Changed the representation of an oc to put the symbolic representatio…

…n first, then the closure. Also fixed all the places where this caused an error due to representation-leaking lazyness on my part!

ck.scm

@@ -133,13 +133,13 @@
 (define-syntax build-oc-aux
   (syntax-rules ()
     ((_ op () (z ...) (arg ...))
-     (let ((z arg) ...) `(,(op z ...) . (op ,z ...))))
+     (let ((z arg) ...) `((op ,z ...) . ,(op z ...))))
     ((_ op (arg0 arg ...) (z ...) args)
      (build-oc-aux op (arg ...) (z ... q) args))))
 
-(define oc->proc car)
-(define oc->rands cddr)
-(define oc->rator cadr)
+(define oc->proc cdr)
+(define oc->rands cdar)
+(define oc->rator caar)
 
 ;; ---FIXED-POINT--------------------------------------------------
 

never-true.scm

@@ -53,7 +53,7 @@
 (define reified-allowed
   (lambda (v r c)
     (let ((c (filter (lambda (oc) (eq? (oc->rator oc) 'allowed-c)) c)))
-      (let ((c (walk* (map cddr c) r)))
+      (let ((c (walk* (map oc->rands c) r)))
         `((allowed . ,c))))))
 
 (extend-enforce-fns 'required required-enforceo)

pref.scm

@@ -49,9 +49,9 @@
                           (else (loop (cdr c^))))))))))
            (loop
              (map
-               ;; This is lazy
                (lambda (oc)
-                 (cons (caddr oc) (cadddr oc)))
+                 (let ((p (oc->rands oc)))
+                   (cons (car p) (cadr p))))
                (filter
                  (lambda (oc) (eq? (oc->rator oc) 'prefo-c))
                  c))))