From 593e6256d2bbfd9cbfa33c373c3bdae0e75e608a Mon Sep 17 00:00:00 2001
From: Kathy Gray <kathryn.gray@cl.cam.ac.uk>
Date: Thu, 17 Jul 2008 16:07:44 +0000
Subject: [PATCH] Arity bugs identified by the optimizer

svn: r10820
---
 collects/profj/check.ss               | 6 +++---
 collects/profj/parsers/parse-error.ss | 2 +-
 collects/profj/types.ss               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/collects/profj/check.ss b/collects/profj/check.ss
index baacb472f4..696b6431dd 100644
--- a/collects/profj/check.ss
+++ b/collects/profj/check.ss
@@ -1201,7 +1201,7 @@
       (when (ref-type? type)
         (add-required c-class (ref-type-class/iface type) (ref-type-path type) type-recs))
       (when (eq? 'string type)
-        (add-required c-class "String" '("java" "lang")))
+        (add-required c-class "String" '("java" "lang") type-recs))
       (when (and in-env? (not (properties-field? (var-type-properties in-env?))))
         (illegal-redefinition (field-name local) (field-src local)))
       (if is-var-init?
@@ -2296,7 +2296,7 @@
       (member s `("if" "return"))))
   
   (define (error-file-exists? class type-recs) #f)
-  (define (call-provided-error) null)
+  (define (call-provided-error a b c) null)
   
   ;check-method-args: (list type) (list type) id type src type-records -> void
   (define (check-method-args args atypes name exp-type src type-recs)
@@ -2946,7 +2946,7 @@
       (when (eq? actual-t 'void)
         (check-rand-type-error 'void level actual-t er-ts (expr-src actual)))
       (when (null? er-ts)
-        (check-rand-type-error 'empty level actual-t src))
+        (check-rand-type-error 'empty level actual-t 'none src))
       
       (and
        (andmap
diff --git a/collects/profj/parsers/parse-error.ss b/collects/profj/parsers/parse-error.ss
index b987b0c3a2..3c3f0c2ce1 100644
--- a/collects/profj/parsers/parse-error.ss
+++ b/collects/profj/parsers/parse-error.ss
@@ -2510,7 +2510,7 @@
             (if (close-to-keyword? tok 'within)
                 (parse-error
                  (format "Expected 'within' for range of check, found ~a which is similar to 'within'. Check capitolization and spelling."
-                         out))
+                         out) ps end)
                 cur-tok))))
         ((name)
          (case kind
diff --git a/collects/profj/types.ss b/collects/profj/types.ss
index 175d9d3fb1..aafd44db81 100644
--- a/collects/profj/types.ss
+++ b/collects/profj/types.ss
@@ -214,8 +214,8 @@
             ((and (not from-record) to-record (class-record-class? to-record))
              (type=? object-type to))
             ((and (not from-record) to-record)
-             (or (type=? serializable-type to type-recs)
-                 (type=? cloneable-type to type-recs)))
+             (or (type=? serializable-type to)
+                 (type=? cloneable-type to)))
             (else
              (or (type=? (array-type-type to) (array-type-type from))
                  (castable? (array-type-type from)