From e30d275e41b21e601e7cf6d51059108a28ea4a6f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Nov 2009 02:01:28 -0600
Subject: [PATCH] compiler.cfg: 'basic-block new hashcode' should not throw an
 exception; fixes tools.deploy.test.11

---
 basis/compiler/cfg/cfg.factor         |  2 +-
 core/classes/tuple/tuple-tests.factor | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/basis/compiler/cfg/cfg.factor b/basis/compiler/cfg/cfg.factor
index 035cc63b1e..5d815e3b0f 100644
--- a/basis/compiler/cfg/cfg.factor
+++ b/basis/compiler/cfg/cfg.factor
@@ -4,7 +4,7 @@ USING: kernel math vectors arrays accessors namespaces ;
 IN: compiler.cfg
 
 TUPLE: basic-block < identity-tuple
-id
+{ id integer }
 number
 { instructions vector }
 { successors vector }
diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor
index 3555147542..eb033edfe4 100644
--- a/core/classes/tuple/tuple-tests.factor
+++ b/core/classes/tuple/tuple-tests.factor
@@ -6,7 +6,7 @@ io.streams.string kernel kernel.private math math.constants
 math.order namespaces parser parser.notes prettyprint
 quotations random see sequences sequences.private slots
 slots.private splitting strings summary threads tools.test
-vectors vocabs words words.symbol ;
+vectors vocabs words words.symbol fry ;
 IN: classes.tuple.tests
 
 TUPLE: rect x y w h ;
@@ -734,3 +734,11 @@ ERROR: base-error x y ;
 ERROR: derived-error < base-error z ;
 
 [ (( x y z -- * )) ] [ \ derived-error stack-effect ] unit-test
+
+USE: classes.struct
+
+[ { } ] [
+    classes
+    [ "prototype" word-prop ] map
+    [ '[ _ hashcode drop f ] [ drop t ] recover ] filter
+] unit-test