! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel math math.order words combinators locals
-unicode.categories combinators.short-circuit sequences
-fry macros arrays assocs sets classes mirrors unicode.script
-unicode.data ;
+USING: accessors kernel math math.order words combinators
+combinators.smart combinators.short-circuit locals
+unicode.categories sequences fry macros arrays assocs sets
+classes unicode.script unicode.data ;
FROM: ascii => ascii? ;
+FROM: sets => members ;
IN: regexp.classes
SINGLETONS: dot letter-class LETTER-class Letter-class digit-class
: java-blank? ( ch -- ? )
{
CHAR: \s CHAR: \t CHAR: \n
- HEX: b HEX: 7 CHAR: \r
+ 0xb 0x7 CHAR: \r
} member? ;
M: java-blank-class class-member? ( obj class -- ? )
TUPLE: class-partition integers not-integers simples not-simples and or other ;
: partition-classes ( seq -- class-partition )
- prune
+ members
[ integer? ] partition
[ not-integer? ] partition
[ simple-class? ] partition
class-partition boa ;
: class-partition>seq ( class-partition -- seq )
- make-mirror values concat ;
+ [
+ {
+ [ integers>> ]
+ [ not-integers>> ]
+ [ simples>> ]
+ [ not-simples>> ]
+ [ and>> ]
+ [ or>> ]
+ [ other>> ]
+ } cleave
+ ] output>array concat ;
: repartition ( partition -- partition' )
! This could be made more efficient; only and and or are effected
[ t swap remove ] change-other
dup contradiction?
[ drop f ]
- [ filter-not-integers class-partition>seq prune t and-class seq>instance ] if ;
+ [ filter-not-integers class-partition>seq members t and-class seq>instance ] if ;
: <and-class> ( seq -- class )
dup and-class flatten partition-classes
[ f swap remove ] change-other
dup tautology?
[ drop t ]
- [ filter-integers class-partition>seq prune f or-class seq>instance ] if ;
+ [ filter-integers class-partition>seq members f or-class seq>instance ] if ;
: <or-class> ( seq -- class )
dup or-class flatten partition-classes
: condition-states ( condition -- states )
dup condition? [
[ yes>> ] [ no>> ] bi
- [ condition-states ] bi@ append prune
+ [ condition-states ] bi@ union
] [ 1array ] if ;
: condition-at ( condition assoc -- new-condition )