From 9e82f1f8dd96efccbd3834f01d34ebf93258cc19 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:42:53 -0600
Subject: [PATCH] Better inference error messages

---
 basis/compiler/tree/builder/builder.factor           | 12 ++++--------
 basis/stack-checker/errors/errors.factor             |  2 +-
 .../recursive-state/recursive-state.factor           |  4 +---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/basis/compiler/tree/builder/builder.factor b/basis/compiler/tree/builder/builder.factor
index c2ec6552cd..4e79c4cd2d 100644
--- a/basis/compiler/tree/builder/builder.factor
+++ b/basis/compiler/tree/builder/builder.factor
@@ -34,14 +34,10 @@ IN: compiler.tree.builder
     if ;
 
 : (build-tree-from-word) ( word -- )
-    dup
-    [ "inline" word-prop ]
-    [ "recursive" word-prop ] bi and [
-        1quotation f initial-recursive-state infer-quot
-    ] [
-        [ specialized-def ] [ initial-recursive-state ] bi
-        infer-quot
-    ] if ;
+    dup initial-recursive-state recursive-state set
+    dup [ "inline" word-prop ] [ "recursive" word-prop ] bi and
+    [ 1quotation ] [ specialized-def ] if
+    infer-quot-here ;
 
 : check-cannot-infer ( word -- )
     dup "cannot-infer" word-prop [ cannot-infer-effect ] [ drop ] if ;
diff --git a/basis/stack-checker/errors/errors.factor b/basis/stack-checker/errors/errors.factor
index efdc7e23b2..9fb2b59f6c 100644
--- a/basis/stack-checker/errors/errors.factor
+++ b/basis/stack-checker/errors/errors.factor
@@ -24,7 +24,7 @@ M: inference-error error-help error>> error-help ;
     +warning+ (inference-error) ; inline
 
 M: inference-error error.
-    [ "In word: " write word>> . ] [ error>> error. ] bi ;
+    [ word>> [ "In word: " write . ] when* ] [ error>> error. ] bi ;
 
 TUPLE: literal-expected ;
 
diff --git a/basis/stack-checker/recursive-state/recursive-state.factor b/basis/stack-checker/recursive-state/recursive-state.factor
index 41d7331230..9abfb1fcd5 100644
--- a/basis/stack-checker/recursive-state/recursive-state.factor
+++ b/basis/stack-checker/recursive-state/recursive-state.factor
@@ -4,9 +4,7 @@ USING: accessors arrays sequences kernel sequences assocs
 namespaces stack-checker.recursive-state.tree ;
 IN: stack-checker.recursive-state
 
-TUPLE: recursive-state words word quotations inline-words ;
-
-C: <recursive-state> recursive-state
+TUPLE: recursive-state word words quotations inline-words ;
 
 : prepare-recursive-state ( word rstate -- rstate )
     swap >>word