Changeset 1215

Timestamp:

07/06/08 22:33:50 (3 months ago)

Author:

asterite

Message:

Fixed ticket #102, which I accidentaly broke when implementing the optimization stuff...

Files:

• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (7 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ScopeDsymbol.java (modified) (1 diff)

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

@@ -719 +719 @@
-        doSemantic();
-        
-
+//
-        
-        if (node.mod != null) {
+            node.mod = node.mod.unlazy(semanticContext);
-            if (node.selectiveName == null) {
-                this.startPosition = actualCompletionPosition;
@@ -1095 +1096 @@
-        
-        if (sym instanceof ClassDeclaration) {
-
-
+
-            
-            Declaration func = cd.ctor;
@@ -1405 +1405 @@
-                        TypeClass tc = (TypeClass) bc.type;
-                    loop:
-
+unlazy(semanticContext).
-                            if (member instanceof FuncDeclaration) {
-                                FuncDeclaration fd = (FuncDeclaration) member;
@@ -1501 +1501 @@
-        } else {
-            if (sym instanceof ScopeDsymbol) {
-ScopeDsymbol) sym
+(ScopeDsymbol) sym).unlazy(semanticContext)
-                if (scopeDsymbol.members != null) {
-                    completeScopeDsymbol(scopeDsymbol, false /* not only statics */, includes);
@@ -1541 +1541 @@
-    
-    private void completeScopeDsymbol(ScopeDsymbol sd, boolean onlyStatics, int includes) {
+        sd = sd.unlazy(semanticContext);
-        if (sd instanceof ClassDeclaration) {
-            completeTypeClass((TypeClass) sd.type(), onlyStatics);
@@ -1554 +1555 @@
-
-    private Dsymbol getScopeSymbol(Scope scope) {
+        scope.scopesym = scope.scopesym == null ? null : scope.scopesym.unlazy(semanticContext);
-        if (scope.scopesym == null || scope.scopesym.members == null
-                || scope.scopesym.members.isEmpty()) {
@@ -2002 +2004 @@
-            if (member instanceof StructDeclaration ||
-                member instanceof EnumDeclaration) {
-
+unlazy(semanticContext).
-            }
-            return;

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

@@ -345 +345 @@
-        return null;
-    }
+    
+    public ScopeDsymbol unlazy(SemanticContext context) {
+        return this;
+    }
-
-}