Changeset 37

Timestamp:

06/05/08 18:57:43 (7 months ago)

Author:

mb0

Message:

1. added simple namespace support
   
2. added missing modifiers final enumerable explicit intrinsic
   
3. condensed constructor and method header into methoddeclaration
   

Files:

• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3ContentProposer.java (modified) (4 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3KWLexer.gi (modified) (2 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g (modified) (11 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/SymbolTableVisitor.java (modified) (5 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3LabelProvider.java (modified) (4 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3TreeModelBuilder.java (modified) (1 diff)

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3ContentProposer.java

@@ -32 +32 @@
-                if (decl instanceof VariableDeclarator)
-                        return ((VariableDeclarator) decl).getName().toString();
-Header
-Header
+Declaration
+Declaration
-                return "";
-        }
@@ -43 +43 @@
-                        string = ((VariableDeclarator) decl).getName().toString() + "  ("
-                                        + ((VariableDeclarator) decl).getType().toString() + ")";
-Header
-Header fdecl = (MethodHeader
+Declaration
+Declaration fdecl = (MethodDeclaration
-                        FormalParameterList parameters = fdecl.getParameterBlock().getParameters();
-                        string = fdecl.getReturnType().toString() + " "
@@ -64 +64 @@
-                } else if (decl instanceof MethodDeclaration) {
-                        MethodDeclaration fdecl = (MethodDeclaration) decl;
-MethodHeader().get
+
-                        String newText;
-
-MethodHeader().get
+
-                                        + "(";
-                        for (int i = 0; i < parameters.size(); i++)
@@ -73 +73 @@
-                                                + (i < parameters.size() - 1 ? ", " : "");
-                        newText += ")";
-MethodHeader().get
+
-                                        + " " + newText;
-                        return new SourceProposal(proposal, newText, prefix, offset);

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3KWLexer.gi

@@ -23 +23 @@
-    package import class interface
-    public private protected internal static dynamic override
+    final enumerable explicit intrinsic
-    extends implements function var const
-    if else for each in while do
@@ -108 +109 @@
-          $EndAction
-        ./
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    Keyword ::= e x t e n d s
-        /.$BeginAction

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g

@@ -35 +35 @@
-    package import class interface
-    public private protected internal static dynamic override
+    final enumerable explicit intrinsic
-    extends implements function var const
-    if else for each in while do
@@ -134 +135 @@
-    ObjectLiteralField$ObjectLiteralField ::= %empty
-    
-
+$ObjectLiteralFieldName
-    
-    -- types
-    Type ::= Name
-    TypeList$$Type ::= Type | TypeList COMMA Type
+    OptType ::= Type | STAR
-    
-    -- names
@@ -149 +151 @@
-        public IAst getDeclaration() { return decl; }
-    ./
+    QIdent$QIdent ::= NamespaceMod DBL_COLON$ Ident
-    
-    -- cunit
@@ -161 +164 @@
-    TypeSpaceEntry ::= ClassDeclaration
-    TypeSpaceEntry ::= InterfaceDeclaration
+    TypeSpaceEntry ::= NamespaceDeclaration
-    TypeSpaceEntry ::= FieldDeclaration
-    TypeSpaceEntry ::= MethodDeclaration
@@ -182 +186 @@
-    
-    SemiOpt ::= SEMI
+    
+    
-    -- mods
-    Modifiers$$Modifier ::= %empty | Modifiers Modifier
-
-
+
+
+
+
+
+
+
+
-    -- anno
-    Annotations$$Annotations ::= %empty | Annotations Annotation
@@ -210 +222 @@
-    
-    ClassMemberDeclaration ::= FieldDeclaration
-    ClassMemberDeclaration ::= ConstantDeclaration
-    ClassMemberDeclaration ::= ConstructorDeclaration
-    ClassMemberDeclaration ::= MethodDeclaration
+    ClassMemberDeclaration ::= NamespaceDeclaration
-    
-    ClassMemberDeclaration$EmptyDeclaration ::= SEMI$
-    
-
-
-
+
+
+
+
+
+
+
-    
-    VariableDeclarators$$VariableDeclarator ::= VariableDeclarator | VariableDeclarators COMMA VariableDeclarator
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        $action_type.SymbolTable symbolTable;
-        public void setSymbolTable($action_type.SymbolTable symbolTable) { this.symbolTable = symbolTable; }
-        public $action_type.SymbolTable getSymbolTable() { return symbolTable; }
-    ./
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    
-    ParameterBlock$ParameterBlock ::= LPAREN$ RPAREN$
@@ -276 +277 @@
-    
-    InterfaceMemberDeclarations$$InterfaceMemberDeclaration ::= InterfaceMemberDeclaration | InterfaceMemberDeclarations InterfaceMemberDeclaration
-
-
-
+
-    InterfaceMemberDeclaration$EmptyDeclaration ::= SEMI$
+    InterfaceMemberDeclaration ::= NamespaceDeclaration
-
-    -- block
@@ -389 +389 @@
-    ThrowStatement$ThrowStatement ::= throw$ Expression SemiOpt$
-    
-
-    -- expressions
-
+$Primary
-              | MethodInvocation
-              | ArrayAccess
@@ -402 +401 @@
-              | ObjectLiteral
-              | FunctionExpression
+              | QIdent
-    
-    FunctionExpression$FunctionExpression ::= function$ ParameterBlock COLON$ ReturnType Block
@@ -419 +419 @@
-    ElementList$$Expression ::= Expression
-                               | ElementList COMMA Expression
-
+
+
-    FieldAccess$FieldAccess ::= Primary$Base DOT$ Ident
-    
-    MethodInvocation ::= MethodReference Arguments
-                       
-
-
+
-    MethodReference$MethodReference ::= Primary$Base DOT$ Ident
-    
@@ -539 +539 @@
-                if (n instanceof MethodDeclaration)
-                    return ((MethodDeclaration) n).getSymbolTable();
-                if (n instanceof ConstructorDeclaration)
-                    return ((ConstructorDeclaration) n).getSymbolTable();
-                if (n instanceof ClassBody)
-                    return ((ClassBody) n).getSymbolTable();

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/SymbolTableVisitor.java

@@ -1 +1 @@
-package org.axdt.as3.imp.parser;
-
+import lpg.runtime.IAst;
-import lpg.runtime.ILexStream;
-import lpg.runtime.IPrsStream;
@@ -12 +13 @@
-import org.axdt.as3.imp.parser.Ast.Block;
-import org.axdt.as3.imp.parser.Ast.ClassBody;
-
-
+
-import org.axdt.as3.imp.parser.Ast.ExpressionStatement;
+import org.axdt.as3.imp.parser.Ast.FieldDeclaration;
-import org.axdt.as3.imp.parser.Ast.FormalParameter;
-import org.axdt.as3.imp.parser.Ast.FormalParameterList;
-import org.axdt.as3.imp.parser.Ast.FunctionExpression;
-import org.axdt.as3.imp.parser.Ast.InterfaceBody;
-import org.axdt.as3.imp.parser.Ast.MethodDeclaration;
-import org.axdt.as3.imp.parser.Ast.MethodHeader;
-import org.axdt.as3.imp.parser.Ast.PackageBody;
-import org.axdt.as3.imp.parser.Ast.VariableDeclarator;
@@ -110 +109 @@
-
-        public boolean visit(MethodDeclaration n) {
-
-
+
-                SymbolTable symbol_table = peekTable();
-                String name = id.toString();
-hr.getSetOrGet
-hr.getSetOrGet
+n.getAccessorRole
+n.getAccessorRole
-                }
-
+
+
+
+
+
+
+
-                        emitError(id, "Illegal redeclaration of " + name);
-                // Add a symbol table for the parameters
@@ -129 +133 @@
-        }
-
-        public boolean visit(ConstructorDeclaration n) {
-                ConstructorHeader hr = n.getConstructorHeader();
-                IToken id = hr.getName().getIToken();
-                SymbolTable symbol_table = peekTable();
-                String name = id.toString();
-                
-                if (!symbol_table.create(name, hr))
-                        emitError(id, "Illegal redeclaration of " + name);
-                //
-                // Add a symbol table for the parameters
-                symbol_table = parser.new SymbolTable(symbol_table);
-                symbol_table = pushNewTable();
-                n.setSymbolTable(symbol_table);
-                return true;
-        }
-
-        public void endVisit(ConstructorDeclaration n) {
-                parser.symbolTableStack.pop();
-        }
-        
-        public boolean visit(FunctionExpression n) {
-                n.setSymbolTable(pushNewTable());
@@ -176 +160 @@
-        @Override
-        public boolean visit(VariableDeclarator n) {
+                IAst parent = n.getParent().getParent();
-                String name = n.getName().toString();
+                if (parent instanceof FieldDeclaration) {
+                        FieldDeclaration f = (FieldDeclaration) parent;
+                        for (Object o:f.getModifiers().getArrayList()) {
+                                if (o instanceof CustomNamespace) {
+                                        name =  o.toString() + "::" + name;
+                                        break;
+                                }
+                        }
+                }
-                if (!peekTable().create(name, n))
-                        emitError(n, "Illegal redeclaration of " + name);

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3LabelProvider.java

@@ -105 +105 @@
-                if (n instanceof InterfaceDeclaration)
-                        return OUTLINE_INTERFACE_IMAGE;
-                if (n instanceof ConstructorDeclaration) {
-                        ModifierList modifiers = ((ConstructorDeclaration)n).getConstructorHeader().getModifiers();
-                        if (modifiers!=null) {
-                                for (Object m:modifiers.getArrayList()) {
-                                        if (m instanceof Modifier) {
-                                                Modifier mod = (Modifier) m;
-                                                if ("private".equals(mod.toString()))  
-                                                        return OUTLINE_PRIVATE_CONSTRUCTOR_IMAGE;
-                                        }
-                                }
-                        }
-                        return OUTLINE_PUBLIC_CONSTRUCTOR_IMAGE;
-                }
-                if (n instanceof VariableDeclarator) {
-                        IAst parent = ((VariableDeclarator)n).getParent().getParent();
@@ -124 +111 @@
-                                if (modifiers!=null) {
-                                        for (Object m:modifiers.getArrayList()) {
-
-
-
+
+
-                                                                return OUTLINE_PRIVATE_FIELD_IMAGE;
-                                                }
@@ -135 +121 @@
-                }
-                if (n instanceof MethodDeclaration) {
-
+
+
-                        if (modifiers!=null) {
-                                for (Object m:modifiers.getArrayList()) {
-
-
-
+
+
+
+
-                                                        return OUTLINE_PRIVATE_METHOD_IMAGE;
+                                                }
-                                        }
-                                }
-                        }
+                        if (method.isConstructor)
+                                return OUTLINE_PUBLIC_CONSTRUCTOR_IMAGE;
-                        return OUTLINE_PUBLIC_METHOD_IMAGE;
-                }
@@ -170 +161 @@
-                        return ((VariableDeclarator)n).getName().toString();
-                if (n instanceof MethodDeclaration){
-Header header = ((MethodDeclaration)n).getMethodHeader()
-header.getSetOrGet
-header.getSetOrGet().toString() +" "+ header
-header
+Declaration method = (MethodDeclaration)n
+method.getAccessorRole
+method.getAccessorRole().toString() +" "+ method
+method
-                }
-                if (n instanceof ConstructorDeclaration)
-                        return ((ConstructorDeclaration)n).getConstructorHeader().getName().toString();
-                if (n instanceof ClassDeclaration)
-                        return ((ClassDeclaration)n).getName().toString();

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3TreeModelBuilder.java

@@ -32 +32 @@
-
-                public boolean visit(MethodDeclaration n) {
-                        createSubItem(n);
-                        return true;
-                }
-                
-                public boolean visit(ConstructorDeclaration n) {
-                        createSubItem(n);
-                        return true;