use parser-combinators.regexp instead of regexp

diff --git a/basis/globs/globs.factor b/basis/globs/globs.factor
index c7d5413a4721d0d8aa6733cb77d5ad0e72ffb117..14ddb0ed9b7cbc7352097cabad4afcf60c8a5bc6 100755 (executable)
--- a/basis/globs/globs.factor
+++ b/basis/globs/globs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: parser-combinators regexp lists sequences kernel
+USING: parser-combinators parser-combinators.regexp lists sequences kernel
 promises strings unicode.case ;
 IN: globs
 

diff --git a/basis/validators/validators.factor b/basis/validators/validators.factor
index f24171b2b476551f5344f5cd090119025b4b5da0..dab109e36886623cca84c33a919b4c0ae2d3c16b 100644 (file)
--- a/basis/validators/validators.factor
+++ b/basis/validators/validators.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel continuations sequences math namespaces make sets
-math.parser math.ranges assocs regexp unicode.categories arrays
-hashtables words classes quotations xmode.catalog ;
+math.parser math.ranges assocs parser-combinators.regexp
+unicode.categories arrays hashtables words classes quotations
+xmode.catalog ;
 IN: validators
 
 : v-default ( str def -- str )

diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor
index 28c0de406a924bd32a53e3b0c13961c15f331ab8..8639c93e71651ebc9b2ffc2e071a5ee9b1583362 100755 (executable)
--- a/basis/xmode/loader/loader.factor
+++ b/basis/xmode/loader/loader.factor
@@ -1,7 +1,7 @@
 USING: xmode.loader.syntax xmode.tokens xmode.rules
 xmode.keyword-map xml.data xml.utilities xml assocs kernel
 combinators sequences math.parser namespaces parser
-xmode.utilities regexp io.files accessors ;
+xmode.utilities parser-combinators.regexp io.files accessors ;
 IN: xmode.loader
 
 ! Based on org.gjt.sp.jedit.XModeHandler

diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor
index 69c4e4fac39bf87cbb2338aa96c8815d4ad6e3fe..cbebe090c33676bf68372c39f8c86c0ec7736612 100644 (file)
--- a/basis/xmode/loader/syntax/syntax.factor
+++ b/basis/xmode/loader/syntax/syntax.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors xmode.tokens xmode.rules xmode.keyword-map
 xml.data xml.utilities xml assocs kernel combinators sequences
-math.parser namespaces make parser lexer xmode.utilities regexp
-io.files ;
+math.parser namespaces make parser lexer xmode.utilities
+parser-combinators.regexp io.files ;
 IN: xmode.loader.syntax
 
 SYMBOL: ignore-case?

diff --git a/basis/xmode/rules/rules.factor b/basis/xmode/rules/rules.factor
index e3c0c65db0a61e0c7e443c93cc6b84728a3971a3..e4f12bcc49314d0a9debc17ef90b5dbea6a26a5a 100755 (executable)
--- a/basis/xmode/rules/rules.factor
+++ b/basis/xmode/rules/rules.factor
@@ -1,5 +1,6 @@
 USING: accessors xmode.tokens xmode.keyword-map kernel
-sequences vectors assocs strings memoize regexp unicode.case ;
+sequences vectors assocs strings memoize unicode.case
+parser-combinators.regexp ;
 IN: xmode.rules
 
 TUPLE: string-matcher string ignore-case? ;