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

update tests that tested for the 'discard' error messages

Browse source
This commit is contained in:
Araq 2020-05-02 21:16:08 +02:00 • committed by Andreas Rumpf
commit ff1c0bae4c
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/exprs/texprstmt.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "expression 'result[1 .. BackwardsIndex(1)]' is of type 'string' and has to be discarded" errormsg: "expression 'result[1 .. BackwardsIndex(1)]' is of type 'string' and has to be used (or discarded)"
line: 10 line: 10
""" """

2
tests/exprs/tstmtexp.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "expression '5' is of type 'int literal(5)' and has to be discarded" errormsg: "expression '5' is of type 'int literal(5)' and has to be used (or discarded)"
file: "tstmtexp.nim" file: "tstmtexp.nim"
line: 8 line: 8
""" """

16
tests/macros/tmacro6.nim
View file

@ -1,22 +1,22 @@
discard """ discard """
errormsg: "expression '123' is of type 'int literal(123)' and has to be discarded" errormsg: "expression '123' is of type 'int literal(123)' and has to be used (or discarded)"
line: 71 line: 71
""" """
import macros import macros
proc foo(a,b,c: int): int = proc foo(a, b, c: int): int =
result += a result += a
result += b result += b
result += c result += c
macro bar(a,b,c: int): int = macro bar(a, b, c: int): int =
result = newCall(ident"echo") result = newCall(ident"echo")
result.add a result.add a
result.add b result.add b
result.add c result.add c
macro baz(a,b,c: int): int = macro baz(a, b, c: int): int =
let stmt = nnkStmtListExpr.newTree() let stmt = nnkStmtListExpr.newTree()
stmt.add newCall(ident"echo", a) stmt.add newCall(ident"echo", a)
stmt.add newCall(ident"echo", b) stmt.add newCall(ident"echo", b)
@ -26,7 +26,7 @@ macro baz(a,b,c: int): int =
# test no result type with explicit return # test no result type with explicit return
macro baz2(a,b,c: int) = macro baz2(a, b, c: int) =
let stmt = nnkStmtListExpr.newTree() let stmt = nnkStmtListExpr.newTree()
stmt.add newCall(ident"echo", a) stmt.add newCall(ident"echo", a)
stmt.add newCall(ident"echo", b) stmt.add newCall(ident"echo", b)
@ -35,7 +35,7 @@ macro baz2(a,b,c: int) =
# test explicit void type with explicit return # test explicit void type with explicit return
macro baz3(a,b,c: int): void = macro baz3(a, b, c: int): void =
let stmt = nnkStmtListExpr.newTree() let stmt = nnkStmtListExpr.newTree()
stmt.add newCall(ident"echo", a) stmt.add newCall(ident"echo", a)
stmt.add newCall(ident"echo", b) stmt.add newCall(ident"echo", b)
@ -44,7 +44,7 @@ macro baz3(a,b,c: int): void =
# test no result type with result variable # test no result type with result variable
macro baz4(a,b,c: int) = macro baz4(a, b, c: int) =
result = nnkStmtListExpr.newTree() result = nnkStmtListExpr.newTree()
result.add newCall(ident"echo", a) result.add newCall(ident"echo", a)
result.add newCall(ident"echo", b) result.add newCall(ident"echo", b)
@ -52,7 +52,7 @@ macro baz4(a,b,c: int) =
# test explicit void type with result variable # test explicit void type with result variable
macro baz5(a,b,c: int): void = macro baz5(a, b, c: int): void =
let result = nnkStmtListExpr.newTree() let result = nnkStmtListExpr.newTree()
result.add newCall(ident"echo", a) result.add newCall(ident"echo", a)
result.add newCall(ident"echo", b) result.add newCall(ident"echo", b)

2
tests/niminaction/Chapter2/explicit_discard.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "has to be discarded" errormsg: "has to be used (or discarded)"
line: 7 line: 7
""" """

2
tests/niminaction/Chapter2/resultreject.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "has to be discarded" errormsg: "has to be used (or discarded)"
line: 27 line: 27
""" """