Changeset 1167

Timestamp:

05/17/08 10:22:56 (2 months ago)

Author:

asterite

Message:

Updated to DMD 1.030.

Files:

• trunk/descent.core/src/descent/core/compiler/IProblem.java (modified) (1 diff)
• trunk/descent.core/src/descent/core/dom/ASTConverter.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/BinExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/CallExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/DelegateExp.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/DotIdExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/DotVarExp.java (modified) (2 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/StructInitializer.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateParameter.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateThisParameter.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateValueParameter.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeAArray.java (modified) (1 diff)
• trunk/descent.core/template/problem/problems.txt (modified) (2 diffs)

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

@@ -671 +671 @@
-    int TypeofReturnMustBeInsideFunction = 460;
-    int PostBlitsAreOnlyForStructUnionDefinitions = 461;
+    int CannotHaveEDotTuple = 462;
-
-}

trunk/descent.core/src/descent/core/dom/ASTConverter.java

@@ -544 +544 @@
-    
-    public void convert(StorageClassDeclaration a, List<Declaration> toAdd) {
-
+
+
+
+
+
-        
-        if (a.single && a.decl != null && a.decl.size() >= 1) {
@@ -585 +589 @@
-        }
-        
-
-
+
+
+
+
-        convertDeclarations(b.declarations(), a.decl);
-        b.setSourceRange(a.start, a.length);
@@ -615 +621 @@
-
-    public void convert(ProtDeclaration a, List<Declaration> toAdd) {
-
+
+
+
+
-        
-        if (a.single && a.decl != null && a.decl.size() > 0) {
@@ -646 +655 @@
-        }
-        
-
-
+
+
+
+
-        convertDeclarations(b.declarations(), a.decl);
-        b.setSourceRange(a.start, a.length);

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

@@ -44 +44 @@
-import static descent.internal.compiler.parser.TY.Tfunction;
-import static descent.internal.compiler.parser.TY.Tident;
+import static descent.internal.compiler.parser.TY.Tpointer;
-import static descent.internal.compiler.parser.TY.Tsarray;
-import static descent.internal.compiler.parser.TY.Tstruct;
@@ -1894 +1895 @@
-    }
-    
+    /*************************************************************
+     * Now that we have the right function f, we need to get the
+     * right 'this' pointer if f is in an outer class, but our
+     * existing 'this' pointer is in an inner class.
+     * This code is analogous to that used for variables
+     * in DotVarExp::semantic().
+     */
+    public static Expression getRightThis(Loc loc, Scope sc,
+            AggregateDeclaration ad, Expression e1, Declaration var,
+            SemanticContext context) {
+        boolean gotoL1 = true;
+    L1:
+        while(gotoL1) {
+            gotoL1 = false;
+            
+            Type t = e1.type.toBasetype(context);
+    
+            if (ad != null
+                    && !(t.ty == Tpointer && t.next.ty == Tstruct && ((TypeStruct) t.next).sym == ad)
+                    && !(t.ty == Tstruct && ((TypeStruct) t).sym == ad)) {
+                ClassDeclaration cd = ad.isClassDeclaration();
+                ClassDeclaration tcd = t.isClassHandle();
+    
+                if (null == cd || null == tcd
+                        || !(tcd == cd || cd.isBaseOf(tcd, null, context))) {
+                    if (tcd != null && tcd.isNested()) { // Try again with outer scope
+    
+                        e1 = new DotVarExp(loc, e1, tcd.vthis);
+                        e1 = e1.semantic(sc, context);
+    
+                        // Skip over nested functions, and get the enclosing
+                        // class type.
+                        Dsymbol s = tcd.toParent();
+                        while (s != null && s.isFuncDeclaration() != null) {
+                            FuncDeclaration f = s.isFuncDeclaration();
+                            if (f.vthis != null) {
+                                e1 = new VarExp(loc, f.vthis);
+                            }
+                            s = s.toParent();
+                        }
+                        if (s != null && s.isClassDeclaration() != null) {
+                            e1.type = s.isClassDeclaration().type;
+                        }
+                        e1 = e1.semantic(sc, context);
+                        // goto L1;
+                        gotoL1 = true;
+                        continue L1;
+                    }
+                    if (context.acceptsProblems()) {
+                        context.acceptProblem(Problem.newSemanticTypeError(IProblem.ThisForSymbolNeedsToBeType, var, new String[] { var
+                                .toChars(context), ad.toChars(context), t
+                                .toChars(context) }));
+                    }
+                }
+            }
+        }
+        return e1;
+    }
+    
-    public void errorOnModifier(int problemId, TOK tok, SemanticContext context) {
-        boolean reported = false;

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

@@ -474 +474 @@
-            return this;
-        } else if (t1.ty == Tclass || t2.ty == Tclass) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        } else if ((e1.op == TOKstring || e1.op == TOKnull)

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

@@ -391 +391 @@
-                    ad = td.toParent().isAggregateDeclaration();
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                }
-

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

@@ -6 +6 @@
-import static descent.internal.compiler.parser.TY.Tdelegate;
-import static descent.internal.compiler.parser.TY.Tfunction;
-import static descent.internal.compiler.parser.TY.Tpointer;
-import static descent.internal.compiler.parser.TY.Tstruct;
-
-
@@ -113 +111 @@
-            type = new TypeDelegate(func.type);
-            type = type.semantic(loc, sc, context);
-            //  -----------------
-            /* For func, we need to get the
-             * right 'this' pointer if func is in an outer class, but our
-             * existing 'this' pointer is in an inner class.
-             * This code is analogous to that used for variables
-             * in DotVarExp::semantic().
-             */
-            AggregateDeclaration ad = func.toParent().isAggregateDeclaration();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            }
-            //  -----------------
-        }
-        return this;

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

@@ -199 +199 @@
-                    return new TypeExp(loc, t);
-                }
+                
+                TupleDeclaration tup = s.isTupleDeclaration();
+                if (tup != null)
+                {
+                if (eleft != null) {
+                    if (context.acceptsProblems()) {
+                        context.acceptProblem(Problem.newSemanticTypeError(IProblem.CannotHaveEDotTuple, this));
+                    }
+                }
+                e = new TupleExp(loc, tup, context);
+                e = e.semantic(sc, context);
+                return e;
+                }
-
-                ScopeDsymbol sds = s.isScopeDsymbol();

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

@@ -10 +10 @@
-import static descent.internal.compiler.parser.TOK.TOKdsymbol;
-import static descent.internal.compiler.parser.TOK.TOKthis;
-
-import static descent.internal.compiler.parser.TY.Tpointer;
-import static descent.internal.compiler.parser.TY.Tstruct;
-
-
@@ -125 +122 @@
-                AggregateDeclaration ad = var.toParent()
-                        .isAggregateDeclaration();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                accessCheck(sc, e1, var, context);
-            }

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

@@ -1050 +1050 @@
-        case PostBlitsAreOnlyForStructUnionDefinitions:
-            return String.format(ProblemMessages.PostBlitsAreOnlyForStructUnionDefinitions);
+        case CannotHaveEDotTuple:
+            return String.format(ProblemMessages.CannotHaveEDotTuple);
-        default:
-            return "";

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

@@ -472 +472 @@
-    public static String TypeofReturnMustBeInsideFunction;
-    public static String PostBlitsAreOnlyForStructUnionDefinitions;
+    public static String CannotHaveEDotTuple;
-    
-    static {

trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.properties

@@ -460 +460 @@
-TypeofReturnMustBeInsideFunction=typeof(return) must be inside function
-PostBlitsAreOnlyForStructUnionDefinitions=Post blits are only for struct/union definitions
+CannotHaveEDotTuple=Cannot have e.tuple

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

@@ -83 +83 @@
-                            context.acceptProblem(Problem.newSemanticTypeError(IProblem.TooManyInitializers, this, new String[] { ad.toChars(context) }));
-                        }
+                        field.remove(i);
+                        i--;
-                        continue;
-                    } else {

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

@@ -6 +6 @@
-import melnorme.miscutil.tree.TreeVisitor;
-import descent.core.IJavaElement;
-import descent.core.compiler.CharOperation;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.lookup.SemanticRest;
@@ -102 +101 @@
-            }
-
-Loc.ZERO
+loc
-                    tp.ident, init);
-            v.storage_class = STCconst;
@@ -655 +654 @@
-            Declaration[] sparam = { null };
-
-
-
+
+
+
+
+
+
+
-
-            if (m2 == MATCHnomatch) {

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

@@ -39 +39 @@
-        return null;
-    }
+    
+    public TemplateThisParameter isTemplateThisParameter() {
+        return null;
+    }
-
-    /**

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
-
-
-public class TemplateThisParameter extends TemplateTypeParameter {
-
-
+
+
-        super(loc, ident, specType, defaultType);
-    }
-
+    @Override
+    public TemplateThisParameter isTemplateThisParameter() {
+        return this;
+    }
+
+    @Override
+    public TemplateParameter syntaxCopy(SemanticContext context) {
+        TemplateThisParameter tp = new TemplateThisParameter(loc, ident,
+                specType, defaultType);
+        if (tp.specType != null)
+            tp.specType = specType.syntaxCopy(context);
+        if (defaultType != null)
+            tp.defaultType = defaultType.syntaxCopy(context);
+        tp.copySourceRange(this);
+        return tp;
+    }
+    
+    @Override
+    public void toCBuffer(OutBuffer buf, HdrGenState hgs, SemanticContext context) {
+        buf.writestring("this ");
+        super.toCBuffer(buf, hgs, context);
+    }
+
-}

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

@@ -69 +69 @@
-            e = e.syntaxCopy(context);
-            e = e.semantic(sc, context);
+            if (context.apiLevel == Parser.D2) {
+                // TODO Semantic D2
+//              if (e.op == TOKdefault)
+//              {   DefaultInitExp de = (DefaultInitExp) e;
+//                  e = de.resolve(loc, sc, context);
+//              }
+            }
-        }
-        return e;

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

@@ -241 +241 @@
-    
-    @Override
+    public void resolve(Loc loc, Scope sc, Expression[] pe, Type[] pt, Dsymbol[] ps, SemanticContext context) {
+        // Deal with the case where we thought the index was a type, but
+        // in reality it was an expression.
+        if (index.ty == Tident || index.ty == Tinstance || index.ty == Tsarray) {
+            Expression[] e = { null };
+            Type[] t = { null };
+            Dsymbol[] s = { null };
+
+            index.resolve(loc, sc, e, t, s, context);
+            if (e[0] != null) { // It was an expression -
+                // Rewrite as a static array
+
+                TypeSArray tsa = new TypeSArray(next, e[0], context.encoder);
+                tsa.resolve(loc, sc, pe, pt, ps, context);
+                return;
+            } else if (t != null) {
+                index = t[0];
+            } else {
+                if (context.acceptsProblems()) {
+                    context.acceptProblem(Problem.newSemanticTypeError(IProblem.IndexIsNotATypeOrExpression, index));
+                }
+            }
+        }
+        super.resolve(loc, sc, pe, pt, ps, context);
+    }
+    
+    @Override
-    protected void appendSignature0(StringBuilder sb) {
-        sb.append('H');

trunk/descent.core/template/problem/problems.txt

@@ -1381 +1381 @@
-PostBlitsAreOnlyForStructUnionDefinitions
-    formatString=Post blits are only for struct/union definitions
+    numArgs=0
+CannotHaveEDotTuple
+    formatString=Cannot have e.tuple
-    numArgs=0
-
@@ -1391 +1394 @@
-
-
-
-