Changeset 176 for trunk/blade/BladeVisitor.d

Timestamp:

01/16/08 05:01:53 (11 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/BladeVisitor.d (modified) (4 diffs)

trunk/blade/BladeVisitor.d

@@ -20 +20 @@
-V.ReturnType beginVisit(V)(V visitor, char [] expr)
-{
-exprLength(expr)==expr.length
- // 
+isSimpleExpr(expr)
+
-    } else return doVisit(visitor, "(" ~ expr ~ ")");
-}
@@ -127 +127 @@
-}
-
+// Return true if the function is a single variable, or an intrinsic.
+bool isSimpleExpr(char [] s)
+{
+    if (s.length==1) return true;
+    if (s[0]<'a' || s[0]>'z') return false;
+    return exprLength(s)==s.length;
+}
+
-unittest {
-    assert(exprLength("A*B")==1);
@@ -142 +150 @@
-bool expressionContainsAssignment(char [] expr)
-{
+    if (isSimpleExpr(expr)) return false;
-    // BUG: also need to deal with comma, ?:, &&, ||, is, !is, in, 
-    // unary &, unary !
-    if (expr.length>1 && expr[0]=='(') expr = expr[1..$-1];
-    else if (expr.length==1 && ((expr[0]>='A' && expr[0]<='Z') || expr[0]=='$')){
-        return false;
-    }
-    if (expr.length>3 && (expr[0]>='a' && expr[1]<='z')) { // function
-        return false;
-    }
-    if (expr.length>2 && (expr[0..2]=="++" || expr[0..2]=="--")) {
-        return false;
@@ -158 +161 @@
-    }
-    if (expr.length>2 && (expr[$-2..$]=="++" || expr[$-2..$]=="--")) {
-is
+_is_
-    }
-    int y = exprLength(expr);