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

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index c0a9fd6..25dd773 100644
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -47,8 +47,8 @@ eol_helper = cr lf | cr | lf; // This takes care of different platforms
 
 // characers inside strings and super-strings (atomaton powaa)
 str_char
-	= [any - [['"' + '{'] + '\']] 
-	| '\' any 
+	= [any - [['"' + '{'] + '\']]
+	| '\' any
 	;
 str_body = str_char*;
 
@@ -159,6 +159,7 @@ kwlabel = 'label';
 kwwith = 'with';
 kwdebug = '__debug__';
 kwyield = 'yield';
+kwcatch = 'catch';
 
 opar = '(';
 cpar = ')';
@@ -360,7 +361,7 @@ signature {-> signature}
 	| {noparnoret} no {-> New signature(Null, [], Null, Null)}
 	;
 
-params {-> param*} 
+params {-> param*}
 	= param params_tail* [n2]:no {-> [param, params_tail.param] }
 	| {null} {-> []}
 	;
@@ -411,7 +412,7 @@ type~nobra~nopar {-> type}
 	= {simple} kwnullable? qclassid annotations_o~nopar {-> New type(kwnullable, qclassid, Null, [], Null, annotations_o~nopar.annotations)}
 !nobra	| {generic} kwnullable? qclassid obra no types [n2]:no cbra annotations_o~nopar {-> New type(kwnullable, qclassid, obra, [types.type], cbra, annotations_o~nopar.annotations)}
 	;
-types {-> type*} 
+types {-> type*}
 	= type types_tail* {-> [type, types_tail.type]};
 types_tail {-> type}
 	= comma no type {-> type};
@@ -488,8 +489,9 @@ assign_op
 	;
 
 do~withelse {-> expr}
-	= kwdo stmtso_withend label {-> New expr.do(kwdo, stmtso_withend.expr, label)}
-	| {nolabel} kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr, Null)}
+	= kwdo stmtso_withend label {-> New expr.do(kwdo, stmtso_withend.expr, Null, Null, label)}
+	| {nolabel} kwdo stmtso~withelse {-> New expr.do(kwdo, stmtso~withelse.expr, Null, Null, Null)}
+	| {with_catch} kwdo n stmtsn kwcatch stmtso_withend {-> New expr.do(kwdo, stmtsn.expr, kwcatch, stmtso_withend.expr, Null)}
 	;
 
 if~withelse {-> expr}
@@ -689,7 +691,7 @@ array_item {-> expr}
 	| {if} kwif [n1]:no expr [n2]:no kwthen [n3]:no [then]:array_item {-> New expr.if(kwif, expr, kwthen, then.expr, Null, Null)}
 	;
 
-superstring {-> expr} 
+superstring {-> expr}
 	= superstring_start superstring_middle* superstring_end annotations_o {-> New expr.superstring([superstring_start.expr, superstring_middle.expr, superstring_end.expr], annotations_o.annotations)};
 superstring_start {-> expr*}
 	= start_string_p no expr [n2]:no {-> [start_string_p.expr, expr]}
@@ -801,7 +803,7 @@ braargs	{-> exprs}
 	= obra no expr_list cbra {-> New exprs.bra(obra, [expr_list.expr], cbra)};
 expr_list {-> expr*}
 	= arg [n2]:no expr_tail* {-> [arg.expr, expr_tail.expr]};
-expr_tail {-> expr} 
+expr_tail {-> expr}
 	= comma no arg [n2]:no {-> arg.expr};
 idlist {-> id*}
 	= opar no idlist_nopar [n2]:no cpar {-> [idlist_nopar.id]}
@@ -817,10 +819,10 @@ module_name {-> module_name}
 	| {root} quad no modquad* id {-> New module_name(quad, [modquad.id], id)}
 	;
 
-qualified 
+qualified
 	= {cla} modquad* classquad {-> New qualified([modquad.id], classquad.classid)}
 	| {mod} modquad+ {-> New qualified([modquad.id], Null)}
-	; 
+	;
 qualified_o {-> qualified?}
 	= qualified {-> qualified}
 	| {null} {-> Null}
@@ -836,7 +838,7 @@ qmethid~noid {-> methid}
 	;
 modquad {-> id}
 	= id quad no {-> id};
-classquad {-> classid} 
+classquad {-> classid}
 	= classid quad no {-> classid};
 
 kwend_o {-> kwend?}
@@ -956,14 +958,14 @@ type	= kwnullable? [qid]:qclassid obra? [types]:type* cbra? annotations?;
 
 label = kwlabel id?;
 
-expr	= {block} expr* kwend? 
+expr	= {block} expr* kwend?
 	| {vardecl} kwvar? id type? assign? expr? annotations?
 	| {return} kwreturn? expr?
 	| {yield} kwyield expr
 	| {break} kwbreak label?
 	| {abort} kwabort
 	| {continue} kwcontinue? label?
-	| {do} kwdo [block]:expr? label?
+	| {do} kwdo [block]:expr? kwcatch? [catch]:expr? label?
 	| {if} kwif expr kwthen [then]:expr? kwelse? [else]:expr?
 	| {ifexpr} kwif expr kwthen [then]:expr kwelse [else]:expr
 	| {while} kwwhile expr kwdo [block]:expr? label?
@@ -971,9 +973,9 @@ expr	= {block} expr* kwend?
 	| {for} kwfor [groups]:for_group* kwdo [block]:expr? label?
 	| {with} kwwith expr kwdo [block]:expr? label?
 	| {assert} kwassert id? expr kwelse? [else]:expr?
-	| {once} kwonce expr 
-	| {send} expr 
-	| {binop} expr [expr2]:expr 
+	| {once} kwonce expr
+	| {send} expr
+	| {binop} expr [expr2]:expr
 	| {or} expr [op]:kwor [expr2]:expr
 	| {and} expr [op]:kwand [expr2]:expr
 	| {or_else} expr [op]:kwor kwelse [expr2]:expr
@@ -1002,26 +1004,26 @@ expr	= {block} expr* kwend?
 	| {uplus} [op]:plus expr
 	| {utilde} [op]:tilde expr
 	| {new} kwnew type qid? [args]:exprs
-	| {attr} expr [id]:attrid 
-	| {attr_assign} expr [id]:attrid assign [value]:expr 
-	| {attr_reassign} expr [id]:attrid assign_op [value]:expr 
+	| {attr} expr [id]:attrid
+	| {attr_assign} expr [id]:attrid assign [value]:expr
+	| {attr_reassign} expr [id]:attrid assign_op [value]:expr
 	| {call} expr qid [args]:exprs
 	| {call_assign} expr qid [args]:exprs assign [value]:expr
 	| {call_reassign} expr qid [args]:exprs assign_op [value]:expr
 	| {super} qualified? kwsuper [args]:exprs
-	| {init} expr kwinit [args]:exprs 
+	| {init} expr kwinit [args]:exprs
 	| {bra} expr [args]:exprs
-	| {bra_assign} expr [args]:exprs assign [value]:expr 
-	| {bra_reassign} expr [args]:exprs assign_op [value]:expr 
+	| {bra_assign} expr [args]:exprs assign [value]:expr
+	| {bra_reassign} expr [args]:exprs assign_op [value]:expr
 	| {var} id
-	| {var_assign} id assign [value]:expr 
-	| {var_reassign} id assign_op [value]:expr 
+	| {var_assign} id assign [value]:expr
+	| {var_reassign} id assign_op [value]:expr
 	| {range} expr [expr2]:expr annotations?
 	| {crange} obra expr dotdot [expr2]:expr cbra annotations?
 	| {orange} obra expr dotdot [expr2]:expr [cbra]:obra annotations?
 	| {array} obra [exprs]:expr* type? cbra annotations?
 	| {self} kwself annotations?
-	| {implicit_self} 
+	| {implicit_self}
 	| {true} kwtrue annotations?
 	| {false} kwfalse annotations?
 	| {null} kwnull annotations?
@@ -1029,9 +1031,9 @@ expr	= {block} expr* kwend?
 	| {float} float annotations?
 	| {char} char annotations?
 	| {string} string annotations?
-	| {start_string} [string]:start_string 
-	| {mid_string} [string]:mid_string 
-	| {end_string} [string]:end_string 
+	| {start_string} [string]:start_string
+	| {mid_string} [string]:mid_string
+	| {end_string} [string]:end_string
 	| {superstring} [exprs]:expr* annotations?
 	| {par} opar expr cpar annotations?
         | {as_cast} expr kwas opar? type cpar?