Handle all types of rules in one place (in parser).

diff --git a/re2c/bootstrap/src/parse/lex.cc b/re2c/bootstrap/src/parse/lex.cc
index 4f158e0aec57d6d4c778105b2aeb2d72d8dd5af1..0884fbeed0c44ecbb0eb42efc69d26614e18095e 100644 (file)
--- a/re2c/bootstrap/src/parse/lex.cc
+++ b/re2c/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Dec 22 13:54:31 2016 */
+/* Generated by re2c 0.16 on Thu Dec 22 14:38:33 2016 */
 #line 1 "../src/parse/lex.re"
 #include "src/util/c99_stdint.h"
 #include <stddef.h>

diff --git a/re2c/bootstrap/src/parse/parser.cc b/re2c/bootstrap/src/parse/parser.cc
index 2bc9bd19e058e497081636413ab05176437fcaee..c0086d2e7cc459bd71cd72c8947459a924121ca0 100644 (file)
--- a/re2c/bootstrap/src/parse/parser.cc
+++ b/re2c/bootstrap/src/parse/parser.cc
@@ -153,7 +153,7 @@ static void delay_default(Spec &spec)
        std::stable_partition(spec.begin(), spec.end(), RegExpRule::isnt_def);
 }
 
-void context_check(Scanner &in, CondList *clist)
+static void context_check(Scanner &in, CondList *clist)
 {
        if (clist && clist->size() == 1 && clist->begin()->empty()) {
                if (in.opts->cFlag) {
@@ -165,10 +165,29 @@ void context_check(Scanner &in, CondList *clist)
        }
 }
 
-void context_rule(Scanner &in, CondList *clist, RegExpRule *rule, const std::string *newcond)
+static void make_rule(Scanner &in, CondList *clist, RegExpRule *rule,
+       Code *code, const std::string *newcond)
 {
+       if (!clist) {
+               clist = new CondList;
+               clist->insert(rule ? "" : "0");
+       }
        context_check(in, clist);
-       if (newcond) rule->code->cond = *newcond;
+
+       if (!code) {
+               code = new Code(in.get_fname(), in.get_cline());
+       }
+
+       if (newcond) {
+               code->cond = *newcond;
+               delete newcond;
+       }
+
+       if (!rule) {
+               rule = new RegExpRule(RegExp::make_nil(), false);
+       }
+       rule->code = code;
+
        for(CondList::const_iterator i = clist->begin(); i != clist->end(); ++i) {
                const std::string &cond = *i;
                if (cond != "" && cond != "*" && specMap.find(cond) == specMap.end()) {
@@ -177,10 +196,9 @@ void context_rule(Scanner &in, CondList *clist, RegExpRule *rule, const std::str
                specMap[cond].push_back(rule);
        }
        delete clist;
-       delete newcond;
 }
 
-void setup_rule(Scanner &in, CondList *clist, const Code * code)
+static void make_setup(Scanner &in, CondList *clist, const Code * code)
 {
        assert(clist);
        assert(code);
@@ -575,8 +593,8 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   181,   181,   183,   184,   185,   189,   196,   201,   204,
-     208,   208,   211,   218,   223,   228,   233,   241,   249,   257,
+       0,   199,   199,   201,   202,   203,   207,   214,   219,   222,
+     226,   226,   229,   233,   237,   241,   245,   249,   253,   257,
      262,   268,   275,   276,   280,   284,   289,   294,   298,   305,
      309,   316,   320,   327,   331,   348,   367,   371,   375,   379,
      386,   396,   400
@@ -1572,74 +1590,56 @@ yyreduce:
   case 12:
 
     {
-               CondList *cl = new CondList;
-               cl->insert("");
-               (yyvsp[(1) - (2)].rule)->code = (yyvsp[(2) - (2)].code);
-               context_rule(in, cl, (yyvsp[(1) - (2)].rule), NULL);
+               make_rule(in, NULL, (yyvsp[(1) - (2)].rule), (yyvsp[(2) - (2)].code), NULL);
        ;}
     break;
 
   case 13:
 
     {
-               (yyvsp[(4) - (5)].rule)->code = (yyvsp[(5) - (5)].code);
-               context_rule(in, (yyvsp[(2) - (5)].clist), (yyvsp[(4) - (5)].rule), NULL);
+               make_rule(in, (yyvsp[(2) - (5)].clist), (yyvsp[(4) - (5)].rule), (yyvsp[(5) - (5)].code), NULL);
        ;}
     break;
 
   case 14:
 
     {
-               (yyvsp[(4) - (8)].rule)->code = (yyvsp[(8) - (8)].code);
-               context_rule(in, (yyvsp[(2) - (8)].clist), (yyvsp[(4) - (8)].rule), (yyvsp[(7) - (8)].str));
+               make_rule(in, (yyvsp[(2) - (8)].clist), (yyvsp[(4) - (8)].rule), (yyvsp[(8) - (8)].code), (yyvsp[(7) - (8)].str));
        ;}
     break;
 
   case 15:
 
     {
-               (yyvsp[(4) - (8)].rule)->code = new Code(in.get_fname(), in.get_cline());
-               context_rule(in, (yyvsp[(2) - (8)].clist), (yyvsp[(4) - (8)].rule), (yyvsp[(8) - (8)].str));
+               make_rule(in, (yyvsp[(2) - (8)].clist), (yyvsp[(4) - (8)].rule), NULL, (yyvsp[(8) - (8)].str));
        ;}
     break;
 
   case 16:
 
     {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = (yyvsp[(3) - (3)].code);
-               context_rule(in, cl, r, NULL);
+               make_rule(in, NULL, NULL, (yyvsp[(3) - (3)].code), NULL);
        ;}
     break;
 
   case 17:
 
     {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = (yyvsp[(6) - (6)].code);
-               context_rule(in, cl, r, (yyvsp[(5) - (6)].str));
+               make_rule(in, NULL, NULL, (yyvsp[(6) - (6)].code), (yyvsp[(5) - (6)].str));
        ;}
     break;
 
   case 18:
 
     {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = new Code(in.get_fname(), in.get_cline());
-               context_rule(in, cl, r, (yyvsp[(6) - (6)].str));
+               make_rule(in, NULL, NULL, NULL, (yyvsp[(6) - (6)].str));
        ;}
     break;
 
   case 19:
 
     {
-               setup_rule(in, (yyvsp[(3) - (5)].clist), (yyvsp[(5) - (5)].code));
+               make_setup(in, (yyvsp[(3) - (5)].clist), (yyvsp[(5) - (5)].code));
        ;}
     break;
 

diff --git a/re2c/src/parse/parser.ypp b/re2c/src/parse/parser.ypp
index e1746c5eafd49ea252dd3f67d99d4445f3e9de81..6998f1e2c22d2bb09a9b80de93303c1dd160cb08 100644 (file)
--- a/re2c/src/parse/parser.ypp
+++ b/re2c/src/parse/parser.ypp
@@ -85,7 +85,7 @@ static void delay_default(Spec &spec)
        std::stable_partition(spec.begin(), spec.end(), RegExpRule::isnt_def);
 }
 
-void context_check(Scanner &in, CondList *clist)
+static void context_check(Scanner &in, CondList *clist)
 {
        if (clist && clist->size() == 1 && clist->begin()->empty()) {
                if (in.opts->cFlag) {
@@ -97,10 +97,29 @@ void context_check(Scanner &in, CondList *clist)
        }
 }
 
-void context_rule(Scanner &in, CondList *clist, RegExpRule *rule, const std::string *newcond)
+static void make_rule(Scanner &in, CondList *clist, RegExpRule *rule,
+       Code *code, const std::string *newcond)
 {
+       if (!clist) {
+               clist = new CondList;
+               clist->insert(rule ? "" : "0");
+       }
        context_check(in, clist);
-       if (newcond) rule->code->cond = *newcond;
+
+       if (!code) {
+               code = new Code(in.get_fname(), in.get_cline());
+       }
+
+       if (newcond) {
+               code->cond = *newcond;
+               delete newcond;
+       }
+
+       if (!rule) {
+               rule = new RegExpRule(RegExp::make_nil(), false);
+       }
+       rule->code = code;
+
        for(CondList::const_iterator i = clist->begin(); i != clist->end(); ++i) {
                const std::string &cond = *i;
                if (cond != "" && cond != "*" && specMap.find(cond) == specMap.end()) {
@@ -109,10 +128,9 @@ void context_rule(Scanner &in, CondList *clist, RegExpRule *rule, const std::str
                specMap[cond].push_back(rule);
        }
        delete clist;
-       delete newcond;
 }
 
-void setup_rule(Scanner &in, CondList *clist, const Code * code)
+static void make_setup(Scanner &in, CondList *clist, const Code * code)
 {
        assert(clist);
        assert(code);
@@ -209,53 +227,35 @@ enddef: ';' | TOKEN_FID_END;
 
 rule
        : trailexpr TOKEN_CODE {
-               CondList *cl = new CondList;
-               cl->insert("");
-               $1->code = $2;
-               context_rule(in, cl, $1, NULL);
+               make_rule(in, NULL, $1, $2, NULL);
        }
 
        | '<' clist '>' trailexpr TOKEN_CODE {
-               $4->code = $5;
-               context_rule(in, $2, $4, NULL);
+               make_rule(in, $2, $4, $5, NULL);
        }
 
        | '<' clist '>' trailexpr '=' '>' TOKEN_ID TOKEN_CODE {
-               $4->code = $8;
-               context_rule(in, $2, $4, $7);
+               make_rule(in, $2, $4, $8, $7);
        }
 
        | '<' clist '>' trailexpr ':' '=' '>' TOKEN_ID {
-               $4->code = new Code(in.get_fname(), in.get_cline());
-               context_rule(in, $2, $4, $8);
+               make_rule(in, $2, $4, NULL, $8);
        }
 
        | '<' '>' TOKEN_CODE {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = $3;
-               context_rule(in, cl, r, NULL);
+               make_rule(in, NULL, NULL, $3, NULL);
        }
 
        | '<' '>' '=' '>' TOKEN_ID TOKEN_CODE {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = $6;
-               context_rule(in, cl, r, $5);
+               make_rule(in, NULL, NULL, $6, $5);
        }
 
        | '<' '>' ':' '=' '>' TOKEN_ID {
-               CondList *cl = new CondList;
-               cl->insert("0");
-               RegExpRule *r = new RegExpRule(RegExp::make_nil(), false);
-               r->code = new Code(in.get_fname(), in.get_cline());
-               context_rule(in, cl, r, $6);
+               make_rule(in, NULL, NULL, NULL, $6);
        }
 
        | '<' '!' clist '>' TOKEN_CODE {
-               setup_rule(in, $3, $5);
+               make_setup(in, $3, $5);
        };
 
 clist