Merge branch 'll-and-gg-operators' into wip

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

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index b0faf45..b5975c4 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -45,7 +45,7 @@ end
 class TComment
 special Token
 end
-class TKwpackage
+class TKwmodule
 special Token
 end
 class TKwimport
@@ -258,12 +258,18 @@ end
 class TLe
 special Token
 end
+class TLl
+special Token
+end
 class TGt
 special Token
 end
 class TGe
 special Token
 end
+class TGg
+special Token
+end
 class TStarship
 special Token
 end
@@ -311,14 +317,14 @@ end
 
 class AModule
 special Prod
-    readable var _n_packagedecl: nullable APackagedecl = null
+    readable var _n_moduledecl: nullable AModuledecl = null
     readable var _n_imports: List[AImport] = new List[AImport]
     readable var _n_classdefs: List[AClassdef] = new List[AClassdef]
 end
-class APackagedecl
+class AModuledecl
 special Prod
     readable var _n_doc: nullable ADoc = null
-    readable var _n_kwpackage: TKwpackage
+    readable var _n_kwmodule: TKwmodule
     readable var _n_id: TId
 end
 class AImport special Prod end
@@ -407,7 +413,8 @@ special APropdef
     readable var _n_kwredef: nullable TKwredef = null
     readable var _n_visibility: AVisibility
     readable var _n_kwvar: TKwvar
-    readable var _n_id: TAttrid
+    readable var _n_id: nullable TAttrid
+    readable var _n_id2: nullable TId
     readable var _n_type: nullable AType = null
     readable var _n_readable: nullable AAble = null
     readable var _n_writable: nullable AAble = null
@@ -454,6 +461,7 @@ special APropdef
     readable var _n_type: AType
 end
 class AAble special Prod
+    readable var _n_visibility: nullable AVisibility = null
     readable var _n_kwredef: nullable TKwredef = null
 end
 class AReadAble
@@ -513,6 +521,14 @@ class AGtMethid
 special AMethid
     readable var _n_gt: TGt
 end
+class ALlMethid
+special AMethid
+    readable writable var _n_ll: TLl
+end
+class AGgMethid
+special AMethid
+    readable writable var _n_gg: TGg
+end
 class ABraMethid
 special AMethid
     readable var _n_obra: TObra
@@ -717,12 +733,18 @@ end
 class ALeExpr
 special ABinopExpr
 end
+class ALlExpr
+special ABinopExpr
+end
 class AGtExpr
 special ABinopExpr
 end
 class AGeExpr
 special ABinopExpr
 end
+class AGgExpr
+special ABinopExpr
+end
 class AIsaExpr
 special ABoolExpr
     readable var _n_expr: AExpr