Changeset 39

Timestamp:

06/05/08 22:56:08 (7 months ago)

Author:

mb0

Message:

added "use" namespace directive.
enabled complex namespace qualifier.
reworked primary expressions.
added scope for for.

Files:

• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g (modified) (10 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/SymbolTableVisitor.java (modified) (2 diffs)

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

@@ -151 +151 @@
-        public IAst getDeclaration() { return decl; }
-    ./
-    QIdent$QIdent ::= NamespaceMod DBL_COLON$ Ident
-    
-    -- cunit
@@ -165 +164 @@
-    TypeSpaceEntry ::= InterfaceDeclaration
-    TypeSpaceEntry ::= NamespaceDeclaration
+    TypeSpaceEntry ::= NamespaceDirective
-    TypeSpaceEntry ::= FieldDeclaration
-    TypeSpaceEntry ::= MethodDeclaration
@@ -224 +224 @@
-    ClassMemberDeclaration ::= MethodDeclaration
-    ClassMemberDeclaration ::= NamespaceDeclaration
+    ClassMemberDeclaration ::= NamespaceDirective
-    
-    ClassMemberDeclaration$EmptyDeclaration ::= SEMI$
@@ -230 +231 @@
-    NamespaceDeclaration$NamespaceDeclaration ::= Modifiers namespace IDENTIFIER$Name
-    NamespaceDeclaration$NamespaceDeclaration ::= Modifiers namespace IDENTIFIER$Name ASSIGN$ Expression$Initializer
+    
+    NamespaceDirective$NamespaceDirective ::= use$ namespace$ Ident SemiOpt$
+    
-    
-    FieldDeclaration$FieldDeclaration ::= Annotations Modifiers FieldType VariableDeclarators SemiOpt
@@ -316 +320 @@
-                            | SuperStatement
-                            | ThrowStatement
+                            | NamespaceDirective
-    EmptyStatement ::= SEMI
-    
@@ -357 +362 @@
-    ForStatementNoShortIf$ForStatement ::= for$ LPAREN$ ForHead RPAREN$ StatementNoShortIf$Statement
-    ForStatementNoShortIf$ForStatement ::= for$ each$ LPAREN$ ForHead RPAREN$ StatementNoShortIf$Statement
+    /.
+        $action_type.SymbolTable symbolTable;
+        public void setSymbolTable($action_type.SymbolTable symbolTable) { this.symbolTable = symbolTable; }
+        public $action_type.SymbolTable getSymbolTable() { return symbolTable; }
+    ./
-
-    ContinueStatement$ContinueStatement ::= continue$ SemiOpt$
@@ -391 +401 @@
-    -- expressions
-    Primary$Primary ::= Literal
-              | MethodInvocation
-              | ArrayAccess
-              | FieldAccess
-              | InstanceCreationExpression
-              | EncapsulatedExpression
-              | this
-              | super
-              | ArrayLiteral
-              | ObjectLiteral
-              | FunctionExpression
-
-
-
+
+
+
+
+
+
-    FunctionExpression$FunctionExpression ::= function$ ParameterBlock Block
-    /.
@@ -410 +416 @@
-        public $action_type.SymbolTable getSymbolTable() { return symbolTable; }
-    ./
-    
-    EncapsulatedExpression ::= LPAREN$ Expression RPAREN$
-    InstanceCreationExpression ::= new$ Type Arguments
-    
-    Arguments$Arguments ::= LPAREN$ %empty RPAREN$
-                          | LPAREN$ ElementList RPAREN$
-                
-    ElementList$$Expression ::= Expression
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                       
-
-
-
-
-
-
-
-
+
+
+
+
-    PostfixExpression ::= PostIncrementExpression
-    PostfixExpression ::= PostDecrementExpression
+    
+    QualifiedExpression ::= Secondary DBL_COLON$ PostfixExpression
-    
-    PostIncrementExpression ::= PostfixExpression$Expression INC$
@@ -480 +485 @@
-    InclusiveOrExpression ::= ExclusiveOrExpression
-    InclusiveOrExpression$InclusiveOrExpression ::= InclusiveOrExpression$Left BOR$ ExclusiveOrExpression$Right
-                       
+
-    ConditionalAndExpression ::= InclusiveOrExpression
-    ConditionalAndExpression$ConditionalAndExpression ::= ConditionalAndExpression$Left LAND$ InclusiveOrExpression$Right
@@ -539 +544 @@
-                if (n instanceof MethodDeclaration)
-                    return ((MethodDeclaration) n).getSymbolTable();
+                if (n instanceof FunctionExpression)
+                    return ((FunctionExpression) n).getSymbolTable();
-                if (n instanceof ClassBody)
-                    return ((ClassBody) n).getSymbolTable();
-                if (n instanceof InterfaceBody)
-                    return ((InterfaceBody) n).getSymbolTable();
+                if (n instanceof ForStatement)
+                    return ((ForStatement) n).getSymbolTable();
-            }
-            return getTopLevelSymbolTable();

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

@@ -16 +16 @@
-import org.axdt.as3.imp.parser.Ast.ExpressionStatement;
-import org.axdt.as3.imp.parser.Ast.FieldDeclaration;
+import org.axdt.as3.imp.parser.Ast.ForStatement;
-import org.axdt.as3.imp.parser.Ast.FormalParameter;
-import org.axdt.as3.imp.parser.Ast.FunctionExpression;
@@ -141 +142 @@
-                parser.symbolTableStack.pop();
-        }
+        public boolean visit(ForStatement n) {
+                n.setSymbolTable(pushNewTable());
+                return true;
+        }
+
+        public void endVisit(ForStatement n) {
+                parser.symbolTableStack.pop();
+        }
-        
-        @Override