X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index afa1ac2..88619c5 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -57,17 +57,16 @@ blank = (' ' | tab)+; eol = eol_helper; comment = '#' any* eol_helper; -kwpackage = 'package'; +kwmodule = 'package'|'module'; kwimport = 'import'; kwclass = 'class'; kwabstract = 'abstract'; kwinterface = 'interface'; -kwuniversal = 'universal'; +kwenum = 'universal'|'enum'; 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'; @@ -84,6 +83,7 @@ kwif = 'if'; kwthen = 'then'; kwelse = 'else'; kwwhile = 'while'; +kwloop = 'loop'; kwfor = 'for'; kwin = 'in'; kwand = 'and'; @@ -103,9 +103,9 @@ kwtrue = 'true'; kwfalse = 'false'; kwnull = 'null'; kwas = 'as'; -kwwith = 'with'; kwnullable = 'nullable'; kwisset = 'isset'; +kwlabel = 'label'; opar = '('; cpar = ')'; @@ -129,9 +129,12 @@ eq = '=='; ne = '!='; lt = '<'; le = '<='; +ll = '<<'; gt = '>'; ge = '>='; +gg = '>>'; starship = '<=>'; +bang='!'; classid = uppercase letter*; id = lowercase letter*; @@ -158,10 +161,10 @@ Productions /* MODULES *******************************************************************/ module - = packagedecl? [imports]:import* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(packagedecl, [imports.import],[classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])}; + = moduledecl? [imports]:import* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(moduledecl, [imports.import],[classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])}; -packagedecl - = [doc]:no kwpackage no id [n2]:n1 {-> New packagedecl(doc.doc, kwpackage, id)}; +moduledecl + = [doc]:no kwmodule no id [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, id)}; import = {std} [doc]:no visibility kwimport no id [n2]:n1 {-> New import.std(visibility, kwimport, id)} @@ -169,25 +172,27 @@ import ; implicit_top_class {-> classdef} - = propdefs_toplevel {-> New classdef.top([propdefs_toplevel.propdef])}; + = propdefs_toplevel+ {-> New classdef.top([propdefs_toplevel.propdef])}; implicit_main_class {-> classdef?} = implicit_main_meth {-> New classdef.main([implicit_main_meth.propdef])} | {null} n {-> Null} ; implicit_main_meth {-> propdef} - = [doc]:no stmts no {-> New propdef.main_meth(Null, stmts.expr)}; + = [doc]:no stmts {-> New propdef.main_meth(Null, stmts.expr)} + | {n} [doc]:no stmtsn {-> New propdef.main_meth(Null, stmtsn.expr)} + ; /* CLASSES *******************************************************************/ classdef - = [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])}; + = [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 = {concrete} kwclass | {abstract} kwabstract kwclass | {interface} kwinterface - | {universal} kwuniversal + | {enum} kwenum ; formaldefs {-> formaldef*} @@ -198,34 +203,34 @@ formaldef = classid typing? {-> New formaldef(classid, typing.type)}; special {-> superclass} - = no kwspecial [n2]:no type {-> New superclass(kwspecial, type)}; - -propdefs~toplevel {-> propdef*} - = propdef~toplevel n1 propdefs_tail~toplevel* {-> [propdef~toplevel.propdef, propdefs_tail~toplevel.propdef]} + = {special} no kwspecial [n2]:no type {-> New superclass(kwspecial, Null, type)} + | {super} no kwsuper [n2]:no type {-> New superclass(Null, kwsuper, type)} ; -propdefs_tail~toplevel {-> propdef} + +propdefs~toplevel {-> propdef} = propdef~toplevel n1 {-> propdef~toplevel.propdef} ; 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 signature_withret assign no assign_return {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, 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, Null, 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, Null, typing.type, expr)} +!toplevel| {var3} [doc]:no redef visibility kwvar id typing? writable2? {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, Null)} +!toplevel| {var4} [doc]:no redef visibility kwvar id typing? writable2? assign [n2]:no expr {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, 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)} ; -readable {-> able?} +readable {-> able} = redef kwreadable {-> New able.read(redef.kwredef, kwreadable)} - | {empty} {-> Null} ; -writable {-> able?} - = redef kwwritable {-> New able.write(redef.kwredef, kwwritable)} - | {empty} {-> Null} +writable {-> able} + = redef kwwritable {-> New able.write(redef.kwredef, Null, kwwritable)} + ; +writable2 {-> able} + = redef visibility kwwritable {-> New able.write(redef.kwredef, visibility, kwwritable)} ; visibility @@ -235,28 +240,32 @@ visibility | {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 {-> 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)} + | {ll} ll {-> New methid.ll(ll)} + | {gg} gg {-> New methid.gg(gg)} + | {bra} obra cbra {-> New methid.bra(obra, cbra)} + | {starship} starship {-> New methid.starship(starship)} + | {assign} id assign {-> New methid.assign(id, assign)} + | {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} @@ -276,10 +285,16 @@ param 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} kwnullable? classid {-> New type(kwnullable, classid, [])} @@ -293,26 +308,29 @@ 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 stmtsn kwend {-> stmtsn.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])}; +stmtsn {-> expr} + = stmt stmts_tail* n {-> New expr.block([stmt.expr, stmts_tail.expr])}; stmts_tail {-> expr} = n stmt {-> stmt.expr}; 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} + | {loop} loop~withelse {-> loop~withelse.expr} | {for} for~withelse {-> for~withelse.expr} | {assert} assert~withelse {-> assert~withelse.expr} | {call} recv id args_nopar closure_defs~withelse? {-> New expr.call(recv.expr, id, [args_nopar.expr], [closure_defs~withelse.closure_def])} @@ -320,18 +338,30 @@ 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)} + = bang [id]:closure_id idlist? kwdo stmtso_withend label {-> New closure_def(bang, id, [idlist.id], kwdo, stmtso_withend.expr, label)} + | {nolabel} bang [id]:closure_id idlist? kwdo stmtso~withelse {-> New closure_def(bang, id, [idlist.id], kwdo, stmtso~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 stmtsn {-> New closure_def(bang, id, [idlist.id], kwdo, stmtsn.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} @@ -353,13 +383,14 @@ assign_op ; do~withelse {-> expr} - = kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~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)} ; if~withelse {-> expr} = {onelineelse} kwif no expr [n2]:no kwthen stmt_withelse kwelse stmtso~withelse {-> New expr.if(kwif, expr, stmt_withelse.expr, stmtso~withelse.expr)} !withelse | {oneline} kwif no expr [n2]:no kwthen stmt {-> New expr.if(kwif, expr, stmt.expr, Null)} -!withelse | {block} kwif no expr [n2]:no kwthen [n3]:n stmts [n4]:n elsepartblock {-> New expr.if(kwif, expr, stmts.expr, elsepartblock.expr)} +!withelse | {block} kwif no expr [n2]:no kwthen [n3]:n stmtsn elsepartblock {-> New expr.if(kwif, expr, stmtsn.expr, elsepartblock.expr)} !withelse | {emptyblock} kwif no expr [n2]:no kwthen [n3]:n? elsepartblock {-> New expr.if(kwif, expr, Null, elsepartblock.expr)} ; elsepartblock {-> expr?} @@ -367,14 +398,25 @@ elsepartblock {-> expr?} | {empty} kwend {-> Null} ; +loop~withelse {-> expr} + = kwloop stmtso_withend label {-> New expr.loop(kwloop, stmtso_withend.expr, label)} + | {nolabel} kwloop stmtso~withelse {-> New expr.loop(kwloop, stmtso~withelse.expr, Null)} + ; + 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_withend label {-> New expr.while(kwwhile, expr, kwdo, stmtso_withend.expr, label)} + | {nolabel} kwwhile no expr [n2]:no kwdo stmtso~withelse {-> New expr.while(kwwhile, expr, kwdo, stmtso~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_withend label {-> New expr.for(kwfor, id, expr, kwdo, stmtso_withend.expr, label)} + | {nolabel} kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, id, expr, kwdo, stmtso~withelse.expr, Null)} + ; assert~withelse {-> expr} - = kwassert assertid? expr_final~withelse {-> New expr.assert(kwassert, assertid.id, expr_final~withelse.expr)}; + = {else} kwassert assertid? expr_final_withelse kwelse stmtso~withelse {-> New expr.assert(kwassert, assertid.id, expr_final_withelse.expr, stmtso~withelse.expr)} +!withelse| {noelse} kwassert assertid? expr_final {-> New expr.assert(kwassert, assertid.id, expr_final.expr, Null)} + ; assertid {-> id} = id column {-> id}; @@ -394,6 +436,7 @@ expr_and~nopar~nobra {-> expr} = expr_not~nopar~nobra {-> expr_not~nopar~nobra.expr} | {or} expr_and~nopar~nobra kwor no expr_not~nopar~nobra {-> New expr.or(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)} | {and} expr_and~nopar~nobra kwand no expr_not~nopar~nobra {-> New expr.and(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)} + | {or_else} expr_and~nopar~nobra kwor kwelse no expr_not~nopar~nobra {-> New expr.or_else(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)} ; expr_not~nopar~nobra {-> expr} @@ -408,8 +451,10 @@ expr_eq~nopar~nobra {-> expr} | {ne} expr_add~nopar~nobra ne no [expr2]:expr_add~nopar~nobra {-> New expr.ne(expr_add~nopar~nobra.expr, expr2.expr)} | {lt} expr_add~nopar~nobra lt no [expr2]:expr_add~nopar~nobra {-> New expr.lt(expr_add~nopar~nobra.expr, expr2.expr)} | {le} expr_add~nopar~nobra le no [expr2]:expr_add~nopar~nobra {-> New expr.le(expr_add~nopar~nobra.expr, expr2.expr)} + | {ll} expr_eq~nopar~nobra ll no [expr2]:expr_add~nopar~nobra {-> New expr.ll(expr_eq~nopar~nobra.expr, expr2.expr)} | {gt} expr_add~nopar~nobra gt no [expr2]:expr_add~nopar~nobra {-> New expr.gt(expr_add~nopar~nobra.expr, expr2.expr)} | {ge} expr_add~nopar~nobra ge no [expr2]:expr_add~nopar~nobra {-> New expr.ge(expr_add~nopar~nobra.expr, expr2.expr)} + | {gg} expr_eq~nopar~nobra gg no [expr2]:expr_add~nopar~nobra {-> New expr.gg(expr_eq~nopar~nobra.expr, expr2.expr)} | {starship} expr_add~nopar~nobra starship no [expr2]:expr_add~nopar~nobra {-> New expr.starship(expr_add~nopar~nobra.expr, expr2.expr)} | {isa} expr_add~nopar~nobra kwisa no type~nobra {-> New expr.isa(expr_add~nopar~nobra.expr, type~nobra.type)} ; @@ -444,8 +489,9 @@ expr_atom~nopar~nobra {-> expr} | {call} recv~nopar~nobra id args {-> New expr.call(recv~nopar~nobra.expr, id, [args.expr], [])} | {super} qualified? kwsuper args {-> New expr.super(qualified, kwsuper, [args.expr])} | {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, [args.expr])} -!nobra!nopar | {bra} expr_atom braargs {-> New expr.bra(expr_atom.expr, [braargs.expr], [])} +!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, [braargs.expr], [])} | {new} kwnew no type~nobra dot [n2]:no id args {-> New expr.new(kwnew, type~nobra.type, id, [args.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 {-> New expr.crange(expr, expr2.expr)} !nobra!nopar | {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra {-> New expr.orange(expr, expr2.expr)} !nobra!nopar | {array} braargs {-> New expr.array([braargs.expr])} @@ -499,8 +545,12 @@ braargs {-> 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 @@ -531,10 +581,10 @@ n2 Abstract Syntax Tree /*****************************************************************************/ -module = packagedecl? [imports]:import* [classdefs]:classdef*; +module = moduledecl? [imports]:import* [classdefs]:classdef*; -packagedecl - = doc? kwpackage id; +moduledecl + = doc? kwmodule id; import = {std} visibility kwimport id | {no} visibility kwimport kwend @@ -555,13 +605,13 @@ classkind = {concrete} kwclass | {abstract} kwabstract kwclass | {interface} kwinterface - | {universal} kwuniversal + | {enum} kwenum ; formaldef = [id]:classid type?; -superclass = kwspecial type; +superclass = kwspecial? kwsuper? 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? [id2]:id? type? expr? | {meth} doc? kwredef? visibility methid signature | {deferred_meth} doc? kwredef? visibility kwmeth methid signature | {intern_meth} doc? kwredef? visibility kwmeth methid signature @@ -573,46 +623,52 @@ propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwat ; able = {read} kwredef? kwreadable - | {write} kwredef? kwwritable + | {write} kwredef? visibility? kwwritable ; -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; +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 | {ll} ll | {gg} gg | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign; signature = [params]:param* type? [closure_decls]:closure_decl*; -param = id type? dotdotdot? +param = id type? dotdotdot? ; -closure_decl = kwwith kwbreak? id signature expr? +closure_decl = kwbreak? bang id signature expr? ; 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? - | {assert} kwassert id? expr + | {while} kwwhile expr kwdo [block]:expr? label? + | {loop} kwloop [block]:expr? label? + | {for} kwfor id expr kwdo [block]:expr? label? + | {assert} kwassert id? expr [else]:expr? | {once} kwonce expr | {send} expr | {binop} expr [expr2]:expr | {or} expr [expr2]:expr | {and} expr [expr2]:expr + | {or_else} expr [expr2]:expr | {not} kwnot expr | {eq} expr [expr2]:expr | {ee} expr [expr2]:expr | {ne} expr [expr2]:expr | {lt} expr [expr2]:expr | {le} expr [expr2]:expr + | {ll} expr [expr2]:expr | {gt} expr [expr2]:expr | {ge} expr [expr2]:expr + | {gg} expr [expr2]:expr | {isa} expr type | {plus} expr [expr2]:expr | {minus} expr [expr2]:expr @@ -665,7 +721,11 @@ assign_op ; closure_def - = kwwith id* kwdo expr? + = bang [id]:closure_id [ids]:id* kwdo? expr? label? + ; +closure_id + = {simple} id + | {break} kwbreak ; qualified = id* classid? ;