version 0.8.5: bugfixes; compiler now maintained in Nimrod

4 files changed, 18 insertions, 17 deletions

diff --git a/nim/ccgstmts.pas b/nim/ccgstmts.pas
index 97641f0c8..d31f0e5bd 100755
--- a/nim/ccgstmts.pas
+++ b/nim/ccgstmts.pas
@@ -886,19 +886,19 @@ begin
     else begin
       key := it;
     end;
-    assert(key.kind = nkIdent);
-    case whichKeyword(key.ident) of
-      wBreakpoint: genBreakPoint(p, it);
-      wDeadCodeElim: begin
-        if not (optDeadCodeElim in gGlobalOptions) then begin
-          // we need to keep track of ``deadCodeElim`` pragma
-          if (sfDeadCodeElim in p.module.module.flags) then
-            addPendingModule(p.module)
-        end            
+    if key.kind = nkIdent then
+      case whichKeyword(key.ident) of
+        wBreakpoint: genBreakPoint(p, it);
+        wDeadCodeElim: begin
+          if not (optDeadCodeElim in gGlobalOptions) then begin
+            // we need to keep track of ``deadCodeElim`` pragma
+            if (sfDeadCodeElim in p.module.module.flags) then
+              addPendingModule(p.module)
+          end            
+        end
+        else begin end
       end
-      else begin end
-    end
-  end;
+  end
 end;
 
 procedure genAsgn(p: BProc; e: PNode);
diff --git a/nim/pnimsyn.pas b/nim/pnimsyn.pas
index eeaf2a6e9..260d1e5a5 100755
--- a/nim/pnimsyn.pas
+++ b/nim/pnimsyn.pas
@@ -1460,7 +1460,6 @@ begin
   result := newNodeP(nkEnumTy, p);
   a := nil;
   getTok(p);
-  optInd(p, result);
   if p.tok.tokType = tkOf then begin
     a := newNodeP(nkOfInherit, p);
     getTok(p); optInd(p, a);
@@ -1468,6 +1467,7 @@ begin
     addSon(result, a)
   end
   else addSon(result, nil);
+  optInd(p, result);
 
   while true do begin
     case p.tok.tokType of
diff --git a/nim/pragmas.pas b/nim/pragmas.pas
index 8411a319f..7a0fd2468 100755
--- a/nim/pragmas.pas
+++ b/nim/pragmas.pas
@@ -607,7 +607,7 @@ begin
       else invalidPragma(it);
     end
     else begin
-      processNote(c, n)
+      processNote(c, it)
     end;
   end;
   if (sym <> nil) and (sym.kind <> skModule) then begin
diff --git a/nim/readme.txt b/nim/readme.txt
index 99d574bac..258192543 100755
--- a/nim/readme.txt
+++ b/nim/readme.txt
@@ -1,3 +1,4 @@
-This is the Pascal version of the sources. The Nimrod version is generated
-automatically from it. DO NOT MODIFY THE NIMROD VERSION OF THE SOURCES,
-BUT THIS VERSION!
+This is the Pascal version of the sources. The Nimrod version has been 
+generated automatically from it. DO NOT MODIFY THIS OLD VERSION, BUT THE 
+UP-TO-DATE VERSION IN NIMROD!
+