Defining views

diff --git a/src/utils.scm b/src/utils.scm
index eb20531fdc90680abfcd224e942d81afd510af43..d63a51148f2a8f590ae1e2a545abc8dc49d5dd16 100644 (file)
--- a/src/utils.scm
+++ b/src/utils.scm
@@ -19,7 +19,8 @@
   #:export (use-cache-with
            arguments-calling
            arguments-apply
-           bound?))
+           bound?
+           make-producer))
 
 
 ;;; Cache for procedures

diff --git a/src/views.scm b/src/views.scm
index f021286c844fd5af6bdd0fefbe0940d41411c06e..46657293c54d94bd5ee0509b43dd1a06fd9aeb4d 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,25 +26,21 @@
 
 (define view-type
   (make-record-type "view" 
-                   '(id body meshes priority)
+                   '(id constructor body meshes priority)
                    (lambda (record port)
                      (format port "#<view: ~a meshes>"
                              (length (view-meshes record))))))
 
-(define (make-view body meshes) ((record-constructor view-type) (gensym) body meshes 0))
+(define (make-view constructor) ((record-constructor view-type) (gensym) constructor #f '() 0))
 (define view? (record-predicate view-type))
 (define view-id (record-accessor view-type 'id))
+(define view-constructor (record-accessor view-type 'constructor))
 (define view-body (record-accessor view-type 'body))
 (define view-meshes (record-accessor view-type 'meshes))
 (define view-priority (record-accessor view-type 'priority))
 
-(define-macro (define-view meshes . body)
-  `(make-view
-    ,(cond ((null? body) `(lambda () #f))
-          (else `(lambda () ,@body)))
-    (map (lambda (m)
-          `(,(mesh-inner-property m 'id) . ,m))
-        ,meshes)))
+(define-macro (define-view body)
+  `(make-view (lambda () ,body)))
 
 (define activated-views '())
 (define (sort-views views-alist)