diff --git a/alib2algo/src/regexp/convert/ToAutomatonGlushkov.cpp b/alib2algo/src/regexp/convert/ToAutomatonGlushkov.cpp index 22f67ae66d420aeba13d24a8077901bd168dfcb2..6c7c9262fc44a12c059cb168cbf7573728d4eb3a 100644 --- a/alib2algo/src/regexp/convert/ToAutomatonGlushkov.cpp +++ b/alib2algo/src/regexp/convert/ToAutomatonGlushkov.cpp @@ -77,8 +77,8 @@ automaton::NFA < > ToAutomatonGlushkov::convert ( const regexp::UnboundedRegExp return automaton; } -automaton::NFA < > ToAutomatonGlushkov::convert ( const regexp::FormalRegExp < > & /* regexp */ ) { - throw exception::CommonException ( "Glushkov: Converting FormalRegExp NYI" ); // TODO +automaton::NFA < > ToAutomatonGlushkov::convert ( const regexp::FormalRegExp < > & regexp ) { + return ToAutomatonGlushkov::convert ( regexp::UnboundedRegExp < > ( regexp ) ); } auto ToAutomatonGlushkovUnboundedRegExp = registration::AbstractRegister < ToAutomatonGlushkov, automaton::NFA < >, const regexp::UnboundedRegExp < > & > ( ToAutomatonGlushkov::convert ); diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp index 5724977b5657a6c3569c93252341fd193f6a18b3..48b6a7c9c4a95f50e3d6ce00ea3e4ff99febf828 100644 --- a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp +++ b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp @@ -82,8 +82,8 @@ grammar::RightRG < > ToGrammarRightRGGlushkov::convert ( const regexp::Unbounded return grammar; } -grammar::RightRG < > ToGrammarRightRGGlushkov::convert ( const regexp::FormalRegExp < > & /* regexp */ ) { - throw exception::CommonException ( "Glushkov: Converting FormalRegExp NYI" ); // TODO +grammar::RightRG < > ToGrammarRightRGGlushkov::convert ( const regexp::FormalRegExp < > & regexp ) { + return ToGrammarRightRGGlushkov::convert ( regexp::UnboundedRegExp < > ( regexp ) ); } auto ToGrammarRightRGGlushkovUnboundedRegExp = registration::AbstractRegister < ToGrammarRightRGGlushkov, grammar::RightRG < >, const regexp::UnboundedRegExp < > & > ( ToGrammarRightRGGlushkov::convert );