use `check-instance` instead; reformat USING:`

[factor.git] / basis / stack-checker / stack-checker.factor

diff --git a/basis/stack-checker/stack-checker.factor b/basis/stack-checker/stack-checker.factor
old mode 100755 (executable)
new mode 100644 (file)
index bc3b655..4eab65f
--- a/basis/stack-checker/stack-checker.factor
+++ b/basis/stack-checker/stack-checker.factor
@@ -1,27 +1,18 @@
-! Copyright (C) 2004, 2008 Slava Pestov.
+! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel io effects namespaces sequences quotations vocabs
-generic words stack-checker.backend stack-checker.state
-stack-checker.known-words stack-checker.transforms
-stack-checker.errors stack-checker.inlining
-stack-checker.visitor.dummy ;
+USING: accessors classes effects generic io kernel namespaces
+quotations sequences stack-checker.backend stack-checker.errors
+stack-checker.inlining stack-checker.known-words
+stack-checker.state stack-checker.transforms
+stack-checker.visitor.dummy vocabs vocabs.loader words ;
 IN: stack-checker
 
-GENERIC: infer ( quot -- effect )
-
-M: callable infer ( quot -- effect )
-    [ recursive-state get infer-quot ] with-infer drop ;
+: infer ( quot -- effect )
+    callable check-instance
+    [ infer-quot-here ] with-infer drop ;
 
 : infer. ( quot -- )
-    #! Safe to call from inference transforms.
+    ! Safe to call from inference transforms.
     infer effect>string print ;
 
-: forget-errors ( -- )
-    all-words [
-        dup subwords [ f "cannot-infer" set-word-prop ] each
-        f "cannot-infer" set-word-prop
-    ] each ;
-
-: forget-effects ( -- )
-    forget-errors
-    all-words [ f "inferred-effect" set-word-prop ] each ;
+M: callable stack-effect infer ;