Merge branch 'master' of git://factorcode.org/git/factor
commit
04cc1ec53e
|
@ -3,7 +3,7 @@
|
||||||
USING: kernel namespaces make xmode.rules xmode.tokens
|
USING: kernel namespaces make xmode.rules xmode.tokens
|
||||||
xmode.marker.state xmode.marker.context xmode.utilities
|
xmode.marker.state xmode.marker.context xmode.utilities
|
||||||
xmode.catalog sequences math assocs combinators strings
|
xmode.catalog sequences math assocs combinators strings
|
||||||
regexp splitting unicode.case
|
regexp splitting unicode.case ascii
|
||||||
combinators.short-circuit accessors ;
|
combinators.short-circuit accessors ;
|
||||||
IN: xmode.marker
|
IN: xmode.marker
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ M: string-matcher text-matches?
|
||||||
] keep string>> length and ;
|
] keep string>> length and ;
|
||||||
|
|
||||||
M: regexp text-matches?
|
M: regexp text-matches?
|
||||||
[ >string ] dip match-head ;
|
[ >string ] dip re-contains? ;
|
||||||
|
|
||||||
: rule-start-matches? ( rule -- match-count/f )
|
: rule-start-matches? ( rule -- match-count/f )
|
||||||
dup start>> tuck swap can-match-here? [
|
dup start>> tuck swap can-match-here? [
|
||||||
|
|
Loading…
Reference in New Issue