Changeset 1155

Timestamp:

05/04/08 22:32:49 (8 months ago)

Author:

asterite

Message:

template.c ported to DMD 1.028.

Files:

• trunk/descent.core/src/descent/core/compiler/IProblem.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Module.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Problem.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.properties (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/STC.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (11 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateInstance.java (modified) (7 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateMixin.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateTypeParameter.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Type.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeInstance.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeSArray.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/core/CompilationUnitElementInfo.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/core/CompilationUnitStructureRequestor.java (modified) (10 diffs)
• trunk/descent.core/template/problem/problems.txt (modified) (2 diffs)
• trunk/descent.ui/plugin.xml (modified) (2 diffs)
• trunk/update.txt (modified) (1 diff)

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

@@ -640 +640 @@
-    int CannotDeclareTemplateAtFunctionScope = 429;
-    int TemplateHasNoValue = 430;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}

trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java

@@ -334 +334 @@
-        }
-        
-//
+
-        
-        this.requestor.beginReporting();
@@ -429 +429 @@
-            this.requestor.endReporting();
-            
-//
+
-//          System.out.println("Completion took " + time + " milliseconds to complete.");
-        }

trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java

@@ -417 +417 @@
-    @Override
-    public boolean visit(TemplateDeclaration node) {
-        // TODO Java -> D
-        if (node.wrapper) {
-            Dsymbol wrappedSymbol = node.members.get(0); // SEMANTIC
@@ -1027 +1026 @@
-    @Override
-    public void endVisit(TemplateDeclaration node) {
+        int end;
-        if (node.postComment != null) {
-requestor.exitType(endOfDeclaration(node.postComment)
+end = endOfDeclaration(node.postComment
-        } else {
-
+
+
+
+
+
+
+
+
+
+
-        }
-        if (!node.wrapper) {

trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java

@@ -89 +89 @@
-     * Wether to make surface Module semantic.
-     */
-tru
+fals
-    
-    /*
@@ -180 +180 @@
-        this.encoder = encoder;
-        
-
-
-
-
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
-    }
-    
@@ -208 +208 @@
-                public void run() {
-                    try {
+                        long time = System.currentTimeMillis();
+                        
-                        IPackageDeclaration[] packageDeclarations = unit.getPackageDeclarations();
-                        if (packageDeclarations.length == 1) {
@@ -222 +224 @@
-                        
-                        state.surface = false;
+                        
+                        time = System.currentTimeMillis() - time;
+                        System.out.println(module.moduleName + ": " + time);
-                    } catch (JavaModelException e) {
-                        Util.log(e);

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

@@ -42 +42 @@
-import static descent.internal.compiler.parser.TY.Tdelegate;
-import static descent.internal.compiler.parser.TY.Tfunction;
+import static descent.internal.compiler.parser.TY.Tident;
-import static descent.internal.compiler.parser.TY.Tsarray;
-import static descent.internal.compiler.parser.TY.Tstruct;
@@ -1651 +1652 @@
-
-            if (null == t2 || !t1.equals(t2)) {
-1
+nomatch
-                return false;
-            }
-        } else if (e1 != null) {
-
-
+
+
+
+
+
+
-                return false;
-            }
-        } else if (s1 != null) {
-            if (null == s2 || !s1.equals(s2) || s1.parent != s2.parent) {
-1
+nomatch
-                return false;
-            }
-        } else if (v1 != null) {
-            if (null == v2) {
-1
+nomatch
-                return false;
-            }
-            if (size(v1.objects) != size(v2.objects)) {
-1
+nomatch
-                return false;
-            }
@@ -1676 +1681 @@
-                if (!match((ASTDmdNode) v1.objects.get(i),
-                        (ASTDmdNode) v2.objects.get(i), tempdecl, sc, context)) {
-1
+nomatch
-                    return false;
-                }
@@ -1682 +1687 @@
-        }
-        return true; // match
-1
+nomatch
-        //      return 0;   // nomatch;
-    }
@@ -1843 +1848 @@
-    }
-    
+    public static int templateIdentifierLookup(IdentifierExp id, TemplateParameters parameters) {
+        for (int i = 0; i < size(parameters); i++) {
+            TemplateParameter tp = (TemplateParameter) parameters.get(i);
+
+            if (equals(tp.ident, id))
+                return i;
+        }
+
+        return -1;
+    }
+    
+    public static int templateParameterLookup(Type tparam,
+            TemplateParameters parameters) {
+        if (tparam.ty != Tident) {
+            throw new IllegalStateException("assert(tparam.ty == Tident);");
+        }
+        TypeIdentifier tident = (TypeIdentifier) tparam;
+        if (size(tident.idents) == 0) {
+            return templateIdentifierLookup(tident.ident, parameters);
+        }
+        return -1;
+    }
+    
-    public void errorOnModifier(int problemId, TOK tok, SemanticContext context) {
-        boolean reported = false;

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

@@ -992 +992 @@
-                // Verify this doesn't override previous final function
-                if (cd.baseClass != null) {
+                    if (ident.toString().equals("callWindowProc")) {
+                        System.out.println(1);
+                    }
+                    
-                    Dsymbol s = cd.baseClass.search(loc, ident, 0, context);
-                    if (s != null) {
-                        FuncDeclaration f2 = s.isFuncDeclaration();
+                        if (f2 == null) {
+                            cd.baseClass.search(loc, ident, 0, context);
+                        }
-                        f2 = f2.overloadExactMatch(type, context);
-                        if (f2 != null && f2.isFinal()

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

@@ -6 +6 @@
-import melnorme.miscutil.tree.TreeVisitor;
-import descent.core.ICompilationUnit;
+import descent.core.JavaModelException;
-import descent.core.compiler.CharOperation;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.lookup.SemanticRest;
-import descent.internal.compiler.parser.ast.IASTVisitor;
+import descent.internal.core.CompilationUnit;
+import descent.internal.core.CompilationUnitElementInfo;
+import descent.internal.core.util.Util;
-
-// DMD 1.020
-public class Module extends Package {
+    
+    private final static boolean FAST_SEARCH = false;
-
-    public int apiLevel;
@@ -177 +183 @@
-        semanticdone = semanticstarted;
-        
-
+//
-    }
-
@@ -346 +352 @@
-            s = this.searchCacheSymbol;
-        } else {
+            this.insearch = true;
+            
-            // Descent: lazy initailization
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            this.insearch = true;
-            s = super.search(loc, ident, flags, context);
-            this.insearch = false;
-
-
-
-
-
-
-
-
-
-
+
-            this.searchCacheSymbol = s;
-            this.searchCacheFlags = flags;

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

@@ -988 +988 @@
-        case TemplateHasNoValue:
-            return String.format(ProblemMessages.TemplateHasNoValue, arguments[0]);
-        case InconsistentNestingLevels:
-            return String.format(ProblemMessages.InconsistentNestingLevels, arguments[0], arguments[1]);
-        case CannotUseLocalAsTemplateParameter:
-            return String.format(ProblemMessages.CannotUseLocalAsTemplateParameter, arguments[0]);
@@ -1022 +1020 @@
-        case ShiftAssignIsOutsideTheRange:
-            return String.format(ProblemMessages.ShiftAssignIsOutsideTheRange, arguments[0], arguments[1]);
+        case TemplateTupleParameterMustBeLastOne:
+            return String.format(ProblemMessages.TemplateTupleParameterMustBeLastOne);
+        case SymbolIsNestedInBoth:
+            return String.format(ProblemMessages.SymbolIsNestedInBoth, arguments[0], arguments[1], arguments[2]);
-        default:
-            return "";

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

@@ -441 +441 @@
-    public static String CannotDeclareTemplateAtFunctionScope;
-    public static String TemplateHasNoValue;
-    public static String InconsistentNestingLevels;
-    public static String CannotUseLocalAsTemplateParameter;
-    public static String NoSizeForType;
@@ -458 +457 @@
-    public static String StaticConstructorCanOnlyBePartOfStructClassModule;
-    public static String ShiftAssignIsOutsideTheRange;
+    public static String TemplateTupleParameterMustBeLastOne;
+    public static String SymbolIsNestedInBoth;
-    
-    static {

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

@@ -429 +429 @@
-CannotDeclareTemplateAtFunctionScope=Cannot declare template at function scope %1$s
-TemplateHasNoValue=Template %1$s has no value
-InconsistentNestingLevels=Inconsistent nesting levels %1$s and %2$s
-CannotUseLocalAsTemplateParameter=Cannot use local '%1$s' as template parameter
-NoSizeForType=No size for type %1$s
@@ -446 +445 @@
-StaticConstructorCanOnlyBePartOfStructClassModule=Static constructor can only be part of struct/class/module
-ShiftAssignIsOutsideTheRange=Shift assign by %1$s is outside the range 0..%2$s
+TemplateTupleParameterMustBeLastOne=Template tuple parameter must be last one
+SymbolIsNestedInBoth=%1$s is nested in both %2$s and %2$s

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

@@ -27 +27 @@
-    public final static int STCinvariant    = 0x100000;
-    public final static int STCref      = 0x200000;
+    public final static int STCinit     = 0x400000;     // has explicit initializer
+    public final static int STCmanifest     = 0x800000;     // manifest constant
+    public final static int STCnodtor       = 0x1000000;    // don't run destructor
+    public final static int STCnothrow      = 0x2000000;    // never throws exceptions
-    
-    public static int fromTOK(TOK tok) {

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;
@@ -177 +178 @@
-            td_best.leastAsSpecialized(td, context);
-
-0 != c1 && 0 ==
+c1 >
-                // Ltd:
-                td_ambig = null;
-                continue;
-0 == c1 && 0 !=
+c1 <
-                // Ltd_best:
-                td_ambig = null;
@@ -239 +240 @@
-        int i;
-        int nfparams;
-        int nfparams2;
-        int nfargs;
-        int nargsi;
+        int fptupindex = -1;
+        int tuple_dim = 0;
-        MATCH match = MATCHexact;
-        FuncDeclaration fd = onemember.toAlias(context).isFuncDeclaration();
@@ -261 +263 @@
-        paramsym.parent = scope.parent;
-        Scope paramscope = scope.push(paramsym);
+        
+        tp = isVariadic();
-
-        nargsi = 0;
@@ -266 +270 @@
-
-            nargsi = targsi.size();
-
-
+
+
+
+
+
+
+
-
-            //memcpy(dedargs.data, targsi.data, nargsi * sizeof(dedargs.data));
@@ -302 +311 @@
-        // function
-        // parameters
-        nfparams2 = nfparams;
-        nfargs = fargs.size(); // number of function arguments
-
@@ -324 +332 @@
-                    throw GOTO_L1;
-                } else {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-            }
@@ -383 +392 @@
-        // L2:
-        // Loop through the function parameters
-
+
+
+
+
+
+
+
+
+
+
+
+
-            Argument fparam = Argument.getNth(fdtype.parameters, i, context);
-            Expression farg;
@@ -756 +776 @@
-        }
-
-
+
+
-            tp.semantic(paramscope, context);
+            
+            if (i + 1 != parameters.size() && tp.isTemplateTupleParameter() != null) {
+                if (context.acceptsProblems()) {
+                    context.acceptProblem(Problem.newSemanticTypeError(IProblem.TemplateTupleParameterMustBeLastOne, tp));
+                }
+            }
-        }
-
@@ -771 +798 @@
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    @Override
@@ -894 +888 @@
-    }
-    
+    /**
+     * We can overload templates.
+     */
+    public boolean isOverloadable() {
+        return true;
+    }
+    
-    public void setJavaElement(IJavaElement javaElement) {
-        this.javaElement = javaElement;

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

@@ -8 +8 @@
-import descent.internal.compiler.parser.ast.IASTVisitor;
-
+import static descent.internal.compiler.parser.STC.*;
-import static descent.internal.compiler.parser.MATCH.MATCHnomatch;
-
-TOKfunction
+*
-import static descent.internal.compiler.parser.TOK.TOKtuple;
-import static descent.internal.compiler.parser.TOK.TOKvar;
@@ -121 +122 @@
-
-            dedtypes.setDim(size(td.parameters));
+            dedtypes.zero();
+            
-            if (null == td.scope) {
-                if (context.acceptsProblems()) {
@@ -152 +155 @@
-                int c2 = td_best.leastAsSpecialized(td, context);
-
-!= 0 && 0 ==
+>
-                    // goto Ltd;
-                    td_ambig = null;
@@ -163 +166 @@
-                    tdtypes.memcpy(dedtypes);
-                    continue;
-0 == c1 && c2 != 0
+c1 < c2
-                    // goto Ltd_best;
-                    td_ambig = null;
@@ -404 +407 @@
-    }
-
-boolean
-boolean nested = false
+int
+int nested = 0
-
-        /* A nested instance happens when an argument references a local
@@ -435 +438 @@
-                if (gotoLsa) {
-                    Declaration d = sa.isDeclaration();
-
+
+
-                            && !d.isDataseg(context)
-                            && (null == d.isFuncDeclaration() || d
-                                    .isFuncDeclaration().isNested())
-
+
+
+
+
+
+
-                        // if module level template
-                        if (null != tempdecl.toParent().isModule()) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                if (context.acceptsProblems()) {
-
-
+
+
+
+
+
+
+
-                                }
-                            }
-isnested = d.toParent();
-= true
+// L1:
+|= 1
-                        } else {
-                            if (context.acceptsProblems()) {
-
-
+
+
+
+
+
+
+
-                            }
-                        }
@@ -929 +973 @@
-                ea[0] = ea[0].optimize(WANTvalue | WANTinterpret, context);
-                tiargs.set(j, ea[0]);
+                if (ea[0].op == TOKtype) {
+                    tiargs.set(j, ea[0].type);
+                }
-            } else if (sa[0] != null) {
-            } else {

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

@@ -268 +268 @@
-        argsym.parent = scy.parent;
-        Scope scope = scy.push(argsym);
+        
+        int errorsave = context.global.errors;
-
-        // Declare each template parameter as an alias for the argument type
@@ -303 +305 @@
-