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

diff --git a/contrib/nitcc/src/nitcc_parser_gen.nit b/contrib/nitcc/src/nitcc_parser_gen.nit
index deee3f7..c15238b 100644
--- a/contrib/nitcc/src/nitcc_parser_gen.nit
+++ b/contrib/nitcc/src/nitcc_parser_gen.nit
@@ -40,6 +40,7 @@ var p_re = new Production("re")
 var p_re1 = new Production("re1")
 var p_re2 = new Production("re2")
 var p_re3 = new Production("re3")
+var p_text = new Production("text")
 var p_par = new Production("parser")
 var p_ign = new Production("ignored")
 var p_rej = new Production("rejected")
@@ -53,10 +54,12 @@ var p_altid = new Production("altident")
 var p_elems = new Production("elems")
 var p_elem_list = new Production("elem_list")
 var p_elem = new Production("elem")
-g.prods.add_all([p_gr, p_re, p_re1, p_re2, p_re3, p_lex, p_exprs, p_expr, p_par, p_ign, p_rej, p_prods, p_prod, p_ptrans_o, p_alts, p_alt, p_altid_o, p_altid, p_elems, p_elem_list, p_elem])
+var p_pri = new Production("priority")
+g.prods.add_all([p_gr, p_re, p_re1, p_re2, p_re3, p_text, p_lex, p_exprs, p_expr, p_par, p_ign, p_rej, p_prods, p_prod, p_ptrans_o, p_alts, p_alt, p_altid_o, p_altid, p_elems, p_elem_list, p_elem, p_pri])
 g.prods.add(new Production("atrans"))
 g.prods.add(new Production("elemid"))
 g.prods.add(new Production("nelem"))
+g.prods.add(new Production("tree_part"))
 
 var t_opar = new Token("opar")
 var t_cpar = new Token("cpar")
@@ -77,8 +80,39 @@ var t_str = new Token("str")
 var t_id = new Token("id")
 var t_kw = new Token("kw")
 var t_any = new Token("any")
+var t_end = new Token("end")
+var t_and = new Token("and")
+var t_except = new Token("except")
+var t_shortest = new Token("shortest")
+var t_longest = new Token("longest")
 var t_ch_dec = new Token("ch_dec")
-g.tokens.add_all([t_opar, t_cpar, t_ocur, t_ccur, t_pipe, t_star, t_ques, t_plus, t_minus, t_comma, t_colo, t_semi, t_dot, t_eq, t_arrow, t_str, t_id, t_kw, t_any, t_ch_dec])
+var t_ch_hex = new Token("ch_hex")
+g.tokens.add_all([t_opar,
+	t_cpar,
+	t_ocur,
+	t_ccur,
+	t_pipe,
+	t_star,
+	t_ques,
+	t_plus,
+	t_minus,
+	t_comma,
+	t_colo,
+	t_semi,
+	t_dot,
+	t_eq,
+	t_arrow,
+	t_str,
+	t_id,
+	t_kw,
+	t_any,
+	t_end,
+	t_and,
+	t_except,
+	t_shortest,
+	t_longest,
+	t_ch_dec,
+	t_ch_hex])
 
 p_gr.new_alt("gr", t_kw, t_id, t_semi, p_lex, p_par)
 
@@ -93,6 +127,8 @@ p_re.new_alt("re_alter", p_re, t_pipe, p_re1)
 p_re.new_alt("re_re2", p_re1)
 
 p_re1.new_alt("re_minus", p_re1, t_minus, p_re2)
+p_re1.new_alt("re_except", p_re1, t_and, p_re2)
+p_re1.new_alt("re_and", p_re1, t_except, p_re2)
 p_re1.new_alt("re_re1", p_re2)
 
 p_re2.new_alt("re_conc", p_re2, p_re3)
@@ -101,16 +137,22 @@ p_re2.new_alt("re_re3", p_re3)
 p_re3.new_alt("re_star", p_re3, t_star)
 p_re3.new_alt("re_ques", p_re3, t_ques)
 p_re3.new_alt("re_plus", p_re3, t_plus)
+p_re3.new_alt("re_shortest", t_shortest, t_opar, p_re, t_cpar)
+p_re3.new_alt("re_longest", t_longest, t_opar, p_re, t_cpar)
 p_re3.new_alt("re_par", t_opar, p_re, t_cpar)
-p_re3.new_alt("re_str", t_str)
-p_re3.new_alt("re_ch_dec", t_ch_dec)
-p_re3.new_alt("re_class", t_str, t_dot, t_dot, t_str)
+p_re3.new_alt("re_class", p_text, t_dot, t_dot, p_text)
 p_re3.new_alt("re_any", t_any)
+p_re3.new_alt("re_end", t_end)
 p_re3.new_alt("re_id", t_id)
+p_re3.new_alt("re_text", p_text)
+
+p_text.new_alt("re_str", t_str)
+p_text.new_alt("re_ch_dec", t_ch_dec)
+p_text.new_alt("re_ch_hex", t_ch_hex)
 
 p_par.new_alt("par", t_kw, p_ign, p_rej, p_prods)
 
-p_ign.new_alt("ign", t_kw, t_id, t_semi)
+p_ign.new_alt("ign", t_kw, p_elem_list, t_semi)
 
 p_rej.new_alt("rej", t_kw, p_elem_list, t_semi)
 
@@ -139,12 +181,16 @@ p_elem_list.new_alt("elem_list_many", p_elem_list, t_comma, p_elem)
 p_elem_list.new_alt("elem_list_one", p_elem)
 
 p_elem.new_alt("elem_id", t_id)
-p_elem.new_alt("elem_str", t_str)
+p_elem.new_alt("elem_str", p_text)
 p_elem.new_alt("elem_par", t_opar, p_alts, t_cpar)
 p_elem.new_alt("elem_star", p_elem, t_star)
 p_elem.new_alt("elem_ques", p_elem, t_ques)
 p_elem.new_alt("elem_plus", p_elem, t_plus)
 
+p_pri.new_alt0("priority_left").phony = true
+p_pri.new_alt0("priority_right").phony = true
+p_pri.new_alt0("priority_unary").phony = true
+
 var a = g.lr0
 
 print "LR automaton: {a.states.length} states (see nitcc0.lr.dot)"
@@ -152,6 +198,6 @@ a.to_dot("nitcc0.lr.dot")
 
 a.gen_to_nit("nitcc_parser.nit", "nitcc")
 
-var f = new OFStream.open("nitcc_lexer.nit")
+var f = new FileWriter.open("nitcc_lexer.nit")
 f.write("import nitcc_lexer0\n")
 f.close