Changeset 103

Timestamp:

05/01/07 07:26:17 (1 year ago)

Author:

Don Clugston

Message:

Now checks vector lengths and semantics, and actually generates D code.

Files:

• trunk/blade/BladeMixin.d (modified) (8 diffs)

trunk/blade/BladeMixin.d

@@ -1 +1 @@
-/** BLADE 0.3 -- vector expressions using mixins
+* Using mixins gives extraordinary potential for optimisation of the generated code.
+* It is possible to detect aliases, and resolve compile-time constants.
-*
+* Terminology:
+* A "CTFE macro" is a function, executed at compile time, which returns a char []
+* containing source code to be mixed in.
+* A "CTFE expression macro" is a CTFE macro with parameters (char [] expression, char [][2][] symbol)
+* where all terminal symbols in the expression (symbols or literals) are replaced with placeholders
+* #a, #b, ... which index into the Symbol array. Eg, for #c, the type is symbol['c'-'a'][0],
+* and the value is symbol['c'-'a'][1].
-*
-*/
@@ -25 +34 @@
-}
-
-
-
+
+2][
-{
-    char [] result = "";
-    for(int i=0; i<symbols.length; ++i) {
-        if (i>0) result ~=",";
-"typeof(" ~ symbols[i] ~ ")"
+symbols[i][0]
-    }
-    result ~="";
-    return result;
-}
-
-char [] mixin_valueTuple(char [][] symbols)
-{
-    char [] result = "";
-    for(int i=0; i<symbols.length; ++i) {
-        if (i>0) result ~=",";
-        result ~= "" ~ symbols[i] ~ "";
-    }
-    result ~="";
-    return result;
-}
-
-/*
-char [] mixin_typeTuple(char [][2][] symbols)
-{
-    char [] result = "";
-    for(int i=0; i<symbols.length; ++i) {
-        if (i>0) result ~=",";
-        result ~= symbols[i][0]; //"typeof(" ~ symbols[i] ~ ")";
-    }
-    result ~="";
-    return result;
-}
-*/
-
-/** Parse a string to construct an expression tree, using normal D syntax.
@@ -118 +103 @@
-    parseExpression("(any)+=(((((any)*(yx))*(c))+(((((32.145e31f)*(yx))*(any.length))*(test.extra))*(big)))-(big))", exprTree);
-    assert(exprTree=="#a+=((((#b*#c)*#d)+((((#e*#f)*#g)*#h)*#i))-#j)", exprTree);
-
-    char [] expr = "#a+=(((#a*#b)*#c)+((((#d*#b)*#e)*#c)*#f))-#f";
-}
-
@@ -150 +133 @@
-        else newvalues ~= newvalues[k];
-    }
+    // Update the expression
-    char [] newexpr=expr[0..1];
-    for (int i=1; i<expr.length; ++i) {
@@ -181 +165 @@
-}
-
-char [] determineVectorLength(Symbol[] symbols)
-{
-    char [] result="";
-    char [] first;
-    char [] knownlength="";
-    bool bFirst=true;
-    for (int i=0; i<symbols.length; ++i) {
-        if (isArray(symbols[i][0])) {
-            if (!isDynamicArray(symbols[i][0]))
-                knownlength=symbols[i][1] ~".length";
-            if (bFirst) {
-                first = symbols[i][1] ~".length";
-                bFirst=false;
-            } else {
-                if (result!="") result ~= " && ";
-                result ~= "(" ~ symbols[i][1] ~".length == "~ first ~")";
-            }
-        }
-    }
-    if (knownlength=="") return first; else return knownlength;
-//    return result;
-}
-
-//--------------------------
-public import std.stdio;
-
-// Normal function (not CTFE or mixin) which will be called at run-time.
-// prints all symbols used in the expression
-void do_describe(char [] expr, Symbol[] symbols, int x)
-{
-    char [] result = "Expression:" ~ expr ~ "\n\tTYPE\t\tVALUE\n";
-    for (int i=0; i<symbols.length; ++i) {
-        result ~= "#" ~ cast(char)('a'+i) ~ "\t" ~ symbols[i][0] ~ " \t" ~ symbols[i][1] ~ \n;
-    }
-    printf("%.*s\n Length=%d", result, x);
-}
-
-
-// Returns a string, which, when mixed in, will produce the value described in s.
-
-char [] MixinOf(A)(A[] symbols)
-{
@@ -242 +187 @@
-}
-
-
-
-
+
+
+
+
+
-{
-    removeDuplicatesFromExpression(expr, symbols);
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -267 +204 @@
-//  char [] macroname(char [] syntaxtree, char [][2][] symboltable)
-// and it must return a char [] of the text to be mixed in.
-
-
+
+
+
+
-    char [] expr;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -283 +360 @@
-
-double extra = 3.8;
+
-void main()
-{
-
-auto
-
-i
+double []
+4
+
-
-    alias extra c;
-
-    // For now, parentheses must be used around each element. Yes, it's disgusting.
-+
+
-    printf(\n);
-}