remove useless <glil-vars> helper type, serialize GHIL more strictly

[bpt/guile.git] / module / language / ghil / compile-glil.scm

diff --git a/module/language/ghil/compile-glil.scm b/module/language/ghil/compile-glil.scm
index ae68f14..b8259f8 100644 (file)
--- a/module/language/ghil/compile-glil.scm
+++ b/module/language/ghil/compile-glil.scm
@@ -216,6 +216,12 @@
         (maybe-drop)
         (maybe-return))
 
+       ((<ghil-unquote> env loc exp)
+         (error "unquote outside of quasiquote" exp))
+
+       ((<ghil-unquote-splicing> env loc exp)
+         (error "unquote-splicing outside of quasiquote" exp))
+
        ((<ghil-ref> env loc var)
         (return-code! loc (make-glil-var 'ref env var)))
 
@@ -428,11 +434,9 @@
         ;; compile body
         (comp body #t #f)
         ;; create GLIL
-        (let ((vars (make-glil-vars #:nargs (length vars)
-                                     #:nrest (if rest 1 0)
-                                     #:nlocs (length locs)
-                                     #:nexts (length exts))))
-          (make-glil-asm vars meta (reverse! stack))))))))
+         (make-glil-asm
+          (length vars) (if rest 1 0) (length locs) (length exts)
+          meta (reverse! stack)))))))
 
 (define (finalize-index! list)
   (do ((n 0 (1+ n))