In ilasm/tests:

2005-12-14 Ankit Jain <jankit@novell.com> * dotted-names.il: Add test for class with no explicit namespace. In ilasm/codegen: 2005-12-14 Ankit Jain <jankit@novell.com> * TypeDef.cs (TypeDef.ctor): name_space can be null. svn path=/trunk/mcs/; revision=54348
mono · Dec 14, 2005 · 112c395 · 112c395
1 parent ec6a49b
commit 112c395
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/mcs/ilasm/codegen/ChangeLog b/mcs/ilasm/codegen/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-14  Ankit Jain  <jankit@novell.com>
+
+	* TypeDef.cs (TypeDef.ctor): name_space can be null.
+
 2005-12-13  Ankit Jain  <jankit@novell.com>
 
 	* TypeDef.cs (TypeDef.ctor): Ensure that 'name' contains only the last part

diff --git a/mcs/ilasm/codegen/TypeDef.cs b/mcs/ilasm/codegen/TypeDef.cs
@@ -72,14 +72,18 @@ public TypeDef (PEAPI.TypeAttr attr, string name_space, string name,
                         is_value_class = false;
                         is_enum_class = false;
 
-			int lastdot = name.LastIndexOf ('.');
+
-			if (lastdot >= 0) {
+                        int lastdot = name.LastIndexOf ('.');
-				this.name_space = name_space + "." + name.Substring (0, lastdot);
+                        if (lastdot >= 0) {
-				this.name = name.Substring (lastdot + 1);
+                                if (name_space == null || name_space == "")
-			} else {
+                                        this.name_space = name.Substring (0, lastdot);
-	                        this.name_space = name_space;
+                                else
-        	                this.name = name;
+                                        this.name_space = name_space + "." + name.Substring (0, lastdot);
-			}
+                                this.name = name.Substring (lastdot + 1);
+                        } else {
+                                this.name_space = name_space;
+                                this.name = name;
+                        }
                 }
 
                 public string Name {

diff --git a/mcs/ilasm/tests/ChangeLog b/mcs/ilasm/tests/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-14  Ankit Jain  <jankit@novell.com>
+
+	* dotted-names.il: Add test for class with no explicit namespace.
+
 2005-12-13  Ankit Jain  <jankit@novell.com>
 
 	* dotted-names.il: New. Test for dotted names in namespace, class.

diff --git a/mcs/ilasm/tests/dotted-names.il b/mcs/ilasm/tests/dotted-names.il
@@ -1,9 +1,14 @@
 //Tests dotted names (namespace, class names)
 //It should emit namespace = A.B.C and type name = D
+//For E.F, namespace = E, name = F
 
-//.assembly extern mscorlib
+.assembly extern mscorlib
-//{
+{
-//}
+}
+
+.assembly Output 
+{
+}
 
 .module Output
 
@@ -15,3 +20,9 @@
 }
 
 }
+
+.class public auto autochar sealed beforefieldinit E.F 
+       extends [mscorlib]System.Object
+{
+}
+