Revert "Revert "words: use remove-word-prop instead of f set-word-prop.""

This reverts commit 62b994e1e5a33f6a293d84f203db9b1b03f1cdc5.

diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor
index 1554616c787259fedd5fa01cc06ac3c2a476f996..feac748ccda658503ee756e9165f2c118fe5f6dc 100644 (file)
--- a/basis/delegate/delegate.factor
+++ b/basis/delegate/delegate.factor
@@ -60,7 +60,7 @@ PREDICATE: consult-method < method
     "consultation" word-prop >boolean ;
 
 M: consult-method reset-word
-    [ call-next-method ] [ f "consultation" set-word-prop ] bi ;
+    [ call-next-method ] [ "consultation" remove-word-prop ] bi ;
 
 GENERIC#: (consult-method-quot) 2 ( consultation quot word -- object )
 

diff --git a/basis/help/help.factor b/basis/help/help.factor
index f33f0f52b112e9682021b3ac47cab7f86a6ca53f..3411af819cb15bc17f64d75c9061e1e6f87d8ce3 100644 (file)
--- a/basis/help/help.factor
+++ b/basis/help/help.factor
@@ -206,7 +206,7 @@ help-hook [ [ print-topic ] ] initialize
     [ articles get set-at ] keep xref-article ;
 
 : remove-word-help ( word -- )
-    f "help" set-word-prop ;
+    "help" remove-word-prop ;
 
 : set-word-help ( content word -- )
     [ swap "help" set-word-prop ] keep xref-article ;

diff --git a/basis/locals/definitions/definitions.factor b/basis/locals/definitions/definitions.factor
index 6823788bc54c384829b8aa9e0a4ae575510c8e3d..62dcaa6b48ce9cd6f481403d739e2561941c822d 100644 (file)
--- a/basis/locals/definitions/definitions.factor
+++ b/basis/locals/definitions/definitions.factor
@@ -12,7 +12,7 @@ M: lambda-word definition
     "lambda" word-prop body>> ;
 
 M: lambda-word reset-word
-    [ call-next-method ] [ f "lambda" set-word-prop ] bi ;
+    [ call-next-method ] [ "lambda" remove-word-prop ] bi ;
 
 PREDICATE: lambda-macro < macro lambda-word? ;
 
@@ -22,7 +22,7 @@ M: lambda-macro definition
     "lambda" word-prop body>> ;
 
 M: lambda-macro reset-word
-    [ call-next-method ] [ f "lambda" set-word-prop ] bi ;
+    [ call-next-method ] [ "lambda" remove-word-prop ] bi ;
 
 PREDICATE: lambda-method < method lambda-word? ;
 
@@ -32,7 +32,7 @@ M: lambda-method definition
     "lambda" word-prop body>> ;
 
 M: lambda-method reset-word
-    [ call-next-method ] [ f "lambda" set-word-prop ] bi ;
+    [ call-next-method ] [ "lambda" remove-word-prop ] bi ;
 
 PREDICATE: lambda-memoized < memoized lambda-word? ;
 
@@ -42,7 +42,7 @@ M: lambda-memoized definition
     "lambda" word-prop body>> ;
 
 M: lambda-memoized reset-word
-    [ call-next-method ] [ f "lambda" set-word-prop ] bi ;
+    [ call-next-method ] [ "lambda" remove-word-prop ] bi ;
 
 : method-stack-effect ( method -- effect )
     dup "lambda" word-prop vars>>

diff --git a/basis/tools/annotations/annotations.factor b/basis/tools/annotations/annotations.factor
index f5c4ffec4cab80f47805d2e24f5c1d0641f1ae40..97090e121800155915c4e9bfb728857d47d6e6f4 100644 (file)
--- a/basis/tools/annotations/annotations.factor
+++ b/basis/tools/annotations/annotations.factor
@@ -17,7 +17,7 @@ M: generic (reset)
 
 M: word (reset)
     dup "unannotated-def" word-prop [
-        dupd define f "unannotated-def" set-word-prop
+        dupd define "unannotated-def" remove-word-prop
     ] [ drop ] if* ;
 
 PRIVATE>

diff --git a/basis/tools/coverage/coverage.factor b/basis/tools/coverage/coverage.factor
index d0352f4d29d923baac478624035470d88f492735..f0486cdb90967c4506a718ea12dc75afeb502e2d 100644 (file)
--- a/basis/tools/coverage/coverage.factor
+++ b/basis/tools/coverage/coverage.factor
@@ -71,7 +71,7 @@ M: word add-coverage
     ] deep-annotate ;
 
 M: word remove-coverage
-    [ reset ] [ f "coverage" set-word-prop ] bi ;
+    [ reset ] [ "coverage" remove-word-prop ] bi ;
 
 M: string reset-coverage
     [ reset-coverage ] each-word ;

diff --git a/core/classes/classes.factor b/core/classes/classes.factor
index 8401a654a190f4aae601ac3b58dc18412db18de2..434f2cbb46241b0c5e771b382e7abd554b9fcf5f 100644 (file)
--- a/core/classes/classes.factor
+++ b/core/classes/classes.factor
@@ -92,10 +92,10 @@ M: object predicate-def
 M: predicate flushable? drop t ;
 
 M: predicate forget*
-    [ call-next-method ] [ f "predicating" set-word-prop ] bi ;
+    [ call-next-method ] [ "predicating" remove-word-prop ] bi ;
 
 M: predicate reset-word
-    [ call-next-method ] [ f "predicating" set-word-prop ] bi ;
+    [ call-next-method ] [ "predicating" remove-word-prop ] bi ;
 
 : define-predicate ( class quot -- )
     [ predicate-word ] dip ( object -- ? ) define-declared ;

diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index e9c7ce93e76d77f584c4f4acce9bc8c4502e1b1b..16ed284ec31aa17da1f37dbd064872ca84f68077 100644 (file)
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -300,7 +300,7 @@ GENERIC#: (define-tuple-class) 2 ( class superclass slots -- )
 
 : reset-final ( class -- )
     dup final-class? [
-        [ f "final" set-word-prop ]
+        [ "final" remove-word-prop ]
         [ changed-conditionally ]
         bi
     ] [ drop ] if ;

diff --git a/core/macros/macros.factor b/core/macros/macros.factor
index 435edd92d5d4244fc66195d9004dda10d6a86ac1..0179acf2b4409f40b52e2a15c968f0641c6eaee5 100644 (file)
--- a/core/macros/macros.factor
+++ b/core/macros/macros.factor
@@ -36,6 +36,6 @@ M: macro definer drop \ MACRO: \ ; ;
 M: macro definition "macro" word-prop ;
 
 M: macro reset-word
-    [ call-next-method ] [ f "macro" set-word-prop ] bi ;
+    [ call-next-method ] [ "macro" remove-word-prop ] bi ;
 
 M: macro always-bump-effect-counter? drop t ;

diff --git a/core/words/alias/alias.factor b/core/words/alias/alias.factor
index 754cda996b57c60990f4aa89afc3d4bed0df8895..81923af5ec4439635381f91f5e32c77ddaa513b3 100644 (file)
--- a/core/words/alias/alias.factor
+++ b/core/words/alias/alias.factor
@@ -12,6 +12,6 @@ PREDICATE: alias < word "alias" word-prop ;
     [ parsing-word? [ t "parsing" set-word-prop ] [ drop ] if ] 2tri ;
 
 M: alias reset-word
-    [ call-next-method ] [ f "alias" set-word-prop ] bi ;
+    [ call-next-method ] [ "alias" remove-word-prop ] bi ;
 
 M: alias definer drop \ ALIAS: f ;

diff --git a/core/words/constant/constant.factor b/core/words/constant/constant.factor
index 926387539b793e2c5ffe20ed4c85b395c9ba81ab..9572500e70a5f64f75574f99dd81f04704f3ed96 100644 (file)
--- a/core/words/constant/constant.factor
+++ b/core/words/constant/constant.factor
@@ -10,6 +10,6 @@ PREDICATE: constant < word "constant" word-prop >boolean ;
     [ [ ] curry ( -- value ) define-inline ] 2bi ;
 
 M: constant reset-word
-    [ call-next-method ] [ f "constant" set-word-prop ] bi ;
+    [ call-next-method ] [ "constant" remove-word-prop ] bi ;
 
 M: constant definer drop \ CONSTANT: f ;

diff --git a/extra/descriptive/descriptive.factor b/extra/descriptive/descriptive.factor
index 8c2d5e365fa4d96b21f9ac0a3c5ced6305a862b9..1e0a5eedfb9398f49fd981a15ee2c5aa8448fd86 100644 (file)
--- a/extra/descriptive/descriptive.factor
+++ b/extra/descriptive/descriptive.factor
@@ -47,7 +47,7 @@ M: descriptive definition
 
 M: descriptive reset-word
     [ call-next-method ]
-    [ f "descriptive-definition" set-word-prop ] bi ;
+    [ "descriptive-definition" remove-word-prop ] bi ;
 
 SYNTAX: DESCRIPTIVE:: (::) define-descriptive ;
 
@@ -59,4 +59,4 @@ M: descriptive-lambda definition
     "lambda" word-prop body>> ;
 
 M: descriptive-lambda reset-word
-    [ call-next-method ] [ f "lambda" set-word-prop ] bi ;
+    [ call-next-method ] [ "lambda" remove-word-prop ] bi ;