diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor index 0b63351e0c..b8c03d7a3b 100644 --- a/basis/regexp/disambiguate/disambiguate.factor +++ b/basis/regexp/disambiguate/disambiguate.factor @@ -33,7 +33,9 @@ TUPLE: parts in out ; ] assoc-map ] change-transitions ; +USE: sorting + : nfa>dfa ( nfa -- dfa ) - construct-dfa - minimize disambiguate + construct-dfa minimize + disambiguate construct-dfa minimize ; diff --git a/basis/regexp/regexp-tests.factor b/basis/regexp/regexp-tests.factor index 742b16dc41..9d94c4126b 100644 --- a/basis/regexp/regexp-tests.factor +++ b/basis/regexp/regexp-tests.factor @@ -3,6 +3,8 @@ regexp.traversal eval strings multiline accessors regexp.matchers ; IN: regexp-tests \ must-infer +\ compile-regexp must-infer +\ compile-dfa-quot must-infer \ matches? must-infer [ f ] [ "b" "a*" matches? ] unit-test