/* This file is part of NIT ( http://www.nitlanguage.org ).
*
- * Copyright 2008 Jean Privat <jean@pryen.org>
+ * Copyright 2008-2009 Jean Privat <jean@pryen.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
kwuniversal = 'universal';
kwspecial = 'special';
kwend = 'end';
-kwmeth = 'meth';
+kwmeth = 'fun';
kwtype = 'type';
-kwattr = 'attr';
kwinit = 'init';
kwredef = 'redef';
kwis = 'is';
kwthen = 'then';
kwelse = 'else';
kwwhile = 'while';
+kwloop = 'loop';
kwfor = 'for';
kwin = 'in';
kwand = 'and';
kwfalse = 'false';
kwnull = 'null';
kwas = 'as';
+kwnullable = 'nullable';
+kwisset = 'isset';
+kwlabel = 'label';
opar = '(';
cpar = ')';
ne = '!=';
lt = '<';
le = '<=';
+ll = '<<';
gt = '>';
ge = '>=';
+gg = '>>';
starship = '<=>';
+bang='!';
classid = uppercase letter*;
id = lowercase letter*;
= [doc]:no kwpackage no id [n2]:n1 {-> New packagedecl(doc.doc, kwpackage, id)};
import
- = [doc]:no visibility kwimport no id [n2]:n1 {-> New import(visibility, kwimport, id)}
+ = {std} [doc]:no visibility kwimport no id [n2]:n1 {-> New import.std(visibility, kwimport, id)}
| {no} [doc]:no visibility kwimport no kwend [n2]:n1 {-> New import.no(visibility, kwimport, kwend)}
;
implicit_top_class {-> classdef}
- = tl_propdefs {-> New classdef.top([tl_propdefs.propdef])};
+ = propdefs_toplevel+ {-> New classdef.top([propdefs_toplevel.propdef])};
implicit_main_class {-> classdef?}
= implicit_main_meth {-> New classdef.main([implicit_main_meth.propdef])}
| {null} n {-> Null}
;
implicit_main_meth {-> propdef}
- = [doc]:no stmts no {-> New propdef.main_meth(Null, stmts.expr)};
+ = [doc]:no stmts {-> New propdef.main_meth(Null, stmts.expr)}
+ | {n} [doc]:no stmtsn {-> New propdef.main_meth(Null, stmtsn.expr)}
+ ;
/* CLASSES *******************************************************************/
classdef
- = [doc]:no redef visibility classkind no classid formaldefs? [specials]:special* propdefs? [n2]:no kwend {-> New classdef(doc.doc, redef.kwredef, visibility, classkind, classid, [formaldefs.formaldef], [specials.superclass], [propdefs.propdef])};
+ = [doc]:no redef visibility classkind no classid formaldefs? [specials]:special* propdefs* [n2]:no kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, classid, [formaldefs.formaldef], [specials.superclass], [propdefs.propdef])};
redef {-> kwredef?}
= kwredef? {-> kwredef};
classkind
= classid typing? {-> New formaldef(classid, typing.type)};
special {-> superclass}
- = no kwspecial [n2]:no type {-> New superclass(kwspecial, type)};
-
-propdefs {-> propdef*}
- = propdef n1 propdefs_tail* {-> [propdef, propdefs_tail.propdef]};
-propdefs_tail {-> propdef}
- = propdef n1 {-> propdef};
-propdef
- = {attr} [doc]:no readable writable redef visibility kwattr attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwattr, attrid, typing.type, Null)}
- | {attr2} [doc]:no readable writable redef visibility kwattr attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwattr, attrid, typing.type, expr)}
- | {deferred} [doc]:no redef visibility kwmeth methid signature kwis kwabstract {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature)}
- | {intern} [doc]:no redef visibility kwmeth methid signature kwis kwintern {-> New propdef.intern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature)}
- | {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, string)}
- | {meth} [doc]:no redef visibility kwmeth methid signature no kwdo stmtso kwend? {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, stmtso.expr)}
- | {init} [doc]:no redef visibility kwinit methid? signature no kwdo stmtso kwend? {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, stmtso.expr)}
- | {type} [doc]:no redef visibility kwtype classid typing {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, classid, typing.type)}
- ;
-readable {-> able?}
+ = {special} no kwspecial [n2]:no type {-> New superclass(kwspecial, Null, type)}
+ | {super} no kwsuper [n2]:no type {-> New superclass(Null, kwsuper, type)}
+ ;
+
+propdefs~toplevel {-> propdef}
+ = propdef~toplevel n1 {-> propdef~toplevel.propdef}
+ ;
+propdef~toplevel {-> propdef}
+ = {meth} [doc]:no redef visibility kwmeth methid signature kwdo stmtso kwend? {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, stmtso.expr)}
+ | {assign_return} [doc]:no redef visibility kwmeth methid signature_withret assign no assign_return {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature_withret.signature, assign_return.expr)}
+!toplevel| {deferred} [doc]:no redef visibility kwmeth methid signature kwis kwabstract {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
+!toplevel| {intern} [doc]:no redef visibility kwmeth methid signature kwis kwintern {-> New propdef.intern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
+ | {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, string)}
+!toplevel| {var} [doc]:no readable? writable? redef visibility kwvar attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing.type, Null)}
+!toplevel| {var2} [doc]:no readable? writable? redef visibility kwvar attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing.type, expr)}
+!toplevel| {var3} [doc]:no redef visibility kwvar id typing? writable2? {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, Null)}
+!toplevel| {var4} [doc]:no redef visibility kwvar id typing? writable2? assign [n2]:no expr {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, expr)}
+!toplevel| {init} [doc]:no redef visibility kwinit methid? signature kwdo stmtso kwend? {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, stmtso.expr)}
+!toplevel| {type} [doc]:no redef visibility kwtype classid typing {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, classid, typing.type)}
+ ;
+readable {-> able}
= redef kwreadable {-> New able.read(redef.kwredef, kwreadable)}
- | {empty} {-> Null}
;
-writable {-> able?}
- = redef kwwritable {-> New able.write(redef.kwredef, kwwritable)}
- | {empty} {-> Null}
+writable {-> able}
+ = redef kwwritable {-> New able.write(redef.kwredef, Null, kwwritable)}
;
-
-tl_propdefs {-> propdef*}
- = tl_propdef n1 tl_propdefs_tail* {-> [tl_propdef.propdef, tl_propdefs_tail.propdef]};
-tl_propdefs_tail {-> propdef}
- = tl_propdef n1 {-> tl_propdef.propdef};
-tl_propdef {-> propdef}
- = {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, string)}
- | {meth} [doc]:no redef visibility kwmeth methid signature no kwdo stmtso {-> New propdef.concrete_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature, stmtso.expr)}
+writable2 {-> able}
+ = redef visibility kwwritable {-> New able.write(redef.kwredef, visibility, kwwritable)}
;
visibility
| {intrude} kwintrude no {-> New visibility.intrude(kwintrude)}
;
-methid
- = {id} id
- | {plus} plus
- | {minus} minus
- | {star} star
- | {slash} slash
- | {percent} percent
- | {eq} eq
- | {ne} ne
- | {le} le
- | {ge} ge
- | {lt} lt
- | {gt} gt
- | {bra} obra cbra
- | {starship} starship
- | {assign} id assign
- | {braassign} obra cbra assign
- ;
-
-signature
- = params? typing? {-> New signature([params.param], typing.type)};
+methid {-> methid}
+ = {id} id {-> New methid.id(id)}
+ | {plus} plus {-> New methid.plus(plus)}
+ | {minus} minus {-> New methid.minus(minus)}
+ | {star} star {-> New methid.star(star)}
+ | {slash} slash {-> New methid.slash(slash)}
+ | {percent} percent {-> New methid.percent(percent)}
+ | {eq} eq {-> New methid.eq(eq)}
+ | {ne} ne {-> New methid.ne(ne)}
+ | {le} le {-> New methid.le(le)}
+ | {ge} ge {-> New methid.ge(ge)}
+ | {lt} lt {-> New methid.lt(lt)}
+ | {gt} gt {-> New methid.gt(gt)}
+ | {ll} ll {-> New methid.ll(ll)}
+ | {gg} gg {-> New methid.gg(gg)}
+ | {bra} obra cbra {-> New methid.bra(obra, cbra)}
+ | {starship} starship {-> New methid.starship(starship)}
+ | {assign} id assign {-> New methid.assign(id, assign)}
+ | {braassign} obra cbra assign {-> New methid.braassign(obra, cbra, assign)}
+ ;
+
+signature~withret {-> signature}
+ = params? typing closure_decls {-> New signature([params.param], typing.type, [closure_decls.closure_decl])}
+ | {noclosures} params? typing no {-> New signature([params.param], typing.type, [])}
+!withret| {noret} params? closure_decls {-> New signature([params.param], Null, [closure_decls.closure_decl])}
+!withret| {noretnoclosures} params? no {-> New signature([params.param], Null, [])}
+ ;
+
+signature_noclosures {-> signature}
+ = params? typing? {-> New signature([params.param], typing.type, [])};
params {-> param*}
= opar no param params_tail* [n2]:no cpar {-> [param, params_tail.param]}
| id typing dotdotdot? {-> New param(id, typing.type, dotdotdot)}
;
+closure_decls {->closure_decl*}
+ = no 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)}
+ ;
+
+
/* TYPES *********************************************************************/
-type/*B3*//*B*/ {-> type}
- = {simple} classid {-> New type(classid, [])}
-/*N*/ | {generic} classid obra no types [n2]:no cbra {-> New type(classid, [types.type])}
+type~nobra {-> type}
+ = {simple} kwnullable? classid {-> New type(kwnullable, classid, [])}
+!nobra | {generic} kwnullable? classid obra no types [n2]:no cbra {-> New type(kwnullable, classid, [types.type])}
;
-/*E*/
types {-> type*}
= type types_tail* {-> [type, types_tail.type]};
types_tail {-> type}
= column no type {-> type};
/* STATMENTS *****************************************************************/
-stmtso/*B2*/ {-> expr?}
- = {oneline} stmt/*B2*/ {-> stmt/*B2*/.expr}
- | {block} n stmts [n2]:n kwend {-> stmts.expr}
- | {emptyblock} n kwend {-> Null}
- | {emptyoneline} kwend {-> Null}
+stmtso~withelse~withend {-> expr?}
+ = {block} n stmtsn kwend {-> stmtsn.expr}
+ | {emptyblock} n kwend {-> New expr.block([])}
+ | {emptyoneline} kwend {-> New expr.block([])}
+!withend| {oneline} stmt~withelse {-> stmt~withelse.expr}
;
stmts {-> expr}
= stmt stmts_tail* {-> New expr.block([stmt.expr, stmts_tail.expr])};
+stmtsn {-> expr}
+ = stmt stmts_tail* n {-> New expr.block([stmt.expr, stmts_tail.expr])};
stmts_tail {-> expr}
= n stmt {-> stmt.expr};
-stmt/*B2*/ {-> expr}
- = {vardecl} vardecl {-> vardecl.expr}
- | {assign} assignment {-> assignment.expr}
- | {return} kwreturn expr? {-> New expr.return(kwreturn, expr)}
- | {break} kwbreak {-> New expr.break(kwbreak)}
+stmt~withelse {-> expr}
+ = {vardecl} vardecl~withelse {-> vardecl~withelse.expr}
+ | {assign} assignment~withelse {-> assignment~withelse.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)}
| {abort} kwabort {-> New expr.abort(kwabort)}
- | {continue} kwcontinue {-> New expr.continue(kwcontinue)}
- | {do} do/*B2*/ {-> do/*B2*/.expr}
- | {if} if/*B2*/ {-> if/*B2*/.expr}
- | {while} while/*B2*/ {-> while/*B2*/.expr}
- | {for} for/*B2*/ {-> for/*B2*/.expr}
- | {assert} assert {-> assert.expr}
-// | {expr} expr {-> expr.expr}
- | {call} recv id args_nopar {-> New expr.call(recv.expr, id, [args_nopar.expr])}
+ | {continue} kwcontinue label? expr_final~withelse? {-> New expr.continue(kwcontinue, label, expr_final~withelse.expr)}
+ | {do} do~withelse {-> do~withelse.expr}
+ | {if} if~withelse {-> if~withelse.expr}
+ | {while} while~withelse {-> while~withelse.expr}
+ | {loop} loop~withelse {-> loop~withelse.expr}
+ | {for} for~withelse {-> for~withelse.expr}
+ | {assert} assert~withelse {-> assert~withelse.expr}
+ | {call} recv id args_nopar closure_defs~withelse? {-> New expr.call(recv.expr, id, [args_nopar.expr], [closure_defs~withelse.closure_def])}
| {super} qualified? kwsuper args_nopar {-> New expr.super(qualified, kwsuper, [args_nopar.expr])}
| {init} recv kwinit args_nopar {-> New expr.init(recv.expr, kwinit, [args_nopar.expr])}
;
-vardecl {-> expr}
+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 typing? {-> New expr.vardecl(kwvar, id, typing.type, Null, Null)}
- | {assign} kwvar id typing? assign no expr {-> New expr.vardecl(kwvar, id, typing.type, assign, expr)}
+ | {assign} kwvar id typing? assign no expr_final~withelse {-> New expr.vardecl(kwvar, id, typing.type, assign, expr_final~withelse.expr)}
;
-assignment {-> expr}
- = {attr} recv attrid assign expr {-> New expr.attr_assign(recv.expr, attrid, assign, expr)}
- | {call} recv id args assign expr {-> New expr.call_assign(recv.expr, id, [args.expr], assign, expr)}
- | {bra} expr_atom braargs assign expr {-> New expr.bra_assign(expr_atom.expr, [braargs.expr], assign, expr)}
- | {attr_re} recv attrid assign_op expr {-> New expr.attr_reassign(recv.expr, attrid, assign_op, expr)}
- | {call_re} recv id args assign_op expr {-> New expr.call_reassign(recv.expr, id, [args.expr], assign_op, expr)}
- | {bra_re} expr_atom braargs assign_op expr {-> New expr.bra_reassign(expr_atom.expr, [braargs.expr], assign_op, expr)}
+assignment~withelse {-> expr}
+ = {attr} recv attrid assign expr_final~withelse {-> New expr.attr_assign(recv.expr, attrid, assign, expr_final~withelse.expr)}
+ | {call} recv id args assign expr_final~withelse {-> New expr.call_assign(recv.expr, id, [args.expr], assign, expr_final~withelse.expr)}
+ | {bra} expr_atom braargs assign expr_final~withelse {-> New expr.bra_assign(expr_atom.expr, [braargs.expr], assign, expr_final~withelse.expr)}
+ | {attr_re} recv attrid assign_op expr_final~withelse {-> New expr.attr_reassign(recv.expr, attrid, assign_op, expr_final~withelse.expr)}
+ | {call_re} recv id args assign_op expr_final~withelse {-> New expr.call_reassign(recv.expr, id, [args.expr], assign_op, expr_final~withelse.expr)}
+ | {bra_re} expr_atom braargs assign_op expr_final~withelse {-> New expr.bra_reassign(expr_atom.expr, [braargs.expr], assign_op, expr_final~withelse.expr)}
;
assign_op
= {plus} pluseq
| {minus} minuseq
;
-do/*B2*/ {-> expr}
- = kwdo stmtso/*B2*/ {-> New expr.do(kwdo, stmtso/*B2*/.expr)}
+do~withelse {-> expr}
+ = kwdo stmtso_withend label {-> New expr.do(kwdo, stmtso_withend.expr, label)}
+ | {nolabel} kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr, Null)}
;
-if/*B2*/ {-> expr}
- = {onelineelse} kwif no expr [n2]:no kwthen stmt_withelse kwelse stmtso/*B2*/ {-> New expr.if(kwif, expr, stmt_withelse.expr, stmtso/*B2*/.expr)}
-/*N2*/ | {oneline} kwif no expr [n2]:no kwthen stmt {-> New expr.if(kwif, expr, stmt.expr, Null)}
-/*N2*/ | {block} kwif no expr [n2]:no kwthen [n3]:n stmts [n4]:n elsepartblock {-> New expr.if(kwif, expr, stmts.expr, elsepartblock.expr)}
-/*N2*/ | {emptyblock} kwif no expr [n2]:no kwthen [n3]:n? elsepartblock {-> New expr.if(kwif, expr, Null, elsepartblock.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)}
;
elsepartblock {-> expr?}
= {else} kwelse stmtso {-> stmtso.expr}
| {empty} kwend {-> Null}
;
-while/*B2*/ {-> expr}
- = kwwhile no expr [n2]:no kwdo stmtso/*B2*/ {-> New expr.while(kwwhile, expr, kwdo, stmtso/*B2*/.expr)};
-
-for/*B2*/ {-> expr}
- = for_vardecl [n4]:no kwdo stmtso/*B2*/ {-> New expr.for(for_vardecl.expr, kwdo, stmtso/*B2*/.expr)};
-for_vardecl {-> expr}
- = kwfor no id [n2]:no kwin [n3]:no expr {-> New expr.for_vardecl(kwfor, id, expr)};
+loop~withelse {-> expr}
+ = kwloop stmtso_withend label {-> New expr.loop(kwloop, stmtso_withend.expr, label)}
+ | {nolabel} kwloop stmtso~withelse {-> New expr.loop(kwloop, stmtso~withelse.expr, Null)}
+ ;
+
+while~withelse {-> expr}
+ = kwwhile no expr [n2]:no kwdo stmtso_withend label {-> New expr.while(kwwhile, expr, kwdo, stmtso_withend.expr, label)}
+ | {nolabel} kwwhile no expr [n2]:no kwdo stmtso~withelse {-> New expr.while(kwwhile, expr, kwdo, stmtso~withelse.expr, Null)}
+ ;
-assert {-> expr}
- = kwassert assertid? expr {-> New expr.assert(kwassert, assertid.id, expr)};
+for~withelse {-> expr}
+ = kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, id, expr, kwdo, stmtso_withend.expr, label)}
+ | {nolabel} kwfor no id [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, id, expr, kwdo, stmtso~withelse.expr, Null)}
+ ;
+
+assert~withelse {-> expr}
+ = {else} kwassert assertid? expr_final_withelse kwelse stmtso~withelse {-> New expr.assert(kwassert, assertid.id, expr_final_withelse.expr, stmtso~withelse.expr)}
+!withelse| {noelse} kwassert assertid? expr_final {-> New expr.assert(kwassert, assertid.id, expr_final.expr, Null)}
+ ;
assertid {-> id}
= id column {-> id};
/* EXPRESSIONS ***************************************************************/
-expr/*B3*//*B*/ {-> expr}
- = expr_and/*B3*//*B*/ {-> expr_and/*B3*//*B*/.expr}
- | {ifexpr} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:expr [n4]:no kwelse [n5]:no [else]:expr/*B3*//*B*/ {-> New expr.ifexpr(kwif, expr, kwthen, then, kwelse, else.expr)}
+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.expr], [closure_defs~withelse.closure_def])}
+!nobra!nopar | {closure_bra} expr_atom braargs closure_defs~withelse {-> New expr.bra(expr_atom.expr, [braargs.expr], [closure_defs~withelse.closure_def])}
;
-expr_and/*B3*//*B*/ {-> expr}
- = expr_not/*B3*//*B*/ {-> expr_not/*B3*//*B*/.expr}
- | {or} expr_and/*B3*//*B*/ kwor no expr_not/*B3*//*B*/ {-> New expr.or(expr_and/*B3*//*B*/.expr, expr_not/*B3*//*B*/.expr)}
- | {and} expr_and/*B3*//*B*/ kwand no expr_not/*B3*//*B*/ {-> New expr.and(expr_and/*B3*//*B*/.expr, expr_not/*B3*//*B*/.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_not/*B3*//*B*/ {-> expr}
- = expr_eq/*B3*//*B*/ {-> expr_eq/*B3*//*B*/.expr}
- | {not} kwnot no expr_not/*B3*//*B*/ {-> New expr.not(kwnot, expr_not/*B3*//*B*/.expr)}
+expr_and~nopar~nobra {-> expr}
+ = expr_not~nopar~nobra {-> expr_not~nopar~nobra.expr}
+ | {or} expr_and~nopar~nobra kwor no expr_not~nopar~nobra {-> New expr.or(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)}
+ | {and} expr_and~nopar~nobra kwand no expr_not~nopar~nobra {-> New expr.and(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)}
+ | {or_else} expr_and~nopar~nobra kwor kwelse no expr_not~nopar~nobra {-> New expr.or_else(expr_and~nopar~nobra.expr, expr_not~nopar~nobra.expr)}
;
-expr_eq/*B3*//*B*/ {-> expr}
- = expr_add/*B3*//*B*/ {-> expr_add/*B3*//*B*/.expr}
- | {eq} expr_add/*B3*//*B*/ eq no [expr2]:expr_add/*B3*//*B*/ {-> New expr.eq(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {ee} expr_add/*B3*//*B*/ kwis no [expr2]:expr_add/*B3*//*B*/ {-> New expr.ee(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {ne} expr_add/*B3*//*B*/ ne no [expr2]:expr_add/*B3*//*B*/ {-> New expr.ne(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {lt} expr_add/*B3*//*B*/ lt no [expr2]:expr_add/*B3*//*B*/ {-> New expr.lt(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {le} expr_add/*B3*//*B*/ le no [expr2]:expr_add/*B3*//*B*/ {-> New expr.le(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {gt} expr_add/*B3*//*B*/ gt no [expr2]:expr_add/*B3*//*B*/ {-> New expr.gt(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {ge} expr_add/*B3*//*B*/ ge no [expr2]:expr_add/*B3*//*B*/ {-> New expr.ge(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {starship} expr_add/*B3*//*B*/ starship no [expr2]:expr_add/*B3*//*B*/ {-> New expr.starship(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {isa} expr_add/*B3*//*B*/ kwisa no type/*B3*//*B*/ {-> New expr.isa(expr_add/*B3*//*B*/.expr, type/*B3*//*B*/.type)}
+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_add/*B3*//*B*/ {-> expr}
- = expr_mul/*B3*//*B*/ {-> expr_mul/*B3*//*B*/.expr}
- | {plus} expr_add/*B3*//*B*/ plus no [expr2]:expr_mul/*B3*//*B*/ {-> New expr.plus(expr_add/*B3*//*B*/.expr, expr2.expr)}
- | {minus} expr_add/*B3*//*B*/ minus no [expr2]:expr_mul/*B3*//*B*/ {-> New expr.minus(expr_add/*B3*//*B*/.expr, expr2.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 {-> New expr.eq(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {ee} expr_add~nopar~nobra kwis no [expr2]:expr_add~nopar~nobra {-> New expr.ee(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {ne} expr_add~nopar~nobra ne no [expr2]:expr_add~nopar~nobra {-> New expr.ne(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {lt} expr_add~nopar~nobra lt no [expr2]:expr_add~nopar~nobra {-> New expr.lt(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {le} expr_add~nopar~nobra le no [expr2]:expr_add~nopar~nobra {-> New expr.le(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {ll} expr_eq~nopar~nobra ll no [expr2]:expr_add~nopar~nobra {-> New expr.ll(expr_eq~nopar~nobra.expr, expr2.expr)}
+ | {gt} expr_add~nopar~nobra gt no [expr2]:expr_add~nopar~nobra {-> New expr.gt(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {ge} expr_add~nopar~nobra ge no [expr2]:expr_add~nopar~nobra {-> New expr.ge(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {gg} expr_eq~nopar~nobra gg no [expr2]:expr_add~nopar~nobra {-> New expr.gg(expr_eq~nopar~nobra.expr, expr2.expr)}
+ | {starship} expr_add~nopar~nobra starship no [expr2]:expr_add~nopar~nobra {-> New expr.starship(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {isa} expr_add~nopar~nobra kwisa no type~nobra {-> New expr.isa(expr_add~nopar~nobra.expr, type~nobra.type)}
;
-expr_mul/*B3*//*B*/ {-> expr}
- = expr_minus/*B3*//*B*/ {-> expr_minus/*B3*//*B*/.expr}
- | {star} expr_mul/*B3*//*B*/ star no [expr2]:expr_minus/*B3*//*B*/ {-> New expr.star(expr_mul/*B3*//*B*/.expr, expr2.expr)}
- | {slash} expr_mul/*B3*//*B*/ slash no [expr2]:expr_minus/*B3*//*B*/ {-> New expr.slash(expr_mul/*B3*//*B*/.expr, expr2.expr)}
- | {percent} expr_mul/*B3*//*B*/ percent no [expr2]:expr_minus/*B3*//*B*/ {-> New expr.percent(expr_mul/*B3*//*B*/.expr, expr2.expr)}
+expr_add~nopar~nobra {-> expr}
+ = expr_mul~nopar~nobra {-> expr_mul~nopar~nobra.expr}
+ | {plus} expr_add~nopar~nobra plus no [expr2]:expr_mul~nopar~nobra {-> New expr.plus(expr_add~nopar~nobra.expr, expr2.expr)}
+ | {minus} expr_add~nopar~nobra minus no [expr2]:expr_mul~nopar~nobra {-> New expr.minus(expr_add~nopar~nobra.expr, expr2.expr)}
;
-expr_minus/*B3*//*B*/ {-> expr}
- = expr_new/*B3*//*B*/ {-> expr_new/*B3*//*B*/.expr}
- | {minus} minus no expr_minus/*B3*//*B*/ {-> New expr.uminus(minus, expr_minus/*B3*//*B*/.expr)}
- | {once} kwonce no expr_minus/*B3*//*B*/ {-> New expr.once(kwonce, expr_minus/*B3*//*B*/.expr)}
+expr_mul~nopar~nobra {-> expr}
+ = expr_minus~nopar~nobra {-> expr_minus~nopar~nobra.expr}
+ | {star} expr_mul~nopar~nobra star no [expr2]:expr_minus~nopar~nobra {-> New expr.star(expr_mul~nopar~nobra.expr, expr2.expr)}
+ | {slash} expr_mul~nopar~nobra slash no [expr2]:expr_minus~nopar~nobra {-> New expr.slash(expr_mul~nopar~nobra.expr, expr2.expr)}
+ | {percent} expr_mul~nopar~nobra percent no [expr2]:expr_minus~nopar~nobra {-> New expr.percent(expr_mul~nopar~nobra.expr, expr2.expr)}
;
-expr_new/*B3*//*B*/ {-> expr}
- = expr_atom/*B3*//*B*/ {-> expr_atom/*B3*//*B*/.expr}
- | {new} kwnew no type/*B3*//*B*/ args {-> New expr.new(kwnew, type/*B3*//*B*/.type, Null, [args.expr])}
+expr_minus~nopar~nobra {-> expr}
+ = expr_new~nopar~nobra {-> expr_new~nopar~nobra.expr}
+ | {minus} minus no expr_minus~nopar~nobra {-> New expr.uminus(minus, expr_minus~nopar~nobra.expr)}
+ | {once} kwonce no expr_minus~nopar~nobra {-> New expr.once(kwonce, expr_minus~nopar~nobra.expr)}
;
-expr_atom/*B3*//*B*/ {-> expr}
- = {attr} recv/*B3*//*B*/ attrid {-> New expr.attr(recv/*B3*//*B*/.expr, attrid)}
- | {call} recv/*B3*//*B*/ id args {-> New expr.call(recv/*B3*//*B*/.expr, id, [args.expr])}
+expr_new~nopar~nobra {-> expr}
+ = expr_atom~nopar~nobra {-> expr_atom~nopar~nobra.expr}
+ | {new} kwnew no type~nobra args {-> New expr.new(kwnew, type~nobra.type, Null, [args.expr])}
+ | {isset_attr} kwisset recv~nopar~nobra 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.expr], [])}
| {super} qualified? kwsuper args {-> New expr.super(qualified, kwsuper, [args.expr])}
- | {init} recv/*B3*//*B*/ kwinit args {-> New expr.init(recv/*B3*//*B*/.expr, kwinit, [args.expr])}
-/*N*//*N3*/ | {bra} expr_atom braargs {-> New expr.bra(expr_atom.expr, [braargs.expr])}
- | {new} kwnew no type/*B3*//*B*/ dot [n2]:no id args {-> New expr.new(kwnew, type/*B3*//*B*/.type, id, [args.expr])}
-/*N*//*N3*/ | {range} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no cbra {-> New expr.crange(expr, expr2.expr)}
-/*N*//*N3*/ | {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra {-> New expr.orange(expr, expr2.expr)}
-/*N*//*N3*/ | {array} braargs {-> New expr.array([braargs.expr])}
+ | {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, [args.expr])}
+!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, [braargs.expr], [])}
+ | {new} kwnew no type~nobra dot [n2]:no id args {-> New expr.new(kwnew, type~nobra.type, id, [args.expr])}
+// FIXME: Why are these 3 !nopar mandatory?
+!nobra!nopar | {range} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no cbra {-> New expr.crange(expr, expr2.expr)}
+!nobra!nopar | {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra {-> New expr.orange(expr, expr2.expr)}
+!nobra!nopar | {array} braargs {-> New expr.array([braargs.expr])}
| {self} kwself {-> New expr.self(kwself)}
| {true} kwtrue {-> New expr.true(kwtrue)}
| {false} kwfalse {-> New expr.false(kwfalse)}
| {char} char {-> New expr.char(char)}
| {string} string {-> New expr.string(string)}
| {superstring} superstring {-> superstring.expr}
-/*N3*/ | {par} opar expr cpar {-> expr}
- | {as_cast} expr_atom/*B3*//*B*/ dot no kwas [n2]:no opar [n3]:no type [n4]:no cpar {-> New expr.as_cast(expr_atom/*B3*//*B*/.expr, kwas, type)}
+!nopar | {par} opar expr cpar {-> 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, type)}
+ | {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, kwnot, kwnull)}
;
superstring {-> expr}
/* MISC **********************************************************************/
-recv/*B3*//*B*/ {-> expr}
- = expr_atom/*B3*//*B*/ dot no {-> expr_atom/*B3*//*B*/.expr}
+recv~nopar~nobra {-> expr}
+ = expr_atom~nopar~nobra dot no {-> expr_atom~nopar~nobra.expr}
| {implicit} {-> New expr.implicit_self()}
;
= obra no expr [n2]:no args_tail* cbra {-> [expr, args_tail.expr]};
args_tail {-> expr}
= comma no expr [n2]:no {-> expr};
+idlist {-> id*}
+ = opar idlist_nopar cpar {-> [idlist_nopar.id]}
+ | {nopar} idlist_nopar {-> [idlist_nopar.id]}
+ ;
+idlist_nopar {-> id*}
+ = {single} id {-> [id]}
+ | {more} idlist_nopar no comma [n2]:no id {-> [idlist_nopar.id, id]}
+ ;
qualified
= {cla} modquad* classquad {-> New qualified([modquad.id], classquad.classid)}
| {b} eol+
;
-/* EXPR NO BRACKETS **********************************************************/
-/* since there is no shift/reduce conflict handling in sablecc, the following
- * is a duplication of previous productions minus some alternative where '['
- * are not protected. */
-
-/*I*/
-/*I2*/
-/*I3*/
-
/*****************************************************************************/
Abstract Syntax Tree
/*****************************************************************************/
packagedecl
= doc? kwpackage id;
-import = visibility kwimport id
+import = {std} visibility kwimport id
| {no} visibility kwimport kwend
;
| {intrude} kwintrude
;
-classdef = doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* [superclasses]:superclass* [propdefs]:propdef*
+classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* [superclasses]:superclass* [propdefs]:propdef*
| {top} [propdefs]:propdef*
| {main} [propdefs]:propdef*
;
| {universal} kwuniversal
;
formaldef = [id]:classid type?;
-superclass = kwspecial type;
+superclass = kwspecial? kwsuper? type;
-propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwattr [id]:attrid type? expr?
+propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwvar [id]:attrid? [id2]:id? type? expr?
| {meth} doc? kwredef? visibility methid signature
| {deferred_meth} doc? kwredef? visibility kwmeth methid signature
| {intern_meth} doc? kwredef? visibility kwmeth methid signature
;
able = {read} kwredef? kwreadable
- | {write} kwredef? kwwritable
+ | {write} kwredef? visibility? kwwritable
;
-methid = {id} id | {plus} plus | {minus} minus | {star} star | {slash} slash | {percent} percent | {eq} eq | {ne} ne | {le} le | {ge} ge | {lt} lt | {gt} gt | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign;
+methid = {id} id | {plus} plus | {minus} minus | {star} star | {slash} slash | {percent} percent | {eq} eq | {ne} ne | {le} le | {ge} ge | {lt} lt | {gt} gt | {ll} ll | {gg} gg | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign;
+
+signature = [params]:param* type? [closure_decls]:closure_decl*;
-signature = [params]:param* type?;
+param = id type? dotdotdot?
+ ;
-param = id type? dotdotdot?
+closure_decl = kwbreak? bang id signature expr?
;
-type = [id]:classid [types]:type*;
+type = kwnullable? [id]:classid [types]:type*;
+
+label = kwlabel id;
expr = {block} expr*
| {vardecl} kwvar id type? assign? expr?
- | {return} kwreturn expr?
- | {break} kwbreak
+ | {return} kwreturn? expr?
+ | {break} kwbreak label? expr?
| {abort} kwabort
- | {continue} kwcontinue
- | {do} kwdo [block]:expr?
+ | {continue} kwcontinue? label? expr?
+ | {do} kwdo [block]:expr? label?
| {if} kwif expr [then]:expr? [else]:expr?
| {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
- | {while} kwwhile expr kwdo [block]:expr?
- | {for} [vardecl]:expr kwdo [block]:expr?
- | {for_vardecl} kwfor id expr
- | {assert} kwassert id? expr
+ | {while} kwwhile expr kwdo [block]:expr? label?
+ | {loop} kwloop [block]:expr? label?
+ | {for} kwfor id expr kwdo [block]:expr? label?
+ | {assert} kwassert id? expr [else]:expr?
| {once} kwonce expr
| {send} expr
| {binop} expr [expr2]:expr
| {or} expr [expr2]:expr
| {and} expr [expr2]:expr
+ | {or_else} expr [expr2]:expr
| {not} kwnot expr
| {eq} expr [expr2]:expr
| {ee} expr [expr2]:expr
| {ne} expr [expr2]:expr
| {lt} expr [expr2]:expr
| {le} expr [expr2]:expr
+ | {ll} expr [expr2]:expr
| {gt} expr [expr2]:expr
| {ge} expr [expr2]:expr
+ | {gg} expr [expr2]:expr
| {isa} expr type
| {plus} expr [expr2]:expr
| {minus} expr [expr2]:expr
| {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]:expr*
+ | {call} expr id [args]:expr* [closure_defs]:closure_def*
| {call_assign} expr id [args]:expr* assign [value]:expr
| {call_reassign} expr id [args]:expr* assign_op [value]:expr
| {super} qualified? kwsuper [args]:expr*
| {init} expr kwinit [args]:expr*
- | {bra} expr [args]:expr*
+ | {bra} expr [args]:expr* [closure_defs]:closure_def*
| {bra_assign} expr [args]:expr* assign [value]:expr
| {bra_reassign} expr [args]:expr* assign_op [value]:expr
+ | {closure_call} id [args]:expr* [closure_defs]:closure_def*
| {var} id
| {var_assign} id assign [value]:expr
| {var_reassign} id assign_op [value]:expr
| {superstring} [exprs]:expr*
| {par} expr
| {as_cast} expr kwas type
+ | {as_notnull} expr kwas kwnot kwnull
+ | {isset_attr} kwisset expr [id]:attrid
;
assign_op
= {plus} pluseq
| {minus} minuseq
;
+closure_def
+ = bang [id]:closure_id [ids]:id* kwdo? expr? label?
+ ;
+closure_id
+ = {simple} id
+ | {break} kwbreak
+ ;
+
qualified = id* classid? ;
doc = comment+;
nitlanguage / nit.git / blobdiff