From 987cd1c8ce78c9ae459f86b7dfce7a946a0971c0 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Tue, 10 Mar 2009 18:27:33 -0500 Subject: [PATCH] Moving regexp.matchers back to regexp --- basis/globs/globs.factor | 2 +- basis/validators/validators.factor | 2 +- basis/xmode/marker/marker.factor | 6 +++--- extra/benchmark/regex-dna/regex-dna.factor | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/globs/globs.factor b/basis/globs/globs.factor index 173187574b..cac7fd9a2f 100644 --- a/basis/globs/globs.factor +++ b/basis/globs/globs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2009 Slava Pestov, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: sequences kernel regexp.combinators regexp.matchers strings unicode.case +USING: sequences kernel regexp.combinators strings unicode.case peg.ebnf regexp arrays ; IN: globs diff --git a/basis/validators/validators.factor b/basis/validators/validators.factor index 740cf7db13..f0ee13dd38 100644 --- a/basis/validators/validators.factor +++ b/basis/validators/validators.factor @@ -1,7 +1,7 @@ ! 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 regexp.matchers unicode.categories arrays +math.parser math.ranges assocs regexp unicode.categories arrays hashtables words classes quotations xmode.catalog unicode.case ; IN: validators diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor index de1f4254ea..d3ad266b5d 100755 --- a/basis/xmode/marker/marker.factor +++ b/basis/xmode/marker/marker.factor @@ -1,11 +1,11 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -IN: xmode.marker USING: kernel namespaces make xmode.rules xmode.tokens xmode.marker.state xmode.marker.context xmode.utilities xmode.catalog sequences math assocs combinators strings -regexp splitting ascii unicode.case regexp.matchers -ascii combinators.short-circuit accessors ; +regexp splitting unicode.case +combinators.short-circuit accessors ; +IN: xmode.marker ! Next two words copied from parser-combinators ! Just like head?, but they optionally ignore case diff --git a/extra/benchmark/regex-dna/regex-dna.factor b/extra/benchmark/regex-dna/regex-dna.factor index 29cb0b7357..5c11be357f 100644 --- a/extra/benchmark/regex-dna/regex-dna.factor +++ b/extra/benchmark/regex-dna/regex-dna.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors regexp.matchers prettyprint io io.encodings.ascii +USING: accessors prettyprint io io.encodings.ascii io.files kernel sequences assocs namespaces regexp ; IN: benchmark.regex-dna -- 2.34.1