From be5a09c9e39fc1b0a9421364aa28ede77aa055e1 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Wed, 26 Mar 2008 18:37:28 -0500
Subject: [PATCH] Inheritance work in progress

---
 core/prettyprint/prettyprint.factor |  3 +++
 core/tuples/tuples-tests.factor     | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/prettyprint/prettyprint.factor b/core/prettyprint/prettyprint.factor
index 26c6076769..7b8c8f2997 100755
--- a/core/prettyprint/prettyprint.factor
+++ b/core/prettyprint/prettyprint.factor
@@ -257,6 +257,9 @@ M: predicate-class see-class*
 M: tuple-class see-class*
     <colon \ TUPLE: pprint-word
     dup pprint-word
+    dup superclass tuple eq? [
+        "<" text dup superclass pprint-word
+    ] unless
     "slot-names" word-prop [ text ] each
     pprint-; block> ;
 
diff --git a/core/tuples/tuples-tests.factor b/core/tuples/tuples-tests.factor
index e7ad44a264..2d28697b70 100755
--- a/core/tuples/tuples-tests.factor
+++ b/core/tuples/tuples-tests.factor
@@ -3,7 +3,7 @@ math.constants parser sequences tools.test words assocs
 namespaces quotations sequences.private classes continuations
 generic.standard effects tuples tuples.private arrays vectors
 strings compiler.units accessors classes.algebra calendar
-prettyprint io.streams.string ;
+prettyprint io.streams.string splitting ;
 IN: tuples.tests
 
 TUPLE: rect x y w h ;
@@ -247,8 +247,8 @@ C: <erg's-reshape-problem> erg's-reshape-problem
 ! Inheritance
 TUPLE: computer cpu ram ;
 
-[ "IN: tuples.tests TUPLE: computer cpu ram ;\n" ] [
-    [ \ computer see ] with-string-writer
+[ "TUPLE: computer cpu ram ;" ] [
+    [ \ computer see ] with-string-writer string-lines second
 ] unit-test
 
 TUPLE: laptop < computer battery ;
@@ -264,8 +264,8 @@ C: <laptop> laptop
 [ t ] [ "laptop" get computer? ] unit-test
 [ t ] [ "laptop" get tuple? ] unit-test
 
-[ "IN: tuples.tests TUPLE: laptop < computer battery ;\n" ] [
-    [ \ laptop see ] with-string-writer
+[ "TUPLE: laptop < computer battery ;" ] [
+    [ \ laptop see ] with-string-writer string-lines second
 ] unit-test
 
 TUPLE: server < computer rackmount? ;
@@ -288,8 +288,8 @@ C: <server> server
 [ f ] [ laptop server class< ] unit-test
 [ f ] [ laptop server classes-intersect? ] unit-test
 
-[ "IN: tuples.tests TUPLE: server < computer rackmount ;\n" ] [
-    [ \ server see ] with-string-writer
+[ "TUPLE: server < computer rackmount? ;" ] [
+    [ \ server see ] with-string-writer string-lines second
 ] unit-test
 
 [