From c6fc88f28f8d846da3d47fbfadfbf385cba01751 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sat, 21 Mar 2009 01:18:25 -0500 Subject: [PATCH] Unicode categories syntax cleanup --- basis/unicode/categories/syntax/syntax.factor | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/basis/unicode/categories/syntax/syntax.factor b/basis/unicode/categories/syntax/syntax.factor index 593bb0bbdd..93f7919b6b 100644 --- a/basis/unicode/categories/syntax/syntax.factor +++ b/basis/unicode/categories/syntax/syntax.factor @@ -17,8 +17,14 @@ SYMBOLS: Cn Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd Ps Pe Pi Pf Po Sm Sc Sk So Zs [ >category-array ] dip '[ dup category# _ nth-unsafe [ drop t ] _ if ] ; +: integer-predicate-class ( word predicate -- ) + integer swap define-predicate-class ; + : define-category ( word categories code -- ) - [category] integer swap define-predicate-class ; + [category] integer-predicate-class ; + +: define-not-category ( word categories code -- ) + [category] [ not ] compose integer-predicate-class ; : parse-category ( -- word tokens quot ) CREATE-CLASS \ ; parse-until { | } split1 @@ -31,6 +37,4 @@ PRIVATE> parse-category define-category ; parsing : CATEGORY-NOT: - parse-category - [ categories swap diff ] dip - define-category ; parsing + parse-category define-not-category ; parsing