[svn] r7712: nemerle/trunk: macros/Data.n macros/core.n ncc/typing/Typer.n

[divan]

Log:
1) Improve sequence locations.
2) Fix 1030.
3) Fix some minor typos.

Author: divan
Date: Sat Jun 23 13:27:19 2007
New Revision: 7712

Modified:
   nemerle/trunk/macros/Data.n
   nemerle/trunk/macros/core.n
   nemerle/trunk/ncc/typing/Typer.n

Modified: nemerle/trunk/macros/Data.n
==============================================================================
--- nemerle/trunk/macros/Data.n	(original)
+++ nemerle/trunk/macros/Data.n	Sat Jun 23 13:27:19 2007
@@ -334,7 +334,7 @@
         variables with names of those parameters.
     
         Returns:
-        - final SQL provider secific query
+        - final SQL provider specific query
         - collection of pairs of name and typed expression containing variable with this
           name
         - list of expressions initializing [querycmd.Parameters] to value of

Modified: nemerle/trunk/macros/core.n
==============================================================================
--- nemerle/trunk/macros/core.n	(original)
+++ nemerle/trunk/macros/core.n	Sat Jun 23 13:27:19 2007
@@ -174,7 +174,7 @@
         def $(loop : name) () : void {
           when ($cond) {
             $("_N_continue" : global) : {
-              $body 
+              $body : void
             } 
             $(loop : name) ()
           }
@@ -188,7 +188,7 @@
   macro repeatmacro (times, body)
   syntax ("repeat", "(", times, ")", body)
   {
-    <[ for(mutable t = $times; t > 0;--t) $body ]>
+    <[ for (mutable t = $times; t > 0; --t) $body ]>
   }
 
 
@@ -198,14 +198,14 @@
   {
     def res1 = match (cond)
     {
-      | <[ $subCond is $pattren ]> with guard = null
-      | <[ $subCond is $pattren when $guard ]> =>
-        def res2 = match (pattren)
+      | <[ $subCond is $pattern ]> with guard = null
+      | <[ $subCond is $pattern when $guard ]> =>
+        def res2 = match (pattern)
         {
           | PT.PExpr.Call when guard != null => 
-            <[ match ($subCond) { | $pattren when $guard => $body : void | _ => () } ]>
+            <[ match ($subCond) { | $pattern when $guard => $body : void | _ => () } ]>
           | PT.PExpr.Call => 
-            <[ match ($subCond) { | $pattren => $body : void | _ => () } ]>
+            <[ match ($subCond) { | $pattern => $body : void | _ => () } ]>
           | _ => <[ match ($cond) { | true => $body : void | _ => () } ]>
         }
         res2
@@ -230,7 +230,7 @@
         def $(loop : name) () : void {
           when ($cond) {
             $("_N_continue" : global) : {
-              $body
+              $body : void
             }
             $change; 
             $(loop : name) ()

Modified: nemerle/trunk/ncc/typing/Typer.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer.n	(original)
+++ nemerle/trunk/ncc/typing/Typer.n	Sat Jun 23 13:27:19 2007
@@ -1904,12 +1904,14 @@
                   if (acc == null) dv.body = VoidLiteral ();
                   else dv.body = acc;
                   dv.ty = dv.body.Type;
+                  dv.loc += dv.body.loc;
                   x
 
                 | TExpr.DefFunctionsIn (_, body) as dv when body == null =>
                   if (acc == null) dv.body = VoidLiteral ();
                   else dv.body = acc;
                   dv.ty = dv.body.Type;
+                  dv.loc += dv.body.loc;
                   x
                   
                 | TExpr.Match (_, [case]) when case.body == null =>
@@ -1926,7 +1928,7 @@
 
                 | x =>
                   if (acc == null) x
-                  else TExpr.Sequence (acc.Type, x, acc);
+                  else TExpr.Sequence (x.loc + acc.loc, acc.Type, x, acc);
               }
             loop (acc, xs)