From 66687d6b214106dfc7f496452fa6c433abc4b291 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 7 Mar 2010 20:08:35 -0800 Subject: [PATCH] reuse @ and _ from fry in placeholders for invalid-quotation-input errors rather than making our own redundant placeholder symbols --- basis/stack-checker/values/values.factor | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/basis/stack-checker/values/values.factor b/basis/stack-checker/values/values.factor index e2c1ec4707..e701f297d7 100644 --- a/basis/stack-checker/values/values.factor +++ b/basis/stack-checker/values/values.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors namespaces kernel assocs sequences +USING: accessors namespaces fry kernel assocs sequences stack-checker.recursive-state stack-checker.errors quotations ; IN: stack-checker.values @@ -120,15 +120,12 @@ M: f (literal-value?) drop f ; M: f (literal) current-word get bad-macro-input ; -SYMBOL: (_) -ERROR: (@) ; - GENERIC: known>callable ( known -- quot ) : ?@ ( x -- y ) - dup callable? [ drop [ (@) ] ] unless ; + dup callable? [ drop [ @ ] ] unless ; -M: object known>callable drop (_) ; +M: object known>callable drop \ _ ; M: literal known>callable value>> ; M: composed known>callable [ quot1>> known known>callable ?@ ] [ quot2>> known known>callable ?@ ] bi