Changeset 1222

Timestamp:

07/09/08 15:32:51 (2 months ago)

Author:

asterite

Message:

Now const and invariant are shown in the UI, except in autocompletion

Files:

• trunk/descent.core/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/descent.core/src/descent/core/Flags.java (modified) (2 diffs)
• trunk/descent.core/src/descent/core/Signature.java (modified) (4 diffs)
• trunk/descent.core/src/descent/core/compiler/IProblem.java (modified) (2 diffs)
• trunk/descent.core/src/descent/core/dom/ASTConverter.java (modified) (1 diff)
• trunk/descent.core/src/descent/core/dom/Modifier.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyAggregateDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/LazyModule.java (modified) (8 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/CallExp.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Declaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/FuncDeclaration.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Import.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (11 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Problem.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/ProblemMessages.properties (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Type.java (modified) (4 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/ast/NaiveASTFlattener.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/port.txt (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/ISignatureRequestor.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/InternalSignature.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/core/SignatureProcessor.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/SignatureRequestorAdapter.java (modified) (1 diff)
• trunk/descent.core/template/problem/IProblem.template.java (modified) (1 diff)
• trunk/descent.core/template/problem/problems.txt (modified) (1 diff)

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

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

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

@@ -105 +105 @@
-     * @since 2.0
-     */
-2
+80000
-    /**
-     * Scope property flag.
@@ -252 +252 @@
-     * @since 2.0
-     */
-0002
+4000
-    
-    /**

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

@@ -681 +681 @@
-    
-    /**
+     * Character constant indicating a const type in a signature.
+     * Value is <code>'x'</code>.
+     */
+    public static final char C_CONST                                    = 'x';
+    
+    /**
+     * Character constant indicating an invariant type in a signature.
+     * Value is <code>'y'</code>.
+     */
+    public static final char C_INVARIANT                                    = 'y';
+    
+    /**
-     * String constant for the signature of the primitive type void.
-     * Value is <code>"v"</code>.
@@ -1353 +1365 @@
-            }
-            @Override
+            public void acceptConst(String signature) {
+                replace(signature);
+            }
+            @Override
+            public void acceptInvariant(String signature) {
+                replace(signature);
+            }
+            @Override
-            public void acceptDynamicArray(String signature) {
-                replace(signature);
@@ -1496 +1516 @@
-            @Override
-            public void acceptStaticArray(char[] dimension, String signature) {
+                copy(signature);
+            }
+            @Override
+            public void acceptConst(String signature) {
+                copy(signature);
+            }
+            @Override
+            public void acceptInvariant(String signature) {
-                copy(signature);
-            }
@@ -1627 +1655 @@
-                sb.append('[');
-                sb.append(']');
+            }
+            @Override
+            public void acceptConst(String signature) {
+                Stack<StringBuilder> st = stack.peek();
+                
+                StringBuilder sb = st.peek();
+                sb.insert(0, "const(");
+                sb.append(')');
+            }
+            @Override
+            public void acceptInvariant(String signature) {
+                Stack<StringBuilder> st = stack.peek();
+                
+                StringBuilder sb = st.peek();
+                sb.insert(0, "invariant(");
+                sb.append(')');
-            }
-            @Override

trunk/descent.core/src/descent/core/compiler/IProblem.java

@@ -209 +209 @@
-    
-    /* Problems during lexing, parsing, and semantic analysis, generated automatically,
-4
+5
-    int UnterminatedBlockComment = 1;
-    int UnterminatedPlusBlockComment = 2;
@@ -272 +272 @@
-    int TypeOnlyAllowedIfAnonymousEnumAndNoEnumType = 61;
-    int IfTypeThereMustBeAnInitializer = 62;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}

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

@@ -3293 +3293 @@
-        case TOKlazy: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.LAZY_KEYWORD); break;
-        case TOKref: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.REF_KEYWORD); break;
+        case TOKenum: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.ENUM_KEYWORD); break;
-        default:
-            throw new IllegalStateException("Invalid modifier: " + a.tok);

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

@@ -32 +32 @@
- *    <b>lazy</b>
- *    <b>ref</b>
+ *    <b>enum</b>
- * </pre>
- */
@@ -62 +63 @@
-        LAZY_KEYWORD("lazy", LAZY),
-        REF_KEYWORD("ref", REF),
+        ENUM_KEYWORD("enum", ENUM),
-        ;
-