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

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index 77d4242..bbf34da 100644
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -160,6 +160,12 @@ end
 class TKwdebug
 	super Token
 end
+class TKwyield
+	super Token
+end
+class TKwcatch
+	super Token
+end
 class TOpar
 	super Token
 end
@@ -301,16 +307,7 @@ end
 class TAttrid
 	super Token
 end
-class TNumber
-	super Token
-end
-class THexNumber
-	super Token
-end
-class TBinNumber
-	super Token
-end
-class TOctNumber
+class TInteger
 	super Token
 end
 class TFloat
@@ -362,6 +359,8 @@ class AClasskind super Prod end
 class AFormaldef super Prod end
 class APropdef super Prod end
 class AMethid super Prod end
+class AQid super Prod end
+class AQclassid super Prod end
 class ASignature super Prod end
 class AParam super Prod end
 class AType super Prod end
@@ -369,6 +368,7 @@ class ALabel super Prod end
 class AExpr super Prod end
 class AExprs super Prod end
 class AAssignOp super Prod end
+class AForGroup super Prod end
 class AModuleName super Prod end
 class AExternCalls super Prod end
 class AExternCall super Prod end
@@ -431,7 +431,7 @@ class AStdClassdef
 	var n_kwredef: nullable TKwredef = null is writable
 	var n_visibility: AVisibility is writable, noinit
 	var n_classkind: AClasskind is writable, noinit
-	var n_id: nullable TClassid = null is writable
+	var n_qid: nullable AQclassid = null is writable
 	var n_obra: nullable TObra = null is writable
 	var n_formaldefs: List[AFormaldef] = new List[AFormaldef]
 	var n_cbra: nullable TCbra = null is writable
@@ -501,7 +501,7 @@ class ATypePropdef
 	var n_kwredef: nullable TKwredef = null is writable
 	var n_visibility: AVisibility is writable, noinit
 	var n_kwtype: TKwtype is writable, noinit
-	var n_id: TClassid is writable, noinit
+	var n_qid: AQclassid is writable, noinit
 	var n_type: AType is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
 end
@@ -638,6 +638,16 @@ class ABraassignMethid
 	var n_cbra: TCbra is writable, noinit
 	var n_assign: TAssign is writable, noinit
 end
+class AQid
+	super AQid
+	var n_qualified: nullable AQualified = null is writable
+	var n_id: TId is writable, noinit
+end
+class AQclassid
+	super AQclassid
+	var n_qualified: nullable AQualified = null is writable
+	var n_id: TClassid is writable, noinit
+end
 class ASignature
 	super ASignature
 	var n_opar: nullable TOpar = null is writable
@@ -655,7 +665,7 @@ end
 class AType
 	super AType
 	var n_kwnullable: nullable TKwnullable = null is writable
-	var n_id: TClassid is writable, noinit
+	var n_qid: AQclassid is writable, noinit
 	var n_obra: nullable TObra = null is writable
 	var n_types: List[AType] = new List[AType]
 	var n_cbra: nullable TCbra = null is writable
@@ -685,6 +695,11 @@ class AReturnExpr
 	var n_kwreturn: nullable TKwreturn = null is writable
 	var n_expr: nullable AExpr = null is writable
 end
+class AYieldExpr
+	super AExpr
+	var n_kwyield: TKwyield is writable, noinit
+	var n_expr: AExpr is writable, noinit
+end
 class ABreakExpr
 	super AExpr
 	var n_kwbreak: TKwbreak is writable, noinit
@@ -703,6 +718,8 @@ class ADoExpr
 	super AExpr
 	var n_kwdo: TKwdo is writable, noinit
 	var n_block: nullable AExpr = null is writable
+	var n_kwcatch: nullable TKwcatch = null is writable
+	var n_catch: nullable AExpr = null is writable
 	var n_label: nullable ALabel = null is writable
 end
 class AIfExpr
@@ -740,9 +757,7 @@ end
 class AForExpr
 	super AExpr
 	var n_kwfor: TKwfor is writable, noinit
-	var n_ids: List[TId] = new List[TId]
-	var n_kwin: TKwin is writable, noinit
-	var n_expr: AExpr is writable, noinit
+	var n_groups: List[AForGroup] = new List[AForGroup]
 	var n_kwdo: TKwdo is writable, noinit
 	var n_block: nullable AExpr = null is writable
 	var n_label: nullable ALabel = null is writable
@@ -940,7 +955,7 @@ class ANewExpr
 	super AExpr
 	var n_kwnew: TKwnew is writable, noinit
 	var n_type: AType is writable, noinit
-	var n_id: nullable TId = null is writable
+	var n_qid: nullable AQid = null is writable
 	var n_args: AExprs is writable, noinit
 end
 class AAttrExpr
@@ -965,13 +980,13 @@ end
 class ACallExpr
 	super AExpr
 	var n_expr: AExpr is writable, noinit
-	var n_id: TId is writable, noinit
+	var n_qid: AQid is writable, noinit
 	var n_args: AExprs is writable, noinit
 end
 class ACallAssignExpr
 	super AExpr
 	var n_expr: AExpr is writable, noinit
-	var n_id: TId is writable, noinit
+	var n_qid: AQid is writable, noinit
 	var n_args: AExprs is writable, noinit
 	var n_assign: TAssign is writable, noinit
 	var n_value: AExpr is writable, noinit
@@ -979,7 +994,7 @@ end
 class ACallReassignExpr
 	super AExpr
 	var n_expr: AExpr is writable, noinit
-	var n_id: TId is writable, noinit
+	var n_qid: AQid is writable, noinit
 	var n_args: AExprs is writable, noinit
 	var n_assign_op: AAssignOp is writable, noinit
 	var n_value: AExpr is writable, noinit
@@ -1086,24 +1101,9 @@ class ANullExpr
 	var n_kwnull: TKwnull is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
 end
-class ADecIntExpr
-	super AExpr
-	var n_number: TNumber is writable, noinit
-	var n_annotations: nullable AAnnotations = null is writable
-end
-class AHexIntExpr
+class AIntegerExpr
 	super AExpr
-	var n_hex_number: THexNumber is writable, noinit
-	var n_annotations: nullable AAnnotations = null is writable
-end
-class ABinIntExpr
-	super AExpr
-	var n_bin_number: TBinNumber is writable, noinit
-	var n_annotations: nullable AAnnotations = null is writable
-end
-class AOctIntExpr
-	super AExpr
-	var n_oct_number: TOctNumber is writable, noinit
+	var n_integer: TInteger is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
 end
 class AFloatExpr
@@ -1263,6 +1263,12 @@ class AGgAssignOp
 	super AAssignOp
 	var n_op: TGgeq is writable, noinit
 end
+class AForGroup
+	super AForGroup
+	var n_ids: List[TId] = new List[TId]
+	var n_kwin: TKwin is writable, noinit
+	var n_expr: AExpr is writable, noinit
+end
 class AModuleName
 	super AModuleName
 	var n_quad: nullable TQuad = null is writable