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

diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index f624878..a789e90 100644
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -983,10 +983,10 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode4 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode4
 					)
@@ -1027,13 +1027,13 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode5 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode5
 					)
@@ -1074,13 +1074,13 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode5 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode4 = nodearraylist2
 					assert listnode4 isa Array[Object]
 					listnode5 = concat(listnode5, listnode4)
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode5
 					)
@@ -1126,8 +1126,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode6 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1135,7 +1135,7 @@ special ReduceAction
 					assert listnode5 isa Array[Object]
 					listnode6 = concat(listnode6, listnode5)
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode6
 					)
@@ -1183,8 +1183,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode7 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode6 = new Array[Object]
 					var listnode5 = nodearraylist2
 					assert listnode5 isa Array[Object]
@@ -1196,7 +1196,7 @@ special ReduceAction
 						listnode7.add(pclassdefnode4)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode7
 					)
@@ -1249,8 +1249,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode8 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1265,7 +1265,7 @@ special ReduceAction
 						listnode8.add(pclassdefnode5)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode8
 					)
@@ -1318,8 +1318,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode8 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode4 = nodearraylist2
 					assert listnode4 isa Array[Object]
 					var listnode7 = new Array[Object]
@@ -1334,7 +1334,7 @@ special ReduceAction
 						listnode8.add(pclassdefnode5)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode8
 					)
@@ -1392,8 +1392,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode9 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1411,7 +1411,7 @@ special ReduceAction
 						listnode9.add(pclassdefnode6)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode9
 					)
@@ -1454,15 +1454,15 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode5 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var pclassdefnode4 = nodearraylist2
 					assert pclassdefnode4 isa nullable AClassdef
 					if pclassdefnode4 != null then
 						listnode5.add(pclassdefnode4)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode5
 					)
@@ -1510,8 +1510,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode6 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1521,7 +1521,7 @@ special ReduceAction
 						listnode6.add(pclassdefnode5)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode6
 					)
@@ -1569,8 +1569,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode6 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode4 = nodearraylist2
 					assert listnode4 isa Array[Object]
 					var pclassdefnode5 = nodearraylist3
@@ -1580,7 +1580,7 @@ special ReduceAction
 						listnode6.add(pclassdefnode5)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode6
 					)
@@ -1633,8 +1633,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode7 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1647,7 +1647,7 @@ special ReduceAction
 						listnode7.add(pclassdefnode6)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode7
 					)
@@ -1702,8 +1702,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode8 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode6 = new Array[Object]
 					var listnode5 = nodearraylist2
 					assert listnode5 isa Array[Object]
@@ -1720,7 +1720,7 @@ special ReduceAction
 						listnode8.add(pclassdefnode7)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode8
 					)
@@ -1780,8 +1780,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode9 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1801,7 +1801,7 @@ special ReduceAction
 						listnode9.add(pclassdefnode8)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode9
 					)
@@ -1861,8 +1861,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode3 = new Array[Object]
 					var listnode9 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode4 = nodearraylist2
 					assert listnode4 isa Array[Object]
 					var listnode7 = new Array[Object]
@@ -1882,7 +1882,7 @@ special ReduceAction
 						listnode9.add(pclassdefnode8)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode3,
 						listnode9
 					)
@@ -1947,8 +1947,8 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var listnode4 = new Array[Object]
 					var listnode10 = new Array[Object]
-					var ppackagedeclnode2 = nodearraylist1
-					assert ppackagedeclnode2 isa nullable APackagedecl
+					var pmoduledeclnode2 = nodearraylist1
+					assert pmoduledeclnode2 isa nullable AModuledecl
 					var listnode3 = nodearraylist2
 					assert listnode3 isa Array[Object]
 					listnode4 = concat(listnode4, listnode3)
@@ -1971,7 +1971,7 @@ special ReduceAction
 						listnode10.add(pclassdefnode9)
 					end
 					var pmodulenode1: nullable AModule = new AModule.init_amodule(
-						ppackagedeclnode2,
+						pmoduledeclnode2,
 						listnode4,
 						listnode10
 					)
@@ -1993,16 +1993,16 @@ special ReduceAction
 					var nodearraylist1 = p.pop
 					var pdocnode2 = nodearraylist1
 					assert pdocnode2 isa nullable ADoc
-					var tkwpackagenode3 = nodearraylist2
-					assert tkwpackagenode3 isa nullable TKwpackage
+					var tkwmodulenode3 = nodearraylist2
+					assert tkwmodulenode3 isa nullable TKwmodule
 					var tidnode4 = nodearraylist4
 					assert tidnode4 isa nullable TId
-					var ppackagedeclnode1: nullable APackagedecl = new APackagedecl.init_apackagedecl(
+					var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
 						pdocnode2,
-						tkwpackagenode3,
+						tkwmodulenode3,
 						tidnode4
 					)
-					node_list = ppackagedeclnode1
+					node_list = pmoduledeclnode1
 					p.push(p.go_to(_goto), node_list)
 	end
 	var _goto: Int