Applied java data array encoding patch from Colin Fleming. Only works with byte

and short alphabet types. The transformation to java in the test suite sets the
byte alphabet type (default is char, which is unimplemented).

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

diff --git a/javagen/fsmcodegen.cpp b/javagen/fsmcodegen.cpp
index 982e2e6..22fcaf9 100644 (file)
--- a/javagen/fsmcodegen.cpp
+++ b/javagen/fsmcodegen.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <string>
 #include <assert.h>
-
+#include <iomanip>
 
 using std::ostream;
 using std::ostringstream;
@@ -84,26 +84,18 @@ string FsmCodeGen::START_STATE_ID()
 /* Write out the array of actions. */
 std::ostream &FsmCodeGen::ACTIONS_ARRAY()
 {
-       out << "\t0, ";
-       int totalActions = 1;
+       START_ARRAY_LINE();
+       int totalActions = 0;
+       ARRAY_ITEM( 0, ++totalActions, false );
        for ( ActionTableMap::Iter act = redFsm->actionMap; act.lte(); act++ ) {
                /* Write out the length, which will never be the last character. */
-               out << act->key.length() << ", ";
-               /* Put in a line break every 8 */
-               if ( totalActions++ % 8 == 7 )
-                       out << "\n\t";
+               ARRAY_ITEM( act->key.length(), ++totalActions, false );
 
                for ( ActionTable::Iter item = act->key; item.lte(); item++ ) {
-                       out << item->value->actionId;
-                       if ( ! (act.last() && item.last()) )
-                               out << ", ";
-
-                       /* Put in a line break every 8 */
-                       if ( totalActions++ % 8 == 7 )
-                               out << "\n\t";
+                       ARRAY_ITEM( item->value->actionId, ++totalActions, (act.last() && item.last()) );
                }
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
@@ -174,16 +166,9 @@ string FsmCodeGen::TABS( int level )
        return result;
 }
 
-/* Write out a key from the fsm code gen. Depends on wether or not the key is
- * signed. */
-string FsmCodeGen::KEY( Key key )
+int FsmCodeGen::KEY( Key key )
 {
-       ostringstream ret;
-       if ( keyOps->isSigned || !hostLang->explicitUnsigned )
-               ret << key.getVal();
-       else
-               ret << (unsigned long) key.getVal() << 'u';
-       return ret.str();
+       return key.getVal();
 }
 
 void FsmCodeGen::EXEC( ostream &ret, InlineItem *item, int targState, int inFinish )
@@ -498,6 +483,33 @@ std::ostream &CCodeGen::OPEN_ARRAY( string type, string name )
        return out;
 }
 
+std::ostream &CCodeGen::START_ARRAY_LINE()
+{
+       out << "\t";
+       return out;
+}
+
+std::ostream &CCodeGen::ARRAY_ITEM( int item, int count, bool last )
+{
+       out << item;
+       if ( !last )
+       {
+               out << ", ";
+               if ( count % IALL == 0 )
+               {
+                       END_ARRAY_LINE();
+                       START_ARRAY_LINE();
+               }
+       }
+       return out;
+}
+
+std::ostream &CCodeGen::END_ARRAY_LINE()
+{
+       out << "\n";
+       return out;
+}
+
 std::ostream &CCodeGen::CLOSE_ARRAY()
 {
        return out << "};\n";
@@ -570,6 +582,33 @@ std::ostream &DCodeGen::OPEN_ARRAY( string type, string name )
        return out;
 }
 
+std::ostream &DCodeGen::START_ARRAY_LINE()
+{
+       out << "\t";
+       return out;
+}
+
+std::ostream &DCodeGen::ARRAY_ITEM( int item, int count, bool last )
+{
+       out << item;
+       if ( !last )
+       {
+               out << ", ";
+               if ( count % IALL == 0 )
+               {
+                       END_ARRAY_LINE();
+                       START_ARRAY_LINE();
+               }
+       }
+       return out;
+}
+
+std::ostream &DCodeGen::END_ARRAY_LINE()
+{
+       out << "\n";
+       return out;
+}
+
 std::ostream &DCodeGen::CLOSE_ARRAY()
 {
        return out << "];\n";
@@ -621,13 +660,58 @@ string JavaCodeGen::PTR_CONST()
 
 std::ostream &JavaCodeGen::OPEN_ARRAY( string type, string name )
 {
-       out << "static final " << type << "[] " << name << " = {\n";
+       array_type = type;
+       array_name = name;
+       out << "private static final String packed" << name << " = \n";
+       return out;
+}
+
+std::ostream &JavaCodeGen::START_ARRAY_LINE()
+{
+       out << "\t\"";
+       return out;
+}
+
+std::ostream &JavaCodeGen::ARRAY_ITEM( int item, int count, bool last )
+{
+       // 0 codes in 2 bytes in the Java class file and is common,
+       // so we increment all values by one when packing
+       item++;
+
+       std::ios_base::fmtflags originalFlags=out.flags();
+       if ( item < 0x80 )
+       {
+               out << std::oct << "\\" << item;
+       }
+       else
+       {
+               out << std::hex << "\\u" << std::setfill('0') << std::setw(4) << item;
+       }
+       out.flags(originalFlags);
+       
+       if ( !last )
+       {
+               if ( count % IALL == 0 )
+               {
+                       END_ARRAY_LINE();
+                       START_ARRAY_LINE();
+               }
+       }
+       return out;
+}
+
+std::ostream &JavaCodeGen::END_ARRAY_LINE()
+{
+       out << "\" +\n";
        return out;
 }
 
 std::ostream &JavaCodeGen::CLOSE_ARRAY()
 {
-       return out << "};\n";
+       out << "\t\"\";\n";
+       out << "static final " << array_type << "[] " << array_name 
+               << " = unpack_" << array_type << "(packed" << array_name << ");\n";
+       return out;
 }
 
 std::ostream &JavaCodeGen::STATIC_VAR( string type, string name )

diff --git a/javagen/fsmcodegen.h b/javagen/fsmcodegen.h
index 1071190..fb9894c 100644 (file)
--- a/javagen/fsmcodegen.h
+++ b/javagen/fsmcodegen.h
@@ -79,7 +79,7 @@ protected:
        string GET_WIDE_KEY();
        string GET_WIDE_KEY( RedStateAp *state );
        string TABS( int level );
-       string KEY( Key key );
+       int KEY( Key key );
        string LDIR_PATH( char *path );
        void ACTION( ostream &ret, Action *action, int targState, bool inFinish );
        void CONDITION( ostream &ret, Action *condition );
@@ -160,6 +160,9 @@ protected:
 
        virtual string PTR_CONST() = 0;
        virtual ostream &OPEN_ARRAY( string type, string name ) = 0;
+       virtual ostream &START_ARRAY_LINE() = 0;
+       virtual ostream &ARRAY_ITEM( int item, int count, bool last ) = 0;
+       virtual ostream &END_ARRAY_LINE() = 0;
        virtual ostream &CLOSE_ARRAY() = 0;
        virtual ostream &STATIC_VAR( string type, string name ) = 0;
 
@@ -198,6 +201,9 @@ public:
        virtual string POINTER();
        virtual ostream &SWITCH_DEFAULT();
        virtual ostream &OPEN_ARRAY( string type, string name );
+       virtual ostream &START_ARRAY_LINE();
+       virtual ostream &ARRAY_ITEM( int item, int count, bool last );
+       virtual ostream &END_ARRAY_LINE();
        virtual ostream &CLOSE_ARRAY();
        virtual ostream &STATIC_VAR( string type, string name );
        virtual string ARR_OFF( string ptr, string offset );
@@ -217,6 +223,9 @@ public:
        virtual ostream &SWITCH_DEFAULT();
        virtual ostream &OPEN_ARRAY( string type, string name );
        virtual ostream &CLOSE_ARRAY();
+       virtual ostream &START_ARRAY_LINE();
+       virtual ostream &ARRAY_ITEM( int item, int count, bool last );
+       virtual ostream &END_ARRAY_LINE();
        virtual ostream &STATIC_VAR( string type, string name );
        virtual string ARR_OFF( string ptr, string offset );
        virtual string CAST( string type );
@@ -227,6 +236,10 @@ public:
 
 class JavaCodeGen : virtual public FsmCodeGen
 {
+private:
+       string array_type;
+       string array_name;
+
 public:
        JavaCodeGen( ostream &out ) : FsmCodeGen(out) {}
 
@@ -234,6 +247,9 @@ public:
        virtual string POINTER();
        virtual ostream &SWITCH_DEFAULT();
        virtual ostream &OPEN_ARRAY( string type, string name );
+       virtual ostream &START_ARRAY_LINE();
+       virtual ostream &ARRAY_ITEM( int item, int count, bool last );
+       virtual ostream &END_ARRAY_LINE();
        virtual ostream &CLOSE_ARRAY();
        virtual ostream &STATIC_VAR( string type, string name );
        virtual string ARR_OFF( string ptr, string offset );

diff --git a/javagen/javacodegen.cpp b/javagen/javacodegen.cpp
index 109a846..4275743 100644 (file)
--- a/javagen/javacodegen.cpp
+++ b/javagen/javacodegen.cpp
@@ -168,6 +168,37 @@ void JavaTabCodeGen::LOCATE_TRANS()
                "\n";
 }
 
+void JavaTabCodeGen::writeOutData()
+{
+       TabCodeGen::writeOutData();
+       
+       out <<
+               "       private static byte[] unpack_byte(String packed)\n"
+               "       {\n"
+               "               byte[] ret = new byte[packed.length()];\n"
+               "               for (int i = 0; i < packed.length(); i++)\n"
+               "               {\n"
+               "                       int value = packed.charAt(i);\n"
+               "                       value--;\n"
+               "                       ret[i] = (byte) value;\n"
+               "               }\n"
+               "               return ret;\n"
+               "       }\n"
+               "       private static short[] unpack_short(String packed)\n"
+               "       {\n"
+               "               short[] ret = new short[packed.length()];\n"
+               "               for (int i = 0; i < packed.length(); i++)\n"
+               "               {\n"
+               "                       int value = packed.charAt(i);\n"
+               "                       value--;\n"
+               "                       ret[i] = (short) value;\n"
+               "               }\n"
+               "               return ret;\n"
+               "       }\n";
+
+       
+}
+
 void JavaTabCodeGen::writeOutExec()
 {
        out <<

diff --git a/javagen/javacodegen.h b/javagen/javacodegen.h
index 3481a6c..58ec9e0 100644 (file)
--- a/javagen/javacodegen.h
+++ b/javagen/javacodegen.h
@@ -44,6 +44,7 @@ struct JavaTabCodeGen
        void LOCATE_TRANS();
        virtual void writeOutExec();
        virtual void writeOutEOF();
+       virtual void writeOutData();
 };
 
 

diff --git a/javagen/tabcodegen.cpp b/javagen/tabcodegen.cpp
index be6c8cc..57c0a35 100644 (file)
--- a/javagen/tabcodegen.cpp
+++ b/javagen/tabcodegen.cpp
@@ -54,42 +54,38 @@ void TabCodeGen::calcIndexSize()
        useIndicies = sizeWithInds < sizeWithoutInds;
 }
 
-std::ostream &TabCodeGen::TO_STATE_ACTION( RedStateAp *state )
+int TabCodeGen::TO_STATE_ACTION( RedStateAp *state )
 {
        int act = 0;
        if ( state->toStateAction != 0 )
                act = state->toStateAction->location+1;
-       out << act;
-       return out;
+       return act;
 }
 
-std::ostream &TabCodeGen::FROM_STATE_ACTION( RedStateAp *state )
+int TabCodeGen::FROM_STATE_ACTION( RedStateAp *state )
 {
        int act = 0;
        if ( state->fromStateAction != 0 )
                act = state->fromStateAction->location+1;
-       out << act;
-       return out;
+       return act;
 }
 
-std::ostream &TabCodeGen::EOF_ACTION( RedStateAp *state )
+int TabCodeGen::EOF_ACTION( RedStateAp *state )
 {
        int act = 0;
        if ( state->eofAction != 0 )
                act = state->eofAction->location+1;
-       out << act;
-       return out;
+       return act;
 }
 
 
-std::ostream &TabCodeGen::TRANS_ACTION( RedTransAp *trans )
+int TabCodeGen::TRANS_ACTION( RedTransAp *trans )
 {
        /* If there are actions, emit them. Otherwise emit zero. */
        int act = 0;
        if ( trans->action != 0 )
                act = trans->action->location+1;
-       out << act;
-       return out;
+       return act;
 }
 
 std::ostream &TabCodeGen::TO_STATE_ACTION_SWITCH()
@@ -163,313 +159,247 @@ std::ostream &TabCodeGen::ACTION_SWITCH()
 
 std::ostream &TabCodeGen::COND_OFFSETS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0, curKeyOffset = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write the key offset. */
-               out << curKeyOffset;
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( curKeyOffset, ++totalStateNum, st.last() );
 
                /* Move the key offset ahead. */
                curKeyOffset += st->stateCondList.length();
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::KEY_OFFSETS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0, curKeyOffset = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write the key offset. */
-               out << curKeyOffset;
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( curKeyOffset, ++totalStateNum, st.last() );
 
                /* Move the key offset ahead. */
                curKeyOffset += st->outSingle.length() + st->outRange.length()*2;
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 
 std::ostream &TabCodeGen::INDEX_OFFSETS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0, curIndOffset = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write the index offset. */
-               out << curIndOffset;
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( curIndOffset, ++totalStateNum, st.last() );
 
                /* Move the index offset ahead. */
                curIndOffset += st->outSingle.length() + st->outRange.length();
                if ( st->defTrans != 0 )
                        curIndOffset += 1;
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::COND_LENS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write singles length. */
-               out << st->stateCondList.length();
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( st->stateCondList.length(), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 
 std::ostream &TabCodeGen::SINGLE_LENS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write singles length. */
-               out << st->outSingle.length();
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( st->outSingle.length(), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::RANGE_LENS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Emit length of range index. */
-               out << st->outRange.length();
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( st->outRange.length(), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::TO_STATE_ACTIONS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write any eof action. */
-               TO_STATE_ACTION(st);
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( TO_STATE_ACTION(st), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::FROM_STATE_ACTIONS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write any eof action. */
-               FROM_STATE_ACTION(st);
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( FROM_STATE_ACTION(st), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::EOF_ACTIONS()
 {
-       out << "\t";
+       START_ARRAY_LINE();
        int totalStateNum = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Write any eof action. */
-               EOF_ACTION(st);
-               if ( !st.last() ) {
-                       out << ", ";
-                       if ( ++totalStateNum % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( EOF_ACTION(st), ++totalStateNum, st.last() );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::COND_KEYS()
 {
-       out << '\t';
+       START_ARRAY_LINE();
        int totalTrans = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Loop the state's transitions. */
                for ( StateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
                        /* Lower key. */
-                       out << KEY( sc->lowKey ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
-
-                       /* Upper key. */
-                       out << KEY( sc->highKey ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( sc->lowKey ), ++totalTrans, false );
+                       ARRAY_ITEM( KEY( sc->highKey ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::COND_SPACES()
 {
-       out << '\t';
+       START_ARRAY_LINE();
        int totalTrans = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Loop the state's transitions. */
                for ( StateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
                        /* Cond Space id. */
-                       out << sc->condSpace->condSpaceId << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( sc->condSpace->condSpaceId ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::KEYS()
 {
-       out << '\t';
+       START_ARRAY_LINE();
        int totalTrans = 0;
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Loop the singles. */
                for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-                       out << KEY( stel->lowKey ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( stel->lowKey ), ++totalTrans, false );
                }
 
                /* Loop the state's transitions. */
                for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
                        /* Lower key. */
-                       out << KEY( rtel->lowKey ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( rtel->lowKey ), ++totalTrans, false );
 
                        /* Upper key. */
-                       out << KEY( rtel->highKey ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( rtel->highKey ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::INDICIES()
 {
        int totalTrans = 0;
-       out << '\t';
+       START_ARRAY_LINE();
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Walk the singles. */
                for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-                       out << stel->value->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( stel->value->id ), ++totalTrans, false );
                }
 
                /* Walk the ranges. */
                for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
-                       out << rtel->value->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( rtel->value->id ), ++totalTrans, false );
                }
 
                /* The state's default index goes next. */
                if ( st->defTrans != 0 ) {
-                       out << st->defTrans->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( st->defTrans->id ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
 std::ostream &TabCodeGen::TRANS_TARGS()
 {
        int totalTrans = 0;
-       out << '\t';
+       START_ARRAY_LINE();
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Walk the singles. */
                for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
                        RedTransAp *trans = stel->value;
-                       out << trans->targ->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( trans->targ->id ), ++totalTrans, false );
                }
 
                /* Walk the ranges. */
                for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
                        RedTransAp *trans = rtel->value;
-                       out << trans->targ->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( trans->targ->id ), ++totalTrans, false );
                }
 
                /* The state's default target state. */
                if ( st->defTrans != 0 ) {
                        RedTransAp *trans = st->defTrans;
-                       out << trans->targ->id << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( KEY( trans->targ->id ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
@@ -477,36 +407,31 @@ std::ostream &TabCodeGen::TRANS_TARGS()
 std::ostream &TabCodeGen::TRANS_ACTIONS()
 {
        int totalTrans = 0;
-       out << '\t';
+       START_ARRAY_LINE();
        for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
                /* Walk the singles. */
                for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
                        RedTransAp *trans = stel->value;
-                       TRANS_ACTION( trans ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( TRANS_ACTION( trans ), ++totalTrans, false );
                }
 
                /* Walk the ranges. */
                for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
                        RedTransAp *trans = rtel->value;
-                       TRANS_ACTION( trans ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( TRANS_ACTION( trans ), ++totalTrans, false );
                }
 
                /* The state's default index goes next. */
                if ( st->defTrans != 0 ) {
                        RedTransAp *trans = st->defTrans;
-                       TRANS_ACTION( trans ) << ", ";
-                       if ( ++totalTrans % IALL == 0 )
-                               out << "\n\t";
+                       ARRAY_ITEM( TRANS_ACTION( trans ), ++totalTrans, false );
                }
        }
 
        /* Output one last number so we don't have to figure out when the last
         * entry is and avoid writing a comma. */
-       out << 0 << "\n";
+       ARRAY_ITEM( 0, ++totalTrans, true );
+       END_ARRAY_LINE();
        return out;
 }
 
@@ -518,19 +443,14 @@ std::ostream &TabCodeGen::TRANS_TARGS_WI()
                transPtrs[trans->id] = trans;
 
        /* Keep a count of the num of items in the array written. */
-       out << '\t';
+       START_ARRAY_LINE();
        int totalStates = 0;
        for ( int t = 0; t < redFsm->transSet.length(); t++ ) {
                /* Write out the target state. */
                RedTransAp *trans = transPtrs[t];
-               out << trans->targ->id;
-               if ( t < redFsm->transSet.length()-1 ) {
-                       out << ", ";
-                       if ( ++totalStates % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( trans->targ->id, ++totalStates, ( t >= redFsm->transSet.length()-1 ) );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        delete[] transPtrs;
        return out;
 }
@@ -544,19 +464,14 @@ std::ostream &TabCodeGen::TRANS_ACTIONS_WI()
                transPtrs[trans->id] = trans;
 
        /* Keep a count of the num of items in the array written. */
-       out << '\t';
+       START_ARRAY_LINE();
        int totalAct = 0;
        for ( int t = 0; t < redFsm->transSet.length(); t++ ) {
                /* Write the function for the transition. */
                RedTransAp *trans = transPtrs[t];
-               TRANS_ACTION( trans );
-               if ( t < redFsm->transSet.length()-1 ) {
-                       out << ", ";
-                       if ( ++totalAct % IALL == 0 )
-                               out << "\n\t";
-               }
+               ARRAY_ITEM( TRANS_ACTION( trans ), ++totalAct, ( t >= redFsm->transSet.length()-1 ) );
        }
-       out << "\n";
+       END_ARRAY_LINE();
        delete[] transPtrs;
        return out;
 }

diff --git a/javagen/tabcodegen.h b/javagen/tabcodegen.h
index c946e80..bb59dba 100644 (file)
--- a/javagen/tabcodegen.h
+++ b/javagen/tabcodegen.h
@@ -82,10 +82,10 @@ protected:
        void RET( ostream &ret, bool inFinish );
        void BREAK( ostream &ret, int targState );
 
-       virtual std::ostream &TO_STATE_ACTION( RedStateAp *state );
-       virtual std::ostream &FROM_STATE_ACTION( RedStateAp *state );
-       virtual std::ostream &EOF_ACTION( RedStateAp *state );
-       virtual std::ostream &TRANS_ACTION( RedTransAp *trans );
+       virtual int TO_STATE_ACTION( RedStateAp *state );
+       virtual int FROM_STATE_ACTION( RedStateAp *state );
+       virtual int EOF_ACTION( RedStateAp *state );
+       virtual int TRANS_ACTION( RedTransAp *trans );
        virtual void calcIndexSize();
        virtual void writeOutEOF();
 };

diff --git a/test/java1.rl b/test/java1.rl
index 128386f..d98f6c7 100644 (file)
--- a/test/java1.rl
+++ b/test/java1.rl
@@ -7,6 +7,7 @@ class java1
 {
        %%{
                machine java1;
+               alphtype byte;
 
                one := 'one\n';
                two := 'two\n';

diff --git a/test/java2.rl b/test/java2.rl
index 61d9ac9..a20d793 100644 (file)
--- a/test/java2.rl
+++ b/test/java2.rl
@@ -1,6 +1,9 @@
 /*
  * @LANG: java
  * @ALLOW_GENFLAGS: -T0
+ *
+ * Need unpacking of integer types for this to work.
+ * @IGNORE: yes
  */
 
 class java2

diff --git a/test/langtrans_java.txl b/test/langtrans_java.txl
index 3f1755d..542e35b 100644 (file)
--- a/test/langtrans_java.txl
+++ b/test/langtrans_java.txl
@@ -272,6 +272,16 @@ rule machineName
                'machine ClassName ';
 end rule
 
+function byteAlphtype
+       replace * [repeat statement]
+               MS [machine_stmt]
+               Rest [repeat statement]
+       by
+               MS
+               'alphtype 'byte ';
+               Rest
+end function
+
 function langTransJava
        replace [program]
                Definitions [repeat action_lang_stmt]
@@ -283,7 +293,7 @@ function langTransJava
        construct JavaInitializations [repeat java_lang_stmt]
                _ [alToJava Initializations]
        construct NewRagelDef [ragel_def]
-               RagelDef [actionTransJava] [machineName]
+               RagelDef [actionTransJava] [machineName] [byteAlphtype]
        import ArrayInits [java_statements]
                ArrayInitStmts [repeat java_lang_stmt]
        by

diff --git a/test/testcase.txl b/test/testcase.txl
index cd02bb8..0b82b6f 100644 (file)
--- a/test/testcase.txl
+++ b/test/testcase.txl
@@ -17,6 +17,7 @@ keys
        'int 'bool 'true 'false 'char 'ptr
        'if 'else 'printi 'prints 
        'fc 'fpc 'fbreak 'fgoto 'fcall 'fret 'fhold 'fexec
+       'machine 'alphtype 'action
 end keys
 
 define lang_indep
@@ -38,6 +39,7 @@ end define
 
 define statement
                [machine_stmt]
+       |       [alphtype_stmt]
        |       [action_stmt]
        |       [cond_action_stmt]
        |       [machine_def]
@@ -48,6 +50,10 @@ define machine_stmt
                'machine [id] '; [NL]
 end define
 
+define alphtype_stmt
+               'alphtype [repeat id] '; [NL]
+end define
+
 define action_stmt
                'action [id] [al_host_block]
 end define