factor: trim using lists

[factor.git] / basis / xmode / rules / rules.factor

diff --git a/basis/xmode/rules/rules.factor b/basis/xmode/rules/rules.factor
index adc43d7bb6b6364521eb220c564af61dfbcd6436..084abb5084c07e6063b78237c6ebecf9474184de 100644 (file)
--- a/basis/xmode/rules/rules.factor
+++ b/basis/xmode/rules/rules.factor
@@ -1,6 +1,7 @@
-USING: accessors xmode.tokens xmode.keyword-map kernel
-sequences vectors assocs strings memoize unicode.case
-parser-combinators.regexp ;
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors assocs kernel regexp sequences unicode
+xmode.keyword-map ;
 IN: xmode.rules
 
 TUPLE: string-matcher string ignore-case? ;
@@ -41,7 +42,7 @@ MEMO: standard-rule-set ( id -- ruleset )
 
 : ?push-all ( seq1 seq2 -- seq1+seq2 )
     [
-        over [ [ V{ } like ] dip over push-all ] [ nip ] if
+        over [ [ V{ } like ] dip append! ] [ nip ] if
     ] when* ;
 
 : rule-set-no-word-sep* ( ruleset -- str )
@@ -77,7 +78,7 @@ TUPLE: eol-span-rule < rule ;
 : init-span ( rule -- )
     dup delegate>> [ drop ] [
         dup body-token>> standard-rule-set
-        swap (>>delegate)
+        swap delegate<<
     ] if ;
 
 : init-eol-span ( rule -- )
@@ -112,7 +113,7 @@ M: regexp text-hash-char drop f ;
 : add-escape-rule ( string ruleset -- )
     over [
         [ <escape-rule> ] dip
-        2dup (>>escape-rule)
+        2dup escape-rule<<
         add-rule
     ] [
         2drop