From 875357c1bf16981fb85e7bfadeac74de09dd1b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Thu, 4 Aug 2016 13:30:24 +0200
Subject: [PATCH] stack-checker.*: init-known-values word not needed

---
 .../backend/backend-tests.factor              |  9 ++++---
 basis/stack-checker/backend/backend.factor    |  2 +-
 basis/stack-checker/state/state-tests.factor  |  3 ++-
 .../stack-checker/values/values-tests.factor  | 27 ++++++++++++++++---
 basis/stack-checker/values/values.factor      |  3 ---
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/basis/stack-checker/backend/backend-tests.factor b/basis/stack-checker/backend/backend-tests.factor
index 37815462bc..dfd9c8119f 100644
--- a/basis/stack-checker/backend/backend-tests.factor
+++ b/basis/stack-checker/backend/backend-tests.factor
@@ -1,6 +1,7 @@
-USING: accessors classes.tuple compiler.tree stack-checker.backend tools.test
-kernel namespaces stack-checker.state stack-checker.values
-stack-checker.visitor sequences assocs ;
+USING: accessors assocs classes.tuple compiler.tree kernel namespaces
+sequences stack-checker.backend stack-checker.recursive-state
+stack-checker.state stack-checker.values stack-checker.visitor
+tools.test ;
 IN: stack-checker.backend.tests
 
 { } [
@@ -32,7 +33,7 @@ IN: stack-checker.backend.tests
     V{ 3 9 8 }
     H{ { 8 input-parameter } { 9 input-parameter } { 3 input-parameter } }
 } [
-    init-known-values
+    H{ } clone known-values set
     V{ } clone stack-visitor set
     V{ 3 9 8 } introduce-values
     stack-visitor get first out-d>>
diff --git a/basis/stack-checker/backend/backend.factor b/basis/stack-checker/backend/backend.factor
index 4e763fa223..29bb56e844 100644
--- a/basis/stack-checker/backend/backend.factor
+++ b/basis/stack-checker/backend/backend.factor
@@ -151,7 +151,7 @@ M: object apply-object push-literal ;
 : with-infer ( quot -- effect visitor )
     [
         init-inference
-        init-known-values
+        H{ } clone known-values set
         stack-visitor off
         call
         end-infer
diff --git a/basis/stack-checker/state/state-tests.factor b/basis/stack-checker/state/state-tests.factor
index 24dd34bb23..bba4da1bd7 100644
--- a/basis/stack-checker/state/state-tests.factor
+++ b/basis/stack-checker/state/state-tests.factor
@@ -7,7 +7,8 @@ IN: stack-checker.state.tests
     V{ 1 2 3 }
 } [
     0 \ <value> set-global
-    init-inference init-known-values
+    init-inference
+    H{ } clone known-values set
     V{ 1 2 3 } literals set commit-literals
     (meta-d) get
 ] unit-test
diff --git a/basis/stack-checker/values/values-tests.factor b/basis/stack-checker/values/values-tests.factor
index c92ce9d6f9..1ece7272e1 100644
--- a/basis/stack-checker/values/values-tests.factor
+++ b/basis/stack-checker/values/values-tests.factor
@@ -1,9 +1,30 @@
-USING: kernel namespaces stack-checker.backend stack-checker.values
-tools.test ;
+USING: accessors kernel namespaces stack-checker.state
+stack-checker.values tools.test ;
 IN: stack-checker.values.tests
 
+TUPLE: foo-tup a b ;
+
+! known
+{ T{ foo-tup f 10 20 } } [
+    H{ } clone known-values set
+    0 \ <value> set-global
+    V{ } clone literals set
+    10 20 foo-tup boa 23 set-known
+    23 known
+] unit-test
+
+! literal
+{ T{ foo-tup f 10 20 } } [
+    H{ } clone known-values set
+    0 \ <value> set-global
+    V{ } clone literals set
+    10 20 foo-tup boa <literal> make-known
+    literal value>>
+] unit-test
+
+! set-known
 { H{ { 3 input-parameter } } } [
-    init-known-values
+    H{ } clone known-values set
     input-parameter 3 set-known
     known-values get
 ] unit-test
diff --git a/basis/stack-checker/values/values.factor b/basis/stack-checker/values/values.factor
index 603dd9fd40..93b87057fa 100644
--- a/basis/stack-checker/values/values.factor
+++ b/basis/stack-checker/values/values.factor
@@ -8,9 +8,6 @@ IN: stack-checker.values
 
 SYMBOL: known-values
 
-: init-known-values ( -- )
-    H{ } clone known-values set ;
-
 : known ( value -- known )
     known-values get at ;