Changeset 176 for trunk/blade/SyntaxTree.d

Timestamp:

01/16/08 05:01:53 (8 months ago)

Author:

Don Clugston

Message:

SyntaxTree? now creates a tuple of the types. This opens the way to significant simplification of some of the code (eg, I should be able to remove the rank stuff from SyntaxTree?).

Files:

• trunk/blade/SyntaxTree.d (modified) (5 diffs)

trunk/blade/SyntaxTree.d

@@ -62 +62 @@
-{
-    char [][] symbols = replaceSymbolsWithPlaceholders(expression);
- char [] result = `AbstractSyntaxTree(` ~ mixin_getPrecedence(expression) ~ `,[`;    
+char [] result = `AbstractSyntaxTree(` ~ mixin_getPrecedence(expression) ~ `,[`;
-        
-    for(int i=0; i<symbols.length; ++i) {
-
+ 
-        result ~= `Symbol(` ~ mixin_typeOf(symbols[i])
-                      ~ `,` ~ mixin_valueOf(symbols[i])
@@ -74 +74 @@
-    result ~="])";
-    return `mixin("` ~ enquote(result) ~ `")`;
+}
+
+/**
+*  As for syntaxtreeof(), except that it creates a tuple as well as the abstract syntax tree
+*/
+char [] mixin_tupleAndSyntaxtreeof(char [] funcname, char [] expression)
+{
+    char [][] symbols = replaceSymbolsWithPlaceholders(expression);
+    char [] result = `AbstractSyntaxTree(` ~ mixin_getPrecedence(expression) ~ `,[`;
+    char [] tuple;
+        
+    for(int i=0; i<symbols.length; ++i) {
+        if (i>0) {
+            result ~= ",";
+            tuple ~= ",";
+        }
+        result ~= `Symbol(` ~ mixin_typeOf(symbols[i])
+                      ~ `,` ~ mixin_valueOf(symbols[i])
+                      ~ `,` ~ mixin_rankOf(symbols[i])
+                      ~ `,` ~ mixin_elementOf(symbols[i]) ~ `)`;
+        tuple ~= mixin_typeOfOrVoid(symbols[i]);
+    }    
+    
+    result ~="])";
+    return funcname ~ `!(mixin("` ~ enquote(tuple) ~ `"))(mixin("` ~ enquote(result) ~ `"))`;
-}
-
@@ -314 +339 @@
-}
-
+char [] mixin_typeOfOrVoid(char [] sym)
+{
+    // If sym is a function, we take its address, since
+    //   typeof(x).stringof doesn't compile if x is a function.
+    // If sym doesn't compile at all, return "void".
+    return `mixin(!is(typeof(` ~ sym ~ `))?"\"void\"" : is(typeof(` ~ sym ~ `)==function)?"` ~ enquote("typeof(&" ~ sym ~ ").stringof")~`":"` ~ enquote("typeof(" ~ sym ~ ").stringof") ~ `")`;
+}
+
-// Returns sym.stringof, with workarounds for compiler bugs
-char [] mixin_valueOf(char [] sym)
@@ -347 +380 @@
-    ~ s ~ `[0][0][0]":"` ~ s ~ `[0][0]":"` ~ s ~ `[0]":"` ~ s ~ `")`);   
-}
-
-
-//  ==== TESTS ====
@@ -366 +398 @@
-    assert(mixin(mixin_getPrecedence("(A+B)  in(C^D)"))=="(A+B)in(C^D)");
-    assert(mixin(mixin_getPrecedence("A"))=="A");
+    assert(mixin(mixin_getPrecedence("--A"))=="--A");
+//   assert(mixin(mixin_getPrecedence("A--"))=="A--"); // BUG: fails
-    
-    assert(mixin(mixin_getPrecedence("A[B,[C,D]]"))=="A[B,([C,D])]");