Changeset 2168
- Timestamp:
- 07/03/08 08:00:01 (2 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ProjectFortress/src/com/sun/fortress/parser/Expression.rats
r2104 r2168 62 62 <As> As 63 63 / <Asif> AsIf 64 / <DoubleStar> Star 64 65 ; 65 66 … … 79 80 return new AsIfExpr(createSpan(yyStart,yyCount), false, 80 81 (Expr)base, a1); 82 }}; 83 }; 84 85 constant inline Action<Expr> Star = 86 DoubleStar 87 { yyValue = new Action<Expr>() { 88 public Expr run(Expr base) { 89 return base; 81 90 }}; 82 91 }; trunk/ProjectFortress/src/com/sun/fortress/parser/NoNewlineExpr.rats
r1987 r2168 61 61 <As> NoNewlineAs 62 62 / <AsIf> NoNewlineAsIf 63 / <DoubleStar> NoNewlineStar 63 64 ; 64 65 … … 80 81 return new AsIfExpr(createSpan(yyStart,yyCount), false, 81 82 (Expr)base, t); 83 }}; 84 }; 85 86 constant inline Action<Expr> NoNewlineStar = 87 DoubleStar 88 { yyValue = new Action<Expr>() { 89 public Expr run(Expr base) { 90 return base; 82 91 }}; 83 92 }; trunk/ProjectFortress/src/com/sun/fortress/parser/Symbol.rats
r2024 r2168 160 160 private String singleOp = 161 161 !(encloser / leftEncloser / rightEncloser / multiOp / compOp / match) 162 a1:_ &{ PrecedenceMap.ONLY.isOperator("" + a1) }162 a1:_ !("*") &{ PrecedenceMap.ONLY.isOperator("" + a1) } 163 163 { yyValue = "" + a1; } ; 164 164 … … 222 222 transient void plus = "+":singleOp; 223 223 transient void pound = "#":singleOp; 224 transient void star = "*":singleOp;224 transient void star = !("**") "*":singleOp; 225 225 transient void underscore = "_"; 226 226 … … 257 257 a1.getA(), a1.getB(), a2); 258 258 }; 259 260 transient void DoubleStar = "**";
