Changeset 1200

Timestamp:

06/30/08 20:43:22 (2 months ago)

Author:

asterite

Message:

Fixed some bugs, Tango errors dropped to 13 without activating any optimization. Now if you hover over an alias of an import, you get to know which import it is, and you can go to it's definition

Files:

• trunk/descent.core/src/descent/internal/codeassist/SelectionEngine.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ArrayInitializer.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ClassDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/DotVarExp.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ForeachStatement.java (modified) (2 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) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Type.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeAArray.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeClass.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ast/ASTNode.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/hover/JavadocHover.java (modified) (2 diffs)

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

@@ -343 +343 @@
-                if (isLocal(sym)) {
-                    addLocal((Declaration) sym, sym.getFlags());
-
-
+
-                    addBinarySearch(sym);
-                }

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

@@ -623 +623 @@
-     */
-    public Dsymbol creator;
-
+
-    public void accessCheck(Scope sc, Expression e, Declaration d,
-            SemanticContext context) {
+        accessCheck(sc, e, d, context, null);
+    }
+
+    public void accessCheck(Scope sc, Expression e, Declaration d,
+            SemanticContext context, ASTDmdNode reference) {
-        if (e == null) {
-            if ((d.prot() == PROTprivate && d.getModule() != sc.module
@@ -647 +652 @@
-                }
-            }
-
+reference != null ? reference : 
-        } else if (e.type.ty == Tstruct) { // Do access check
-            StructDeclaration cd;
-
-            cd = (((TypeStruct) e.type).sym);
-
+reference != null ? reference : 
-        }
-    }

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

@@ -32 +32 @@
-
-    public void addInit(Expression index, Initializer value) {
-        if (value == null) {
-            System.out.println(123456);
-        }
-        
-        if (this.index == null) {
-            this.index = new Expressions();
@@ -173 +169 @@
-
-            Initializer init = value.get(i);
-            if (init == null) {
-                System.out.println(123456);
-            }
-            init = init.syntaxCopy(context);
-            ai.value.set(i, init);

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

@@ -145 +145 @@
-            for (i = 0; i < this.baseclasses.size(); i++) {
-                BaseClass b = this.baseclasses.get(i);
-
-                if (b == null || b.base == null) {
-                    System.out.println(123456);
-                }
-                access = b.base.getAccess(smember);
-                switch (access) {
@@ -353 +349 @@
-    @Override
-    public void semantic(Scope sc, SemanticContext context) {
-        if ("FilePath".equals(new String(ident.ident))) {
-            System.out.println(123456);
-        }
-        
-        if (rest != null && !rest.isConsumed()) {
-            if (rest.getScope() == null) { 

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

@@ -16 +16 @@
-    public Declaration var;
-    public int hasOverloads;
+    public IdentifierExp ident; // Descent: for better error reporting
-    
-    public DotVarExp(Loc loc, Expression e, Declaration var) {
@@ -129 +130 @@
-                        .isAggregateDeclaration();
-                e1 = getRightThis(loc, sc, ad, e1, var, context);
-
+, ident
-            }
-        }

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

@@ -673 +673 @@
-                    }
-                }
-nextOf()
+index
-                    if (context.acceptsProblems()) {
-                        context.acceptProblem(Problem.newSemanticTypeError(
-this
+arg
-                    }
-                }
@@ -684 +684 @@
-                if (context.acceptsProblems()) {
-                    context.acceptProblem(Problem.newSemanticTypeError(
-this
+arg
-                }
-            }

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

@@ -1332 +1332 @@
-                            f2 = s.isFuncDeclaration();
-                        }
-                        if (f2 == null) {
-                            System.out.println(123456);
-                        }
-                        f2 = f2.overloadExactMatch(type, context);
-                        if (f2 != null && f2.isFinal()

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

@@ -389 +389 @@
-         */
-        
-        if ("_P_WAIT".equals(new String(ident))) {
-            System.out.println(123456);
-        }
-
-        Dsymbol s = null;
-        if (insearch) {

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

@@ -803 +803 @@
-        }
-        
-        if (f == beforePf) {
-            System.out.println(123456);
-        }
-
-        beforePf.overnext = f;
-        f.overprevious = beforePf;

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

@@ -953 +953 @@
-
-        // deco strings are unique and semantic() has been run
-
+
+
+
-            return true;
-        }

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

@@ -28 +28 @@
-        boolean children = visitor.visit(this);
-        if (children) {
-Index
-key);
+Next
+sourceIndex);          
-        }
-        visitor.endVisit(this);

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

@@ -360 +360 @@
-
-        de = new DotVarExp(e.loc, e, d);
-start = e.start;
-length = e.length
+ident = ident; // Descent: for better error reporting
+copySourceRange(e)
-        return de.semantic(sc, context);
-    }

trunk/descent.core/src/descent/internal/compiler/parser/ast/ASTNode.java

@@ -89 +89 @@
-    /** {@inheritDoc} */
-    public final void accept(IASTVisitor visitor) {
-        AssertIn.isNotNull(visitor);
-
-        // begin with the generic pre-visit
-        visitor.preVisit(this);

trunk/descent.ui/src/descent/internal/ui/text/java/hover/JavadocHover.java

@@ -22 +22 @@
-
-import descent.core.ICompilationUnit;
+import descent.core.IImportDeclaration;
-import descent.core.IJavaElement;
-import descent.core.IMember;
@@ -185 +186 @@
-                    return null;
-                }
+            } else if (curr instanceof IImportDeclaration) {
+                HTMLPrinter.addSmallHeader(buffer, "import " + ((IImportDeclaration) curr).getElementName());
+                hasContents= true;
-            }
-        }