From eacf5485f4a0b3d2d7ead2bffd5b5263c880e540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <peckato1@fit.cvut.cz>
Date: Mon, 12 May 2014 11:25:30 +0200
Subject: [PATCH] aconversions: Glushkov state/nonterm names
---
aconversions/src/re2fa/Glushkov.cpp | 3 +--
aconversions/src/re2rg/re2rrg/GlushkovRRG.cpp | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/aconversions/src/re2fa/Glushkov.cpp b/aconversions/src/re2fa/Glushkov.cpp
index b2a847223b..5263f85adf 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 f28ec8c927..dc75515fa7 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 ) );
}
--
GitLab