Changeset 2235
- Timestamp:
- 07/11/08 08:09:44 (5 months ago)
- Files:
-
- trunk/ProjectFortress/parser_tests/DeclTest.fss (added)
- trunk/ProjectFortress/parser_tests/DeclTest2.fsi (added)
- trunk/ProjectFortress/parser_tests/VarNYITest.fss (added)
- trunk/ProjectFortress/parser_tests/VarNYITest2.fsi (added)
- trunk/ProjectFortress/src/com/sun/fortress/parser/Spacing.rats (modified) (1 diff)
- trunk/ProjectFortress/src/com/sun/fortress/parser/Variable.rats (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ProjectFortress/src/com/sun/fortress/parser/Spacing.rats
r2233 r2235 64 64 || yyValue.contains("\n")) }; 65 65 66 private String wValue =67 a1s:Whitespace*68 { yyValue = "";69 for (String s : (List<String>)a1s.list()) {70 yyValue += s;71 }72 };73 private String wrValue =74 a1s:Whitespace+75 { yyValue = "";76 for (String s : (List<String>)a1s.list()) {77 yyValue += s;78 }79 };80 81 66 transient void w = void:Whitespace*; // whitespace optional 82 67 transient void wr = void:Whitespace+; // whitespace required trunk/ProjectFortress/src/com/sun/fortress/parser/Variable.rats
r2233 r2235 96 96 /* VarImmutableMods ::= (VarImmutableMod w)+ */ 97 97 transient List<Modifier> VarImmutableMods = 98 <NYI>a1s:(VarImmutableMod w)+98 a1s:(VarImmutableMod w)+ 99 99 { yyValue = FortressUtil.mkList(a1s.list()); 100 100 FortressUtil.noDuplicate(yyValue); … … 104 104 transient private Modifier VarMod = 105 105 AbsVarMod 106 / <NYI>a1:private106 / a1:private 107 107 { yyValue = new ModifierPrivate(createSpan(yyStart,yyCount)); }; 108 108 109 109 /* VarImmutableMod ::= AbsVarImmutableMod | private */ 110 110 transient private Modifier VarImmutableMod = 111 <NYI1>AbsVarImmutableMod112 / <NYI2>a1:private111 AbsVarImmutableMod 112 / a1:private 113 113 { yyValue = new ModifierPrivate(createSpan(yyStart,yyCount)); }; 114 114 … … 168 168 }; 169 169 170 /* AbsVarMod ::= var | test*/170 /* AbsVarMod ::= var | AbsVarImmutableMod */ 171 171 transient private Modifier AbsVarMod = 172 172 a1:var { yyValue = new ModifierVar(createSpan(yyStart,yyCount)); } 173 / <NYI> a1:test { yyValue = new ModifierTest(createSpan(yyStart,yyCount)); };173 / AbsVarImmutableMod ; 174 174 175 175 /* AbsVarImmutableMod ::= test */ 176 176 transient private Modifier AbsVarImmutableMod = 177 <NYI>a1:test { yyValue = new ModifierTest(createSpan(yyStart,yyCount)); };177 a1:test { yyValue = new ModifierTest(createSpan(yyStart,yyCount)); };
