X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index 48c6ed3..9d22a62 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; @@ -114,6 +115,7 @@ kwwritable = 'writable'; kwvar = 'var'; kwintern = 'intern'; kwextern = 'extern'; +kwpublic = 'public'; kwprotected = 'protected'; kwprivate = 'private'; kwintrude = 'intrude'; @@ -182,6 +184,7 @@ id = lowercase letter*; attrid = '_' lowercase letter*; number = digit+; +hex_number = ('0x' | '0X') hexdigit+; float = digit* '.' digit+; string = '"' str_body '"' | '"' '"' '"' long_str_body lsend1 | ''' ''' ''' long_sstr_body ''' ''' '''; start_string = '"' str_body '{' | '"' '"' '"' long_str_body lsend2; @@ -205,18 +208,20 @@ 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 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)} ; -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])} @@ -237,7 +242,7 @@ classkind | {abstract} kwabstract kwclass | {interface} kwinterface | {enum} kwenum - | {extern} kwextern kwclass? + | {extern} kwextern kwclass ; formaldefs {-> formaldef*} @@ -258,20 +263,20 @@ propdefs~toplevel {-> propdef} ; propdef~toplevel {-> propdef} = {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)} - | {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_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_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)} + | {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, Null, string_o.string, extern_calls, extern_code_block_o.extern_code_block)} + | {extern_implicit} [doc]:no redef visibility kwmeth methid signature annotation_noend? extern_calls extern_code_block {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, annotation_noend.annotations, 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)} +!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, Null, string_o.string, extern_calls, extern_code_block_o.extern_code_block)} +!toplevel| {extern_init_implicit} [doc]:no redef visibility kwnew methid? signature annotation_noend? extern_calls extern_code_block {-> New propdef.extern_init(doc.doc, redef.kwredef, visibility, kwnew, methid, signature, annotation_noend.annotations, Null, extern_calls, extern_code_block)} ; annotation_withend~nonull {-> annotations?} = {oneliner} kwis many_annotations {-> many_annotations.annotations} @@ -290,7 +295,8 @@ writable {-> able} ; visibility - = {public} {-> New visibility.public()} + = {public} {-> New visibility.public(Null)} + | {public2} kwpublic no {-> New visibility.public(kwpublic)} | {private} kwprivate no {-> New visibility.private(kwprivate)} | {protected} kwprotected no {-> New visibility.protected(kwprotected)} | {intrude} kwintrude no {-> New visibility.intrude(kwintrude)} @@ -317,11 +323,11 @@ methid {-> methid} | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)} ; -signature~withret {-> signature} +signature {-> signature} = opar no params cpar typing [no2]:no {-> New signature(opar, [params.param], cpar, typing.type)} -!withret| {noret} opar no params cpar [no2]:no {-> New signature(opar, [params.param], cpar, Null)} + | {noret} opar no params cpar [no2]:no {-> New signature(opar, [params.param], cpar, Null)} | {nopar} typing no {-> New signature(Null, [], Null, typing.type)} -!withret| {noparnoret} no {-> New signature(Null, [], Null, Null)} + | {noparnoret} no {-> New signature(Null, [], Null, Null)} ; params {-> param*} @@ -335,10 +341,6 @@ param | id annotations? typing dotdotdot? {-> New param(id, typing.type, dotdotdot, annotations)} ; -assign_return{-> expr} - = expr_final {-> New expr.return(Null, expr_final.expr)} - ; - extern_calls {-> extern_calls?} = kwimport no extern_call extern_call_tail* {-> New extern_calls( kwimport, [extern_call, extern_call_tail.extern_call] )} | {null} {-> Null} @@ -346,25 +348,27 @@ extern_calls {-> extern_calls?} 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} type quad methid {-> New extern_call.full_prop( type, Null, methid )} - | {full2} type dot methid {-> New extern_call.full_prop( type, dot, methid )} + = {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 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_nullable} type dot? kwas [n2]:no kwnullable {-> New extern_call.as_nullable( type, kwas, kwnullable)} - | {as_not_nullable} type dot? 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)} ; string_o {->string?} = string? {-> string}; -in_language = kwin 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} @@ -407,9 +411,9 @@ stmt~withelse~noexpr~nopar {-> expr} = {vardecl} vardecl~withelse {-> vardecl~withelse.expr} | {assign} assignment~withelse~nopar {-> assignment~withelse~nopar.expr} | {return} kwreturn expr_final~withelse? {-> New expr.return(kwreturn, expr_final~withelse.expr)} - | {break} kwbreak label? expr_final~withelse? {-> New expr.break(kwbreak, label, expr_final~withelse.expr)} + | {break} kwbreak label? {-> New expr.break(kwbreak, label)} | {abort} kwabort {-> New expr.abort(kwabort)} - | {continue} kwcontinue label? expr_final~withelse? {-> New expr.continue(kwcontinue, label, expr_final~withelse.expr)} + | {continue} kwcontinue label? {-> New expr.continue(kwcontinue, label)} | {do} do~withelse {-> do~withelse.expr} !noexpr | {if} if~withelse {-> if~withelse.expr} | {while} while~withelse {-> while~withelse.expr} @@ -422,11 +426,7 @@ stmt~withelse~noexpr~nopar {-> expr} | {debug_type_is} kwdebug kwtype type column expr_final~withelse {-> New expr.debug_type(kwdebug, kwtype, expr_final~withelse.expr, type) } ; -label= kwlabel id; - -assign_continue~withelse{-> expr} - = expr_final~withelse {-> New expr.continue(Null, Null, expr_final~withelse.expr)} - ; +label= kwlabel id?; vardecl~withelse{-> expr} = kwvar id annotations? typing_o {-> New expr.vardecl(kwvar, id, typing_o.type, Null, Null, annotations)} @@ -547,28 +547,35 @@ expr_new~nopar~nobra {-> expr} ; expr_atom~nopar~nobra {-> expr} - = {attr} recv~nopar~nobra qualified_o attrid {-> New expr.attr(recv~nopar~nobra.expr, attrid)} + = expr_single~nopar~nobra {-> expr_single~nopar~nobra.expr} + | {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 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_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)} + | {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)} + ; + +expr_single~nopar~nobra {-> expr} + = {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.int(number, 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_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)} +// !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 | {array} braargs annotations_o {-> New expr.array(braargs.exprs, annotations_o.annotations)} ; superstring {-> expr} @@ -600,9 +607,9 @@ annotations_o~nopar {-> annotations?} ; one_annotation~nopar {-> annotation} - = {alone} atid annotations_o~nopar {-> New annotation(atid, Null, [], Null, annotations_o~nopar.annotations)} + = {alone} redef visibility atid annotations_o~nopar {-> New annotation(Null, redef.kwredef, visibility, 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_o~nopar {-> New annotation(atid, opar, [at_args.at_arg], cpar, annotations_o~nopar.annotations)} +!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.at_arg], cpar, annotations_o~nopar.annotations)} ; many_annotations {-> annotations} @@ -613,13 +620,21 @@ annotation_list {-> annotation*} = {many} one_annotation annotations_tail* {-> [one_annotation.annotation, annotations_tail.annotation] } ; -line_annotations~forclass {-> annotations} - = line_annotation~forclass+ {-> New annotations(Null, Null, [line_annotation~forclass.annotation], Null) } +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.at_arg], 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.at_arg], Null, Null)} + ; +line_annotations_forclass {-> annotations} + = line_annotation_forclass+ {-> New annotations(Null, Null, [line_annotation_forclass.annotation], Null) } ; -line_annotation~forclass {-> annotation} - = [doc]:no atid~forclass annotations? n1 {-> New annotation(atid~forclass.atid, Null, [], Null, annotations)} - | {args} [doc]:no atid~forclass opar no at_args cpar annotations? n1 {-> New annotation(atid~forclass.atid, opar, [at_args.at_arg], cpar, annotations)} - | {nopar} [doc]:no atid~forclass at_args_nopar n1 {-> New annotation(atid~forclass.atid, Null, [at_args_nopar.at_arg], Null, Null)} +line_annotation_forclass {-> annotation} + = [doc]:no atid_forclass annotations? n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, Null, [], Null, annotations)} + | {args} [doc]:no atid_forclass opar no at_args cpar annotations? n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, opar, [at_args.at_arg], cpar, annotations)} + | {nopar} [doc]:no atid_forclass at_args_nopar n1 {-> New annotation(doc.doc, Null, Null, atid_forclass.atid, Null, [at_args_nopar.at_arg], Null, Null)} ; annotations_tail {-> annotation} @@ -647,7 +662,7 @@ atid~forclass {-> atid} //!forclass | {kwintern} kwintern {-> New atid.kwintern(kwintern)} !forclass | {kwreadable} kwreadable {-> New atid.kwreadable(kwreadable)} !forclass | {kwwritable} kwwritable {-> New atid.kwwritable(kwwritable)} - | {kwimport} kwimport {-> New atid.kwimport(kwimport)} +// | {kwimport} kwimport {-> New atid.kwimport(kwimport)} ; /* MISC **********************************************************************/ @@ -733,14 +748,14 @@ Abstract Syntax Tree module = moduledecl? [imports]:import* [extern_code_blocks]:extern_code_block* [classdefs]:classdef*; moduledecl - = doc? kwmodule [name]:module_name annotations?; + = doc? kwredef? visibility kwmodule [name]:module_name annotations?; import = {std} visibility kwimport [name]:module_name annotations? | {no} visibility kwimport kwend ; visibility - = {public} + = {public} kwpublic? | {private} kwprivate | {protected} kwprotected | {intrude} kwintrude @@ -765,11 +780,12 @@ 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 - | {extern_meth} doc? kwredef? visibility kwmeth methid signature [extern]:string? extern_calls? extern_code_block? + | {intern_new} doc? kwredef? visibility kwnew methid? signature + | {extern_meth} doc? kwredef? visibility kwmeth methid signature annotations? [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? //| {concrete_new} doc? kwredef? visibility kwnew methid? signature [block]:expr? - | {extern_init} doc? kwredef? visibility kwnew methid? signature [extern]:string? extern_calls? extern_code_block? + | {extern_init} doc? kwredef? visibility kwnew methid? signature annotations? [extern]:string? extern_calls? extern_code_block? | {main_meth} kwredef? [block]:expr? | {type} doc? kwredef? visibility kwtype [id]:classid type annotations? ; @@ -787,14 +803,14 @@ param = id type? dotdotdot? annotations? type = kwnullable? [id]:classid [types]:type* annotations?; -label = kwlabel id; +label = kwlabel id?; expr = {block} expr* kwend? | {vardecl} kwvar id type? assign? expr? annotations? | {return} kwreturn? expr? - | {break} kwbreak label? expr? + | {break} kwbreak label? | {abort} kwabort - | {continue} kwcontinue? label? expr? + | {continue} kwcontinue? label? | {do} kwdo [block]:expr? label? | {if} kwif expr [then]:expr? [else]:expr? | {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr @@ -850,7 +866,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? @@ -859,10 +876,11 @@ 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 + | {vararg} expr dotdotdot ; exprs = {list} [exprs]:expr* @@ -895,7 +913,7 @@ doc = comment+; annotations = at? opar? [items]:annotation* cpar?; -annotation = atid opar? [args]:at_arg* cpar? annotations?; +annotation = doc? kwredef? visibility? atid opar? [args]:at_arg* cpar? annotations?; at_arg = {type} type