X-Git-Url: http://nitlanguage.org?ds=inline

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index a37dc71..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
@@ -425,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
@@ -495,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
@@ -659,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
@@ -689,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
@@ -707,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