Added call-with-values back

cyclone.scm

@@ -131,8 +131,8 @@
                    input-program)))
         (cond
          ((and library? (equal? lib-name '(scheme base)))
-           (set! globals (cons 'call/cc globals))
+           (set! globals (append '(call-with-values call/cc) globals))
-           (set! module-globals (cons 'call/cc module-globals))
+           (set! module-globals (append '(call-with-values call/cc) module-globals))
            (set! input-program 
              (cons
               ;; Experimental version of call-with-values,

eval.scm

@@ -188,6 +188,7 @@
 (define primitive-procedures
   (list 
       (list 'call/cc call/cc)
+      (list 'call-with-values call-with-values)
       (list 'Cyc-global-vars Cyc-global-vars)
       (list 'Cyc-get-cvar Cyc-get-cvar)
       (list 'Cyc-set-cvar! Cyc-set-cvar!)

scheme/base.sld

@@ -6,9 +6,9 @@
     ;delete-duplicates
     call-with-current-continuation
     call/cc
-    ;call-with-values
+    call-with-values
-    ;dynamic-wind
+    dynamic-wind
-    ;values
+    values
     ;(Cyc-bin-op cmp x lst)
     ;(Cyc-bin-op-char cmp c cs)
     char=?
@@ -74,14 +74,14 @@
         (lambda (cont) (apply cont things))))
     ;; TODO: just need something good enough for bootstrapping (for now)
     ;; does not have to be perfect (this is not, does not handle call/cc or exceptions)
-    ;(define (dynamic-wind before thunk after)
+    (define (dynamic-wind before thunk after)
-    ;  (before)
+      (before)
-    ;  (call-with-values
+      (call-with-values
-    ;    thunk
+        thunk
-    ;    (lambda (result) ;results
+        (lambda (result) ;results
-    ;      (after)
+          (after)
-    ;      result)))
+          result)))
-    ;      ;(apply values results))))
+          ;(apply values results))))
     (define (Cyc-bin-op cmp x lst)
       (cond
         ((null? lst) #t)

test.scm

@@ -20,7 +20,7 @@
 (define b (vector 10 20 30 40 50))
 (vector-copy! b 1 a 0 2)
 (write (equal? b #(10 1 2 40 50)))
-;(call-with-values 
+(call-with-values 
-;  (lambda () (values 1 1))
+  (lambda () (values 1 1))
-;  (lambda (a) (write a)))
+  (lambda (a) (write a)))
 

trans.scm

@@ -126,7 +126,7 @@
 
 
 (define (built-in-syms)
-  '(call/cc define))
+  '(call-with-values call/cc define))
 
 ;; Tuning
 (define *do-code-gen* #t) ; Generate C code?