Changeset 1136

Timestamp:

04/28/08 21:13:52 (4 months ago)

Author:

asterite

Message:

Now import("file_name") expressions work, but the path of them is the same as the include path. It will be like this for the next release... I'm kind of lazy to do a sofisticated dialog to configure that.
Now autocompletion works in "mixin |" and "class Foo : |".
Cleaned up some code and some behaviour.

Files:

• trunk/descent.core/src/descent/core/dom/ASTConverter.java (modified) (1 diff)
• trunk/descent.core/src/descent/core/dom/CompilationUnitResolver.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (13 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionOnClassDeclaration.java (added)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionOnInterfaceDeclaration.java (added)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionOnTemplateMixin.java (added)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (7 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Dsymbol.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/EnumDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/FileExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Global.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/InterfaceDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/StructDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateMixin.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/UnionDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ast/NaiveASTFlattener.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/GenericJavaTypeProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaMethodCompletionProposal.java (modified) (1 diff)

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

@@ -3593 +3593 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
-
-
-
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
+
+
+
+
+
+
+
-                } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-        return ret;

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

@@ -369 +369 @@
-            for(IPackageFragmentRoot root : project.getAllPackageFragmentRoots()) {
-                if (root.getResource() == null) {
-
+
+
+
-                } else {
-
+
+
+
-                }
-            }

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

@@ -24 +24 @@
-import descent.internal.codeassist.complete.CompletionOnCallExp;
-import descent.internal.codeassist.complete.CompletionOnCaseStatement;
+import descent.internal.codeassist.complete.CompletionOnClassDeclaration;
-import descent.internal.codeassist.complete.CompletionOnCompoundStatement;
-import descent.internal.codeassist.complete.CompletionOnContinueStatement;
@@ -32 +33 @@
-import descent.internal.codeassist.complete.CompletionOnIdentifierExp;
-import descent.internal.codeassist.complete.CompletionOnImport;
+import descent.internal.codeassist.complete.CompletionOnInterfaceDeclaration;
-import descent.internal.codeassist.complete.CompletionOnJavadocImpl;
-import descent.internal.codeassist.complete.CompletionOnModuleDeclaration;
-import descent.internal.codeassist.complete.CompletionOnNewExp;
-import descent.internal.codeassist.complete.CompletionOnSuperDotExp;
+import descent.internal.codeassist.complete.CompletionOnTemplateMixin;
-import descent.internal.codeassist.complete.CompletionOnThisDotExp;
-import descent.internal.codeassist.complete.CompletionOnTypeDotIdExp;
@@ -256 +259 @@
-    boolean wantProperties = true;
-    boolean wantMethodContextInfo = false;
-
+
+
-    
-    int INCLUDE_TYPES = 1;
@@ -381 +385 @@
-            
-            // First the assist node
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            
-            // For new |, don't suggest keywords or ddoc
@@ -453 +394 @@
-            // Then the keywords
-            if (!wantMethodContextInfo &&
-                    wantKeywords &&
-                    parser.getKeywordCompletions() != null && 
-                    !requestor.isIgnored(CompletionProposal.KEYWORD)) {
@@ -487 +427 @@
-    }
-
+    private void completeNode(ASTDmdNode assistNode) throws JavaModelException {
+        if (assistNode != null) {
+            if (assistNode instanceof CompletionOnModuleDeclaration && 
+                    !requestor.isIgnored(CompletionProposal.COMPILATION_UNIT_REF)) {
+                CompletionOnModuleDeclaration node = (CompletionOnModuleDeclaration) assistNode;
+                completeModuleDeclaration(node);
+            } else if (assistNode instanceof CompletionOnImport &&
+                    !requestor.isIgnored(CompletionProposal.COMPILATION_UNIT_REF)) {
+                CompletionOnImport node = (CompletionOnImport) assistNode;
+                completeImport(node);
+            } else if (assistNode instanceof CompletionOnArgumentName) {
+                CompletionOnArgumentName node = (CompletionOnArgumentName) assistNode;
+                completeArgumentName(node);
+            } else if (assistNode instanceof CompletionOnGotoStatement) {
+                CompletionOnGotoStatement node = (CompletionOnGotoStatement) assistNode;
+                completeGotoBreakOrContinueStatement(node.ident, false /* don't check in loop */);
+            } else if (assistNode instanceof CompletionOnBreakStatement) {
+                CompletionOnBreakStatement node = (CompletionOnBreakStatement) assistNode;
+                completeGotoBreakOrContinueStatement(node.ident, true /* check in loop */);
+            } else if (assistNode instanceof CompletionOnContinueStatement) {
+                CompletionOnContinueStatement node = (CompletionOnContinueStatement) assistNode;
+                completeGotoBreakOrContinueStatement(node.ident, true /* check in loop */);
+            } else if (assistNode instanceof CompletionOnVersionCondition) {
+                CompletionOnVersionCondition node = (CompletionOnVersionCondition) assistNode;
+                completeVersionCondition(node);
+            } else if (assistNode instanceof CompletionOnDebugCondition) {
+                CompletionOnDebugCondition node = (CompletionOnDebugCondition) assistNode;
+                completeDebugCondition(node);
+            } else if (assistNode instanceof CompletionOnCaseStatement) {
+                CompletionOnCaseStatement node = (CompletionOnCaseStatement) assistNode;
+                completeCaseStatement(node);
+            } else if (assistNode instanceof CompletionOnTypeDotIdExp) {
+                CompletionOnTypeDotIdExp node = (CompletionOnTypeDotIdExp) assistNode;
+                completeTypeDotIdExp(node);
+            } else if (assistNode instanceof CompletionOnDotIdExp) {
+                CompletionOnDotIdExp node = (CompletionOnDotIdExp) assistNode;
+                completeDotIdExp(node);
+            } else if (assistNode instanceof CompletionOnTypeIdentifier) {
+                CompletionOnTypeIdentifier node = (CompletionOnTypeIdentifier) assistNode;
+                completeTypeIdentifier(node);
+            } else if (assistNode instanceof CompletionOnExpStatement) {
+                CompletionOnExpStatement node = (CompletionOnExpStatement) assistNode;
+                completeExpStatement(node);
+            } else if (assistNode instanceof CompletionOnIdentifierExp) {
+                CompletionOnIdentifierExp node = (CompletionOnIdentifierExp) assistNode;
+                completeIdentifierExp(node);
+            } else if (assistNode instanceof CompletionOnThisDotExp) {
+                CompletionOnThisDotExp node = (CompletionOnThisDotExp) assistNode;
+                completeThisDotExp(node);
+            } else if (assistNode instanceof CompletionOnSuperDotExp) {
+                CompletionOnSuperDotExp node = (CompletionOnSuperDotExp) assistNode;
+                completeSuperDotExp(node);
+            } else if (assistNode instanceof CompletionOnCompoundStatement) {
+                CompletionOnCompoundStatement node = (CompletionOnCompoundStatement) assistNode;
+                completeCompoundStatement(node);
+            } else if (assistNode instanceof CompletionOnCallExp) {
+                CompletionOnCallExp node = (CompletionOnCallExp) assistNode;
+                completeCallExp(node);
+            } else if (assistNode instanceof CompletionOnNewExp) {
+                CompletionOnNewExp node = (CompletionOnNewExp) assistNode;
+                completeNewExp(node);
+            } else if (assistNode instanceof CompletionOnTemplateMixin) {
+                CompletionOnTemplateMixin node = (CompletionOnTemplateMixin) assistNode;
+                completeTemplateMixin(node);
+            } else if (assistNode instanceof CompletionOnClassDeclaration) {
+                CompletionOnClassDeclaration node = (CompletionOnClassDeclaration) assistNode;
+                completeClassDeclaration(node);
+            } else if (assistNode instanceof CompletionOnInterfaceDeclaration) {
+                CompletionOnInterfaceDeclaration node = (CompletionOnInterfaceDeclaration) assistNode;
+                completeInterfaceDeclaration(node);
+            }
+        }
+    }
+    
-    private void computeExpectedType() {
-        if (parser.expectedTypeNode instanceof CallExp) {
@@ -622 +636 @@
-        doSemantic();
-        
-
+
+
+
-        
-        currentName = CharOperation.NO_CHAR;
@@ -631 +647 @@
-        
-        if (parser.wantOnlyType()) {
-s
+rootS
-        } else {
-s
+rootS
-        }
-    }
@@ -990 +1006 @@
-            currentName = computePrefixAndSourceRange(node.ident);
-            
-
+
+
+
-            
-            // Inside a function, this may be the case of:
@@ -1001 +1019 @@
-            // The parser thinks it's: somet something (a var declaration with type "somet"),
-            // so inside a function we want other things beside types
-scope != null && s
+rootScope != null && rootS
-                isCompletingTypeIdentifier = false;
-            }
-            
-s
+rootS
-            
-            // Also suggest packages
@@ -1149 +1167 @@
-        }
-        
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        // Also suggest packages
@@ -1170 +1191 @@
-            currentName = computePrefixAndSourceRange(node);
-            
-
-
+
+
+
+
+
-            
-            // Also suggest packages
@@ -1232 +1256 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    private void completeSuperDotExp(CompletionOnSuperDotExp node) throws JavaModelException {
-        doSemantic();

trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java

@@ -9 +9 @@
-import descent.internal.compiler.parser.AggregateDeclaration;
-import descent.internal.compiler.parser.Argument;
+import descent.internal.compiler.parser.BaseClass;
-import descent.internal.compiler.parser.BaseClasses;
-import descent.internal.compiler.parser.BreakStatement;
@@ -33 +34 @@
-import descent.internal.compiler.parser.Module;
-import descent.internal.compiler.parser.ModuleDeclaration;
+import descent.internal.compiler.parser.Objects;
-import descent.internal.compiler.parser.Parser;
-import descent.internal.compiler.parser.Statement;
@@ -38 +40 @@
-import descent.internal.compiler.parser.SuperExp;
-import descent.internal.compiler.parser.TOK;
+import descent.internal.compiler.parser.TemplateMixin;
-import descent.internal.compiler.parser.ThisExp;
-import descent.internal.compiler.parser.Token;
@@ -411 +414 @@
-        if (caseEnd <= cursorLocation && cursorLocation <= expStart + expLength && exp != null && (exp instanceof ErrorExp || 
-                (exp.getNodeType() == ASTDmdNode.IDENTIFIER_EXP))) {
+            wantKeywords = false;
+            
-            assistNode = new CompletionOnCaseStatement(loc, exp, statement);
-            return (CaseStatement) assistNode;
@@ -453 +458 @@
-        }
-        return typeBasic;
+    }
+    
+    @Override
+    protected TemplateMixin newTemplateMixin(Loc loc, IdentifierExp id, Type tqual, Identifiers idents, Objects tiargs) {
+        if (prevToken.ptr + prevToken.sourceLen <= cursorLocation && cursorLocation <= token.ptr) {
+            wantKeywords = false;
+            
+            assistNode = new CompletionOnTemplateMixin(loc, id, tqual, idents, tiargs);
+            return (CompletionOnTemplateMixin) assistNode;
+        }
+        return super.newTemplateMixin(loc, id, tqual, idents, tiargs);
-    }
-    
@@ -800 +816 @@
-        // We don't want assist for an aggregate's name, but we do want it
-        // for base classes
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -815 +845 @@
-        // We don't want assist for an aggregate's name, but we do want it
-        // for base classes
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

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

@@ -627 +627 @@
-     * is resolved.
-     */
-final 
+
-        long flags = 0;
-        long storage_class = getStorageClass();

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

@@ -4 +4 @@
-
-import melnorme.miscutil.tree.TreeVisitor;
+import descent.core.Flags;
-import descent.core.IType;
-import descent.core.compiler.IProblem;
@@ -399 +400 @@
-        }
-    }
+    
+    @Override
+    public long getFlags() {
+        return super.getFlags() | Flags.AccEnum;
+    }
-
-}

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

@@ -67 +67 @@
-        
-        String filename = new String(((StringExp) e1).string);
-        File file = context.fileImports.get(filename);
-        
-if(null == file)
-
-context.acceptProblem(Problem.newSemanticTypeError(
-       IProblem.FileImportsMustBeSpecified,
-   e1,
-   new String[] { filename }))
-       return (new StringExp(loc, Id.empty, 0)).semantic(sc, context);
+File file = null;
+for(String filePath : context.global.filePath) 
+File aFile = new File(filePath, filename);
+if (aFile.exists()) {
+file = aFile;
+break
+       }
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
+
-        {
-            context.acceptProblem(Problem.newSemanticTypeError(
-                    IProblem.FileNotFound,
-                    e1,
-.getAbsolutePath()
+name
-            return (new StringExp(loc, Id.empty, 0)).semantic(sc, context);
-        }

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

@@ -11 +11 @@
-    public long debugLevel;
-    public Array<String> path = new Array<String>();
+    public Array<String> filePath = new Array<String>();
-    
-    public Global() {

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

@@ -5 +5 @@
-import org.eclipse.core.runtime.Assert;
-
+import descent.core.Flags;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
@@ -320 +321 @@
-        }
-    }
+    
+    @Override
+    public long getFlags() {
+        return super.getFlags() | Flags.AccInterface;
+    }
-
-}

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

@@ -1830 +1830 @@
-                String word = toWord(firstToken.value.toString());
-                parsingErrorInsertToComplete(prevToken,  word + "Body", word + "Declaration");
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }       
@@ -2158 +2161 @@
-            if (token.value != TOKidentifier) {
-                parsingErrorDeleteToken(prevToken);
+                
-                // goto Lerr;
-ull
+ewTemplateMixin(loc(), null, null, null, null)
-            }
-            id = newIdentifierExp();
@@ -2207 +2211 @@
-        }
-        
- 
+
-        tm.setTypeSourceRange(typeStart, typeLength);
-
@@ -2221 +2225 @@
-        // Lerr:
-        // return NULL;
-
+  
-
-    @SuppressWarnings("unchecked")
@@ -7404 +7408 @@
-    }
-    
+    protected TemplateMixin newTemplateMixin(Loc loc, IdentifierExp id, Type tqual, Identifiers idents, Objects tiargs) {
+        return new TemplateMixin(loc(), id, tqual, idents, tiargs);
+    }
+    
-    private Statement dietParseStatement(FuncDeclaration f) {
-        if (diet) {

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

@@ -7 +7 @@
-import org.eclipse.core.runtime.Assert;
-
+import descent.core.Flags;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
@@ -335 +336 @@
-        }
-    }
+    
+    @Override
+    public long getFlags() {
+        return super.getFlags() | Flags.AccStruct;
+    }
-
-}

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

@@ -21 +21 @@
-    public TemplateMixin(Loc loc, IdentifierExp ident, Type tqual,
-            Identifiers idents, Objects tiargs) {
-
+ == null || idents.isEmpty() ? null : idents
-        this.ident = ident;
-        this.sourceIdent = ident;
@@ -95 +95 @@
-            int i;
-            IdentifierExp id;
+            
+            // Descent: recovery on "mixin"
+            if (idents == null) {
+                return;
+            }
-
-            if (tqual != null) {

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

@@ -2 +2 @@
-
-import melnorme.miscutil.tree.TreeVisitor;
+import descent.core.Flags;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-
@@ -82 +83 @@
-        }
-    }
+    
+    @Override
+    public long getFlags() {
+        return (super.getFlags() | Flags.AccUnion) - Flags.AccStruct;
+    }
-
-}

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

@@ -2461 +2461 @@
-        }
-        
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                    this.buffer.append(".");