Changeset 1185

Timestamp:

06/02/08 20:43:54 (7 months ago)

Author:

asterite

Message:

More porting...

Files:

• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/AddrExp.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ArrayScopeSymbol.java (modified) (9 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CallExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Dsymbol.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/PostBlitDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/PtrExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ScopeDsymbol.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/SymOffExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/VarDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/VarExp.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/port.txt (modified) (2 diffs)

trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java

@@ -23 +23 @@
-import static descent.internal.compiler.parser.PROT.PROTprotected;
-
-STClazy
+*
-import static descent.internal.compiler.parser.STC.STCout;
-import static descent.internal.compiler.parser.STC.STCref;
-
-TOKarray
+*
-import static descent.internal.compiler.parser.TOK.TOKassocarrayliteral;
-import static descent.internal.compiler.parser.TOK.TOKdelegate;
@@ -1087 +1087 @@
-        return getNodeType();
-    }
+    
+    /*************************************
+     * If variable has a const initializer,
+     * return that initializer.
+     */
+
+    public static Expression expandVar(int result, VarDeclaration v,
+            SemanticContext context) {
+        Expression e = null;
+        if (v != null
+                && (v.isConst() || v.isInvariant() || (v.storage_class & STCmanifest) != 0)) {
+            Type tb = v.type.toBasetype(context);
+            if ((result & WANTinterpret) != 0
+                    || (v.storage_class & STCmanifest) != 0
+                    || (tb.ty != Tsarray && tb.ty != Tstruct)) {
+                if (v.init != null) {
+                    if (v.inuse != 0) {
+                        // goto L1;
+                        return e;
+                    }
+                    Expression ei = v.init.toExpression(context);
+                    if (null == ei) {
+                        // goto L1;
+                        return e;
+                    }
+                    if (ei.op == TOKconstruct || ei.op == TOKblit) {
+                        AssignExp ae = (AssignExp) ei;
+                        ei = ae.e2;
+                        if (ei.isConst() != true && ei.op != TOKstring) {
+                            // goto L1;
+                            return e;
+                        }
+                        if (ei.type != v.type) {
+                            // goto L1;
+                            return e;
+                        }
+                    }
+                    if (v.scope != null) {
+                        v.inuse++;
+                        e = ei.syntaxCopy(context);
+                        e = e.semantic(v.scope, context);
+                        e = e.implicitCastTo(v.scope, v.type, context);
+                        v.scope = null;
+                        v.inuse--;
+                    } else if (null == ei.type) {
+                        // goto L1;
+                        return e;
+                    } else {
+                        // Should remove the copy() operation by
+                        // making all mods to expressions copy-on-write
+                        e = ei.copy();
+                    }
+                } else {
+                    // goto L1;
+                    return e;
+                }
+                if (e.type != v.type) {
+                    e = e.castTo(null, v.type, context);
+                }
+                e = e.optimize(result, context);
+            }
+        }
+        //L1: 
+        return e;
+    }
+
-
-    /*************************************
@@ -1092 +1158 @@
-     * return that initializer.
-     */
-
-
+
+static 
-            SemanticContext context) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }

trunk/descent.core/src/descent/internal/compiler/parser/AddrExp.java

@@ -8 +8 @@
-import static descent.internal.compiler.parser.TOK.TOKint64;
-import static descent.internal.compiler.parser.TOK.TOKstar;
-
+
+
-import static descent.internal.compiler.parser.TY.Tbit;
-import static descent.internal.compiler.parser.TY.Tfunction;
@@ -103 +104 @@
-        Expression e;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // Convert &ex to ex
-        if (e1.op == TOKstar) {
@@ -121 +145 @@
-            if (!ve.var.isOut() && !ve.var.isRef()
-                    && !ve.var.isImportedSymbol()) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -133 +163 @@
-                integer_t index = ae.e2.toInteger(context);
-                VarExp ve = (VarExp) ae.e1;
-
-
+
+
+
+
+
+
+
+
+
+
-                    TypeSArray ts = (TypeSArray) ve.type;
-                    integer_t dim = ts.dim.toInteger(context);
@@ -149 +187 @@
-                        }
-                    }
-
-
+
+
+
+
+
+
+
-                    e.type = type;
-                    return e;

trunk/descent.core/src/descent/internal/compiler/parser/ArrayScopeSymbol.java

@@ -6 +6 @@
-
-import static descent.internal.compiler.parser.STC.STCconst;
+import static descent.internal.compiler.parser.STC.STCstatic;
-
-import static descent.internal.compiler.parser.TOK.TOKarrayliteral;
@@ -13 +14 @@
-import static descent.internal.compiler.parser.TOK.TOKtuple;
-import static descent.internal.compiler.parser.TOK.TOKtype;
+import static descent.internal.compiler.parser.TOK.TOKvar;
-
-import static descent.internal.compiler.parser.TY.Ttuple;
@@ -21 +23 @@
-    public TypeTuple type; // for tuple[length]
-    public TupleDeclaration td; // for tuples of objects
+    public Scope sc;
-
-    public ArrayScopeSymbol(Expression e) {
+        this(null, e);
+    }
+    
+    public ArrayScopeSymbol(Scope sc, Expression e) {
-        Assert.isTrue(e.op == TOK.TOKindex || e.op == TOK.TOKslice);
-
+
+
-    }
-
-    public ArrayScopeSymbol(TupleDeclaration s) {
+        this(null, s);
+    }
+    
+    public ArrayScopeSymbol(Scope sc, TupleDeclaration s) {
-        this.exp = null;
-        this.type = null;
-        this.td = s;
+        this.sc = sc;
-    }
-
-    public ArrayScopeSymbol(TypeTuple t) {
+        this(null, t);
+    }
+    
+    public ArrayScopeSymbol(Scope sc, TypeTuple t) {
-        this.exp = null;
-        this.type = t;
-        this.td = null;
+        this.sc = sc;
-    }
-
@@ -75 +93 @@
-                            Type.tsize_t);
-                    v.init = new ExpInitializer(Loc.ZERO, e);
-
+
+
+
+
+
+
-                    return v;
-                }
@@ -85 +108 @@
-                            .size(), Type.tsize_t);
-                    v.init = new ExpInitializer(Loc.ZERO, e);
-
+
+
+
+
+
+
-                    return v;
-                }
@@ -126 +154 @@
-                    VarDeclaration v = new VarDeclaration(loc, Type.tsize_t,
-                            Id.dollar, null);
+                    
+                    if (context.isD2()) {
+                        if (ce.op == TOKvar) { // if ce is const, get its initializer
+                            ce = fromConstInitializer(
+                                    WANTvalue | WANTinterpret, ce, context);
+                        }
+                    }
-
-                    if (ce.op == TOKstring) {
@@ -131 +166 @@
-                                ((StringExp) ce).len, Type.tsize_t);
-                        v.init = new ExpInitializer(Loc.ZERO, e);
-
+
+
+
+
+
-                    } else if (ce.op == TOKarrayliteral) {
-                        /* It is for an array literal, so the
@@ -140 +179 @@
-                                Type.tsize_t);
-                        v.init = new ExpInitializer(Loc.ZERO, e);
-
+
+
+
+
+
-                    } else if (ce.op == TOKtuple) {
-                        Expression e = new IntegerExp(loc, ((TupleExp) ce).exps
-                                .size(), Type.tsize_t);
-                        v.init = new ExpInitializer(loc, e);
-
+
+
+
+
+
-                    }
-
@@ -156 +203 @@
-                    }
-                }
+                
+                if (context.isD2()) {
+                    pvar.semantic(sc, context);
+                }
+                
-                // TODO semantic I think this logic is ok
-                // return *pvar;

trunk/descent.core/src/descent/internal/compiler/parser/CallExp.java

@@ -165 +165 @@
-
-        e1 = e1.optimize(result, context);
-
+
+
+
+
+
+
+
+
+
-            FuncDeclaration fd = ((VarExp) e1).var.isFuncDeclaration();
-            if (fd != null) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/descent.core/src/descent/internal/compiler/parser/Dsymbol.java

@@ -321 +321 @@
-    }
-    
+    public boolean isOverloadable() {
+        return false;
+    }
+    
-    public OverloadSet isOverloadSet() {
-        return null;
@@ -326 +330 @@
-
-    public Package isPackage() {
+        return null;
+    }
+    
+    public PostBlitDeclaration isPostBlitDeclaration() {
-        return null;
-    }

trunk/descent.core/src/descent/internal/compiler/parser/PostBlitDeclaration.java

@@ -66 +66 @@
-    
-    @Override
+    public PostBlitDeclaration isPostBlitDeclaration() {
+        return this;
+    }
+    
+    @Override
-    public boolean isVirtual(SemanticContext context) {
-        return false;

trunk/descent.core/src/descent/internal/compiler/parser/PtrExp.java

@@ -115 +115 @@
-        }
-        
+        if (context.isD2()) {
+            if (e1.op == TOKsymoff) {
+                SymOffExp se = (SymOffExp) e1;
+                VarDeclaration v = se.var.isVarDeclaration();
+                Expression e = expandVar(result, v, context);
+                if (e != null && e.op == TOKstructliteral) {
+                    StructLiteralExp sle = (StructLiteralExp) e;
+                    e = sle.getField(type, se.offset.intValue(), context);
+                    if (e != EXP_CANT_INTERPRET)
+                        return e;
+                }
+            }
+        }
+        
-        return this;
-    }

trunk/descent.core/src/descent/internal/compiler/parser/ScopeDsymbol.java

@@ -156 +156 @@
-    @Override
-    public Dsymbol search(Loc loc, char[] ident, int flags, SemanticContext context) {
-        Dsymbol s;
-        int i;
-
-        // Look in symbols declared in this module
-
+Dsymbol 
-        if (s != null) {
-        } else if (imports != null && !imports.isEmpty()) {
+            OverloadSet a = null;
+            
-            // Look in imported modules
-   i = -1;
-ScopeDsymbol ss : imports
-i++
+loop:
+int i = 0; i < imports.size(); i++
+ScopeDsymbol ss = imports.get(i)
-                Dsymbol s2;
-
@@ -192 +191 @@
-                                .isImport() == null
-                                && i2.parent.isImport() == null && ASTDmdNode.equals(i1.ident, i2.ident))))) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            break;
-                        }
@@ -198 +231 @@
-                }
-            }
+
+            if (context.isD2()) {
+                /* Build special symbol if we had multiple finds
+                 */
+                if (a != null) {
+                    a.push(s);
+                    s = a;
+                }
+            }
+            
-            if (s != null) {
-                Declaration d = s.isDeclaration();
-
-
+
+
+
+
+
+
+
-                    if (context.acceptsProblems()) {
-                        context.acceptProblem(Problem.newSemanticTypeError(
@@ -232 +280 @@
-     * Returns NULL if not found
-     */
-
+public 
-        Dsymbol s = search_function(this, Id.getmembers, context);
-        FuncDeclaration fdx = s != null ? s.isFuncDeclaration() : null;
@@ -241 +289 @@
-        return fdx;
-    }
+    
+    /***************************************
+     * Determine number of Dsymbols, folding in AttribDeclaration members.
+     */
+    public static int dim(Array members) {
+        int n = 0;
+        if (members != null) {
+            for (int i = 0; i < size(members); i++) {
+                Dsymbol s = (Dsymbol) members.get(i);
+                AttribDeclaration a = s.isAttribDeclaration();
+
+                if (a != null) {
+                    n += dim(a.decl);
+                } else {
+                    n++;
+                }
+            }
+        }
+        return n;
+    }
+    
+    /***************************************
+     * Get nth Dsymbol, folding in AttribDeclaration members.
+     * Returns:
+     *  Dsymbol*    nth Dsymbol
+     *  NULL        not found, *pn gets incremented by the number
+     *          of Dsymbols
+     */
+    public static Dsymbol getNth(Array members, int nth, int[] pn) {
+        if (null == members)
+            return null;
+
+        int[] n = { 0 };
+        for (int i = 0; i < size(members); i++) {
+            Dsymbol s = (Dsymbol) members.get(i);
+            AttribDeclaration a = s.isAttribDeclaration();
+
+            if (a != null) {
+                s = getNth(a.decl, nth - n[0], n);
+                if (s != null)
+                    return s;
+            } else if (n[0] == nth)
+                return s;
+            else
+                n[0]++;
+        }
+
+        if (pn != null) {
+            pn[0] += n[0];
+        }
+        return null;
+    }
-
-}

trunk/descent.core/src/descent/internal/compiler/parser/SymOffExp.java

@@ -34 +34 @@
-    }
-    
+    public SymOffExp(Loc loc, Declaration var, int offset, boolean hasOverloads, SemanticContext context) {
+        // TODO SEMANTIC
+        this(loc, var, new integer_t(offset), context);
+    }
+
-    @Override
-    public void accept0(IASTVisitor visitor) {

trunk/descent.core/src/descent/internal/compiler/parser/VarDeclaration.java

@@ -56 +56 @@
-    public Object csym;
-    public Object isym;
+    public Scope scope;
-    
-    private IField javaElement;

trunk/descent.core/src/descent/internal/compiler/parser/VarExp.java

@@ -18 +18 @@
-
-    public Declaration var;
+    public boolean hasOverloads;
-
-    public VarExp(Loc loc, Declaration var) {
@@ -149 +150 @@
-    public Expression optimize(int result, SemanticContext context)
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-

trunk/descent.core/src/descent/internal/compiler/parser/port.txt

@@ -23 +23 @@
-declaration.c
-declaration.h
-dsymbol.c
-dsymbol.h
-enum.c
-enum.h
@@ -40 +38 @@
-mtype.h
-opopver.c
-
+ --> CastExp::optimize
-statement.c
-statement.h