grammar: propdefs returns a list

[nit.git] / src / parser / nit.sablecc3xx

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index ad3ad66..e0b3b0d 100644 (file)
--- 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*;
 
@@ -218,7 +219,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 +233,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 line_annotations_forclass? extern_code_block? [superclasses]:superclass* propdefs 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)};
 redef {-> kwredef?}
        = kwredef? {-> kwredef};
 classkind
@@ -256,19 +257,25 @@ superclass {-> superclass}
        = {super} no kwsuper [n2]:no type annotation_withend {-> New superclass(kwsuper, type, annotation_withend.annotations)}
        ;
 
-propdefs~toplevel {-> propdef}
-       = propdef~toplevel n1 {-> propdef~toplevel.propdef}
+propdefs {-> propdef*}
+       = propdefn+ no {-> [propdefn.propdef]}
+       | {empty} no {-> []}
+       ;
+propdefn {-> propdef}
+       = propdef n1 {-> propdef.propdef}
        ;
 propdef~toplevel {-> propdef}
-       = {meth} [doc]:no redef visibility kwmeth methid signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, methid, signature, annotation_noend.annotations, Null, Null, stmtso.expr)}
-       | {nobody} [doc]:no redef visibility kwmeth methid signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, methid, signature.signature, annotation_withend_nonull.annotations, Null, Null, Null)}
-!toplevel| {intern_new} [doc]:no redef visibility kwnew methid? signature annotation_withend_nonull {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwnew, methid, signature, annotation_withend_nonull.annotations, Null, Null, Null)}
-       | {extern_implicit} [doc]:no redef visibility kwmeth methid signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, kwmeth, Null, Null, 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| {init} [doc]:no redef visibility kwinit methid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, kwinit, Null, methid, signature, annotation_noend.annotations, Null, Null, stmtso.expr)}
+       = {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, 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 methid? signature annotation_noend? extern_calls extern_code_block {-> New propdef.meth(doc.doc, redef.kwredef, visibility, Null, Null, kwnew, methid, signature, annotation_noend.annotations, extern_calls, extern_code_block, Null)}
+!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)}
        ;
 annotation_withend~nonull {-> annotations?}
        = {oneliner} kwis many_annotations {-> many_annotations.annotations}
@@ -288,9 +295,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 +314,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}
@@ -340,8 +347,8 @@ extern_call {-> extern_call}
        | {super} kwsuper {-> New extern_call.super( kwsuper )}
        ;
 extern_call_prop {-> extern_call}
-       = {local} methid {-> New extern_call.local_prop( methid )}
-       | {full} type dot methid {-> New extern_call.full_prop( type, dot, methid )}
+       = {local} qmethid {-> New extern_call.local_prop( qmethid.methid )}
+       | {full} type dot qmethid {-> New extern_call.full_prop( type, dot, qmethid.methid )}
        | {init} type {-> New extern_call.init_prop( type )}
        ;
 extern_call_cast {-> extern_call}
@@ -524,7 +531,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
        ;
 
@@ -559,11 +566,36 @@ expr_single~nopar~nobra {-> expr}
        | {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}
-!nopar | {par} opar no any_expr [n2]:no cpar annotations_o {-> New expr.par(opar, any_expr.expr, cpar, annotations_o.annotations)}
+!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, 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}
+       = {par} opar no any_expr [n2]:no cpar annotations_o {-> New expr.par(opar, any_expr.expr, cpar, annotations_o.annotations)}
+       | {tuple} opar no many_expr [n2]:no cpar annotations_o {-> New expr.par(opar, many_expr.expr, cpar, annotations_o.annotations)}
+       ;
+
+many_expr {->expr}
+       = any_expr many_expr_tail+ {-> New expr.many([any_expr.expr, many_expr_tail.expr])}
+       ;
+
+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} 
@@ -652,6 +684,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)}
        ;
 
@@ -670,9 +703,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) }
@@ -716,6 +752,9 @@ qid {-> id}
 qclassid {-> classid}
        = qualified? classid {-> classid}
        ;
+qmethid~noid {-> methid}
+       = qualified? methid~noid {-> methid~noid.methid}
+       ;
 modquad {-> id}
        = id quad no {-> id};
 classquad {-> classid} 
@@ -775,7 +814,7 @@ 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?
@@ -835,7 +874,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 
@@ -848,7 +887,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?
@@ -870,7 +909,9 @@ expr        = {block} expr* kwend?
        | {debug_type} kwdebug kwtype expr type
        | {vararg} expr dotdotdot
        | {type} type
+       | {methid} expr [id]:methid
        | {at} annotations
+       | {many} [exprs]:expr*
        ;
 exprs
        = {list} [exprs]:expr*