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';
kwfalse = 'false';
kwnull = 'null';
kwas = 'as';
-kwwith = 'with';
+kwnullable = 'nullable';
+kwisset = 'isset';
+kwlabel = 'label';
opar = '(';
cpar = ')';
gt = '>';
ge = '>=';
starship = '<=>';
+bang='!';
classid = uppercase letter*;
id = lowercase letter*;
= [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)}
;
/* 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
;
propdef~toplevel {-> propdef}
= {meth} [doc]:no redef visibility kwmeth methid signature kwdo stmtso kwend? {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, stmtso.expr)}
+ | {assign_return} [doc]:no redef visibility kwmeth methid_noassign signature_withret assign no assign_return {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid_noassign.methid, signature_withret.signature, assign_return.expr)}
!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)}
;
| {intrude} kwintrude no {-> New visibility.intrude(kwintrude)}
;
-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
- ;
-
-signature
- = params? typing? closure_decls {-> New signature([params.param], typing.type, [closure_decls.closure_decl])}
- | {noclosures} params? typing? no {-> New signature([params.param], typing.type, [])}
+methid~noassign {-> methid}
+ = {id} id {-> New methid.id(id)}
+ | {plus} plus {-> New methid.plus(plus)}
+ | {minus} minus {-> New methid.minus(minus)}
+ | {star} star {-> New methid.star(star)}
+ | {slash} slash {-> New methid.slash(slash)}
+ | {percent} percent {-> New methid.percent(percent)}
+ | {eq} eq {-> New methid.eq(eq)}
+ | {ne} ne {-> New methid.ne(ne)}
+ | {le} le {-> New methid.le(le)}
+ | {ge} ge {-> New methid.ge(ge)}
+ | {lt} lt {-> New methid.lt(lt)}
+ | {gt} gt {-> New methid.gt(gt)}
+ | {bra} obra cbra {-> New methid.bra(obra, cbra)}
+ | {starship} starship {-> New methid.starship(starship)}
+!noassign | {assign} id assign {-> New methid.assign(id, assign)}
+!noassign | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)}
+ ;
+
+signature~withret {-> signature}
+ = params? typing closure_decls {-> New signature([params.param], typing.type, [closure_decls.closure_decl])}
+ | {noclosures} params? typing no {-> New signature([params.param], typing.type, [])}
+!withret| {noret} params? closure_decls {-> New signature([params.param], Null, [closure_decls.closure_decl])}
+!withret| {noretnoclosures} params? no {-> New signature([params.param], Null, [])}
;
signature_noclosures {-> signature}
closure_decls {->closure_decl*}
= no closure_decl+ {-> [closure_decl]};
closure_decl
- = kwwith kwbreak? [no2]:no id signature_noclosures n {-> New closure_decl(kwwith, kwbreak, id, signature_noclosures.signature, Null)}
- | {optionnal} kwwith kwbreak? [no2]:no id signature_noclosures kwdo stmtso n {-> New closure_decl(kwwith, kwbreak, id, signature_noclosures.signature, stmtso.expr)}
+ = kwbreak? bang id signature_noclosures n {-> New closure_decl(kwbreak, bang, id, signature_noclosures.signature, Null)}
+ | {optionnal} kwbreak? bang id signature_noclosures kwdo stmtso n {-> New closure_decl(kwbreak, bang, id, signature_noclosures.signature, stmtso.expr)}
+ | {assign} kwbreak? bang id signature_noclosures assign no assign_continue n {-> New closure_decl(kwbreak, bang, id, signature_noclosures.signature, assign_continue.expr)}
+ ;
+
+assign_return{-> expr}
+ = expr_final {-> New expr.return(Null, expr_final.expr)}
;
+
/* 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]};
= 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])};
= {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}
| {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)}
+ = bang [id]:closure_id idlist? kwdo stmtso~withelse_withend label? {-> New closure_def(bang, id, [idlist.id], kwdo, stmtso~withelse_withend.expr, label)}
+ | {noend} bang [id]:closure_id idlist? kwdo stmt~withelse {-> New closure_def(bang, id, [idlist.id], kwdo, stmt~withelse.expr, Null)}
+ | {assign} bang [id]:closure_id idlist? assign no assign_continue~withelse {-> New closure_def(bang, id, [idlist.id], Null, assign_continue~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)}
+ = bang [id]:closure_id idlist? kwdo n stmts [n2]:n {-> New closure_def(bang, id, [idlist.id], kwdo, stmts.expr, Null)}
+ | {empty} bang [id]:closure_id idlist? kwdo n {-> New closure_def(bang, id, [idlist.id], kwdo, Null, Null)}
+ ;
+closure_id
+ = {simple} id
+ | {break} kwbreak
+ ;
+
+assign_continue~withelse{-> expr}
+ = expr_final~withelse {-> New expr.continue(Null, Null, expr_final~withelse.expr)}
;
vardecl~withelse{-> expr}
;
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}
;
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)};
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}
| {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}
args_tail {-> expr}
= comma no expr [n2]:no {-> expr};
idlist {-> id*}
+ = opar idlist_nopar cpar {-> [idlist_nopar.id]}
+ | {nopar} idlist_nopar {-> [idlist_nopar.id]}
+ ;
+idlist_nopar {-> id*}
= {single} id {-> [id]}
- | {more} idlist no comma [n2]:no id {-> [idlist.id, id]}
+ | {more} idlist_nopar no comma [n2]:no id {-> [idlist_nopar.id, id]}
;
qualified
packagedecl
= doc? kwpackage id;
-import = visibility kwimport id
+import = {std} visibility kwimport id
| {no} visibility kwimport kwend
;
| {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*
;
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
param = id type? dotdotdot?
;
-closure_decl = kwwith kwbreak? id signature expr?
+closure_decl = kwbreak? bang 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?
+ | {return} kwreturn? 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
| {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
| {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
;
closure_def
- = kwwith id* kwdo expr?
+ = bang [id]:closure_id [ids]:id* kwdo? expr? label?
+ ;
+closure_id
+ = {simple} id
+ | {break} kwbreak
;
qualified = id* classid? ;
nitlanguage / nit.git / blobdiff