Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/globs/globs.factor b/basis/globs/globs.factor
index 72b686c3b1db7cc603037b055d9b7ab02b2dd4d1..9cd6a73891b4e95093dd6b54a80eb944ecb5f5a5 100644 (file)
--- 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 <regexp> ; foldable
+    os windows? R! [^/\\]! R! [^/]! ? ; foldable
 
 EBNF: <glob>
 
@@ -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 ;

diff --git a/basis/vocabs/metadata/resources/resources-tests.factor b/basis/vocabs/metadata/resources/resources-tests.factor
index 36fd13125e4f0a98087ebc43cfaa8a2fb95e7b72..5c50406a264da2db7a508458ec88c293c78a2a20 100644 (file)
--- a/basis/vocabs/metadata/resources/resources-tests.factor
+++ b/basis/vocabs/metadata/resources/resources-tests.factor
@@ -14,6 +14,5 @@ IN: vocabs.metadata.resources.tests
     "resource-dir/bas"
     "resource-dir/bas/zang"
     "resource-dir/bas/zim"
-    "resource-dir/buh"
     "resource-dir/foo"
 } ] [ "vocabs.metadata.resources.test.3" vocab-resource-files natural-sort ] unit-test

diff --git a/extra/gpu/demos/bunny/deploy.factor b/extra/gpu/demos/bunny/deploy.factor
index 1289caadb6dfb574184dbd85de958f1594b381ec..048d710a419566cfd4357e95672a34ba64a5494e 100644 (file)
--- a/extra/gpu/demos/bunny/deploy.factor
+++ b/extra/gpu/demos/bunny/deploy.factor
@@ -6,7 +6,7 @@ H{
     { deploy-unicode? f }
     { "stop-after-last-window?" t }
     { deploy-io 3 }
-    { deploy-reflection 2 }
+    { deploy-reflection 1 }
     { deploy-word-props? f }
     { deploy-math? t }
     { deploy-threads? t }