Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /trunk/src/compiler/parser/diderot.grm
ViewVC logotype

Diff of /trunk/src/compiler/parser/diderot.grm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 378, Tue Oct 5 00:22:49 2010 UTC revision 379, Tue Oct 5 00:28:29 2010 UTC
# Line 290  Line 290 
290  (***** Expressions *****)  (***** Expressions *****)
291    
292  Expr  Expr
293            : TestExpr ( "if" Expr "else" Expr => (Expr1, Expr2) )?
294                    => (case SR
295                         of NONE => TestExpr
296                          | SOME(e1, e2) => markExpr(FULL_SPAN, PT.E_Cond(TestExpr, e1, e2))
297                        (* end case *))
298            ;
299    
300    TestExpr
301          : AndExpr ( "||" AndExpr )*          : AndExpr ( "||" AndExpr )*
302                  => (mkCondExp PT.E_OrElse (AndExpr, SR))                  => (mkCondExp PT.E_OrElse (AndExpr, SR))
303          ;          ;

Legend:
Removed from v.378  
changed lines
  Added in v.379

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0