diff options
| -rwxr-xr-x | lib/pure/times.nim | 2 | ||||
| -rwxr-xr-x | rod/c2nim/cpp.nim | 2 | ||||
| -rwxr-xr-x | rod/sigmatch.nim | 3 | ||||
| -rw-r--r-- | tests/accept/compile/tnamedparams.nim | 8 | ||||
| -rwxr-xr-x | tests/reject/spec.csv | 1 | ||||
| -rw-r--r-- | tests/reject/tnamedparams.nim | 8 | ||||
| -rwxr-xr-x | tests/tester.nim | 2 | ||||
| -rwxr-xr-x | todo.txt | 2 |
8 files changed, 25 insertions, 3 deletions
diff --git a/lib/pure/times.nim b/lib/pure/times.nim index d3e2fe7cf..f428a33b3 100755 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -143,7 +143,7 @@ proc `<=` * (a, b: TTime): bool {. proc getStartMilsecs*(): int {.deprecated.} ## get the miliseconds from the start of the program. **Deprecated since - ## version 0.8.10.** Use ``realTime`` or ``cpuTime`` instead. + ## version 0.8.10.** Use ``epochTime`` or ``cpuTime`` instead. when not defined(ECMAScript): proc epochTime*(): float {.rtl, extern: "nt$1".} diff --git a/rod/c2nim/cpp.nim b/rod/c2nim/cpp.nim index 5f304e1f8..5507c6116 100755 --- a/rod/c2nim/cpp.nim +++ b/rod/c2nim/cpp.nim @@ -279,7 +279,7 @@ proc parsePegLit(p: var TParser): TPeg = if p.tok.xkind != pxStrLit: ExpectIdent(p) try: result = parsePeg( - input = if p.tok.xkind == pxStrLit: p.tok.s else: escapePeg(p.tok.s), + pattern = if p.tok.xkind == pxStrLit: p.tok.s else: escapePeg(p.tok.s), filename = p.lex.filename, line = p.lex.linenumber, col = col) diff --git a/rod/sigmatch.nim b/rod/sigmatch.nim index 6a91550e6..5dc9de7b0 100755 --- a/rod/sigmatch.nim +++ b/rod/sigmatch.nim @@ -95,6 +95,9 @@ proc getNotFoundError(c: PContext, n: PNode): string = result = msgKindToString(errTypeMismatch) for i in countup(1, sonsLen(n) - 1): #debug(n.sons[i].typ); + if n.sons[i].kind == nkExprEqExpr: + add(result, renderTree(n.sons[i].sons[0])) + add(result, ": ") add(result, typeToString(n.sons[i].typ)) if i != sonsLen(n) - 1: add(result, ", ") add(result, ')') diff --git a/tests/accept/compile/tnamedparams.nim b/tests/accept/compile/tnamedparams.nim new file mode 100644 index 000000000..4b0cd5361 --- /dev/null +++ b/tests/accept/compile/tnamedparams.nim @@ -0,0 +1,8 @@ +import pegs + +discard parsePeg( + pattern = "input", + filename = "filename", + line = 1, + col = 23) + diff --git a/tests/reject/spec.csv b/tests/reject/spec.csv index 6b1165677..a332096b2 100755 --- a/tests/reject/spec.csv +++ b/tests/reject/spec.csv @@ -15,6 +15,7 @@ tinvalidnewseq.nim;10;type mismatch: got (array[0..6, string], int) tinvwhen.nim;6;invalid indentation titer4.nim;2;iterator within for loop context expected tmethod.nim;2;'method' needs a parameter that has an object type +tnamedparams.nim;3; Error: type mismatch: got (input: string, filename: string, line: int, col: int) tnamspc.nim;5;undeclared identifier: 'global' tnoop.nim;6;expression 'a()' cannot be called tnot.nim;9;type mismatch diff --git a/tests/reject/tnamedparams.nim b/tests/reject/tnamedparams.nim new file mode 100644 index 000000000..6c59518b3 --- /dev/null +++ b/tests/reject/tnamedparams.nim @@ -0,0 +1,8 @@ +import pegs + +discard parsePeg( + input = "input", + filename = "filename", + line = 1, + col = 23) + diff --git a/tests/tester.nim b/tests/tester.nim index e9f030115..1c21e7afc 100755 --- a/tests/tester.nim +++ b/tests/tester.nim @@ -1,7 +1,7 @@ # # # Nimrod Tester -# (c) Copyright 2010 Andreas Rumpf +# (c) Copyright 2011 Andreas Rumpf # # See the file "copying.txt", included in this # distribution, for details about the copyright. diff --git a/todo.txt b/todo.txt index 0c77c484e..f5de17517 100755 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,6 @@ - we need a way to disable tests +- {.extern: "thisfile.m".} pragma for objective C/C++ support +- deprecate ^ and make it awailable as operator High priority (version 0.9.0) |