Introcuded the "eof" variable for indicating the end of file. The p variable is

[external/ragel.git] / rlgen-cd / gotocodegen.cpp

diff --git a/rlgen-cd/gotocodegen.cpp b/rlgen-cd/gotocodegen.cpp
index 89f3107..51a4c16 100644 (file)
--- a/rlgen-cd/gotocodegen.cpp
+++ b/rlgen-cd/gotocodegen.cpp
@@ -659,6 +659,7 @@ void GotoCodeGen::writeData()
 
 void GotoCodeGen::writeExec()
 {
+       testEofUsed = false;
        outLabelUsed = false;
 
        out << "        {\n";
@@ -680,10 +681,10 @@ void GotoCodeGen::writeExec()
        out << "\n";
 
        if ( hasEnd ) {
-               outLabelUsed = true;
+               testEofUsed = true;
                out << 
                        "       if ( " << P() << " == " << PE() << " )\n"
-                       "               goto _out;\n";
+                       "               goto _test_eof;\n";
        }
 
        if ( redFsm->errState != 0 ) {
@@ -753,22 +754,18 @@ void GotoCodeGen::writeExec()
                        "       goto _resume;\n";
        }
 
-       if ( outLabelUsed )
-               out << "        _out: {}\n";
-
-       out << "        }\n";
-}
+       if ( testEofUsed )
+               out << "        _test_eof: {}\n";
 
-void GotoCodeGen::writeEOF()
-{
        if ( redFsm->anyEofActions() ) {
                out << 
+                       "       if ( " << P() << " == " << EOFV() << " )\n"
                        "       {\n"
-                       "       " << PTR_CONST() << ARRAY_TYPE(redFsm->maxActArrItem) << POINTER() << "_acts = " << 
+                       "       " << PTR_CONST() << ARRAY_TYPE(redFsm->maxActArrItem) << POINTER() << "__acts = " << 
                                        ARR_OFF( A(), EA() + "[" + CS() + "]" ) << ";\n"
-                       "       " << UINT() << " _nacts = " << CAST(UINT()) << " *_acts++;\n"
-                       "       while ( _nacts-- > 0 ) {\n"
-                       "               switch ( *_acts++ ) {\n";
+                       "       " << UINT() << " __nacts = " << CAST(UINT()) << " *__acts++;\n"
+                       "       while ( __nacts-- > 0 ) {\n"
+                       "               switch ( *__acts++ ) {\n";
                        EOF_ACTION_SWITCH();
                        SWITCH_DEFAULT() <<
                        "               }\n"
@@ -776,4 +773,13 @@ void GotoCodeGen::writeEOF()
                        "       }\n"
                        "\n";
        }
+
+       if ( outLabelUsed )
+               out << "        _out: {}\n";
+
+       out << "        }\n";
+}
+
+void GotoCodeGen::writeEOF()
+{
 }