Changeset 1226

Timestamp:

07/12/08 19:38:24 (3 months ago)

Author:

asterite

Message:

Added const and invariant decorations to fields, methods, types and local variables.

Files:

• trunk/descent.core/src/descent/internal/compiler/parser/ASTDmdNode.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ASTNodeEncoder.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ArrayScopeSymbol.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CastExp.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/IndexExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Lexer.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/SliceExp.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Type.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeSArray.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeSlice.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/builder/JavaBuilder.java (modified) (3 diffs)
• trunk/descent.tests/descent/tests/mangling/SignatureToTemplateParameter_Test.java (modified) (11 diffs)
• trunk/descent.tests/descent/tests/mangling/SignatureToType_Test.java (modified) (18 diffs)
• trunk/descent.tests/descent/tests/mangling/Signature_Test.java (modified) (3 diffs)
• trunk/descent.tests/descent/tests/mars/Parser_Test.java (modified) (1 diff)
• trunk/descent.ui/icons/full/ovr16/const_co.gif (added)
• trunk/descent.ui/icons/full/ovr16/invariant_co.gif (added)
• trunk/descent.ui/src/descent/internal/ui/JavaPluginImages.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/viewsupport/JavaElementImageProvider.java (modified) (1 diff)
• trunk/descent.ui/src/descent/ui/JavaElementImageDescriptor.java (modified) (4 diffs)
• trunk/descent.ui/src/descent/ui/JavaElementLabels.java (modified) (1 diff)
• trunk/descent.ui/src/descent/ui/text/java/CompletionProposalLabelProvider.java (modified) (1 diff)

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

@@ -1204 +1204 @@
-    public static void arrayExpressionScanForNestedRef(Scope sc, Expressions a,
-            SemanticContext context) {
-=
+!
-            for (int i = 0; i < a.size(); i++) {
-                Expression e = a.get(i);
@@ -1327 +1327 @@
-            SemanticContext context) {
-        if (t.ty == Ttuple) {
-
+sc, 
-            sym.parent = sc.scopesym;
-            sc = sc.push(sym);
@@ -1342 +1342 @@
-    public static Expression semanticLength(Scope sc, TupleDeclaration s,
-            Expression exp, SemanticContext context) {
-
+c, s
-        sym.parent = sc.scopesym;
-        sc = sc.push(sym);
@@ -1958 +1958 @@
-    public static Expression eval_builtin(BUILTIN builtin,
-            Expressions arguments, SemanticContext context) {
+        if (size(arguments) == 0) {
+            return null;
+        }
+        
-        Expression arg0 = arguments.get(0);
-        Expression e = null;

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

@@ -15 +15 @@
-    
-    private Parser parser;
+    private final int apiLevel;
-    private Parser initParser(char[] source) {
-        if (parser == null) {
-Parser.DEFAULT_LEVEL
+apiLevel
-        } else {
-            parser.reset(source, 0, source.length, false, false, false, false);
@@ -25 +26 @@
-    }
-    
-
-
+int apiLevel
+this.apiLevel = apiLevel;      
-    }
-    

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

@@ -24 +24 @@
-    public TupleDeclaration td; // for tuples of objects
-    public Scope sc;
-
-    public ArrayScopeSymbol(Expression e) {
-        this(null, e);
-    }
-    
-    public ArrayScopeSymbol(Scope sc, Expression e) {
@@ -33 +29 @@
-        this.exp = e;
-        this.sc = sc;
-
-
-
-
+
+
+
-    }
-    
@@ -44 +39 @@
-        this.td = s;
-        this.sc = sc;
-
-
-
-
+
+
+
-    }
-    
@@ -204 +198 @@
-                }
-                
-                if (context.isD2()) {
-                    pvar.semantic(sc, context);
-                }
-                
-                // TODO semantic I think this logic is ok
-                // return *pvar;
-                if (pvar instanceof IndexExp) {
+                    if (context.isD2()) {
+                        ((IndexExp) pvar).lengthVar.semantic(sc, context);
+                    }
-                    return ((IndexExp) pvar).lengthVar;
-                } else {
+                    if (context.isD2()) {
+                        ((SliceExp) pvar).lengthVar.semantic(sc, context);
+                    }
-                    return ((SliceExp) pvar).lengthVar;
-                }

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

@@ -1 +1 @@
-package descent.internal.compiler.parser;
-
-import melnorme.miscutil.tree.TreeVisitor;
-import descent.core.compiler.IProblem;
-import descent.internal.compiler.parser.ast.IASTVisitor;
-import static descent.internal.compiler.parser.Constfold.Cast;
-import static descent.internal.compiler.parser.TOK.TOKarrayliteral;
-import static descent.internal.compiler.parser.TOK.TOKcall;
+import static descent.internal.compiler.parser.TOK.TOKconst;
+import static descent.internal.compiler.parser.TOK.TOKinvariant;
-import static descent.internal.compiler.parser.TOK.TOKnull;
-import static descent.internal.compiler.parser.TOK.TOKstring;
-import static descent.internal.compiler.parser.TOK.TOKsymoff;
-import static descent.internal.compiler.parser.TOK.TOKvar;
-
-import static descent.internal.compiler.parser.TY.Tarray;
-import static descent.internal.compiler.parser.TY.Tclass;
@@ -18 +16 @@
-import static descent.internal.compiler.parser.TY.Tstruct;
-import static descent.internal.compiler.parser.TY.Tvoid;
+import melnorme.miscutil.tree.TreeVisitor;
+import descent.core.compiler.IProblem;
+import descent.internal.compiler.parser.ast.IASTVisitor;
-
-
@@ -184 +185 @@
-        {
-            e1 = resolveProperties(sc, e1, context);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            e = op_overload(sc, context);

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

@@ -130 +130 @@
-        if (t1.ty == TY.Tsarray || t1.ty == TY.Tarray || t1.ty == TY.Ttuple) {
-            // Create scope for 'length' variable
-
+sc, 
-            sym.loc = loc;
-            sym.parent = sc.scopesym;

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

@@ -274 +274 @@
-            int apiLevel, char[] filename) {
-        this(source, offset, length, tokenizeComments, tokenizePragmas,
-
+apiLevel
-    }
-

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

@@ -203 +203 @@
-    public Parser(int apiLevel, char[] source, int offset, 
-            int length, char[][] taskTags, char[][] taskPriorities, boolean isTaskCaseSensitive, char[] filename) {
-
+apiLevel
-    }
-    
-    public Parser(int apiLevel, char[] source, int offset, 
-            int length, char[][] taskTags, char[][] taskPriorities, boolean recordLineSeparator, boolean isTaskCaseSensitive, char[] filename) {
-
+apiLevel
-    }
-    
@@ -236 +236 @@
-        this(source, offset, length, tokenizeComments, tokenizePragmas,
-                tokenizeWhiteSpace, recordLineSeparator, apiLevel,
-
+apiLevel
-    }
-    
@@ -2861 +2861 @@
-            t = parseType();
-            check(TOKrparen);
+            if (t == null) {
+                System.out.println(123456);
+            }
-            t = t.makeInvariant(start, prevToken.ptr + prevToken.sourceLen - start);
-            break;

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

@@ -199 +199 @@
-
-        if (t.ty == TY.Tsarray || t.ty == TY.Tarray || t.ty == TY.Ttuple) {
-
+sc, 
-            sym.loc = loc;
-            sym.parent = sc.scopesym;

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

@@ -502 +502 @@
-    public Type rto; // reference to this type
-    public Type arrayof; // array of this type
-    public Object vtinfo;
-    
-    /*
@@ -742 +741 @@
-            t.cto = null;
-            t.ito = null;
-            t.vtinfo = null;
-//          if (ty == Tsarray) {
-//              TypeSArray ta = (TypeSArray) t;
@@ -1320 +1318 @@
-            if (context.isD2()) {
-                if (t.isConst()) {
-t.
+
-                } else if (t.isInvariant()) {
-t.
+
-                } else {
-t.
+
-                }
-            } else {

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

@@ -232 +232 @@
-            TupleDeclaration td = s.isTupleDeclaration();
-            if (null != td) {
-
+sc, 
-                sym.parent = sc.scopesym;
-                sc = sc.push(sym);

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

@@ -61 +61 @@
-                 * It's a slice of a TupleDeclaration
-                 */
-
+sc, 
-                sym.parent = sc.scopesym;
-                sc = sc.push(sym);

trunk/descent.core/src/descent/internal/core/builder/JavaBuilder.java

@@ -47 +47 @@
-            fullBuild(project, monitor);
-        } else {
-
+
+
-        }
-        return null;
@@ -55 +56 @@
-        IJavaProject javaProject = JavaCore.create(project);
-        IResource[] members = project.members();
-
+javaProject.getApiLevel()
-    }
-    
@@ -72 +73 @@
-    private class JavaBuilderVisitor implements IResourceDeltaVisitor {
-        
-ASTNodeEncoder encoder = new ASTNodeEncoder()
-boolean showSemanticErrors
-
-
+private final boolean showSemanticErrors
+private final ASTNodeEncoder encoder
+
+int apiLevel, 
-            this.showSemanticErrors = showSemanticErrors;
+            this.encoder = new ASTNodeEncoder(apiLevel);
-        }
-

trunk/descent.tests/descent/tests/mangling/SignatureToTemplateParameter_Test.java

@@ -1 +1 @@
-package descent.tests.mangling;
-
+import descent.core.dom.AST;
-import descent.internal.compiler.parser.ASTNodeEncoder;
-import descent.internal.compiler.parser.IntegerExp;
@@ -14 +15 @@
-    public void testTuple() {
-        TemplateTupleParameter param = (TemplateTupleParameter) 
-
+AST.D1
-        assertNull(param.ident);
-    }
@@ -20 +21 @@
-    public void testAlias() {
-        TemplateAliasParameter param = (TemplateAliasParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertNull(param.specAliasT);
@@ -28 +29 @@
-    public void testAliasDefaultValue() {
-        TemplateAliasParameter param = (TemplateAliasParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertNull(param.specAliasT);
@@ -36 +37 @@
-    public void testAliasSpecificType() {
-        TemplateAliasParameter param = (TemplateAliasParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertSame(Type.tint32, param.specAliasT);
@@ -44 +45 @@
-    public void testType() {
-        TemplateTypeParameter param = (TemplateTypeParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertNull(param.specType);
@@ -52 +53 @@
-    public void testTypeSpecificType() {
-        TemplateTypeParameter param = (TemplateTypeParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertSame(Type.tint32, param.specType);
@@ -60 +61 @@
-    public void testTypeDefaultValue() {
-        TemplateTypeParameter param = (TemplateTypeParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertNull(param.specType);
@@ -68 +69 @@
-    public void testValue() {
-        TemplateValueParameter param = (TemplateValueParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertSame(Type.tint32, param.valType);
@@ -77 +78 @@
-    public void testValueSpecific() {
-        TemplateValueParameter param = (TemplateValueParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertSame(Type.tint32, param.valType);
@@ -86 +87 @@
-    public void testValueDefaultValue() {
-        TemplateValueParameter param = (TemplateValueParameter) 
-
+AST.D1
-        assertNull(param.ident);
-        assertSame(Type.tint32, param.valType);

trunk/descent.tests/descent/tests/mangling/SignatureToType_Test.java

@@ -30 +30 @@
-    
-    public void testPrimitive() {
-
+AST.D1
-        assertSame(Type.tint32, actual);
-    }
-    
-    public void testPointer() {
-
+AST.D1
-        assertSame(Type.tint32, actual.next);
-    }
-    
-    public void testStaticArray() {
-
+AST.D1
-        assertSame(Type.tint32, actual.next);
-        assertSame(3, ((IntegerExp) actual.dim).value.intValue());
@@ -46 +46 @@
-    
-    public void testDynamicArray() {
-
+AST.D1
-        assertSame(Type.tint32, actual.next);
-    }
-    
-    public void testAssociativeArray() {
-
+AST.D1
-        assertSame(Type.tint32, actual.index);
-        assertSame(Type.tchar, actual.next);
@@ -57 +57 @@
-    
-    public void testConst() {
-
+AST.D1
-        assertEquals(descent.internal.compiler.parser.TY.Tint32, actual.ty);
-        assertEquals(Type.MODconst, actual.mod);
@@ -63 +63 @@
-    
-    public void testInvariant() {
-
+AST.D1
-        assertEquals(descent.internal.compiler.parser.TY.Tint32, actual.ty);
-        assertEquals(Type.MODinvariant, actual.mod);
@@ -69 +69 @@
-    
-    public void testTypeof() {
-
+AST.D1
-        assertSame(3, ((IntegerExp) actual.exp).value.intValue());
-    }
-    
-    public void testSlice() {
-
+AST.D1
-        assertSame(Type.tint32, actual.next);
-        assertSame(1, ((IntegerExp) actual.lwr).value.intValue());
@@ -81 +81 @@
-    
-    public void testFunction() {
-
+AST.D1
-        assertEquals(LINK.LINKd, actual.linkage);
-        assertSame(Type.tchar, actual.next);
@@ -93 +93 @@
-    
-    public void testFunctionManyParameters() {
-
+AST.D1
-        assertEquals(LINK.LINKd, actual.linkage);
-        assertSame(Type.tvoid, actual.next);
@@ -111 +111 @@
-    
-    public void testFunctionParameterStorageClass() {
-
+AST.D1
-        assertEquals(LINK.LINKd, actual.linkage);
-        assertSame(Type.tchar, actual.next);
@@ -123 +123 @@
-    
-    public void testDelegate() {
-
+AST.D1
-        
-        TypeFunction actual = (TypeFunction) delegate.next;
@@ -137 +137 @@
-
-    public void testIdentifier() {
-
+AST.D1
-        
-        assertEquals("Foo", new String(actual.ident.ident));
@@ -144 +144 @@
-    
-    public void testIdentifier2() {
-
+AST.D1
-        
-        assertEquals("Bar", new String(actual.ident.ident));
@@ -153 +153 @@
-    
-    public void testInstance() {
-
+AST.D1
-        TemplateInstance templInstance = typeInstance.tempinst;
-        
@@ -161 +161 @@
-    
-    public void testInstanceType() {
-
+AST.D1
-        TemplateInstance templInstance = typeInstance.tempinst;
-        
@@ -171 +171 @@
-    
-    public void testInstanceSymbol() {
-
+AST.D1
-        TemplateInstance templInstance = typeInstance.tempinst;
-        
@@ -181 +181 @@
-    
-    public void testInstanceValue() {
-
+AST.D1
-        TemplateInstance templInstance = typeInstance.tempinst;
-        
@@ -191 +191 @@
-    
-    public void testQualifiedInstance() {
-
+AST.D1
-        assertEquals("Foo", new String(typeIdent.ident.ident));
-        
@@ -204 +204 @@
-    
-    public void testNestedInstance() {
-
+AST.D1
-        TemplateInstance tempInstance = typeInstance.tempinst;
-        
@@ -220 +220 @@
-    
-    public void testNestedQualifiedInstance() {
-
+AST.D1
-        assertEquals("Foo", new String(typeIdent.ident.ident));
-        

trunk/descent.tests/descent/tests/mangling/Signature_Test.java

@@ -2 +2 @@
-
-import descent.core.Signature;
+import descent.core.dom.AST;
-import descent.internal.compiler.parser.ASTNodeEncoder;
-import descent.internal.compiler.parser.IntegerExp;
@@ -26 +27 @@
-    
-    public void testStaticArray() {
-
+AST.D1
-            Signature.createStaticArraySignature(Signature.SIG_INT, "3"));
-    }
-    
-    public void testStaticArray2() {
-
+AST.D1
-            new String(Signature.createStaticArraySignature(Signature.SIG_INT.toCharArray(), "3".toCharArray())));
-    }
-    
-    public void testStaticArray3() {
-
+AST.D1
-            new String(Signature.createStaticArraySignature(Signature.SIG_INT.toCharArray(), "123".toCharArray())));
-    }
@@ -61 +62 @@
-    
-    public void testTypeof() {
-
+AST.D1
-            Signature.createTypeofSignature("3"));
-    }
-    
-    public void testTypeof2() {
-
+AST.D1
-            new String(Signature.createTypeofSignature("3".toCharArray())));
-    }
-    
-    public void testSlice() {
-
+AST.D1
-            Signature.createSliceSignature(Signature.SIG_INT, "1", "23"));
-    }
-    
-    public void testSlice2() {
-
+AST.D1
-            new String(Signature.createSliceSignature(Signature.SIG_INT.toCharArray(), "1".toCharArray(), "23".toCharArray())));
-    }

trunk/descent.tests/descent/tests/mars/Parser_Test.java

@@ -161 +161 @@
-            
-        }, result.module, null, new DmdModuleFinder(global), global, new CompilerConfiguration(),
-
+apiLevel
-        
-        if (!(result.module.problems != null && result.module.problems.size() > 0)) {

trunk/descent.ui/src/descent/internal/ui/JavaPluginImages.java

@@ -447 +447 @@
-    public static final ImageDescriptor DESC_OVR_FINAL= createUnManagedCached(T_OVR, "final_co.gif");                       //$NON-NLS-1$
-    public static final ImageDescriptor DESC_OVR_ABSTRACT= createUnManagedCached(T_OVR, "abstract_co.gif");                     //$NON-NLS-1$
+    public static final ImageDescriptor DESC_OVR_CONST= createUnManagedCached(T_OVR, "const_co.gif");                   //$NON-NLS-1$
+    public static final ImageDescriptor DESC_OVR_INVARIANT= createUnManagedCached(T_OVR, "invariant_co.gif");                   //$NON-NLS-1$
-    public static final ImageDescriptor DESC_OVR_SYNCH= createUnManagedCached(T_OVR, "synch_co.gif");                       //$NON-NLS-1$
-    public static final ImageDescriptor DESC_OVR_RUN= createUnManagedCached(T_OVR, "run_co.gif");                           //$NON-NLS-1$

trunk/descent.ui/src/descent/internal/ui/viewsupport/JavaElementImageProvider.java

@@ -374 +374 @@
-                    flags |= JavaElementImageDescriptor.STATIC;
-                
+                if (Flags.isInvariant(modifiers)) {
+                    flags |= JavaElementImageDescriptor.INVARIANT;
+                } else if (Flags.isConst(modifiers)) {
+                    flags |= JavaElementImageDescriptor.CONST;
+                }
+                
-                if (Flags.isDeprecated(modifiers))
-                    flags |= JavaElementImageDescriptor.DEPRECATED;

trunk/descent.ui/src/descent/ui/JavaElementImageDescriptor.java

@@ -69 +69 @@
-     * @since 3.0
-     */
-
+
+
+
+
+
+
+
-
-    private ImageDescriptor fBaseImage;
@@ -195 +201 @@
-    private void drawTopRight() {       
-        int x= getSize().x;
-
+ && (fFlags & FINAL) == 0
-            ImageData data= getImageData(JavaPluginImages.DESC_OVR_ABSTRACT);
-            x-= data.width;
@@ -205 +211 @@
-            drawImage(data, x, 0);
-        }
-
+ && (fFlags & ABSTRACT) == 0
-            ImageData data= getImageData(JavaPluginImages.DESC_OVR_FINAL);
-            x-= data.width;
@@ -215 +221 @@
-            drawImage(data, x, 0);
-        }
+        if ((fFlags & INVARIANT) != 0) {
+            ImageData data= getImageData(JavaPluginImages.DESC_OVR_INVARIANT);
+            x-= data.width;
+            drawImage(data, x, 0);
+        } else if ((fFlags & CONST) != 0) {
+            ImageData data= getImageData(JavaPluginImages.DESC_OVR_CONST);
+            x-= data.width;
+            drawImage(data, x, 0);
+        } 
-    }       
-    

trunk/descent.ui/src/descent/ui/JavaElementLabels.java

@@ -760 +760 @@
-                    }
-                    
-                    if (Flags.isInvariant(field.getFlags())) {
-                        buf.append("invariant ");
-                    } else if (Flags.isConst(field.getFlags())) {
-                        buf.append("const ");
-                    }
-                    
-                    getTypeSignatureLabel(new BindingKey(field.getKey()).toSignature(), flags, buf);
-                } else {
-                    if (!annonymous) {
-                        buf.append(DECL_STRING);
-                    }
-                    
-                    if (Flags.isInvariant(field.getFlags())) {
-                        buf.append("invariant ");
-                    } else if (Flags.isConst(field.getFlags())) {
-                        buf.append("const ");
-                    }
-                    

trunk/descent.ui/src/descent/ui/text/java/CompletionProposalLabelProvider.java

@@ -821 +821 @@
-