Changeset 150

Timestamp:

11/29/07 03:11:11 (4 years ago)

Author:

Don Clugston

Message:

Strided array accesses are now parsed OK, and dimensionality errors are detected. (But there's no codegen support yet).

Files:

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

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"));
-
-
+
+
+
-    writefln("a=", a);
-}

trunk/blade/BladeRank.d

@@ -1 +1 @@
-//  Written in the D programming language 1.0
+//  Part of BLADE : Basic Linear Algebra D Expressions
-/**
-Part of BLADE : Basic Linear Algebra D Expressions
+ Determine the tensor rank of an expression.
-*
-*/
@@ -100 +101 @@
-    RankMismatch = -8,
-    RankMismatchConcatenation = -9,
-
+
+
+
-}
-
@@ -114 +117 @@
-            "Dimensionality mismatch (addition or subtraction)",
-            "Dimensionality mismatch in concatenation",
-
+
+
+
+
-}
-
@@ -153 +159 @@
-    // Deal with unary operators
-    if (expr[0]=='+' || expr[0]=='-') return subexprRank(expr[1..$], rank);
-//    if (expr[0]=='~' || expr[0]=='*') { return 0; }
-    
-    int x = exprLength(expr);
+    if (expr[0]=='[') { // array literal
+        if (x!=expr.length-1) return RankError.ExtraCharsAfterArrayLiteral;
+        expr = expr[1..$-1];
+        x = exprLength(expr);
+        int lrank = subexprRank(expr[0..x+1], rank);
+        while (x<expr.length-1) {
+            if (expr[x+1]!=',') return RankError.CommaExpected;
+            expr = expr[x+2.. $];
+            x = exprLength(expr);
+            int rrank = subexprRank(expr[0..x+1], rank);
+            if (lrank!=rrank) return RankError.ArrayLiteralRankMismatch;
+        }
+        return lrank+1;
+    }
-    int y = x+1;
-    // Deal with shifts, op=, and NCEG operators
@@ -163 +182 @@
-    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);
@@ -185 +201 @@
-                // 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 (rrank<0) return rrank;
-                if (rrank>1) return RankError.NonScalarIndex;
-                if (rrank==0) --totrank;
-
-
+
-                if (z==right.length-1) return totrank;
-                right = right[z+2..$];
@@ -239 +255 @@
-
-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);
@@ -255 +269 @@
-    assert(exprRank("d(A)", "1")==RankError.CommaExpected);
-    assert(exprRank("d(A,B)", "10")==RankError.RankMismatchDotProduct);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-bool hasScalarMultiply(char [] expr, char [] rank)
-{

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/BladeUtil.d

@@ -1 +1 @@
-//  Written in the D programming language 1.0
-/**
-string utility 
+
-* BLADE 0.3Alpha -- Basic Linear Algebra D Expressions
-*/
@@ -42 +42 @@
-    for(int i=0; i<instr.length; ++i) {
-        if (instr[i]=='"' || instr[i]=='\\') {
-=
+ = 
-            int m = i;
-            foreach(int k, char c; instr[i+1..$]) {

trunk/blade/SyntaxTree.d

@@ -344 +344 @@
-//  ==== SEMANTIC PASS ====
-
-, with workarounds for compiler bugs
+.
-char [] mixin_typeOf(char [] sym)
-{
-
-
+
+
+
-    return `mixin(!is(typeof(` ~ sym ~ `))?"\"\"" : is(typeof(` ~ sym ~ `)==function)?"` ~ enquote("typeof(&" ~ sym ~ ").stringof")~`":"` ~ enquote("typeof(" ~ sym ~ ").stringof") ~ `")`;
-}