Skip to content
Snippets Groups Projects
Commit f7538b7d authored by Jan Trávníček's avatar Jan Trávníček
Browse files

complete outsourcing of symbols normalization to SymbolNormalize

parent 6c3e7e63
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -259,7 +259,7 @@ public:
 
DefaultStateType from = AutomatonNormalize::normalizeState ( std::move ( std::get < 0 > ( transition.first ) ) );
std::variant < DefaultEpsilonType, DefaultSymbolType > input = AutomatonNormalize::normalizeSymbolEpsilon ( std::move ( std::get < 1 > ( transition.first ) ) );
DefaultSymbolType pop ( alib::AnyObject < PushdownStoreSymbolType > ( std::move ( std::get < 2 > ( transition.first ) ) ) );
DefaultSymbolType pop = alphabet::SymbolNormalize::normalizeSymbol ( std::move ( std::get < 2 > ( transition.first ) ) );
 
res->addReturnTransition ( std::move ( from ), std::move ( input ), std::move ( pop ), std::move ( to ) );
}
......
......@@ -298,11 +298,11 @@ public:
for ( std::pair < std::tuple < StateType, std::variant < EpsilonType, InputSymbolType >, PushdownStoreSymbolType >, std::set < StateType > > && transition : std::make_moveable_map ( returnTransitions ) ) {
std::set < DefaultStateType > targets = AutomatonNormalize::normalizeStates ( std::move ( transition.second ) );
 
DefaultSymbolType popSymbol ( alib::AnyObject < PushdownStoreSymbolType > ( std::move ( std::get < 2 > ( transition.first ) ) ) );
DefaultSymbolType pop = alphabet::SymbolNormalize::normalizeSymbol ( std::move ( std::get < 2 > ( transition.first ) ) );
DefaultStateType from = AutomatonNormalize::normalizeState ( std::move ( std::get < 0 > ( transition.first ) ) );
std::variant < DefaultEpsilonType, DefaultSymbolType > input = AutomatonNormalize::normalizeSymbolEpsilon ( std::move ( std::get < 1 > ( transition.first ) ) );
 
res->addReturnTransitions ( std::move ( from ), std::move ( input ), std::move ( popSymbol ), std::move ( targets ) );
res->addReturnTransitions ( std::move ( from ), std::move ( input ), std::move ( pop ), std::move ( targets ) );
}
 
for ( std::pair < std::pair < StateType, std::variant < EpsilonType, InputSymbolType > >, std::set < StateType > > && transition : std::make_moveable_map ( localTransitions ) ) {
......
......@@ -13,8 +13,6 @@
#include <set>
#include <variant>
 
#include <object/AnyObject.h>
#include <alphabet/common/SymbolNormalize.h>
 
namespace grammar {
......
......@@ -14,8 +14,6 @@
#include <variant>
#include <trie>
 
#include <object/AnyObject.h>
#include <alphabet/common/SymbolNormalize.h>
 
namespace indexes {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment