Changeset 1198

Timestamp:

06/29/08 11:58:45 (2 months ago)

Author:

asterite

Message:

Trying a new optimization... will need to cleanup code later. Now struct literals and array literals that are compile-time results are shown in the UI very nicely :-)

Files:

• trunk/descent.core/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.core/src/descent/core/IEvaluationResult.java (modified) (2 diffs)
• trunk/descent.core/src/descent/core/IStructLiteral.java (added)
• trunk/descent.core/src/descent/core/IType.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) (4 diffs)
• trunk/descent.core/src/descent/internal/codeassist/EvaluationEngine.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/codeassist/EvaluationResult.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/ISourceElementRequestor.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (24 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/SemanticRest.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/AggregateDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/AttribDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ClassDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CompoundStatement.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/DeclarationExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncDeclaration.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Import.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Module.java (modified) (13 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/SemanticContext.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateMixin.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/CompilationUnitElementInfo.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/core/CompilationUnitStructureRequestor.java (modified) (9 diffs)
• trunk/descent.core/src/descent/internal/core/SourceType.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/SourceTypeElementInfo.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/formatter/CodeFormatterVisitor.java (modified) (2 diffs)
• trunk/descent.debug.core/META-INF/MANIFEST.MF (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.tests/AllWorkbenchTests.java (modified) (2 diffs)
• trunk/descent.tests/descent/tests/lookup/Lookup_Test.java (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.ui/icons/full/obj16/classf_obj.gif (modified) (previous)
• trunk/descent.ui/src/descent/internal/ui/text/JavaPartitionScanner.java (modified) (4 diffs)
• trunk/descent.ui/src/descent/internal/ui/text/java/hover/JavaEvaluateHover.java (modified) (1 diff)
• trunk/descent.ui/src/descent/ui/JavaElementLabels.java (modified) (1 diff)

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

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

trunk/descent.core/src/descent/core/IEvaluationResult.java

@@ -170 +170 @@
-     * An array result (which is not char[], dchar[] or wchar[]).
-     * {@link #getValue()} can be safely cast to {@link IEvaluationResult[]}.
-     * TODO: implement this
-     */
-    int ARRAY = CREAL + 1;
@@ -179 +178 @@
-     */
-    int COMPILATION_UNIT = ARRAY + 1;
+    
+    /**
+     * A struct literal result.
+     * {@link #getValue()} can be safely cast to IStructLiteral.
+     */
+    int STRUCT_LITERAL = COMPILATION_UNIT + 1;
-    
-    /**

trunk/descent.core/src/descent/core/IType.java

@@ -1074 +1074 @@
-     */
-    String[][] resolveType(String typeName, WorkingCopyOwner owner) throws JavaModelException;
+    
+    /**
+     * Determines whether this type was declared like "class Bar;", that
+     * is, it is just a forward declaration definition.
+     */
+    boolean isForwardDeclaration() throws JavaModelException;
-}

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

@@ -45 +45 @@
-    
-    private final static boolean RESOLVE = true;
-fals
+tru
-    
-    public static class ParseResult {

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

@@ -433 +433 @@
-            
-            time = System.currentTimeMillis() - time;
-//
+
-        }
-    }
@@ -717 +717 @@
-        doSemantic();
-        
+        node.semantic(Scope.createGlobal(node.mod, semanticContext), semanticContext);
+        node.mod.consumeRestStructure();
+        node.mod.consumeRest();
+        
-        if (node.mod != null) {
-            if (node.selectiveName == null) {
@@ -1375 +1379 @@
-                includesFilter = 0;
-                
+                wantOverrides = false;
-                if (wantOverrides) {
-                    List<FuncDeclaration> funcs = new ArrayList<FuncDeclaration>();
@@ -2285 +2290 @@
-                if (currentName.length == 0 || match(currentName, ident)) {
-                    if (member.getSignature() == null) {
+                        member.consumeRest();
-                        member.getSignature();
-                    }

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

@@ -16 +16 @@
-import descent.internal.compiler.impl.CompilerOptions;
-import descent.internal.compiler.parser.ASTDmdNode;
+import descent.internal.compiler.parser.ArrayInitializer;
+import descent.internal.compiler.parser.ArrayLiteralExp;
-import descent.internal.compiler.parser.CallExp;
-import descent.internal.compiler.parser.ComplexExp;
@@ -30 +32 @@
-import descent.internal.compiler.parser.SemanticContext;
-import descent.internal.compiler.parser.StringExp;
+import descent.internal.compiler.parser.StructLiteralExp;
-import descent.internal.compiler.parser.Type;
-import descent.internal.compiler.parser.TypeEnum;
@@ -141 +144 @@
-            ExpInitializer expInit = (ExpInitializer) init;
-            evalExp(expInit.exp);
+        } else if (init.isArrayInitializer() != null) {
+            ArrayInitializer arrayInit = (ArrayInitializer) init;
+            
+            IEvaluationResult[] er = new IEvaluationResult[arrayInit.value.size()];
+            for (int i = 0; i < er.length; i++) {
+                Initializer subInit = arrayInit.value.get(i);
+                evalInit(subInit);
+                er[i] = result;
+            }
+            
+            result = new EvaluationResult(er, IEvaluationResult.ARRAY);
-        }
-    }
@@ -155 +169 @@
-        } else if (exp instanceof NegExp) {
-            // evalExp(((NegExp) exp).e1);
+        } else if (exp instanceof StructLiteralExp) {
+            StructLiteralExp sle = (StructLiteralExp) exp;
+            String name = sle.sd.ident.toChars();
+            String[] names = new String[sle.sd.fields.size()]; 
+            for (int i = 0; i < names.length; i++) {
+                names[i] = sle.sd.fields.get(i).ident.toChars();
+            }
+            IEvaluationResult[] values = new IEvaluationResult[sle.elements.size()];
+            for (int i = 0; i < values.length; i++) {
+                evalExp(sle.elements.get(i));
+                values[i] = result;
+            }
+            
+            StructLiteral sl = new StructLiteral(name, names, values);
+            result = new EvaluationResult(sl, IEvaluationResult.STRUCT_LITERAL);
+        } else if (exp instanceof ArrayLiteralExp) {
+            ArrayLiteralExp ale = (ArrayLiteralExp) exp;
+            
+            IEvaluationResult[] er = new IEvaluationResult[ale.elements.size()];
+            for (int i = 0; i < er.length; i++) {
+                evalExp(ale.elements.get(i));
+                er[i] = result;
+            }
+            
+            result = new EvaluationResult(er, IEvaluationResult.ARRAY);
-        }
-    }

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

@@ -23 +23 @@
-    @Override
-    public String toString() {
+        if (value instanceof IEvaluationResult[]) {
+            IEvaluationResult[] results = (IEvaluationResult[]) value;
+            
+            StringBuilder sb = new StringBuilder();
+            sb.append("[");
+            for (int i = 0; i < results.length; i++) {
+                if (i != 0) {
+                    sb.append(", ");
+                }
+                sb.append(results[i]);
+            }
+            sb.append("]");
+            return sb.toString();
+        }
-        return value.toString();
-    }

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

@@ -900 +900 @@
-    @Override
-    protected AggregateDeclaration endAggregateDeclaration(AggregateDeclaration a) {
-
-
-
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
-        return super.endAggregateDeclaration(a);
-    }

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

@@ -47 +47 @@
-        public char[][] superinterfaces;
-        public TypeParameterInfo[] typeParameters;
+        public boolean isForwardDeclaration;
-    }
-    

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

@@ -367 +367 @@
-            }
-        }
+        info.isForwardDeclaration = node.members == null;
-        //info.secondary = !foundType;
-        
@@ -765 +766 @@
-            info.nameSourceEnd = node.start + 3; // enum
-        }
-
+info.isForwardDeclaration = node.members == null;
-        info.superinterfaces = node.memtype == null ? CharOperation.NO_CHAR_CHAR : new char[][] { getSignature(node.memtype) };
-        

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

@@ -72 +72 @@
-import descent.internal.compiler.parser.VersionCondition;
-import descent.internal.compiler.parser.VersionSymbol;
+import descent.internal.core.CompilationUnit;
+import descent.internal.core.CompilationUnitElementInfo;
-import descent.internal.core.CompilerConfiguration;
-import descent.internal.core.InternalSignature;
@@ -89 +91 @@
-     * Whether to make surface Module semantic.
-     */
-LAZY & fals
+tru
-    
-    /*
@@ -135 +137 @@
-     * Currently doesn't work.
-     */
-fals
+tru
-    
-    /*
@@ -162 +164 @@
-     * is returned normally, without skipping it.
-     */
-
+public static 
-        HashtableOfCharArrayAndObject versions = new HashtableOfCharArrayAndObject();
-        HashtableOfCharArrayAndObject debugs = new HashtableOfCharArrayAndObject();
@@ -169 +171 @@
-    
-    private final ASTNodeEncoder encoder;   
-rivate
+ublic
-    
-    /**
@@ -198 +200 @@
-     * @return the module representing the unit
-     */
-
+
+
+
-        final Module module = new Module(unit.getElementName(), new IdentifierExp(unit.getModuleName().toCharArray()));
-        module.setJavaElement(unit);
-        module.moduleName = unit.getFullyQualifiedName();
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            try {
-                IPackageDeclaration[] packageDeclarations = unit.getPackageDeclarations();
-                if (packageDeclarations.length == 1) {
-                    String elementName = packageDeclarations[0].getElementName();
-                    Identifiers packages = new Identifiers();
-                    IdentifierExp name = splitName(elementName, packages);  
-                    module.md = new ModuleDeclaration(packages, name);
-                }
-                
-                State state = new State();
-                
@@ -251 +264 @@
-            } catch (JavaModelException e) {
-                Util.log(e);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        return module;
-    }
-    
-rivate
+ublic
-            State state) throws JavaModelException {
-        for(IJavaElement elem : elements) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -485 +510 @@
-    }
-
-rivate
+ublic
-            final State state) throws JavaModelException {
-        boolean surface = state.surface;
@@ -502 +527 @@
-                                member.sourceBaseclasses = new BaseClasses(member.baseclasses);
-                            }
+                            if (type.isForwardDeclaration()) {
+                                return;
+                            }
-                            member.members = new Dsymbols();
-                            fill(module, member.members, type.getChildren(), state);
@@ -507 +535 @@
-                        } catch (JavaModelException e) {
-                            Util.log(e);
-  
+
-                    };
-                });
-            } else {
-                member = new ClassDeclaration(getLoc(module, type), getIdent(type), getBaseClasses(type));
-
-
-
+
+
+
+
+
+
-            }
-
@@ -531 +562 @@
-                                member.sourceBaseclasses = new BaseClasses(member.baseclasses);
-                            }
+                            if (type.isForwardDeclaration()) {
+                                return;
+                            }
-                            member.members = new Dsymbols();
-                            fill(module, member.members, type.getChildren(), state);
@@ -543 +577 @@
-                member = new InterfaceDeclaration(getLoc(module, type), getIdent(type), getBaseClasses(type));
-                
-
-
-
+
+
+
+
+
-            }
-            
@@ -561 +597 @@
-                    member.rest = new SemanticRest(new Runnable() {
-                        public void run() {
-                            member.members = new Dsymbols();
-                            try {
+                                if (type.isForwardDeclaration()) {
+                                    return;
+                                }
+                                
+                                member.members = new Dsymbols();
-                                fill(module, member.members, type.getChildren(), state);
-                                member.sourceMembers = new Dsymbols(member.members);
@@ -572 +612 @@
-                } else {
-                    member = new StructDeclaration(getLoc(module, type), id);
-
-
-
+
+
+
+
+
+
-                }
-                
@@ -591 +634 @@
-                    member.rest = new SemanticRest(new Runnable() {
-                        public void run() {
-                            member.members = new Dsymbols();
-                            try {
+                                if (type.isForwardDeclaration()) {
+                                    return;
+                                }
+
+                                member.members = new Dsymbols();
-                                fill(module, member.members, type.getChildren(), state);
-                                member.sourceMembers = new Dsymbols(member.members);
@@ -603 +650 @@
-                    member = new UnionDeclaration(getLoc(module, type), id);
-                    
-
-
-
+
+
+
+
+
-                }
-                
@@ -612 +661 @@
-            }
-        } else if (type.isEnum()) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        } else if (type.isTemplate()) {
-            final TemplateDeclaration member;
@@ -687 +695 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            boolean isUnion, State state) throws JavaModelException {
-        Dsymbols symbols = new Dsymbols();
@@ -696 +757 @@
-    }
-
-rivate
+ublic
-        if (field.isVariable()) {
-            final VarDeclaration member;
@@ -747 +808 @@
-    }
-
-rivate void
+ublic Dsymbol
-        String elementName = impDecl.getElementName();
-        Identifiers packages = new Identifiers();
@@ -772 +833 @@
-        }
-        
-
+
+
+
-    }
-    
@@ -788 +851 @@
-    }
-    
-rivate
+ublic static
-        String name = init.getElementName();
-        if ("".equals(name) || "D".equals(name)) {
@@ -962 +1025 @@
-    
-    
-rivate
+ublic
-        return wrap(symbol, member.getFlags());
-    }
-    
-rivate
+ublic
-        int stc = getStorageClass(flags);