From d73fbb0f321cba6a9064f9f5887df90f6e8ac023 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 11 Jan 2022 19:15:29 -0800 Subject: [PATCH] Revert "Revert "words: use remove-word-prop instead of f set-word-prop."" This reverts commit 62b994e1e5a33f6a293d84f203db9b1b03f1cdc5. --- basis/delegate/delegate.factor | 2 +- basis/help/help.factor | 2 +- basis/locals/definitions/definitions.factor | 8 ++++---- basis/tools/annotations/annotations.factor | 2 +- basis/tools/coverage/coverage.factor | 2 +- core/classes/classes.factor | 4 ++-- core/classes/tuple/tuple.factor | 2 +- core/macros/macros.factor | 2 +- core/words/alias/alias.factor | 2 +- core/words/constant/constant.factor | 2 +- extra/descriptive/descriptive.factor | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor index 1554616c78..feac748ccd 100644 --- 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 f33f0f52b1..3411af819c 100644 --- 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 6823788bc5..62dcaa6b48 100644 --- 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 f5c4ffec4c..97090e1218 100644 --- 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 d0352f4d29..f0486cdb90 100644 --- 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 8401a654a1..434f2cbb46 100644 --- 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 e9c7ce93e7..16ed284ec3 100644 --- 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 435edd92d5..0179acf2b4 100644 --- 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 754cda996b..81923af5ec 100644 --- 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 926387539b..9572500e70 100644 --- 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 8c2d5e365f..1e0a5eedfb 100644 --- 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 ; -- 2.34.1