diff options
| -rw-r--r-- | changelog.md | 1 | ||||
| -rw-r--r-- | lib/core/macros.nim | 8 | ||||
| -rw-r--r-- | testament/important_packages.nim | 2 | ||||
| -rw-r--r-- | tests/macros/tmacros_various.nim | 38 |
4 files changed, 14 insertions, 35 deletions
diff --git a/changelog.md b/changelog.md index 588af989b..3f3a2f9b2 100644 --- a/changelog.md +++ b/changelog.md @@ -112,6 +112,7 @@ - new proc `heapqueue.find[T](heap: HeapQueue[T], x: T): int` to get index of element ``x``. - Add `rstgen.rstToLatex` convenience proc for `renderRstToOut` and `initRstGenerator` with `outLatex` output. - Add `os.normalizeExe`, eg: `koch` => `./koch`. +- `macros.newLit` now preserves named vs unnamed tuples; use `-d:nimHasWorkaround14720` to keep old behavior ## Language changes diff --git a/lib/core/macros.nim b/lib/core/macros.nim index 04a85d355..1b0986d33 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -801,12 +801,14 @@ proc newLit*[T](s: set[T]): NimNode {.compileTime.} = result = newCall(typ,result) proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".} - ## See typetraits.isNamedTuple + ## See `typetraits.isNamedTuple` proc newLit*[T: tuple](arg: T): NimNode {.compileTime.} = + ## use -d:nimHasWorkaround14720 to restore behavior prior to PR, forcing + ## a named tuple even when `arg` is unnamed. result = nnkTupleConstr.newTree - when isNamedTuple(T): - for a,b in arg.fieldPairs: + when defined(nimHasWorkaround14720) or isNamedTuple(T): + for a, b in arg.fieldPairs: result.add nnkExprColonExpr.newTree(newIdentNode(a), newLit(b)) else: for b in arg.fields: diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 6da644ce3..0a64f6c33 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -43,7 +43,7 @@ pkg1 "elvis" # Error: cannot open 'tests/runNative.nim' pkg1 "fragments", false, "nim c -r fragments/dsl.nim" pkg1 "gara" -pkg1 "ggplotnim", true, "nim c -d:noCairo -r -d:nimWorkaround14447 tests/tests.nim" +pkg1 "ggplotnim", true, "nim c -d:noCairo -r -d:nimWorkaround14447 -d:nimHasWorkaround14720 tests/tests.nim" # pkg1 "gittyup", true, "nimble test", "https://github.com/disruptek/gittyup" pkg1 "glob" pkg1 "gnuplot" diff --git a/tests/macros/tmacros_various.nim b/tests/macros/tmacros_various.nim index 695353b0c..533db25e1 100644 --- a/tests/macros/tmacros_various.nim +++ b/tests/macros/tmacros_various.nim @@ -194,35 +194,11 @@ static: doAssert(v == a) echo "macrocache ok" - + block tupleNewLitTests: - macro t0(): untyped = - result = newLit(()) - doAssert t0 == () - macro t1(): untyped = - result = newLit((5,)) - doAssert t1 == (5,) - macro t2(): untyped = - result = newLit((a: 5)) - doAssert t2 == (a: 5) - macro t3(): untyped = - result = newLit((5, "5")) - doAssert t3 == (5, "5") - macro t4(): untyped = - result = newLit((a: 5, b: "5")) - doAssert t4 == (a: 5, b: "5") - macro t5(): untyped = - result = newLit(@[(5,)]) - doAssert t5 == @[(5,)] - macro t6(): untyped = - result = newLit(@[(a: 5)]) - doAssert t6 == @[(a: 5)] - macro t7(): untyped = - result = newLit(@[(5, "5")]) - doAssert t7 == @[(5, "5")] - macro t8(): untyped = - result = newLit(@[(a: 5, b: "5")]) - doAssert t8 == @[(a: 5, b: "5")] - macro t9(): untyped = - result = newLit(@[(a: (5, 6), b: ())]) - doAssert t9 == @[(a: (5, 6), b: ())] + macro t(): untyped = + result = newLit (1, "foo", (), (1,), (a1: 'x', a2: @["ba"])) + doAssert $t() == """(1, "foo", (), (1,), (a1: 'x', a2: @["ba"]))""" + # this `$` test is needed because tuple equality doesn't distinguish + # between named vs unnamed tuples + doAssert t() == (1, "foo", (), (1, ), (a1: 'x', a2: @["ba"])) |