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

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index 4379bee..4f7dc47 100644
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -289,6 +289,9 @@ end
 class TAt
 	super Token
 end
+class TSemi
+	super Token
+end
 class TClassid
 	super Token
 end
@@ -298,10 +301,7 @@ end
 class TAttrid
 	super Token
 end
-class TNumber
-	super Token
-end
-class THexNumber
+class TInteger
 	super Token
 end
 class TFloat
@@ -353,6 +353,7 @@ 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 ASignature super Prod end
 class AParam super Prod end
 class AType super Prod end
@@ -423,7 +424,9 @@ class AStdClassdef
 	var n_visibility: AVisibility is writable, noinit
 	var n_classkind: AClasskind is writable, noinit
 	var n_id: nullable TClassid = 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
 	var n_extern_code_block: nullable AExternCodeBlock = null is writable
 	var n_propdefs: List[APropdef] = new List[APropdef]
 	var n_kwend: TKwend is writable, noinit
@@ -472,9 +475,12 @@ class AAttrPropdef
 	var n_kwvar: TKwvar is writable, noinit
 	var n_id2: TId is writable, noinit
 	var n_type: nullable AType = null is writable
+	var n_assign: nullable TAssign = null is writable
 	var n_expr: nullable AExpr = null is writable
 	var n_annotations: nullable AAnnotations = null is writable
+	var n_kwdo: nullable TKwdo = null is writable
 	var n_block: nullable AExpr = null is writable
+	var n_kwend: nullable TKwend = null is writable
 end
 class AMainMethPropdef
 	super APropdef
@@ -504,7 +510,9 @@ class AMethPropdef
 	var n_annotations: nullable AAnnotations = null is writable
 	var n_extern_calls: nullable AExternCalls = null is writable
 	var n_extern_code_block: nullable AExternCodeBlock = null is writable
+	var n_kwdo: nullable TKwdo = null is writable
 	var n_block: nullable AExpr = null is writable
+	var n_kwend: nullable TKwend = null is writable
 end
 class ASuperPropdef
 	super APropdef
@@ -622,6 +630,11 @@ 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 ASignature
 	super ASignature
 	var n_opar: nullable TOpar = null is writable
@@ -640,7 +653,9 @@ class AType
 	super AType
 	var n_kwnullable: nullable TKwnullable = null is writable
 	var n_id: TClassid 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
 	var n_annotations: nullable AAnnotations = null is writable
 end
 class ALabel
@@ -691,7 +706,9 @@ class AIfExpr
 	super AExpr
 	var n_kwif: TKwif is writable, noinit
 	var n_expr: AExpr is writable, noinit
+	var n_kwthen: TKwthen is writable, noinit
 	var n_then: nullable AExpr = null is writable
+	var n_kwelse: nullable TKwelse = null is writable
 	var n_else: nullable AExpr = null is writable
 end
 class AIfexprExpr
@@ -721,6 +738,7 @@ 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_kwdo: TKwdo is writable, noinit
 	var n_block: nullable AExpr = null is writable
@@ -739,6 +757,7 @@ class AAssertExpr
 	var n_kwassert: TKwassert is writable, noinit
 	var n_id: nullable TId = null is writable
 	var n_expr: AExpr is writable, noinit
+	var n_kwelse: nullable TKwelse = null is writable
 	var n_else: nullable AExpr = null is writable
 end
 class AOnceExpr
@@ -918,7 +937,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
@@ -943,13 +962,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
@@ -957,7 +976,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
@@ -1019,6 +1038,7 @@ class ACrangeExpr
 	super AExpr
 	var n_obra: TObra is writable, noinit
 	var n_expr: AExpr is writable, noinit
+	var n_dotdot: TDotdot is writable, noinit
 	var n_expr2: AExpr is writable, noinit
 	var n_cbra: TCbra is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
@@ -1027,6 +1047,7 @@ class AOrangeExpr
 	super AExpr
 	var n_obra: TObra is writable, noinit
 	var n_expr: AExpr is writable, noinit
+	var n_dotdot: TDotdot is writable, noinit
 	var n_expr2: AExpr is writable, noinit
 	var n_cbra: TObra is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
@@ -1062,14 +1083,9 @@ class ANullExpr
 	var n_kwnull: TKwnull is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
 end
-class ADecIntExpr
+class AIntegerExpr
 	super AExpr
-	var n_number: TNumber is writable, noinit
-	var n_annotations: nullable AAnnotations = null is writable
-end
-class AHexIntExpr
-	super AExpr
-	var n_hex_number: THexNumber is writable, noinit
+	var n_integer: TInteger is writable, noinit
 	var n_annotations: nullable AAnnotations = null is writable
 end
 class AFloatExpr
@@ -1302,10 +1318,12 @@ class ADoc
 end
 class AAnnotations
 	super AAnnotations
+	var n_kwis: nullable TKwis = null is writable
 	var n_at: nullable TAt = null is writable
 	var n_opar: nullable TOpar = null is writable
 	var n_items: List[AAnnotation] = new List[AAnnotation]
 	var n_cpar: nullable TCpar = null is writable
+	var n_kwend: nullable TKwend = null is writable
 end
 class AAnnotation
 	super AAnnotation