[svn] r7707: nemerle/trunk: boot/Nemerle.Compiler.dll boot/Nemerle.MSBuild.Tasks.dll boot/Nemerle.Macros.d...

divan svnadmin at nemerle.org
Sun Jun 17 21:04:47 CEST 2007


Log:
Convert Message.FatalError to macro to avoid void generic parameter.

Author: divan
Date: Sun Jun 17 21:04:33 2007
New Revision: 7707

Modified:
   nemerle/trunk/boot/Nemerle.Compiler.dll
   nemerle/trunk/boot/Nemerle.MSBuild.Tasks.dll
   nemerle/trunk/boot/Nemerle.Macros.dll
   nemerle/trunk/boot/Nemerle.dll
   nemerle/trunk/boot/ncc.exe
   nemerle/trunk/macros/compiler.n
   nemerle/trunk/ncc/parsing/Utility.n

Modified: nemerle/trunk/boot/Nemerle.Compiler.dll
==============================================================================
Binary files. No diff available.

Modified: nemerle/trunk/boot/Nemerle.MSBuild.Tasks.dll
==============================================================================
Binary files. No diff available.

Modified: nemerle/trunk/boot/Nemerle.Macros.dll
==============================================================================
Binary files. No diff available.

Modified: nemerle/trunk/boot/Nemerle.dll
==============================================================================
Binary files. No diff available.

Modified: nemerle/trunk/boot/ncc.exe
==============================================================================
Binary files. No diff available.

Modified: nemerle/trunk/macros/compiler.n
==============================================================================
--- nemerle/trunk/macros/compiler.n	(original)
+++ nemerle/trunk/macros/compiler.n	Sun Jun 17 21:04:33 2007
@@ -66,6 +66,25 @@
   }
 }
 
+namespace Nemerle.Compiler.Message 
+{
+  macro FatalError (a, b = null)
+  {
+    match (a, b) {
+      | (m, null) =>
+        <[ {
+              Message.Error (Location.Default, $m);
+              throw Recovery ()
+        } ]>
+      | (loc, m) =>
+        <[ {
+              Message.Error ($loc, $m);
+              throw Recovery ()
+        } ]>
+    }
+  }
+}
+
 namespace Nemerle.Compiler
 {
   using Nemerle.Collections;

Modified: nemerle/trunk/ncc/parsing/Utility.n
==============================================================================
--- nemerle/trunk/ncc/parsing/Utility.n	(original)
+++ nemerle/trunk/ncc/parsing/Utility.n	Sun Jun 17 21:04:33 2007
@@ -264,12 +264,6 @@
       Message.Debug (Location.Default, m)
     }
 
-    public FatalError['a] (loc : Location, m : string) : 'a
-    {
-      Message.Error (loc, m);
-      throw Recovery ()
-    }
-
     public FatalError2 (loc : Location, m : string) : void
     {
       Message.Error (loc, m);
@@ -277,11 +271,6 @@
         throw Recovery ()
     }
 
-    public FatalError['a] (m : string) : 'a
-    {
-      Message.FatalError (Location.Default, m) 
-    }
-
     public MaybeBailout (fscked_up : bool) : void
     {
       unless (Manager.Options.IgnoreConfusion && fscked_up)



More information about the svn mailing list