! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators kernel kernel.private math sequences
-sequences.private strings sets assocs make lexer namespaces parser
-arrays fry locals regexp.parser splitting sorting regexp.ast
-regexp.negation regexp.compiler compiler.units words math.ranges ;
+USING: accessors arrays classes compiler.units kernel
+kernel.private lexer make math ranges namespaces quotations
+regexp.ast regexp.compiler regexp.negation regexp.parser
+sequences sequences.private splitting strings vocabs.loader
+words ;
IN: regexp
TUPLE: regexp
M: lookahead question>quot
! Returns ( index string -- ? )
- term>> ast>dfa dfa>shortest-word '[ f _ execute ] ;
+ term>> ast>dfa dfa>shortest-word 1quotation [ f ] prepose ;
: <reversed-option> ( ast -- reversed )
"r" string>options <with-options> ;
! Returns ( index string -- ? )
term>> <reversed-option>
ast>dfa dfa>reverse-shortest-word
- '[ [ 1 - ] dip f _ execute ] ;
-
-: check-string ( string -- string )
- ! Make this configurable
- dup string? [ "String required" throw ] unless ;
+ 1quotation [ [ 1 - ] dip f ] prepose ;
: match-index-from ( i string regexp -- index/f )
! This word is unsafe. It assumes that i is a fixnum
PRIVATE>
: matches? ( string regexp -- ? )
- [ check-string ] dip
+ [ string check-instance ] dip
[ end/start ] 2keep
match-index-from
[ = ] [ drop f ] if* ;
<PRIVATE
: search-range ( i string reverse? -- seq )
- [ drop -1 ] [ length ] if [a,b] ; inline
+ [ drop -1 ] [ length ] if [a..b] ; inline
:: (next-match) ( i string regexp quot: ( i string regexp -- j ) reverse? -- start end ? )
i string regexp quot call dup
M: reverse-regexp match-iterator-start drop length ;
: prepare-match-iterator ( string regexp -- i string regexp )
- [ check-string ] dip [ match-iterator-start ] 2keep ; inline
+ [ string check-instance ] dip [ match-iterator-start ] 2keep ; inline
PRIVATE>
SYNTAX: R/ parse-regexp ;
-USE: vocabs.loader
{ "prettyprint" "regexp" } "regexp.prettyprint" require-when