From 21e38157917068fc920a057bc6c170be5dfe2bda Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Fri, 11 Feb 2011 16:07:30 -0500
Subject: [PATCH] parser: rename 'enum' to 'universal'

In fact, both are synonymous until 'universal' is completely removed.

Also rename some identifiers.

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/parser/lexer.nit        |    9 +-
 src/parser/nit.sablecc3xx   |    6 +-
 src/parser/parser.nit       |    8 +-
 src/parser/parser_abs.nit   |    6 +-
 src/parser/parser_nodes.nit |    6 +-
 src/parser/parser_prod.nit  |   18 +-
 src/parser/tables_nit.c     |  565 ++++++++++++++++++++++---------------------
 src/syntax/mmbuilder.nit    |    2 +-
 8 files changed, 318 insertions(+), 302 deletions(-)

diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 1f50959..7ac93d4 100644
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -106,15 +106,15 @@ redef class TKwinterface
     end
 end
 
-redef class TKwuniversal
+redef class TKwenum
     redef fun parser_index: Int
     do
 	return 7
     end
 
-    init init_tk(loc: Location)
+    init init_tk(text: String, loc: Location)
     do
-        _text = once "universal"
+        _text = text
 		_location = loc
     end
 end
@@ -1388,7 +1388,8 @@ special TablesCapable
 						return new TKwinterface.init_tk(location)
 					end
 					if accept_token == 8 then
-						return new TKwuniversal.init_tk(location)
+						var token_text = text.substring(0, accept_length)
+						return new TKwenum.init_tk(token_text, location)
 					end
 					if accept_token == 9 then
 						return new TKwspecial.init_tk(location)
diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 9d17d23..88619c5 100644
--- 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';
@@ -192,7 +192,7 @@ classkind
 	= {concrete} kwclass
 	| {abstract} kwabstract kwclass
 	| {interface} kwinterface
-	| {universal} kwuniversal
+	| {enum} kwenum
 	;
 
 formaldefs {-> formaldef*}
@@ -605,7 +605,7 @@ classkind
 	= {concrete} kwclass
 	| {abstract} kwabstract kwclass
 	| {interface} kwinterface
-	| {universal} kwuniversal
+	| {enum} kwenum
 	;
 formaldef = [id]:classid type?;
 superclass = kwspecial? kwsuper? type;
diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index a789e90..ae6bf39 100644
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -2921,10 +2921,10 @@ special ReduceAction
 	do
 					var node_list: nullable Object = null
 					var nodearraylist1 = p.pop
-					var tkwuniversalnode2 = nodearraylist1
-					assert tkwuniversalnode2 isa nullable TKwuniversal
-					var pclasskindnode1: nullable AUniversalClasskind = new AUniversalClasskind.init_auniversalclasskind(
-						tkwuniversalnode2
+					var tkwenumnode2 = nodearraylist1
+					assert tkwenumnode2 isa nullable TKwenum
+					var pclasskindnode1: nullable AEnumClasskind = new AEnumClasskind.init_aenumclasskind(
+						tkwenumnode2
 					)
 					node_list = pclasskindnode1
 					p.push(p.go_to(_goto), node_list)
diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index e152ead..e11a37c 100644
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -44,7 +44,7 @@ end
 class TKwinterface
 special Token
 end
-class TKwuniversal
+class TKwenum
 special Token
 end
 class TKwspecial
@@ -393,9 +393,9 @@ class AInterfaceClasskind
 special AClasskind
     readable var _n_kwinterface: TKwinterface
 end
-class AUniversalClasskind
+class AEnumClasskind
 special AClasskind
-    readable var _n_kwuniversal: TKwuniversal
+    readable var _n_kwenum: TKwenum
 end
 class AFormaldef
 special AFormaldef
diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index b5975c4..7201f98 100644
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -60,7 +60,7 @@ end
 class TKwinterface
 special Token
 end
-class TKwuniversal
+class TKwenum
 special Token
 end
 class TKwspecial
@@ -390,9 +390,9 @@ class AInterfaceClasskind
 special AClasskind
     readable var _n_kwinterface: TKwinterface
 end
-class AUniversalClasskind
+class AEnumClasskind
 special AClasskind
-    readable var _n_kwuniversal: TKwuniversal
+    readable var _n_kwenum: TKwenum
 end
 class AFormaldef
 special Prod
diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit
index 4ec1345..847a005 100644
--- a/src/parser/parser_prod.nit
+++ b/src/parser/parser_prod.nit
@@ -779,25 +779,25 @@ redef class AInterfaceClasskind
         v.enter_visit(_n_kwinterface)
     end
 end
-redef class AUniversalClasskind
+redef class AEnumClasskind
     private init empty_init do end
 
-    init init_auniversalclasskind (
-            n_kwuniversal: nullable TKwuniversal
+    init init_aenumclasskind (
+            n_kwenum: nullable TKwenum
     )
     do
         empty_init
-        _n_kwuniversal = n_kwuniversal.as(not null)
-	n_kwuniversal.parent = self
+        _n_kwenum = n_kwenum.as(not null)
+	n_kwenum.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_kwuniversal == old_child then
+        if _n_kwenum == old_child then
             if new_child != null then
                 new_child.parent = self
-		assert new_child isa TKwuniversal
-                _n_kwuniversal = new_child
+		assert new_child isa TKwenum
+                _n_kwenum = new_child
 	    else
 		abort
             end
@@ -807,7 +807,7 @@ redef class AUniversalClasskind
 
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_kwuniversal)
+        v.enter_visit(_n_kwenum)
     end
 end
 redef class AFormaldef
diff --git a/src/parser/tables_nit.c b/src/parser/tables_nit.c
index 9db8780..d7c20a8 100644
--- a/src/parser/tables_nit.c
+++ b/src/parser/tables_nit.c
@@ -448,34 +448,36 @@ static const int lexer_goto_row86[] = {
 	116, 122, 77
 };
 static const int lexer_goto_row87[] = {
-	3,
+	5,
 	48, 99, -81,
 	100, 100, 136,
-	101, 122, 77
+	101, 116, 77,
+	117, 117, 137,
+	118, 122, 77
 };
 static const int lexer_goto_row88[] = {
 	4,
 	48, 95, -29,
 	97, 115, 77,
-	116, 116, 137,
+	116, 116, 138,
 	117, 122, 77
 };
 static const int lexer_goto_row89[] = {
 	3,
 	48, 107, -31,
-	108, 108, 138,
+	108, 108, 139,
 	109, 122, 77
 };
 static const int lexer_goto_row90[] = {
 	3,
 	48, 113, -30,
-	114, 114, 139,
+	114, 114, 140,
 	115, 122, 77
 };
 static const int lexer_goto_row91[] = {
 	3,
 	48, 109, -40,
-	110, 110, 140,
+	110, 110, 141,
 	111, 122, 77
 };
 static const int lexer_goto_row92[] = {
@@ -486,68 +488,68 @@ static const int lexer_goto_row93[] = {
 	4,
 	48, 95, -29,
 	97, 111, 77,
-	112, 112, 141,
+	112, 112, 142,
 	113, 122, 77
 };
 static const int lexer_goto_row94[] = {
 	6,
 	48, 95, -29,
 	97, 104, 77,
-	105, 105, 142,
+	105, 105, 143,
 	106, 115, 77,
-	116, 116, 143,
+	116, 116, 144,
 	117, 122, 77
 };
 static const int lexer_goto_row95[] = {
 	5,
 	48, 95, -29,
-	97, 97, 144,
+	97, 97, 145,
 	98, 114, 77,
-	115, 115, 145,
+	115, 115, 146,
 	116, 122, 77
 };
 static const int lexer_goto_row96[] = {
 	3,
 	48, 97, -29,
-	98, 98, 146,
+	98, 98, 147,
 	99, 122, 77
 };
 static const int lexer_goto_row97[] = {
 	3,
 	48, 110, -32,
-	111, 111, 147,
+	111, 111, 148,
 	112, 122, 77
 };
 static const int lexer_goto_row98[] = {
 	3,
 	48, 99, -81,
-	100, 100, 148,
+	100, 100, 149,
 	101, 122, 77
 };
 static const int lexer_goto_row99[] = {
 	4,
 	48, 95, -29,
 	97, 118, 77,
-	119, 119, 149,
+	119, 119, 150,
 	120, 122, 77
 };
 static const int lexer_goto_row100[] = {
 	3,
 	48, 115, -89,
-	116, 116, 150,
+	116, 116, 151,
 	117, 122, 77
 };
 static const int lexer_goto_row101[] = {
 	3,
 	48, 107, -31,
-	108, 108, 151,
+	108, 108, 152,
 	109, 122, 77
 };
 static const int lexer_goto_row102[] = {
 	4,
 	48, 95, -29,
 	97, 98, 77,
-	99, 99, 152,
+	99, 99, 153,
 	100, 122, 77
 };
 static const int lexer_goto_row103[] = {
@@ -557,86 +559,86 @@ static const int lexer_goto_row103[] = {
 static const int lexer_goto_row104[] = {
 	3,
 	48, 98, -103,
-	99, 99, 153,
+	99, 99, 154,
 	100, 122, 77
 };
 static const int lexer_goto_row105[] = {
 	5,
 	48, 104, -95,
-	105, 105, 154,
+	105, 105, 155,
 	106, 110, 77,
-	111, 111, 155,
+	111, 111, 156,
 	112, 122, 77
 };
 static const int lexer_goto_row106[] = {
 	7,
 	48, 95, -29,
-	97, 97, 156,
+	97, 97, 157,
 	98, 99, 77,
-	100, 100, 157,
+	100, 100, 158,
 	101, 115, 77,
-	116, 116, 158,
+	116, 116, 159,
 	117, 122, 77
 };
 static const int lexer_goto_row107[] = {
 	3,
 	48, 107, -31,
-	108, 108, 159,
+	108, 108, 160,
 	109, 122, 77
 };
 static const int lexer_goto_row108[] = {
 	3,
 	48, 100, -39,
-	101, 101, 160,
+	101, 101, 161,
 	102, 122, 77
 };
 static const int lexer_goto_row109[] = {
 	3,
 	48, 111, -94,
-	112, 112, 161,
+	112, 112, 162,
 	113, 122, 77
 };
 static const int lexer_goto_row110[] = {
 	3,
 	48, 100, -39,
-	101, 101, 162,
+	101, 101, 163,
 	102, 122, 77
 };
 static const int lexer_goto_row111[] = {
 	4,
 	48, 95, -29,
 	97, 116, 77,
-	117, 117, 163,
+	117, 117, 164,
 	118, 122, 77
 };
 static const int lexer_goto_row112[] = {
 	3,
 	48, 111, -94,
-	112, 112, 164,
+	112, 112, 165,
 	113, 122, 77
 };
 static const int lexer_goto_row113[] = {
 	3,
 	48, 104, -95,
-	105, 105, 165,
+	105, 105, 166,
 	106, 122, 77
 };
 static const int lexer_goto_row114[] = {
 	3,
 	48, 113, -30,
-	114, 114, 166,
+	114, 114, 167,
 	115, 122, 77
 };
 static const int lexer_goto_row115[] = {
 	3,
 	48, 104, -95,
-	105, 105, 167,
+	105, 105, 168,
 	106, 122, 77
 };
 static const int lexer_goto_row116[] = {
 	3,
 	48, 104, -95,
-	105, 105, 168,
+	105, 105, 169,
 	106, 122, 77
 };
 static const int lexer_goto_row117[] = {
@@ -645,9 +647,9 @@ static const int lexer_goto_row117[] = {
 };
 static const int lexer_goto_row119[] = {
 	3,
-	0, 9, 169,
-	11, 12, 169,
-	14, 255, 169
+	0, 9, 170,
+	11, 12, 170,
+	14, 255, 170
 };
 static const int lexer_goto_row121[] = {
 	1,
@@ -672,13 +674,13 @@ static const int lexer_goto_row128[] = {
 static const int lexer_goto_row129[] = {
 	3,
 	48, 113, -30,
-	114, 114, 170,
+	114, 114, 171,
 	115, 122, 77
 };
 static const int lexer_goto_row130[] = {
 	3,
 	48, 115, -89,
-	116, 116, 171,
+	116, 116, 172,
 	117, 122, 77
 };
 static const int lexer_goto_row131[] = {
@@ -688,31 +690,31 @@ static const int lexer_goto_row131[] = {
 static const int lexer_goto_row132[] = {
 	3,
 	48, 100, -39,
-	101, 101, 172,
+	101, 101, 173,
 	102, 122, 77
 };
 static const int lexer_goto_row133[] = {
 	3,
 	48, 95, -29,
-	97, 97, 173,
+	97, 97, 174,
 	98, 122, 77
 };
 static const int lexer_goto_row134[] = {
 	3,
 	48, 114, -82,
-	115, 115, 174,
+	115, 115, 175,
 	116, 122, 77
 };
 static const int lexer_goto_row135[] = {
 	3,
 	48, 115, -89,
-	116, 116, 175,
+	116, 116, 176,
 	117, 122, 77
 };
 static const int lexer_goto_row136[] = {
 	3,
 	48, 100, -39,
-	101, 101, 176,
+	101, 101, 177,
 	102, 122, 77
 };
 static const int lexer_goto_row137[] = {
@@ -720,729 +722,740 @@ static const int lexer_goto_row137[] = {
 	48, 122, -35
 };
 static const int lexer_goto_row138[] = {
+	4,
+	48, 95, -29,
+	97, 108, 77,
+	109, 109, 178,
+	110, 122, 77
+};
+static const int lexer_goto_row139[] = {
 	3,
 	48, 100, -39,
-	101, 101, 177,
+	101, 101, 179,
 	102, 122, 77
 };
-static const int lexer_goto_row139[] = {
+static const int lexer_goto_row140[] = {
 	3,
 	48, 114, -82,
-	115, 115, 178,
+	115, 115, 180,
 	116, 122, 77
 };
-static const int lexer_goto_row140[] = {
+static const int lexer_goto_row141[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row141[] = {
+static const int lexer_goto_row142[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row142[] = {
+static const int lexer_goto_row143[] = {
 	3,
 	48, 110, -32,
-	111, 111, 179,
+	111, 111, 181,
 	112, 122, 77
 };
-static const int lexer_goto_row143[] = {
+static const int lexer_goto_row144[] = {
 	3,
 	48, 115, -89,
-	116, 116, 180,
+	116, 116, 182,
 	117, 122, 77
 };
-static const int lexer_goto_row144[] = {
+static const int lexer_goto_row145[] = {
 	5,
 	48, 100, -39,
-	101, 101, 181,
+	101, 101, 183,
 	102, 113, 77,
-	114, 114, 182,
+	114, 114, 184,
 	115, 122, 77
 };
-static const int lexer_goto_row145[] = {
+static const int lexer_goto_row146[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row146[] = {
+static const int lexer_goto_row147[] = {
 	3,
 	48, 100, -39,
-	101, 101, 183,
+	101, 101, 185,
 	102, 122, 77
 };
-static const int lexer_goto_row147[] = {
+static const int lexer_goto_row148[] = {
 	3,
 	48, 100, -39,
-	101, 101, 184,
+	101, 101, 186,
 	102, 122, 77
 };
-static const int lexer_goto_row148[] = {
+static const int lexer_goto_row149[] = {
 	3,
 	48, 111, -94,
-	112, 112, 185,
+	112, 112, 187,
 	113, 122, 77
 };
-static const int lexer_goto_row149[] = {
+static const int lexer_goto_row150[] = {
 	3,
 	48, 116, -112,
-	117, 117, 186,
+	117, 117, 188,
 	118, 122, 77
 };
-static const int lexer_goto_row150[] = {
+static const int lexer_goto_row151[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row151[] = {
+static const int lexer_goto_row152[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row152[] = {
+static const int lexer_goto_row153[] = {
 	3,
 	48, 107, -31,
-	108, 108, 187,
+	108, 108, 189,
 	109, 122, 77
 };
-static const int lexer_goto_row153[] = {
+static const int lexer_goto_row154[] = {
 	3,
 	48, 100, -39,
-	101, 101, 188,
+	101, 101, 190,
 	102, 122, 77
 };
-static const int lexer_goto_row154[] = {
+static const int lexer_goto_row155[] = {
 	4,
 	48, 95, -29,
 	97, 106, 77,
-	107, 107, 189,
+	107, 107, 191,
 	108, 122, 77
 };
-static const int lexer_goto_row155[] = {
+static const int lexer_goto_row156[] = {
 	4,
 	48, 95, -29,
 	97, 117, 77,
-	118, 118, 190,
+	118, 118, 192,
 	119, 122, 77
 };
-static const int lexer_goto_row156[] = {
+static const int lexer_goto_row157[] = {
 	3,
 	48, 115, -89,
-	116, 116, 191,
+	116, 116, 193,
 	117, 122, 77
 };
-static const int lexer_goto_row157[] = {
+static const int lexer_goto_row158[] = {
 	3,
 	48, 99, -81,
-	100, 100, 192,
+	100, 100, 194,
 	101, 122, 77
 };
-static const int lexer_goto_row158[] = {
+static const int lexer_goto_row159[] = {
 	3,
 	48, 100, -39,
-	101, 101, 193,
+	101, 101, 195,
 	102, 122, 77
 };
-static const int lexer_goto_row159[] = {
+static const int lexer_goto_row160[] = {
 	3,
 	48, 116, -112,
-	117, 117, 194,
+	117, 117, 196,
 	118, 122, 77
 };
-static const int lexer_goto_row160[] = {
+static const int lexer_goto_row161[] = {
 	3,
 	48, 101, -36,
-	102, 102, 195,
+	102, 102, 197,
 	103, 122, 77
 };
-static const int lexer_goto_row161[] = {
+static const int lexer_goto_row162[] = {
 	3,
 	48, 98, -103,
-	99, 99, 196,
+	99, 99, 198,
 	100, 122, 77
 };
-static const int lexer_goto_row162[] = {
+static const int lexer_goto_row163[] = {
 	3,
 	48, 100, -39,
-	101, 101, 197,
+	101, 101, 199,
 	102, 122, 77
 };
-static const int lexer_goto_row163[] = {
+static const int lexer_goto_row164[] = {
 	3,
 	48, 109, -40,
-	110, 110, 198,
+	110, 110, 200,
 	111, 122, 77
 };
-static const int lexer_goto_row164[] = {
+static const int lexer_goto_row165[] = {
 	3,
 	48, 100, -39,
-	101, 101, 199,
+	101, 101, 201,
 	102, 122, 77
 };
-static const int lexer_goto_row165[] = {
+static const int lexer_goto_row166[] = {
 	3,
 	48, 100, -39,
-	101, 101, 200,
+	101, 101, 202,
 	102, 122, 77
 };
-static const int lexer_goto_row166[] = {
+static const int lexer_goto_row167[] = {
 	3,
-	48, 117, -156,
-	118, 118, 201,
+	48, 117, -157,
+	118, 118, 203,
 	119, 122, 77
 };
-static const int lexer_goto_row167[] = {
+static const int lexer_goto_row168[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row168[] = {
+static const int lexer_goto_row169[] = {
 	3,
 	48, 107, -31,
-	108, 108, 202,
+	108, 108, 204,
 	109, 122, 77
 };
-static const int lexer_goto_row169[] = {
+static const int lexer_goto_row170[] = {
 	3,
 	48, 115, -89,
-	116, 116, 203,
+	116, 116, 205,
 	117, 122, 77
 };
-static const int lexer_goto_row170[] = {
+static const int lexer_goto_row171[] = {
 	1,
 	0, 255, -48
 };
-static const int lexer_goto_row171[] = {
+static const int lexer_goto_row172[] = {
 	3,
 	48, 115, -89,
-	116, 116, 204,
+	116, 116, 206,
 	117, 122, 77
 };
-static const int lexer_goto_row172[] = {
+static const int lexer_goto_row173[] = {
 	3,
 	48, 113, -30,
-	114, 114, 205,
+	114, 114, 207,
 	115, 122, 77
 };
-static const int lexer_goto_row173[] = {
+static const int lexer_goto_row174[] = {
 	3,
 	48, 113, -30,
-	114, 114, 206,
+	114, 114, 208,
 	115, 122, 77
 };
-static const int lexer_goto_row174[] = {
+static const int lexer_goto_row175[] = {
 	3,
-	48, 106, -155,
-	107, 107, 207,
+	48, 106, -156,
+	107, 107, 209,
 	108, 122, 77
 };
-static const int lexer_goto_row175[] = {
+static const int lexer_goto_row176[] = {
 	3,
 	48, 114, -82,
-	115, 115, 208,
+	115, 115, 210,
 	116, 122, 77
 };
-static const int lexer_goto_row176[] = {
+static const int lexer_goto_row177[] = {
 	3,
 	48, 104, -95,
-	105, 105, 209,
+	105, 105, 211,
 	106, 122, 77
 };
-static const int lexer_goto_row177[] = {
+static const int lexer_goto_row178[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row178[] = {
+static const int lexer_goto_row179[] = {
+	1,
+	48, 122, -35
+};
+static const int lexer_goto_row180[] = {
 	3,
 	48, 113, -30,
-	114, 114, 210,
+	114, 114, 212,
 	115, 122, 77
 };
-static const int lexer_goto_row179[] = {
+static const int lexer_goto_row181[] = {
 	3,
 	48, 100, -39,
-	101, 101, 211,
+	101, 101, 213,
 	102, 122, 77
 };
-static const int lexer_goto_row180[] = {
+static const int lexer_goto_row182[] = {
 	3,
 	48, 113, -30,
-	114, 114, 212,
+	114, 114, 214,
 	115, 122, 77
 };
-static const int lexer_goto_row181[] = {
+static const int lexer_goto_row183[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row182[] = {
+static const int lexer_goto_row184[] = {
 	3,
 	48, 113, -30,
-	114, 114, 213,
+	114, 114, 215,
 	115, 122, 77
 };
-static const int lexer_goto_row183[] = {
+static const int lexer_goto_row185[] = {
 	3,
 	48, 116, -112,
-	117, 117, 214,
+	117, 117, 216,
 	118, 122, 77
 };
-static const int lexer_goto_row184[] = {
+static const int lexer_goto_row186[] = {
 	3,
 	48, 115, -89,
-	116, 116, 215,
+	116, 116, 217,
 	117, 122, 77
 };
-static const int lexer_goto_row185[] = {
+static const int lexer_goto_row187[] = {
 	3,
 	48, 107, -31,
-	108, 108, 216,
+	108, 108, 218,
 	109, 122, 77
 };
-static const int lexer_goto_row186[] = {
+static const int lexer_goto_row188[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row187[] = {
+static const int lexer_goto_row189[] = {
 	3,
 	48, 107, -31,
-	108, 108, 217,
+	108, 108, 219,
 	109, 122, 77
 };
-static const int lexer_goto_row188[] = {
+static const int lexer_goto_row190[] = {
 	3,
 	48, 95, -29,
-	97, 97, 218,
+	97, 97, 220,
 	98, 122, 77
 };
-static const int lexer_goto_row189[] = {
+static const int lexer_goto_row191[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row190[] = {
+static const int lexer_goto_row192[] = {
 	3,
 	48, 95, -29,
-	97, 97, 219,
+	97, 97, 221,
 	98, 122, 77
 };
-static const int lexer_goto_row191[] = {
+static const int lexer_goto_row193[] = {
 	3,
 	48, 95, -29,
-	97, 97, 220,
+	97, 97, 222,
 	98, 122, 77
 };
-static const int lexer_goto_row192[] = {
+static const int lexer_goto_row194[] = {
 	3,
 	48, 100, -39,
-	101, 101, 221,
+	101, 101, 223,
 	102, 122, 77
 };
-static const int lexer_goto_row193[] = {
+static const int lexer_goto_row195[] = {
 	3,
 	48, 95, -29,
-	97, 97, 222,
+	97, 97, 224,
 	98, 122, 77
 };
-static const int lexer_goto_row194[] = {
+static const int lexer_goto_row196[] = {
 	3,
 	48, 101, -36,
-	102, 102, 223,
+	102, 102, 225,
 	103, 122, 77
 };
-static const int lexer_goto_row195[] = {
+static const int lexer_goto_row197[] = {
 	3,
 	48, 113, -30,
-	114, 114, 224,
+	114, 114, 226,
 	115, 122, 77
 };
-static const int lexer_goto_row196[] = {
+static const int lexer_goto_row198[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row197[] = {
+static const int lexer_goto_row199[] = {
 	3,
 	48, 104, -95,
-	105, 105, 225,
+	105, 105, 227,
 	106, 122, 77
 };
-static const int lexer_goto_row198[] = {
+static const int lexer_goto_row200[] = {
 	3,
 	48, 113, -30,
-	114, 114, 226,
+	114, 114, 228,
 	115, 122, 77
 };
-static const int lexer_goto_row199[] = {
+static const int lexer_goto_row201[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row200[] = {
+static const int lexer_goto_row202[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row201[] = {
+static const int lexer_goto_row203[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row202[] = {
+static const int lexer_goto_row204[] = {
 	3,
 	48, 100, -39,
-	101, 101, 227,
+	101, 101, 229,
 	102, 122, 77
 };
-static const int lexer_goto_row203[] = {
+static const int lexer_goto_row205[] = {
 	3,
 	48, 100, -39,
-	101, 101, 228,
+	101, 101, 230,
 	102, 122, 77
 };
-static const int lexer_goto_row204[] = {
+static const int lexer_goto_row206[] = {
 	3,
 	48, 95, -29,
-	97, 97, 229,
+	97, 97, 231,
 	98, 122, 77
 };
-static const int lexer_goto_row205[] = {
+static const int lexer_goto_row207[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row206[] = {
+static const int lexer_goto_row208[] = {
 	3,
 	48, 95, -29,
-	97, 97, 230,
+	97, 97, 232,
 	98, 122, 77
 };
-static const int lexer_goto_row207[] = {
+static const int lexer_goto_row209[] = {
 	3,
 	48, 115, -89,
-	116, 116, 231,
+	116, 116, 233,
 	117, 122, 77
 };
-static const int lexer_goto_row208[] = {
+static const int lexer_goto_row210[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row209[] = {
+static const int lexer_goto_row211[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row210[] = {
+static const int lexer_goto_row212[] = {
 	3,
 	48, 109, -40,
-	110, 110, 232,
+	110, 110, 234,
 	111, 122, 77
 };
-static const int lexer_goto_row211[] = {
+static const int lexer_goto_row213[] = {
 	3,
 	48, 109, -40,
-	110, 110, 233,
+	110, 110, 235,
 	111, 122, 77
 };
-static const int lexer_goto_row212[] = {
+static const int lexer_goto_row214[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row213[] = {
+static const int lexer_goto_row215[] = {
 	3,
 	48, 115, -89,
-	116, 116, 234,
+	116, 116, 236,
 	117, 122, 77
 };
-static const int lexer_goto_row214[] = {
+static const int lexer_goto_row216[] = {
 	5,
 	48, 101, -36,
-	102, 102, 235,
+	102, 102, 237,
 	103, 109, 77,
-	110, 110, 236,
+	110, 110, 238,
 	111, 122, 77
 };
-static const int lexer_goto_row215[] = {
+static const int lexer_goto_row217[] = {
 	3,
 	48, 99, -81,
-	100, 100, 237,
+	100, 100, 239,
 	101, 122, 77
 };
-static const int lexer_goto_row216[] = {
+static const int lexer_goto_row218[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row217[] = {
+static const int lexer_goto_row219[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row218[] = {
+static const int lexer_goto_row220[] = {
 	3,
 	48, 100, -39,
-	101, 101, 238,
+	101, 101, 240,
 	102, 122, 77
 };
-static const int lexer_goto_row219[] = {
+static const int lexer_goto_row221[] = {
 	3,
 	48, 97, -29,
-	98, 98, 239,
+	98, 98, 241,
 	99, 122, 77
 };
-static const int lexer_goto_row220[] = {
+static const int lexer_goto_row222[] = {
 	4,
 	48, 95, -29,
 	97, 102, 77,
-	103, 103, 240,
+	103, 103, 242,
 	104, 122, 77
 };
-static const int lexer_goto_row221[] = {
+static const int lexer_goto_row223[] = {
 	3,
 	48, 115, -89,
-	116, 116, 241,
+	116, 116, 243,
 	117, 122, 77
 };
-static const int lexer_goto_row222[] = {
+static const int lexer_goto_row224[] = {
 	3,
 	48, 98, -103,
-	99, 99, 242,
+	99, 99, 244,
 	100, 122, 77
 };
-static const int lexer_goto_row223[] = {
+static const int lexer_goto_row225[] = {
 	3,
 	48, 97, -29,
-	98, 98, 243,
+	98, 98, 245,
 	99, 122, 77
 };
-static const int lexer_goto_row224[] = {
+static const int lexer_goto_row226[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row225[] = {
+static const int lexer_goto_row227[] = {
 	3,
 	48, 109, -40,
-	110, 110, 244,
+	110, 110, 246,
 	111, 122, 77
 };
-static const int lexer_goto_row226[] = {
+static const int lexer_goto_row228[] = {
 	3,
 	48, 95, -29,
-	97, 97, 245,
+	97, 97, 247,
 	98, 122, 77
 };
-static const int lexer_goto_row227[] = {
+static const int lexer_goto_row229[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row228[] = {
+static const int lexer_goto_row230[] = {
 	3,
 	48, 113, -30,
-	114, 114, 246,
+	114, 114, 248,
 	115, 122, 77
 };
-static const int lexer_goto_row229[] = {
+static const int lexer_goto_row231[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row230[] = {
+static const int lexer_goto_row232[] = {
 	3,
 	48, 97, -29,
-	98, 98, 247,
+	98, 98, 249,
 	99, 122, 77
 };
-static const int lexer_goto_row231[] = {
+static const int lexer_goto_row233[] = {
 	3,
 	48, 98, -103,
-	99, 99, 248,
+	99, 99, 250,
 	100, 122, 77
 };
-static const int lexer_goto_row232[] = {
+static const int lexer_goto_row234[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row233[] = {
+static const int lexer_goto_row235[] = {
 	3,
 	48, 116, -112,
-	117, 117, 249,
+	117, 117, 251,
 	118, 122, 77
 };
-static const int lexer_goto_row234[] = {
+static const int lexer_goto_row236[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row235[] = {
+static const int lexer_goto_row237[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row236[] = {
+static const int lexer_goto_row238[] = {
 	3,
 	48, 95, -29,
-	97, 97, 250,
+	97, 97, 252,
 	98, 122, 77
 };
-static const int lexer_goto_row237[] = {
+static const int lexer_goto_row239[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row238[] = {
+static const int lexer_goto_row240[] = {
 	3,
 	48, 100, -39,
-	101, 101, 251,
+	101, 101, 253,
 	102, 122, 77
 };
-static const int lexer_goto_row239[] = {
+static const int lexer_goto_row241[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row240[] = {
+static const int lexer_goto_row242[] = {
 	3,
 	48, 107, -31,
-	108, 108, 252,
+	108, 108, 254,
 	109, 122, 77
 };
-static const int lexer_goto_row241[] = {
+static const int lexer_goto_row243[] = {
 	3,
 	48, 100, -39,
-	101, 101, 253,
+	101, 101, 255,
 	102, 122, 77
 };
-static const int lexer_goto_row242[] = {
+static const int lexer_goto_row244[] = {
 	3,
 	48, 100, -39,
-	101, 101, 254,
+	101, 101, 256,
 	102, 122, 77
 };
-static const int lexer_goto_row243[] = {
+static const int lexer_goto_row245[] = {
 	3,
 	48, 115, -89,
-	116, 116, 255,
+	116, 116, 257,
 	117, 122, 77
 };
-static const int lexer_goto_row244[] = {
+static const int lexer_goto_row246[] = {
 	3,
 	48, 107, -31,
-	108, 108, 256,
+	108, 108, 258,
 	109, 122, 77
 };
-static const int lexer_goto_row245[] = {
+static const int lexer_goto_row247[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row246[] = {
+static const int lexer_goto_row248[] = {
 	3,
 	48, 107, -31,
-	108, 108, 257,
+	108, 108, 259,
 	109, 122, 77
 };
-static const int lexer_goto_row247[] = {
+static const int lexer_goto_row249[] = {
 	3,
 	48, 114, -82,
-	115, 115, 258,
+	115, 115, 260,
 	116, 122, 77
 };
-static const int lexer_goto_row248[] = {
+static const int lexer_goto_row250[] = {
 	3,
 	48, 107, -31,
-	108, 108, 259,
+	108, 108, 261,
 	109, 122, 77
 };
-static const int lexer_goto_row249[] = {
+static const int lexer_goto_row251[] = {
 	3,
 	48, 115, -89,
-	116, 116, 260,
+	116, 116, 262,
 	117, 122, 77
 };
-static const int lexer_goto_row250[] = {
+static const int lexer_goto_row252[] = {
 	3,
 	48, 100, -39,
-	101, 101, 261,
+	101, 101, 263,
 	102, 122, 77
 };
-static const int lexer_goto_row251[] = {
+static const int lexer_goto_row253[] = {
 	3,
 	48, 98, -103,
-	99, 99, 262,
+	99, 99, 264,
 	100, 122, 77
 };
-static const int lexer_goto_row252[] = {
+static const int lexer_goto_row254[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row253[] = {
+static const int lexer_goto_row255[] = {
 	3,
 	48, 100, -39,
-	101, 101, 263,
+	101, 101, 265,
 	102, 122, 77
 };
-static const int lexer_goto_row254[] = {
+static const int lexer_goto_row256[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row255[] = {
+static const int lexer_goto_row257[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row256[] = {
+static const int lexer_goto_row258[] = {
 	3,
 	48, 100, -39,
-	101, 101, 264,
+	101, 101, 266,
 	102, 122, 77
 };
-static const int lexer_goto_row257[] = {
+static const int lexer_goto_row259[] = {
 	3,
 	48, 100, -39,
-	101, 101, 265,
+	101, 101, 267,
 	102, 122, 77
 };
-static const int lexer_goto_row258[] = {
+static const int lexer_goto_row260[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row259[] = {
+static const int lexer_goto_row261[] = {
 	3,
 	48, 95, -29,
-	97, 97, 266,
+	97, 97, 268,
 	98, 122, 77
 };
-static const int lexer_goto_row260[] = {
+static const int lexer_goto_row262[] = {
 	3,
 	48, 100, -39,
-	101, 101, 267,
+	101, 101, 269,
 	102, 122, 77
 };
-static const int lexer_goto_row261[] = {
+static const int lexer_goto_row263[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row262[] = {
+static const int lexer_goto_row264[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row263[] = {
+static const int lexer_goto_row265[] = {
 	3,
 	48, 100, -39,
-	101, 101, 268,
+	101, 101, 270,
 	102, 122, 77
 };
-static const int lexer_goto_row264[] = {
+static const int lexer_goto_row266[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row265[] = {
+static const int lexer_goto_row267[] = {
 	3,
 	48, 99, -81,
-	100, 100, 269,
+	100, 100, 271,
 	101, 122, 77
 };
-static const int lexer_goto_row266[] = {
+static const int lexer_goto_row268[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row267[] = {
+static const int lexer_goto_row269[] = {
 	3,
 	48, 107, -31,
-	108, 108, 270,
+	108, 108, 272,
 	109, 122, 77
 };
-static const int lexer_goto_row268[] = {
+static const int lexer_goto_row270[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row269[] = {
+static const int lexer_goto_row271[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row270[] = {
+static const int lexer_goto_row272[] = {
 	1,
 	48, 122, -35
 };
-static const int lexer_goto_row271[] = {
+static const int lexer_goto_row273[] = {
 	1,
 	48, 122, -35
 };
@@ -1718,11 +1731,13 @@ const int* const lexer_goto_table[] = {
 	lexer_goto_row268,
 	lexer_goto_row269,
 	lexer_goto_row270,
-	lexer_goto_row271
+	lexer_goto_row271,
+	lexer_goto_row272,
+	lexer_goto_row273
 };
 
 const int lexer_accept_table[] = {
-	-1,0,1,1,0,79,-1,-1,69,-1,52,53,67,65,56,66,64,68,83,57,72,59,75,80,54,55,-1,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,-1,1,71,-1,86,-1,87,-1,2,2,-1,85,60,61,63,84,-1,58,74,73,70,76,77,80,80,80,80,82,81,81,81,81,81,81,48,81,81,81,16,81,81,81,81,81,81,25,81,31,15,81,81,81,81,81,81,81,33,81,81,81,81,81,81,81,81,81,81,81,81,81,-1,89,-1,88,-1,2,62,78,82,82,82,82,81,81,32,81,81,81,81,81,10,81,81,30,11,81,81,81,41,81,81,81,81,40,34,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,19,81,81,-1,81,81,81,81,81,81,27,81,81,81,13,81,81,81,81,29,81,47,42,81,81,81,81,81,81,44,81,81,26,45,12,81,81,81,38,81,81,37,5,81,81,46,81,81,81,50,51,81,81,81,81,81,81,14,81,81,43,81,28,81,81,39,81,21,4,81,20,81,3,81,81,81,81,81,35,81,81,81,81,81,81,24,81,3,23,81,81,9,81,81,6,36,81,49,81,17,81,18,7,22,8
+	-1,0,1,1,0,79,-1,-1,69,-1,52,53,67,65,56,66,64,68,83,57,72,59,75,80,54,55,-1,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,-1,1,71,-1,86,-1,87,-1,2,2,-1,85,60,61,63,84,-1,58,74,73,70,76,77,80,80,80,80,82,81,81,81,81,81,81,48,81,81,81,16,81,81,81,81,81,81,25,81,31,15,81,81,81,81,81,81,81,33,81,81,81,81,81,81,81,81,81,81,81,81,81,-1,89,-1,88,-1,2,62,78,82,82,82,82,81,81,32,81,81,81,81,81,10,81,81,81,30,11,81,81,81,41,81,81,81,81,40,34,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,19,81,81,-1,81,81,81,81,81,81,27,8,81,81,81,13,81,81,81,81,29,81,47,42,81,81,81,81,81,81,44,81,81,26,45,12,81,81,81,38,81,81,37,5,81,81,46,81,81,81,50,51,81,81,81,81,81,81,14,81,81,43,81,28,81,81,39,81,21,4,81,20,81,3,81,81,81,81,81,35,81,81,81,81,81,81,24,81,3,23,81,81,9,81,81,6,36,81,49,81,17,81,18,7,22,8
 };
 
 static int parser_action_row1[] = {
diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 983bc8f..720d49e 100644
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -576,7 +576,7 @@ end
 redef class AInterfaceClasskind
 	redef fun is_interface do return true
 end
-redef class AUniversalClasskind
+redef class AEnumClasskind
 	redef fun is_universal do return true
 end
 redef class AAbstractClasskind
-- 
1.7.9.5