X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index afeef1e..98bbcc2 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -27,6 +27,7 @@ all = [0 .. 0xFF]; lowercase = ['a' .. 'z']; uppercase = ['A' .. 'Z']; digit = ['0' .. '9']; +hexdigit = ['0'..'9'] | ['a'..'f'] | ['A'..'F']; letter = lowercase | uppercase | digit | '_'; tab = 9; @@ -51,15 +52,18 @@ sstr_body = sstr_char*; long_str_char = str_char | cr | lf; +// because no substraction in sablecc3, complex long strings are difficult to express +ls1 = '"' '"'? ; +ls2 = '{' '{'? ; +ls12 = ls1? (ls2 ls1)* ls2?; + long_str_part - = long_str_char - | '"' long_str_char - | '"' '"' long_str_char - | '{' long_str_char - | '{' '{' long_str_char + = ls12 long_str_char ; long_str_body = long_str_part*; +lsend1 = ls2? (ls1 ls2)* '"""' '"'*; +lsend2 = ls1? (ls2 ls1)* '{{{' '{'*; long_sstr_char = sstr_char | cr | lf; long_sstr_part @@ -92,7 +96,8 @@ blank = (' ' | tab)+; eol = eol_helper; comment = '#' any* eol_helper?; -kwmodule = 'package'|'module'; +kwpackage = 'package'; +kwmodule = 'module'; kwimport = 'import'; kwclass = 'class'; kwabstract = 'abstract'; @@ -110,6 +115,7 @@ kwwritable = 'writable'; kwvar = 'var'; kwintern = 'intern'; kwextern = 'extern'; +kwpublic = 'public'; kwprotected = 'protected'; kwprivate = 'private'; kwintrude = 'intrude'; @@ -123,6 +129,7 @@ kwin = 'in'; kwand = 'and'; kwor = 'or'; kwnot = 'not'; +kwimplies = 'implies'; kwreturn = 'return'; kwcontinue = 'continue'; kwbreak = 'break'; @@ -177,11 +184,12 @@ id = lowercase letter*; attrid = '_' lowercase letter*; number = digit+; +hex_number = ('0x' | '0X') hexdigit+; float = digit* '.' digit+; -string = '"' str_body '"' | '"' '"' '"' long_str_body '"' '"' '"' | ''' ''' ''' long_sstr_body ''' ''' '''; -start_string = '"' str_body '{' | '"' '"' '"' long_str_body '{' '{' '{'; -mid_string = '}' str_body '{' | '}' '}' '}' long_str_body '{' '{' '{'; -end_string = '}' str_body '"' | '}' '}' '}' long_str_body '"' '"' '"'; +string = '"' str_body '"' | '"' '"' '"' long_str_body lsend1 | ''' ''' ''' long_sstr_body ''' ''' '''; +start_string = '"' str_body '{' | '"' '"' '"' long_str_body lsend2; +mid_string = '}' str_body '{' | '}' '}' '}' long_str_body lsend2; +end_string = '}' str_body '"' | '}' '}' '}' long_str_body lsend1; char = (''' [[any - '''] - '\'] ''') | (''' '\' any '''); bad_string = ('"'|'}') str_body | '"' '"' '"' long_str_body | ''' ''' ''' long_sstr_body; bad_char = ''' '\'? any; @@ -200,22 +208,24 @@ Productions /* MODULES *******************************************************************/ module - = moduledecl? [imports]:import* [extern_bodies]:extern_code_body* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(moduledecl, [imports.import], [extern_bodies.extern_code_block], [classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])}; + = 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 kwmodule no module_name annotation_withend? [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, module_name, annotation_withend.annotations)}; + = [doc]:no kwmodule no module_name annotation_withend [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, module_name, annotation_withend.annotations)}; import - = {std} [doc]:no visibility kwimport no module_name annotation_withend? [n2]:n1 {-> New import.std(visibility, kwimport, module_name, annotation_withend.annotations)} - | {no} [doc]:no visibility kwimport no kwend [n2]:n1 {-> New import.no(visibility, kwimport, kwend)} + = {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)} ; -implicit_top_class {-> classdef} - = propdefs_toplevel+ {-> New classdef.top([propdefs_toplevel.propdef])}; +topdef {-> classdef} + = {classdef} classdef {-> classdef} + | 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} + | {null} n? {-> Null} ; implicit_main_meth {-> propdef} = [doc]:no stmts {-> New propdef.main_meth(Null, stmts.expr)} @@ -224,7 +234,7 @@ implicit_main_meth {-> propdef} /* CLASSES *******************************************************************/ classdef - = [doc]:no redef visibility classkind no classid formaldefs? line_annotations_forclass? extern_code_block? [superclasses]:superclass* propdefs* [n2]:no kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, classid, [formaldefs.formaldef], line_annotations_forclass.annotations, extern_code_block, [superclasses.superclass], [propdefs.propdef], kwend)}; + = [doc]:no redef visibility classkind no qclassid formaldefs line_annotations_forclass? extern_code_block? [superclasses]:superclass* propdefs* [n2]:no kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], line_annotations_forclass.annotations, extern_code_block, [superclasses.superclass], [propdefs.propdef], kwend)}; redef {-> kwredef?} = kwredef? {-> kwredef}; classkind @@ -232,55 +242,55 @@ classkind | {abstract} kwabstract kwclass | {interface} kwinterface | {enum} kwenum - | {extern} kwextern kwclass? + | {extern} kwextern kwclass ; formaldefs {-> formaldef*} - = obra no formaldef formaldefs_tail* [n2]:no cbra {-> [formaldef, formaldefs_tail.formaldef]}; + = obra no formaldef formaldefs_tail* [n2]:no cbra {-> [formaldef, formaldefs_tail.formaldef]} + | {null} {-> []} + ; formaldefs_tail {-> formaldef} = comma no formaldef {-> formaldef}; formaldef - = classid annotations? typing? {-> New formaldef(classid, typing.type, annotations)}; + = classid annotations? typing_o {-> New formaldef(classid, typing_o.type, annotations)}; superclass {-> superclass} - = {super} no kwsuper [n2]:no type annotation_withend? {-> New superclass(kwsuper, type, annotation_withend.annotations)} + = {super} no kwsuper [n2]:no type annotation_withend {-> New superclass(kwsuper, type, annotation_withend.annotations)} ; propdefs~toplevel {-> propdef} = propdef~toplevel n1 {-> propdef~toplevel.propdef} ; propdef~toplevel {-> propdef} - = {meth} [doc]:no redef visibility kwmeth methid signature annotation_noend? kwdo stmtso kwend? {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, annotation_noend.annotations, 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, Null, assign_return.expr)} - | {nobody} [doc]:no redef visibility kwmeth methid signature annotation_withend {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, annotation_withend.annotations)} + = {meth} [doc]:no redef visibility kwmeth methid signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, annotation_noend.annotations, stmtso.expr)} + | {nobody} [doc]:no redef visibility kwmeth methid signature annotation_withend_nonull {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, annotation_withend_nonull.annotations)} !toplevel| {deferred} [doc]:no redef visibility kwmeth methid signature kwis kwabstract {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, Null)} -!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? extern_calls? extern_code_block? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, string, extern_calls, extern_code_block)} - | {extern_implicit} [doc]:no redef visibility kwmeth methid signature extern_calls? extern_code_block {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, Null, extern_calls, extern_code_block)} -!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, 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, Null, expr)} -!toplevel| {var3} [doc]:no redef visibility kwvar id typing? writable2? annotation_withend? {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, annotation_withend.annotations, Null)} -!toplevel| {var4} [doc]:no redef visibility kwvar id typing? writable2? assign [n2]:no expr_nois annotation_withend? {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, annotation_withend.annotations, expr_nois.expr)} -!toplevel| {init} [doc]:no redef visibility kwinit methid? signature annotation_noend? kwdo stmtso kwend? {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, annotation_noend.annotations, 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} [doc]:no redef visibility kwnew methid? signature kwis kwextern string? extern_calls? extern_code_block? {-> New propdef.extern_init(doc.doc, redef.kwredef, visibility, kwnew, methid, signature, string, extern_calls, extern_code_block)} -!toplevel| {extern_init_implicit} [doc]:no redef visibility kwnew methid? signature string? extern_calls? extern_code_block {-> New propdef.extern_init(doc.doc, redef.kwredef, visibility, kwnew, methid, signature, string, extern_calls, extern_code_block)} - ; -annotation_withend {-> annotations} + | {intern} [doc]:no redef visibility kwmeth methid signature kwis kwintern {-> New propdef.intern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)} +!toplevel| {intern_new} [doc]:no redef visibility kwnew methid? signature kwis kwintern {-> New propdef.intern_new(doc.doc, redef.kwredef, visibility, kwnew, methid, signature)} + | {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string_o extern_calls extern_code_block_o {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, string_o.string, extern_calls, extern_code_block_o.extern_code_block)} + | {extern_implicit} [doc]:no redef visibility kwmeth methid signature extern_calls extern_code_block {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, Null, extern_calls, extern_code_block)} +!toplevel| {var} [doc]:no readable? writable? redef visibility kwvar attrid typing_o {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing_o.type, Null, Null)} +!toplevel| {var2} [doc]:no readable? writable? redef visibility kwvar attrid typing_o assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing_o.type, Null, expr)} +!toplevel| {var3} [doc]:no redef visibility kwvar id typing_o writable? annotation_withend {-> New propdef.attr(doc.doc, Null, writable.able, redef.kwredef, visibility, kwvar, Null, id, typing_o.type, annotation_withend.annotations, Null)} +!toplevel| {var4} [doc]:no redef visibility kwvar id typing_o writable? assign [n2]:no expr annotation_withend {-> New propdef.attr(doc.doc, Null, writable.able, redef.kwredef, visibility, kwvar, Null, id, typing_o.type, annotation_withend.annotations, expr.expr)} +!toplevel| {init} [doc]:no redef visibility kwinit methid? signature annotation_noend? kwdo stmtso kwend_o {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, annotation_noend.annotations, 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} [doc]:no redef visibility kwnew methid? signature kwis kwextern string_o extern_calls extern_code_block_o {-> New propdef.extern_init(doc.doc, redef.kwredef, visibility, kwnew, methid, signature, string_o.string, extern_calls, extern_code_block_o.extern_code_block)} +!toplevel| {extern_init_implicit} [doc]:no redef visibility kwnew methid? signature string_o extern_calls extern_code_block {-> New propdef.extern_init(doc.doc, redef.kwredef, visibility, kwnew, methid, signature, string_o.string, extern_calls, extern_code_block)} + ; +annotation_withend~nonull {-> annotations?} = {oneliner} kwis many_annotations {-> many_annotations.annotations} | {more} kwis n1 line_annotations kwend {-> line_annotations.annotations} +!nonull | {null} {-> Null} ; annotation_noend {-> annotations} = {oneliner} kwis many_annotations {-> many_annotations.annotations} | {more} kwis n1 line_annotations {-> line_annotations.annotations} ; readable {-> able} - = redef kwreadable {-> New able.read(redef.kwredef, kwreadable)} + = redef visibility kwreadable {-> New able.read(redef.kwredef, kwreadable)} ; writable {-> able} - = redef kwwritable {-> New able.write(redef.kwredef, Null, kwwritable)} - ; -writable2 {-> able} = redef visibility kwwritable {-> New able.write(redef.kwredef, visibility, kwwritable)} ; @@ -312,69 +322,63 @@ methid {-> methid} | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)} ; -signature~withret {-> signature} - = opar no params? cpar typing [no2]:no closure_decls? {-> New signature(opar, [params.param], cpar, typing.type, [closure_decls.closure_decl])} -!withret| {noret} opar no params? cpar [no2]:no closure_decls? {-> New signature(opar, [params.param], cpar, Null, [closure_decls.closure_decl])} - | {nopar} typing no closure_decls? {-> New signature(Null, [], Null, typing.type, [closure_decls.closure_decl])} -!withret| {noparnoret} no closure_decls? {-> New signature(Null, [], Null, Null, [closure_decls.closure_decl])} - ; - -signature_noclosures {-> signature} - = opar no params? cpar typing? {-> New signature(opar, [params.param], cpar, typing.type, [])} - | {nopar} typing? {-> New signature(Null, [], Null, typing.type, [])} +signature {-> signature} + = opar no params cpar typing [no2]:no {-> New signature(opar, [params.param], cpar, typing.type)} + | {noret} opar no params cpar [no2]:no {-> New signature(opar, [params.param], cpar, Null)} + | {nopar} typing no {-> New signature(Null, [], Null, typing.type)} + | {noparnoret} no {-> New signature(Null, [], Null, Null)} ; params {-> param*} = param params_tail* [n2]:no {-> [param, params_tail.param] } + | {null} {-> []} ; params_tail {-> param} = comma no param {-> param}; param - = {untyped} id annotations? {-> New param(id, Null, Null, annotations)} + = {untyped} id annotations_o {-> New param(id, Null, Null, annotations_o.annotations)} | id annotations? typing dotdotdot? {-> New param(id, typing.type, dotdotdot, annotations)} ; -closure_decls {->closure_decl*} - = closure_decl+ {-> [closure_decl]}; -closure_decl - = 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)} - ; - -extern_calls {-> extern_calls} +extern_calls {-> extern_calls?} = kwimport no extern_call extern_call_tail* {-> New extern_calls( kwimport, [extern_call, extern_call_tail.extern_call] )} + | {null} {-> Null} ; extern_call_tail {-> extern_call} = comma no extern_call {-> extern_call}; extern_call {-> extern_call} - = {prop} extern_call_prop {-> extern_call_prop.extern_call} - | {cast} extern_call_cast {-> extern_call_cast.extern_call} + = {prop} extern_call_prop {-> extern_call_prop.extern_call} + | {cast} extern_call_cast {-> extern_call_cast.extern_call} | {super} kwsuper {-> New extern_call.super( kwsuper )} - ; + ; extern_call_prop {-> extern_call} - = {local} methid {-> New extern_call.local_prop( methid )} - | {full} classid quad methid {-> New extern_call.full_prop( classid, quad, methid )} - | {init} classid {-> New extern_call.init_prop( classid )} + = {local} methid {-> New extern_call.local_prop( methid )} + | {full} type dot methid {-> New extern_call.full_prop( type, dot, methid )} + | {init} type {-> New extern_call.init_prop( type )} ; extern_call_cast {-> extern_call} - = {as_cast} [from_type]:type kwas [n2]:no opar [n3]:no [to_type]:type [n4]:no cpar {-> New extern_call.cast_as(from_type, kwas, to_type)} - | {as_nullable} type kwas [n2]:no kwnullable {-> New extern_call.as_nullable( type, kwas, kwnullable)} - | {as_not_nullable} type kwas [n2]:no kwnot [n3]:no kwnullable {-> New extern_call.as_not_nullable( type, kwas, kwnot, kwnullable)} + = {as_cast} [from_type]:type dot kwas [n2]:no opar [n3]:no [to_type]:type [n4]:no cpar {-> New extern_call.cast_as(from_type, dot, kwas, to_type)} + | {as_cast2}[from_type]:type dot kwas [n2]:no [to_type]:type {-> New extern_call.cast_as(from_type, dot, kwas, to_type)} + | {as_nullable} type dot kwas [n2]:no opar [n3]:no kwnullable [n4]:no cpar {-> New extern_call.as_nullable( type, kwas, kwnullable)} + | {as_nullable2}type dot kwas [n2]:no kwnullable {-> New extern_call.as_nullable( type, kwas, kwnullable)} + | {as_not_nullable} type dot kwas [n2]:no opar [n3]:no kwnot [n4]:no kwnullable [n5]:no cpar {-> New extern_call.as_not_nullable( type, kwas, kwnot, kwnullable)} + | {as_not_nullable2}type dot kwas [n2]:no kwnot [n3]:no kwnullable {-> New extern_call.as_not_nullable( type, kwas, kwnot, kwnullable)} ; -in_language = kwin string; +string_o {->string?} = string? {-> string}; + +in_language = kwin no string [n1]:no {-> New in_language(kwin, string)}; extern_code_block = in_language? extern_code_segment; +extern_code_block_o {-> extern_code_block?} + = extern_code_block {-> extern_code_block} + | {null} {-> Null} + ; extern_code_body {-> extern_code_block} = no extern_code_block {-> extern_code_block}; /* TYPES *********************************************************************/ type~nobra~nopar {-> type} - = {simple} kwnullable? classid annotations~nopar? {-> New type(kwnullable, classid, [], annotations~nopar.annotations)} -!nobra | {generic} kwnullable? classid obra no types [n2]:no cbra annotations~nopar? {-> New type(kwnullable, classid, [types.type], annotations~nopar.annotations)} + = {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)} ; types {-> type*} = type types_tail* {-> [type, types_tail.type]}; @@ -382,6 +386,10 @@ types_tail {-> type} = comma no type {-> type}; typing {-> type} = column no type {-> type}; +typing_o {-> type?} + = column no type {-> type} + | {null} {-> Null} + ; /* STATMENTS *****************************************************************/ stmtso~withelse~withend {-> expr?} @@ -411,49 +419,29 @@ stmt~withelse~noexpr~nopar {-> expr} | {loop} loop~withelse {-> loop~withelse.expr} | {for} for~withelse {-> for~withelse.expr} | {assert} assert~withelse {-> assert~withelse.expr} -!noexpr | {call} recv id args_nopar closure_defs~withelse? {-> New expr.call(recv.expr, id, args_nopar.exprs, [closure_defs~withelse.closure_def])} -!noexpr | {super} qualified? kwsuper args_nopar {-> New expr.super(qualified, kwsuper, args_nopar.exprs)} -!noexpr | {init} recv kwinit args_nopar {-> New expr.init(recv.expr, kwinit, args_nopar.exprs)} +!noexpr | {call} recv qid args_nopar {-> New expr.call(recv.expr, qid.id, args_nopar.exprs)} +!noexpr | {super} qualified_o kwsuper args_nopar {-> New expr.super(qualified_o.qualified, kwsuper, args_nopar.exprs)} +!noexpr | {init} recv qualified? kwinit args_nopar {-> New expr.init(recv.expr, kwinit, args_nopar.exprs)} | {debug_type_is} kwdebug kwtype type column expr_final~withelse {-> New expr.debug_type(kwdebug, kwtype, expr_final~withelse.expr, type) } ; 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} - = 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 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} - = kwvar id annotations? typing? {-> New expr.vardecl(kwvar, id, typing.type, Null, Null, annotations)} - | {assign} kwvar id annotations? typing? assign no expr_final~withelse {-> New expr.vardecl(kwvar, id, typing.type, assign, expr_final~withelse.expr, annotations)} + = kwvar id annotations? typing_o {-> New expr.vardecl(kwvar, id, typing_o.type, Null, Null, annotations)} + | {assign} kwvar id annotations? typing_o assign no expr_final~withelse {-> New expr.vardecl(kwvar, id, typing_o.type, assign, expr_final~withelse.expr, annotations)} ; assignment~withelse~nopar {-> expr} - = {attr} recv~nopar attrid assign expr_final~withelse {-> New expr.attr_assign(recv~nopar.expr, attrid, assign, expr_final~withelse.expr)} - | {call} recv~nopar id args assign expr_final~withelse {-> New expr.call_assign(recv~nopar.expr, id, args.exprs, assign, expr_final~withelse.expr)} + = {attr} recv~nopar qualified_o attrid assign expr_final~withelse {-> New expr.attr_assign(recv~nopar.expr, attrid, assign, expr_final~withelse.expr)} + | {call} recv~nopar qid args assign expr_final~withelse {-> New expr.call_assign(recv~nopar.expr, qid.id, args.exprs, assign, expr_final~withelse.expr)} | {bra} expr_atom~nopar braargs assign expr_final~withelse {-> New expr.bra_assign(expr_atom~nopar.expr, braargs.exprs, assign, expr_final~withelse.expr)} - | {attr_re} recv~nopar attrid assign_op expr_final~withelse {-> New expr.attr_reassign(recv~nopar.expr, attrid, assign_op, expr_final~withelse.expr)} - | {call_re} recv~nopar id args assign_op expr_final~withelse {-> New expr.call_reassign(recv~nopar.expr, id, args.exprs, assign_op, expr_final~withelse.expr)} + | {attr_re} recv~nopar qualified_o attrid assign_op expr_final~withelse {-> New expr.attr_reassign(recv~nopar.expr, attrid, assign_op, expr_final~withelse.expr)} + | {call_re} recv~nopar qid args assign_op expr_final~withelse {-> New expr.call_reassign(recv~nopar.expr, qid.id, args.exprs, assign_op, expr_final~withelse.expr)} | {bra_re} expr_atom~nopar braargs assign_op expr_final~withelse {-> New expr.bra_reassign(expr_atom~nopar.expr, braargs.exprs, assign_op, expr_final~withelse.expr)} ; assign_op @@ -502,38 +490,36 @@ assertid {-> id} /* EXPRESSIONS ***************************************************************/ expr_final~nopar~withelse~nobra {-> expr} = expr~nopar~nobra {-> expr~nopar~nobra.expr} - | {closure_call} recv~nobra id args closure_defs~withelse {-> New expr.call(recv~nobra.expr, id, args.exprs, [closure_defs~withelse.closure_def])} -!nobra!nopar | {closure_bra} expr_atom braargs closure_defs~withelse {-> New expr.bra(expr_atom.expr, braargs.exprs, [closure_defs~withelse.closure_def])} ; -expr~nopar~nobra~nois {-> expr} - = expr_and~nopar~nobra~nois {-> expr_and~nopar~nobra~nois.expr} - | {ifexpr} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:expr [n4]:no kwelse [n5]:no [else]:expr~nopar~nobra~nois {-> New expr.ifexpr(kwif, expr, kwthen, then, kwelse, else.expr)} +expr~nopar~nobra {-> expr} + = expr_and~nopar~nobra {-> expr_and~nopar~nobra.expr} + | {ifexpr} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:expr [n4]:no kwelse [n5]:no [else]:expr~nopar~nobra {-> New expr.ifexpr(kwif, expr, kwthen, then, kwelse, else.expr)} ; -expr_and~nopar~nobra~nois {-> expr} - = expr_not~nopar~nobra~nois {-> expr_not~nopar~nobra~nois.expr} - | {:or} expr_and~nopar~nobra~nois :kwor :no expr_not~nopar~nobra~nois - | {:and} expr_and~nopar~nobra~nois :kwand :no expr_not~nopar~nobra~nois - | {:or_else} expr_and~nopar~nobra~nois :kwor :kwelse :no expr_not~nopar~nobra~nois +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 + | {:and} expr_and~nopar~nobra :kwand :no expr_not~nopar~nobra + | {:or_else} expr_and~nopar~nobra :kwor :kwelse :no expr_not~nopar~nobra + | {:implies} expr_and~nopar~nobra :kwimplies :no expr_not~nopar~nobra ; -expr_not~nopar~nobra~nois {-> expr} - = expr_eq~nopar~nobra~nois {-> expr_eq~nopar~nobra~nois.expr} - | {not} kwnot no expr_not~nopar~nobra~nois {-> New expr.not(kwnot, expr_not~nopar~nobra~nois.expr)} +expr_not~nopar~nobra {-> expr} + = expr_eq~nopar~nobra {-> expr_eq~nopar~nobra.expr} + | {not} kwnot no expr_not~nopar~nobra {-> New expr.not(kwnot, expr_not~nopar~nobra.expr)} ; -expr_eq~nopar~nobra~nois {-> 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 -!nois | {ee} [expr]:expr_add~nopar~nobra kwis no [expr2]:expr_add~nopar~nobra {-> New expr.ee(expr.expr, expr2.expr)} | {: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~nois :ll :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~nois :gg :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 ; @@ -560,42 +546,48 @@ expr_minus~nopar~nobra {-> expr} expr_new~nopar~nobra {-> expr} = expr_atom~nopar~nobra {-> expr_atom~nopar~nobra.expr} | {new} kwnew no type~nobra_nopar args {-> New expr.new(kwnew, type~nobra_nopar.type, Null, args.exprs)} - | {isset_attr} kwisset recv~nopar~nobra attrid {-> New expr.isset_attr(kwisset, recv~nopar~nobra.expr, attrid)} + | {isset_attr} kwisset recv~nopar~nobra qualified_o attrid {-> New expr.isset_attr(kwisset, recv~nopar~nobra.expr, attrid)} ; expr_atom~nopar~nobra {-> expr} - = {attr} recv~nopar~nobra attrid {-> New expr.attr(recv~nopar~nobra.expr, attrid)} - | {call} recv~nopar~nobra id args {-> New expr.call(recv~nopar~nobra.expr, id, args.exprs, [])} - | {super} qualified? kwsuper args {-> New expr.super(qualified, kwsuper, args.exprs)} + = {attr} recv~nopar~nobra qualified_o attrid {-> New expr.attr(recv~nopar~nobra.expr, attrid)} + | {call} recv~nopar~nobra qid args {-> New expr.call(recv~nopar~nobra.expr, qid.id, args.exprs)} + | {super} qualified_o kwsuper args {-> New expr.super(qualified_o.qualified, kwsuper, args.exprs)} | {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, args.exprs)} -!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, braargs.exprs, [])} - | {new} kwnew no type~nobra_nopar dot [n2]:no id args {-> New expr.new(kwnew, type~nobra_nopar.type, id, args.exprs)} +!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, braargs.exprs)} + | {new} kwnew no type~nobra_nopar dot [n2]:no qid args {-> New expr.new(kwnew, type~nobra_nopar.type, qid.id, args.exprs)} // !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? {-> New expr.crange(obra, expr, expr2.expr, cbra, annotations)} -!nobra!nopar | {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra annotations? {-> New expr.orange(obra, expr, expr2.expr, cbra, annotations)} -!nobra!nopar | {array} braargs annotations? {-> New expr.array(braargs.exprs, annotations)} - | {self} kwself annotations? {-> New expr.self(kwself, annotations)} - | {true} kwtrue annotations? {-> New expr.true(kwtrue, annotations)} - | {false} kwfalse annotations? {-> New expr.false(kwfalse, annotations)} - | {null} kwnull annotations? {-> New expr.null(kwnull, annotations)} - | {int} number annotations? {-> New expr.int(number, annotations)} - | {float} float annotations? {-> New expr.float(float, annotations)} - | {char} char annotations? {-> New expr.char(char, annotations)} - | {string} string annotations? {-> New expr.string(string, 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, 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 | {array} braargs annotations_o {-> New expr.array(braargs.exprs, annotations_o.annotations)} + | {self} kwself annotations_o {-> New expr.self(kwself, annotations_o.annotations)} + | {true} kwtrue annotations_o {-> New expr.true(kwtrue, annotations_o.annotations)} + | {false} kwfalse annotations_o {-> New expr.false(kwfalse, annotations_o.annotations)} + | {null} kwnull annotations_o {-> New expr.null(kwnull, annotations_o.annotations)} + | {int} number annotations_o {-> New expr.dec_int(number, annotations_o.annotations)} + | {hex_int} hex_number annotations_o {-> New expr.hex_int(hex_number, annotations_o.annotations)} + | {float} float annotations_o {-> New expr.float(float, annotations_o.annotations)} + | {char} char annotations_o {-> New expr.char(char, annotations_o.annotations)} + | {string} string annotations_o {-> New expr.string(string, annotations_o.annotations)} | {superstring} superstring {-> superstring.expr} -!nopar | {par} opar no expr [n2]:no cpar annotations? {-> New expr.par(opar, expr, cpar, annotations)} +!nopar | {par} opar no expr [n2]:no cpar annotations_o {-> New expr.par(opar, expr, cpar, annotations_o.annotations)} | {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)} ; superstring {-> expr} - = superstring_start superstring_middle* superstring_end annotations? {-> New expr.superstring([superstring_start.expr, superstring_middle.expr, superstring_end.expr], annotations)}; + = superstring_start superstring_middle* superstring_end annotations_o {-> New expr.superstring([superstring_start.expr, superstring_middle.expr, superstring_end.expr], annotations_o.annotations)}; superstring_start {-> expr*} - = start_string_p no expr [n2]:no {-> [start_string_p.expr, expr]}; + = start_string_p no expr [n2]:no {-> [start_string_p.expr, expr]} + | {noexpr} start_string_p no {-> [start_string_p.expr]} + ; start_string_p {-> expr} = start_string {-> New expr.start_string(start_string)}; superstring_middle {-> expr*} - = mid_string_p no expr [n2]:no {-> [mid_string_p.expr, expr]}; + = mid_string_p no expr [n2]:no {-> [mid_string_p.expr, expr]} + | {noexpr} mid_string_p no {-> [mid_string_p.expr]} + ; mid_string_p {-> expr} = mid_string {-> New expr.mid_string(mid_string)}; superstring_end {-> expr} @@ -607,11 +599,15 @@ 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)} ; +annotations_o~nopar {-> annotations?} + = annotations~nopar {-> annotations~nopar.annotations} + | {null} {-> Null} + ; one_annotation~nopar {-> annotation} - = {alone} atid annotations~nopar? {-> New annotation(atid, Null, [], Null, annotations~nopar.annotations)} + = {alone} atid annotations_o~nopar {-> New annotation(atid, Null, [], Null, annotations_o~nopar.annotations)} // !nopar to unambiguise 'new T@foo(bar)' between 'new T@(foo(bar))' and 'new (T@foo)(bar)' -!nopar | {args} atid opar no at_args [n2]:no cpar annotations~nopar? {-> New annotation(atid, opar, [at_args.at_arg], cpar, annotations~nopar.annotations)} +!nopar | {args} atid opar no at_args [n2]:no cpar annotations_o~nopar {-> New annotation(atid, opar, [at_args.at_arg], cpar, annotations_o~nopar.annotations)} ; many_annotations {-> annotations} @@ -651,7 +647,7 @@ at_arg~nopar {-> at_arg} ; atid~forclass {-> atid} - = {id} id {-> New atid.id(id)} + = {id} id {-> New atid.id(id)} //!forclass | {kwextern} kwextern {-> New atid.kwextern(kwextern)} //!forclass | {kwintern} kwintern {-> New atid.kwintern(kwintern)} !forclass | {kwreadable} kwreadable {-> New atid.kwreadable(kwreadable)} @@ -701,11 +697,25 @@ qualified = {cla} modquad* classquad {-> New qualified([modquad.id], classquad.classid)} | {mod} modquad+ {-> New qualified([modquad.id], Null)} ; +qualified_o {-> qualified?} + = qualified {-> qualified} + | {null} {-> Null} + ; +qid {-> id} + = qualified? id {-> id} + ; +qclassid {-> classid} + = qualified? classid {-> classid} + ; modquad {-> id} = id quad no {-> id}; classquad {-> classid} = classid quad no {-> classid}; +kwend_o {-> kwend?} + = kwend? {-> kwend} + ; + n1 = {a} comment | {b} eol; n {-> doc?} = {a} n2? comment+ {-> New doc([comment])} @@ -760,6 +770,7 @@ propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwva | {meth} doc? kwredef? visibility methid signature | {deferred_meth} doc? kwredef? visibility kwmeth methid signature annotations? | {intern_meth} doc? kwredef? visibility kwmeth methid signature + | {intern_new} doc? kwredef? visibility kwnew methid? signature | {extern_meth} doc? kwredef? visibility kwmeth methid signature [extern]:string? extern_calls? extern_code_block? | {concrete_meth} doc? kwredef? visibility kwmeth methid signature annotations? [block]:expr? | {concrete_init} doc? kwredef? visibility kwinit methid? signature annotations? [block]:expr? @@ -775,14 +786,11 @@ able = {read} kwredef? kwreadable 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 = opar? [params]:param* cpar? type? [closure_decls]:closure_decl*; +signature = opar? [params]:param* cpar? type?; param = id type? dotdotdot? annotations? ; -closure_decl = kwbreak? bang id signature expr? - ; - type = kwnullable? [id]:classid [types]:type* annotations?; label = kwlabel id; @@ -806,9 +814,9 @@ expr = {block} expr* kwend? | {or} expr [expr2]:expr | {and} expr [expr2]:expr | {or_else} expr [expr2]:expr + | {implies} 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 @@ -828,15 +836,14 @@ expr = {block} expr* kwend? | {attr} expr [id]:attrid | {attr_assign} expr [id]:attrid assign [value]:expr | {attr_reassign} expr [id]:attrid assign_op [value]:expr - | {call} expr id [args]:exprs [closure_defs]:closure_def* + | {call} expr id [args]:exprs | {call_assign} expr id [args]:exprs assign [value]:expr | {call_reassign} expr id [args]:exprs assign_op [value]:expr | {super} qualified? kwsuper [args]:exprs | {init} expr kwinit [args]:exprs - | {bra} expr [args]:exprs [closure_defs]:closure_def* + | {bra} expr [args]:exprs | {bra_assign} expr [args]:exprs assign [value]:expr | {bra_reassign} expr [args]:exprs assign_op [value]:expr - | {closure_call} id [args]:exprs [closure_defs]:closure_def* | {var} id | {var_assign} id assign [value]:expr | {var_reassign} id assign_op [value]:expr @@ -849,7 +856,8 @@ expr = {block} expr* kwend? | {true} kwtrue annotations? | {false} kwfalse annotations? | {null} kwnull annotations? - | {int} number annotations? + | {dec_int} number annotations? + | {hex_int} hex_number annotations? | {float} float annotations? | {char} char annotations? | {string} string annotations? @@ -858,8 +866,8 @@ expr = {block} expr* kwend? | {end_string} [string]:end_string | {superstring} [exprs]:expr* annotations? | {par} opar expr cpar annotations? - | {as_cast} expr kwas opar type cpar - | {as_notnull} expr kwas opar kwnot kwnull cpar + | {as_cast} expr kwas opar? type cpar? + | {as_notnull} expr kwas opar? kwnot kwnull cpar? | {isset_attr} kwisset expr [id]:attrid | {debug_type} kwdebug kwtype expr type ; @@ -873,23 +881,15 @@ assign_op | {minus} minuseq ; -closure_def - = bang [id]:closure_id [ids]:id* kwdo? expr? label? - ; -closure_id - = {simple} id - | {break} kwbreak - ; - module_name = quad? [path]:id* id; extern_calls = kwimport [extern_calls]:extern_call* ; extern_call = | {super} kwsuper | {local_prop} methid - | {full_prop} classid quad? methid - | {init_prop} classid - | {cast_as} [from_type]:type kwas [to_type]:type + | {full_prop} type dot? methid + | {init_prop} type + | {cast_as} [from_type]:type dot? kwas [to_type]:type | {as_nullable} type kwas kwnullable | {as_not_nullable} type kwas kwnot kwnullable ;