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

4
tests/ast_pattern_matching.nim
View file

@ -133,8 +133,8 @@ proc matchLengthKind*(arg: NimNode; kind: NimNodeKind; length: int): MatchingErr
matchLengthKind(arg, {kind}, length)
proc matchValue(arg: NimNode; kind: set[NimNodeKind]; value: SomeInteger): MatchingError {.compileTime.} =
let kindFail = not(kind.card == 0 or arg.kind in kind)
let valueFail = arg.intVal != int(value)
template kindFail: bool = not(kind.card == 0 or arg.kind in kind)
template valueFail: bool = arg.intVal != int(value)
if kindFail or valueFail:
result.node = arg
result.kind = WrongKindValue

36
tests/astspec/tastspec.nim
View file

@ -327,19 +327,43 @@ static:
testArrayAccessOperator(x[y])
## Parentheses
scope:
let ast = myquote:
(1, 2, (3))
(a + b) * c
ast.matchAst:
of nnkPar(nnkIntLit(intVal = 1), nnkIntLit(intVal = 2), nnkPar(nnkIntLit(intVal = 3))):
echo "ok"
of nnkInfix(ident"*", nnkPar(nnkInfix(ident"+", ident"a", ident"b")), ident"c"):
echo "parentheses ok"
## Tuple Constructors
scope:
let ast = myquote:
(1, 2, 3)
(a: 1, b: 2, c: 3)
(1,)
(a: 1)
()
for it in ast:
echo it.lispRepr
it.matchAst:
of nnkTupleConstr(nnkIntLit(intVal = 1), nnkIntLit(intVal = 2), nnkIntLit(intVal = 3)):
echo "simple tuple ok"
of nnkTupleConstr(
nnkExprColonExpr(ident"a", nnkIntLit(intVal = 1)),
nnkExprColonExpr(ident"b", nnkIntLit(intVal = 2)),
nnkExprColonExpr(ident"c", nnkIntLit(intVal = 3))
):
echo "named tuple ok"
of nnkTupleConstr(nnkIntLit(intVal = 1)):
echo "one tuple ok"
of nnkTupleConstr(nnkExprColonExpr(ident"a", nnkIntLit(intVal = 1))):
echo "named one tuple ok"
of nnkTupleConstr():
echo "empty tuple ok"
## Curly braces

2
tests/compiler/tprefixmatches.nim
View file

@ -5,7 +5,7 @@ macro check(val, body: untyped): untyped =
result = newStmtList()
expectKind body, nnkStmtList
for b in body:
expectKind b, nnkPar
expectKind b, nnkTupleConstr
expectLen b, 2
let p = b[0]
let s = b[1]

2
tests/lexer/tunary_minus.nim
View file

@ -45,7 +45,7 @@ template main =
doAssert lispReprStr([-1]) == """(Bracket (IntLit -1))"""
doAssert (-1, 2)[0] == minusOne:
"unable to handle negatives after parenthesis"
doAssert lispReprStr((-1, 2)) == """(Par (IntLit -1) (IntLit 2))"""
doAssert lispReprStr((-1, 2)) == """(TupleConstr (IntLit -1) (IntLit 2))"""
proc x(): int =
var a = 1;-1 # the -1 should act as the return value
doAssert x() == minusOne:

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)"

6
tests/parser/tpostexprblocks.nim
View file

@ -464,7 +464,7 @@ StmtList
DiscardStmt
Empty
OfBranch
Par
TupleConstr
Ident "a"
Ident "b"
StmtList
@ -476,7 +476,7 @@ StmtList
DiscardStmt
Empty
ElifBranch
Par
TupleConstr
Ident "a"
Ident "b"
StmtList
@ -488,7 +488,7 @@ StmtList
DiscardStmt
Empty
ExceptBranch
Par
TupleConstr
Ident "a"
Ident "b"
StmtList

15
tests/parser/ttypemodifiers.nim
View file

@ -21,7 +21,7 @@ StmtList
Ident "PtrTuple"
Empty
PtrTy
Par
TupleConstr
Ident "int"
Ident "string"
TypeDef
@ -43,14 +43,14 @@ StmtList
Ident "RefTupleType"
Empty
RefTy
Par
TupleConstr
Ident "int"
Ident "string"
TypeDef
Ident "RefTupleVars"
Empty
RefTy
Par
TupleConstr
Ident "a"
Ident "b"
TypeDef
@ -80,7 +80,7 @@ StmtList
Empty
Command
Ident "static"
Par
TupleConstr
Ident "int"
Ident "string"
TypeDef
@ -155,7 +155,7 @@ StmtList
Empty
Command
Ident "type"
Par
TupleConstr
Ident "a"
Ident "b"
TypeDef
@ -163,7 +163,7 @@ StmtList
Empty
Command
Ident "type"
Par
TupleConstr
Ident "int"
Ident "string"
TypeDef
@ -287,7 +287,7 @@ StmtList
IdentDefs
Ident "refTuple2"
RefTy
Par
TupleConstr
Ident "int"
Ident "string"
Empty
@ -524,4 +524,3 @@ dumpTree:
static:
staticStmtList1
staticStmtList2