X-Git-Url: http://nitlanguage.org

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 7a5f825..6455b05 100644
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -62,7 +62,7 @@ kwimport = 'import';
 kwclass = 'class';
 kwabstract = 'abstract';
 kwinterface = 'interface';
-kwuniversal = 'universal';
+kwenum = 'universal'|'enum';
 kwspecial = 'special';
 kwend = 'end';
 kwmeth = 'fun';
@@ -129,8 +129,10 @@ eq = '==';
 ne = '!=';
 lt = '<';
 le = '<=';
+ll = '<<';
 gt = '>';
 ge = '>=';
+gg = '>>';
 starship = '<=>';
 bang='!';
 
@@ -190,7 +192,7 @@ classkind
 	= {concrete} kwclass
 	| {abstract} kwabstract kwclass
 	| {interface} kwinterface
-	| {universal} kwuniversal
+	| {enum} kwenum
 	;
 
 formaldefs {-> formaldef*}
@@ -251,6 +253,8 @@ methid {-> methid}
 	| {ge} ge {-> New methid.ge(ge)}
 	| {lt} lt {-> New methid.lt(lt)}
 	| {gt} gt {-> New methid.gt(gt)}
+	| {ll} ll {-> New methid.ll(ll)}
+	| {gg} gg {-> New methid.gg(gg)}
 	| {bra} obra cbra {-> New methid.bra(obra, cbra)}
 	| {starship} starship {-> New methid.starship(starship)}
 	| {assign} id assign {-> New methid.assign(id, assign)}
@@ -405,8 +409,8 @@ while~withelse {-> expr}
 	;
 
 for~withelse {-> expr}
-	= kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, id, expr, kwdo, stmtso_withend.expr, label)}
-	| {nolabel} kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, id, expr, kwdo, stmtso~withelse.expr, Null)}
+	= kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso_withend.expr, label)}
+	| {nolabel} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso~withelse.expr, Null)}
 	;
 
 assert~withelse {-> expr}
@@ -447,8 +451,10 @@ expr_eq~nopar~nobra {-> expr}
 	| {ne} expr_add~nopar~nobra ne no [expr2]:expr_add~nopar~nobra {-> New expr.ne(expr_add~nopar~nobra.expr, expr2.expr)}
 	| {lt} expr_add~nopar~nobra lt no [expr2]:expr_add~nopar~nobra {-> New expr.lt(expr_add~nopar~nobra.expr, expr2.expr)}
 	| {le} expr_add~nopar~nobra le no [expr2]:expr_add~nopar~nobra {-> New expr.le(expr_add~nopar~nobra.expr, expr2.expr)}
+	| {ll} expr_eq~nopar~nobra ll no [expr2]:expr_add~nopar~nobra {-> New expr.ll(expr_eq~nopar~nobra.expr, expr2.expr)}
 	| {gt} expr_add~nopar~nobra gt no [expr2]:expr_add~nopar~nobra {-> New expr.gt(expr_add~nopar~nobra.expr, expr2.expr)}
 	| {ge} expr_add~nopar~nobra ge no [expr2]:expr_add~nopar~nobra {-> New expr.ge(expr_add~nopar~nobra.expr, expr2.expr)}
+	| {gg} expr_eq~nopar~nobra gg no [expr2]:expr_add~nopar~nobra {-> New expr.gg(expr_eq~nopar~nobra.expr, expr2.expr)}
 	| {starship} expr_add~nopar~nobra starship no [expr2]:expr_add~nopar~nobra {-> New expr.starship(expr_add~nopar~nobra.expr, expr2.expr)}
 	| {isa} expr_add~nopar~nobra kwisa no type~nobra {-> New expr.isa(expr_add~nopar~nobra.expr, type~nobra.type)}
 	;
@@ -485,7 +491,7 @@ expr_atom~nopar~nobra {-> expr}
 	| {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, [args.expr])}
 !nobra	| {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, [braargs.expr], [])}
 	| {new} kwnew no type~nobra dot [n2]:no id args {-> New expr.new(kwnew, type~nobra.type, id, [args.expr])}
-// FIXME: Why are these 3 !nopar mandatory?
+// !nopar to unambiguise 'foo[5].bar' between '(foo[5]).bar' and 'foo([5].bar),
 !nobra!nopar	| {range} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no cbra {-> New expr.crange(expr, expr2.expr)}
 !nobra!nopar	| {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra  {-> New expr.orange(expr, expr2.expr)}
 !nobra!nopar	| {array} braargs {-> New expr.array([braargs.expr])}
@@ -599,7 +605,7 @@ classkind
 	= {concrete} kwclass
 	| {abstract} kwabstract kwclass
 	| {interface} kwinterface
-	| {universal} kwuniversal
+	| {enum} kwenum
 	;
 formaldef = [id]:classid type?;
 superclass = kwspecial? kwsuper? type;
@@ -620,11 +626,11 @@ able	= {read} kwredef? kwreadable
 	| {write} kwredef? visibility? kwwritable
 	;
 
-methid = {id} id | {plus} plus | {minus} minus | {star} star | {slash} slash | {percent} percent | {eq} eq | {ne} ne | {le} le | {ge} ge | {lt} lt | {gt} gt | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign;
+methid = {id} id | {plus} plus | {minus} minus | {star} star | {slash} slash | {percent} percent | {eq} eq | {ne} ne | {le} le | {ge} ge | {lt} lt | {gt} gt |  {ll} ll | {gg} gg | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign;
 
 signature = [params]:param* type? [closure_decls]:closure_decl*;
 
-param	= id type? dotdotdot? 
+param	= id type? dotdotdot?
 	;
 
 closure_decl = kwbreak? bang id signature expr?
@@ -645,7 +651,7 @@ expr	= {block} expr*
 	| {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
 	| {while} kwwhile expr kwdo [block]:expr? label?
 	| {loop} kwloop [block]:expr? label?
-	| {for} kwfor id expr kwdo [block]:expr? label?
+	| {for} kwfor [ids]:id* expr kwdo [block]:expr? label?
 	| {assert} kwassert id? expr [else]:expr?
 	| {once} kwonce expr 
 	| {send} expr 
@@ -659,8 +665,10 @@ expr	= {block} expr*
 	| {ne} expr [expr2]:expr 
 	| {lt} expr [expr2]:expr 
 	| {le} expr [expr2]:expr 
+	| {ll} expr [expr2]:expr
 	| {gt} expr [expr2]:expr 
 	| {ge} expr [expr2]:expr 
+	| {gg} expr [expr2]:expr
 	| {isa} expr type 
 	| {plus} expr [expr2]:expr 
 	| {minus} expr [expr2]:expr