From dea7e0f50dcdc19462e6953d339a3780e3136cb5 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 31 Jul 2015 21:57:37 -0700
Subject: [PATCH] stack-checker: too tired to figure out which using is
 required but not used.

---
 .../known-words/known-words.factor            | 44 ++++++++++++-------
 basis/stack-checker/values/values.factor      |  8 ++--
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index f1c4c94a0e..c3a0cc490e 100644
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/basis/stack-checker/known-words/known-words.factor
@@ -1,21 +1,31 @@
 ! Copyright (C) 2004, 2011 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.accessors alien.libraries
-alien.private arrays assocs byte-arrays classes
-classes.tuple.private combinators combinators.private
-combinators.short-circuit compiler.units effects fry
-generic.single.private io.files.private io.streams.c kernel
-kernel.private locals locals.backend locals.types macros math
-math.parser.private math.private memory memory.private
-namespaces quotations quotations.private sequences
-sequences.private slots.private stack-checker.alien
-stack-checker.backend stack-checker.branches
-stack-checker.dependencies stack-checker.errors
-stack-checker.row-polymorphism stack-checker.state
-stack-checker.transforms stack-checker.values
-stack-checker.visitor strings strings.private system
-threads.private tools.dispatch.private tools.memory.private
-tools.profiler.sampling.private words words.private ;
+USING: fry accessors alien alien.accessors alien.private arrays
+byte-arrays classes continuations.private effects generic
+hashtables hashtables.private io io.backend io.files
+io.files.private io.streams.c kernel kernel.private math
+math.private math.parser.private memory memory.private
+namespaces namespaces.private parser quotations
+quotations.private sbufs sbufs.private sequences
+sequences.private slots.private strings strings.private system
+threads.private classes.tuple classes.tuple.private vectors
+vectors.private words words.private definitions assocs summary
+compiler.units system.private combinators tools.memory.private
+combinators.short-circuit locals locals.backend locals.types
+combinators.private stack-checker.values generic.single
+generic.single.private alien.libraries tools.dispatch.private
+macros tools.profiler.sampling.private classes.algebra
+stack-checker.alien
+stack-checker.state
+stack-checker.errors
+stack-checker.visitor
+stack-checker.backend
+stack-checker.branches
+stack-checker.transforms
+stack-checker.dependencies
+stack-checker.recursive-state
+stack-checker.row-polymorphism ;
+QUALIFIED-WITH: generic.single.private gsp
 IN: stack-checker.known-words
 
 : infer-special ( word -- )
@@ -415,7 +425,7 @@ M: object infer-call* \ call bad-macro-input ;
 \ innermost-frame-scan { callstack } { fixnum } define-primitive
 \ jit-compile { quotation } { } define-primitive
 \ leaf-signal-handler { } { } define-primitive
-\ lookup-method { object array } { word } define-primitive
+\ gsp:lookup-method { object array } { word } define-primitive
 \ minor-gc { } { } define-primitive
 \ modify-code-heap { array object object } { } define-primitive
 \ nano-count { } { integer } define-primitive \ nano-count make-flushable
diff --git a/basis/stack-checker/values/values.factor b/basis/stack-checker/values/values.factor
index 7b052f9ca5..70fb49e33c 100644
--- a/basis/stack-checker/values/values.factor
+++ b/basis/stack-checker/values/values.factor
@@ -132,12 +132,12 @@ M: object known>callable drop \ _ ;
 M: literal-tuple known>callable value>> ;
 
 M: composed known>callable
-    [ quot1>> known known>callable ?@ ]
-    [ quot2>> known known>callable ?@ ] bi append ;
+    [ quot1>> ] [ quot2>> ] bi
+    [ known known>callable ?@ ] bi@ append ;
 
 M: curried known>callable
-    [ quot>> known known>callable ]
-    [ obj>> known known>callable ] bi prefix ;
+    [ quot>> ] [ obj>> ] bi
+    [ known known>callable ] bi@ prefix ;
 
 M: declared-effect known>callable
     known>> known>callable ;