Changeset 1223

Timestamp:

07/12/08 14:05:38 (2 months ago)

Author:

asterite

Message:

Updated to DMD 1.033

Files:

• trunk/descent.core/src/descent/core/compiler/IProblem.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ArrayLiteralExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/CallExp.java (modified) (6 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CompileDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CompileStatement.java (modified) (6 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CompoundStatement.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ConditionalStatement.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Constfold.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/CtorDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/DotVarExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Dsymbol.java (modified) (6 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/EnumDeclaration.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Expression.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncDeclaration.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncLiteralDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Id.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/IntegerExp.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Problem.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.properties (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/STC.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ScopeDsymbol.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/StaticCtorDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/StaticDtorDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/StructDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/SuperExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateInstance.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateMixin.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ThisExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Type.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeClass.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeQualified.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeStruct.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeTypeof.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypedefDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeidExp.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/object1.d (deleted)
• trunk/descent.core/src/descent/internal/compiler/parser/object2.d (deleted)
• trunk/descent.core/src/descent/internal/compiler/parser/port.txt (modified) (1 diff)
• trunk/descent.core/template/problem/problems.txt (modified) (2 diffs)
• trunk/descent.debug.core/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.debug.core/plugin.xml (modified) (1 diff)
• trunk/descent.debug.core/src/descent/internal/debug/core/model/gdb/GdbDebugger.java (modified) (3 diffs)
• trunk/descent.debug.ui/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.launching/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.tests/descent/tests/mangling/SignatureParameterCount_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/mangling/SignatureParameterTypes_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/mangling/SignatureReturnType_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/mangling/SignatureToCharArray_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/mangling/SignatureToType_Test.java (modified) (2 diffs)
• trunk/descent.ui-feature/feature.xml (modified) (1 diff)
• trunk/descent.ui.astviewer/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui.metrics/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui/src/descent/ui/JavaElementLabels.java (modified) (2 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/ui/OpenModuleAction.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/ui/TraceUtil.java (modified) (2 diffs)

trunk/descent.core/src/descent/core/compiler/IProblem.java

@@ -683 +683 @@
-    int WithoutThisCannotBeConstInvariant = 472;
-    int CannotModifySymbol = 473;
+    int CannotCallPublicExportFunctionFromInvariant = 474;
+    int TemplateMemberFunctionNotAllowedInInterface = 475;
+    int ArgumentToTypeofIsNotAnExpression = 476;
-
-}

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

@@ -815 +815 @@
-                    }
-                    if (!gotoL2) {
-
+
+
-                        arguments.add(arg);
-                        nargs++;
@@ -962 +963 @@
-                if (tb.ty == Tsarray) {
-                    TypeSArray ts = (TypeSArray) tb;
-b
+s
-                    if (ts.size(arg.loc, context) == 0) {
-                        arg = new NullExp(arg.loc);
@@ -2016 +2017 @@
-    
-            if (ad != null
-.ty == Tstruct && ((TypeStruct) t.next
+Of().ty == Tstruct && ((TypeStruct) t.nextOf()
-                    && !(t.ty == Tstruct && ((TypeStruct) t).sym == ad)) {
-                ClassDeclaration cd = ad.isClassDeclaration();
@@ -2026 +2027 @@
-    
-                        e1 = new DotVarExp(loc, e1, tcd.vthis);
-
+
+
-    
-                        // Skip over nested functions, and get the enclosing
-                        // class type.
-
-
+
+
+
-                            FuncDeclaration f = s.isFuncDeclaration();
-                            if (f.vthis != null) {
+                                n++;
-                                e1 = new VarExp(loc, f.vthis);
-                            }
@@ -2040 +2044 @@
-                        if (s != null && s.isClassDeclaration() != null) {
-                            e1.type = s.isClassDeclaration().type;
+                            if (n > 1) {
+                                e1 = e1.semantic(sc, context);
+                            }
+                        } else {
+                            e1 = e1.semantic(sc, context);
-                        }
-                        e1 = e1.semantic(sc, context);
-                        // goto L1;
-                        gotoL1 = true;

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

@@ -22 +22 @@
-            this.sourceElements = new Expressions(elements);
-        }
+    }
+    
+    public ArrayLiteralExp(Loc loc, Expression e) {
+        super(loc, TOK.TOKarrayliteral);
+        this.elements = new Expressions();
+        this.elements.add(e);
+        this.sourceElements = new Expressions(elements);
-    }
-

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
-
-import melnorme.miscutil.tree.TreeVisitor;
-
-import org.eclipse.core.runtime.Assert;
-
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-import static descent.internal.compiler.parser.LINK.LINKd;
-
-import static descent.internal.compiler.parser.STC.STClazy;
-
-import static descent.internal.compiler.parser.Scope.CSXany_ctor;
-import static descent.internal.compiler.parser.Scope.CSXlabel;
@@ -25 +17 @@
-import static descent.internal.compiler.parser.TOK.TOKtemplate;
-import static descent.internal.compiler.parser.TOK.TOKthis;
-*
-
+TOKtype
+
-import static descent.internal.compiler.parser.TY.Taarray;
-import static descent.internal.compiler.parser.TY.Tarray;
@@ -36 +28 @@
-import static descent.internal.compiler.parser.TY.Tstruct;
-import static descent.internal.compiler.parser.TY.Tvoid;
+import melnorme.miscutil.tree.TreeVisitor;
+
+import org.eclipse.core.runtime.Assert;
+
+import descent.core.compiler.IProblem;
+import descent.internal.compiler.parser.ast.IASTVisitor;
-
-
@@ -414 +412 @@
-                    ue.e1 = getRightThis(loc, sc, ad, ue.e1, f, context);
-                }
+                
+                /* Cannot call public functions from inside invariant
+                 * (because then the invariant would have infinite recursion)
+                 */
+                if (sc.func != null && sc.func.isInvariantDeclaration() != null &&
+                    ue.e1.op == TOKthis &&
+                    f.addPostInvariant(context)
+                   ) {
+                    if (context.acceptsErrors()) {
+                        context.acceptProblem(Problem.newSemanticTypeError(IProblem.CannotCallPublicExportFunctionFromInvariant, this, f.toChars(context)));
+                    }
+                }
-
-                checkDeprecated(sc, f, context);
@@ -463 +473 @@
-                        return this;
-                    } else {
-
-
-
+
+
+
+
+
-                            }
-}
-if ((sc.callSuper & (CSXsuper_ctor | CSXthis_ctor)) != 0
-if (context.acceptsErrors()) {
-context.acceptProblem(Problem.newSemanticTypeError(IProblem.MultipleConstructorCalls, this));
+   if ((sc.callSuper & (CSXsuper_ctor | CSXthis_ctor)) != 0) {
+       if (context.acceptsErrors()
+       context.acceptProblem(Problem.newSemanticTypeError(IProblem.MultipleConstructorCalls, this));
+}
-                            }
-}
-sc.callSuper |= CSXany_ctor | CSXsuper_ctor;
+   sc.callSuper |= CSXany_ctor | CSXsuper_ctor;
+}
-
-                        f = f.overloadResolve(loc, null, arguments, context, this);
@@ -496 +508 @@
-                    return this;
-                } else {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                    f = cd.ctor;

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

@@ -16 +16 @@
-    public Expression exp, sourceExp;
-    public ScopeDsymbol sd;
+    public boolean compiled;
-    
-    protected IInitializer javaElement;
@@ -40 +41 @@
-            SemanticContext context) {
-        this.sd = sd;
+        if (memnum == 0) {
+            /*
+             * No members yet, so parse the mixin now
+             */
+            compileIt(sc, context);
+            memnum |= super.addMember(sc, sd, memnum, context);
+            compiled = true;
+        }
-        return memnum;
+    }
+    
+    public void compileIt(Scope sc, SemanticContext context) {
+        exp = exp.semantic(sc, context);
+        exp = resolveProperties(sc, exp, context);
+        exp = exp.optimize(WANTvalue | WANTinterpret, context);
+        if (exp.op != TOKstring) {
+            if (context.acceptsErrors()) {
+                context.acceptProblem(Problem.newSemanticTypeError(IProblem.ArgumentToMixinMustBeString, this, exp.toChars(context)));
+            }
+        }
+        else
+        {
+            StringExp se = (StringExp) exp;
+            se = se.toUTF8(sc, context);
+            Parser p = new Parser(context.Module_rootModule.apiLevel, se.string);
+            // p.nextToken();
+            p.loc = loc;
+            decl = p.parseModule();
+            for(Dsymbol s : decl) {
+                s.accept(new AstVisitorAdapter() {
+                    @Override
+                    public void preVisit(ASTNode node) {
+                        if (node instanceof ASTDmdNode) {
+                            ASTDmdNode s = (ASTDmdNode) node;
+                            s.synthetic = true;
+                            s.setStart(getStart() + 1);
+                            s.setLength(getLength());
+                            s.setLineNumber(getLineNumber());                   
+                            s.creator = CompileDeclaration.this;
+                        }
+                    }
+                });
+            }
+
+            // TODO semantic do this better
+            if (p.problems != null) {
+                for (int i = 0; i < p.problems.size(); i++) {
+                    Problem problem = (Problem) p.problems.get(i);
+                    problem.setSourceStart(start);
+                    problem.setSourceEnd(start + length - 1);
+                    context.acceptProblem(problem);
+                }
+            }
+
+            if (p.token.value != TOKeof) {
+                if (context.acceptsErrors()) {
+                    context.acceptProblem(Problem.newSemanticTypeError(
+                            IProblem.IncompleteMixinDeclaration, this,
+                            new String[] { se.toChars(context) }));
+                }
+            }
+        }
-    }
-
@@ -50 +112 @@
-    @Override
-    public void semantic(Scope sc, SemanticContext context) {
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-        StringExp se = (StringExp) exp;
-        se = se.toUTF8(sc, context);
-        Parser p = new Parser(context.Module_rootModule.apiLevel, se.string);
-        // p.nextToken();
-        p.loc = loc;
-        decl = p.parseModule();
-        for(Dsymbol s : decl) {
-            s.accept(new AstVisitorAdapter() {
-                @Override
-                public void preVisit(ASTNode node) {
-                    if (node instanceof ASTDmdNode) {
-                        ASTDmdNode s = (ASTDmdNode) node;
-                        s.synthetic = true;
-                        s.setStart(getStart() + 1);
-                        s.setLength(getLength());
-                        s.setLineNumber(getLineNumber());                   
-                        s.creator = CompileDeclaration.this;
-                    }
-                }
-            });
-        }
-
-        // TODO semantic do this better
-        if (p.problems != null) {
-            for (int i = 0; i < p.problems.size(); i++) {
-                Problem problem = (Problem) p.problems.get(i);
-                problem.setSourceStart(start);
-                problem.setSourceEnd(start + length - 1);
-                context.acceptProblem(problem);
-            }
-        }
-
-        if (p.token.value != TOKeof) {
-            if (context.acceptsErrors()) {
-                context.acceptProblem(Problem.newSemanticTypeError(
-                        IProblem.IncompleteMixinDeclaration, this,
-                        new String[] { se.toChars(context) }));
-            }
-        }
-
-        super.addMember(sc, sd, 0, context);
-        super.semantic(sc, context);
-    }

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
-
-import melnorme.miscutil.tree.TreeVisitor;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.ASTNode;
-import descent.internal.compiler.parser.ast.AstVisitorAdapter;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-import static descent.internal.compiler.parser.Parser.PScurlyscope;
-import static descent.internal.compiler.parser.Parser.PSsemi;
-import static descent.internal.compiler.parser.TOK.TOKeof;
+import melnorme.miscutil.tree.TreeVisitor;
+import descent.core.compiler.IProblem;
+import descent.internal.compiler.parser.ast.IASTVisitor;
-
-
@@ -35 +33 @@
-
-    @Override
- semantic
+s flatten
-        exp = exp.semantic(sc, context);
-        exp = ASTDmdNode.resolveProperties(sc, exp, context);
@@ -44 +42 @@
-                context.acceptProblem(Problem.newSemanticTypeError(IProblem.ArgumentToMixinMustBeString, this, exp.toChars(context)));
-            }
-this
+null
-        }
-        StringExp se = (StringExp) exp;
@@ -51 +49 @@
-        p.loc = loc;
-
-statements
+a
-        while (p.token.value != TOKeof) {
-            Statement s = p.parseStatement(PSsemi | PScurlyscope);
@@ -70 +68 @@
-//          });
-            
-statements
+a
-        }
-        
@@ -83 +81 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-

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

@@ -248 +248 @@
-        }
-        if (statements != null && statements.size() == 1) {
-
+tatements.get(0)
-        }
-        return this;

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

@@ -81 +81 @@
-        condition.toCBuffer(buf, hgs, context);
-        buf.writenl();
+        buf.writeByte('{');
+        buf.writenl();
-        if (ifbody != null) {
-            ifbody.toCBuffer(buf, hgs, context);
-        }
+        buf.writeByte('}');
+        buf.writenl();
-        if (elsebody != null) {
-            buf.writestring("else");
-            buf.writenl();
+            buf.writeByte('{');
+            buf.writenl();
-            elsebody.toCBuffer(buf, hgs, context);
+            buf.writeByte('}');
+            buf.writenl();
-        }
-        buf.writenl();

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

@@ -875 +875 @@
-            }
-
-e1.op == TOKarrayliteral
+(e1.op == TOKarrayliteral || e1.op == TOKnull)
-                    && e1.type.toBasetype(context).nextOf().equals(e2.type)) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-                if (type.toBasetype(context).ty == Tsarray) {

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

@@ -89 +89 @@
-        }
-        type = new TypeFunction(arguments, tret, varargs, LINK.LINKd);
+        
+        if (null == originalType) {
+            originalType = type;
+        }
-
-        sc.flags |= Scope.SCOPEctor;

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

@@ -127 +127 @@
-                        .isAggregateDeclaration();
-                e1 = getRightThis(loc, sc, ad, e1, var, context);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
+
+import static descent.internal.compiler.parser.STC.STCdeprecated;
-
-import org.eclipse.core.runtime.Assert;
@@ -7 +9 @@
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-
-
-public class Dsymbol extends ASTDmdNode {
@@ -138 +139 @@
-                    return;
-                }
+                
+                // If inside a StorageClassDeclaration that is deprecated
+                if ((sc.stc & STCdeprecated) != 0) {
+                    return;
+                }
-            }
-
@@ -476 +482 @@
-    }
-
+    /**
+     * Search for ident as member of s.
+     * Input:
+     *  flags:  1   don't find private members
+     *      2   don't give error messages
+     *      4   return NULL if ambiguous
+     * Returns:
+     *  NULL if not found
+     */
-    public final Dsymbol search(Loc loc, IdentifierExp ident, int flags,
-            SemanticContext context) {
@@ -481 +496 @@
-    }
-
+    /**
+     * Search for ident as member of s.
+     * Input:
+     *  flags:  1   don't find private members
+     *      2   don't give error messages
+     *      4   return NULL if ambiguous
+     * Returns:
+     *  NULL if not found
+     */
-    public Dsymbol searchX(Loc loc, Scope sc, IdentifierExp id,
-            SemanticContext context) {
@@ -565 +589 @@
-    public String toChars(SemanticContext context) {
-        return (this.ident != null && this.ident.ident != null) ? this.ident.toChars() : "__anonymous";
+    }
+    
+    public TemplateInstance inTemplateInstance() {
+        for (Dsymbol parent = this.parent; parent != null; parent = parent.parent) {
+            TemplateInstance ti = parent.isTemplateInstance();
+            if (ti != null)
+                return ti;
+        }
+        return null;
-    }
-

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
+
+import static descent.internal.compiler.parser.STC.STCdeprecated;
-
-import java.math.BigInteger;
@@ -9 +11 @@
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-
-
-public class EnumDeclaration extends ScopeDsymbol {
@@ -27 +28 @@
-    public integer_t minval;
-    public integer_t defaultval; // default initializer
+    public boolean isdeprecated;
-    
-    private IType javaElement;
@@ -63 +65 @@
-        return type;
-    }
+    
+    @Override
+    public boolean isDeprecated() {
+        return isdeprecated;
+    }
-
-    @Override
@@ -99 +106 @@
-        if (memtype == null) {
-            memtype = Type.tint32;
+        }
+        
+        if ((sc.stc & STCdeprecated) != 0) {
+            isdeprecated = true;
-        }
-

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

@@ -127 +127 @@
-    
-    public boolean canThrow() {
-fals
+tru
-    }
-
@@ -253 +253 @@
-                e = new AddrExp(loc, this);
-            }
-b
+s
-        }
-        return e;
@@ -460 +460 @@
-                        new String[] { toChars(context) }));
-            }
+            type = Type.tint32;
-        }
-    }

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

@@ -57 +57 @@
-import descent.core.compiler.CharOperation;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.lookup.LazyClassDeclaration;
-import descent.internal.compiler.lookup.LazyInterfaceDeclaration;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-import descent.internal.core.util.Util;
@@ -1002 +1000 @@
-        ClassDeclaration cd = null;
-        InterfaceDeclaration id = null;
+        Dsymbol pd;
-        int nparams = 0;
-
@@ -1167 +1166 @@
-                }
-            }
+        }
+        
+        /* Template member functions aren't virtual:
+         *   interface TestInterface { void tpl(T)(); }
+         * and so won't work in interfaces
+         */
+        if ((pd = toParent()) != null && pd.isTemplateInstance() != null
+                && (pd = toParent2()) != null
+                && (id = pd.isInterfaceDeclaration()) != null) {
+            if (context.acceptsErrors()) {
+                context.acceptProblem(Problem.newSemanticTypeError(IProblem.TemplateMemberFunctionNotAllowedInInterface, this, id.toString()));
+            }
-        }
-
@@ -2072 +2083 @@
-            }
-
-fbody.fallOffEnd(context) 
+(fbody.blockExit(context) & BEfallthru) != 0
-
-            if (isStaticCtorDeclaration() != null) {