'--skeleton': don't forget to jump to start label when needed.

diff --git a/re2c/src/codegen/emit_dfa.cc b/re2c/src/codegen/emit_dfa.cc
index 230d85c73a428e4a25f067db2bedf5e15138a1c5..0088c2305298837d5301a48dbbab389f36d48127 100644 (file)
--- a/re2c/src/codegen/emit_dfa.cc
+++ b/re2c/src/codegen/emit_dfa.cc
@@ -85,8 +85,16 @@ 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) 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 << indent(ind) << "goto " << opts->labelPrefix << initial << ";\n";
+       }
+
        const bool save_yyaccept = accepts.size () > 1;
        for (State * s = head; s; s = s->next)
        {
@@ -130,7 +138,7 @@ void DFA::emit(Output & output, uint32_t& ind, bool isLastCond, bool& bPrologBra
                        skeleton->emit_data (o.file_name);
                        skeleton->emit_start (o, max_fill, need_backup, need_backupctx, need_accept);
                        uint32_t i = 2;
-                       emit_body (o, i, used_labels);
+                       emit_body (o, i, used_labels, initial_label);
                        skeleton->emit_end (o, need_backup, need_backupctx);
                }
        }
@@ -217,15 +225,8 @@ void DFA::emit(Output & output, uint32_t& ind, bool isLastCond, bool& bPrologBra
                        o << indent(ind++) << "{\n";
                        BitMap::gen(o, ind, lbChar, ubChar <= 256 ? ubChar : 256);
                }
-               // 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 << indent(ind) << "goto " << opts->labelPrefix << initial_label << ";\n";
-               }
                // Generate code
-               emit_body (o, ind, used_labels);
+               emit_body (o, ind, used_labels, initial_label);
                if (opts->cFlag && opts->bFlag && BitMap::first)
                {
                        o << indent(--ind) << "}\n";

diff --git a/re2c/src/ir/dfa/dfa.h b/re2c/src/ir/dfa/dfa.h
index 5a9f74b5255956bf62e24bf6ddf79d0225aa677a..e9cd04d0dfa18e884bde0feb080b33b3ee03a118 100644 (file)
--- a/re2c/src/ir/dfa/dfa.h
+++ b/re2c/src/ir/dfa/dfa.h
@@ -57,7 +57,7 @@ private:
        void calc_stats ();
        void prepare ();
        void count_used_labels (std::set<label_t> & used, label_t prolog, label_t start, bool force_start) const;
-       void emit_body (OutputFile &, uint32_t &, const std::set<label_t> & used_labels) const;
+       void emit_body (OutputFile &, uint32_t &, const std::set<label_t> & used_labels, label_t initial) const;
 
        FORBID_COPY (DFA);
 };