Changeset 874

Timestamp:

10/22/07 17:58:09 (1 year ago)

Author:

asterite

Message:

- Fixed a bug relating multiple imports.
- Now versions already used or defined (version(X) { }, version = X;) in the file are used in the completion on version.

Files:

• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (4 diffs)

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

@@ -151 +151 @@
-            CharOperation.replace(sourceUnitFqn, '/', '.');
-            
-CompletionParser 
+
-            parser.filename = this.fileName;
-            parser.cursorLocation = completionPosition;
@@ -381 +381 @@
-    
-    private void completeVersionCondition(CompletionOnVersionCondition node) {
-        // TODO For now, suggest the predefined versions. Later, visit the file
-        // to see what other versions the user used, and also use the
-        // versions defined in the UI (which doesn't exist yet)
-        char[] name = node.ident == null ? CharOperation.NO_CHAR : node.ident;
-        this.startPosition = this.actualCompletionPosition - name.length;
-        this.endPosition = this.actualCompletionPosition;
+        
+        // Suggest the versions found in the source file
+        HashtableOfCharArrayAndObject versions = parser.versions;
+        if (versions == null) {
+            versions = new HashtableOfCharArrayAndObject();
+        }
+        
+        // And also the predefined
-        for(char[] predefined : VersionCondition.resevered) {
-
+
+
+
+
+
+
+
+
+
-                CompletionProposal proposal = this.createProposal(CompletionProposal.KEYWORD, this.actualCompletionPosition);
-predefine
-predefine
+i
+i
-                proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
-                CompletionEngine.this.requestor.accept(proposal);

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

@@ -12 +12 @@
-import descent.internal.compiler.parser.Expression;
-import descent.internal.compiler.parser.GotoStatement;
+import descent.internal.compiler.parser.HashtableOfCharArrayAndObject;
-import descent.internal.compiler.parser.IdentifierExp;
-import descent.internal.compiler.parser.Identifiers;
@@ -21 +22 @@
-import descent.internal.compiler.parser.TOK;
-import descent.internal.compiler.parser.Type;
+import descent.internal.compiler.parser.Version;
-import descent.internal.compiler.parser.VersionCondition;
+import descent.internal.compiler.parser.VersionSymbol;
-
-public class CompletionParser extends Parser {
@@ -29 +32 @@
-    private List<ICompletionOnKeyword> keywordCompletions;
-    private boolean includeExpectations = true;
+    
+    // Versions found in the source file: useful for suggesting a
+    // version identifier in a CompletionOnVersionCondition
+    public HashtableOfCharArrayAndObject versions;
-
-    public CompletionParser(int apiLevel, char[] source) {
@@ -154 +161 @@
-    @Override
-    protected VersionCondition newVersionCondition(Module module, Loc loc, long level, char[] id) {
-
+
+
+
+
+
+
+
+
+
-            includeExpectations = false;
-            
@@ -164 +179 @@
-    }
-    
+    @Override
+    protected VersionSymbol newVersionSymbol(Loc loc, IdentifierExp id, Version version) {
+        if (id != null && id.ident != null) {
+            if (versions == null) {
+                versions = new HashtableOfCharArrayAndObject();
+            }
+            versions.put(id.ident, this);
+        }
+        return super.newVersionSymbol(loc, id, version);
+    }
+    
-    private boolean inCompletion() {
-        return prevToken.ptr + prevToken.sourceLen <= cursorLocation && cursorLocation <= token.ptr + token.sourceLen

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

@@ -998 +998 @@
-    
-    public void endVisit(Import node) {
+        if (!node.first) {
+            return;
+        }
+        
-        popLevelInAttribDeclarationStack();
-    }

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

@@ -1063 +1063 @@
-                idTokenLength = token.sourceLen;
-                
-           
+
-                c = newVersionCondition(module, loc, level, id);
-                check(TOKrparen);               
@@ -1070 +1070 @@
-                
-                c = newVersionCondition(module, loc, level, id);
-
+
+
+
+
+
+
-            }           
-        } else {
@@ -6740 +6745 @@
-            return new VersionSymbol(loc, token.intValue.longValue(), newVersionForCurrentToken());
-        } else if (token.value == TOKidentifier) {
- 
+
-        } else {
-            throw new RuntimeException("Can't happen");
-        }
-    }
-
+
-    private VoidInitializer newVoidInitializerForToken(Token token) {
-        VoidInitializer voidInitializer = new VoidInitializer(loc);
@@ -6995 +7000 @@
-    }
-    
+    protected VersionSymbol newVersionSymbol(Loc loc, IdentifierExp id, Version version) {
+        return new VersionSymbol(loc, id, version);
+    }
+    
-    /**
-     * The parser expects the current token to be