Changeset 210

Timestamp:

07/06/06 15:25:30 (2 years ago)

Author:

Don Clugston

Message:

Refactoring nameof and demangle, to make it closer to library standard.

Files:

• trunk/meta/demangle.d (modified) (21 diffs)
• trunk/meta/nameof.d (modified) (10 diffs)

trunk/meta/demangle.d

@@ -4 +4 @@
- */
- 
-
+
+
+
+
- a 'demangle' metafunction, which returns a const char [],
- and a 'Consumed' metafunction, which returns an integer, the number of characters which
@@ -10 +13 @@
-*/
-
-
-
-
+
+
+
-enum MangledNameType
-{
-
-
-
-
-
-
+
+
+
+
+
+**************
- * Pretty-prints a mangled type string.
- */
-template demangleType(char[] str, MangledNameType wantQualifiedNames = MangledNameType.PrettyName)
-{
-   
-       
-       
-           
-       
-   
+    
+        
+        
+            
+        
+    
-        const char [] demangleType = demangleType!(str[1..$], wantQualifiedNames) ~ "[]";
-    else static if (str[0] == 'H')   // associative array
-        const char [] demangleType 
-           
-           
+            
+            
-    else static if (str[0] == 'G') // static array
-        const char [] demangleType
-           
-           
+            
+            
-    else static if (str[0]=='C')
-           
+        
-    else static if (str[0]=='S')
-        const char [] demangleType = "struct " ~ prettyLname!(str[1..$], wantQualifiedNames); 
@@ -49 +52 @@
-        const char [] demangleType = "typedef " ~ prettyLname!(str[1..$], wantQualifiedNames); 
-    else static if (str[0]=='D' && str.length>2 && isMangledFunction!(( str[1] )) ) // delegate
-       
+        
-    else static if (str[0]=='P' && str.length>2 && isMangledFunction!(( str[1] )) ) // function pointer
-       
+        
-    else static if (str[0]=='P') // only after we've dealt with function pointers
-        const char [] demangleType = demangleType!(str[1..$], wantQualifiedNames) ~ "*";
-    else static if (str[0]=='F')
-       
+        
-    else const char [] demangleType = demangleBasicType!(str);  
-}
@@ -103 +106 @@
-    else static if (str[0]=='H')
-        const int demangleTypeConsumed = 1 + demangleTypeConsumed!(str[1..$]) 
-           
+            
-    else static if (str[0]=='G')
-        const int demangleTypeConsumed = 1 + countLeadingDigits!(str[1..$])
@@ -112 +115 @@
-        const int demangleTypeConsumed = 1 + demangleTypeConsumed!(str[1..$]);     
-    else static if (str[0]=='C' || str[0]=='S' || str[0]=='E' || str[0]=='T')
-
-
-
+
+
-        const int demangleTypeConsumed = 1 + demangleParamListAndRetValConsumed!(str[1..$]);     
-}
-       
+
+        
-}
-
@@ -154 +156 @@
-template pretty_Dname(char [] str, int dotnameconsumed, MangledNameType wantQualifiedNames)
-{
-
-
-
-
-
-
-
+
+
+
-    } else {
-
-
-
+
+
+
+
+
+
+
+
-}
-
-// Deal with the case where an Lname contains an embedded ("__D") function.
-// Split into a seperate function because it's so complicated.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    } else static if (wantQualifiedNames == MangledNameType.QualifiedName) {
-       // Qualified names
-       const char [] pretty_Dfunction = getDot
-           
+        // Qualified name
+        const char [] pretty_Dfunction = getQualified
+            
-    } else {  // symbol name
-       
-           const char [] pretty_Dfunction = getDot
-       
-           
-   
+        
+            const char [] pretty_Dfunction = getQualified
+        
+            
+    
- }
-
@@ -191 +195 @@
-template get_DnameConsumed(char [] str)
-{
-   const int get_DnameConsumed = 2 + getDot
-           + demangleTypeConsumed!(str[2+getDot
+    const int get_DnameConsumed = 2 + getQualified
+        + demangleTypeConsumed!(str[2+getQualifed
-}
-
@@ -199 +203 @@
-template prettyLname(char [] str, MangledNameType wantQualifiedNames)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -220 +225 @@
-{
-    static if (str.length==0)
-       
+        
-    else static if (str.length<=10 || !isdigit!( (str[1]) ) )
-        const int getLnameConsumed = 1 + str[0]-'0';
@@ -226 +231 @@
-        const int getLnameConsumed = (str[0]-'0')*10 + str[1]-'0' + 2;
-    else
-       
+        
-}
-
-template getQualifiedName(char [] str, MangledNameType wantQualifiedNames, char [] dotstr = "")
-{
-// main() is a special case, it isn't qualified by a module.
-//    static if (str.length>4 && dotstr="" && str[0..4] == "main")
-    static if (str.length==0) const char [] getQualifiedName="";
+    else static if (str.length>2 && str[0]=='_' && str[1]=='D')
+        const char [] getDotName = getQualifiedName!(str[2..$], wantQualifiedNames);
-    else static if (isdigit!(( str[0] ))) {
-        static if (str[getLnameConsumed!(str)..$].length>0) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else const char [] getQualifiedName = "";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -286 +286 @@
-template demangleFunctionOrDelegate(char [] str, char [] funcOrDelegStr, MangledNameType wantQualifiedNames)
-{
-    
-           
-           
-    
-    
+
+        
+        
+
+
-}
-
@@ -297 +297 @@
-template demangleFunctionParamType(char[] str, MangledNameType wantQualifiedNames)
-{
-   
-       
-   
-       
-   
+    
+        
+    
+        
+    
-}
-
@@ -307 +307 @@
-template demangleFunctionParamTypeConsumed(char[] str)
-{
-   
-       
-   
+    
+        
+    
-}
-
@@ -315 +315 @@
-template isMangledFunction(char c)
-{
-   
+    
-}
-
-template demangleExtern(char c)
-{
-   
-   
-   
-   
-   
-   
+    
+    
+    
+    
+    
+    
-}
-
@@ -333 +333 @@
-{
-    static assert(str.length>=1, "Demangle error(Function): No return value found");
-   
+    
-        const char[] demangleReturnValue = demangleType!(str[1..$], wantQualifiedNames);
-    else const char [] demangleReturnValue = demangleReturnValue!(str[demangleFunctionParamTypeConsumed!(str)..$], wantQualifiedNames);
@@ -346 +346 @@
-        const char [] demangleParamList = commastr ~ "...";
-    else
-
+
+
-            ~ demangleParamList!(str[demangleFunctionParamTypeConsumed!(str)..$], wantQualifiedNames, ", ");
-}
@@ -393 +394 @@
-    else static if (str[0]=='V') // value
-        const char [] prettyTemplateArg = 
-           
-           
+            
+            
-    else static if (str[0]=='T') // type
-        const char [] prettyTemplateArg = demangleType!(str[1..$], wantQualifiedNames);
@@ -406 +407 @@
-    else static if (str[0]=='V') // value
-        const int templateArgConsumed = 1 + demangleTypeConsumed!(str[1..$]) + 
-           
+            
-    else static if (str[0]=='T') // type
-        const int templateArgConsumed = 1 + demangleTypeConsumed!(str[1..$]);
@@ -427 +428 @@
-{
-    static assert(str.length>0, "No Z found at end of template argument list");
-   
+    
-        const int templateArgListConsumed = 1;
-    else
@@ -449 +450 @@
-
-extern (Windows) {
-   
+    
-}
-extern (Pascal) {
-   
+    
-}
-extern (C) {
-   
+    
-}
-extern (C++) {
-   
+    
-}
-
@@ -471 +472 @@
-template ComplexTemplate(real a, creal b)
-{
-   
+    
-}
-

trunk/meta/nameof.d

@@ -1 +1 @@
-/**
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- */
-module meta.nameof;
@@ -27 +36 @@
-    }
-
-   
-   
-   
-   
-               
-   
+    
+    
+    
+    
+                
+    
-
-// If the identifier is "MyIdentifier" and this module is "QualModule"
@@ -71 +80 @@
-
-
-
+
+
- */
-template manglednameof(alias A)
-{
-   static if (rawmanglednameof!(A).length - pointerstartlength - pointerendlength <= 99+2
-       // the length of the template argument requires 2 byte
-       
+    static if (rawmanglednameof!(A).length - pointerstartlength <= 100 + 1
+        // the length of the template argument requires 2 character
+        
-             rawmanglednameof!(A)[ pointerstartlength + 2 .. $ - pointerendlength];
-   
-       
+    
+        
-             rawmanglednameof!(A)[ pointerstartlength + 3 .. $ - pointerendlength];
-}
-
-
-
+
+
+
+
+
-template prettynameof(alias A)
-{
@@ -91 +104 @@
-}
-
-
+
+
- * example: "int function(double, char[])"
- */
@@ -111 +125 @@
-}
-
-
+
+
- *
- * eg. "myfunc"
@@ -121 +136 @@
-
-//----------------------------------------------
-
+            
-//----------------------------------------------
-
@@ -164 +179 @@
-
-static assert( prettynameof!(SomeInt)
-   
+    
-static assert( qualifiednameof!(OuterClass) == THISFILE ~".OuterClass");
-static assert( symbolnameof!(SomeInt) == "SomeInt");
-
-static assert( prettynameof!(inner!( MyInt!(68u) ))
-   
-    
+    
+ 
-static assert( prettynameof!(ClassTemplate!(OuterClass.SomeClass))
-   
- 
+    
+  
-
-// Extern(D) declarations have full type information.
@@ -184 +199 @@
-// Extern(Windows) declarations contain no type information.
-extern (Windows) {
-   
-   
+    
+    
-}
-
@@ -195 +210 @@
-
-extern (Windows) {
-// "Gad! You think of everything." - Ned Seagoon
-// "No! Sometimes I forget aardvarks." - Major Denis Bloodnok.
-template aardvark(X) {
-   
-       
-       
-           
-       
-       
-       
-       
-   
+    
+        
+        
+            
+        
+        
+        
+        
+    
-}
-
@@ -214 +227 @@
-// Corner case #2: template inside function. This is currently possible only with mixins.
-template fox(B, ushort C) {
-   
+    
-}
-
-void wolf() {
-       
-       
-       
-       
-
-
-
+        
+        
+        
+        
+
+
+