summary refs log tree commit diff stats
path: root/compiler/c2nim/cpp.nim
diff options
context:
space:
mode:
authorZahary Karadjov <zahary@gmail.com>2014-02-17 00:48:10 +0200
committerZahary Karadjov <zahary@gmail.com>2014-02-17 00:48:10 +0200
commit9a41db7d7abaf92dbdef425605f68454d48b22b2 (patch)
tree309383a42d07cc62ebffca6c97f75e335dd3614e /compiler/c2nim/cpp.nim
parentb80503814d3ad37023b27cc8b2d78aed0c10bfcb (diff)
parent5cd9b035b40f11a950d37695d75f0981b5c13fbe (diff)
downloadNim-9a41db7d7abaf92dbdef425605f68454d48b22b2.tar.gz
Merge branch 'devel' of gh:/Araq/Nimrod into devel
Diffstat (limited to 'compiler/c2nim/cpp.nim')
-rw-r--r--compiler/c2nim/cpp.nim4
1 files changed, 2 insertions, 2 deletions
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) =