Changeset 159

Timestamp:

12/12/07 03:12:39 (9 months ago)

Author:

Don Clugston

Message:

Index folding visitor -- not linked into the main line yet. Minor refactoring in other modules.

Files:

• trunk/blade/BladeDemo.d (modified) (2 diffs)
• trunk/blade/BladeRank.d (modified) (2 diffs)
• trunk/blade/BladeSimplify.d (modified) (3 diffs)
• trunk/blade/BladeVisitor.d (modified) (4 diffs)
• trunk/blade/PostfixX86.d (modified) (4 diffs)

trunk/blade/BladeDemo.d

@@ -30 +30 @@
-        r[i]= q[i]*2213.3L;
-    }
-
+
+
-    real k=3.4;
-
-//    mixin(vectorize(` a += (d[2..$-1]*2.01*a[2]-another[][1])["abc".length-3..$]`));
-
+/+
-    mixin(vectorize(" a-= 2.01*(        3.04+k)*r"));
-    mixin(vectorize("q+= q*2.01"));
@@ -45 +46 @@
-    mixin(vectorize("another[0..$,1]+=6*a[0..2]"));
-    mixin(vectorize("r-=another[0]"));
-
+
-    // Parses OK, but I don't think I'll support this.
-//    mixin(vectorize("a+=6*another[1,[1,$]]"));
-
-
-// Parses, and simplifies to A*A, where A = dot(q,q). No codegen yet.

trunk/blade/BladeRank.d

@@ -117 +117 @@
-    char [] rank;
-static:
-
-'$'
-
+[] 
+"$"
+[0]
-    }
-    ReturnType onVisitFunction(This this_, char [] func, char [][] args) {
@@ -146 +146 @@
-    }
-    // Includes multi-dimensional slicing and indexing.    
-] startSlice, char [][] endSlice
+2][] slices
-        int totrank = doVisit(this_, base);
-endSlice
-tartSlice[i
+slices
+lices[i][0
-            if (r!=0) return (r<0)? r :RankError.NonScalarIndex; 
-endSlice[i
+slices[i][1
-                --totrank;
-            } else {
-endSlice[i
+slices[i][1
-                if (r!=0) return (r<0)?r:RankError.NonScalarSlice; 
-            }

trunk/blade/BladeSimplify.d

@@ -29 +29 @@
-
-public import blade.SyntaxTree : AbstractSyntaxTree, Symbol;
-//
+
-private import blade.BladeRank : exprLength, exprRank, subexprRank,
-        hasScalarMultiply, getRankErrorText, isStrided; 
@@ -336 +336 @@
-RevisedExpression simplifyVectorExpression(char [] expr, char [] rank, Symbol[] symTable=[])
-{
+//    char [] s = exprSimplify(foldIndices(expr, rank), rank, "", "");
-    char [] s = exprSimplify(expr, rank, "", "");
-    if (s.length>1 && s[0]=='(') s = s[1..$-1]; // strip off ()
-    char [][] comp;
-=
+ = 
-                  // of the name, or - if not used.
-    for (int i=0; i<rank.length; ++i) used ~= "-";
@@ -420 +421 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/blade/BladeVisitor.d

@@ -20 +20 @@
-V.ReturnType beginVisit(V)(V visitor, char [] expr)
-{
-
-
-
+
+
-    } else return doVisit(visitor, "(" ~ expr ~ ")");
-}
@@ -34 +33 @@
-    if (expr.length>1 && expr[0]=='(') expr = expr[1..$-1];
-    else if (expr.length==1 && ((expr[0]>='A' && expr[0]<='Z') || expr[0]=='$')){
-[0]
+
-    }
-    if (expr.length>3 && (expr[0]>='a' && expr[1]<='z') && expr[1]=='(') { // function
@@ -65 +64 @@
-    if (op=="[") {
-        right = right[0..$-1];
-
-
-
-
+
-        int z = 0;
-        while (z<right.length) {
-
-
-
-
-
-
-
-
+
+
+
-            } else {
-
-
+
+
+
+
+
+
+
+
+
+
-             }
-        }
-
-
+
-    }
-//    printf("%.*s\t%.*s\t%.*s\n", op, left, right);
-    return visitor.onVisitBinaryOp(visitor, op, left, right);
-}
@@ -119 +116 @@
-    assert(0, "BLADE ICE: " ~ s);   
-}
+
+/* Wrap parentheses around the expression, if required
+*/
+char [] wrapInParens(char [] a)
+{
+    return (a.length==1)? a : "(" ~ a ~ ")";
+}

trunk/blade/PostfixX86.d

@@ -38 +38 @@
-    char [] ranklist;
-static:
-
- ~ ""
+[] 
+
-    }
-    ReturnType onVisitFunction(This this_, char [] func, char [][] args) {
@@ -50 +50 @@
-        assert(0, "BLADE ICE: Unsupported");
-    }
-] startSlice, char [][] endSlice
+2][] slices
-        assert(0, "BLADE ICE: Unsupported");
-    }
@@ -110 +110 @@
-    char [] ranklist;
-static:
-
- ~ ""
+[] 
+
-    }
-    ReturnType onVisitFunction(This this_, char [] func, char [][] args) {
@@ -122 +122 @@
-        assert(0, "BLADE ICE: Unsupported");
-    }
-] startSlice, char [][] endSlice
+2][] slices
-        assert(0, "BLADE ICE: Unsupported");
-    }