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

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 2e15312..26946a7 100644
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -78,6 +78,7 @@ long_sstr_body = long_sstr_part*;
 extern_code_char
 	= [all - ['`' + '\']]
 	| '\' all
+	| '`' [all - '}']
 	;
 extern_code_body = extern_code_char*;
 
@@ -144,6 +145,7 @@ kwas = 'as';
 kwnullable = 'nullable';
 kwisset = 'isset';
 kwlabel = 'label';
+kwwith = 'with';
 kwdebug = '__debug__';
 
 opar = '(';
@@ -218,7 +220,7 @@ import
 
 topdef {-> classdef}
 	= {classdef} classdef {-> classdef}
-	| propdefs_toplevel {-> New classdef.top([propdefs_toplevel.propdef])}
+	| propdef_toplevel n1 {-> New classdef.top([propdef_toplevel.propdef])}
 	;
 
 implicit_main_class {-> classdef?}
@@ -232,7 +234,7 @@ implicit_main_meth {-> propdef}
 
 /* CLASSES *******************************************************************/
 classdef
-	= [doc]:no redef visibility classkind no qclassid formaldefs line_annotations_forclass? extern_code_block? [superclasses]:superclass* propdefs* [n2]:no kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], line_annotations_forclass.annotations, extern_code_block, [superclasses.superclass], [propdefs.propdef], kwend)};
+	= [doc]:no redef visibility classkind no qclassid formaldefs extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], extern_code_block, [propdefs.propdef], kwend)};
 redef {-> kwredef?}
 	= kwredef? {-> kwredef};
 classkind
@@ -252,23 +254,32 @@ formaldefs_tail {-> formaldef}
 formaldef
 	= classid annotations? typing_o {-> New formaldef(classid, typing_o.type, annotations)};
 
-superclass {-> superclass}
-	= {super} no kwsuper [n2]:no type annotation_withend {-> New superclass(kwsuper, type, annotation_withend.annotations)}
+superclass {-> propdef}
+	= {super} [doc]:no redef visibility kwsuper [n2]:no type annotation_withend {-> New propdef.super(doc.doc, redef.kwredef, visibility, kwsuper, type, annotation_withend.annotations)}
 	;
 
-propdefs~toplevel {-> propdef}
-	= propdef~toplevel n1 {-> propdef~toplevel.propdef}
+propdefs {-> propdef*}
+	= propdefn+ no {-> [propdefn.propdef]}
+	| {super} superclass {-> [superclass.propdef]}
+	| {empty} no {-> []}
+	;
+propdefn {-> propdef}
+	= propdef n1 {-> propdef.propdef}
 	;
 propdef~toplevel {-> propdef}
 	= {meth} [doc]:no 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, stmtso.expr)}
 	| {nobody} [doc]:no 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)}
 !toplevel| {intern_new} [doc]:no 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)}
+!toplevel| {new} [doc]:no 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, stmtso.expr)}
 	| {extern_implicit} [doc]:no 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)}
-!toplevel| {var3} [doc]:no redef visibility kwvar id typing_o annotation_withend {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, Null, annotation_withend.annotations)}
-!toplevel| {var4} [doc]:no 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, expr.expr, annotation_withend.annotations)}
+!toplevel| {var3} [doc]:no redef visibility kwvar id typing_o annotation_withend {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, Null, annotation_withend.annotations, Null)}
+!toplevel| {var4} [doc]:no 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, expr.expr, annotation_withend.annotations, Null)}
+!toplevel| {var5} [doc]:no 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, annotation_noend.annotations, stmtso.expr)}
 !toplevel| {init} [doc]:no 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, stmtso.expr)}
 !toplevel| {type} [doc]:no 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]:no 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)}
+!toplevel| {annot} line_annotation_forclass {-> line_annotation_forclass.propdef}
+!toplevel| {super} superclass {-> superclass.propdef}
 	;
 annotation_withend~nonull {-> annotations?}
 	= {oneliner} kwis many_annotations {-> many_annotations.annotations}
@@ -288,9 +299,8 @@ visibility
 	| {intrude} kwintrude no {-> New visibility.intrude(kwintrude)}
 	;
 
-methid {-> methid}
-	= {id} id {-> New methid.id(id)}
-	| {plus} plus {-> New methid.plus(plus)}
+methid~noid {-> methid}
+	= {plus} plus {-> New methid.plus(plus)}
 	| {minus} minus {-> New methid.minus(minus)}
 	| {star} star {-> New methid.star(star)}
 	| {starstar} starstar {-> New methid.starstar(starstar)}
@@ -308,6 +318,7 @@ methid {-> methid}
 	| {starship} starship {-> New methid.starship(starship)}
 	| {assign} id assign {-> New methid.assign(id, assign)}
 	| {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)}
+!noid	| {id} id {-> New methid.id(id)}
 	;
 
 signature {-> signature}
@@ -406,6 +417,7 @@ stmt~withelse~noexpr~nopar {-> expr}
 	| {while} while~withelse {-> while~withelse.expr}
 	| {loop} loop~withelse {-> loop~withelse.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	| {super} qualified_o kwsuper args_nopar {-> New expr.super(qualified_o.qualified, kwsuper, args_nopar.exprs)}
@@ -464,6 +476,16 @@ for~withelse {-> expr}
 	| {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)}
 	;
 
+with~withelse {-> expr}
+	= kwwith no withexpr [n4]:no kwdo stmtso_withend label {-> New expr.with(kwwith, withexpr.expr, kwdo, stmtso_withend.expr, label)}
+	| {nolabel} kwwith no withexpr [n4]:no kwdo stmtso~withelse {-> New expr.with(kwwith, withexpr.expr, kwdo, stmtso~withelse.expr, Null)}
+	;
+
+withexpr {-> expr}
+	= {assign} id annotations? typing_o assign no expr {-> New expr.vardecl(Null, id, typing_o.type, assign, expr.expr, annotations)}
+	| expr {-> expr}
+	;
+
 assert~withelse {-> expr}
 	= {else} kwassert assertid? expr kwelse stmtso~withelse {-> New expr.assert(kwassert, assertid.id, expr, stmtso~withelse.expr)}
 !withelse| {noelse} kwassert assertid? expr {-> New expr.assert(kwassert, assertid.id, expr, Null)}
@@ -524,7 +546,7 @@ expr_pow~nopar~nobra {-> expr}
 
 expr_minus~nopar~nobra {-> expr}
 	= expr_new~nopar~nobra {-> expr_new~nopar~nobra.expr}
-	| {:uminus} minus :no expr_minus~nobra
+	| {:uminus} minus expr_minus~nobra
 	| {:once} kwonce :no expr_minus~nobra
 	;
 
@@ -563,7 +585,7 @@ expr_single~nopar~nobra {-> 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, expr2.expr, cbra, annotations_o.annotations)}
 !nobra!nopar	| {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra annotations_o {-> New expr.orange(obra, expr, expr2.expr, cbra, annotations_o.annotations)}
-!nobra!nopar	| {array} obra no args_list typing_o cbra annotations_o {-> New expr.array(obra, args_list.exprs, typing_o.type, cbra, annotations_o.annotations)}
+!nobra!nopar	| {array} obra no array_items typing_o cbra annotations_o {-> New expr.array(obra, [array_items.expr], typing_o.type, cbra, annotations_o.annotations)}
 	;
 
 expr_par {-> expr}
@@ -579,6 +601,18 @@ many_expr_tail {->expr}
 	= comma no any_expr {-> any_expr.expr}
 	;
 
+array_items {-> expr*}
+	= array_item array_items_tail* {-> [array_item.expr, array_items_tail.expr]}
+	;
+array_items_tail {-> expr}
+	= comma no array_item {-> array_item.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], expr, kwdo, block.expr, Null)}
+	| {if} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:array_item {-> New expr.if(kwif, expr, then.expr, Null)}
+	;
+
 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*}
@@ -644,13 +678,10 @@ line_annotation {-> annotation}
 	| {args} [doc]:no redef visibility atid opar no at_args cpar annotations? n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, opar, [at_args.expr], cpar, annotations)}
 	| {nopar} [doc]:no redef visibility atid at_args_nopar n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, Null, [at_args_nopar.expr], Null, Null)}
 	;
-line_annotations_forclass {-> annotations}
-	= line_annotation_forclass+ {-> New annotations(Null, Null, [line_annotation_forclass.annotation], Null) }
-	;
-line_annotation_forclass {-> annotation}
-	= [doc]:no atid_forclass annotations? n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, Null, [], Null, annotations)}
-	| {args} [doc]:no atid_forclass opar no at_args cpar annotations? n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, opar, [at_args.expr], cpar, annotations)}
-	| {nopar} [doc]:no atid_forclass at_args_nopar n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, Null, [at_args_nopar.expr], Null, Null)}
+line_annotation_forclass {-> propdef}
+	= [doc]:no atid_forclass annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [], Null, annotations)}
+	| {args} [doc]:no atid_forclass opar no at_args cpar annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, opar, [at_args.expr], cpar, annotations)}
+	| {nopar} [doc]:no atid_forclass at_args_nopar {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [at_args_nopar.expr], Null, Null)}
 	;
 
 at_args~nopar {-> expr* }
@@ -665,6 +696,7 @@ any_expr~nopar {-> expr}
 	= {type} type {-> New expr.type(type)}
 	| {expr} expr~nopar {-> expr~nopar.expr}
 	| {stmt} stmt_noexpr~nopar {-> stmt_noexpr~nopar.expr}
+	| {methid} recv~nopar qmethid_noid {-> New expr.methid(recv~nopar.expr, qmethid_noid.methid)}
 !nopar	| {at} annotations {-> New expr.at(annotations.annotations)}
 	;
 
@@ -683,9 +715,12 @@ recv~nopar~nobra {-> expr}
 	;
 
 args {-> exprs}
+	= args_n {-> args_n.exprs}
+	| {empty} {-> New exprs.list([])}
+	;
+args_n {-> exprs}
 	= opar no expr_list cpar {-> New exprs.par(opar, [expr_list.expr], cpar) }
 	| {emptypar} opar no cpar {-> New exprs.par(opar, [], cpar) }
-	| {empty} {-> New exprs.list([])}
 	;
 args_nopar {-> exprs}
 	= opar no expr_list cpar {-> New exprs.par(opar, [expr_list.expr], cpar) }
@@ -776,7 +811,7 @@ visibility
 	| {intrude} kwintrude
 	;
 
-classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* annotations? extern_code_block? [superclasses]:superclass* [propdefs]:propdef* kwend
+classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* extern_code_block? [propdefs]:propdef* kwend
 	| {top} [propdefs]:propdef*
 	| {main} [propdefs]:propdef*
 	;
@@ -788,13 +823,14 @@ classkind
 	| {extern} kwextern kwclass?
 	;
 formaldef = [id]:classid type? annotations?;
-superclass = kwsuper type annotations?;
 
 
-propdef = {attr} doc? kwredef? visibility kwvar [id2]:id type? expr? annotations?
+propdef = {attr} doc? kwredef? visibility kwvar [id2]:id type? expr? annotations? [block]:expr?
 	| {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? [block]:expr?
+	| {super} doc? kwredef? visibility kwsuper type annotations?
+	| {annot} doc? kwredef? visibility? atid opar? [args]:expr* cpar? annotations?
 	;
 
 methid = {id} id | {plus} plus | {minus} minus | {star} star | {starstar} starstar | {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;
@@ -809,7 +845,7 @@ type	= kwnullable? [id]:classid [types]:type* annotations?;
 label = kwlabel id?;
 
 expr	= {block} expr* kwend? 
-	| {vardecl} kwvar id type? assign? expr? annotations?
+	| {vardecl} kwvar? id type? assign? expr? annotations?
 	| {return} kwreturn? expr?
 	| {break} kwbreak label?
 	| {abort} kwabort
@@ -820,6 +856,7 @@ expr	= {block} expr* kwend?
 	| {while} kwwhile expr kwdo [block]:expr? label?
 	| {loop} kwloop [block]:expr? label?
 	| {for} kwfor [ids]:id* expr kwdo [block]:expr? label?
+	| {with} kwwith expr kwdo [block]:expr? label?
 	| {assert} kwassert id? expr [else]:expr?
 	| {once} kwonce expr 
 	| {send} expr 
@@ -851,7 +888,7 @@ expr	= {block} expr* kwend?
 	| {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_assign} expr id [args]:exprs assign [value]:expr
 	| {call_reassign} expr id [args]:exprs assign_op [value]:expr 
 	| {super} qualified? kwsuper [args]:exprs
 	| {init} expr kwinit [args]:exprs 
@@ -864,7 +901,7 @@ expr	= {block} expr* kwend?
 	| {range} expr [expr2]:expr annotations?
 	| {crange} obra expr [expr2]:expr cbra annotations?
 	| {orange} obra expr [expr2]:expr [cbra]:obra annotations?
-	| {array} obra [exprs]:exprs type? cbra annotations?
+	| {array} obra [exprs]:expr* type? cbra annotations?
 	| {self} kwself annotations?
 	| {implicit_self} 
 	| {true} kwtrue annotations?
@@ -886,6 +923,7 @@ expr	= {block} expr* kwend?
 	| {debug_type} kwdebug kwtype expr type
 	| {vararg} expr dotdotdot
 	| {type} type
+	| {methid} expr [id]:methid
 	| {at} annotations
 	| {many} [exprs]:expr*
 	;