Changeset 1195

Timestamp:

06/22/08 14:10:19 (2 months ago)

Author:

asterite

Message:

Made all tests (except 4) pass. Fixed some bugs

Files:

• trunk/descent.core/src/descent/core/Flags.java (modified) (1 diff)
• trunk/descent.core/src/descent/core/Signature.java (modified) (4 diffs)
• trunk/descent.core/src/descent/core/dom/ASTConverter.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/codeassist/SelectionEngine.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateInstance.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Token.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/CompilationUnitStructureRequestor.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/formatter/CodeFormatterVisitor.java (modified) (1 diff)
• trunk/descent.tests/AllNonWorkbenchTests.java (modified) (3 diffs)
• trunk/descent.tests/descent/tests/assist/EnumMemberProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/FieldProposal_Test.java (modified) (6 diffs)
• trunk/descent.tests/descent/tests/assist/FunctionCallProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/TemplateProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/TemplatedAggregateProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/TemplatedFunctionProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/TypeProposal_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/binding/BindingExpression_Test.java (modified) (2 diffs)
• trunk/descent.tests/descent/tests/format/FormatEnumDeclaration_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/lookup/Lookup_Test.java (modified) (2 diffs)
• trunk/descent.tests/descent/tests/mangling/SignatureToCharArray_Test.java (modified) (2 diffs)
• trunk/descent.tests/descent/tests/mars/Comment_Test.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/mars/ScannerTests.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/model/HierarchyTest.java (modified) (6 diffs)

trunk/descent.core/src/descent/core/Flags.java

@@ -220 +220 @@
-     * @since 2.0
-     */
-100000;
+200000; // 0x00100000 is already taken by AccTemplate
-    
-    // Extensions for fields (can reuse flags)

trunk/descent.core/src/descent/core/Signature.java

@@ -1020 +1020 @@
-    sb.append(C_STATIC_ARRAY);
-    sb.append(type);
-
+2
-    sb.append(dimension.length());
-    sb.append(C_STATIC_ARRAY);
@@ -1040 +1040 @@
-    ret[0] = C_STATIC_ARRAY;
-    System.arraycopy(type, 0, ret, 1, type.length);
-
+2
-    copyNumber(dimensionLength, dimensionLengthStringLength, ret, 2 + type.length);
-    ret[2 + type.length + dimensionLengthStringLength] = C_STATIC_ARRAY;
@@ -1143 +1143 @@
-    sb.append(C_SLICE);
-    sb.append(type);
-
+2
-    sb.append(lower.length());
-    sb.append(C_SLICE);
@@ -1170 +1170 @@
-    ret[0] = C_SLICE;
-    System.arraycopy(type, 0, ret, 1, type.length);
-
+2
-    
-    copyNumber(lowerLength, lowerLengthStringLength, ret, 2 + type.length);

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

@@ -1473 +1473 @@
-                    IdentifierExp name = a.names.get(i);
-                    SelectiveImport selective = new SelectiveImport(ast);
-
+
+
+
-                    if (alias == null) {
-                        setSourceRange(selective, name.start, name.length);

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

@@ -272 +272 @@
-    
-    Scope rootScope;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    
-    /**
@@ -1370 +1371 @@
-                endPosition = actualCompletionPosition;
-                
+                includesFilter = INCLUDE_VARIABLES;
-                completeScope(rootScope, INCLUDE_ALL);
+                includesFilter = 0;
-                
-                if (wantOverrides) {
@@ -1411 +1414 @@
-                }
-            } else {
+                includesFilter = INCLUDE_VARIABLES;
-                completeNode(node.baseclasses.get(baseClassIndex).type);
+                includesFilter = 0;
-            }
-        }
@@ -2004 +2009 @@
-    
-    private void suggestMember(Dsymbol member, char[] ident, boolean onlyStatics, long flags, HashtableOfCharArrayAndObject funcSignatures, int includes, boolean isAliased) {
+        if (includesFilter != 0) {
+            includes &= ~includesFilter;
+        }
+        
-        // The member may not have it's semantic pass done
-        member.consumeRestStructure();
@@ -2358 +2367 @@
-        }
-        
-
+isCompletingTypeIdentifier && !
-                ((includes & (INCLUDE_CONSTRUCTORS | INCLUDE_OPCALL)) != 0 && wantConstructorsAndOpCall)) {
-            // See if it's a function

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

@@ -44 +44 @@
-import descent.internal.compiler.parser.Token;
-import descent.internal.compiler.parser.Type;
+import descent.internal.compiler.parser.TypeClass;
-import descent.internal.compiler.parser.TypeExp;
-import descent.internal.compiler.parser.TypedefDeclaration;
@@ -439 +440 @@
-                    addBinarySearch(ctor);
-                }
+            } else if (node.newtype != null) {
+                if (node.newtype.getJavaElement() != null) {
+                    addJavaElement(node.newtype.getJavaElement());
+                } else if (node.newtype instanceof TypeClass){
+                    addBinarySearch(((TypeClass) node.newtype).sym);
+                }
-            }
-            return false;

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

@@ -468 +468 @@
-    @Override
-    protected DotIdExp newDotIdExp(Loc loc, Expression e, IdentifierExp id) {
+        Token pivot;
-        if (prevToken.ptr <= cursorLocation && cursorLocation <= prevToken.ptr + prevToken.sourceLen) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        } else {
-            return super.newDotIdExp(loc, e, id);
+        }
+        
+        if (cursorLocation <= id.start) {
+            assistNode = new CompletionOnDotIdExp(loc, e, new IdentifierExp(CharOperation.NO_CHAR));
+            return (DotIdExp) assistNode;
+        } else {
+            completionTokenStart = pivot.ptr;
+            completionTokenEnd = pivot.ptr + pivot.sourceLen;
+            completionToken = CharOperation.subarray(input, completionTokenStart, cursorLocation);
+            
+            assistNode = new CompletionOnDotIdExp(loc, e, id);
+            return (DotIdExp) assistNode;
-        }
-    }
@@ -869 +874 @@
-        }
-        
+        // If it's class NOT_IDENTIFIER and the cursor is after class, we don't want assist
+        if (prevToken.value == TOK.TOKclass && token.value != TOK.TOKidentifier) {
+            this.wantAssist = false;
+            this.wantKeywords = false;
+            return super.newClassDeclaration(loc, id, baseClasses);
+        }
+        
-        if (baseClasses != null) {
-            int i = 0;
@@ -913 +925 @@
-        }
-        
+        // If it's interface NOT_IDENTIFIER and the cursor is after class, we don't want assist
+        if (prevToken.value == TOK.TOKinterface && token.value != TOK.TOKidentifier) {
+            this.wantAssist = false;
+            this.wantKeywords = false;
+            return super.newClassDeclaration(loc, id, baseClasses);
+        }
+        
-        if (baseClasses != null) {
-            int i = 0;

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

@@ -1808 +1808 @@
-                // Descent: for binding resolution
-                arg.var = v;
+                if (type instanceof TypeFunction) {
+                    TypeFunction tf = (TypeFunction) type;
+                    if (tf.parameters != null && i < tf.parameters.size()) {
+                        tf.parameters.get(i).var = v;
+                    }
+                }
+                if (sourceType instanceof TypeFunction) {
+                    TypeFunction tf = (TypeFunction) sourceType;
+                    if (tf.parameters != null && i < tf.parameters.size()) {
+                        tf.parameters.get(i).var = v;
+                    }
+                }
-
-                v.storage_class |= STCparameter;

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

@@ -2208 +2208 @@
-
-        // Get array of TemplateParameters
-flag != 0 && token.value != TOKrparen
+(flag != 0 || token.value != TOKrparen)
-            
-            boolean isvariadic = false;
@@ -2646 +2646 @@
-                        }
-                        s = addImportAlias(s, name, alias);
-                        decldefs.add(s);
-                        s.setSourceRange(sStart, prevToken.ptr + prevToken.sourceLen - sStart);
-                    } while (token.value == TOKcomma);
+                    
+                    decldefs.add(s);
+                    
-                    break; // no comma-separated imports of this form
-                } else {
@@ -7673 +7675 @@
-        return tok;
-    }
+    
+    @Override
+    public Token peek(Token ct) {
+        Token tok = super.peek(ct);
+        while(tok != null && 
+                (tok.value == TOK.TOKlinecomment || tok.value == TOK.TOKblockcomment || tok.value == TOKpluscomment ||
+                        tok.value == TOK.TOKdoclinecomment || tok.value == TOK.TOKdocblockcomment || tok.value == TOKdocpluscomment)) {
+            tok = super.peek(tok);
+        }
+        return tok;
+    }
-
-    @Override
@@ -7687 +7700 @@
-    
-    private void attachCommentToCurrentToken(Comment comment) {
-
-
-
-
-
-
-
-
+
+
-            return;
-        }
@@ -7961 +7968 @@
-    
-    protected Import addImportAlias(Import s, IdentifierExp name, IdentifierExp alias) {
-&&
+||
-            s.addAlias(name, alias);
-        }

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

@@ -45 +45 @@
-        this.loc = loc;
-        this.name = id;
-
+
+
+
-        this.encoder = encoder;
-    }

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

@@ -76 +76 @@
-    
-    public void setString(char[] input, int start, int length) {
+        if (start + length >= input.length) {
+            length = input.length - start;
+        }
+        
-        this.sourceString = new char[length];
-        System.arraycopy(input, start, this.sourceString, 0, length);

trunk/descent.core/src/descent/internal/core/CompilationUnitStructureRequestor.java

@@ -444 +444 @@
-        parameterNames[i] = manager.intern(parameterNames[i]);
-    info.setArgumentNames(parameterNames);
-, 'o','i', 'd'
+
-    info.setReturnType(manager.intern(returnType));
-    info.setParameterDefaultValues(methodInfo.parameterDefaultValues);

trunk/descent.core/src/descent/internal/formatter/CodeFormatterVisitor.java

@@ -78 +78 @@
-        } catch (AbortFormatting e)
-        {
+            e.printStackTrace();
-            return failedToFormat(e);
-        }

trunk/descent.tests/AllNonWorkbenchTests.java

@@ -74 +74 @@
-import descent.tests.mars.Recovery_Tests;
-import descent.tests.mars.ScannerTests;
-import descent.tests.mars.SourceElementParserTest;
-import descent.tests.mars.Statement_Test;
-import descent.tests.mars.Struct_Test;
@@ -131 +130 @@
-                    | LEXER_PARSER 
-                    | SIGNATURE 
-
+//
-                    | TRACE
-                    ;
@@ -213 +212 @@
-            suite.addTestSuite(ScannerTests.class);
-//          suite.addTestSuite(Semantic1_Test.class);
-            suite.addTestSuite(SourceElementParserTest.class);
-            suite.addTestSuite(Statement_Test.class);
-            suite.addTestSuite(Struct_Test.class);

trunk/descent.tests/descent/tests/assist/EnumMemberProposal_Test.java

@@ -2 +2 @@
-
-public class EnumMemberProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/assist/FieldProposal_Test.java

@@ -12 +12 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL }, 
-/
+B
-    }
-    
@@ -24 +24 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL }, 
-/
+B
-    }
-    
@@ -34 +34 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL }, 
-/
+B
-    }
-    
@@ -44 +44 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL }, 
-/
+B
-    }
-    
@@ -70 +70 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL },
-/
+B
-                );
-    }
@@ -117 +117 @@
-        assertCompletions(null, "test.d", s, pos, CompletionProposal.FIELD_REF,
-                new int[] { SIGNATURE, TYPE_SIGNATURE, DECLARATION_SIGNATURE, LABEL }, 
-/
+B
-    }
-    

trunk/descent.tests/descent/tests/assist/FunctionCallProposal_Test.java

@@ -2 +2 @@
-
-public class FunctionCallProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/assist/TemplateProposal_Test.java

@@ -2 +2 @@
-
-public class TemplateProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/assist/TemplatedAggregateProposal_Test.java

@@ -2 +2 @@
-
-public class TemplatedAggregateProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/assist/TemplatedFunctionProposal_Test.java

@@ -2 +2 @@
-
-public class TemplatedFunctionProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/assist/TypeProposal_Test.java

@@ -2 +2 @@
-
-public class TypeProposal_Test extends AbstractCompletionTest {
+    
+    public void test() throws Exception {
+        
+    }
-
-}

trunk/descent.tests/descent/tests/binding/BindingExpression_Test.java

@@ -11 +11 @@
-
-
-
+ 
-    
-    public void testExpression(String expString, String expectedSignature) throws Exception {
@@ -47 +47 @@
-    
-    public void testString() throws Exception {
-G
+&
-    }
-    
-    public void testStrings() throws Exception {
-G
+&
-    }
-    

trunk/descent.tests/descent/tests/format/FormatEnumDeclaration_Test.java

@@ -101 +101 @@
-                    "\ty, // comment\r\n" +
-                    "\tz // comment\r\n" +
- 
+
-                
-                "/*\r\n" +

trunk/descent.tests/descent/tests/lookup/Lookup_Test.java

@@ -1 +1 @@
-package descent.tests.lookup;
+
+import java.util.Hashtable;
+
+import descent.core.JavaCore;
-
-/*
@@ -6 +10 @@
- */
-public class Lookup_Test extends AbstractLookupTest {
+    
+    @Override
+    protected void setUp() throws Exception {
+        Hashtable opts = JavaCore.getOptions();
+        opts.put(JavaCore.COMPILER_SHOW_SEMANTIC_ERRORS, "2");
+        JavaCore.setOptions(opts);
+        
+        super.setUp();
+    }
-    
-    public void testExtern() throws Exception {

trunk/descent.tests/descent/tests/mangling/SignatureToCharArray_Test.java

@@ -58 +58 @@
-    
-    public void testIdentifier() {
-ar.B
+
-    }
-    
@@ -142 +142 @@
-    
-    public void testTemplateInstance() {
-ar.B
+
-    }
-    
-    public void testTemplateInstanceSymbol() {
-ar.B
+
-    }
-    
-    public void testTemplateInstanceType() {
-ar.B
+
-    }
-    
-    public void testTemplateInstanceValue() {
-ar.B
+
-    }
-    
-    public void testTemplateInstanceManyTypes() {
-ar.B
+
-    }
-    

trunk/descent.tests/descent/tests/mars/Comment_Test.java

@@ -5 +5 @@
-import descent.core.dom.AggregateDeclaration;
-import descent.core.dom.AliasDeclaration;
+import descent.core.dom.CompilationUnit;
-import descent.core.dom.DDocComment;
-import descent.core.dom.CompilationUnit;
-import descent.core.dom.Declaration;
-import descent.core.dom.ModuleDeclaration;
-import descent.core.dom.TypedefDeclaration;
-import descent.core.dom.VariableDeclaration;
-import descent.internal.compiler.parser.VarDeclaration;
-
-public class Comment_Test extends Parser_Test {

trunk/descent.tests/descent/tests/mars/ScannerTests.java

@@ -75 +75 @@
-            case TOKarraylength:
-            case TOKblit:
+            case TOKtls:
+            case TOKline:
+            case TOKfile:
-                continue;
-            }

trunk/descent.tests/descent/tests/model/HierarchyTest.java

@@ -66 +66 @@
-        
-        imp = (IImportDeclaration) imports[0];      
-foo = 
+
-        assertEquals("import foo = one", imp.getSource());
-        assertEquals(1, imp.getSourceRange().getOffset());
@@ -72 +72 @@
-
-        imp = (IImportDeclaration) imports[1];      
- : three
+
-        assertEquals("two : three;", imp.getSource());
-        assertEquals(19, imp.getSourceRange().getOffset());
@@ -127 +127 @@
-        assertFalse(type.isStruct());
-        assertFalse(type.isUnion());
-Fals
+Tru
-        assertEquals("Clazz1", type.getElementName());
-        assertEquals(1, type.getSourceRange().getOffset());
@@ -249 +249 @@
-        assertFalse(method.isNew());
-        assertFalse(method.isDelete());
+        assertTrue(method.isTemplate());
-        assertEquals(16, method.getSourceRange().getOffset());
-        assertEquals(34, method.getSourceRange().getLength());
@@ -341 +342 @@
-        assertEquals(16, method.getJavadocRanges()[0].getOffset());
-        assertEquals(11, method.getJavadocRanges()[0].getLength());
-
+new
-        assertEquals(1, method.getNumberOfParameters());
-        assertEquals(1, method.getParameterNames().length);
@@ -371 +372 @@
-        assertEquals(16, method.getJavadocRanges()[0].getOffset());
-        assertEquals(11, method.getJavadocRanges()[0].getLength());
-
+delete
-        assertEquals(1, method.getNumberOfParameters());
-        assertEquals(1, method.getParameterNames().length);