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

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 4a90050..603133c 100644
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -26,10 +26,17 @@ Helpers
 all = [0 .. 0xFF];
 lowercase = ['a' .. 'z'];
 uppercase = ['A' .. 'Z'];
+
 digit = ['0' .. '9'];
 hexdigit = ['0'..'9'] | ['a'..'f'] | ['A'..'F'] | '_';
 bindigit = '0' | '1' | '_';
 octdigit = ['0' .. '7'] | '_';
+number = digit (digit | '_')*;
+hex_number = ('0x' | '0X') hexdigit+;
+bin_number = ('0b' | '0B') bindigit+;
+oct_number = ('0o' | '0O') octdigit+;
+prec = '8' | '16' | '32';
+
 letter = lowercase | uppercase | digit | '_';
 
 tab = 9;
@@ -40,8 +47,8 @@ eol_helper = cr lf | cr | lf; // This takes care of different platforms
 
 // characers inside strings and super-strings (atomaton powaa)
 str_char
-	= [any - [['"' + '{'] + '\']] 
-	| '\' any 
+	= [any - [['"' + '{'] + '\']]
+	| '\' any
 	;
 str_body = str_char*;
 
@@ -84,6 +91,8 @@ extern_code_char
 	;
 extern_code_body = extern_code_char*;
 
+id = lowercase letter*;
+
 /*****************************************************************************/
 States
 /*****************************************************************************/
@@ -106,6 +115,7 @@ kwclass = 'class';
 kwabstract = 'abstract';
 kwinterface = 'interface';
 kwenum = 'universal'|'enum';
+kwsubset = 'subset';
 kwend = 'end';
 kwmeth = 'fun';
 kwtype = 'type';
@@ -149,6 +159,8 @@ kwisset = 'isset';
 kwlabel = 'label';
 kwwith = 'with';
 kwdebug = '__debug__';
+kwyield = 'yield';
+kwcatch = 'catch';
 
 opar = '(';
 cpar = ')';
@@ -192,27 +204,27 @@ ge = '>=';
 gg = '>>';
 starship = '<=>';
 bang='!';
+quest='?';
 at='@';
 semi=';';
 
 classid = uppercase letter*;
-id = lowercase letter*;
+id = id;
 attrid = '_' lowercase letter*;
 
-number = digit+;
-hex_number = ('0x' | '0X') hexdigit+;
-bin_number = ('0b' | '0B') bindigit+;
-oct_number = ('0o' | '0O') octdigit+;
-float = digit* '.' digit+;
-string = '"' str_body '"' | '"' '"' '"' long_str_body lsend1 | ''' ''' ''' long_sstr_body ''' ''' ''';
-start_string = '"' str_body '{' | '"' '"' '"' long_str_body lsend2;
+integer = (number | hex_number | bin_number | oct_number) (('u' prec) | ('i' prec) |);
+float = digit* '.' digit+ | (digit+ | digit* '.' digit+) ('E'|'e') ('+'|'-'|) digit+;
+string = id? '"' str_body '"' id? | id? '"' '"' '"' long_str_body lsend1 | id? ''' ''' ''' long_sstr_body ''' ''' ''' id?;
+start_string = id? '"' str_body '{' | id? '"' '"' '"' long_str_body lsend2;
 mid_string = '}' str_body '{' | '}' '}' '}' long_str_body lsend2;
-end_string = '}' str_body '"' | '}' '}' '}' long_str_body lsend1;
-char = (''' [[any - '''] - '\'] ''') | (''' '\' any ''');
-bad_string = ('"'|'}') str_body | '"' '"' '"' long_str_body | ''' ''' ''' long_sstr_body;
+end_string = '}' str_body '"' id? | '}' '}' '}' long_str_body lsend1 id? ;
+char = id? ((''' [[any - '''] - '\'] ''') | (''' '\' any ''')) id?;
+bad_string = ('"'|'}') str_body ;
+bad_t_string = '"' '"' '"' long_str_body | ''' ''' ''' long_sstr_body;
 bad_char = ''' '\'? any;
 
 extern_code_segment = '`' '{' extern_code_body '`' '}';
+bad_extern = '`' '{' extern_code_body;
 
 /*****************************************************************************/
 Ignored Tokens
@@ -252,8 +264,8 @@ implicit_main_meth {-> propdef}
 
 /* CLASSES *******************************************************************/
 classdef
-	= [doc]:nd redef visibility classkind no qclassid extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, Null, [], Null, extern_code_block, [propdefs.propdef], kwend)}
-	| {for} [doc]:nd redef visibility classkind no qclassid obra [n2]:no formaldefs cbra extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, obra, [formaldefs.formaldef], cbra, extern_code_block, [propdefs.propdef], kwend)}
+	= [doc]:nd redef visibility classkind no qclassid extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid, Null, [], Null, extern_code_block, [propdefs.propdef], kwend)}
+	| {for} [doc]:nd redef visibility classkind no qclassid obra [n2]:no formaldefs cbra extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid, obra, [formaldefs.formaldef], cbra, extern_code_block, [propdefs.propdef], kwend)}
 	;
 
 redef {-> kwredef?}
@@ -264,6 +276,7 @@ classkind
 	| {interface} kwinterface
 	| {enum} kwenum
 	| {extern} kwextern kwclass
+	| {subset} kwsubset
 	;
 
 formaldefs {-> formaldef*}
@@ -288,28 +301,33 @@ propdefn {-> propdef}
 	= propdef n1 {-> propdef.propdef}
 	;
 propdef~toplevel {-> propdef}
-	= {meth} [doc]:nd redef visibility kwmeth qmethid signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
-	| {nobody} [doc]:nd redef visibility kwmeth qmethid signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, qmethid.methid, signature.signature, annotation_withend_nonull.annotations, Null, Null, Null, Null, Null)}
-!toplevel| {intern_new} [doc]:nd redef visibility kwnew qmethid? signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwnew, qmethid.methid, signature, annotation_withend_nonull.annotations, Null, Null, Null, Null, Null)}
-!toplevel| {new} [doc]:nd redef visibility kwnew qmethid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwnew, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
-	| {extern_implicit} [doc]:nd redef visibility kwmeth qmethid signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, qmethid.methid, signature.signature, annotation_noend.annotations, extern_calls, extern_code_block, Null, Null, Null)}
+	= {meth} [doc]:nd redef visibility kwmeth qmethid signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, Null, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
+	| {nobody} [doc]:nd redef visibility kwmeth qmethid signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, Null, qmethid.methid, signature.signature, annotation_withend_nonull.annotations, Null, Null, Null, Null, Null)}
+!toplevel| {isa} [doc]:nd redef visibility kwisa annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwisa, Null, Null, New signature(Null, [], Null, Null), annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
+!toplevel| {intern_new} [doc]:nd redef visibility kwnew qmethid? signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, Null, kwnew, qmethid.methid, signature, annotation_withend_nonull.annotations, Null, Null, Null, Null, Null)}
+!toplevel| {new} [doc]:nd redef visibility kwnew qmethid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, Null, kwnew, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
+	| {extern_implicit} [doc]:nd redef visibility kwmeth qmethid signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, Null, qmethid.methid, signature.signature, annotation_noend.annotations, extern_calls, extern_code_block, Null, Null, Null)}
 !toplevel| {var3} [doc]:nd redef visibility kwvar id typing_o annotation_withend {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, Null, Null, annotation_withend.annotations, Null, Null, Null)}
 !toplevel| {var4} [doc]:nd redef visibility kwvar id typing_o assign [n2]:no expr annotation_withend {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, assign, expr.expr, annotation_withend.annotations, Null, Null, Null)}
 !toplevel| {var5} [doc]:nd redef visibility kwvar id typing_o annotation_noend? kwdo stmtso kwend? {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, Null, Null, annotation_noend.annotations, kwdo, stmtso.expr, kwend)}
-!toplevel| {init} [doc]:nd redef visibility kwinit qmethid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, kwinit, Null, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
-!toplevel| {type} [doc]:nd redef visibility kwtype classid typing annotation_withend {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, classid, typing.type, annotation_withend.annotations)}
-!toplevel| {extern_init_implicit} [doc]:nd redef visibility kwnew qmethid? signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwnew, qmethid.methid, signature, annotation_noend.annotations, extern_calls, extern_code_block, Null, Null, Null)}
+!toplevel| {init} [doc]:nd redef visibility kwinit qmethid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, kwinit, Null, Null, qmethid.methid, signature, annotation_noend.annotations, Null, Null, kwdo, stmtso.expr, kwend_o.kwend)}
+!toplevel| {type} [doc]:nd redef visibility kwtype qclassid typing annotation_withend {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, qclassid, typing.type, annotation_withend.annotations)}
+!toplevel| {extern_init_implicit} [doc]:nd redef visibility kwnew qmethid? signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, Null, kwnew, qmethid.methid, signature, annotation_noend.annotations, extern_calls, extern_code_block, Null, Null, Null)}
 !toplevel| {annot} line_annotation_forclass {-> line_annotation_forclass.propdef}
 !toplevel| {super} superclass {-> superclass.propdef}
 	;
 annotation_withend~nonull {-> annotations?}
 	= {oneliner} kwis annotation_list {-> New annotations(kwis, Null, Null, [annotation_list.annotation], Null, Null)}
-	| {more} kwis n1 line_annotation+ kwend {-> New annotations(kwis, Null, Null, [line_annotation.annotation], Null, kwend) }
+	| {more} kwis n1 line_annotations kwend {-> New annotations(kwis, Null, Null, [line_annotations.annotation], Null, kwend) }
 !nonull	| {null} {-> Null}
 	;
 annotation_noend {-> annotations}
 	= {oneliner} kwis annotation_list {-> New annotations(kwis, Null, Null, [annotation_list.annotation], Null, Null)}
-	| {more} kwis n1 line_annotation+ {-> New annotations(kwis, Null, Null, [line_annotation.annotation], Null, Null) }
+	| {more} kwis n1 line_annotations {-> New annotations(kwis, Null, Null, [line_annotations.annotation], Null, Null) }
+	;
+
+line_annotations {-> annotation*}
+	= {some} line_annotation* n? {-> [line_annotation.annotation] }
 	;
 
 visibility
@@ -353,7 +371,7 @@ signature {-> signature}
 	| {noparnoret} no {-> New signature(Null, [], Null, Null)}
 	;
 
-params {-> param*} 
+params {-> param*}
 	= param params_tail* [n2]:no {-> [param, params_tail.param] }
 	| {null} {-> []}
 	;
@@ -401,10 +419,15 @@ extern_code_body {-> extern_code_block} = no extern_code_block {-> extern_code_b
 
 /* TYPES *********************************************************************/
 type~nobra~nopar {-> type}
-	= {simple} kwnullable? classid annotations_o~nopar {-> New type(kwnullable, classid, Null, [], Null, annotations_o~nopar.annotations)}
-!nobra	| {generic} kwnullable? classid obra no types [n2]:no cbra annotations_o~nopar {-> New type(kwnullable, classid, obra, [types.type], cbra, annotations_o~nopar.annotations)}
+	= {atom} [t]:type_atom~nobra~nopar {-> t.type }
+	| {inter} [t1]:type_atom~nobra~nopar kwand [t2]:type_atom~nobra~nopar {-> t1.type } /* TODO create real nodes */
+	| {union} [t1]:type_atom~nobra~nopar kwor [t2]:type_atom~nobra~nopar {-> t1.type }
+	;
+type_atom~nobra~nopar {-> type}
+	= {simple} kwnullable? qclassid annotations_o~nopar {-> New type(kwnullable, qclassid, Null, [], Null, annotations_o~nopar.annotations)}
+!nobra	| {generic} kwnullable? qclassid obra no types [n2]:no cbra annotations_o~nopar {-> New type(kwnullable, qclassid, obra, [types.type], cbra, annotations_o~nopar.annotations)}
 	;
-types {-> type*} 
+types {-> type*}
 	= type types_tail* {-> [type, types_tail.type]};
 types_tail {-> type}
 	= comma no type {-> type};
@@ -434,6 +457,7 @@ stmt~withelse~noexpr~nopar {-> expr}
 	= {vardecl} vardecl {-> vardecl.expr}
 	| {assign} assignment~nopar {-> assignment~nopar.expr}
 	| {return} kwreturn expr? {-> New expr.return(kwreturn, expr)}
+	| {yield} kwyield expr {-> New expr.yield(kwyield, expr)}
 	| {break} kwbreak label? {-> New expr.break(kwbreak, label)}
 	| {abort} kwabort {-> New expr.abort(kwabort)}
 	| {continue} kwcontinue label? {-> New expr.continue(kwcontinue, label)}
@@ -444,7 +468,7 @@ stmt~withelse~noexpr~nopar {-> expr}
 	| {for} for~withelse {-> for~withelse.expr}
 	| {with} with~withelse {-> with~withelse.expr}
 	| {assert} assert~withelse {-> assert~withelse.expr}
-!noexpr	| {call} recv qid args_nopar {-> New expr.call(recv.expr, qid.id, args_nopar.exprs)}
+!noexpr	| {call} recv qid args_nopar {-> New expr.call(recv.expr, qid, args_nopar.exprs)}
 !noexpr	| {super} qualified_o kwsuper args_nopar {-> New expr.super(qualified_o.qualified, kwsuper, args_nopar.exprs)}
 !noexpr	| {init} recv qualified? kwinit args_nopar {-> New expr.init(recv.expr, kwinit, args_nopar.exprs)}
 	| {debug_type_is} kwdebug kwtype type column expr {-> New expr.debug_type(kwdebug, kwtype, expr.expr, type) }
@@ -459,10 +483,10 @@ vardecl{-> expr}
 
 assignment~nopar {-> expr}
 	= {attr} recv~nopar qualified_o attrid assign expr {-> New expr.attr_assign(recv~nopar.expr, attrid, assign, expr)}
-	| {call} recv~nopar qid args assign expr {-> New expr.call_assign(recv~nopar.expr, qid.id, args.exprs, assign,  expr)}
+	| {call} recv~nopar qid args assign expr {-> New expr.call_assign(recv~nopar.expr, qid, args.exprs, assign,  expr)}
 	| {bra} expr_atom~nopar braargs assign expr {-> New expr.bra_assign(expr_atom~nopar.expr, braargs.exprs, assign,  expr)}
 	| {attr_re} recv~nopar qualified_o attrid assign_op expr {-> New expr.attr_reassign(recv~nopar.expr, attrid, assign_op,  expr)}
-	| {call_re} recv~nopar qid args assign_op expr {-> New expr.call_reassign(recv~nopar.expr, qid.id, args.exprs, assign_op,  expr)}
+	| {call_re} recv~nopar qid args assign_op expr {-> New expr.call_reassign(recv~nopar.expr, qid, args.exprs, assign_op,  expr)}
 	| {bra_re} expr_atom~nopar braargs assign_op expr {-> New expr.bra_reassign(expr_atom~nopar.expr, braargs.exprs, assign_op,  expr)}
 	;
 assign_op
@@ -480,8 +504,9 @@ assign_op
 	;
 
 do~withelse {-> expr}
-	= kwdo stmtso_withend label {-> New expr.do(kwdo, stmtso_withend.expr, label)}
-	| {nolabel} kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr, Null)}
+	= kwdo stmtso_withend label {-> New expr.do(kwdo, stmtso_withend.expr, Null, Null, label)}
+	| {nolabel} kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr, Null, Null, Null)}
+	| {with_catch} kwdo n stmtsn kwcatch stmtso_withend {-> New expr.do(kwdo, stmtsn.expr, kwcatch, stmtso_withend.expr, Null)}
 	;
 
 if~withelse {-> expr}
@@ -507,8 +532,16 @@ while~withelse {-> expr}
 	;
 
 for~withelse {-> expr}
-	= kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [ids.id], kwin, 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], kwin, expr, kwdo, stmtso~withelse.expr, Null)}
+	= kwfor no for_groups [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [for_groups.for_group], kwdo, stmtso_withend.expr, label)}
+	| {nolabel} kwfor no for_groups [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, [for_groups.for_group], kwdo, stmtso~withelse.expr, Null)}
+	;
+
+for_groups {-> for_group*}
+	= {one} for_group {-> [for_group]}
+	| {many} for_groups no comma [n2]:no for_group {-> [for_groups.for_group, for_group] }
+	;
+for_group
+	= [ids]:idlist [n2]:no kwin [n3]:no expr {-> New for_group([ids.id], kwin, expr)}
 	;
 
 with~withelse {-> expr}
@@ -556,7 +589,7 @@ expr_eq~nopar~nobra {-> expr}
 	| {:gt} expr_bitor~nopar~nobra gt :no [expr2]:expr_bitor~nopar~nobra
 	| {:ge} expr_bitor~nopar~nobra ge :no [expr2]:expr_bitor~nopar~nobra
 	| {:starship} expr_bitor~nopar~nobra starship :no [expr2]:expr_bitor~nopar~nobra
-	| {:isa} expr_bitor~nopar~nobra kwisa :no type~nobra
+	| {:isa} expr_bitor~nopar~nobra kwisa :no type_atom~nobra
 	;
 
 expr_bitor~nopar~nobra {-> expr}
@@ -608,18 +641,19 @@ expr_minus~nopar~nobra {-> expr}
 
 expr_new~nopar~nobra {-> expr}
 	= expr_atom~nopar~nobra {-> expr_atom~nopar~nobra.expr}
-	| {new} kwnew no type~nobra_nopar args {-> New expr.new(kwnew, type~nobra_nopar.type, Null, args.exprs)}
+	| {new} kwnew no type_atom~nobra_nopar args {-> New expr.new(kwnew, type_atom~nobra_nopar.type, Null, args.exprs)}
 	| {isset_attr} kwisset recv~nopar~nobra qualified_o attrid {-> New expr.isset_attr(kwisset, recv~nopar~nobra.expr, attrid)}
+	| {callref} amp recv~nopar~nobra qid args {-> New expr.callref(amp, recv~nopar~nobra.expr, qid, args.exprs)}
 	;
 
 expr_atom~nopar~nobra {-> expr}
 	= expr_single~nopar~nobra {-> expr_single~nopar~nobra.expr}
 	| {attr} recv~nopar~nobra qualified_o attrid {-> New expr.attr(recv~nopar~nobra.expr, attrid)}
-	| {call} recv~nopar~nobra qid args {-> New expr.call(recv~nopar~nobra.expr, qid.id, args.exprs)}
+	| {call} recv~nopar~nobra qid args {-> New expr.call(recv~nopar~nobra.expr, qid, args.exprs)}
 	| {super} qualified_o kwsuper args {-> New expr.super(qualified_o.qualified, kwsuper, args.exprs)}
 	| {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, args.exprs)}
 !nobra	| {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, braargs.exprs)}
-	| {new} kwnew no type~nobra_nopar dot [n2]:no qid args {-> New expr.new(kwnew, type~nobra_nopar.type, qid.id, args.exprs)}
+	| {new} kwnew no type_atom~nobra_nopar dot [n2]:no qid args {-> New expr.new(kwnew, type_atom~nobra_nopar.type, qid, args.exprs)}
         | {as_cast} expr_atom~nopar~nobra dot no kwas [n2]:no opar [n3]:no type [n4]:no cpar {-> New expr.as_cast(expr_atom~nopar~nobra.expr, kwas, opar, type, cpar)}
         | {as_notnull} expr_atom~nopar~nobra dot no kwas [n2]:no opar [n3]:no kwnot [n4]:no kwnull [n5]:no cpar {-> New expr.as_notnull(expr_atom~nopar~nobra.expr, kwas, opar, kwnot, kwnull, cpar)}
         | {as_notnull2}expr_atom~nopar~nobra dot no kwas [n2]:no kwnot [n4]:no kwnull {-> New expr.as_notnull(expr_atom~nopar~nobra.expr, kwas, Null, kwnot, kwnull, Null)}
@@ -636,14 +670,13 @@ expr_single~nopar~nobra {-> expr}
 	| {true} kwtrue annotations_o {-> New expr.true(kwtrue, annotations_o.annotations)}
 	| {false} kwfalse annotations_o {-> New expr.false(kwfalse, annotations_o.annotations)}
 	| {null} kwnull annotations_o {-> New expr.null(kwnull, annotations_o.annotations)}
-	| {int} number annotations_o {-> New expr.dec_int(number, annotations_o.annotations)}
-	| {hex_int} hex_number annotations_o {-> New expr.hex_int(hex_number, annotations_o.annotations)}
-	| {bin_int} bin_number annotations_o {-> New expr.bin_int(bin_number, annotations_o.annotations)}
-	| {oct_int} oct_number annotations_o {-> New expr.oct_int(oct_number, annotations_o.annotations)}
+	| {integer} integer annotations_o {-> New expr.integer(integer, annotations_o.annotations)}
 	| {float} float annotations_o {-> New expr.float(float, annotations_o.annotations)}
 	| {char} char annotations_o {-> New expr.char(char, annotations_o.annotations)}
 	| {string} string annotations_o {-> New expr.string(string, annotations_o.annotations)}
 	| {superstring} superstring  {-> superstring.expr}
+	| {lambdan} kwmeth signature kwdo no stmts [n2]:no kwend {-> New expr.lambda(kwmeth, signature, kwdo, stmts.expr)}
+	| {lambda0} kwmeth signature kwdo no endblock {-> New expr.lambda(kwmeth, signature, kwdo, endblock.expr)}
 !nopar	| {par} expr_par {-> expr_par.expr}
 // !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 annotations_o {-> New expr.crange(obra, expr, dotdot, expr2.expr, cbra, annotations_o.annotations)}
@@ -672,11 +705,11 @@ array_items_tail {-> expr}
 	;
 array_item {-> expr}
 	= expr no {-> expr}
-	| {for} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo [block]:array_item {-> New expr.for(kwfor, [ids.id], kwin, expr, kwdo, block.expr, Null)}
+	| {for} kwfor no for_groups [n4]:no kwdo [block]:array_item {-> New expr.for(kwfor, [for_groups.for_group], kwdo, block.expr, Null)}
 	| {if} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:array_item {-> New expr.if(kwif, expr, kwthen, then.expr, Null, Null)}
 	;
 
-superstring {-> expr} 
+superstring {-> expr}
 	= superstring_start superstring_middle* superstring_end annotations_o {-> New expr.superstring([superstring_start.expr, superstring_middle.expr, superstring_end.expr], annotations_o.annotations)};
 superstring_start {-> expr*}
 	= start_string_p no expr [n2]:no {-> [start_string_p.expr, expr]}
@@ -767,6 +800,7 @@ atid~forclass {-> atid}
 
 recv~nopar~nobra {-> expr}
 	= expr_atom~nopar~nobra dot no {-> expr_atom~nopar~nobra.expr}
+	| {safe} expr_atom~nopar~nobra quest dot no {-> New expr.safe(expr_atom~nopar~nobra.expr, quest)}
 	| {implicit} {-> New expr.implicit_self()}
 	;
 
@@ -788,7 +822,7 @@ braargs	{-> exprs}
 	= obra no expr_list cbra {-> New exprs.bra(obra, [expr_list.expr], cbra)};
 expr_list {-> expr*}
 	= arg [n2]:no expr_tail* {-> [arg.expr, expr_tail.expr]};
-expr_tail {-> expr} 
+expr_tail {-> expr}
 	= comma no arg [n2]:no {-> arg.expr};
 idlist {-> id*}
 	= opar no idlist_nopar [n2]:no cpar {-> [idlist_nopar.id]}
@@ -804,26 +838,26 @@ module_name {-> module_name}
 	| {root} quad no modquad* id {-> New module_name(quad, [modquad.id], id)}
 	;
 
-qualified 
+qualified
 	= {cla} modquad* classquad {-> New qualified([modquad.id], classquad.classid)}
 	| {mod} modquad+ {-> New qualified([modquad.id], Null)}
-	; 
+	;
 qualified_o {-> qualified?}
 	= qualified {-> qualified}
 	| {null} {-> Null}
 	;
-qid {-> id}
-	= qualified? id {-> id}
+qid
+	= qualified? id
 	;
-qclassid {-> classid}
-	= qualified? classid {-> classid}
+qclassid
+	= qualified? classid
 	;
 qmethid~noid {-> methid}
 	= qualified? methid~noid {-> methid~noid.methid}
 	;
 modquad {-> id}
 	= id quad no {-> id};
-classquad {-> classid} 
+classquad {-> classid}
 	= classid quad no {-> classid};
 
 kwend_o {-> kwend?}
@@ -878,7 +912,7 @@ visibility
 	| {intrude} kwintrude
 	;
 
-classdef= {std} doc? kwredef? visibility classkind [id]:classid? obra? [formaldefs]:formaldef* cbra? extern_code_block? [propdefs]:propdef* kwend
+classdef= {std} doc? kwredef? visibility classkind [qid]:qclassid? obra? [formaldefs]:formaldef* cbra? extern_code_block? [propdefs]:propdef* kwend
 	| {top} [propdefs]:propdef*
 	| {main} [propdefs]:propdef*
 	;
@@ -888,14 +922,15 @@ classkind
 	| {interface} kwinterface
 	| {enum} kwenum
 	| {extern} kwextern kwclass?
+	| {subset} kwsubset
 	;
 formaldef = [id]:classid type? annotations?;
 
 
 propdef = {attr} doc? kwredef? visibility kwvar [id2]:id type? assign? expr? annotations? kwdo? [block]:expr? kwend?
 	| {main_meth} kwredef? [block]:expr?
-	| {type} doc? kwredef? visibility kwtype [id]:classid type annotations?
-	| {meth} doc? kwredef? visibility kwmeth? kwinit? kwnew? methid? signature annotations? extern_calls? extern_code_block? kwdo? [block]:expr? kwend?
+	| {type} doc? kwredef? visibility kwtype [qid]:qclassid type annotations?
+	| {meth} doc? kwredef? visibility kwmeth? kwinit? kwisa? kwnew? methid? signature annotations? extern_calls? extern_code_block? kwdo? [block]:expr? kwend?
 	| {super} doc? kwredef? visibility kwsuper type annotations?
 	| {annot} doc? kwredef? visibility? atid opar? [args]:expr* cpar? annotations?
 	;
@@ -926,32 +961,41 @@ methid
 	| {braassign} obra cbra assign
 	;
 
+qid
+	= qualified? id
+	;
+
+qclassid
+	= qualified? [id]:classid
+	;
+
 signature = opar? [params]:param* cpar? type?;
 
 param	= id type? dotdotdot? annotations?
 	;
 
-type	= kwnullable? [id]:classid obra? [types]:type* cbra? annotations?;
+type	= kwnullable? [qid]:qclassid obra? [types]:type* cbra? annotations?;
 
 label = kwlabel id?;
 
-expr	= {block} expr* kwend? 
+expr	= {block} expr* kwend?
 	| {vardecl} kwvar? id type? assign? expr? annotations?
 	| {return} kwreturn? expr?
+	| {yield} kwyield expr
 	| {break} kwbreak label?
 	| {abort} kwabort
 	| {continue} kwcontinue? label?
-	| {do} kwdo [block]:expr? label?
+	| {do} kwdo [block]:expr? kwcatch? [catch]:expr? label?
 	| {if} kwif expr kwthen [then]:expr? kwelse? [else]:expr?
 	| {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
 	| {while} kwwhile expr kwdo [block]:expr? label?
 	| {loop} kwloop [block]:expr? label?
-	| {for} kwfor [ids]:id* kwin expr kwdo [block]:expr? label?
+	| {for} kwfor [groups]:for_group* kwdo [block]:expr? label?
 	| {with} kwwith expr kwdo [block]:expr? label?
 	| {assert} kwassert id? expr kwelse? [else]:expr?
-	| {once} kwonce expr 
-	| {send} expr 
-	| {binop} expr [expr2]:expr 
+	| {once} kwonce expr
+	| {send} expr
+	| {binop} expr [expr2]:expr
 	| {or} expr [op]:kwor [expr2]:expr
 	| {and} expr [op]:kwand [expr2]:expr
 	| {or_else} expr [op]:kwor kwelse [expr2]:expr
@@ -979,41 +1023,40 @@ expr	= {block} expr* kwend?
 	| {uminus} [op]:minus expr
 	| {uplus} [op]:plus expr
 	| {utilde} [op]:tilde expr
-	| {new} kwnew type id? [args]:exprs
-	| {attr} expr [id]:attrid 
-	| {attr_assign} expr [id]:attrid assign [value]:expr 
-	| {attr_reassign} expr [id]:attrid assign_op [value]:expr 
-	| {call} expr id [args]:exprs
-	| {call_assign} expr id [args]:exprs assign [value]:expr
-	| {call_reassign} expr id [args]:exprs assign_op [value]:expr 
+	| {new} kwnew type qid? [args]:exprs
+	| {attr} expr [id]:attrid
+	| {attr_assign} expr [id]:attrid assign [value]:expr
+	| {attr_reassign} expr [id]:attrid assign_op [value]:expr
+	| {call} expr qid [args]:exprs
+	| {callref} amp expr qid [args]:exprs
+	| {call_assign} expr qid [args]:exprs assign [value]:expr
+	| {call_reassign} expr qid [args]:exprs assign_op [value]:expr
 	| {super} qualified? kwsuper [args]:exprs
-	| {init} expr kwinit [args]:exprs 
+	| {init} expr kwinit [args]:exprs
 	| {bra} expr [args]:exprs
-	| {bra_assign} expr [args]:exprs assign [value]:expr 
-	| {bra_reassign} expr [args]:exprs assign_op [value]:expr 
+	| {bra_assign} expr [args]:exprs assign [value]:expr
+	| {bra_reassign} expr [args]:exprs assign_op [value]:expr
 	| {var} id
-	| {var_assign} id assign [value]:expr 
-	| {var_reassign} id assign_op [value]:expr 
+	| {var_assign} id assign [value]:expr
+	| {var_reassign} id assign_op [value]:expr
 	| {range} expr [expr2]:expr annotations?
 	| {crange} obra expr dotdot [expr2]:expr cbra annotations?
 	| {orange} obra expr dotdot [expr2]:expr [cbra]:obra annotations?
 	| {array} obra [exprs]:expr* type? cbra annotations?
 	| {self} kwself annotations?
-	| {implicit_self} 
+	| {implicit_self}
 	| {true} kwtrue annotations?
 	| {false} kwfalse annotations?
 	| {null} kwnull annotations?
-	| {dec_int} number annotations?
-	| {hex_int} hex_number annotations?
-	| {bin_int} bin_number annotations?
-	| {oct_int} oct_number annotations?
+	| {integer} integer annotations?
 	| {float} float annotations?
 	| {char} char annotations?
 	| {string} string annotations?
-	| {start_string} [string]:start_string 
-	| {mid_string} [string]:mid_string 
-	| {end_string} [string]:end_string 
+	| {start_string} [string]:start_string
+	| {mid_string} [string]:mid_string
+	| {end_string} [string]:end_string
 	| {superstring} [exprs]:expr* annotations?
+	| {lambda} kwmeth signature kwdo expr
 	| {par} opar expr cpar annotations?
         | {as_cast} expr kwas opar? type cpar?
         | {as_notnull} expr kwas opar? kwnot kwnull cpar?
@@ -1021,6 +1064,7 @@ expr	= {block} expr* kwend?
 	| {debug_type} kwdebug kwtype expr type
 	| {vararg} expr dotdotdot
 	| {namedarg} id assign expr
+	| {safe} expr quest
 	| {type} type
 	| {methid} expr [id]:methid
 	| {at} annotations
@@ -1044,6 +1088,9 @@ assign_op
 	| {ll} [op]:lleq
 	| {gg} [op]:ggeq
 	;
+for_group
+	= [ids]:id* kwin expr
+	;
 
 module_name = quad? [path]:id* id;
 extern_calls = kwimport [extern_calls]:extern_call*