Changeset 101

Timestamp:

07/06/08 00:24:04 (6 months ago)

Author:

mb0

Message:

CLOSED - # 87: static members need their own scope.
http://axdt.org/ticket/87

Files:

• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g (modified) (2 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/parser/AS3Parser.g

@@ -219 +219 @@
-    -- class
-    ClassDeclaration$ClassDeclaration ::= Annotations Modifiers class$ IDENTIFIER$Name ClassExtends Implements ClassBody$Body
+    /.
+        $action_type.SymbolTable symbolTable;
+        public void setSymbolTable($action_type.SymbolTable symbolTable) { this.symbolTable = symbolTable; }
+        public $action_type.SymbolTable getSymbolTable() { return symbolTable; }
+    ./
-    
-    ClassExtends$Type ::= %empty | extends$ Name
@@ -577 +582 @@
-                                if (n instanceof FunctionExpression) return ((FunctionExpression) n).getSymbolTable();
-                                if (n instanceof ClassBody) return ((ClassBody) n).getSymbolTable();
+                                if (n instanceof ClassDeclaration) return ((ClassDeclaration) n).getSymbolTable();
-                                if (n instanceof InterfaceBody) return ((InterfaceBody) n).getSymbolTable();
-                                if (n instanceof ForStatement) return ((ForStatement) n).getSymbolTable();

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

@@ -13 +13 @@
-import org.axdt.as3.imp.parser.Ast.Block;
-import org.axdt.as3.imp.parser.Ast.ClassBody;
+import org.axdt.as3.imp.parser.Ast.ClassDeclaration;
-import org.axdt.as3.imp.parser.Ast.CustomNamespace;
-import org.axdt.as3.imp.parser.Ast.ExpressionStatement;
@@ -21 +22 @@
-import org.axdt.as3.imp.parser.Ast.InterfaceBody;
-import org.axdt.as3.imp.parser.Ast.MethodDeclaration;
+import org.axdt.as3.imp.parser.Ast.OtherMod;
-import org.axdt.as3.imp.parser.Ast.PackageBody;
-import org.axdt.as3.imp.parser.Ast.VariableDeclarator;
@@ -80 +82 @@
-        }
-
+        public boolean visit(ClassDeclaration n) {
+                n.setSymbolTable(pushNewTable());
+                return true;
+        }
+
-        public boolean visit(ClassBody n) {
-                n.setSymbolTable(pushNewTable());
@@ -115 +122 @@
-                }
-                for (Object o:n.getModifiers().getArrayList()) {
-
+
+
+
-                                name = o.toString() + "::" + name;
-                                break;
-                        }
-                }
@@ -169 +177 @@
-        public boolean visit(VariableDeclarator n) {
-                IAst parent = n.getParent().getParent();
+                SymbolTable symbol_table = peekTable();
-                String name = n.getName().toString();
-                if (parent instanceof FieldDeclaration) {
-                        FieldDeclaration f = (FieldDeclaration) parent;
-                        for (Object o:f.getModifiers().getArrayList()) {
-
+
+
+
-                                        name = o.toString() + "::" + name;
-                                        break;
-                                }
-                        }
-                }
-peekTable()
+symbol_table
-                return true;
-        }