Changeset 369d8ecb6239f8f96d0abe435a0b50d8fbaabb9a

Timestamp:

06/28/09 23:36:49 (14 months ago)

Author:

mb0 <mb0@…>

Children:

85b4650e22de85722d0e932da31e0104e8a88327

Parents:

87f02d16be3ad1849f47a8a1e5c588a5924d4677

git-author:

mb0 <mb0@…> (06/05/09 02:44:14)

git-committer:

mb0 <mb0@…> (06/28/09 23:36:49)

Message:

unified some ast types that had different implementations for prfixes
added more fences to as3 syntax properties

Location:

org.axdt.as3/src/org/axdt/as3/imp/parser

Files:

• AS3Parser.g (modified) (6 diffs)
• AS3SyntaxProperties.java (modified) (1 diff)

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

@@ -527 +527 @@
 
  --W 
-Substatement_abbrev
+Substatement_abbrev$Substatement
         ::= EmptyStatment
           | Statement_abbrev
@@ -533 +533 @@
           | Attributes --no_line_break$ 
                 LCURLY$ Substatements RCURLY$
-Substatement_nosif
+Substatement_nosif$Substatement
         ::= EmptyStatment
           | Statement_nosif
@@ -539 +539 @@
           | Attributes --no_line_break$ 
                 LCURLY$ Substatements RCURLY$
-Substatement_full
+Substatement_full$Substatement
         ::= EmptyStatment
           | Statement_full
@@ -641 +641 @@
 DoStatement_full$DoStatement ::= do$ Substatement_abbrev$Statement while$ ParenListExpression$Condition Semicolon_full$
 
--- 15.17.2 While statement --W
+-- 15.7.2 While statement --W
 WhileStatement_abbrev$WhileStatement 
         ::= while$ ParenListExpression$Condition Substatement_abbrev$Statement
@@ -757 +757 @@
 
 -- 16 Directives --W
-AnnotatedDirective_abbrev ::= Attributes --no_line_break$ 
-                                AnnotatableDirective_abbrev
-                                | AnnotatableDirective_abbrev
+AnnotatedDirective_abbrev 
+        ::= Attributes --no_line_break$ 
+                AnnotatableDirective_abbrev
+        | AnnotatableDirective_abbrev
 Directive_abbrev ::= AnnotatedDirective_abbrev
           | EmptyStatment
@@ -1067 +1068 @@
 %End
 
+%Types
+RelationalExpression ::= RelationalExpression_allowin | RelationalExpression_noin
+
+EqualityExpression ::= EqualityExpression_allowin | EqualityExpression_noin 
+
+BitwiseAndExpression ::= BitwiseAndExpression_allowin | BitwiseAndExpression_noin
+
+BitwiseXorExpression ::= BitwiseXorExpression_allowin | BitwiseXorExpression_noin
+
+BitwiseOrExpression ::= BitwiseOrExpression_allowin | BitwiseOrExpression_noin
+
+LogicalAndExpression ::= LogicalAndExpression_allowin | LogicalAndExpression_noin
+
+LogicalOrExpression ::= LogicalOrExpression_allowin | LogicalOrExpression_noin
+
+ConditionalExpression ::= ConditionalExpression_allowin | ConditionalExpression_noin
+
+NonAssignmentExpression ::= NonAssignmentExpression_allowin | NonAssignmentExpression_noin
+
+AssignmentExpression ::= AssignmentExpression_allowin | AssignmentExpression_noin
+
+--AssignmentExpressionList ::= AssignmentExpression_allowinList | AssignmentExpression_noinList
+
+TypeExpression ::= TypeExpression_allowin | TypeExpression_noin
+
+Statement ::= Statement_abbrev | Statement_nosif | Statement_full
+
+Substatement ::= Substatement_abbrev | Substatement_nosif | Substatement_full
+
+Semicolon ::= Semicolon_abbrev | Semicolon_nosif | Semicolon_full
+
+ExpressionStatement ::= ExpressionStatement_abbrev | ExpressionStatement_nosif | ExpressionStatement_full
+
+SuperStatement ::= SuperStatement_abbrev | SuperStatement_nosif | SuperStatement_full
+
+LabeledStatement ::= LabeledStatement_abbrev | LabeledStatement_nosif | LabeledStatement_full
+
+IfStatement ::= IfStatement_abbrev | IfStatement_nosif | IfStatement_full
+
+DoStatement ::= DoStatement_abbrev | DoStatement_nosif | DoStatement_full
+
+WhileStatement ::= WhileStatement_abbrev | WhileStatement_nosif | WhileStatement_full
+
+ForStatement ::= ForStatement_abbrev | ForStatement_nosif | ForStatement_full
+
+ContinueStatement ::= ContinueStatement_abbrev | ContinueStatement_nosif | ContinueStatement_full
+
+BreakStatement ::= BreakStatement_abbrev | BreakStatement_nosif | BreakStatement_full
+
+WithStatement ::= WithStatement_abbrev | WithStatement_nosif | WithStatement_full
+
+ReturnStatement ::= ReturnStatement_abbrev | ReturnStatement_nosif | ReturnStatement_full
+
+ThrowStatement ::= ThrowStatement_abbrev | ThrowStatement_nosif | ThrowStatement_full
+
+VariableDefinitionSemi ::= VariableDefinitionSemi_abbrev | VariableDefinitionSemi_full
+%End

org.axdt.as3/src/org/axdt/as3/imp/parser/AS3SyntaxProperties.java

@@ -19 +19 @@
         public String[][] getFences() {
                 return new String[][] { new String[] { "{", "}" },
-                                new String[] { "[", "]" }, new String[] { "(", ")" } };
+                                new String[] { "[", "]" }, new String[] { "(", ")" },
+                                new String[] { "/*", "*/" }, new String[] { "<", ">" } };
         }