diff --git a/extra/globs/globs.factor b/extra/globs/globs.factor old mode 100644 new mode 100755 index bcc6b572fc..901191b51e --- a/extra/globs/globs.factor +++ b/extra/globs/globs.factor @@ -1,22 +1,18 @@ ! Copyright (C) 2007 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: parser-combinators regexp lazy-lists sequences kernel -promises ; +promises strings ; IN: globs [ token ] <@ ; +: 'string' 'char' <+> [ >lower token ] <@ ; -: 'escaped-char' - "\\" token any-char-parser &> [ 1token ] <@ ; +: 'escaped-char' "\\" token any-char-parser &> [ 1token ] <@ ; -: 'escaped-string' - 'string' 'escaped-char' <|> ; +: 'escaped-string' 'string' 'escaped-char' <|> ; DEFER: 'term' @@ -39,4 +35,4 @@ PRIVATE> : 'glob' just parse-1 just ; : glob-matches? ( input glob -- ? ) - parse nil? not ; + >r >lower r> parse nil? not ;