* ILParser.jay: Pass null Location when adding class, concat dottedName pieces

svn path=/trunk/mcs/; revision=12297

diff --git a/mcs/ilasm/parser/ChangeLog b/mcs/ilasm/parser/ChangeLog
index 18dbeff3a28bc4f10d9f79a3aa90cd60a28a6e07..d025c08cf24b9fab3d63105d72abd4895b4cb557 100644 (file)
--- a/mcs/ilasm/parser/ChangeLog
+++ b/mcs/ilasm/parser/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILParser.jay: Pass null Location when adding class, concat dottedName pieces
+
 2003-03-06 Jackson Harper <jackson@latitudegeo.com>
 
        * ILParser.jay: Reconfigure to work with new PEAPI emission system

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index d29ec2d9bbcf10a311d94fd1d8ac47188f8a9601..ab384c54f77783d7f37a1d96add6a9cdf5f3726a 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -449,7 +449,7 @@ classHead               : D_CLASS type_attr id extendsClause implClause
                                currentClass = new Class ($3 as string);\r
                                currentClass.Attrs = currentTypeAttrs;\r
                                */\r
-                               codegen.AddClass ((TypeAttr)$2, (string) $3);\r
+                               codegen.AddClass ((TypeAttr)$2, (string) $3, null);\r
                                // TODO: extends/implemets\r
                        }\r
                        ;\r
@@ -584,7 +584,7 @@ internal_type_ref   : name1
                        ;\r
 \r
 external_type_ref      : assembly_name namespace_name DOT id\r
-                         { \r
+                         {\r
                                AssemblyRef asmb_ref;\r
                                asmb_ref = codegen.PEFile.AddExternAssembly ((string) $1);\r
                                $$ = asmb_ref.AddClass ($2 as string, $4 as string);\r
@@ -1096,7 +1096,7 @@ dottedName                : id DOT id     {$$ = ($1 as string) + "." + ($3 as string);}
 \r
 name1                   : id\r
                        | dottedName\r
-                       | name1 DOT name1\r
+                       | name1 DOT name1       {$$ = String.Format ("{0}.{1}", $1, $3); }\r
                        ;\r
 \r
 call_name              : \r