Continued adding "--skeleton" switch.

Generate prolog and epilog in the form of a for-loop. The body
of the loop is the hard-coded DFA. The code in DFA final states
is substituted with "continue" statements.

diff --git a/re2c/code.cc b/re2c/code.cc
index 2d80fd3afa0b881381d03915f13df5b2eb6044d5..1ada05e59d158d4cdc669af7afcbc712cfb02006 100644 (file)
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -598,7 +598,11 @@ void Rule::emit(Output & output, uint ind, bool &, const std::string& condName)
 
        o.write_line_info (rule->code->line, rule->code->source.c_str ());
        o << indent(ind);
-       if (rule->code->autogen)
+       if (flag_skeleton)
+       {
+               o << "{ continue; }";
+       }
+       else if (rule->code->autogen)
        {
                o << replaceParam(condGoto, condGotoParam, condPrefix + rule->code->newcond);
        }
@@ -1083,10 +1087,60 @@ void DFA::prepare(uint & max_fill)
        }
 }
 
+static void output_skeleton_prolog (OutputFile & o, uint ind)
+{
+       std::string yyctype;
+       switch (encoding.szCodeUnit ())
+       {
+               case 1:
+                       yyctype = " unsigned char";
+                       break;
+               case 2:
+                       yyctype = " unsigned short";
+                       break;
+               case 4:
+                       yyctype = " unsigned int";
+                       break;
+       }
+
+       o << "int main () {\n";
+
+       o << "#define " << mapCodeName["YYCTYPE"] << yyctype << "\n";
+       o << "#define " << mapCodeName["YYPEEK"] << "() *cursor\n";
+       o << "#define " << mapCodeName["YYSKIP"] << "() ++cursor\n";
+       o << "#define " << mapCodeName["YYBACKUP"] << "() marker = cursor\n";
+       o << "#define " << mapCodeName["YYBACKUPCTX"] << "() ctxmarker = cursor\n";
+       o << "#define " << mapCodeName["YYRESTORE"] << "() cursor = marker\n";
+       o << "#define " << mapCodeName["YYRESTORECTX"] << "() cursor = ctxmarker\n";
+       o << "#define " << mapCodeName["YYLESSTHAN"] << "(n) cursor < limit\n";
+       o << "#define " << mapCodeName["YYFILL"] << "(n) { break; }\n";
+       o << indent (ind) << "const unsigned int data_size = 0xFF;\n";
+       o << indent (ind) << "YYCTYPE * data = new YYCTYPE [data_size];\n";
+       o << indent (ind) << "const YYCTYPE * cursor = data;\n";
+       o << indent (ind) << "const YYCTYPE * marker = data;\n";
+       o << indent (ind) << "const YYCTYPE * ctxmarker = data;\n";
+       o << indent (ind) << "const YYCTYPE * const limit = &data[data_size - 1];\n";
+       o << indent (ind) << "for (;;)\n";
+       o << indent (ind) << "{\n";
+}
+
+static void output_skeleton_epilog (OutputFile & o, uint ind)
+{
+       o << indent (ind) << "}\n";
+       o << indent (ind) << "delete [] data;\n";
+
+       o << "return 0; }\n";
+}
 
 void DFA::emit(Output & output, uint& ind, const RegExpMap* specMap, const std::string& condName, bool isLastCond, bool& bPrologBrace)
 {
        OutputFile & o = output.source;
+
+       if (flag_skeleton)
+       {
+               output_skeleton_prolog (o, ind);
+       }
+
        bool bProlog = (!cFlag || !bWroteCondCheck);
 
        // In -c mode, the prolog needs its own label separate from start_label.
@@ -1258,6 +1312,11 @@ void DFA::emit(Output & output, uint& ind, const RegExpMap* specMap, const std::
        }
 
        bUseStartLabel = false;
+
+       if (flag_skeleton)
+       {
+               output_skeleton_epilog (o, ind);
+       }
 }
 
 static void output_state_goto_sub (std::ostream & o, uint ind, uint start_label, int cMin, int cMax)

diff --git a/re2c/main.cc b/re2c/main.cc
index 0c43f17e0e3b9f78fb76b74b2d85024281eaeb46..777006b79fc9ada9464ebeca580e4f366bdd0b6f 100644 (file)
--- a/re2c/main.cc
+++ b/re2c/main.cc
@@ -408,6 +408,7 @@ int main(int argc, char *argv[])
 
                        case 15:
                        flag_skeleton = true;
+                       input_api.set (InputAPI::CUSTOM);
                        break;
                }
        }