core: subseq-index? -> subseq-of?

[factor.git] / extra / txon / txon.factor

diff --git a/extra/txon/txon.factor b/extra/txon/txon.factor
index e39616a624a920a6bb502984c56baf7cd8b8d614..0e826b216536ff5a3e8c9c933ddc717bda504d3a 100644 (file)
--- a/extra/txon/txon.factor
+++ b/extra/txon/txon.factor
@@ -42,11 +42,11 @@ DEFER: name/values
 
 : name=value ( string -- remain term )
     [ unicode:blank? ] trim
-    ":`" over subseq? [ (name=value) ] [ f swap ] if ;
+    dup ":`" subseq-of? [ (name=value) ] [ f swap ] if ;
 
 : name/values ( string -- remain terms )
     [ dup { [ empty? not ] [ first CHAR: ` = not ] } 1&& ]
-    [ name=value ] produce assoc-combine ;
+    [ name=value ] produce assoc-union-all ;
 
 : parse-txon ( string -- objects )
     [ dup empty? not ] [ name=value ] produce nip ;