From dadf13a84668e0d7ca5c85692189973a8ee88d90 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 26 Jun 2016 02:18:09 -0700 Subject: [PATCH] factor: fix naming convention for more words. --- ffi/cuda/syntax/syntax.factor | 2 +- language/variables/variables.factor | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ffi/cuda/syntax/syntax.factor b/ffi/cuda/syntax/syntax.factor index 082581d0b2..4a6dcb8b6f 100644 --- a/ffi/cuda/syntax/syntax.factor +++ b/ffi/cuda/syntax/syntax.factor @@ -13,6 +13,6 @@ SYNTAX: \ CUDA-FUNCTION: scan-token [ create-word-in current-cuda-library get ] keep scan-c-args ";" expect define-cuda-function ; -SYNTAX: \ cuda-global: +SYNTAX: \ CUDA-GLOBAL: scan-token [ create-word-in current-cuda-library get ] keep define-cuda-global ; diff --git a/language/variables/variables.factor b/language/variables/variables.factor index 10ca032741..eb4f4d7f69 100644 --- a/language/variables/variables.factor +++ b/language/variables/variables.factor @@ -14,7 +14,7 @@ GENERIC: variable-setter ( word -- word' ) ; M: variable variable-setter "variable-setter" word-prop ; M: local-reader variable-setter "local-writer" word-prop ; -SYNTAX: \ set: +SYNTAX: \ vset: scan-object variable-setter suffix! ; : [variable-getter] ( variable -- quot ) @@ -26,7 +26,7 @@ SYNTAX: \ set: [ ( -- value ) define-inline ] [ [ - [ name>> "set: " prepend ] + [ name>> "vset: " prepend ] [ over "variable-setter" set-word-prop ] bi ] dip ( value -- ) define-inline ] bi-curry* bi ; @@ -77,10 +77,10 @@ PREDICATE: global-variable < variable : define-global ( word -- ) global-box new [ [global-getter] ] [ [global-setter] ] bi (define-variable) ; -SYNTAX: \ global: +SYNTAX: \ GLOBAL: scan-new-word define-global ; -M: global-variable definer drop \ global: f ; +M: global-variable definer drop \ GLOBAL: f ; INTERSECTION: typed-global-variable global-variable typed-variable ;