Changeset 148

Timestamp:

11/28/07 03:17:22 (9 months ago)

Author:

Don Clugston

Message:

More support for array literals; fixed most (but not all) of the rank determination issues for multi-index arrays.

Files:

• trunk/blade/BladeDemo.d (modified) (1 diff)
• trunk/blade/BladeRank.d (modified) (8 diffs)
• trunk/blade/BladeSimplify.d (modified) (1 diff)
• trunk/blade/SyntaxTree.d (modified) (4 diffs)

trunk/blade/BladeDemo.d

@@ -34 +34 @@
-    //mixin(vectorize("dot(q,q*dot(q,q))"));    
-    // should simplify to: dot(q.q) * dot(q,q)
-
+/*
-    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"));
+*/    
+//    mixin(vectorize("a+=d[2,[1,$]]"));
-    writefln("a=", a);
-}

trunk/blade/BladeRank.d

@@ -50 +50 @@
- * The sub-expression must be 
- *  - a single character (eg "X"), OR
-
+
+
- */
-int exprLength(char [] s)
@@ -61 +62 @@
-    }
-    int numParens = 0;
+    int numBrack = 0;
-    for (; i<s.length; ++i) {
-
-
-
-
-
-
-
+
+
+
+
+
-            return i;
-        }
@@ -83 +83 @@
-    if (expr.length==1) {
-        if (expr=="$") return 0;
+        assert(expr[0]>='A' && expr[0]<='Z', expr);
-        return rank[expr[0]-'A']-'0';
-    }
@@ -124 +125 @@
- */
-int exprRank(char [] expr, char [] rank)
-    
+
-    // BUG: also need to deal with comma, ?:, &&, ||, is, !is, in, 
-    // unary &, unary !
@@ -159 +160 @@
-    while (expr[y+1]=='<' || expr[y+1]=='>' || expr[y+1]=='=') ++y;    
-
-    
+
-    char [] left = expr[0..x+1];
-    char [] right = expr[y+1..$];
+    if (expr[0]=='[') { // array literal
+        assert(0, expr);
+    }
-    if (expr[x+1]=='[') right = expr[y+1..$-1]; // drop off the ']'.
-    int lrank = subexprRank(left, rank);
@@ -178 +182 @@
-        } else if (right[z+1]==',') {
-            int totrank = lrank;
-
+
+
+
-                int rrank = subexprRank(right[0..z+1], rank);
-                if (rrank<0) return rrank;
-                if (rrank>1) return RankError.NonScalarIndex;
-                if (rrank==0) --totrank;
+                if (rrank==1) assert(0, right);
-                
-                if (z==right.length-1) return totrank;
-                right = right[z+2..$];
-                
-                z = exprLength(right);
-~ "#" ~right[z+2..$]
-
+
+while (true);
-        } else {
-            // slicing -- does not change the rank
@@ -233 +239 @@
-
-unittest {    
+//    assert(exprRank("A[B,[B,C],B]", "600")==4);
+//    const y = exprRank("A+=(B[C,$])", "1100");
-    assert(exprRank("A+((((++B)+D)--)*C)", "1010")==1);
-    assert(exprRank("A+(B*C)", "000")==0);
@@ -248 +256 @@
-    assert(exprRank("d(A,B)", "10")==RankError.RankMismatchDotProduct);
-    assert(exprRank("d(B,(A*(d(B,B))))", "11")==0);
-
+
+
-}
-

trunk/blade/BladeSimplify.d

@@ -61 +61 @@
-    else {
-        char [] expr2 = removeDuplicates(tree);
+        assert(0, ranks);
-        // Check for rank errors
-        int wholerank = exprRank(expr2, ranks);

trunk/blade/SyntaxTree.d

@@ -29 +29 @@
-*
-* An unmatched ] in the expression generates a garbage error message after the
-
+; this is a compiler bug
-*
-* NOTES:
@@ -276 +276 @@
-    preOp!("++") opAddAssign(T:int=int)(int x){ return null; }
-    preOp!("--") opSubAssign(T:int=int)(int x){ return null; }  
-/*
-  static if (text.length==0) {
-    AST!("[" ~ T.text ~ ".." ~ U.text ~ "]") opSlice(T, U)(T x, U y){ return null; }    
-    AST!("[" ~ AllText!(T) ~ "]") opIndex(T...)(T x){ return null; }
-  } else {     
-*/      
-    AST!("(" ~ text ~ "[" ~ T.text ~ ".." ~ U.text ~ "])") opSlice(T, U)(T x, U y){ 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; }
-    AST!("(" ~ text ~ "(" ~ AllText!(T) ~ "))") opCall(T...)(T){ return null; }
@@ -316 +309 @@
- *    
- *   Bugs:
- 
+
- *      unary operators & !
- *      && and || operators
- *      ?:
- *      $ not really supported: a[$-1] should be replaced by a[a.length-1]
- *      Comparison and NCEG floating point operators
- *      cast
@@ -327 +319 @@
- */
-char [] mixin_getPrecedence(char [] expr)
-
+    
-    if (expr.length<2) return "`" ~ expr ~ "`";
+    // The scheme doesn't work directly for array literals. Instead, change them
+    // into opIndex of a nameless `` symbol.
-    bool lastWasSymbol=false; // hack for array literals
-    char [] code = "typeof(";