nimrod compiles again

5 files changed, 28 insertions, 16 deletions

diff --git a/doc/manual.txt b/doc/manual.txt
index a203b75e0..647ce2774 100755
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -2276,7 +2276,7 @@ top-level symbols that are marked with an asterisk (``*``) are exported.
 
 The algorithm for compiling modules is:
 
-- Compile the whole module as usual, following import statements recursively
+- compile the whole module as usual, following import statements recursively
 - if there is a cycle only import the already parsed symbols (that are
   exported); if an unknown identifier occurs then abort
 
@@ -2408,6 +2408,11 @@ time only. No code will be generated for it. Compile time procs are useful
 as helpers for macros.
 
 
+noReturn pragma
+---------------
+The `noreturn`:idx: pragma is used to mark a proc that it never returns. 
+
+
 error pragma
 ------------
 The `error`:idx: pragma is used to make the compiler output an error message
diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index d17c48740..a07b8a9f7 100755
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
@@ -9,7 +9,6 @@
 
 ## This module contains various string utility routines.
 ## See the module `regexprs` for regular expression support.
-## All the routines here are avaiable for the EMCAScript target too!
 
 {.deadCodeElim: on.}
 
@@ -27,7 +26,7 @@ template newException(exceptn, message: expr): expr =
 
 
 type
-  TCharSet* = set[char] # for compability with Nim
+  TCharSet* = set[char] # for compatibility with Nim
 
 const
   Whitespace* = {' ', '\t', '\v', '\r', '\l', '\f'}
diff --git a/nim/pbraces.pas b/nim/pbraces.pas
index 2e10c50f2..d1cb84096 100755
--- a/nim/pbraces.pas
+++ b/nim/pbraces.pas
@@ -1376,9 +1376,9 @@ begin
         // type alias:
         
       end;
-      tkEnum:
-      tkObject:
-      tkTuple:
+      tkEnum: begin end;
+      tkObject: begin end;
+      tkTuple: begin end;
       else break;
     end
   end
@@ -1401,7 +1401,8 @@ begin
     tkTemplate:  result := parseRoutine(p, nkTemplateDef);
     tkConverter: result := parseRoutine(p, nkConverterDef);
     tkType, tkEnum, tkObject, tkTuple:      
-      result := parseTypeAlias(p, nkTypeSection, parseTypeDef);
+      result := nil;
+      //result := parseTypeAlias(p, nkTypeSection, parseTypeDef);
     tkConst:     result := parseConstSection(p);
     tkWhen:      result := parseIfOrWhen(p, nkWhenStmt);
     tkVar:       result := parseSection(p, nkVarSection, parseVariable);
diff --git a/nim/transf.pas b/nim/transf.pas
index 192d76a84..a0f07d51d 100755
--- a/nim/transf.pas
+++ b/nim/transf.pas
@@ -916,6 +916,12 @@ begin
       result := transformAddrDeref(c, n, nkAddr, nkHiddenAddr);
     nkHiddenStdConv, nkHiddenSubConv, nkConv:
       result := transformConv(c, n);
+    nkDiscardStmt: begin
+      for i := 0 to sonsLen(n)-1 do
+        result.sons[i] := transform(c, n.sons[i]);
+      if isConstExpr(result.sons[0]) then
+        result := newNode(nkCommentStmt)
+    end;
     nkCommentStmt, nkTemplateDef: exit;
     nkConstSection: exit; // do not replace ``const c = 3`` with ``const 3 = 3``
     else begin
diff --git a/tests/tromans.nim b/tests/tromans.nim
index 89e3deba8..12deca1ea 100755
--- a/tests/tromans.nim
+++ b/tests/tromans.nim
@@ -1,5 +1,5 @@
 import
-  math, strutils
+  strutils
 
 ## Convert an integer to a Roman numeral
 # See http://en.wikipedia.org/wiki/Roman_numerals for reference
@@ -15,7 +15,7 @@ proc raiseInvalidValue(msg: string) {.noreturn.} =
 # --> No. Why introduce additional state into such a simple and nice
 # interface? State is evil. :D
 
-proc ConvertRomanToDecimal(romanVal: string): int =
+proc RomanToDecimal(romanVal: string): int =
   result = 0
   var prevVal = 0
   for i in countdown(romanVal.len - 1, 0):
@@ -36,7 +36,7 @@ proc ConvertRomanToDecimal(romanVal: string): int =
       dec(result, val)
     prevVal = val
 
-proc ConvertDecimalToRoman(decValParam: int): string =
+proc DecimalToRoman(decValParam: int): string =
   # Apparently numbers cannot be above 4000
   # Well, they can be (using overbar or parenthesis notation)
   # but I see little interest (beside coding challenge) in coding them as
@@ -55,10 +55,11 @@ proc ConvertDecimalToRoman(decValParam: int): string =
       dec(decVal, val)
       result.add(key)
 
-randomize()
-for i in 1 .. 10:
-  var rnd = 1 + random(3990)
-  var roman = ConvertDecimalToRoman(rnd)
-  var decimal = ConvertRomanToDecimal(roman)
-  echo("$# => $# => $#" % [ $rnd, roman, $decimal ])
+for i in 1..100:
+  if RomanToDecimal(DecimalToRoman(i)) != i: quit "BUG"
+
+for i in items([1238, 1777, 3830, 2401, 379, 33, 940, 3973]):
+  if RomanToDecimal(DecimalToRoman(i)) != i: quit "BUG"
+ 
+echo "success" #OUT success