parser: remove attr and meth alternatives

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

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 1104c50..a386ff1 100644 (file)
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -65,9 +65,8 @@ kwinterface = 'interface';
 kwuniversal = 'universal';
 kwspecial = 'special';
 kwend = 'end';
-kwmeth = 'meth' | 'fun'; //FIXME: Remove the 'meth' alternative once the transition is done
+kwmeth = 'fun';
 kwtype = 'type';
-kwattr = 'attr'; //FIXME: remove kwattr once the transition is done
 kwinit = 'init';
 kwredef = 'redef';
 kwis = 'is';
@@ -104,6 +103,9 @@ kwfalse = 'false';
 kwnull = 'null';
 kwas = 'as';
 kwwith = 'with';
+kwnullable = 'nullable';
+kwisset = 'isset';
+kwlabel = 'label';
 
 opar = '(';
 cpar = ')';
@@ -162,7 +164,7 @@ packagedecl
        = [doc]:no kwpackage no id [n2]:n1 {-> New packagedecl(doc.doc, kwpackage, id)};
 
 import
-       = [doc]:no visibility kwimport no id [n2]:n1            {-> New import(visibility, kwimport, id)}
+       = {std} [doc]:no visibility kwimport no id [n2]:n1              {-> New import.std(visibility, kwimport, id)}
        | {no} [doc]:no visibility kwimport no kwend [n2]:n1    {-> New import.no(visibility, kwimport, kwend)}
        ;
 
@@ -178,7 +180,7 @@ implicit_main_meth {-> propdef}
 
 /* CLASSES *******************************************************************/
 classdef
-       = [doc]:no redef visibility classkind no classid formaldefs? [specials]:special* propdefs? [n2]:no kwend {-> New classdef(doc.doc, redef.kwredef, visibility, classkind, classid, [formaldefs.formaldef], [specials.superclass], [propdefs.propdef])};
+       = [doc]:no redef visibility classkind no classid formaldefs? [specials]:special* propdefs? [n2]:no kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, classid, [formaldefs.formaldef], [specials.superclass], [propdefs.propdef])};
 redef {-> kwredef?}
        = kwredef? {-> kwredef};
 classkind
@@ -209,11 +211,8 @@ propdef~toplevel {-> propdef}
 !toplevel| {deferred} [doc]:no redef visibility kwmeth methid signature kwis kwabstract {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
 !toplevel| {intern} [doc]:no redef visibility kwmeth methid signature kwis kwintern {-> New propdef.intern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
        | {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, string)}
-//FIXME: Remove attr alternative once the transition is done
-!toplevel| {attr} [doc]:no readable writable redef visibility kwattr attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwattr, Null, attrid, typing.type, Null)}
-!toplevel| {attr2} [doc]:no readable writable redef visibility kwattr attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwattr, Null, attrid, typing.type, expr)}
-!toplevel| {var} [doc]:no readable writable redef visibility kwvar attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, Null, kwvar, attrid, typing.type, Null)}
-!toplevel| {var2} [doc]:no readable writable redef visibility kwvar attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, Null, kwvar, attrid, typing.type, expr)}
+!toplevel| {var} [doc]:no readable writable redef visibility kwvar attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, typing.type, Null)}
+!toplevel| {var2} [doc]:no readable writable redef visibility kwvar attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, typing.type, expr)}
 !toplevel| {init} [doc]:no redef visibility kwinit methid? signature kwdo stmtso kwend? {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, stmtso.expr)}
 !toplevel| {type} [doc]:no redef visibility kwtype classid typing {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, classid, typing.type)}
        ;
@@ -280,8 +279,8 @@ closure_decl
 
 /* TYPES *********************************************************************/
 type~nobra {-> type}
-       = {simple} classid {-> New type(classid, [])}
-!nobra | {generic} classid obra no types [n2]:no cbra {-> New type(classid, [types.type])}
+       = {simple} kwnullable? classid {-> New type(kwnullable, classid, [])}
+!nobra | {generic} kwnullable? classid obra no types [n2]:no cbra {-> New type(kwnullable, classid, [types.type])}
        ;
 types {-> type*} 
        = type types_tail* {-> [type, types_tail.type]};
@@ -291,11 +290,11 @@ typing {-> type}
        = column no type {-> type};
 
 /* STATMENTS *****************************************************************/
-stmtso~withelse {-> expr?}
-       = {oneline} stmt~withelse {-> stmt~withelse.expr}
-       | {block} n stmts [n2]:n kwend {-> stmts.expr}
+stmtso~withelse~withend {-> expr?}
+       = {block} n stmts [n2]:n kwend {-> stmts.expr}
        | {emptyblock} n kwend {-> New expr.block([])}
        | {emptyoneline} kwend {-> New expr.block([])}
+!withend| {oneline} stmt~withelse {-> stmt~withelse.expr}
        ;
 stmts {-> expr}
        = stmt stmts_tail* {-> New expr.block([stmt.expr, stmts_tail.expr])};
@@ -305,9 +304,9 @@ stmt~withelse {-> expr}
        = {vardecl} vardecl~withelse {-> vardecl~withelse.expr}
        | {assign} assignment~withelse {-> assignment~withelse.expr}
        | {return} kwreturn expr_final~withelse? {-> New expr.return(kwreturn, expr_final~withelse.expr)}
-       | {break} kwbreak expr_final~withelse? {-> New expr.break(kwbreak, expr_final~withelse.expr)}
+       | {break} kwbreak label? expr_final~withelse? {-> New expr.break(kwbreak, label, expr_final~withelse.expr)}
        | {abort} kwabort {-> New expr.abort(kwabort)}
-       | {continue} kwcontinue expr_final~withelse? {-> New expr.continue(kwcontinue, expr_final~withelse.expr)}
+       | {continue} kwcontinue label? expr_final~withelse? {-> New expr.continue(kwcontinue, label, expr_final~withelse.expr)}
        | {do} do~withelse {-> do~withelse.expr}
        | {if} if~withelse {-> if~withelse.expr}
        | {while} while~withelse {-> while~withelse.expr}
@@ -318,18 +317,21 @@ stmt~withelse {-> expr}
        | {init} recv kwinit args_nopar {-> New expr.init(recv.expr, kwinit, [args_nopar.expr])}
        ;
 
+label= kwlabel id;
+
 closure_defs~withelse {-> closure_def*}
        = {one} closure_def_last~withelse {-> [closure_def_last~withelse.closure_def]}
        | closure_def closure_defs~withelse {-> [closure_def, closure_defs~withelse.closure_def]}
        ;
 
 closure_def_last~withelse {-> closure_def}
-       = kwwith idlist? kwdo stmtso~withelse {-> New closure_def(kwwith, [idlist.id], kwdo, stmtso~withelse.expr)}
+       = kwwith idlist? kwdo stmtso~withelse_withend label? {-> New closure_def(kwwith, [idlist.id], kwdo, stmtso~withelse_withend.expr, label)}
+       | {noend} kwwith idlist? kwdo stmt~withelse {-> New closure_def(kwwith, [idlist.id], kwdo, stmt~withelse.expr, Null)}
        ;
 
 closure_def {-> closure_def}
-       = kwwith idlist? kwdo n stmts [n2]:n {-> New closure_def(kwwith, [idlist.id], kwdo, stmts.expr)}
-       | {empty} kwwith idlist? kwdo n {-> New closure_def(kwwith, [idlist.id], kwdo, Null)}
+       = kwwith idlist? kwdo n stmts [n2]:n {-> New closure_def(kwwith, [idlist.id], kwdo, stmts.expr, Null)}
+       | {empty} kwwith idlist? kwdo n {-> New closure_def(kwwith, [idlist.id], kwdo, Null, Null)}
        ;
 
 vardecl~withelse{-> expr}
@@ -351,7 +353,8 @@ assign_op
        ;
 
 do~withelse {-> expr}
-       = kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr)}
+       = kwdo stmtso~withelse_withend label? {-> New expr.do(kwdo, stmtso~withelse_withend.expr, label)}
+       | {noend} kwdo stmt~withelse {-> New expr.do(kwdo, stmt~withelse.expr, Null)}
        ;
 
 if~withelse {-> expr}
@@ -366,10 +369,14 @@ elsepartblock {-> expr?}
        ;
 
 while~withelse {-> expr}
-       = kwwhile no expr [n2]:no kwdo stmtso~withelse {-> New expr.while(kwwhile, expr, kwdo, stmtso~withelse.expr)};
- 
+       = kwwhile no expr [n2]:no kwdo stmtso~withelse_withend label? {-> New expr.while(kwwhile, expr, kwdo, stmtso~withelse_withend.expr, label)}
+       | {noend} kwwhile no expr [n2]:no kwdo stmt~withelse {-> New expr.while(kwwhile, expr, kwdo, stmt~withelse.expr, Null)}
+       ;
+
 for~withelse {-> expr}
-       = kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, id, expr, kwdo, stmtso~withelse.expr)};
+       = kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse_withend label? {-> New expr.for(kwfor, id, expr, kwdo, stmtso~withelse_withend.expr, label)}
+       | {noend} kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmt~withelse {-> New expr.for(kwfor, id, expr, kwdo, stmt~withelse.expr, Null)}
+       ;
 
 assert~withelse {-> expr}
        = kwassert assertid? expr_final~withelse {-> New expr.assert(kwassert, assertid.id, expr_final~withelse.expr)};
@@ -434,6 +441,7 @@ expr_minus~nopar~nobra {-> expr}
 expr_new~nopar~nobra {-> expr}
        = expr_atom~nopar~nobra {-> expr_atom~nopar~nobra.expr}
        | {new} kwnew no type~nobra args {-> New expr.new(kwnew, type~nobra.type, Null, [args.expr])}
+       | {isset_attr} kwisset recv~nopar~nobra attrid {-> New expr.isset_attr(kwisset, recv~nopar~nobra.expr, attrid)}
        ;
 
 expr_atom~nopar~nobra {-> expr}
@@ -457,6 +465,7 @@ expr_atom~nopar~nobra {-> expr}
        | {superstring} superstring  {-> superstring.expr}
 !nopar | {par} opar expr cpar {-> expr}
         | {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, type)}
+        | {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, kwnot, kwnull)}
        ;
 
 superstring {-> expr} 
@@ -532,7 +541,7 @@ module      = packagedecl? [imports]:import* [classdefs]:classdef*;
 packagedecl
        = doc? kwpackage id;
 
-import =  visibility kwimport id
+import = {std} visibility kwimport id
        | {no} visibility kwimport kwend
        ;
 
@@ -543,7 +552,7 @@ visibility
        | {intrude} kwintrude
        ;
 
-classdef = doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* [superclasses]:superclass* [propdefs]:propdef*
+classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* [superclasses]:superclass* [propdefs]:propdef*
        | {top} [propdefs]:propdef*
        | {main} [propdefs]:propdef*
        ;
@@ -557,7 +566,7 @@ formaldef = [id]:classid type?;
 superclass = kwspecial type;
 
 
-propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwattr? kwvar? [id]:attrid type? expr? // Remove the kwattr? once the transition is done
+propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwvar [id]:attrid type? expr?
        | {meth} doc? kwredef? visibility methid signature 
        | {deferred_meth} doc? kwredef? visibility kwmeth methid signature 
        | {intern_meth} doc? kwredef? visibility kwmeth methid signature 
@@ -582,19 +591,21 @@ param     = id type? dotdotdot?
 closure_decl = kwwith kwbreak? id signature expr?
        ;
 
-type   = [id]:classid [types]:type*;
+type   = kwnullable? [id]:classid [types]:type*;
+
+label = kwlabel id;
 
 expr   = {block} expr* 
        | {vardecl} kwvar id type? assign? expr? 
        | {return} kwreturn expr? 
-       | {break} kwbreak expr?
+       | {break} kwbreak label? expr?
        | {abort} kwabort
-       | {continue} kwcontinue expr?
-       | {do} kwdo [block]:expr? 
+       | {continue} kwcontinue label? expr?
+       | {do} kwdo [block]:expr? label?
        | {if} kwif expr [then]:expr? [else]:expr? 
        | {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
-       | {while} kwwhile expr kwdo [block]:expr? 
-       | {for} kwfor id expr kwdo [block]:expr? 
+       | {while} kwwhile expr kwdo [block]:expr? label?
+       | {for} kwfor id expr kwdo [block]:expr? label?
        | {assert} kwassert id? expr 
        | {once} kwonce expr 
        | {send} expr 
@@ -629,6 +640,7 @@ expr        = {block} expr*
        | {bra} expr [args]:expr* [closure_defs]:closure_def* 
        | {bra_assign} expr [args]:expr* assign [value]:expr 
        | {bra_reassign} expr [args]:expr* assign_op [value]:expr 
+       | {closure_call} id [args]:expr* [closure_defs]:closure_def*
        | {var} id
        | {var_assign} id assign [value]:expr 
        | {var_reassign} id assign_op [value]:expr 
@@ -651,6 +663,8 @@ expr        = {block} expr*
        | {superstring} [exprs]:expr*
        | {par} expr 
         | {as_cast} expr kwas type
+        | {as_notnull} expr kwas kwnot kwnull
+       | {isset_attr} kwisset expr [id]:attrid
        ;
 assign_op
        = {plus} pluseq
@@ -658,7 +672,7 @@ assign_op
        ;
 
 closure_def
-       = kwwith id* kwdo expr?
+       = kwwith id* kwdo expr? label?
        ;
 
 qualified = id* classid? ;