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

IT svnadmin at nemerle.org
Tue Nov 7 07:12:37 CET 2006


Log:
Added method return type location.

Author: IT
Date: Tue Nov  7 07:12:20 2006
New Revision: 6844

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/ncc/external/LibrariesLoader.n
   nemerle/trunk/ncc/hierarchy/BuiltinMethod.n
   nemerle/trunk/ncc/hierarchy/ClassMembers.n
   nemerle/trunk/ncc/typing/TypedTree.n
   nemerle/trunk/ncc/typing/Typer.n
   nemerle/trunk/ncc/typing/Typer2.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/ncc/external/LibrariesLoader.n
==============================================================================
--- nemerle/trunk/ncc/external/LibrariesLoader.n	(original)
+++ nemerle/trunk/ncc/external/LibrariesLoader.n	Tue Nov  7 07:12:20 2006
@@ -1862,7 +1862,7 @@
             name = p.Name,
             color = 0,
             ty = ty,
-            ty_loc = Location.Default,
+            ty_loc    = lib._location,
             kind = parmkind,
             modifiers = Modifiers.Empty // FIXME?
           );
@@ -1888,6 +1888,7 @@
             loc = library._location,
             name = Name,
             ret_type = ret_type,
+            ret_type_loc = library._location,
             parms = fparms,
             typarms = tyvars,
             tenv = null

Modified: nemerle/trunk/ncc/hierarchy/BuiltinMethod.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/BuiltinMethod.n	(original)
+++ nemerle/trunk/ncc/hierarchy/BuiltinMethod.n	Tue Nov  7 07:12:20 2006
@@ -66,6 +66,7 @@
            loc = parent.Location,
            name = name,
            ret_type = on_type,
+           ret_type_loc = Location.Default,
            parms = [fp ("left", on_type), fp ("right", on_type)],
            typarms = [],
            tenv = TyVarEnv (DeclaringType.Manager));

Modified: nemerle/trunk/ncc/hierarchy/ClassMembers.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/ClassMembers.n	(original)
+++ nemerle/trunk/ncc/hierarchy/ClassMembers.n	Tue Nov  7 07:12:20 2006
@@ -1026,6 +1026,7 @@
 
     fun_header = Fun_header (
       ret_type = bind (f.header.ret_type),
+      ret_type_loc = f.header.ret_type.Location,
       typarms = typarms,
       name = this.name,
       parms = parms,

Modified: nemerle/trunk/ncc/typing/TypedTree.n
==============================================================================
--- nemerle/trunk/ncc/typing/TypedTree.n	(original)
+++ nemerle/trunk/ncc/typing/TypedTree.n	Tue Nov  7 07:12:20 2006
@@ -213,6 +213,7 @@
     public mutable name : string;
     public id : int;
     public mutable ret_type : TyVar;
+    public mutable ret_type_loc : Location;
     public mutable parms : list [Fun_parm];
     public mutable typarms : list [StaticTyVar];
     public tenv : TyVarEnv;
@@ -249,13 +250,16 @@
     public this (loc : Location, 
                  name : string, 
                  ret_type : TyVar, 
+                 ret_type_loc : Location,
                  parms : list [Fun_parm], 
                  typarms : list [StaticTyVar], 
                  tenv : TyVarEnv)
     {
       base (loc);
+
       this.name = name;
       this.ret_type = ret_type;
+      this.ret_type_loc = ret_type_loc;
       this.parms = parms;
       this.typarms = typarms;
       this.tenv = tenv;

Modified: nemerle/trunk/ncc/typing/Typer.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer.n	(original)
+++ nemerle/trunk/ncc/typing/Typer.n	Tue Nov  7 07:12:20 2006
@@ -1803,6 +1803,7 @@
         def name_obj = fn.header.name.GetName ();
         def header = Fun_header (
            ret_type = current_type.BindType (tenv, fn.header.ret_type),
+           ret_type_loc = fn.header.ret_type.Location,
            typarms = typarms,
            name = name_obj.Id,
            parms = parms,

Modified: nemerle/trunk/ncc/typing/Typer2.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer2.n	(original)
+++ nemerle/trunk/ncc/typing/Typer2.n	Tue Nov  7 07:12:20 2006
@@ -468,8 +468,8 @@
           Fun_parm (Util.tmpname ("fp"), 0, ty, Modifiers.Empty, ParmKind.Normal)
         });
       def lambda_header = 
-        Fun_header (expr.loc, "_N_poly_local_lambda", ret_type, parms,
-                    [], current_fun.tenv);
+        Fun_header (expr.loc, "_N_poly_local_lambda", ret_type, Location.Default,
+                    parms, [], current_fun.tenv);
       def parms_refs =
         List.Map (parms, fun (fp : Fun_parm) {
           fp.decl =
@@ -515,8 +515,8 @@
           Fun_parm (Util.tmpname ("fp"), 0, ty, Modifiers.Empty, ParmKind.Normal)
         });
       def lambda_header = 
-        Fun_header (obj.loc, "_N_method_lambda", ret_type, parms,
-                    [], current_fun.tenv);
+        Fun_header (obj.loc, "_N_method_lambda", ret_type, Location.Default,
+                    parms, [], current_fun.tenv);
       def parms_refs =
         List.Map (parms, fun (fp : Fun_parm) {
           fp.decl =



More information about the svn mailing list