From a87497012e31317825958f6f71c210d2fda481f2 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 16 Feb 2010 10:33:21 -0800 Subject: [PATCH] fix globs tests --- basis/globs/globs.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/globs/globs.factor b/basis/globs/globs.factor index 72b686c3b1..9cd6a73891 100644 --- a/basis/globs/globs.factor +++ b/basis/globs/globs.factor @@ -1,11 +1,11 @@ ! Copyright (C) 2007, 2009 Slava Pestov, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: sequences io.pathnames kernel regexp.combinators -strings unicode.case peg.ebnf regexp arrays ; +strings splitting system unicode.case peg.ebnf regexp arrays ; IN: globs : not-path-separator ( -- sep ) - "[^" path-separator "]" 3append ; foldable + os windows? R! [^/\\]! R! [^/]! ? ; foldable EBNF: @@ -48,5 +48,5 @@ Main = Concatenation End [ "\\*?[{" member? ] any? ; : glob-parent-directory ( glob -- parent-directory ) - path-components dup [ glob-pattern? ] find drop head + path-separator split harvest dup [ glob-pattern? ] find drop head path-separator join ;