Changeset 151

Timestamp:

11/30/07 02:14:47 (9 months ago)

Author:

Don Clugston

Message:

Now parsing and rank analysis supports combined slice & indices -- eg [1,2..4,5]. Categorisation step not yet implemented.

Files:

• trunk/blade/BladeDemo.d (modified) (2 diffs)
• trunk/blade/BladeRank.d (modified) (3 diffs)
• trunk/blade/BladeSimplify.d (modified) (3 diffs)
• trunk/blade/SyntaxTree.d (modified) (9 diffs)

trunk/blade/BladeDemo.d

@@ -14 +14 @@
-// Use heap-allocated arrays, or static arrays (DMD 1.023 or later)
-// cdouble[] always remains aligned, even when sliced.
+
-
-   
@@ -40 +41 @@
-    mixin(vectorize("q+= q*2.01"));
-  
-
-
+
+
+
+
-    writefln("a=", a);
-}

trunk/blade/BladeRank.d

@@ -84 +84 @@
-    if (expr.length==1) {
-        if (expr=="$") return 0;
-
+"BLADE ICE: " ~ 
-        return rank[expr[0]-'A']-'0';
-    }
@@ -199 +199 @@
-            int totrank = lrank;
-            do {
-                // allow rank of 1 to be a slice operation
-                // (so A[1,[2,$-1], $] is possible).
-//                if (z>1) assert(0, right[0..z+1]);
-                int rrank = subexprRank(right[0..z+1], rank);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-                if (z==right.length-1) return totrank;
@@ -275 +291 @@
-    assert(exprRank("A[B,(([B,C])[B]),B]", "600")==3);
-    assert(exprRank("A+=(B[C..$])", "110")==1);
+    assert(exprRank("A+=(B[C,D..$])", "2300")==2);
-}
-

trunk/blade/BladeSimplify.d

@@ -249 +249 @@
-}
-
-/+
-// return true if the given symbol has a non-zero stride.
-
+
+
-bool isStrided(char [] s)
-{
@@ -257 +257 @@
-   if (s[$-2..$]=="[]") return false;
-   int numbrack=0;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            numbrack++;
-        }
-
-
-
-
+
+
+
+
+
+
+
+
-   }
+   return false;
-}
-
-unittest {
-    assert(!isStrided("A[3..5][]"));
-
-
-
-
+
+
+
+
+
+
-
-RevisedExpression simplifyVectorExpression(char [] expr, char [] rank)
@@ -337 +350 @@
-        } else f ~= c;
-    }
-
-    return RevisedExpression(f, comp, old_ranks~r, mapping);
-}
-
-
+
+
-    assert(exprSimplify("A+=(((D[E])*B)[E])", "103300","","")=="(A+=(B* {D[E][E]} ))");
-    assert(exprSimplify("A+=(B*((C[B])[B..E]))", "103300","","")=="(A+=(B* {C[B][B..E]} ))");

trunk/blade/SyntaxTree.d

@@ -111 +111 @@
-//  ==== LEXER ====
-
-
+non-value, non-type 
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    foreach(char [] s; keywords) {
@@ -176 +177 @@
-            }
-             // The next character is NOT part of the symbol.
-
+NonType
-                code ~= symbol; // non-type keywords are NOT symbols
-                symbol="";
@@ -231 +232 @@
-operation was performed. This gives the associativity and precedence rules
-which the compiler used.
+
+Extension: This code allows opSlice and opIndex to be mixed, even though it is
+not yet allowed in normal D code.
-*/
-class AST(char [] expr)
@@ -276 +280 @@
-    preOp!("++") opAddAssign(T:int=int)(int x){ return null; }
-    preOp!("--") opSubAssign(T:int=int)(int x){ return null; }  
-
+
+
-    AST!("(" ~ text ~ "[" ~ AllText!(T) ~ "])") opIndex(T...)(T x){ return null; }
-    AST!("((" ~ text ~ "[" ~ AllText!(T) ~ "])=" ~ U.text ~ ")") opIndexAssign(U, T...)(U,T){ return null; }
@@ -286 +291 @@
-    preOp!("-") opNeg(dummy=void)(){ return null; }
-    preOp!("*") opStar(dummy=void)(){ return null; }  // D2.0 only
+
-    postOp!("[]") opSlice(dummy=void)(){ return null; }
-    static if (text.length>3 && text[$-3..$]!="++)" && text[$-3..$]!="--)") {
@@ -301 +307 @@
-    static if (T.length==0) const char [] AllText = "";
-    else static if (T.length==1) const char [] AllText = T[0].text;
+    else static if (T.length>2 && T[1].text=="..") // Convert back to a slice
+        const char [] AllText = T[0].text ~ ".." ~ AllText!(T[2..$]);
-    else const char [] AllText = T[0].text ~ "," ~ AllText!(T[1..$]);
-}
@@ -329 +337 @@
-                code ~= "(cast(AST!(`" ~ expr[i] ~"`))(null))";
-                lastWasSymbol = true;
-
+                
-                if (!lastWasSymbol && expr[i]=='[') {
-                    code ~= "(cast(AST!(``))(null))";
@@ -336 +344 @@
-                    && expr[i]!= '\n' && expr[i]!=')') lastWasSymbol = false;
-                if (expr[i]==']') lastWasSymbol=true;
-
+
+
+
+
+
-            }
-        }
@@ -407 +419 @@
-    
-    assert(mixin(mixin_getPrecedence("A[B,[C,D]]"))=="A[B,([C,D])]");
+    assert(mixin(mixin_getPrecedence("A[B,C..D]"))=="A[B,C..D]");
-    assert(mixin(mixin_getPrecedence("A[B][C,D]"))=="(A[B])[C,D]");
-    assert(mixin(mixin_getPrecedence("A[B,([C,D])]"))=="A[B,([C,D])]");