jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unify tuple expressions (#13793)

Browse source 
* unify tuple expressions

* fix test

* fix test

* apply feedback

* Handle empty tuples

* Fix rendering named unary tuple

* Protect static NimNode against stripping

* Slightly less hacky

* Revert "Slightly less hacky"

This reverts commit 170c5aec0addc029f637afbc948700ca006b7942.

* Slightly less hacky

* Cleanup

* Fix test

* Fix another test

* Add condsym

* Rebase fallout

* changelog: Move from compiler changes to language changes

* Add stricter tests

* Add empty tuple example to doc/astspec

* Fix test

Co-authored-by: Clyybber <darkmine956@gmail.com>
This commit is contained in:
Arne Döring 2021-03-30 02:06:51 +02:00 • committed by GitHub
commit 159c06e045
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 136 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/macros/tdumpast.nim
View file

@ -48,3 +48,34 @@ macro fun3(): untyped =
int | float | array | seq | object | ptr | pointer | float32
doAssert n.repr == "int | float | array | seq | object | ptr | pointer | float32", n.repr
fun3()
macro fun4() =
let n = quote do:
(a: 1)
doAssert n.repr == "(a: 1)", n.repr
fun4()
# nkTupleConstr vs nkPar tests:
block: # lispRepr
macro lispRepr2(a: untyped): string = newLit a.lispRepr
doAssert lispRepr2(()) == """(TupleConstr)"""
doAssert lispRepr2((a: 1)) == """(TupleConstr (ExprColonExpr (Ident "a") (IntLit 1)))"""
doAssert lispRepr2((a: 1, b: 2)) == """(TupleConstr (ExprColonExpr (Ident "a") (IntLit 1)) (ExprColonExpr (Ident "b") (IntLit 2)))"""
doAssert lispRepr2((1,)) == """(TupleConstr (IntLit 1))"""
doAssert lispRepr2((1, 2)) == """(TupleConstr (IntLit 1) (IntLit 2))"""
doAssert lispRepr2((1, 2, 3.0)) == """(TupleConstr (IntLit 1) (IntLit 2) (FloatLit 3.0))"""
doAssert lispRepr2((1)) == """(Par (IntLit 1))"""
doAssert lispRepr2((1+2)) == """(Par (Infix (Ident "+") (IntLit 1) (IntLit 2)))"""
block: # repr
macro repr2(a: untyped): string = newLit a.repr
doAssert repr2(()) == "()"
doAssert repr2((a: 1)) == "(a: 1)"
doAssert repr2((a: 1, b: 2)) == "(a: 1, b: 2)"
doAssert repr2((1,)) == "(1,)"
doAssert repr2((1, 2)) == "(1, 2)"
doAssert repr2((1, 2, 3.0)) == "(1, 2, 3.0)"
doAssert repr2((1)) == "(1)"
doAssert repr2((1+2)) == "(1 + 2)"