Changeset 102

Timestamp:

05/01/07 02:24:53 (1 year ago)

Author:

Don Clugston

Message:

Numerous small changes to Blade 0.2.
Added mixin form, which will become Blade 0.3

Files:

• trunk/blade/Blade.d (modified) (4 diffs)
• trunk/blade/BladeMixin.d (added)
• trunk/blade/BladeParse.d (modified) (1 diff)
• trunk/blade/CodegenX87.d (modified) (9 diffs)

trunk/blade/Blade.d

@@ -243 +243 @@
-// of the types in the tuple.
-
-// Create a string representing the type A.
-// Pure imaginary types are treated identically to pure reals, since they result in the
-// same asm code.
+template fpTypeToString(A)
+{
+    static if (is(A==real) || is(A==ireal)|| is(A==creal))  const char [] fpTypeToString="R";
+    else static if (is(A==double) || is(A==idouble) || is(A==cdouble)) const char [] fpTypeToString="D";
+    else static if (is(A==float) || is(A==ifloat) || is(A==cfloat))    const char [] fpTypeToString="F";
+}
+
+// Create a string representing the type A.
-template singleTypeToString(A)
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -264 +270 @@
-template vectorTupleToString(X...)
-{
-//
-//
-
-
+
+
+//
+//
-}
-
@@ -280 +286 @@
-        if (raw[i]=='\0') {
-            char [] a;
+/*
-            switch(raw[start..i]) {
-                case (ifloat[]).stringof:
@@ -302 +309 @@
-//                  a = "??" ~ raw[start..i]; break;
-            }
-
+
+
+
+
-    }
-    return s;

trunk/blade/BladeParse.d

@@ -18 +18 @@
-    return s;
-}
+
+bool isDigit(char c) { return c>='0' && c<='9'; }
+bool isHexDigit(char c) { return c>='0' && c<='9' || c>='a' && c<='f' || c>='A' && c<='F'; }
+bool isAlpha(char c) {
+    return (c>='a' && c<='z') || (c>='A' && c<='Z');
+}
+// Underscores allowed
+bool isUnderscoreDigit(char c) { return c=='_' || c>='0' && c<='9'; }
+bool isUnderscoreHexDigit(char c) { return c=='_' || c>='0' && c<='9' || c>='a' && c<='f' || c>='A' && c<='F'; }
+bool isUnderscoreAlpha(char c) {
+    return c=='_' || (c>='a' && c<='z') || (c>='A' && c<='Z');
+}
+
+unittest {
+    assert(isHexDigit('9'));
+}
+
+// Extract a D identifier. Return the remainder of the string.
+char [] parseIdentifier(char [] s, out char [] rest)
+{
+    int i=0;
+    if (!isUnderscoreAlpha(s[0])) { assert(0, "Identifier expected"); return "";}
+    while (i<s.length && (isUnderscoreAlpha(s[i])||isDigit(s[i]))) ++i;
+    char [] ident=s[0..i];
+    while (i<s.length && s[i]==' ') ++i; // skip trailing spaces
+    rest = s[i..$];
+    return ident;
+}
+
+char [] parseNumber(char [] s, out char[] rest)
+{
+    int k=0;
+    while(k<s.length && isDigit(s[k])) ++k;
+    if (k<s.length-1 && s[k]=='.' && s[k+1]!='.') {
+        ++k;
+        while(k<s.length && isDigit(s[k])) ++k;
+        if (k<s.length && s[k]=='e') { ++k;
+            if (k<s.length && (s[k]=='+' || s[k]=='-')) ++k;
+            while(k<s.length && isDigit(s[k])) ++k;
+        }
+        if (k<s.length && (s[k]=='L' || s[k]=='f')) ++k;
+    }
+    char [] ident = s[0..k];
+    int i=k;
+    while (i<s.length && s[i]==' ') ++i; // skip trailing spaces
+    rest = s[i..$];
+    return ident;
+}
+
+char [] parseOperator(char [] s, out char [] rest)
+{
+    int i=1;
+    if (s[0]=='+' || s[0]=='-' || s[0]=='*') {
+        if (s.length>1 && s[1]=='=') ++i;
+        int k=i;
+        while (k<s.length && s[k]==' ') ++k; // skip trailing spaces
+        rest = s[k..$];
+        return s[0..i];
+    } else {
+        assert(0, `Operator expected, not "` ~ s~ `"`);
+        return "";
+    }
+}
+
+char [] parseQualifiedName(char [] s, out char[] rest)
+{
+    char [] r;
+    char [] id = parseIdentifier(s, r);
+    while (r.length>0 && r[0]=='.') {
+        int i;
+        for (i=1; r[i]==' '; ++i) {}
+        id ~= "." ~ parseIdentifier(r[i..$], r);
+    }
+    rest=r;
+    return id;
+}
+
-
-// Some functions to grab information from the typestring.

trunk/blade/CodegenX87.d

@@ -20 +20 @@
-}
-
+int operatorLength(char [] s)
+{
+    if (s[1]=='=') return 2; else return 1;
+}
+
-// Converts an infix string into postfix. Also strips off the # symbols.
-// Apply x87-specific optimisations during the conversion.
@@ -28 +33 @@
-
-    int x = exprLength(operations);
+    int y = x + 2; // end of the operator
+    if (operations[y]=='=') ++y; // Support +=, -=, *=, /=.
-    char [] first = operations[0..x+1];
-x+2
+y
-    if (first[0]=='(') {
-        first = makePostfixForX87(first[1..first.length-1], typelist);
@@ -35 +42 @@
-    if (second[0]=='(') {
-        second = makePostfixForX87(second[1..second.length-1], typelist);
-x+3
+y+1
-
-    // x87 OPTIMISATION #1
@@ -48 +55 @@
-    if (operations[x+1]=='+') {
-        if (second[second.length-1]=='*'&& first[first.length-1]!='*') {
-x+2
+y
-        }
-    }
@@ -67 +74 @@
-           return second ~ first ~ "_";
-    }
-x+2
+y
-}
-
@@ -126 +133 @@
-char [] operandSize(char [] typestr)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-static if (real.sizeof==10)      const char [] REALSIZE = "10";
@@ -153 +150 @@
-char [] vectorSize(char [] typestr)
-{
-
-"VD"
-"VF"
-"VR"
+[1]
+'D'
+'F'
+'R'
-    }
-}
@@ -380 +377 @@
-      if (isInstruction(operations[done])) {
-            // Perform an arithemetic operation on the top two FPU stack items.
-(operations[done])
+[operations[done]]
-            mainbody ~= next; firstbody ~= next;
-            ++done;
@@ -398 +395 @@
-             // 80-bit vectors must be loaded onto the FPU stack first
-            next = "  fld real ptr ["  ~ vectorRegister[vectorNum(typelist, operations[done])] ~ "];\n"
-(operations[done+1])
+[operations[done+1]]
-         } else {
-(operations[done+1])
+[operations[done+1]]
-              ~ indexedVector(typelist, operations[done] ) ~ ";\n";
-        }