Cleanup in code generation (mostly formatting).

diff --git a/re2c/src/codegen/emit.h b/re2c/src/codegen/emit.h
index 293753448361705a77c7f1944d96fa4f9aa11cc0..499ce644f261ccfc42eedd98bd05d153fa1787dd 100644 (file)
--- a/re2c/src/codegen/emit.h
+++ b/re2c/src/codegen/emit.h
@@ -6,20 +6,11 @@
 
 namespace re2c {
 
-typedef std::vector<std::string> RegExpIndices;
-
-void emit_action
-       ( const Action & action
-       , OutputFile & o
-       , uint32_t ind
-       , bool & readCh
-       , const State * const s
-       , const std::string & condName
-       , const Skeleton * skeleton
-       , const std::set<label_t> & used_labels
-       , bool save_yyaccept
-       , bool base_ctxmarker
-       );
+void emit_action(OutputFile &o, uint32_t ind, bool &readCh,
+       const DFA &dfa, const State *s, const std::set<label_t> &used_labels);
+void gen_goto(OutputFile &o, uint32_t ind, bool &readCh, const State *to);
+void gen_goto_case(OutputFile &o, uint32_t ind, bool &readCh, const State *to);
+void gen_goto_if(OutputFile &o, uint32_t ind, bool &readCh, const State *to);
 
 } // namespace re2c
 

diff --git a/re2c/src/codegen/emit_action.cc b/re2c/src/codegen/emit_action.cc
index 1708b3ec99ced4c55bbccc99dcc053ffcef15c4b..632ee8f3e0a3ca2d78f50c37b23a104b4b0fdd6e 100644 (file)
--- a/re2c/src/codegen/emit_action.cc
+++ b/re2c/src/codegen/emit_action.cc
@@ -21,133 +21,108 @@ namespace re2c
 
 class label_t;
 
-static void need               (OutputFile & o, uint32_t ind, bool & readCh, size_t n, bool bSetMarker);
-static void emit_match         (OutputFile & o, uint32_t ind, bool & readCh, const State * const s);
-static void emit_initial       (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const Initial & init, const std::set<label_t> & used_labels);
-static void emit_save          (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, size_t save, bool save_yyaccept);
-static void emit_accept_binary (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const accept_t & accept, size_t l, size_t r);
-static void emit_accept        (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const accept_t & accept);
-static void emit_rule(OutputFile &o, uint32_t ind,
-       size_t rule, const std::string &condName,
-       const Skeleton *skeleton, bool base_ctxmarker);
-static void genYYFill          (OutputFile & o, size_t need);
-static void genSetCondition    (OutputFile & o, uint32_t ind, const std::string & newcond);
-static void genSetState        (OutputFile & o, uint32_t ind, uint32_t fillIndex);
-static void genGoTo            (OutputFile & o, uint32_t ind, const State * from, const State * to, bool & readCh);
-
-void emit_action
-       ( const Action & action
-       , OutputFile & o
-       , uint32_t ind
-       , bool & readCh
-       , const State * const s
-       , const std::string & condName
-       , const Skeleton * skeleton
-       , const std::set<label_t> & used_labels
-       , bool save_yyaccept
-       , bool base_ctxmarker
-       )
+static void need(OutputFile &o, uint32_t ind, bool &readCh, size_t n, bool bSetMarker);
+static void emit_match(OutputFile &o, uint32_t ind, bool &readCh, const State *s);
+static void emit_initial(OutputFile &o, uint32_t ind, bool &readCh, const State *s, const std::set<label_t> &used_labels);
+static void emit_save(OutputFile &o, uint32_t ind, bool &readCh, const State *s, bool save_yyaccept);
+static void emit_accept_binary(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s, size_t l, size_t r);
+static void emit_accept(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s);
+static void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx);
+static void genYYFill(OutputFile &o, size_t need);
+static void genSetCondition(OutputFile &o, uint32_t ind, const std::string &cond);
+static void genSetState(OutputFile &o, uint32_t ind, uint32_t fillIndex);
+
+void emit_action(OutputFile &o, uint32_t ind, bool &readCh,
+       const DFA &dfa, const State *s, const std::set<label_t> &used_labels)
 {
-       switch (action.type)
-       {
+       switch (s->action.type) {
                case Action::MATCH:
-                       emit_match (o, ind, readCh, s);
+                       emit_match(o, ind, readCh, s);
                        break;
                case Action::INITIAL:
-                       emit_initial (o, ind, readCh, s, * action.info.initial, used_labels);
+                       emit_initial(o, ind, readCh, s, used_labels);
                        break;
                case Action::SAVE:
-                       emit_save (o, ind, readCh, s, action.info.save, save_yyaccept);
+                       emit_save(o, ind, readCh, s, dfa.accepts.size() > 1);
                        break;
                case Action::MOVE:
                        break;
                case Action::ACCEPT:
-                       emit_accept (o, ind, readCh, s, * action.info.accepts);
+                       emit_accept(o, ind, readCh, dfa, s);
                        break;
                case Action::RULE:
-                       emit_rule (o, ind, action.info.rule, condName, skeleton, base_ctxmarker);
+                       emit_rule(o, ind, dfa, s->action.info.rule);
                        break;
        }
        if (!s->ctxs.empty()) {
-               if (base_ctxmarker) {
-                       o.wstring(opts->input_api.stmt_dist(ind, s->ctxs, skeleton->contexts));
+               if (dfa.base_ctxmarker) {
+                       o.wstring(opts->input_api.stmt_dist(ind, s->ctxs, dfa.contexts));
                } else {
                        o.wstring(opts->input_api.stmt_backupctx(ind));
                }
        }
 }
 
-void emit_match (OutputFile & o, uint32_t ind, bool & readCh, const State * const s)
+void emit_match(OutputFile &o, uint32_t ind, bool &readCh, const State *s)
 {
        const bool read_ahead = s
                && s->next
                && s->next->action.type != Action::RULE;
-       if (s->fill != 0)
-       {
-               o.wstring(opts->input_api.stmt_skip (ind));
-       }
-       else if (!read_ahead)
-       {
+
+       if (s->fill != 0) {
+               o.wstring(opts->input_api.stmt_skip(ind));
+       } else if (!read_ahead) {
                /* do not read next char if match */
-               o.wstring(opts->input_api.stmt_skip (ind));
+               o.wstring(opts->input_api.stmt_skip(ind));
                readCh = true;
-       }
-       else
-       {
-               o.wstring(opts->input_api.stmt_skip_peek (ind));
+       } else {
+               o.wstring(opts->input_api.stmt_skip_peek(ind));
                readCh = false;
        }
 
-       if (s->fill != 0)
-       {
+       if (s->fill != 0) {
                need(o, ind, readCh, s->fill, false);
        }
 }
 
-void emit_initial (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const Initial & initial, const std::set<label_t> & used_labels)
+void emit_initial(OutputFile &o, uint32_t ind, bool &readCh,
+       const State *s, const std::set<label_t> &used_labels)
 {
-       if (used_labels.count(s->label))
-       {
-               if (s->fill != 0)
-               {
-                       o.wstring(opts->input_api.stmt_skip (ind));
-               }
-               else
-               {
-                       o.wstring(opts->input_api.stmt_skip_peek (ind));
+       if (used_labels.count(s->label)) {
+               if (s->fill != 0) {
+                       o.wstring(opts->input_api.stmt_skip(ind));
+               } else {
+                       o.wstring(opts->input_api.stmt_skip_peek(ind));
                }
        }
 
-       if (used_labels.count(initial.label))
-       {
+       const Initial &initial = *s->action.info.initial;
+       if (used_labels.count(initial.label)) {
                o.wstring(opts->labelPrefix).wlabel(initial.label).ws(":\n");
        }
 
-       if (opts->dFlag)
-       {
-               o.wind(ind).wstring(opts->yydebug).ws("(").wlabel(initial.label).ws(", *").wstring(opts->yycursor).ws(");\n");
+       if (opts->dFlag) {
+               o.wind(ind).wstring(opts->yydebug).ws("(")
+                       .wlabel(initial.label).ws(", *")
+                       .wstring(opts->yycursor).ws(");\n");
        }
 
-       if (s->fill != 0)
-       {
+       if (s->fill != 0) {
                need(o, ind, readCh, s->fill, initial.setMarker);
-       }
-       else
-       {
-               if (initial.setMarker)
-               {
-                       o.wstring(opts->input_api.stmt_backup (ind));
+       } else {
+               if (initial.setMarker) {
+                       o.wstring(opts->input_api.stmt_backup(ind));
                }
                readCh = false;
        }
 }
 
 void emit_save(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *const s, size_t save, bool save_yyaccept)
+       const State *const s, bool save_yyaccept)
 {
        if (save_yyaccept) {
                o.wind(ind).wstring(opts->yyaccept).ws(" = ")
-                       .wu64(save).ws(";\n");
+                       .wu64(s->action.info.save).ws(";\n");
        }
 
        if (s->fill != 0) {
@@ -159,78 +134,81 @@ void emit_save(OutputFile &o, uint32_t ind, bool &readCh,
        }
 }
 
-void emit_accept_binary (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const accept_t & accepts, size_t l, size_t r)
+void emit_accept_binary(OutputFile &o, uint32_t ind, bool &readCh,
+       const DFA &dfa, const State *s, size_t l, size_t r)
 {
-       if (l < r)
-       {
+       if (l < r) {
                const size_t m = (l + r) >> 1;
-               o.wind(ind).ws("if (").wstring(opts->yyaccept).ws(r == l+1 ? " == " : " <= ").wu64(m).ws(") {\n");
-               emit_accept_binary (o, ++ind, readCh, s, accepts, l, m);
+               o.wind(ind).ws("if (").wstring(opts->yyaccept)
+                       .ws(r == l+1 ? " == " : " <= ").wu64(m).ws(") {\n");
+               emit_accept_binary (o, ++ind, readCh, dfa, s, l, m);
                o.wind(--ind).ws("} else {\n");
-               emit_accept_binary (o, ++ind, readCh, s, accepts, m + 1, r);
+               emit_accept_binary (o, ++ind, readCh, dfa, s, m + 1, r);
                o.wind(--ind).ws("}\n");
-       }
-       else
-       {
-               genGoTo(o, ind, s, accepts[l], readCh);
+       } else {
+               const accept_t &acc = *s->action.info.accepts;
+               gen_goto(o, ind, readCh, acc[l]);
        }
 }
 
-void emit_accept (OutputFile & o, uint32_t ind, bool & readCh, const State * const s, const accept_t & accepts)
+void emit_accept(OutputFile &o, uint32_t ind, bool &readCh,
+       const DFA &dfa, const State *s)
 {
-       const size_t accepts_size = accepts.size ();
-       if (accepts_size > 0)
-       {
-               o.wstring(opts->input_api.stmt_restore (ind));
-
-               if (readCh) // shouldn't be necessary, but might become at some point
-               {
-                       o.wstring(opts->input_api.stmt_peek (ind));
-                       readCh = false;
-               }
+       const accept_t &acc = *s->action.info.accepts;
+       const size_t nacc = acc.size();
 
-               if (accepts_size > 1)
-               {
-                       if (opts->gFlag && accepts_size >= opts->cGotoThreshold)
-                       {
-                               o.wind(ind++).ws("{\n");
-                               o.wind(ind++).ws("static void *").wstring(opts->yytarget).ws("[").wu64(accepts_size).ws("] = {\n");
-                               for (uint32_t i = 0; i < accepts_size; ++i)
-                               {
-                                       o.wind(ind).ws("&&").wstring(opts->labelPrefix).wlabel(accepts[i]->label).ws(",\n");
-                               }
-                               o.wind(--ind).ws("};\n");
-                               o.wind(ind).ws("goto *").wstring(opts->yytarget).ws("[").wstring(opts->yyaccept).ws("];\n");
-                               o.wind(--ind).ws("}\n");
-                       }
-                       else if (opts->sFlag || (accepts_size == 2))
-                       {
-                               emit_accept_binary (o, ind, readCh, s, accepts, 0, accepts_size - 1);
-                       }
-                       else
-                       {
-                               o.wind(ind).ws("switch (").wstring(opts->yyaccept).ws(") {\n");
-                               for (uint32_t i = 0; i < accepts_size - 1; ++i)
-                               {
-                                       o.wind(ind).ws("case ").wu32(i).ws(": \t");
-                                       genGoTo(o, 0, s, accepts[i], readCh);
-                               }
-                               o.wind(ind).ws("default:\t");
-                               genGoTo(o, 0, s, accepts[accepts_size - 1], readCh);
-                               o.wind(ind).ws("}\n");
-                       }
-               }
-               else
-               {
-                       // no need to write if statement here since there is only case 0.
-                       genGoTo(o, ind, s, accepts[0], readCh);
+       if (nacc == 0) {
+               return;
+       }
+
+       o.wstring(opts->input_api.stmt_restore(ind));
+       if (readCh) {
+               o.wstring(opts->input_api.stmt_peek(ind));
+               readCh = false;
+       }
+
+       // only one possible 'yyaccept' value: unconditional jump
+       if (nacc == 1) {
+               gen_goto(o, ind, readCh, acc[0]);
+               return;
+       }
+
+       // jump table
+       if (opts->gFlag && nacc >= opts->cGotoThreshold) {
+               o.wind(ind).ws("{\n")
+                       .wind(ind + 1).ws("static void *")
+                       .wstring(opts->yytarget).ws("[")
+                       .wu64(nacc).ws("] = {\n");
+               for (uint32_t i = 0; i < nacc; ++i) {
+                       o.wind(ind + 2).ws("&&").wstring(opts->labelPrefix)
+                               .wlabel(acc[i]->label).ws(",\n");
                }
+               o.wind(ind + 1).ws("};\n")
+                       .wind(ind + 1).ws("goto *")
+                       .wstring(opts->yytarget).ws("[")
+                       .wstring(opts->yyaccept).ws("];\n")
+                       .wind(ind).ws("}\n");
+               return;
        }
+
+       // nested ifs
+       if (opts->sFlag || nacc == 2) {
+               emit_accept_binary(o, ind, readCh, dfa, s, 0, nacc - 1);
+               return;
+       }
+
+       // switch
+       o.wind(ind).ws("switch (").wstring(opts->yyaccept).ws(") {\n");
+       for (uint32_t i = 0; i < nacc - 1; ++i) {
+               o.wind(ind).ws("case ").wu32(i).ws(": ");
+               gen_goto_case(o, ind, readCh, acc[i]);
+       }
+       o.wind(ind).ws("default:");
+       gen_goto_case(o, ind, readCh, acc[nacc - 1]);
+       o.wind(ind).ws("}\n");
 }
 
-static void subst_contexts(
-       std::string &action,
-       const Rule &rule,
+static void subst_contexts(std::string &action, const Rule &rule,
        const std::vector<CtxVar> &contexts)
 {
        for (size_t i = rule.ltag; i < rule.htag; ++i) {
@@ -246,25 +224,18 @@ static void subst_contexts(
        }
 }
 
-void emit_rule(
-       OutputFile &o,
-       uint32_t ind,
-       size_t rule_idx,
-       const std::string &condName,
-       const Skeleton *skeleton,
-       bool base_ctxmarker)
+void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx)
 {
-       const Rule &rule = skeleton->rules[rule_idx];
+       const Rule &rule = dfa.rules[rule_idx];
        const RuleInfo *info = rule.info;
 
        const Trail &trail = rule.trail;
        switch (trail.type) {
-               case Trail::NONE:
-                       break;
+               case Trail::NONE: break;
                case Trail::VAR:
-                       if (base_ctxmarker) {
+                       if (dfa.base_ctxmarker) {
                                o.wstring(opts->input_api.stmt_restorectx_var_base(ind,
-                                       skeleton->contexts[trail.pld.var].expr()));
+                                       dfa.contexts[trail.pld.var].expr()));
                        } else {
                                o.wstring(opts->input_api.stmt_restorectx_var(ind));
                        }
@@ -275,11 +246,11 @@ void emit_rule(
        }
 
        if (opts->target == opt_t::SKELETON) {
-               emit_action(*skeleton, o, ind, rule_idx);
+               emit_action(*dfa.skeleton, o, ind, rule_idx);
        } else {
-               const std::string &newcond = info->newcond;
-               if (!newcond.empty() && condName != newcond) {
-                       genSetCondition(o, ind, newcond);
+               const std::string &cond = info->newcond;
+               if (!cond.empty() && dfa.cond != cond) {
+                       genSetCondition(o, ind, cond);
                }
                const Code *code = info->code;
                if (code) {
@@ -287,77 +258,63 @@ void emit_rule(
                                o.wind(ind).wstring(yySetupRule).ws("\n");
                        }
                        std::string action = code->text;
-                       subst_contexts(action, rule, skeleton->contexts);
+                       subst_contexts(action, rule, dfa.contexts);
                        o.wline_info(code->loc.line, code->loc.filename.c_str())
                                .wind(ind).wstring(action).ws("\n")
                                .wdelay_line_info();
-               } else if (!newcond.empty()) {
+               } else if (!cond.empty()) {
                        std::string action = opts->condGoto;
-                       strrreplace(action, opts->condGotoParam, opts->condPrefix + newcond);
+                       strrreplace(action, opts->condGotoParam, opts->condPrefix + cond);
                        o.wind(ind).wstring(action).ws("\n");
                }
        }
 }
 
-void need (OutputFile & o, uint32_t ind, bool & readCh, size_t n, bool bSetMarker)
+void need(OutputFile &o, uint32_t ind, bool &readCh, size_t n, bool bSetMarker)
 {
        uint32_t fillIndex = last_fill_index;
 
-       if (opts->fFlag)
-       {
+       if (opts->fFlag) {
                last_fill_index++;
-               genSetState (o, ind, fillIndex);
+               genSetState(o, ind, fillIndex);
        }
 
-       if (opts->fill_use && n > 0)
-       {
+       if (opts->fill_use && n > 0) {
                o.wind(ind);
-               if (n == 1)
-               {
-                       if (opts->fill_check)
-                       {
-                               o.ws("if (").wstring(opts->input_api.expr_lessthan_one ()).ws(") ");
+               if (n == 1) {
+                       if (opts->fill_check) {
+                               o.ws("if (").wstring(opts->input_api.expr_lessthan_one()).ws(") ");
                        }
                        genYYFill(o, n);
-               }
-               else
-               {
-                       if (opts->fill_check)
-                       {
-                               o.ws("if (").wstring(opts->input_api.expr_lessthan (n)).ws(") ");
+               } else {
+                       if (opts->fill_check) {
+                               o.ws("if (").wstring(opts->input_api.expr_lessthan(n)).ws(") ");
                        }
                        genYYFill(o, n);
                }
        }
 
-       if (opts->fFlag)
-       {
+       if (opts->fFlag) {
                o.wstring(opts->yyfilllabel).wu32(fillIndex).ws(":\n");
        }
 
-       if (n > 0)
-       {
-               if (bSetMarker)
-               {
-                       o.wstring(opts->input_api.stmt_backup_peek (ind));
-               }
-               else
-               {
-                       o.wstring(opts->input_api.stmt_peek (ind));
+       if (n > 0) {
+               if (bSetMarker) {
+                       o.wstring(opts->input_api.stmt_backup_peek(ind));
+               } else {
+                       o.wstring(opts->input_api.stmt_peek(ind));
                }
                readCh = false;
        }
 }
 
-void genYYFill (OutputFile & o, size_t need)
+void genYYFill(OutputFile &o, size_t need)
 {
        std::string fill = opts->fill;
        strrreplace(fill, opts->fill_arg, need);
        o.wstring(fill);
-       if (!opts->fill_naked)
-       {
-               if (opts->fill_arg_use)
-               {
+       if (!opts->fill_naked) {
+               if (opts->fill_arg_use) {
                        o.ws("(").wu64(need).ws(")");
                }
                o.ws(";");
@@ -365,39 +322,67 @@ void genYYFill (OutputFile & o, size_t need)
        o.ws("\n");
 }
 
-void genSetCondition(OutputFile & o, uint32_t ind, const std::string& newcond)
+void genSetCondition(OutputFile &o, uint32_t ind, const std::string &cond)
 {
        std::string cond_set = opts->cond_set;
-       strrreplace(cond_set, opts->cond_set_arg, opts->condEnumPrefix + newcond);
+       strrreplace(cond_set, opts->cond_set_arg, opts->condEnumPrefix + cond);
        o.wind(ind).wstring(cond_set);
-       if (!opts->cond_set_naked)
-       {
-               o.ws("(").wstring(opts->condEnumPrefix).wstring(newcond).ws(");");
+       if (!opts->cond_set_naked) {
+               o.ws("(").wstring(opts->condEnumPrefix).wstring(cond).ws(");");
        }
        o.ws("\n");
 }
 
-void genSetState(OutputFile & o, uint32_t ind, uint32_t fillIndex)
+void genSetState(OutputFile &o, uint32_t ind, uint32_t fillIndex)
 {
        std::string state_set = opts->state_set;
        strrreplace(state_set, opts->state_set_arg, fillIndex);
        o.wind(ind).wstring(state_set);
-       if (!opts->state_set_naked)
-       {
+       if (!opts->state_set_naked) {
                o.ws("(").wu32(fillIndex).ws(");");
        }
        o.ws("\n");
 }
 
-void genGoTo(OutputFile & o, uint32_t ind, const State *from, const State *to, bool & readCh)
+void gen_goto_case(OutputFile &o, uint32_t ind, bool &readCh,  const State *to)
 {
-       if (readCh && from->next != to)
-       {
-               o.wstring(opts->input_api.stmt_peek (ind));
-               readCh = false;
+       const bool multiline = readCh;
+
+       if (multiline) {
+               o.ws("\n");
+               gen_goto(o, ind + 1, readCh, to);
+       } else {
+               gen_goto(o, 1, readCh, to);
        }
+}
 
-       o.wind(ind).ws("goto ").wstring(opts->labelPrefix).wlabel(to->label).ws(";\n");
+void gen_goto_if(OutputFile &o, uint32_t ind, bool &readCh, const State *to)
+{
+       const int32_t linecount = (readCh && to != NULL)
+               || (to != NULL);
+
+       if (linecount > 1) {
+               o.ws("{\n");
+               gen_goto(o, ind + 1, readCh, to);
+               o.wind(ind).ws("}\n");
+       } else {
+               gen_goto(o, 0, readCh, to);
+       }
+}
+
+void gen_goto(OutputFile &o, uint32_t ind, bool &readCh, const State *to)
+{
+       if (to == NULL) {
+               readCh = false;
+       }
+       if (readCh) {
+               o.wstring(opts->input_api.stmt_peek(ind));
+               readCh = false;
+       }
+       if (to) {
+               o.wind(ind).ws("goto ").wstring(opts->labelPrefix)
+                       .wlabel(to->label).ws(";\n");
+       }
 }
 
 } // namespace re2c

diff --git a/re2c/src/codegen/emit_dfa.cc b/re2c/src/codegen/emit_dfa.cc
index 08d0bd40dfb1c87ec7dc188bf3a2e90679b0f7e5..26c76448d441e281c69e26c7d522800be26b856d 100644 (file)
--- a/re2c/src/codegen/emit_dfa.cc
+++ b/re2c/src/codegen/emit_dfa.cc
@@ -73,23 +73,21 @@ void DFA::count_used_labels (std::set<label_t> & used, label_t start, label_t in
        }
 }
 
-void DFA::emit_body (OutputFile & o, uint32_t& ind, const std::set<label_t> & used_labels, label_t initial) const
+void DFA::emit_body(OutputFile &o, uint32_t& ind,
+       const std::set<label_t> &used_labels, label_t initial) const
 {
        // If DFA has transitions to initial state, then initial state
        // has a piece of code that advances input position. Wee must
        // skip it when entering DFA.
-       if (used_labels.count(head->label))
-       {
-               o.wind(ind).ws("goto ").wstring(opts->labelPrefix).wlabel(initial).ws(";\n");
+       if (used_labels.count(head->label)) {
+               o.wind(ind).ws("goto ").wstring(opts->labelPrefix)
+                       .wlabel(initial).ws(";\n");
        }
 
-       const bool save_yyaccept = accepts.size () > 1;
-       for (State * s = head; s; s = s->next)
-       {
+       for (State * s = head; s; s = s->next) {
                bool readCh = false;
-               emit_state (o, ind, s, used_labels.count (s->label));
-               emit_action (s->action, o, ind, readCh, s, cond, skeleton,
-                       used_labels, save_yyaccept, base_ctxmarker);
+               emit_state(o, ind, s, used_labels.count(s->label));
+               emit_action(o, ind, readCh, *this, s, used_labels);
                s->go.emit(o, ind, readCh);
        }
 }

diff --git a/re2c/src/codegen/go_emit.cc b/re2c/src/codegen/go_emit.cc
index e970eee562ca944b4b3cba7b746399c74ff59dbb..bef930aeb7f2b3a81842416a964f3d9339be065b 100644 (file)
--- a/re2c/src/codegen/go_emit.cc
+++ b/re2c/src/codegen/go_emit.cc
@@ -6,6 +6,7 @@
 
 #include "src/codegen/bitmap.h"
 #include "src/codegen/go.h"
+#include "src/codegen/emit.h"
 #include "src/codegen/input_api.h"
 #include "src/codegen/label.h"
 #include "src/codegen/output.h"
@@ -19,7 +20,6 @@ namespace re2c
 {
 
 static void output_if (OutputFile & o, uint32_t ind, bool & readCh, const std::string & compare, uint32_t value);
-static void output_goto (OutputFile & o, uint32_t ind, bool & readCh, label_t to);
 static std::string output_yych (bool & readCh);
 static std::string output_hgo (OutputFile & o, uint32_t ind, bool & readCh, SwitchIf * hgo);
 
@@ -41,16 +41,6 @@ void output_if (OutputFile & o, uint32_t ind, bool & readCh, const std::string &
        o.wind(ind).ws("if (").wstring(output_yych (readCh)).ws(" ").wstring(compare).ws(" ").wc_hex (value).ws(") ");
 }
 
-void output_goto (OutputFile & o, uint32_t ind, bool & readCh, label_t to)
-{
-       if (readCh)
-       {
-               o.wstring(opts->input_api.stmt_peek (ind));
-               readCh = false;
-       }
-       o.wind(ind).ws("goto ").wstring(opts->labelPrefix).wlabel(to).ws(";\n");
-}
-
 std::string output_hgo (OutputFile & o, uint32_t ind, bool & readCh, SwitchIf * hgo)
 {
        std::string yych = output_yych (readCh);
@@ -98,11 +88,11 @@ void Cases::emit (OutputFile & o, uint32_t ind, bool & readCh)
                if (cases[i].to != def)
                {
                        cases[i].emit (o, ind);
-                       output_goto (o, 1, readCh, cases[i].to->label);
+                       gen_goto_case(o, 1, readCh, cases[i].to);
                }
        }
        o.wind(ind).ws("default:");
-       output_goto (o, 1, readCh, def->label);
+       gen_goto_case(o, 1, readCh, def);
        o.wind(ind).ws("}\n");
 }
 
@@ -123,11 +113,11 @@ void Linear::emit (OutputFile & o, uint32_t ind, bool & readCh)
                if (branches[i].first != NULL)
                {
                        output_if (o, ind, readCh, branches[i].first->compare, branches[i].first->value);
-                       output_goto (o, 0, readCh, branches[i].second->label);
+                       gen_goto_if(o, ind, readCh, branches[i].second);
                }
                else
                {
-                       output_goto (o, ind, readCh, branches[i].second->label);
+                       gen_goto(o, ind, readCh, branches[i].second);
                }
        }
 }
@@ -171,7 +161,7 @@ void GoBitmap::emit (OutputFile & o, uint32_t ind, bool & readCh)
                o.wu32(bitmap->m);
        }
        o.ws(") {\n");
-       output_goto (o, ind + 1, readCh, bitmap_state->label);
+       gen_goto(o, ind + 1, readCh, bitmap_state);
        o.wind(ind).ws("}\n");
        if (lgo != NULL)
        {

diff --git a/re2c/src/ir/adfa/adfa.h b/re2c/src/ir/adfa/adfa.h
index eb60ba9e3f7713106da51375771b3576817a991e..b19b1face3b6c410f413fdb755e89d73a374097d 100644 (file)
--- a/re2c/src/ir/adfa/adfa.h
+++ b/re2c/src/ir/adfa/adfa.h
@@ -54,31 +54,25 @@ struct State
        FORBID_COPY (State);
 };
 
-class DFA
+struct DFA
 {
        accept_t accepts;
        Skeleton * skeleton;
-
-public:
        const std::string name;
        const std::string cond;
        const uint32_t line;
-
        uint32_t lbChar;
        uint32_t ubChar;
        uint32_t nStates;
        State * head;
        std::valarray<Rule> &rules;
        std::vector<CtxVar> &contexts;
-
-       // statistics
        size_t max_fill;
        bool need_backup;
        bool need_backupctx;
        bool need_accept;
        bool base_ctxmarker;
 
-public:
        DFA     ( const dfa_t &dfa
                , const std::vector<size_t> &fill
                , const std::vector<size_t> &fallback

diff --git a/re2c/test/input_custom_mjson.--input(custom).c b/re2c/test/input_custom_mjson.--input(custom).c
index 614d9fd3f992a808666f3f1add1a4af0d8c132c0..953acea3ad71caf11fa7fd6f81a664aad3b7a6c0 100644 (file)
--- a/re2c/test/input_custom_mjson.--input(custom).c
+++ b/re2c/test/input_custom_mjson.--input(custom).c
@@ -973,11 +973,11 @@ yy38:
 yy39:
             YYRESTORE ();
             switch (yyaccept) {
-            case 0:    goto yy5;
-            case 1:    goto yy16;
-            case 2:    goto yy49;
-            case 3:    goto yy59;
-            default:   goto yy93;
+            case 0:     goto yy5;
+            case 1:     goto yy16;
+            case 2:     goto yy49;
+            case 3:     goto yy59;
+            default:    goto yy93;
             }
 yy40:
             YYSKIP ();

diff --git a/re2c/test/input_custom_mjson.--skeleton--input(custom).c b/re2c/test/input_custom_mjson.--skeleton--input(custom).c
index a6a5d3a400c9da8cb2e0c7723f197c97560d0b11..cdaea869d80fa1ffbfe8c2f66c3f1616ec7f7176 100644 (file)
--- a/re2c/test/input_custom_mjson.--skeleton--input(custom).c
+++ b/re2c/test/input_custom_mjson.--skeleton--input(custom).c
@@ -585,11 +585,11 @@ yy38:
 yy39:
         YYRESTORE ();
         switch (yyaccept) {
-        case 0:        goto yy5;
-        case 1:        goto yy16;
-        case 2:        goto yy49;
-        case 3:        goto yy59;
-        default:       goto yy93;
+        case 0:     goto yy5;
+        case 1:     goto yy16;
+        case 2:     goto yy49;
+        case 3:     goto yy59;
+        default:    goto yy93;
         }
 yy40:
         YYSKIP ();

diff --git a/re2c/test/rexx.--skeleton.c b/re2c/test/rexx.--skeleton.c
index 9d2d53f4b1464975c2c01e1013516305a74a6fac..6063f5a01ec7b14a6a1b5f41dad1194b148f4531 100644 (file)
--- a/re2c/test/rexx.--skeleton.c
+++ b/re2c/test/rexx.--skeleton.c
@@ -875,22 +875,22 @@ yy71:
 yy72:
         YYRESTORE ();
         switch (yyaccept) {
-        case 0:        goto yy6;
-        case 1:        goto yy16;
-        case 2:        goto yy23;
-        case 3:        goto yy34;
-        case 4:        goto yy40;
-        case 5:        goto yy42;
-        case 6:        goto yy44;
-        case 7:        goto yy65;
-        case 8:        goto yy67;
-        case 9:        goto yy74;
-        case 10:       goto yy32;
-        case 11:       goto yy95;
-        case 12:       goto yy109;
-        case 13:       goto yy107;
-        case 14:       goto yy99;
-        default:       goto yy97;
+        case 0:     goto yy6;
+        case 1:     goto yy16;
+        case 2:     goto yy23;
+        case 3:     goto yy34;
+        case 4:     goto yy40;
+        case 5:     goto yy42;
+        case 6:     goto yy44;
+        case 7:     goto yy65;
+        case 8:     goto yy67;
+        case 9:     goto yy74;
+        case 10:     goto yy32;
+        case 11:     goto yy95;
+        case 12:     goto yy109;
+        case 13:     goto yy107;
+        case 14:     goto yy99;
+        default:    goto yy97;
         }
 yy73:
         yyaccept = 9;

diff --git a/re2c/test/scanner.--skeleton.c b/re2c/test/scanner.--skeleton.c
index 1ddcae6b4b6c3425b1281d37ccdd1da5428b160d..edb6bc9cbad28030f1e74cc19afe317a53c08a26 100644 (file)
--- a/re2c/test/scanner.--skeleton.c
+++ b/re2c/test/scanner.--skeleton.c
@@ -694,13 +694,13 @@ yy60:
 yy61:
         YYRESTORE ();
         switch (yyaccept) {
-        case 0:        goto yy40;
-        case 1:        goto yy42;
-        case 2:        goto yy55;
-        case 3:        goto yy58;
-        case 4:        goto yy83;
-        case 5:        goto yy53;
-        default:       goto yy107;
+        case 0:     goto yy40;
+        case 1:     goto yy42;
+        case 2:     goto yy55;
+        case 3:     goto yy58;
+        case 4:     goto yy83;
+        case 5:     goto yy53;
+        default:    goto yy107;
         }
 yy62:
         YYSKIP ();