From eca198d0094212cc90ac41df98f3c0fc5f0e085e Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 17 Sep 2007 17:33:35 +0000
Subject: [PATCH] backed out of contract/class change

svn: r7369
---
 collects/profj/libs/java/lang/Object-composite.ss |  4 ++--
 collects/profj/to-scheme.ss                       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/collects/profj/libs/java/lang/Object-composite.ss b/collects/profj/libs/java/lang/Object-composite.ss
index 8be9557e21..4a6fa49ca0 100644
--- a/collects/profj/libs/java/lang/Object-composite.ss
+++ b/collects/profj/libs/java/lang/Object-composite.ss
@@ -109,7 +109,7 @@
     (if (string? obj)
         (make-java-string string)
         (begin
-          (c:contract (object-contract
+          (c:contract (c:object-contract
                        (clone (c:-> c:any/c))
                        (equals-java.lang.Object (c:-> c:any/c c:any/c))
                        (finalize (c:-> c:any/c))
@@ -1019,7 +1019,7 @@
            guard-convert-Throwable static-Throwable/c)
   
   (define (wrap-convert-assert-Throwable obj p n s c)
-    (c:contract (object-contract
+    (c:contract (c:object-contract
                  (init-cause (c:-> c:any/c c:any/c))
                  (get-message (c:-> c:any/c))
                  (get-cause (c:-> c:any/c))
diff --git a/collects/profj/to-scheme.ss b/collects/profj/to-scheme.ss
index 5233c7b3e8..4ee1dfa310 100644
--- a/collects/profj/to-scheme.ss
+++ b/collects/profj/to-scheme.ss
@@ -992,7 +992,7 @@
     
   ;methods->contract: (list method-record) -> sexp
   (define (methods->contract methods)
-    `(object-contract ,@(map (lambda (m)
+    `(c:object-contract ,@(map (lambda (m)
                                `(,(build-identifier (mangle-method-name (method-record-name m)
                                                                         (method-record-atypes m)))
                                  (c:-> ,@(map (lambda (a) 'c:any/c) (method-record-atypes m)) c:any/c)))
@@ -2116,22 +2116,22 @@
          ((string String) 
           (if from-dynamic?
               `string?
-              `(is-a?/c ,(if (send (types) require-prefix? '("String" "java" "lang") (lambda () #f))
+              `(c:is-a?/c ,(if (send (types) require-prefix? '("String" "java" "lang") (lambda () #f))
                                'java.lang.String 'String))))
          ((dynamic void) 'c:any/c)))
       ((ref-type? type)
        (if (equal? type string-type)
            (type->contract 'string from-dynamic?)
-           `(c:or/c (is-a?/c object%) string?)))
+           `(c:or/c (c:is-a?/c object%) string?)))
       ((unknown-ref? type)
        (if (not (null? stop?))
-           `(c:or/c (is-a?/c object%) string?)
+           `(c:or/c (c:is-a?/c object%) string?)
            (cond
              ((method-contract? (unknown-ref-access type))
-              `(object-contract (,(string->symbol (java-name->scheme (method-contract-name (unknown-ref-access type))))
+              `(c:object-contract (,(string->symbol (java-name->scheme (method-contract-name (unknown-ref-access type))))
                                  ,(type->contract (unknown-ref-access type) from-dynamic?))))
              ((field-contract? (unknown-ref-access type))
-              `(object-contract (field ,(build-identifier (string-append (field-contract-name (unknown-ref-access type)) "~f"))
+              `(c:object-contract (field ,(build-identifier (string-append (field-contract-name (unknown-ref-access type)) "~f"))
                                        ,(type->contract (field-contract-type (unknown-ref-access type)) from-dynamic?)))))))
       ((method-contract? type)
        `(c:-> ,@(map (lambda (a) (type->contract a from-dynamic?)) (method-contract-args type))