parser: add qualified module names

[nit.git] / src / parser / nit.sablecc3xx

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index cfb96ca..323e465 100644 (file)
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -62,7 +62,7 @@ kwimport = 'import';
 kwclass = 'class';
 kwabstract = 'abstract';
 kwinterface = 'interface';
-kwuniversal = 'universal';
+kwenum = 'universal'|'enum';
 kwspecial = 'special';
 kwend = 'end';
 kwmeth = 'fun';
@@ -164,11 +164,11 @@ module
        = moduledecl? [imports]:import* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(moduledecl, [imports.import],[classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])};
 
 moduledecl
-       = [doc]:no kwmodule no id [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, id)};
+       = [doc]:no kwmodule no module_name [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, module_name)};
 
 import
-       = {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)}
+       = {std} [doc]:no visibility kwimport no module_name [n2]:n1 {-> New import.std(visibility, kwimport, module_name)}
+       | {no} [doc]:no visibility kwimport no kwend [n2]:n1 {-> New import.no(visibility, kwimport, kwend)}
        ;
 
 implicit_top_class {-> classdef}
@@ -192,7 +192,7 @@ classkind
        = {concrete} kwclass
        | {abstract} kwabstract kwclass
        | {interface} kwinterface
-       | {universal} kwuniversal
+       | {enum} kwenum
        ;
 
 formaldefs {-> formaldef*}
@@ -409,8 +409,8 @@ while~withelse {-> 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)}
+       = kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso_withend label {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso_withend.expr, label)}
+       | {nolabel} kwfor no [ids]:idlist [n2]:no kwin [n3]:no expr [n4]:no kwdo stmtso~withelse {-> New expr.for(kwfor, [ids.id], expr, kwdo, stmtso~withelse.expr, Null)}
        ;
 
 assert~withelse {-> expr}
@@ -491,7 +491,7 @@ expr_atom~nopar~nobra {-> 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?
+// !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 {-> 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])}
@@ -553,6 +553,11 @@ idlist_nopar {-> id*}
        | {more} idlist_nopar no comma [n2]:no id {-> [idlist_nopar.id, id]}
        ;
 
+module_name {-> module_name}
+       = {mod} modquad* id {-> New module_name(Null, [modquad.id], id)}
+       | {root} quad no modquad* id {-> New module_name(quad, [modquad.id], id)}
+       ;
+
 qualified 
        = {cla} modquad* classquad {-> New qualified([modquad.id], classquad.classid)}
        | {mod} modquad+ {-> New qualified([modquad.id], Null)}
@@ -584,9 +589,9 @@ Abstract Syntax Tree
 module = moduledecl? [imports]:import* [classdefs]:classdef*;
 
 moduledecl
-       = doc? kwmodule id;
+       = doc? kwmodule [name]:module_name;
 
-import = {std} visibility kwimport id
+import = {std} visibility kwimport [name]:module_name
        | {no} visibility kwimport kwend
        ;
 
@@ -605,7 +610,7 @@ classkind
        = {concrete} kwclass
        | {abstract} kwabstract kwclass
        | {interface} kwinterface
-       | {universal} kwuniversal
+       | {enum} kwenum
        ;
 formaldef = [id]:classid type?;
 superclass = kwspecial? kwsuper? type;
@@ -651,7 +656,7 @@ expr        = {block} expr*
        | {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
        | {while} kwwhile expr kwdo [block]:expr? label?
        | {loop} kwloop [block]:expr? label?
-       | {for} kwfor id expr kwdo [block]:expr? label?
+       | {for} kwfor [ids]:id* expr kwdo [block]:expr? label?
        | {assert} kwassert id? expr [else]:expr?
        | {once} kwonce expr 
        | {send} expr 
@@ -728,6 +733,8 @@ closure_id
        | {break} kwbreak
        ;
 
+module_name = quad? [path]:id* id;
+
 qualified = id* classid? ;
 
 doc = comment+;