[svn] r5955: nemerle/trunk/ncc: parsing/MainParser.n testsuite/positive/macrolib.n typing/Macros.n

malekith svnadmin at nemerle.org
Mon Nov 21 16:45:33 CET 2005


Log:
Make all lambda expression have an empty name -- fixes matching on quted lambda expressions.

Author: malekith
Date: Mon Nov 21 16:45:32 2005
New Revision: 5955

Modified:
   nemerle/trunk/ncc/parsing/MainParser.n
   nemerle/trunk/ncc/testsuite/positive/macrolib.n
   nemerle/trunk/ncc/typing/Macros.n

Modified: nemerle/trunk/ncc/parsing/MainParser.n
==============================================================================
--- nemerle/trunk/ncc/parsing/MainParser.n	(original)
+++ nemerle/trunk/ncc/parsing/MainParser.n	Mon Nov 21 16:45:32 2005
@@ -1854,7 +1854,7 @@
             def typarms = parse_where_constraints (tyvars);
 
             def h = Fun_header (loc + ret_type.Location,
-                                name = Splicable.Name (mkname ("")),
+                                name = Splicable.Name (Name ("")),
                                 ret_type = ret_type, 
                                 parms = parms, 
                                 typarms = typarms);

Modified: nemerle/trunk/ncc/testsuite/positive/macrolib.n
==============================================================================
--- nemerle/trunk/ncc/testsuite/positive/macrolib.n	(original)
+++ nemerle/trunk/ncc/testsuite/positive/macrolib.n	Mon Nov 21 16:45:32 2005
@@ -193,6 +193,7 @@
 
 macro arr3_macro (params dims : list [PExpr])
 syntax ("arrr", "(", dims, ")") {
+  assert (<[ fun () { } ]> is <[ fun [ ..$_tparms] (..$_args) : $_ty where ..$_tconstrs $_body ]>);
   <[ array (..$dims) ]>
 }
 

Modified: nemerle/trunk/ncc/typing/Macros.n
==============================================================================
--- nemerle/trunk/ncc/typing/Macros.n	(original)
+++ nemerle/trunk/ncc/typing/Macros.n	Mon Nov 21 16:45:32 2005
@@ -845,7 +845,7 @@
                               = Some ($(patternize_quotation (List.Head (pars))))) ]>
           
         | None =>
-          Util.ice ("expression generated from quotation has broken constructor")
+          Util.ice ($ "expression generated from quotation has broken constructor $exp")
       }
 
     | PExpr.ListLiteral (elems) =>



More information about the svn mailing list