Changeset 209

Timestamp:

07/06/06 07:05:40 (2 years ago)

Author:

Don Clugston

Message:

Finally, symbolof!() works!

Files:

• trunk/meta/demangle.d (modified) (1 diff)
• trunk/meta/nameof.d (modified) (5 diffs)

trunk/meta/demangle.d

@@ -239 +239 @@
-                static if (getLnameConsumed!(str)==str.length) {
-                    const char [] getQualifiedName = prettyLname!(getLname!(str), wantQualifiedNames);
-
+
+
+
-           } else {
-           // Qualified and pretty names

trunk/meta/nameof.d

@@ -99 +99 @@
-}
-
-
-/**
- * Returns the qualified name of the symbol A.
@@ -160 +159 @@
-static assert( prettytypeof!(OuterClass.SomeClass) == "class " ~ THISFILE ~".OuterClass.SomeClass");
-
+// Test that it works with module names (for example, this module)
+static assert( qualifiednameof!(meta.nameof) == "meta.nameof");
+static assert( symbolnameof!(meta.nameof) == "nameof");
+
-static assert( prettynameof!(SomeInt)
-    == "enum " ~ THISFILE ~ ".SomeEnum " ~ THISFILE ~ ".SomeInt");
-static assert( qualifiednameof!(OuterClass) == THISFILE ~".OuterClass");
-//
+
-
-static assert( prettynameof!(inner!( MyInt!(68u) ))
-    ==  "class " ~ THISFILE ~ ".inner!(" ~ THISFILE ~ ".MyInt!(uint = 68)).inner");
+static assert( symbolnameof!(inner!( MyInt!(68u) )) ==  "inner");
-static assert( prettynameof!(ClassTemplate!(OuterClass.SomeClass))
-    == "class "~ THISFILE ~ ".ClassTemplate!(class "~ THISFILE ~ ".OuterClass.SomeClass).ClassTemplate");
+static assert( symbolnameof!(ClassTemplate!(OuterClass.SomeClass))  == "ClassTemplate");
-
-// Extern(D) declarations have full type information.
@@ -175 +180 @@
-static assert( prettynameof!(pig) == "int " ~ THISFILE ~ ".pig()");
-static assert( prettynameof!(pog) == "int " ~ THISFILE ~ ".pog");
+static assert( symbolnameof!(pig) == "pig");
-
-// Extern(Windows) declarations contain no type information.
@@ -197 +203 @@
-            ~ THISFILE ~ ".OuterClass).aardvark(short).wolf");
-        static assert(qualifiednameof!(wolf)== THISFILE ~ ".aardvark.aardvark.wolf");
+        static assert( symbolnameof!(wolf) == "wolf");
-        return 3;
-        }
@@ -214 +221 @@
-        static assert(prettynameof!(fox)== "class void " ~ THISFILE ~ ".wolf().fox!(cfloat, int = 21).fox");
-        static assert(qualifiednameof!(fox)== THISFILE ~ ".wolf.fox.fox");
-
-
-
+
+
+
+