[svn] r7794: nemerle/trunk/ncc: misc/ExprWalker.n parsing/MainParser.n

[kliss]

Log:
Work on formatter

Author: kliss
Date: Tue Sep 11 02:08:14 2007
New Revision: 7794

Modified:
   nemerle/trunk/ncc/misc/ExprWalker.n
   nemerle/trunk/ncc/parsing/MainParser.n

Modified: nemerle/trunk/ncc/misc/ExprWalker.n
==============================================================================
--- nemerle/trunk/ncc/misc/ExprWalker.n	(original)
+++ nemerle/trunk/ncc/misc/ExprWalker.n	Tue Sep 11 02:08:14 2007
@@ -178,7 +178,7 @@
 
         | tb is TypeBuilder     => 
           Go(tb.Ast.name);
-          Go(tb.GetDirectMembers().Reverse());
+          Go(tb.GetDirectMembers()/*.Reverse()*/);
 
         | pb is PropertyBuilder => 
           unless(pb.IsAbstract)

Modified: nemerle/trunk/ncc/parsing/MainParser.n
==============================================================================
--- nemerle/trunk/ncc/parsing/MainParser.n	(original)
+++ nemerle/trunk/ncc/parsing/MainParser.n	Tue Sep 11 02:08:14 2007
@@ -873,7 +873,7 @@
 
               | Token.Keyword ("event") =>
                 shift ();
-                parse_event (tok.Location, mods, customs)
+                parse_event (start_tok.Location.FromStart(), mods, customs)
 
               | Token.Operator ("|") =>
                 shift ();
@@ -1153,7 +1153,7 @@
         name {
           add {  }
           remove { }
-          potiantially many field definitions
+          potentially many field definitions
         }
      */
     parse_event (mutable loc : Location, mods : Modifiers,
@@ -1237,22 +1237,23 @@
           def field_name = mkname (Util.tmpname (plain_name));
           def field_attrs = Modifiers (fmods, []);
           take_attributes_out (ref customs, System.AttributeTargets.Field, false, field_attrs);
-          def field = ClassMember.Field (loc, Splicable.Name (field_name), field_attrs, ret_type);
+          def generatedLoc = loc.AsGenerated();
+          def field = ClassMember.Field (generatedLoc, Splicable.Name (field_name), field_attrs, ret_type);
 
           def method_atts = Modifiers (mods.Attributes, []);                                         
           take_attributes_out (ref customs, System.AttributeTargets.Method, true, method_atts);
 
           def method_parms = [Fun_parm (val_n, ret_type, Modifiers.Empty)];
 
-          def name = Splicable.Name (loc, mkname ("add_" + plain_name));
-          def fh = Fun_header (loc, name, PExpr.Void (loc), method_parms);
+          def name = Splicable.Name (generatedLoc, mkname ("add_" + plain_name));
+          def fh = Fun_header (generatedLoc, name, PExpr.Void (generatedLoc), method_parms);
           // funbody is filled during typing
-          add = ClassMember.Function (loc, name, method_atts, fh, [], null);
+          add = ClassMember.Function (generatedLoc, name, method_atts, fh, [], null);
           add._env = env;
 
-          def name = Splicable.Name (loc, mkname ("remove_" + plain_name));
-          def fh = Fun_header (loc, name, PExpr.Void (loc), method_parms);
-          remove = ClassMember.Function (loc, name, method_atts, fh, [], null);
+          def name = Splicable.Name (generatedLoc, mkname ("remove_" + plain_name));
+          def fh = Fun_header (generatedLoc, name, PExpr.Void (generatedLoc), method_parms);
+          remove = ClassMember.Function (generatedLoc, name, method_atts, fh, [], null);
           remove._env = env;
 
           ClassMember.Event (loc, id, mods, ret_type, field, add, remove)