Changeset 1231

Timestamp:

07/18/08 22:27:10 (2 months ago)

Author:

asterite

Message:

Optimizations for autocompletion, uploaded a new nightly build

Files:

• trunk/descent.core/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (9 diffs)
• trunk/descent.core/src/descent/internal/codeassist/impl/AssistOptions.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/lookup/ILazyAggregate.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyAggregateDeclaration.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyClassDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyInterfaceDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyModule.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyStructDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/AggregateDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ClassDeclaration.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/InterfaceDeclaration.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/Pvirtuals.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ScopeDsymbol.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/StructDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/StructInitializer.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TraitsExp.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/port.txt (modified) (1 diff)
• trunk/descent.debug.core/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.debug.core/plugin.xml (modified) (1 diff)
• trunk/descent.debug.core/src/descent/debug/core/AbstractDescentLaunchConfigurationDelegate.java (modified) (1 diff)
• trunk/descent.debug.ui/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.launching/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui-feature/feature.xml (modified) (1 diff)
• trunk/descent.ui.astviewer/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui.metrics/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.ui/META-INF/MANIFEST.MF (modified) (1 diff)

trunk/descent.core/META-INF/MANIFEST.MF

@@ -3 +3 @@
-Bundle-Name: %pluginName
-Bundle-SymbolicName: descent.core;singleton:=true
-3
+8
-Bundle-Activator: descent.core.JavaCore
-Bundle-Vendor: %providerName

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

@@ -722 +722 @@
-        
-        if (node.mod != null) {
-            node.mod = node.mod.unlazy(semanticContext);
-            if (node.selectiveName == null) {
-                this.startPosition = actualCompletionPosition;
@@ -730 +729 @@
-                this.currentName = computePrefixAndSourceRange(node.selectiveName);
-            }
+            
+            node.mod = node.mod.unlazy(this.currentName, semanticContext);
+            
-            this.wantArguments = false;
-            suggestMembers(node.mod.members, false, new HashtableOfCharArrayAndObject(), INCLUDE_TYPES | INCLUDE_VARIABLES | INCLUDE_FUNCTIONS);
@@ -1096 +1098 @@
-        
-        if (sym instanceof ClassDeclaration) {
-
+this.currentName, 
-            
-            Declaration func = cd.ctor;
@@ -1128 +1130 @@
-            }
-        } else if (sym instanceof StructDeclaration) {
-
+CharOperation.NO_CHAR, 
-            suggestMembers(struct.members, onlyStatics, 0, new HashtableOfCharArrayAndObject(), INCLUDE_OPCALL);
-        }
@@ -1886 +1888 @@
-    
-    private void completeTypeClassRecursively(TypeClass type, boolean onlyStatics, HashtableOfCharArrayAndObject funcSignatures) {
-
+this.currentName, 
-        if (decl == null) {
-            return;
@@ -1910 +1912 @@
-    
-    private void completeTypeStruct(TypeStruct type, boolean onlyStatics) {
-
+this.currentName, 
-        if (decl == null) {
-            return;
@@ -2049 +2051 @@
-                if (!suggestedModules.containsKey(fqn)) {
-                    suggestedModules.put(fqn, this);
-
-
-
+
-                    suggestMembers(mod.members, false, funcSignatures, includes & (~INCLUDE_IMPORTS));
-                }
@@ -2241 +2241 @@
-                    if (parser.inNewExp) {
-                        if (type instanceof TypeClass) {
-
+this.currentName, 
-                            if (cd.isClassDeclaration() != null && cd.isInterfaceDeclaration() == null) {
-                                // If it's abstract, skip
@@ -2548 +2548 @@
-        // opCall
-        case ASTDmdNode.TYPE_STRUCT: {
-            StructDeclaration sym = (((TypeStruct) type).sym).unlazy(semanticContext);
-            currentName = ident;
+            StructDeclaration sym = (((TypeStruct) type).sym).unlazy(this.currentName, semanticContext);            
-            suggestMembers(sym.members, onlyStatics, new HashtableOfCharArrayAndObject(), INCLUDE_OPCALL);
-            break;
-        }
-
-
+
-            currentName = ident;
+            ClassDeclaration sym = (((TypeClass) type).sym).unlazy(this.currentName, semanticContext);          
-            suggestMembers(sym.members, onlyStatics, new HashtableOfCharArrayAndObject(), INCLUDE_OPCALL);
-            

trunk/descent.core/src/descent/internal/codeassist/impl/AssistOptions.java

@@ -247 +247 @@
-                String[] strings = moduleNames.split(",");
-                for(String string : strings) {
-
+
+
+
+
-                }
-            }

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

@@ -31 +31 @@
-    void symtab(DsymbolTable table);
-
+    boolean isUnlazy();
+
-}

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

@@ -20 +20 @@
-public class LazyAggregateDeclaration {
-    
-private 
-private 
-private 
-private 
-private 
+
+
+
+
+
-    
-    public LazyAggregateDeclaration(ILazyAggregate lazy) {
@@ -39 +39 @@
-        if (s == null) {
-            if (javaElementMembersCache == null) {
-
-
-
-
-
-
-
-
-
+
-                
-                if (result.hasMixinDeclaration || result.hasStaticIf || result.hasAnon) {
-                    cancelLazyness = true;
-                    lazy.members(new Dsymbols());
-                    try {
-                        lazy.builder().fill(lazy.getModule(), lazy.members(), lazy.getJavaElement().getChildren(), null);
-                    } catch (JavaModelException e) {
-                        Util.log(e);
-                    }
-                    
-                    int size = lazy.members().size();
-                    
-                    for (int i = 0; i < size; i++) {
-                        Dsymbol sym = lazy.members().get(i);
-                        sym.addMember(lazy.semanticScope(), lazy.asScopeDsymbol(), 0, context);
-                        lazy.runMissingSemantic(sym, context);
-                    }
-                    
-                    return search(loc, ident, flags, context);
-                }
-                
-                if (!privateImports.isEmpty()) {
-                    pendingPrivateImports = privateImports; 
-                }
-                if (!publicImports.isEmpty()) {
-                    pendingPublicImports = publicImports;   
-                }
-                
@@ -159 +128 @@
-        return s;
-    }
+
+    FillResult fillJavaElementMemebrsCache(SemanticContext context) {
+        javaElementMembersCache = new HashtableOfCharArrayAndObject();
+        List<Dsymbol> privateImports = new ArrayList<Dsymbol>();
+        List<Dsymbol> publicImports = new ArrayList<Dsymbol>();
+        FillResult result = null ;
+        try {
+            result = lazy.builder().fillJavaElementMembersCache(lazy, lazy.getJavaElement().getChildren(), javaElementMembersCache, lazy.members(), privateImports, publicImports, context);
+        } catch (JavaModelException e) {
+            Util.log(e);
+        }
+        
+        if (!privateImports.isEmpty()) {
+            pendingPrivateImports = privateImports; 
+        }
+        if (!publicImports.isEmpty()) {
+            pendingPublicImports = publicImports;   
+        }
+        
+        if (result.hasMixinDeclaration || result.hasStaticIf || result.hasAnon) {
+            cancelLazyness = true;
+            lazy.members(new Dsymbols());
+            try {
+                lazy.builder().fill(lazy.getModule(), lazy.members(), lazy.getJavaElement().getChildren(), null);
+            } catch (JavaModelException e) {
+                Util.log(e);
+            }
+            
+            int size = lazy.members().size();
+            
+            for (int i = 0; i < size; i++) {
+                Dsymbol sym = lazy.members().get(i);
+                sym.addMember(lazy.semanticScope(), lazy.asScopeDsymbol(), 0, context);
+                lazy.runMissingSemantic(sym, context);
+            }
+        }
+        
+        return result;
+    }
-    
-    public void runMissingSemantic(Dsymbol sym, SemanticContext context) {
@@ -165 +173 @@
-            sym.semantic(Scope.copy(lazy.semanticScope()), context);
-        }
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        context.muteProblems--;

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

@@ -1 +1 @@
-package descent.internal.compiler.lookup;
-
-JavaModelExcep
+compiler.CharOpera
-import descent.internal.compiler.parser.BaseClasses;
-import descent.internal.compiler.parser.ClassDeclaration;
@@ -12 +12 @@
-import descent.internal.compiler.parser.ScopeDsymbol;
-import descent.internal.compiler.parser.SemanticContext;
-import descent.internal.core.util.Util;
-
-public class LazyClassDeclaration extends ClassDeclaration implements ILazyAggregate {
@@ -30 +29 @@
-    }
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
-            if (baseClass != null) {
-
+prefix, 
-            }
-            
-            for (int i = 0; i < size(baseclasses); i++) {
-
+prefix, 
-            }
-            
-
-
-
-
-
-
-
+
+
-            }
-
-
+
+
+
+
+
+
+
+
+
-        }
-unlazyOne
+this
-    }
-    

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

@@ -1 +1 @@
-package descent.internal.compiler.lookup;
-
-JavaModelExcep
+compiler.CharOpera
-import descent.internal.compiler.parser.BaseClasses;
-import descent.internal.compiler.parser.Dsymbol;
@@ -12 +12 @@
-import descent.internal.compiler.parser.ScopeDsymbol;
-import descent.internal.compiler.parser.SemanticContext;
-import descent.internal.core.util.Util;
-
-public class LazyInterfaceDeclaration extends InterfaceDeclaration implements ILazyAggregate {
@@ -30 +29 @@
-    }
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
-            if (baseClass != null) {
-
+prefix, 
-            }
-            
-            for (int i = 0; i < size(baseclasses); i++) {
-
+prefix, 
-            }
-            
-
-
-
-
-
-
-
+
+
-            }
-
-
+
+
+
+
+
+
+
+
-        }
-unlazyOne
+this
-    }
-    

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

@@ -4 +4 @@
-import java.util.List;
-
+import descent.core.IConditional;
+import descent.core.IInitializer;
-import descent.core.IJavaElement;
-import descent.core.IType;
@@ -84 +86 @@
-    }
-    
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -140 +146 @@
-            if (javaElementMembersCache == null) {
-                Object target = topLevelIdentifiers.get(ident);
+                
+                target = filter(target);
-                
-                if (target != null) {
@@ -212 +220 @@
-    }
-
+    // Remove element that are under false conditionals
+    private Object filter(Object target) {
+        if (target == null) {
+            return null;
+        }
+        
+        if (target instanceof IJavaElement) {
+            IJavaElement element = (IJavaElement) target;
+            return isActive(element) ? element : null;
+        } else if (target instanceof List) {
+            List<IJavaElement> elements = (List<IJavaElement>) target;
+            List<IJavaElement> filteredElements = new ArrayList<IJavaElement>(elements.size());
+            for(IJavaElement element : elements) {
+                if (isActive(element)) {
+                    filteredElements.add(element);
+                }
+            }
+            if (filteredElements.isEmpty()) {
+                return null;
+            } else if (filteredElements.size() == 1) {
+                return filteredElements.get(0);
+            } else {
+                return filteredElements;
+            }
+        }
+        
+        return target;
+    }
+
+    private boolean isActive(IJavaElement element) {
+        switch(element.getParent().getElementType()) {
+        case IJavaElement.COMPILATION_UNIT:
+            return true;
+        case IJavaElement.INITIALIZER:
+            IInitializer init = (IInitializer) element.getParent();
+            try {
+                if (init.isThen()) {
+                    return builder.isThenActive((IConditional) init.getParent(), this);
+                } else if (init.isElse()) {
+                    return !builder.isThenActive((IConditional) init.getParent(), this);
+                } else {
+                    return true;
+                }
+            } catch (JavaModelException e) {
+                Util.log(e);
+                return true;
+            }
+        case IJavaElement.CONDITIONAL:
+            IConditional cond = (IConditional) element.getParent();
+            try {
+                return builder.isThenActive(cond, this);
+            } catch (JavaModelException e) {
+                Util.log(e);
+                return true;
+            }
+        }
+        return false;
+    }
+
-    private boolean isEasy(IJavaElement element) {
-
+
+
+
+
+
+
+
+
-    }
-
@@ -310 +384 @@
-            sym.semantic(Scope.copy(semanticScope), context);
-        }
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        context.muteProblems--;

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

@@ -1 +1 @@
-package descent.internal.compiler.lookup;
-
-JavaModelExcep
+compiler.CharOpera
-import descent.internal.compiler.parser.Dsymbol;
-import descent.internal.compiler.parser.DsymbolTable;
@@ -11 +11 @@
-import descent.internal.compiler.parser.SemanticContext;
-import descent.internal.compiler.parser.StructDeclaration;
-import descent.internal.core.util.Util;
-
-public class LazyStructDeclaration extends StructDeclaration implements ILazyAggregate {
@@ -29 +28 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
+
+
+
+
+
+
+
+
+
-        }
-unlazyOne
+this
-    }
-    

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

@@ -263 +263 @@
-                    buildConditional(module, members, cond, state, nameC, value, false /* not debug */);
-                } else {
-value >= module.versionlevel
+module.versionlevel >= value
-                        fill(module, members, cond.getThenChildren(), state);
-                    } else {
@@ -288 +288 @@
-                    buildConditional(module, members, cond, state, nameC, value, true /* debug */);
-                } else {                    
-value >= module.debuglevel
+module.debuglevel >= value
-                        fill(module, members, cond.getThenChildren(), state);
-                    } else {
@@ -839 +839 @@
-                    if (cond.isStaticIfDeclaration()) {
-                        result.hasStaticIf = true;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                    }
@@ -948 +920 @@
-    }
-    
+    public boolean isThenActive(IConditional cond, ILazy lazy) throws JavaModelException {
+        if (cond.isVersionDeclaration()) {
+            String name = cond.getElementName();
+            char[] nameC = name.toCharArray();
+            try {
+                long value = Long.parseLong(name);
+                return config.isVersionEnabled(value) || lazy.getModule().versionlevel >= value;
+            } catch(NumberFormatException e) {
+                return config.isVersionEnabled(nameC) || (lazy.getModule().versionids != null && lazy.getModule().versionids.containsKey(nameC));
+            }
+        } else if (cond.isDebugDeclaration()) {
+            String name = cond.getElementName();
+            char[] nameC = name.toCharArray();
+            try {
+                long value = Long.parseLong(name);
+                return config.isDebugEnabled(value) || lazy.getModule().debuglevel >= value;
+            } catch(NumberFormatException e) {
+                return config.isDebugEnabled(nameC) || (lazy.getModule().debugids != null && lazy.getModule().debugids.containsKey(nameC));
+            }
+        } else {
+            throw new IllegalStateException("Can't happen");
+        }
+    }
+    
-    public void fillImports(ILazy lazy, IJavaElement[] elements, List<Dsymbol> privateImports, List<Dsymbol> publicImports, SemanticContext context, int lastImportLocation) {
-        try {
@@ -977 +973 @@
-                    if (cond.isStaticIfDeclaration()) {
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                    }

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

@@ -457 +457 @@
-    }
-    
-
+
+
-        return this;
-    }

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

@@ -21 +21 @@
-
-import descent.core.Signature;
+import descent.core.compiler.CharOperation;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.lookup.ModuleBuilder;
@@ -845 +846 @@
-    
-    protected void unlazy(BaseClass bc, SemanticContext context) {
+        unlazy(bc, CharOperation.NO_CHAR, context);
+    }
+    
+    protected void unlazy(BaseClass bc, char[] prefix, SemanticContext context) {
-        if (bc.type instanceof TypeClass) {
-
-
-
-
-
+prefix, 
+
+prefix, 
+
+
-    protected void unlazy(TypeClass type, SemanticContext context) {
-