X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index ecd28ff..47b9d29 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -129,8 +129,10 @@ eq = '=='; ne = '!='; lt = '<'; le = '<='; +ll = '<<'; gt = '>'; ge = '>='; +gg = '>>'; starship = '<=>'; bang='!'; @@ -170,18 +172,20 @@ 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 @@ -199,32 +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_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)} + | {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)} -!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| {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 @@ -234,7 +240,7 @@ visibility | {intrude} kwintrude no {-> New visibility.intrude(kwintrude)} ; -methid~noassign {-> methid} +methid {-> methid} = {id} id {-> New methid.id(id)} | {plus} plus {-> New methid.plus(plus)} | {minus} minus {-> New methid.minus(minus)} @@ -247,10 +253,12 @@ methid~noassign {-> methid} | {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)} -!noassign | {assign} id assign {-> New methid.assign(id, assign)} -!noassign | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)} + | {assign} id assign {-> New methid.assign(id, assign)} + | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)} ; signature~withret {-> signature} @@ -301,13 +309,15 @@ typing {-> type} /* STATMENTS *****************************************************************/ stmtso~withelse~withend {-> expr?} - = {block} n stmts [n2]:n kwend {-> stmts.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} @@ -336,13 +346,13 @@ closure_defs~withelse {-> closure_def*} ; closure_def_last~withelse {-> closure_def} - = 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)} + = 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} - = bang [id]:closure_id idlist? kwdo n stmts [n2]:n {-> New closure_def(bang, id, [idlist.id], kwdo, stmts.expr, 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 @@ -373,14 +383,14 @@ assign_op ; do~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)} + = 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?} @@ -389,18 +399,18 @@ elsepartblock {-> expr?} ; loop~withelse {-> expr} - = kwloop stmtso~withelse_withend label? {-> New expr.loop(kwloop, stmtso~withelse_withend.expr, label)} - | {noend} kwloop stmt~withelse {-> New expr.loop(kwloop, stmt~withelse.expr, Null)} + = 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_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)} + = 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_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)} + = 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} @@ -426,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} @@ -440,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)} ; @@ -476,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])} +// FIXME: Why are these 3 !nopar mandatory? !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])} @@ -594,10 +608,10 @@ classkind | {universal} kwuniversal ; formaldef = [id]:classid type?; -superclass = kwspecial type; +superclass = kwspecial? kwsuper? type; -propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwvar [id]:attrid type? expr? +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 @@ -609,14 +623,14 @@ propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwva ; 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 = kwbreak? bang id signature expr? @@ -644,14 +658,17 @@ expr = {block} 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