words: rename reset-props to remove-word-props.

diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor
index cd929dc70428ab628ad739610aaadcc4b87a1815..4276eed6e69e9108d35b2d9514c49636caca4eb5 100755 (executable)
--- a/basis/alien/parser/parser.factor
+++ b/basis/alien/parser/parser.factor
@@ -44,13 +44,14 @@ ERROR: bad-array-type ;
     } cond ;
 
 : reset-c-type ( word -- )
-    dup "struct-size" word-prop
-    [ dup [ forget-class ] [ { "struct-size" } reset-props ] bi ] when
+    dup "struct-size" word-prop [
+        dup [ forget-class ] [ "struct-size" remove-word-prop ] bi
+    ] when
     {
         "c-type"
         "callback-effect"
         "callback-library"
-    } reset-props ;
+    } remove-word-props ;
 
 ERROR: *-in-c-type-name name ;
 

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index 5ea31bc7d33c119495fc27cdbe687c9974b821b6..b7a68163c6e9f7aa81baf9e70ee72da2ce5d8254 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -333,7 +333,7 @@ M: struct-class reset-class
             [ forget-struct-slot-values-method ]
             [ forget-clone-method ] bi
         ]
-        [ { "c-type" "layout" "struct-size" } reset-props ]
+        [ { "c-type" "layout" "struct-size" } remove-word-props ]
         [ call-next-method ]
     } cleave ;
 

diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor
index 5e949d4558888857615a95f3a5610c9339ed8938..12732b80900d5431c7b3451753fe552b0cd0749d 100644 (file)
--- a/basis/memoize/memoize.factor
+++ b/basis/memoize/memoize.factor
@@ -81,7 +81,7 @@ M: memoized definition "memo-quot" word-prop ;
 
 M: memoized reset-word
     [ call-next-method ]
-    [ { "memoize" "memo-quot" } reset-props ]
+    [ { "memoize" "memo-quot" } remove-word-props ]
     bi ;
 
 : memoize-quot ( quot effect -- memo-quot )

diff --git a/core/classes/classes.factor b/core/classes/classes.factor
index 6d7039dcdfa723780ebc908a494042f8d0e62342..c0251f36d0fcc7142fc34961be1fbc5262308068 100644 (file)
--- a/core/classes/classes.factor
+++ b/core/classes/classes.factor
@@ -62,7 +62,7 @@ M: class reset-class
         "members"
         "participants"
         "predicate"
-    } reset-props ;
+    } remove-word-props ;
 
 M: word reset-class drop ;
 

diff --git a/core/classes/mixin/mixin.factor b/core/classes/mixin/mixin.factor
index f2c16b1b16113be963bada9ad630584e74ce2936..4fc7a15c9b0fddd1a7419dcaadeb499d76de2b07 100644 (file)
--- a/core/classes/mixin/mixin.factor
+++ b/core/classes/mixin/mixin.factor
@@ -14,7 +14,7 @@ M: mixin-class (classes-intersect?)
     members [ classes-intersect? ] with any? ;
 
 M: mixin-class reset-class
-    [ call-next-method ] [ { "mixin" } reset-props ] bi ;
+    [ call-next-method ] [ "mixin" remove-word-prop ] bi ;
 
 M: mixin-class rank-class drop 8 ;
 

diff --git a/core/classes/predicate/predicate.factor b/core/classes/predicate/predicate.factor
index 068311bf4d6e6f70899aa800de8698b717e2070e..4d2d19d3f09e135c258058c11b6fb4137a600277 100644 (file)
--- a/core/classes/predicate/predicate.factor
+++ b/core/classes/predicate/predicate.factor
@@ -32,7 +32,7 @@ PRIVATE>
     ] 3tri ;
 
 M: predicate-class reset-class
-    [ call-next-method ] [ { "predicate-definition" } reset-props ] bi ;
+    [ call-next-method ] [ "predicate-definition" remove-word-prop ] bi ;
 
 M: predicate-class rank-class drop 2 ;
 

diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index 544ad0e81ea46330fd6084204f144843c9c87364..4c9102e4f9a4d601055593b49242e9c2968dab1e 100644 (file)
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -353,7 +353,7 @@ M: tuple-class reset-class
         dup "slots" word-prop forget-slot-accessors
     ] [
         [ call-next-method ]
-        [ { "layout" "slots" "boa-check" "prototype" "final" } reset-props ]
+        [ { "layout" "slots" "boa-check" "prototype" "final" } remove-word-props ]
         bi
     ] bi ;
 

diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index 23c8643692713df1b956016ab11a249b199ffda5..23fca8faebe185db98d63e3ee4f976ee1030c0ec 100644 (file)
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -18,7 +18,7 @@ PREDICATE: generic < word
 M: generic definition drop f ;
 
 : make-generic ( word -- )
-    [ { "unannotated-def" } reset-props ]
+    [ "unannotated-def" remove-word-prop ]
     [ dup "combination" word-prop perform-combination ]
     bi ;
 

diff --git a/core/words/words-docs.factor b/core/words/words-docs.factor
index 5e7b8d85fcd9414a3de5f85f2e0eeb6467383d92..4226e25a4014982936e237be34ec6a25ca09cba0 100644 (file)
--- a/core/words/words-docs.factor
+++ b/core/words/words-docs.factor
@@ -217,6 +217,11 @@ HELP: remove-word-prop
 { $description "Removes a word property, so future lookups will output " { $link f } " until it is set again. Word property names are conventionally strings." }
 { $side-effects "word" } ;
 
+HELP: remove-word-props
+{ $values { "word" word } { "seq" "a sequence of word property names" } }
+{ $description "Removes all listed word properties from the word." }
+{ $side-effects "word" } ;
+
 HELP: word-code
 { $values { "word" word } { "start" "the word's start address" } { "end" "the word's end address" } }
 { $description "Outputs the memory range containing the word's machine code." } ;
@@ -227,11 +232,6 @@ HELP: define
 { $notes "This word must be called from inside " { $link with-compilation-unit } "." }
 { $side-effects "word" } ;
 
-HELP: reset-props
-{ $values { "word" word } { "seq" "a sequence of word property names" } }
-{ $description "Removes all listed word properties from the word." }
-{ $side-effects "word" } ;
-
 HELP: reset-word
 { $values { "word" word } }
 { $description "Reset word declarations." }

diff --git a/core/words/words.factor b/core/words/words.factor
index 37f7f7b0ddf3f2e70ff4cd45721a9d77af7fc24c..0be414ad000216ed6060be790ba43b6114c36df9 100644 (file)
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -33,6 +33,9 @@ M: word definition def>> ;
 
 : remove-word-prop ( word name -- ) swap props>> delete-at ;
 
+: remove-word-props ( word seq -- )
+    swap props>> [ delete-at ] curry each ;
+
 : set-word-prop ( word value name -- )
     over
     [ pick props>> ?set-at >>props drop ]
@@ -41,8 +44,6 @@ M: word definition def>> ;
 : change-word-prop ( ..a word prop quot: ( ..a value -- ..b newvalue ) -- ..b )
     [ swap props>> ] dip change-at ; inline
 
-: reset-props ( word seq -- ) [ remove-word-prop ] with each ;
-
 <PRIVATE
 
 : caller ( callstack -- word ) callstack>array <reversed> third ;
@@ -169,7 +170,7 @@ M: word reset-word
         "unannotated-def" "parsing" "inline" "recursive"
         "foldable" "flushable" "reading" "writing" "reader"
         "writer" "delimiter" "deprecated"
-    } reset-props ;
+    } remove-word-props ;
 
 : reset-generic ( word -- )
     [ subwords forget-all ]
@@ -183,7 +184,7 @@ M: word reset-word
             "default-method"
             "engines"
             "decision-tree"
-        } reset-props
+        } remove-word-props
     ] tri ;
 
 : <word> ( name vocab -- word )