Changeset 1248

Timestamp:

09/02/08 11:29:09 (4 months ago)

Author:

asterite

Message:

Fixed some problems related to D2: thread local storage, manifest enum constants.

Files:

• trunk/descent.core/src/descent/core/Flags.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) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/TypeEnum.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/SourceField.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/javaeditor/EditorUtility.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/JavaCodeScanner.java (modified) (1 diff)

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

@@ -249 +249 @@
-    
-    /**
+     * Thread property flag.
+     * @since 2.0
+     */
+    public static final int AccThread = 0x8000000;
+    
+    /**
-     * Nothrow property flag.
-     * @since 2.0
@@ -490 +496 @@
-    public static boolean isConst(long flags) {
-        return (flags & AccConst) != 0;
+    }
+    
+    /**
+     * Returns whether the given integer includes the <code>__thread</code> modifier.
+     *
+     * @param flags the flags
+     * @return <code>true</code> if the <code>__thread</code> modifier is included
+     */
+    public static boolean isThread(long flags) {
+        return (flags & AccThread) != 0;
-    }
-    

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

@@ -3357 +3357 @@
-        case TOKpure: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.PURE_KEYWORD); break;
-        case TOKnothrow: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.NOTHROW_KEYWORD); break;
+        case TOKtls: b.setModifierKeyword(descent.core.dom.Modifier.ModifierKeyword.THREAD_KEYWORD); break;
-        default:
-            throw new IllegalStateException("Invalid modifier: " + a.tok);

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

@@ -68 +68 @@
-        PURE_KEYWORD("pure", PURE),
-        NOTHROW_KEYWORD("nothrow", NOTHROW),
+        THREAD_KEYWORD("__thread", THREAD),
-        ;
-        
@@ -271 +272 @@
-    
-    /**
+     * "__thread" modifier constant (bit mask).
+     */
+    public static final int THREAD = Flags.AccThread;
+    
+    /**
-     * The "modifierKeyword" structural property of this node type.
-     */

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

@@ -518 +518 @@
-
-    public void fillField(Module module, Dsymbols members, final IField field) throws JavaModelException {
-) {
+ || field.isEnumConstant()) { // enum constant for D2, like "enum int foo = 2;"
-            VarDeclaration member = new VarDeclaration(getLoc(module, field), getType(field.getTypeSignature()), getIdent(field), getInitializer(field));
-            member.setJavaElement(field);

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

@@ -58 +58 @@
-        // Initialize to first member of enum
-        Expression e;
-
+
+
+
+
+
-        return e;
-    }

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

@@ -156 +156 @@
- */
-public String getTypeSignature() throws JavaModelException {
-    // Descent: if I'm an enum constant, my type is my parent's type
-    if (this.isEnumConstant()) {
-        return getParent().getElementSignature();
-    }
-    
-    // Else, return my signature
-    SourceFieldElementInfo info = (SourceFieldElementInfo) getElementInfo();
-
+
+
+
+
+
+
+
+
-}
-/**

trunk/descent.ui/src/descent/internal/ui/javaeditor/EditorUtility.java

@@ -483 +483 @@
-            }
-        }
-        /* TODO JDT UI binary
-        else if (input instanceof IClassFileEditorInput) {
-            jProject= ((IClassFileEditorInput)input).getClassFile().getJavaProject();
-        }
-        */
-        return jProject;
-    }

trunk/descent.ui/src/descent/internal/ui/text/java/JavaCodeScanner.java

@@ -156 +156 @@
-        "__traits", //$NON-NLS-1$,
-        "__overloadset", //$NON-NLS-1$
+        "__thread", //$NON-NLS-1$
-        "nothrow", //$NON-NLS-1$
-        "pure", //$NON-NLS-1$