From 171604d7fce314598737047e8c378f051ee3fd18 Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Wed, 5 Dec 2007 01:33:47 -0500
Subject: [PATCH] values and call-with-values now have proper names when
 printed. e.g. #<procedure values> and #<procedure call-with-values>

---
 scheme/ikarus.compiler.ss        | 2 ++
 scheme/ikarus.intel-assembler.ss | 6 +++---
 scheme/last-revision             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scheme/ikarus.compiler.ss b/scheme/ikarus.compiler.ss
index c483011..d6f4a67 100644
--- a/scheme/ikarus.compiler.ss
+++ b/scheme/ikarus.compiler.ss
@@ -2284,6 +2284,7 @@
         (let ([L_values_one_value (gensym)]
               [L_values_many_values (gensym)])
           (list 0 ; no freevars
+              '(name values)
               (label SL_values)
               (cmpl (int (argc-convention 1)) eax)
               (je (label L_values_one_value))
@@ -2315,6 +2316,7 @@
               [L_cwv_call (gensym)])
           (list 
               0 ; no free vars
+              '(name call-with-values)
               (label SL_call_with_values)
               (cmpl (int (argc-convention 2)) eax)
               (jne (label (sl-invalid-args-label)))
diff --git a/scheme/ikarus.intel-assembler.ss b/scheme/ikarus.intel-assembler.ss
index b7620f7..2a6cbb8 100644
--- a/scheme/ikarus.intel-assembler.ss
+++ b/scheme/ikarus.intel-assembler.ss
@@ -1067,9 +1067,9 @@
             (cdr ls)))
       (define (code-name ls)
         (let ([a (cadr ls)])
-           (and (pair? a) 
-                (eq? (car a) 'name))
-                (cadr a)))
+           (if (and (pair? a) (eq? (car a) 'name))
+               (cadr a)
+               #f)))
       (let ([closure-size* (map car ls*)]
             [code-name* (map code-name ls*)]
             [ls* (map code-list ls*)])
diff --git a/scheme/last-revision b/scheme/last-revision
index 0eec1ae..7fe7c51 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1180
+1182