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

template RightRG in grammar to regexp algo

parent 20a7c913
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
alib2algo/src/grammar/convert/ToRegExp.h
+ 8
− 8
View file @ bb4925db
...@@ -23,20 +23,20 @@ public: ...@@ -23,20 +23,20 @@ public:
* @return regexp equivalent to source right regular grammar. * @return regexp equivalent to source right regular grammar.
* @param grammar Grammar to convert * @param grammar Grammar to convert
*/ */
template < class TerminalSymbolType, class NonterminalSymbolType >
static regexp::UnboundedRegExp < TerminalSymbolType > convert ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & grammar );
template < class SymbolType > template < class SymbolType >
static regexp::UnboundedRegExp < > convert(const grammar::RightRG < SymbolType > & grammar); static regexp::UnboundedRegExp < > convert ( const grammar::LeftRG < SymbolType > & grammar );
template < class SymbolType >
static regexp::UnboundedRegExp < > convert(const grammar::LeftRG < SymbolType > & grammar);
}; };
   
template < class SymbolType > template < class TerminalSymbolType, class NonterminalSymbolType >
regexp::UnboundedRegExp < > ToRegExp::convert(const grammar::RightRG < SymbolType > & grammar) { regexp::UnboundedRegExp < TerminalSymbolType > ToRegExp::convert ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & grammar ) {
return ToRegExpAlgebraic::convert(grammar); return ToRegExpAlgebraic::convert ( grammar );
} }
   
template < class SymbolType > template < class SymbolType >
regexp::UnboundedRegExp < > ToRegExp::convert(const grammar::LeftRG < SymbolType > & grammar) { regexp::UnboundedRegExp < > ToRegExp::convert ( const grammar::LeftRG < SymbolType > & grammar ) {
return ToRegExpAlgebraic::convert(grammar); return ToRegExpAlgebraic::convert ( grammar );
} }
   
} /* namespace covert */ } /* namespace covert */
......
alib2algo/src/grammar/convert/ToRegExpAlgebraic.h
+ 13
− 13
View file @ bb4925db
...@@ -27,8 +27,8 @@ public: ...@@ -27,8 +27,8 @@ public:
* @return regexp equivalent to source right regular grammar. * @return regexp equivalent to source right regular grammar.
* @param grammar Grammar to convert * @param grammar Grammar to convert
*/ */
template < class SymbolType > template < class TerminalSymbolType, class NonterminalSymbolType >
static regexp::UnboundedRegExp < SymbolType > convert(const grammar::RightRG < SymbolType > & grammar); static regexp::UnboundedRegExp < TerminalSymbolType > convert ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & grammar);
template < class SymbolType > template < class SymbolType >
static regexp::UnboundedRegExp < SymbolType > convert(const grammar::LeftRG < SymbolType > & grammar); static regexp::UnboundedRegExp < SymbolType > convert(const grammar::LeftRG < SymbolType > & grammar);
}; };
...@@ -58,29 +58,29 @@ regexp::UnboundedRegExp < SymbolType > ToRegExpAlgebraic::convert(const grammar: ...@@ -58,29 +58,29 @@ regexp::UnboundedRegExp < SymbolType > ToRegExpAlgebraic::convert(const grammar:
return solver.solve(grammar.getInitialSymbol()); return solver.solve(grammar.getInitialSymbol());
} }
   
template < class SymbolType > template < class TerminalSymbolType, class NonterminalSymbolType >
regexp::UnboundedRegExp < SymbolType > ToRegExpAlgebraic::convert(const grammar::RightRG < SymbolType > & grammar) { regexp::UnboundedRegExp < TerminalSymbolType > ToRegExpAlgebraic::convert ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & grammar) {
equations::RightRegularEquationSolver < SymbolType, SymbolType > solver; equations::RightRegularEquationSolver < TerminalSymbolType, NonterminalSymbolType > solver;
   
solver.setVariableSymbols(grammar.getNonterminalAlphabet()); solver.setVariableSymbols(grammar.getNonterminalAlphabet());
   
for(const auto & rule : grammar.getRules()) { for(const auto & rule : grammar.getRules()) {
const SymbolType& lhs = rule.first; const NonterminalSymbolType & lhs = rule.first;
   
for(const auto& ruleRHS : rule.second) { for(const auto& ruleRHS : rule.second) {
if(ruleRHS.template is<SymbolType>()) { if ( ruleRHS.template is < TerminalSymbolType > ( ) ) {
const SymbolType& rhs = ruleRHS.template get<SymbolType>(); const TerminalSymbolType & rhs = ruleRHS.template get < TerminalSymbolType > ( );
solver.addEquation(lhs, regexp::UnboundedRegExpSymbol < SymbolType > (rhs)); solver.addEquation ( lhs, regexp::UnboundedRegExpSymbol < TerminalSymbolType > ( rhs ) );
} else { } else {
const ext::pair<SymbolType, SymbolType>& rhs = ruleRHS.template get<ext::pair<SymbolType, SymbolType>>(); const ext::pair < TerminalSymbolType, NonterminalSymbolType > & rhs = ruleRHS.template get < ext::pair < TerminalSymbolType, NonterminalSymbolType > > ( );
solver.addEquation(lhs, rhs.second, regexp::UnboundedRegExpSymbol < SymbolType > (rhs.first)); solver.addEquation ( lhs, rhs.second, regexp::UnboundedRegExpSymbol < TerminalSymbolType > ( rhs.first ) );
} }
} }
} }
if(grammar.getGeneratesEpsilon()) if(grammar.getGeneratesEpsilon())
solver.addEquation(grammar.getInitialSymbol(), regexp::UnboundedRegExpEpsilon < SymbolType > ()); solver.addEquation ( grammar.getInitialSymbol ( ), regexp::UnboundedRegExpEpsilon < TerminalSymbolType > ( ) );
   
return solver.solve(grammar.getInitialSymbol()); return solver.solve ( grammar.getInitialSymbol ( ) );
} }
   
} /* namespace covert */ } /* namespace covert */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment