Adjust maxIndexOffset to include eofTrans. Use maxIndexOffset when picking the

type for eofTrans.

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

diff --git a/redfsm/gendata.cpp b/redfsm/gendata.cpp
index 5d5bcd3..49d8fe4 100644 (file)
--- a/redfsm/gendata.cpp
+++ b/redfsm/gendata.cpp
@@ -554,7 +554,7 @@ void CodeGenData::setValueLimits()
                if ( ! st.last() ) {
                        redFsm->maxCondOffset += st->stateCondList.length();
                        redFsm->maxKeyOffset += st->outSingle.length() + st->outRange.length()*2;
-                       redFsm->maxIndexOffset += st->outSingle.length() + st->outRange.length() + 1;
+                       redFsm->maxIndexOffset += st->outSingle.length() + st->outRange.length() + 2;
                }
 
                /* Max cond span. */

diff --git a/rlgen-cd/fflatcodegen.cpp b/rlgen-cd/fflatcodegen.cpp
index 806d732..56e6685 100644 (file)
--- a/rlgen-cd/fflatcodegen.cpp
+++ b/rlgen-cd/fflatcodegen.cpp
@@ -227,7 +227,7 @@ void FFlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-cd/flatcodegen.cpp b/rlgen-cd/flatcodegen.cpp
index 7195bc8..55a6642 100644 (file)
--- a/rlgen-cd/flatcodegen.cpp
+++ b/rlgen-cd/flatcodegen.cpp
@@ -624,7 +624,7 @@ void FlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-cd/ftabcodegen.cpp b/rlgen-cd/ftabcodegen.cpp
index 32c8635..3aac8af 100644 (file)
--- a/rlgen-cd/ftabcodegen.cpp
+++ b/rlgen-cd/ftabcodegen.cpp
@@ -281,7 +281,7 @@ void FTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-cd/tabcodegen.cpp b/rlgen-cd/tabcodegen.cpp
index 977ec63..cc6d670 100644 (file)
--- a/rlgen-cd/tabcodegen.cpp
+++ b/rlgen-cd/tabcodegen.cpp
@@ -860,7 +860,7 @@ void TabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-csharp/fflatcodegen.cpp b/rlgen-csharp/fflatcodegen.cpp
index f96975d..cbce95f 100644 (file)
--- a/rlgen-csharp/fflatcodegen.cpp
+++ b/rlgen-csharp/fflatcodegen.cpp
@@ -227,7 +227,7 @@ void CSharpFFlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-csharp/flatcodegen.cpp b/rlgen-csharp/flatcodegen.cpp
index bf3ba24..ca3ce89 100644 (file)
--- a/rlgen-csharp/flatcodegen.cpp
+++ b/rlgen-csharp/flatcodegen.cpp
@@ -625,7 +625,7 @@ void CSharpFlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-csharp/ftabcodegen.cpp b/rlgen-csharp/ftabcodegen.cpp
index 7f36716..421ee9b 100644 (file)
--- a/rlgen-csharp/ftabcodegen.cpp
+++ b/rlgen-csharp/ftabcodegen.cpp
@@ -281,7 +281,7 @@ void CSharpFTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-csharp/tabcodegen.cpp b/rlgen-csharp/tabcodegen.cpp
index 9233246..8c8e113 100644 (file)
--- a/rlgen-csharp/tabcodegen.cpp
+++ b/rlgen-csharp/tabcodegen.cpp
@@ -804,7 +804,7 @@ void CSharpTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-java/javacodegen.cpp b/rlgen-java/javacodegen.cpp
index fdce2b3..0859e0c 100644 (file)
--- a/rlgen-java/javacodegen.cpp
+++ b/rlgen-java/javacodegen.cpp
@@ -942,7 +942,7 @@ void JavaTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-ruby/ruby-fflatcodegen.cpp b/rlgen-ruby/ruby-fflatcodegen.cpp
index a7f1c55..89cab90 100644 (file)
--- a/rlgen-ruby/ruby-fflatcodegen.cpp
+++ b/rlgen-ruby/ruby-fflatcodegen.cpp
@@ -310,7 +310,7 @@ void RubyFFlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-ruby/ruby-flatcodegen.cpp b/rlgen-ruby/ruby-flatcodegen.cpp
index a8e7469..a9346a9 100644 (file)
--- a/rlgen-ruby/ruby-flatcodegen.cpp
+++ b/rlgen-ruby/ruby-flatcodegen.cpp
@@ -647,7 +647,7 @@ void RubyFlatCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-ruby/ruby-ftabcodegen.cpp b/rlgen-ruby/ruby-ftabcodegen.cpp
index 0b4487f..ae4701f 100644 (file)
--- a/rlgen-ruby/ruby-ftabcodegen.cpp
+++ b/rlgen-ruby/ruby-ftabcodegen.cpp
@@ -350,7 +350,7 @@ void RubyFTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";

diff --git a/rlgen-ruby/ruby-tabcodegen.cpp b/rlgen-ruby/ruby-tabcodegen.cpp
index 8b97697..105c44d 100644 (file)
--- a/rlgen-ruby/ruby-tabcodegen.cpp
+++ b/rlgen-ruby/ruby-tabcodegen.cpp
@@ -1015,7 +1015,7 @@ void RubyTabCodeGen::writeData()
        }
 
        if ( redFsm->anyEofTrans() ) {
-               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex+1), ET() );
+               OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
                EOF_TRANS();
                CLOSE_ARRAY() <<
                "\n";