jdb/nim-vcard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifications to compile under Nim 2.x

Browse Source
This commit is contained in:
Jonathan Bernard
2026-03-28 09:55:17 -05:00
parent ce70e5ddd4
commit ab2579bdb5
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vcard/vcard3.nim
View File

@@ -661,7 +661,7 @@ macro genPropertyAccessors(
of vpcAtMostOne: of vpcAtMostOne:
let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName): let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName):
func funcName*(vc3: VCard3): Option[typeName] = func funcName*(vc3: VCard3): Option[typeName] =
result = findFirst[typeName](vc3.content) result = findFirst[typeName, VC3_Property](vc3.content)
funcDef[6].insert(0, newCommentStmtNode( funcDef[6].insert(0, newCommentStmtNode(
"Return the single " & $pn & " property (if present).")) "Return the single " & $pn & " property (if present)."))
result.add(funcDef) result.add(funcDef)
@@ -670,7 +670,7 @@ macro genPropertyAccessors(
of vpcExactlyOne: of vpcExactlyOne:
let funcDef = genAstOpt({kDirtyTemplate}, funcName, pn, typeName): let funcDef = genAstOpt({kDirtyTemplate}, funcName, pn, typeName):
func funcName*(vc3: VCard3): typeName = func funcName*(vc3: VCard3): typeName =
let props = findAll[typeName](vc3.content) let props = findAll[typeName, VC3_Property](vc3.content)
if props.len != 1: if props.len != 1:
raise newException(ValueError, raise newException(ValueError,
"VCard should have exactly one $# property, but $# were found" % "VCard should have exactly one $# property, but $# were found" %
@@ -683,7 +683,7 @@ macro genPropertyAccessors(
of vpcAtLeastOne, vpcAny: of vpcAtLeastOne, vpcAny:
let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName): let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName):
func funcName*(vc3: VCard3): seq[typeName] = func funcName*(vc3: VCard3): seq[typeName] =
result = findAll[typeName](vc3.content) result = findAll[typeName, VC3_Property](vc3.content)
funcDef[6].insert(0, newCommentStmtNode( funcDef[6].insert(0, newCommentStmtNode(
"Return all instances of the " & $pn & " property.")) "Return all instances of the " & $pn & " property."))
result.add(funcDef) result.add(funcDef)
@@ -693,7 +693,7 @@ genPropertyAccessors(propertyCardMap.pairs.toSeq -->
func version*(vc3: VCard3): VC3_Version = func version*(vc3: VCard3): VC3_Version =
## Return the VERSION property. ## Return the VERSION property.
let found = findFirst[VC3_Version](vc3.content) let found = findFirst[VC3_Version, VC3_Property](vc3.content)
if found.isSome: return found.get if found.isSome: return found.get
else: return VC3_Version( else: return VC3_Version(
propertyId: vc3.content.len + 1, propertyId: vc3.content.len + 1,
@@ -701,7 +701,7 @@ func version*(vc3: VCard3): VC3_Version =
name: "VERSION", name: "VERSION",
value: "3.0") value: "3.0")
func xTypes*(vc3: VCard3): seq[VC3_XType] = findAll[VC3_XType](vc3.content) func xTypes*(vc3: VCard3): seq[VC3_XType] = findAll[VC3_XType, VC3_Property](vc3.content)
## Return all extended properties (starting with `x-`). ## Return all extended properties (starting with `x-`).
# Setters # Setters

2
src/vcard/vcard4.nim
View File

@@ -842,7 +842,7 @@ macro genPropAccessors(
of vpcAtLeastOne, vpcAny: of vpcAtLeastOne, vpcAny:
let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName): let funcDef = genAstOpt({kDirtyTemplate}, funcName, typeName):
func funcName*(vc4: VCard4): seq[typeName] = func funcName*(vc4: VCard4): seq[typeName] =
result = findAll[typeName](vc4.content) result = findAll[typeName, VC4_Property](vc4.content)
result.add(funcDef) result.add(funcDef)
macro genNameAccessors(propNames: static[seq[VC4_PropertyName]]): untyped = macro genNameAccessors(propNames: static[seq[VC4_PropertyName]]): untyped =

2
tests/tlexer.nim
View File

@@ -1,5 +1,5 @@
import unittest import unittest
import ./vcard/private/lexer import vcard/private/lexer
suite "vcard/private/lexer": suite "vcard/private/lexer":
test "private lexer tests": test "private lexer tests":

7
tests/tvcard3.nim
View File

@@ -1,7 +1,8 @@
import options, unittest, zero_functional import std/[options, strutils, times, unittest]
import zero_functional
import ./vcard import vcard
import ./vcard/vcard3 import vcard/vcard3
suite "vcard/vcard3": suite "vcard/vcard3":

4
tests/tvcard4.nim
View File

@@ -1,8 +1,8 @@
import std/[options, strutils, tables, unittest] import std/[options, strutils, tables, unittest]
import zero_functional import zero_functional
import ./vcard import vcard
import ./vcard/vcard4 import vcard/vcard4
suite "vcard/vcard4": suite "vcard/vcard4":