Go back to 3.X semantics for >, % and error actions. The > operator also embeds

a leaving action/priority into the start state if it is final. If EOF happens
in a state with a leaving operator then leaving action it is executed. If EOF
happens in a non-final state that has an error action, the error action is
executed.

git-svn-id: http://svn.complang.org/ragel/trunk@301 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/ragel/fsmap.cpp b/ragel/fsmap.cpp
index c9e673a..0674fa9 100644 (file)
--- a/ragel/fsmap.cpp
+++ b/ragel/fsmap.cpp
@@ -122,6 +122,12 @@ void FsmAp::startFsmPrior( int ordering, PriorDesc *prior )
                if ( trans->toState != 0 )
                        trans->priorTable.setPrior( ordering, prior );
        }
+
+       /* If the new start state is final then set the out priority. This follows
+        * the same convention as setting start action in the out action table of
+        * a final start state. */
+       if ( startState->stateBits & SB_ISFINAL )
+               startState->outPriorTable.setPrior( ordering, prior );
 }
 
 /* Set the priority of all transitions in a graph. Walks all transition lists
@@ -180,6 +186,12 @@ void FsmAp::startFsmAction( int ordering, Action *action )
                if ( trans->toState != 0 )
                        trans->actionTable.setAction( ordering, action );
        }
+
+       /* If start state is final then add the action to the out action table.
+        * This means that when the null string is accepted the start action will
+        * not be bypassed. */
+       if ( startState->stateBits & SB_ISFINAL )
+               startState->outActionTable.setAction( ordering, action );
 }
 
 /* Set functions to execute on all transitions. Walks the out lists of all
@@ -320,6 +332,13 @@ void FsmAp::setErrorTarget( StateAp *state, StateAp *target, int *orderings,
        }
 }
 
+void FsmAp::transferOutActions( StateAp *state )
+{
+       for ( ActionTable::Iter act = state->outActionTable; act.lte(); act++ )
+               state->eofActionTable.setAction( act->key, act->value ); 
+       state->outActionTable.empty();
+}
+
 void FsmAp::transferErrorActions( StateAp *state, int transferPoint )
 {
        for ( int i = 0; i < state->errActionTable.length(); ) {
@@ -327,6 +346,8 @@ void FsmAp::transferErrorActions( StateAp *state, int transferPoint )
                if ( act->transferPoint == transferPoint ) {
                        /* Transfer the error action and remove it. */
                        setErrorAction( state, act->ordering, act->action );
+                       if ( ! state->isFinState() )
+                               state->eofActionTable.setAction( act->ordering, act->action );
                        state->errActionTable.vremove( i );
                }
                else {

diff --git a/ragel/fsmgraph.h b/ragel/fsmgraph.h
index 3241f0f..b10ff3a 100644 (file)
--- a/ragel/fsmgraph.h
+++ b/ragel/fsmgraph.h
@@ -1134,6 +1134,7 @@ struct FsmAp
        void leaveFsmPrior( int ordering, PriorDesc *prior );
 
        /* Action setting support. */
+       void transferOutActions( StateAp *state );
        void transferErrorActions( StateAp *state, int transferPoint );
        void setErrorAction( StateAp *state, int ordering, Action *action );
 

diff --git a/ragel/parsedata.cpp b/ragel/parsedata.cpp
index 0dcb238..9a05d70 100644 (file)
--- a/ragel/parsedata.cpp
+++ b/ragel/parsedata.cpp
@@ -1064,6 +1064,10 @@ FsmAp *ParseData::makeInstance( GraphDictEl *gdNode )
         * All state construction is now complete.
         */
 
+       /* Transfer actions from the out action tables to eof action tables. */
+       for ( StateSet::Iter state = graph->finStateSet; state.lte(); state++ )
+               graph->transferOutActions( *state );
+
        /* Transfer global error actions. */
        for ( StateList::Iter state = graph->stateList; state.lte(); state++ )
                graph->transferErrorActions( state, 0 );
@@ -1235,31 +1239,9 @@ void ParseData::checkInlineList( Action *act, InlineList *inlineList )
                /* EOF checks. */
                if ( act->numEofRefs > 0 ) {
                        switch ( item->type ) {
-                       case InlineItem::PChar: 
-                               error(item->loc) << "pointer to current element does not exist in "
-                                               "EOF action code" << endl;
-                               break;
-                       case InlineItem::Char: 
-                               error(item->loc) << "current element does not exist in "
-                                               "EOF action code" << endl;
-                               break;
-                       case InlineItem::Hold:
-                               error(item->loc) << "changing the current element not possible in "
-                                               "EOF action code" << endl;
-                               break;
-                       case InlineItem::Exec:
-                               error(item->loc) << "changing the current element not possible in "
-                                               "EOF action code" << endl;
-                               break;
-                       case InlineItem::Goto: case InlineItem::Call: 
-                       case InlineItem::Next: case InlineItem::GotoExpr: 
-                       case InlineItem::CallExpr: case InlineItem::NextExpr:
-                       case InlineItem::Ret:
-                               error(item->loc) << "changing the current state not possible in "
-                                               "EOF action code" << endl;
-                               break;
-                       default:
-                               break;
+                               /* Currently no checks. */
+                               default:
+                                       break;
                        }
                }
 

diff --git a/rlgen-ruby/ruby-flatcodegen.cpp b/rlgen-ruby/ruby-flatcodegen.cpp
index 5168c7f..0d4196b 100644 (file)
--- a/rlgen-ruby/ruby-flatcodegen.cpp
+++ b/rlgen-ruby/ruby-flatcodegen.cpp
@@ -515,7 +515,8 @@ void RubyFlatCodeGen::BREAK( ostream &out, int targState )
 {
        out << 
                "       begin\n"
-               "               _break_resume = true\n"
+               "               _trigger_goto = true\n"
+               "               _goto_level = _out\n"
                "               break\n"
                "       end\n";
 }
@@ -829,6 +830,9 @@ void RubyFlatCodeGen::writeExec()
                                EOF_ACTION_SWITCH() <<
                                "               end\n"
                                "       end\n"
+                               "       if _trigger_goto\n"
+                               "               next\n"
+                               "       end\n"
                                "       end\n";
                }
 

diff --git a/test/clang1.rl b/test/clang1.rl
index 7ed0456..85532c6 100644 (file)
--- a/test/clang1.rl
+++ b/test/clang1.rl
@@ -161,6 +161,7 @@ void test( char *buf )
 {
        int len = strlen( buf );
        char *p = buf, *pe = buf + len;
+       char *eof = pe;
        char identBuf[IDENT_BUFLEN+1];
        int identLen;
        int curLine;

diff --git a/test/clang2.rl b/test/clang2.rl
index fb7428e..3b22e4b 100644 (file)
--- a/test/clang2.rl
+++ b/test/clang2.rl
@@ -162,6 +162,7 @@
 {
        const char *p = data; 
        const char *pe = data + len;
+       const char *eof = pe;
 
        %% write exec;
 }

diff --git a/test/clang3.rl b/test/clang3.rl
index 6c9150e..82f5eed 100644 (file)
--- a/test/clang3.rl
+++ b/test/clang3.rl
@@ -159,6 +159,7 @@ class CLang
        {
                char *p = _data;
                char *pe = _data + _len;
+               char *eof = pe;
                %% write exec;
        }
 

diff --git a/test/clang4.rl b/test/clang4.rl
index cdd0c44..9644b8e 100644 (file)
--- a/test/clang4.rl
+++ b/test/clang4.rl
@@ -1,5 +1,6 @@
 /*
  * @LANG: indep
+ * @NEEDS_EOF: yes
  */
 
 ptr tokstart;

diff --git a/test/cppscan1.rl b/test/cppscan1.rl
index 0b6e00d..8c87f78 100644 (file)
--- a/test/cppscan1.rl
+++ b/test/cppscan1.rl
@@ -136,6 +136,7 @@ int Scanner::execute( char *data, int len )
        Scanner *fsm = this;
        char *p = data;
        char *pe = data + len;
+       char *eof = pe;
 
        %% write exec;
        if ( cs == Scanner_error )

diff --git a/test/cppscan2.rl b/test/cppscan2.rl
index 9ce3a25..78efe20 100644 (file)
--- a/test/cppscan2.rl
+++ b/test/cppscan2.rl
@@ -184,6 +184,7 @@ int Scanner::execute( char *data, int len )
 {
        char *p = data;
        char *pe = data + len;
+       char *eof = pe;
 
        %% write exec;
 

diff --git a/test/cppscan4.rl b/test/cppscan4.rl
index 8e9dc1b..42a97f1 100644 (file)
--- a/test/cppscan4.rl
+++ b/test/cppscan4.rl
@@ -192,6 +192,7 @@ class Scanner
        {
                char *p = _data;
                char *pe = _data + _len;
+               char *eof = null;
 
                %% write exec;
 

diff --git a/test/erract1.rl b/test/erract1.rl
index 9f34f55..e928179 100644 (file)
--- a/test/erract1.rl
+++ b/test/erract1.rl
@@ -65,6 +65,7 @@ int ErrAct::execute( const char *_data, int _len )
 {
        const char *p = _data;
        const char *pe = _data+_len;
+       const char *eof = pe;
        %% write exec;
 
        if ( cs == ErrAct_error )

diff --git a/test/erract2.rl b/test/erract2.rl
index a4d0ef9..b1fbfbf 100644 (file)
--- a/test/erract2.rl
+++ b/test/erract2.rl
@@ -40,33 +40,45 @@
 _____INPUT_____ */
 
 /* _____OUTPUT_____
+err_start
 eof_start
+err_all
 eof_all
 FAIL
+err_all
+err_middle
 eof_all
 eof_middle
 FAIL
 err_start
 err_all
 FAIL
+err_all
+err_middle
 eof_all
 eof_middle
 FAIL
 err_all
 err_middle
 FAIL
+err_all
+err_middle
 eof_all
 eof_middle
 FAIL
 err_all
 err_middle
 FAIL
+err_all
+err_middle
 eof_all
 eof_middle
 FAIL
 err_all
 err_middle
 FAIL
+err_all
+err_out
 eof_all
 eof_out
 FAIL

diff --git a/test/erract5.rl b/test/erract5.rl
index 2b23324..0ea6e9a 100644 (file)
--- a/test/erract5.rl
+++ b/test/erract5.rl
@@ -69,6 +69,7 @@
 {
        const char *p = _data;
        const char *pe = _data + _len;
+       const char *eof = pe;
        %% write exec;
 }
 

diff --git a/test/erract7.rl b/test/erract7.rl
index 4b403ef..040ad73 100644 (file)
--- a/test/erract7.rl
+++ b/test/erract7.rl
@@ -21,6 +21,7 @@ int main()
 {
        int cs;
        char *p = "hello", *pe = p + strlen(p);
+       char *eof = pe;
        %%{
                write init;
                write exec;

diff --git a/test/erract8.rl b/test/erract8.rl
index c358d23..7926186 100644 (file)
--- a/test/erract8.rl
+++ b/test/erract8.rl
@@ -19,6 +19,7 @@ class erract8
        static void test( char data[] )
        {
                int cs, p = 0, pe = data.length;
+               int eof = pe;
                int top;
 
                %% write init;

diff --git a/test/forder3.rl b/test/forder3.rl
index 15ea41e..55daf18 100644 (file)
--- a/test/forder3.rl
+++ b/test/forder3.rl
@@ -83,15 +83,18 @@ through m1 b
 accept m1
 ACCEPT
 enter m2
+enter m2
 accpet m2
 ACCEPT
 enter m1 aa
+enter m1 aa
 leave m1 aa
 through m1 b
 enter m2
 accept m1
 ACCEPT
 enter m1 aa
+enter m1 aa
 leave m1 aa
 through m1 b
 enter m2

diff --git a/test/gotocallret1.rl b/test/gotocallret1.rl
index 54626dd..8b294dd 100644 (file)
--- a/test/gotocallret1.rl
+++ b/test/gotocallret1.rl
@@ -106,6 +106,7 @@ correct command
 ACCEPT
 correct command
 ACCEPT
+error: failed to recover
 FAIL
 error: garbling line
 error: failed to recover

diff --git a/test/langtrans_c.sh b/test/langtrans_c.sh
index 431ec26..12f0ab4 100755 (executable)
--- a/test/langtrans_c.sh
+++ b/test/langtrans_c.sh
@@ -11,7 +11,10 @@ machine=`sed -n 's/^[\t ]*machine[\t ]*\([a-zA-Z_0-9]*\)[\t ]*;[\t ]*$/\1/p' $fi
 # Make a temporary version of the test case using the C language translations.
 sed -n '/\/\*/,/\*\//d;p' $file | txl -q stdin langtrans_c.txl > $file.pr
 
-has_eof_act=`sed -n '/\/\*/,/\*\//d;p' $file | txl -q stdin checkeofact.txl`
+needs_eof=`sed '/@NEEDS_EOF/s/^.*$/yes/p;d' $file`
+if [ "$needs_eof" != 'yes' ]; then
+       needs_eof=`sed -n '/\/\*/,/\*\//d;p' $file | txl -q stdin checkeofact.txl`
+fi
 
 # Begin writing out the test case.
 cat << EOF
@@ -49,7 +52,7 @@ void exec( char *data, int len )
        char *pe = data + len;
 EOF
 
-[ "$has_eof_act" = "yes" ] && echo "char *eof = pe;"
+[ "$needs_eof" = "yes" ] && echo "char *eof = pe;"
 
 cat << EOF
        %% write exec;

diff --git a/test/recdescent1.rl b/test/recdescent1.rl
index 66812f4..1ffca28 100644 (file)
--- a/test/recdescent1.rl
+++ b/test/recdescent1.rl
@@ -74,7 +74,7 @@ void test( char *buf )
        int cs;
        int *stack;
        int top, stack_size;
-       char *p, *pe, *item = 0;
+       char *p, *pe, *eof, *item = 0;
 
        int len = strlen( buf );
 
@@ -85,6 +85,7 @@ void test( char *buf )
 
        p = buf;
        pe = buf + len;
+       eof = pe;
 
        %% write exec;
 

diff --git a/test/recdescent2.rl b/test/recdescent2.rl
index 1e51451..59c4586 100644 (file)
--- a/test/recdescent2.rl
+++ b/test/recdescent2.rl
@@ -71,7 +71,7 @@ class recdescent2
 
        static void test( char data[] )
        {
-               int cs, p = 0, pe = data.length, item = 0;
+               int cs, p = 0, pe = data.length, eof = data.length, item = 0;
                int stack[] = new int[1024];
                int stack_size = 1;
                int top;

diff --git a/test/recdescent3.rl b/test/recdescent3.rl
index c5621e1..1216b43 100644 (file)
--- a/test/recdescent3.rl
+++ b/test/recdescent3.rl
@@ -70,6 +70,7 @@ def run_machine( data )
        item = 0;
        p = 0;
        pe = data.length;
+       eof = pe;
        cs = 0;
        stack = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ];
        stack_size = 1;

diff --git a/test/union.rl b/test/union.rl
index a8beace..8be02e2 100644 (file)
--- a/test/union.rl
+++ b/test/union.rl
@@ -100,6 +100,7 @@ void Concurrent::execute( const char *data, int len )
 {
        const char *p = data;
        const char *pe = data + len;
+       const char *eof = pe;
 
        %% write exec;
 }