diff --git a/aconversions/src/re2fa/Glushkov.cpp b/aconversions/src/re2fa/Glushkov.cpp index ccf00c4b0d2893398e9d54d50d8a2781c7c75593..98fa8e88eafa4aed3cbabba49ef1a26b6a5f4c00 100644 --- a/aconversions/src/re2fa/Glushkov.cpp +++ b/aconversions/src/re2fa/Glushkov.cpp @@ -105,7 +105,8 @@ bool Glushkov::NumberedSymbol::operator<( const NumberedSymbol & x ) const Glushkov::NumberedSymbol::NumberedSymbol( const RegExpSymbol * symbol, int i ) : m_i( i ), m_alphabetSymbol( symbol->getSymbol( ) ), - m_state( State( "[" + m_alphabetSymbol.getSymbol( ) + "], id " + to_string( m_i ) ) ) + //m_state( State( "[" + m_alphabetSymbol.getSymbol( ) + "], id " + to_string( m_i ) ) ) + m_state( State( to_string( m_i ) ) ) { } diff --git a/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp b/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp index 0fb53d9938b96d3f23ed1d0aedf8b88ad686ab67..4416d1fcb63c7107721d7938be4dc5c76583550f 100644 --- a/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp +++ b/aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp @@ -29,11 +29,11 @@ GlushkovRRG::~GlushkovRRG( void ) RightRegularGrammar GlushkovRRG::convert( void ) { // step 1 - initNumberSymbols( ); - for( const auto & symbol : RegExpAlphabet::getSymbols( m_re ) ) m_grammar.addTerminalSymbol( symbol.getSymbol( ) ); + initNumberSymbols( ); + // steps 2, 3, 4 constructBeginSymbolSet( ); constructEndSymbolSet( ); @@ -136,7 +136,8 @@ bool GlushkovRRG::NumberedSymbol::operator<( const NumberedSymbol & x ) const GlushkovRRG::NumberedSymbol::NumberedSymbol( const RegExpSymbol * symbol, grammar::RightRegularGrammar & g, int i ) : m_i( i ), m_alphabetSymbol( symbol->getSymbol( ) ), - m_nonTerminal( g.createUniqueNonTerminalSymbol( "[" + m_alphabetSymbol.getSymbol( ) + "], id " + to_string( m_i ), false ) ) + // m_nonTerminal( g.createUniqueNonTerminalSymbol( "[" + m_alphabetSymbol.getSymbol( ) + "], id " + to_string( m_i ), false ) ) + m_nonTerminal( g.createUniqueNonTerminalSymbol( to_string( m_i ), false ) ) { }