Changeset 258

Timestamp:

09/01/06 09:53:17 (2 years ago)

Author:

Don Clugston

Message:

For DMD 0.166 -- now demangles lazy parameters and lazy variadics.

Files:

• trunk/meta/demangle.d (modified) (27 diffs)

trunk/meta/demangle.d

@@ -3 +3 @@
- *
- */
-
+
-module meta.demangle;
-private import meta.ctype;
@@ -35 +35 @@
-        else {
-            static assert(0, "Demangle error: type '" ~ str ~ "' does not contain a qualified name");
-        
+
-    } else static if (str[0] == 'A') // dynamic array
-        const char [] demangleType = demangleType!(str[1..$], wantQualifiedNames) ~ "[]";
-    else static if (str[0] == 'H')   // associative array
- 
- 
+
+
-            ~ "[" ~ demangleType!(str[1..1+(demangleTypeConsumed!(str[1..$]))], wantQualifiedNames) ~ "]";
-    else static if (str[0] == 'G') // static array
-        const char [] demangleType
- 
+
-            ~ "[" ~ str[1..1+countLeadingDigits!(str[1..$]) ] ~ "]";
-    else static if (str[0]=='C')
-        const char [] demangleType = "class " ~ prettyLname!(str[1..$], wantQualifiedNames);
-    else static if (str[0]=='S')
- 
+
-    else static if (str[0]=='E')
- 
+
-    else static if (str[0]=='T')
- 
+
-    else static if (str[0]=='D' && str.length>2 && isMangledFunction!(( str[1] )) ) // delegate
-        const char [] demangleType = demangleFunctionOrDelegate!(str[1..$], "delegate ", wantQualifiedNames);
@@ -62 +62 @@
-    else static if (str[0]=='F')
-        const char [] demangleType = demangleFunctionOrDelegate!(str, "", wantQualifiedNames);
-  
+
-}
-
@@ -73 +73 @@
-    // possibly a bug in the D name mangling algorithm?
-    else static if (str == "x") const char [] demangleBasicType = "bool";
-
+
-    // integral types
-    else static if (str == "g") const char [] demangleBasicType = "byte";
@@ -87 +87 @@
-    else static if (str == "d") const char [] demangleBasicType = "double";
-    else static if (str == "f") const char [] demangleBasicType = "float";
-
+
-    else static if (str == "j") const char [] demangleBasicType = "ireal";
-    else static if (str == "p") const char [] demangleBasicType = "idouble";
-    else static if (str == "o") const char [] demangleBasicType = "ifloat";
-
+
-    else static if (str == "c") const char [] demangleBasicType = "creal";
-    else static if (str == "r") const char [] demangleBasicType = "cdouble";
@@ -99 +99 @@
-    else static if (str == "u") const char [] demangleBasicType = "wchar";
-    else static if (str == "w") const char [] demangleBasicType = "dchar";
-
+
-    else static assert(0, "Demangle Error: '" ~ str ~ "' is not a recognised basic type");
-}
@@ -108 +108 @@
-        const int demangleTypeConsumed = 1 + demangleTypeConsumed!(str[1..$]);
-    else static if (str[0]=='H')
- 
+
-            + demangleTypeConsumed!(str[1+demangleTypeConsumed!(str[1..$])..$]);
-    else static if (str[0]=='G')
@@ -116 +116 @@
-        const int demangleTypeConsumed = 2 + demangleParamListAndRetValConsumed!(str[2..$]);
-    else static if (str[0]=='P') // only after we've dealt with function pointers
-     
+
-    else static if (str[0]=='C' || str[0]=='S' || str[0]=='E' || str[0]=='T')
-        const int demangleTypeConsumed = 1 + getQualifiedNameConsumed!(str[1..$]);
-    else static if (str[0]=='F' && str.length>1)
-     
+
-    else // it's a Basic Type
-        const int demangleTypeConsumed = 1;
@@ -151 +151 @@
-        const char [] getLname = str[2..((str[0]-'0')*10 + str[1]-'0'+ 2)];
-    else static if (str.length <= 999+3 || !isdigit!( (str[3]) ))
- 
+
-            str[3..((str[0]-'0')*100 + (str[1]-'0')*10 + str[2]-'0' + 3)];
-    else
- 
+
-            str[4..((str[0]-'0')*1000 + (str[1]-'0')*100 + (str[2]-'0')*10 + (str[3]-'0') + 4)];
-}
@@ -167 +167 @@
-    } else {
-        static if (wantQualifiedNames == MangledNameType.PrettyName) {
- 
+
-                demangleType!(str[2+dotnameconsumed..$], wantQualifiedNames)
-                ~ " " ~ getQualifiedName!(str[2..$], wantQualifiedNames);
-        } else {
-      
+
-        }
-    }
@@ -182 +182 @@
-{
-    static if (wantQualifiedNames == MangledNameType.PrettyName) {
- 
+
-            demangleFunctionOrDelegate!(str[2 + dotnameconsumed .. 3 + dotnameconsumed + paramlistconsumed],
-                getQualifiedName!(str[2..2+dotnameconsumed], wantQualifiedNames), wantQualifiedNames)
@@ -188 +188 @@
-            ~ getQualifiedName!(str[3 + dotnameconsumed + paramlistconsumed .. $], wantQualifiedNames, ".");
-    } else static if (wantQualifiedNames == MangledNameType.QualifiedName) {
-    
+
-        const char [] pretty_Dfunction = getQualifiedName!(str[2..2+dotnameconsumed], wantQualifiedNames)
-            ~ getQualifiedName!(str[3 + dotnameconsumed + paramlistconsumed .. $], wantQualifiedNames, ".");
@@ -202 +202 @@
-template get_DnameConsumed(char [] str)
-{
- 
+
-        + demangleTypeConsumed!(str[2+getQualifedNameConsumed!(str[2..$])..$]);
-}
@@ -221 +221 @@
-    else static if (str.length>2 && str[0..2] == "_D") {
-        const char [] prettyLname = pretty_Dname!(str, getQualifiedNameConsumed!(str[2..$]), wantQualifiedNames);
- 
+
-        const char [] prettyLname = getQualifiedName!(str[0..getQualifiedNameConsumed!(str)], wantQualifiedNames);
-    else const char [] prettyLname = str;
@@ -238 +238 @@
-    else static if (str.length <= (999+3) || !isdigit!( (str[3]) ))
-        const int getLnameConsumed = (str[0]-'0')*100 + (str[1]-'0')*10 + str[2]-'0' + 3;
- 
+
-        const int getLnameConsumed = (str[0]-'0')*1000 + (str[1]-'0')*100 + (str[2]-'0')*10 + (str[3]-'0') + 4;
-}
@@ -289 +289 @@
-template demangleFunctionOrDelegate(char [] str, char [] funcOrDelegStr, MangledNameType wantQualifiedNames)
-{
- 
+
-        ~ demangleReturnValue!(str[1..$], wantQualifiedNames)
-        ~ " " ~ funcOrDelegStr ~ "("
@@ -297 +297 @@
-
-// Special case: types that are in function parameters
-out' or 'inout'. 
+lazy', 'out' or 'inout'.
-template demangleFunctionParamType(char[] str, MangledNameType wantQualifiedNames)
-{
-
+
+
+
-        const char [] demangleFunctionParamType = "inout " ~ demangleType!(str[1..$], wantQualifiedNames);
-    else static if (str[0]=='J')
@@ -310 +312 @@
-template demangleFunctionParamTypeConsumed(char[] str)
-{
-) 
+ || str[0]=='L')
-        const int demangleFunctionParamTypeConsumed = 1 + demangleTypeConsumed!(str[1..$]);
-    else const int demangleFunctionParamTypeConsumed = demangleTypeConsumed!(str);
@@ -336 +338 @@
-{
-    static assert(str.length>=1, "Demangle error(Function): No return value found");
-
+ || str[0]=='X'
-        const char[] demangleReturnValue = demangleType!(str[1..$], wantQualifiedNames);
-    else const char [] demangleReturnValue = demangleReturnValue!(str[demangleFunctionParamTypeConsumed!(str)..$], wantQualifiedNames);
@@ -348 +350 @@
-    else static if (str[0] == 'Y')
-        const char [] demangleParamList = commastr ~ "...";
+    else static if (str[0]=='X') // lazy ...
+        const char[] demangleParamList = commastr ~ "...";
-    else
- 
+
-            demangleFunctionParamType!(str[0..demangleFunctionParamTypeConsumed!(str)], wantQualifiedNames)
-            ~ demangleParamList!(str[demangleFunctionParamTypeConsumed!(str)..$], wantQualifiedNames, ", ");
@@ -358 +362 @@
-{
-    static assert (str.length>0, "Demangle error(ParamList): No return value found");
-
+ || str[0]=='X'
-        const int demangleParamListAndRetValConsumed = 1 + demangleTypeConsumed!(str[1..$]);
-    else {
- 
+
-            + demangleParamListAndRetValConsumed!(str[demangleFunctionParamTypeConsumed!(str)..$]);
-    }
@@ -396 +400 @@
-        const char [] prettyTemplateArg = prettyLname!(str[1..$], wantQualifiedNames);
-    else static if (str[0]=='V') // value
- 
+
-            demangleType!(str[1..1+demangleTypeConsumed!(str[1..$])], wantQualifiedNames)
-            ~ " = " ~ prettyValueArg!(str[1+demangleTypeConsumed!(str[1..$])..$]);
@@ -409 +413 @@
-        const int templateArgConsumed = 1 + getLnameConsumed!(str[1..$]);
-    else static if (str[0]=='V') // value
- 
+
-            templateValueArgConsumed!(str[1+demangleTypeConsumed!(str[1..$])..$]);
-    else static if (str[0]=='T') // type
@@ -422 +426 @@
-    static if (str[0]=='Z')
-        const char[] prettyTemplateArgList = "";
- 
+
-       const char [] prettyTemplateArgList = commastr
-            ~ prettyTemplateArg!(str[0..templateArgConsumed!(str)], wantQualifiedNames)
@@ -434 +438 @@
-        const int templateArgListConsumed = 1;
-    else
- 
+
-            + templateArgListConsumed!(str[templateArgConsumed!(str)..$]);
-}
@@ -451 +455 @@
-idouble SomeFunc2(inout ushort u, ubyte w) { return -3i; }
-byte[] SomeFunc3(out dchar d, ...) { return null; }
+ifloat SomeFunc4(lazy void[] x...) { return 2i; }
+char[dchar] SomeFunc5(lazy int delegate()[] z...);
-
-extern (Windows) {
@@ -464 +470 @@
-    typedef cfloat function (wchar) CPPFunc;
-}
+
+interface SomeInterface {}
-
-static assert( demangleType!((&SomeFunc).mangleof) == "ireal function (ushort)" );
-static assert( demangleType!((&SomeFunc2).mangleof) == "idouble function (inout ushort, ubyte)");
-static assert( demangleType!((&SomeFunc3).mangleof) == "byte[] function (out dchar, ...)");
+static assert( demangleType!((&SomeFunc4).mangleof) == "ifloat function (lazy void[], ...)");
+static assert( demangleType!((&SomeFunc5).mangleof) == "char[dchar] function (lazy int delegate ()[], ...)");
-static assert( demangleType!((WinFunc).mangleof)== "extern (Windows) void function (double, long)");
-static assert( demangleType!((PascFunc).mangleof) == "extern (Pascal) short[wchar] delegate (bool, ...)");
-static assert( demangleType!((CFunc).mangleof) == "extern (C) dchar delegate ()");
-static assert( demangleType!((CPPFunc).mangleof) == "extern (C++) cfloat function (wchar)");
+// Interfaces are mangled as classes
+static assert( demangleType!(SomeInterface.mangleof) == "class " ~ THISFILE ~ ".SomeInterface");
-
-template ComplexTemplate(real a, creal b)