X-Git-Url: http://nitlanguage.org diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index 942ea30..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; @@ -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,7 +208,7 @@ 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)}; @@ -215,8 +218,10 @@ import | {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])} @@ -229,7 +234,7 @@ implicit_main_meth {-> propdef} /* CLASSES *******************************************************************/ classdef - = [doc]:no redef visibility classkind no qualified? 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 @@ -237,7 +242,7 @@ classkind | {abstract} kwabstract kwclass | {interface} kwinterface | {enum} kwenum - | {extern} kwextern kwclass? + | {extern} kwextern kwclass ; formaldefs {-> formaldef*} @@ -247,7 +252,7 @@ formaldefs {-> formaldef*} 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)} @@ -258,16 +263,16 @@ 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)} + | {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? {-> 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? writable? annotation_withend {-> New propdef.attr(doc.doc, Null, writable.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, annotation_withend.annotations, Null)} -!toplevel| {var4} [doc]:no redef visibility kwvar id typing? writable? assign [n2]:no expr annotation_withend {-> New propdef.attr(doc.doc, Null, writable.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, annotation_withend.annotations, expr.expr)} +!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)} @@ -317,11 +322,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 +340,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 +347,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} @@ -383,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?} @@ -425,8 +432,8 @@ assign_continue~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} @@ -557,7 +564,8 @@ expr_atom~nopar~nobra {-> expr} | {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)} @@ -565,6 +573,7 @@ expr_atom~nopar~nobra {-> 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)} + | {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} @@ -695,6 +704,9 @@ qualified_o {-> qualified?} qid {-> id} = qualified? id {-> id} ; +qclassid {-> classid} + = qualified? classid {-> classid} + ; modquad {-> id} = id quad no {-> id}; classquad {-> classid} @@ -758,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? @@ -843,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? @@ -852,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 ;