X-Git-Url: http://nitlanguage.org

diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 3c0f81c..7ac93d4 100644
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -41,15 +41,15 @@ redef class TComment
     end
 end
 
-redef class TKwpackage
+redef class TKwmodule
     redef fun parser_index: Int
     do
 	return 2
     end
 
-    init init_tk(loc: Location)
+    init init_tk(text: String, loc: Location)
     do
-        _text = once "package"
+        _text = text
 		_location = loc
     end
 end
@@ -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
@@ -1372,7 +1372,8 @@ special TablesCapable
 						return new TComment.init_tk(token_text, location)
 					end
 					if accept_token == 3 then
-						return new TKwpackage.init_tk(location)
+						var token_text = text.substring(0, accept_length)
+						return new TKwmodule.init_tk(token_text, location)
 					end
 					if accept_token == 4 then
 						return new TKwimport.init_tk(location)
@@ -1387,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)