From c6ab49e8cafe4c2e0430c1a4828d5a5427a15e8c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 18 Sep 2008 13:48:18 -0500
Subject: [PATCH] use parser-combinators.regexp instead of regexp

---
 basis/globs/globs.factor                | 2 +-
 basis/validators/validators.factor      | 5 +++--
 basis/xmode/loader/loader.factor        | 2 +-
 basis/xmode/loader/syntax/syntax.factor | 4 ++--
 basis/xmode/rules/rules.factor          | 3 ++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/basis/globs/globs.factor b/basis/globs/globs.factor
index c7d5413a47..14ddb0ed9b 100755
--- 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 f24171b2b4..dab109e368 100644
--- 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 28c0de406a..8639c93e71 100755
--- 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 69c4e4fac3..cbebe090c3 100644
--- 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 e3c0c65db0..e4f12bcc49 100755
--- 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? ;