Update some more 'update' usages to call 'assoc-union!'
parent
35acd71551
commit
cdcdb708d7
|
@ -28,10 +28,10 @@ TUPLE: action rest init authorize display validate submit ;
|
||||||
action new-action ;
|
action new-action ;
|
||||||
|
|
||||||
: merge-forms ( form -- )
|
: merge-forms ( form -- )
|
||||||
form get
|
[ form get ] dip
|
||||||
[ [ errors>> ] bi@ push-all ]
|
[ [ errors>> ] bi@ append! drop ]
|
||||||
[ [ values>> ] bi@ swap update ]
|
[ [ values>> ] bi@ assoc-union! drop ]
|
||||||
[ swap validation-failed>> >>validation-failed drop ]
|
[ validation-failed>> >>validation-failed drop ]
|
||||||
2tri ;
|
2tri ;
|
||||||
|
|
||||||
: set-nested-form ( form name -- )
|
: set-nested-form ( form name -- )
|
||||||
|
|
|
@ -136,7 +136,7 @@ CHLOE: form
|
||||||
XML> body>> clone ;
|
XML> body>> clone ;
|
||||||
|
|
||||||
: add-tag-attrs ( attrs tag -- )
|
: add-tag-attrs ( attrs tag -- )
|
||||||
attrs>> swap update ;
|
attrs>> swap assoc-union! drop ;
|
||||||
|
|
||||||
CHLOE: button
|
CHLOE: button
|
||||||
button-tag-markup
|
button-tag-markup
|
||||||
|
|
|
@ -35,10 +35,10 @@ M: form clone
|
||||||
[ [ value ] keep ] dip ; inline
|
[ [ value ] keep ] dip ; inline
|
||||||
|
|
||||||
: from-object ( object -- )
|
: from-object ( object -- )
|
||||||
[ values ] [ make-mirror ] bi* update ;
|
[ values ] [ make-mirror ] bi* assoc-union! drop ;
|
||||||
|
|
||||||
: to-object ( destination names -- )
|
: to-object ( destination names -- )
|
||||||
[ make-mirror ] [ values extract-keys ] bi* update ;
|
[ make-mirror ] [ values extract-keys ] bi* assoc-union! drop ;
|
||||||
|
|
||||||
: with-each-value ( name quot -- )
|
: with-each-value ( name quot -- )
|
||||||
[ value ] dip '[
|
[ value ] dip '[
|
||||||
|
|
|
@ -44,7 +44,7 @@ CONSTANT: fail-state -1
|
||||||
unify-final-state renumber-states box-transitions
|
unify-final-state renumber-states box-transitions
|
||||||
[ start-state>> ]
|
[ start-state>> ]
|
||||||
[ final-states>> keys first ]
|
[ final-states>> keys first ]
|
||||||
[ nfa-table get [ transitions>> ] bi@ swap update ] tri ;
|
[ nfa-table get [ transitions>> ] bi@ swap assoc-union! drop ] tri ;
|
||||||
|
|
||||||
: ast>dfa ( parse-tree -- minimal-dfa )
|
: ast>dfa ( parse-tree -- minimal-dfa )
|
||||||
construct-nfa disambiguate construct-dfa minimize ;
|
construct-nfa disambiguate construct-dfa minimize ;
|
||||||
|
|
|
@ -236,7 +236,7 @@ SYMBOL: deserialized
|
||||||
: deserialize-hashtable ( -- hashtable )
|
: deserialize-hashtable ( -- hashtable )
|
||||||
H{ } clone
|
H{ } clone
|
||||||
[ intern-object ]
|
[ intern-object ]
|
||||||
[ (deserialize) update ]
|
[ (deserialize) assoc-union! drop ]
|
||||||
[ ] tri ;
|
[ ] tri ;
|
||||||
|
|
||||||
: copy-seq-to-tuple ( seq tuple -- )
|
: copy-seq-to-tuple ( seq tuple -- )
|
||||||
|
|
|
@ -67,7 +67,7 @@ DEFER: finalize-rule-set
|
||||||
[ resolve-delegate ] each-rule ;
|
[ resolve-delegate ] each-rule ;
|
||||||
|
|
||||||
: ?update ( keyword-map/f keyword-map -- keyword-map )
|
: ?update ( keyword-map/f keyword-map -- keyword-map )
|
||||||
over [ dupd update ] [ nip clone ] if ;
|
over [ assoc-union! ] [ nip clone ] if ;
|
||||||
|
|
||||||
: import-keywords ( parent child -- )
|
: import-keywords ( parent child -- )
|
||||||
over [ [ keywords>> ] bi@ ?update ] dip (>>keywords) ;
|
over [ [ keywords>> ] bi@ ?update ] dip (>>keywords) ;
|
||||||
|
|
|
@ -8,7 +8,7 @@ f <keyword-map> dup "k" set
|
||||||
{ "int" KEYWORD1 }
|
{ "int" KEYWORD1 }
|
||||||
{ "void" KEYWORD2 }
|
{ "void" KEYWORD2 }
|
||||||
{ "size_t" KEYWORD3 }
|
{ "size_t" KEYWORD3 }
|
||||||
} update
|
} assoc-union! drop
|
||||||
|
|
||||||
[ 3 ] [ "k" get assoc-size ] unit-test
|
[ 3 ] [ "k" get assoc-size ] unit-test
|
||||||
[ KEYWORD1 ] [ "int" "k" get at ] unit-test
|
[ KEYWORD1 ] [ "int" "k" get at ] unit-test
|
||||||
|
@ -21,7 +21,7 @@ t <keyword-map> dup "k" set
|
||||||
{ "Foo" KEYWORD1 }
|
{ "Foo" KEYWORD1 }
|
||||||
{ "bbar" KEYWORD2 }
|
{ "bbar" KEYWORD2 }
|
||||||
{ "BAZ" KEYWORD3 }
|
{ "BAZ" KEYWORD3 }
|
||||||
} update
|
} assoc-union! drop
|
||||||
|
|
||||||
[ KEYWORD1 ] [ "fOo" "k" get at ] unit-test
|
[ KEYWORD1 ] [ "fOo" "k" get at ] unit-test
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,7 @@ CONSTANT: id3v1+-length 227
|
||||||
} cleave ;
|
} cleave ;
|
||||||
|
|
||||||
: merge-frames ( id3 assoc -- id3 )
|
: merge-frames ( id3 assoc -- id3 )
|
||||||
[ dup frames>> ] dip update ;
|
[ dup frames>> ] dip assoc-union! drop ;
|
||||||
|
|
||||||
: merge-id3v1 ( id3 -- id3 )
|
: merge-id3v1 ( id3 -- id3 )
|
||||||
dup id3v1>frames frames>assoc merge-frames ;
|
dup id3v1>frames frames>assoc merge-frames ;
|
||||||
|
|
|
@ -40,7 +40,7 @@ SYMBOL: total
|
||||||
] assoc-map ;
|
] assoc-map ;
|
||||||
|
|
||||||
: canonicalize-specializer-3 ( specializer -- specializer' )
|
: canonicalize-specializer-3 ( specializer -- specializer' )
|
||||||
[ total get object <array> dup <enum> ] dip update ;
|
[ total get object <array> <enum> ] dip assoc-union! seq>> ;
|
||||||
|
|
||||||
: canonicalize-specializers ( methods -- methods' hooks )
|
: canonicalize-specializers ( methods -- methods' hooks )
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in New Issue