diff --git a/aconversions/src/re2fa/Glushkov.cpp b/aconversions/src/re2fa/Glushkov.cpp index b2a847223bec7e25e7de8ac6c510b395b2d9fee5..5263f85adf4684deb0dcd8f70392ebc31049a65d 100644 --- a/aconversions/src/re2fa/Glushkov.cpp +++ b/aconversions/src/re2fa/Glushkov.cpp @@ -50,10 +50,9 @@ FSM Glushkov::convert( void ) State q0( "q0" ); automaton.addState( q0 ); automaton.addInitialState( q0 ); - int stateId = 0; for( auto const& symbol : GlushkovTraversal::getSymbols( m_re ) ) { - State q( toBase26( stateId ++ ) + to_string( symbol.getId( ) ) ); + State q( symbol.getInputSymbol( ).getSymbol( ) + to_string( symbol.getId( ) ) ); m_stateMap.insert( std::pair<GlushkovSymbol, State>( symbol, q ) ); automaton.addState( q ); diff --git a/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp b/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp index f28ec8c92762289f3a261da597668f2ca86cf4b4..dc75515fa7b045459c5d1bddf1958e03aef7486d 100644 --- a/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp +++ b/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp @@ -46,11 +46,9 @@ RightRegularGrammar GlushkovRRG::convert( void ) Symbol S = grammar.createUniqueNonTerminalSymbol( "S" ); grammar.setStartSymbol( S ); - int nonterminalId = 0; - for( auto const& symbol : GlushkovTraversal::getSymbols( m_re ) ) { - Symbol a = grammar.createUniqueNonTerminalSymbol( toBase26( nonterminalId ++ ) + to_string( symbol.getId( ) ) ); + Symbol a = grammar.createUniqueNonTerminalSymbol( symbol.getInputSymbol().getSymbol() + to_string( symbol.getId( ) ) ); m_symbolMap.insert( std::pair<GlushkovSymbol, Symbol>( symbol, a ) ); }