X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index 0e17804..eb80d5f 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -158,6 +158,15 @@ quad = '::'; assign = '='; pluseq = '+='; minuseq = '-='; +stareq = '*='; +slasheq = '/='; +percenteq = '%='; +starstareq = '**='; +pipeeq = '|='; +careteq = '^='; +ampeq = '&='; +lleq = '<<='; +ggeq = '>>='; dotdotdot = '...'; dotdot = '..'; dot = '.'; @@ -167,6 +176,10 @@ star = '*'; starstar = '**'; slash = '/'; percent = '%'; +pipe = '|'; +caret = '^'; +amp = '&'; +tilde = '~'; eq = '=='; ne = '!='; lt = '<'; @@ -178,6 +191,7 @@ gg = '>>'; starship = '<=>'; bang='!'; at='@'; +semi=';'; classid = uppercase letter*; id = lowercase letter*; @@ -211,11 +225,11 @@ module = moduledecl? [imports]:import* [extern_bodies]:extern_code_body* [classdefs]:topdef* implicit_main_class {-> New module(moduledecl, [imports.import], [extern_bodies.extern_code_block], [classdefs.classdef,implicit_main_class.classdef])}; moduledecl - = [doc]:no redef visibility kwmodule no module_name annotation_withend [n2]:n1 {-> New moduledecl(doc.doc, redef.kwredef, visibility, kwmodule, module_name, annotation_withend.annotations)}; + = [doc]:nd redef visibility kwmodule no module_name annotation_withend [n2]:n1 {-> New moduledecl(doc.doc, redef.kwredef, visibility, kwmodule, module_name, annotation_withend.annotations)}; import - = {std} [doc]:no redef visibility kwimport no module_name annotation_withend [n2]:n1 {-> New import.std(visibility, kwimport, module_name, annotation_withend.annotations)} - | {no} [doc]:no redef visibility kwimport no kwend [n2]:n1 {-> New import.no(visibility, kwimport, kwend)} + = {std} [doc]:nd redef visibility kwimport no module_name annotation_withend [n2]:n1 {-> New import.std(visibility, kwimport, module_name, annotation_withend.annotations)} + | {no} [doc]:nd redef visibility kwimport no kwend [n2]:n1 {-> New import.no(visibility, kwimport, kwend)} ; topdef {-> classdef} @@ -228,13 +242,16 @@ implicit_main_class {-> classdef?} | {null} n? {-> Null} ; implicit_main_meth {-> propdef} - = [doc]:no stmts {-> New propdef.main_meth(Null, stmts.expr)} - | {n} [doc]:no stmtsn {-> New propdef.main_meth(Null, stmtsn.expr)} + = [doc]:nd stmts {-> New propdef.main_meth(Null, stmts.expr)} + | {n} [doc]:nd stmtsn {-> New propdef.main_meth(Null, stmtsn.expr)} ; /* CLASSES *******************************************************************/ classdef - = [doc]:no redef visibility classkind no qclassid formaldefs extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], extern_code_block, [propdefs.propdef], kwend)}; + = [doc]:nd redef visibility classkind no qclassid extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, Null, [], Null, extern_code_block, [propdefs.propdef], kwend)} + | {for} [doc]:nd redef visibility classkind no qclassid obra [n2]:no formaldefs cbra extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, obra, [formaldefs.formaldef], cbra, extern_code_block, [propdefs.propdef], kwend)} + ; + redef {-> kwredef?} = kwredef? {-> kwredef}; classkind @@ -246,49 +263,49 @@ classkind ; formaldefs {-> formaldef*} - = obra no formaldef formaldefs_tail* [n2]:no cbra {-> [formaldef, formaldefs_tail.formaldef]} - | {null} {-> []} + = formaldef formaldefs_tail* {-> [formaldef, formaldefs_tail.formaldef]} + | {empty} {->[]} ; formaldefs_tail {-> formaldef} = comma no formaldef {-> formaldef}; formaldef - = classid annotations? typing_o {-> New formaldef(classid, typing_o.type, annotations)}; + = classid annotations? typing_o no {-> New formaldef(classid, typing_o.type, annotations)}; superclass {-> propdef} - = {super} [doc]:no redef visibility kwsuper [n2]:no type annotation_withend {-> New propdef.super(doc.doc, redef.kwredef, visibility, kwsuper, type, annotation_withend.annotations)} + = {super} [doc]:nd redef visibility kwsuper [n2]:no type annotation_withend {-> New propdef.super(doc.doc, redef.kwredef, visibility, kwsuper, type, annotation_withend.annotations)} ; propdefs {-> propdef*} = propdefn+ no {-> [propdefn.propdef]} | {super} superclass {-> [superclass.propdef]} - | {empty} no {-> []} + | {empty} nd {-> []} ; propdefn {-> propdef} = propdef n1 {-> propdef.propdef} ; propdef~toplevel {-> propdef} - = {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 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)} + = {meth} [doc]:nd 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, kwdo, stmtso.expr, kwend_o.kwend)} + | {nobody} [doc]:nd 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, Null, Null)} +!toplevel| {intern_new} [doc]:nd 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, Null, Null)} +!toplevel| {new} [doc]:nd 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, kwdo, stmtso.expr, kwend_o.kwend)} + | {extern_implicit} [doc]:nd 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, Null, Null)} +!toplevel| {var3} [doc]:nd redef visibility kwvar id typing_o annotation_withend {-> New propdef.attr(doc.doc, redef.kwredef, visibility, kwvar, id, typing_o.type, Null, Null, annotation_withend.annotations, Null, Null, Null)} +!toplevel| {var4} [doc]:nd 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, assign, expr.expr, annotation_withend.annotations, Null, Null, Null)} +!toplevel| {var5} [doc]:nd 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, Null, annotation_noend.annotations, kwdo, stmtso.expr, kwend)} +!toplevel| {init} [doc]:nd 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, kwdo, stmtso.expr, kwend_o.kwend)} +!toplevel| {type} [doc]:nd 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]:nd 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, Null, Null)} !toplevel| {annot} line_annotation_forclass {-> line_annotation_forclass.propdef} !toplevel| {super} superclass {-> superclass.propdef} ; annotation_withend~nonull {-> annotations?} - = {oneliner} kwis many_annotations {-> many_annotations.annotations} - | {more} kwis n1 line_annotations kwend {-> line_annotations.annotations} + = {oneliner} kwis annotation_list {-> New annotations(kwis, Null, Null, [annotation_list.annotation], Null, Null)} + | {more} kwis n1 line_annotation+ kwend {-> New annotations(kwis, Null, Null, [line_annotation.annotation], Null, kwend) } !nonull | {null} {-> Null} ; annotation_noend {-> annotations} - = {oneliner} kwis many_annotations {-> many_annotations.annotations} - | {more} kwis n1 line_annotations {-> line_annotations.annotations} + = {oneliner} kwis annotation_list {-> New annotations(kwis, Null, Null, [annotation_list.annotation], Null, Null)} + | {more} kwis n1 line_annotation+ {-> New annotations(kwis, Null, Null, [line_annotation.annotation], Null, Null) } ; visibility @@ -306,6 +323,10 @@ methid~noid {-> methid} | {starstar} starstar {-> New methid.starstar(starstar)} | {slash} slash {-> New methid.slash(slash)} | {percent} percent {-> New methid.percent(percent)} + | {pipe} pipe {-> New methid.pipe(pipe)} + | {caret} caret {-> New methid.caret(caret)} + | {amp} amp {-> New methid.amp(amp)} + | {tilde} tilde {-> New methid.tilde(tilde)} | {eq} eq {-> New methid.eq(eq)} | {ne} ne {-> New methid.ne(ne)} | {le} le {-> New methid.le(le)} @@ -376,8 +397,8 @@ extern_code_body {-> extern_code_block} = no extern_code_block {-> extern_code_b /* TYPES *********************************************************************/ type~nobra~nopar {-> type} - = {simple} kwnullable? classid annotations_o~nopar {-> New type(kwnullable, classid, [], annotations_o~nopar.annotations)} -!nobra | {generic} kwnullable? classid obra no types [n2]:no cbra annotations_o~nopar {-> New type(kwnullable, classid, [types.type], annotations_o~nopar.annotations)} + = {simple} kwnullable? classid annotations_o~nopar {-> New type(kwnullable, classid, Null, [], Null, annotations_o~nopar.annotations)} +!nobra | {generic} kwnullable? classid obra no types [n2]:no cbra annotations_o~nopar {-> New type(kwnullable, classid, obra, [types.type], cbra, annotations_o~nopar.annotations)} ; types {-> type*} = type types_tail* {-> [type, types_tail.type]}; @@ -443,6 +464,15 @@ assignment~nopar {-> expr} assign_op = {plus} pluseq | {minus} minuseq + | {star} stareq + | {slash} slasheq + | {percent} percenteq + | {starstar} starstareq + | {pipe} pipeeq + | {caret} careteq + | {amp} ampeq + | {ll} lleq + | {gg} ggeq ; do~withelse {-> expr} @@ -451,14 +481,15 @@ do~withelse {-> expr} ; 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 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)} + = {onelineelse} kwif no expr [n2]:no kwthen stmt_withelse kwelse stmtso~withelse {-> New expr.if(kwif, expr, kwthen, stmt_withelse.expr, kwelse, stmtso~withelse.expr)} +!withelse | {oneline} kwif no expr [n2]:no kwthen stmt {-> New expr.if(kwif, expr, kwthen, stmt.expr, Null, Null)} +!withelse | {block} kwif no expr [n2]:no kwthen [n3]:n stmtsn kwelse stmtso {-> New expr.if(kwif, expr, kwthen, stmtsn.expr, kwelse, stmtso.expr)} +!withelse | {emptyblock} kwif no expr [n2]:no kwthen [n3]:n? kwelse stmtso {-> New expr.if(kwif, expr, kwthen, Null, kwelse, stmtso.expr)} +!withelse | {blocknoelse} kwif no expr [n2]:no kwthen [n3]:n stmtsn endblock {-> New expr.if(kwif, expr, kwthen, stmtsn.expr, Null, endblock.expr)} +!withelse | {emptyblocknoelse} kwif no expr [n2]:no kwthen [n3]:n? endblock {-> New expr.if(kwif, expr, kwthen, Null, Null, endblock.expr)} ; -elsepartblock {-> expr?} - = {else} kwelse stmtso {-> stmtso.expr} - | {empty} kwend {-> New expr.block([], kwend)} +endblock {-> expr} + = {empty} kwend {-> New expr.block([], kwend)} ; loop~withelse {-> expr} @@ -472,8 +503,8 @@ while~withelse {-> expr} ; for~withelse {-> expr} - = kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso_withend.expr, label)} - | {nolabel} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso~withelse.expr, Null)} + = kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [ids.id], kwin, expr, kwdo, stmtso_withend.expr, label)} + | {nolabel} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, [ids.id], kwin, expr, kwdo, stmtso~withelse.expr, Null)} ; with~withelse {-> expr} @@ -487,8 +518,8 @@ withexpr {-> expr} ; assert~withelse {-> expr} - = {else} kwassert assertid? expr kwelse stmtso~withelse {-> New expr.assert(kwassert, assertid.id, expr, stmtso~withelse.expr)} -!withelse| {noelse} kwassert assertid? expr {-> New expr.assert(kwassert, assertid.id, expr, Null)} + = {else} kwassert assertid? expr kwelse stmtso~withelse {-> New expr.assert(kwassert, assertid.id, expr, kwelse, stmtso~withelse.expr)} +!withelse| {noelse} kwassert assertid? expr {-> New expr.assert(kwassert, assertid.id, expr, Null, Null)} ; assertid {-> id} = id column {-> id}; @@ -513,17 +544,36 @@ expr_not~nopar~nobra {-> expr} ; expr_eq~nopar~nobra {-> expr} - = expr_add~nopar~nobra {-> expr_add~nopar~nobra.expr} - | {:eq} expr_add~nopar~nobra eq :no [expr2]:expr_add~nopar~nobra - | {:ne} expr_add~nopar~nobra ne :no [expr2]:expr_add~nopar~nobra - | {:lt} expr_add~nopar~nobra lt :no [expr2]:expr_add~nopar~nobra - | {:le} expr_add~nopar~nobra le :no [expr2]:expr_add~nopar~nobra - | {:ll} expr_eq~nopar~nobra ll :no [expr2]:expr_add~nopar~nobra - | {:gt} expr_add~nopar~nobra gt :no [expr2]:expr_add~nopar~nobra - | {:ge} expr_add~nopar~nobra ge :no [expr2]:expr_add~nopar~nobra - | {:gg} expr_eq~nopar~nobra gg :no [expr2]:expr_add~nopar~nobra - | {:starship} expr_add~nopar~nobra starship :no [expr2]:expr_add~nopar~nobra - | {:isa} expr_add~nopar~nobra kwisa :no type~nobra + = expr_bitor~nopar~nobra {-> expr_bitor~nopar~nobra.expr} + | {:eq} expr_bitor~nopar~nobra eq :no [expr2]:expr_bitor~nopar~nobra + | {:ne} expr_bitor~nopar~nobra ne :no [expr2]:expr_bitor~nopar~nobra + | {:lt} expr_bitor~nopar~nobra lt :no [expr2]:expr_bitor~nopar~nobra + | {:le} expr_bitor~nopar~nobra le :no [expr2]:expr_bitor~nopar~nobra + | {:gt} expr_bitor~nopar~nobra gt :no [expr2]:expr_bitor~nopar~nobra + | {:ge} expr_bitor~nopar~nobra ge :no [expr2]:expr_bitor~nopar~nobra + | {:starship} expr_bitor~nopar~nobra starship :no [expr2]:expr_bitor~nopar~nobra + | {:isa} expr_bitor~nopar~nobra kwisa :no type~nobra + ; + +expr_bitor~nopar~nobra {-> expr} + = [expr]:expr_bitxor~nopar~nobra {-> expr.expr} + | {:pipe} expr_bitor~nopar~nobra pipe :no [expr2]:expr_bitxor~nopar~nobra + ; + +expr_bitxor~nopar~nobra {-> expr} + = [expr]:expr_bitand~nopar~nobra {-> expr.expr} + | {:caret} expr_bitxor~nopar~nobra caret :no [expr2]:expr_bitand~nopar~nobra + ; + +expr_bitand~nopar~nobra {-> expr} + = [expr]:expr_shift~nopar~nobra {-> expr.expr} + | {:amp} expr_bitand~nopar~nobra amp :no [expr2]:expr_shift~nopar~nobra + ; + +expr_shift~nopar~nobra {-> expr} + = [expr]:expr_add~nopar~nobra {-> expr.expr} + | {:ll} expr_shift~nopar~nobra ll :no [expr2]:expr_add~nopar~nobra + | {:gg} expr_shift~nopar~nobra gg :no [expr2]:expr_add~nopar~nobra ; expr_add~nopar~nobra {-> expr} @@ -548,6 +598,7 @@ expr_minus~nopar~nobra {-> expr} = expr_new~nopar~nobra {-> expr_new~nopar~nobra.expr} | {:uminus} minus expr_minus~nobra | {:uplus} plus expr_minus~nobra + | {:utilde} tilde expr_minus~nobra | {:once} kwonce :no expr_minus~nobra ; @@ -568,7 +619,12 @@ expr_atom~nopar~nobra {-> 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, opar, type, cpar)} | {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, opar, kwnot, kwnull, cpar)} | {as_notnull2}expr_atom~nopar~nobra dot no kwas [n2]:no kwnot [n4]:no kwnull {-> New expr.as_notnull(expr_atom~nopar~nobra.expr, kwas, Null, kwnot, kwnull, Null)} - | {vararg} [expr]:expr_atom~nopar~nobra dotdotdot {-> New expr.vararg(expr.expr, dotdotdot)} + ; + +arg~nopar~nobra {-> expr} + = [expr]:expr~nopar~nobra {-> expr.expr} + | {vararg} [expr]:expr~nopar~nobra dotdotdot {-> New expr.vararg(expr.expr, dotdotdot)} + | {namedarg} id assign [expr]:expr~nopar~nobra {-> New expr.namedarg(id, assign, expr.expr) } ; expr_single~nopar~nobra {-> expr} @@ -584,8 +640,8 @@ expr_single~nopar~nobra {-> expr} | {superstring} superstring {-> superstring.expr} !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 | {range} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no cbra annotations_o {-> New expr.crange(obra, expr, dotdot, 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, dotdot, expr2.expr, 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)} ; @@ -610,8 +666,8 @@ array_items_tail {-> 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)} + | {for} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo [block]:array_item {-> New expr.for(kwfor, [ids.id], kwin, expr, kwdo, block.expr, Null)} + | {if} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:array_item {-> New expr.if(kwif, expr, kwthen, then.expr, Null, Null)} ; superstring {-> expr} @@ -634,8 +690,8 @@ superstring_end {-> expr} /* ANNOTATIONS *******************************************************************/ annotations~nopar {-> annotations} - = {one} at one_annotation~nopar {-> New annotations(at, Null, [one_annotation~nopar.annotation], Null)} - | {many} at opar no annotation_list [n2]:no cpar {-> New annotations(at, opar, [annotation_list.annotation], cpar)} + = {one} at one_annotation~nopar {-> New annotations(Null, at, Null, [one_annotation~nopar.annotation], Null, Null)} + | {many} at opar no annotation_list [n2]:no cpar {-> New annotations(Null, at, opar, [annotation_list.annotation], cpar, Null)} ; annotations_o~nopar {-> annotations?} = annotations~nopar {-> annotations~nopar.annotations} @@ -648,10 +704,6 @@ one_annotation~nopar {-> annotation} !nopar | {args} redef visibility atid opar no at_args [n2]:no cpar annotations_o~nopar {-> New annotation(Null, redef.kwredef, visibility, atid, opar, [at_args.expr], cpar, annotations_o~nopar.annotations)} ; -many_annotations {-> annotations} - = {many} annotation_list {-> New annotations(Null, Null, [annotation_list.annotation], Null)} - ; - annotation_list {-> annotation*} = {many} one_annotation_list annotations_tail* {-> [one_annotation_list.annotation, annotations_tail.annotation] } ; @@ -671,18 +723,15 @@ annotations_tail {-> annotation} = comma no one_annotation_list {-> one_annotation_list.annotation} ; -line_annotations {-> annotations} - = line_annotation+ {-> New annotations(Null, Null, [line_annotation.annotation], Null) } - ; line_annotation {-> annotation} - = [doc]:no redef visibility atid annotations? n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, Null, [], Null, annotations)} - | {args} [doc]:no redef visibility atid opar no at_args cpar annotations? n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, opar, [at_args.expr], cpar, annotations)} - | {nopar} [doc]:no redef visibility atid at_args_nopar n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, Null, [at_args_nopar.expr], Null, Null)} + = [doc]:nd redef visibility atid annotations? n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, Null, [], Null, annotations)} + | {args} [doc]:nd redef visibility atid opar no at_args cpar annotations? n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, opar, [at_args.expr], cpar, annotations)} + | {nopar} [doc]:nd redef visibility atid at_args_nopar n1 {-> New annotation(doc.doc, redef.kwredef, visibility, atid.atid, Null, [at_args_nopar.expr], Null, Null)} ; line_annotation_forclass {-> propdef} - = [doc]:no atid_forclass annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [], Null, annotations)} - | {args} [doc]:no atid_forclass opar no at_args cpar annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, opar, [at_args.expr], cpar, annotations)} - | {nopar} [doc]:no atid_forclass at_args_nopar {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [at_args_nopar.expr], Null, Null)} + = [doc]:nd atid_forclass annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [], Null, annotations)} + | {args} [doc]:nd atid_forclass opar no at_args cpar annotations? {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, opar, [at_args.expr], cpar, annotations)} + | {nopar} [doc]:nd atid_forclass at_args_nopar {-> New propdef.annot(doc.doc, Null, Null, atid_forclass.atid, Null, [at_args_nopar.expr], Null, Null)} ; at_args~nopar {-> expr* } @@ -731,12 +780,10 @@ args_nopar {-> exprs} ; braargs {-> exprs} = obra no expr_list cbra {-> New exprs.bra(obra, [expr_list.expr], cbra)}; -args_list {-> exprs} - = expr_list {-> New exprs.list([expr_list.expr])}; expr_list {-> expr*} - = expr [n2]:no expr_tail* {-> [expr, expr_tail.expr]}; + = arg [n2]:no expr_tail* {-> [arg.expr, expr_tail.expr]}; expr_tail {-> expr} - = comma no expr [n2]:no {-> expr}; + = comma no arg [n2]:no {-> arg.expr}; idlist {-> id*} = opar no idlist_nopar [n2]:no cpar {-> [idlist_nopar.id]} | {nopar} idlist_nopar {-> [idlist_nopar.id]} @@ -777,19 +824,32 @@ kwend_o {-> kwend?} = kwend? {-> kwend} ; -n1 = {a} comment | {b} eol; -n {-> doc?} - = {a} n2? comment+ {-> New doc([comment])} - | {b} n2 {-> Null} +/* A single hard break */ +n1 = {a} comment | {b} eol | {c} semi; + +/* A mandatory hard break, returns the last comment */ +n~nosemi {-> doc?} + = {a} n2* comment+ {-> New doc([comment])} + | {b} n2+ {-> Null} +!nosemi | {c} n2* comment* semi n? {-> n.doc } ; -no {-> doc?} + +/* An optional hard break, returns the last comment. + * Used mainly to introduce optional documentation */ +nd {-> doc?} = {empty} {-> Null} | n {-> n.doc} ; +/* An optional soft break. + * Used when a unambiguous line break or comment could be inserted/ */ +no + = {empty} + | n_nosemi + ; + n2 - = {a} n2? comment+ eol+ - | {b} eol+ + = {a} comment* eol ; /*****************************************************************************/ @@ -812,7 +872,7 @@ visibility | {intrude} kwintrude ; -classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* extern_code_block? [propdefs]:propdef* kwend +classdef= {std} doc? kwredef? visibility classkind [id]:classid? obra? [formaldefs]:formaldef* cbra? extern_code_block? [propdefs]:propdef* kwend | {top} [propdefs]:propdef* | {main} [propdefs]:propdef* ; @@ -826,22 +886,46 @@ classkind formaldef = [id]:classid type? annotations?; -propdef = {attr} doc? kwredef? visibility kwvar [id2]:id type? expr? annotations? [block]:expr? +propdef = {attr} doc? kwredef? visibility kwvar [id2]:id type? assign? expr? annotations? kwdo? [block]:expr? kwend? | {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? + | {meth} doc? kwredef? visibility kwmeth? kwinit? kwnew? methid? signature annotations? extern_calls? extern_code_block? kwdo? [block]:expr? kwend? | {super} doc? kwredef? visibility kwsuper type annotations? | {annot} doc? kwredef? visibility? atid opar? [args]:expr* cpar? annotations? ; -methid = {id} id | {plus} plus | {minus} minus | {star} star | {starstar} starstar | {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; +methid + = {id} id + | {plus} [op]:plus + | {minus} [op]:minus + | {star} [op]:star + | {starstar} [op]:starstar + | {slash} [op]:slash + | {percent} [op]:percent + | {eq} [op]:eq + | {ne} [op]:ne + | {le} [op]:le + | {ge} [op]:ge + | {lt} [op]:lt + | {gt} [op]:gt + | {ll} [op]:ll + | {gg} [op]:gg + | {starship} [op]:starship + | {pipe} [op]:pipe + | {caret} [op]:caret + | {amp} [op]:amp + | {tilde} [op]:tilde + | {bra} obra cbra + | {assign} id assign + | {braassign} obra cbra assign + ; signature = opar? [params]:param* cpar? type?; param = id type? dotdotdot? annotations? ; -type = kwnullable? [id]:classid [types]:type* annotations?; +type = kwnullable? [id]:classid obra? [types]:type* cbra? annotations?; label = kwlabel id?; @@ -852,13 +936,13 @@ expr = {block} expr* kwend? | {abort} kwabort | {continue} kwcontinue? label? | {do} kwdo [block]:expr? label? - | {if} kwif expr [then]:expr? [else]:expr? + | {if} kwif expr kwthen [then]:expr? kwelse? [else]:expr? | {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr | {while} kwwhile expr kwdo [block]:expr? label? | {loop} kwloop [block]:expr? label? - | {for} kwfor [ids]:id* expr kwdo [block]:expr? label? + | {for} kwfor [ids]:id* kwin expr kwdo [block]:expr? label? | {with} kwwith expr kwdo [block]:expr? label? - | {assert} kwassert id? expr [else]:expr? + | {assert} kwassert id? expr kwelse? [else]:expr? | {once} kwonce expr | {send} expr | {binop} expr [expr2]:expr @@ -883,8 +967,12 @@ expr = {block} expr* kwend? | {starstar} expr [op]:starstar [expr2]:expr | {slash} expr [op]:slash [expr2]:expr | {percent} expr [op]:percent [expr2]:expr - | {uminus} minus expr - | {uplus} plus expr + | {pipe} expr [op]:pipe [expr2]:expr + | {caret} expr [op]:caret [expr2]:expr + | {amp} expr [op]:amp [expr2]:expr + | {uminus} [op]:minus expr + | {uplus} [op]:plus expr + | {utilde} [op]:tilde expr | {new} kwnew type id? [args]:exprs | {attr} expr [id]:attrid | {attr_assign} expr [id]:attrid assign [value]:expr @@ -901,8 +989,8 @@ expr = {block} expr* kwend? | {var_assign} id assign [value]:expr | {var_reassign} id assign_op [value]:expr | {range} expr [expr2]:expr annotations? - | {crange} obra expr [expr2]:expr cbra annotations? - | {orange} obra expr [expr2]:expr [cbra]:obra annotations? + | {crange} obra expr dotdot [expr2]:expr cbra annotations? + | {orange} obra expr dotdot [expr2]:expr [cbra]:obra annotations? | {array} obra [exprs]:expr* type? cbra annotations? | {self} kwself annotations? | {implicit_self} @@ -924,6 +1012,7 @@ expr = {block} expr* kwend? | {isset_attr} kwisset expr [id]:attrid | {debug_type} kwdebug kwtype expr type | {vararg} expr dotdotdot + | {namedarg} id assign expr | {type} type | {methid} expr [id]:methid | {at} annotations @@ -935,8 +1024,17 @@ exprs | {bra} obra [exprs]:expr* cbra ; assign_op - = {plus} pluseq - | {minus} minuseq + = {plus} [op]:pluseq + | {minus}[op]:minuseq + | {star} [op]:stareq + | {slash} [op]:slasheq + | {percent} [op]:percenteq + | {starstar} [op]:starstareq + | {pipe} [op]:pipeeq + | {caret} [op]:careteq + | {amp} [op]:ampeq + | {ll} [op]:lleq + | {gg} [op]:ggeq ; module_name = quad? [path]:id* id; @@ -958,7 +1056,7 @@ qualified = id* classid? ; doc = comment+; -annotations = at? opar? [items]:annotation* cpar?; +annotations = kwis? at? opar? [items]:annotation* cpar? kwend?; annotation = doc? kwredef? visibility? atid opar? [args]:expr* cpar? annotations?;