c2nim: bugfix: less picky about newlines in preprocessor defines

4 files changed, 16 insertions, 3 deletions

diff --git a/rod/c2nim/cpp.nim b/rod/c2nim/cpp.nim
index 5507c6116..f59c86044 100755
--- a/rod/c2nim/cpp.nim
+++ b/rod/c2nim/cpp.nim
@@ -16,7 +16,7 @@ proc eatNewLine(p: var TParser, n: PNode) =
   if p.tok.xkind == pxLineComment:
     skipCom(p, n)
     if p.tok.xkind == pxNewLine: getTok(p)
-  else:
+  elif p.tok.xkind == pxNewLine: 
     eat(p, pxNewLine)
   
 proc skipLine(p: var TParser) = 
diff --git a/rod/c2nim/tests/systest.c b/rod/c2nim/tests/systest.c
index 7f689c002..4ba1d9044 100755
--- a/rod/c2nim/tests/systest.c
+++ b/rod/c2nim/tests/systest.c
@@ -9,6 +9,15 @@ extern "C" {
 #  endif
 #endif
 
+typedef void (*callback_t) (int rc);
+
+int   aw_callback_set (AW_CALLBACK c, callback_t callback );
+int   aw_instance_callback_set (AW_CALLBACK c, callback_t callback);
+
+#define AW_BUILD 85 // AW 5.0
+// Limits
+#define AW_MAX_AVCHANGE_PER_SECOND 10
+
 #private expatDll
 
 #if !defined(expatDll)
diff --git a/todo.txt b/todo.txt
index 31fce261a..08b1865b1 100755
--- a/todo.txt
+++ b/todo.txt
@@ -1,11 +1,13 @@
+- built-in serialization
 - thread support: threadvar on Windows seems broken; 
   add --deadlock_prevention:on|off switch
 
+- ban ``nil`` from the AST. This might also fix bugs concerning macros.
+
 - we need a way to disable tests
 - deprecate ^ and make it available as operator
 - test branch coverage
 - checked exceptions
-- built-in serialization
 - do not ambiguity error for methods if ambiguity only affects the same 
   dispatcher anyway
 - slicing
@@ -26,6 +28,7 @@ Bugs
 - proc (x: int) is passable to proc (x: var int)  !?
 - detected by pegs module 64bit: p(result, result) should use a temporary!
 - the parser allows empty object case branches
+- Exception matching needs to take subclasses into account
 
 
 To implement
diff --git a/web/nimrod.ini b/web/nimrod.ini
index 65fc49936..fc11c00d0 100644
--- a/web/nimrod.ini
+++ b/web/nimrod.ini
@@ -24,13 +24,14 @@ file: ticker
 doc: "endb;intern;apis;lib;manual;tut1;tut2;nimrodc;overview"
 doc: "tools;c2nim;niminst"
 pdf: "manual;lib;tut1;tut2;nimrodc;c2nim;niminst"
+srcdoc: "core/macros;core/threads;core/marshal"
 srcdoc: "impure/graphics;pure/sockets"
 srcdoc: "system.nim;pure/os;pure/strutils;pure/math"
 srcdoc: "pure/complex;pure/times;pure/osproc;pure/pegs;pure/dynlib"
 srcdoc: "pure/parseopt;pure/hashes;pure/strtabs;pure/lexbase"
 srcdoc: "pure/parsecfg;pure/parsexml;pure/parsecsv;pure/parsesql"
 srcdoc: "pure/streams;pure/terminal;pure/cgi;impure/web;pure/unicode"
-srcdoc: "impure/zipfiles;pure/xmlgen;pure/macros;pure/parseutils;pure/browsers"
+srcdoc: "impure/zipfiles;pure/xmlgen;pure/parseutils;pure/browsers"
 srcdoc: "impure/db_postgres;impure/db_mysql;impure/db_sqlite"
 srcdoc: "pure/httpserver;pure/httpclient;pure/stmp;impure/ssl"
 srcdoc: "pure/ropes;pure/unidecode/unidecode;pure/xmldom;pure/xmldomparser"