diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-02-16 11:31:03 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-02-16 11:31:03 +0100 |
| commit | 18c47b9e13e289cd4410ac4483f80c8d27450bcd (patch) | |
| tree | a09a0e48025c79fee103b16f19140f533b7c6847 /compiler/c2nim | |
| parent | f701ee086aacf3ad9d4f58c20d5924fc0c5b3bb2 (diff) | |
| parent | ce5a494927abf66cc39cf849b9c66e2dadbe579e (diff) | |
| download | Nim-18c47b9e13e289cd4410ac4483f80c8d27450bcd.tar.gz | |
Merge pull request #928 from Varriount/testement/nil-to-discard
Changed tests and tools to use 'discard' statements
Diffstat (limited to 'compiler/c2nim')
| -rw-r--r-- | compiler/c2nim/cparse.nim | 8 | ||||
| -rw-r--r-- | compiler/c2nim/cpp.nim | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/c2nim/cparse.nim b/compiler/c2nim/cparse.nim index ffab05788..e4abe11a0 100644 --- a/compiler/c2nim/cparse.nim +++ b/compiler/c2nim/cparse.nim @@ -540,7 +540,7 @@ proc typeAtom(p: var TParser): PNode = if p.tok.s == "unsigned": isUnsigned = true elif p.tok.s == "signed" or p.tok.s == "int": - nil + discard else: add(x, p.tok.s) getTok(p, nil) @@ -746,7 +746,7 @@ proc directDeclarator(p: var TParser, a: PNode, ident: ptr PNode): PNode = result = declarator(p, a, ident) eat(p, pxParRi, result) else: - nil + discard return parseTypeSuffix(p, a) proc declarator(p: var TParser, a: PNode, ident: ptr PNode): PNode = @@ -1165,7 +1165,7 @@ proc enumSpecifier(p: var TParser): PNode = proc setBaseFlags(n: PNode, base: TNumericalBase) = case base - of base10: nil + of base10: discard of base2: incl(n.flags, nfBase2) of base8: incl(n.flags, nfBase8) of base16: incl(n.flags, nfBase16) @@ -1686,7 +1686,7 @@ proc switchStatement(p: var TParser): PNode = break of "case", "default": break - else: nil + else: discard addSon(result, statement(p)) if sonsLen(result) == 0: # translate empty statement list to Nimrod's ``nil`` statement diff --git a/compiler/c2nim/cpp.nim b/compiler/c2nim/cpp.nim index 1707b75db..84b4c4dfb 100644 --- a/compiler/c2nim/cpp.nim +++ b/compiler/c2nim/cpp.nim @@ -103,7 +103,7 @@ proc parseDefBody(p: var TParser, m: var TMacro, params: seq[string]) = m.body.add(tok) of pxDirConc: # just ignore this token: this implements token merging correctly - nil + discard else: m.body.add(p.tok) # we do not want macro expansion here: @@ -166,7 +166,7 @@ proc parseStmtList(p: var TParser): PNode = of pxDirectiveParLe, pxDirective: case p.tok.s of "else", "endif", "elif": break - else: nil + else: discard addSon(result, statement(p)) proc eatEndif(p: var TParser) = |