more ghil parsing fixen

* module/system/il/ghil.scm (parse-ghil): Fix a typo for values*
  (unparse-ghil): Only output (quote foo) if the object is a symbol.
  (unparse-ghil): Fix some missing ,@.

diff --git a/module/system/il/ghil.scm b/module/system/il/ghil.scm
index 50db309..0340c03 100644 (file)
--- a/module/system/il/ghil.scm
+++ b/module/system/il/ghil.scm
@@ -414,7 +414,7 @@
       (make-ghil-values env loc (map retrans values)))
 
      ((values* . ,values)
-      (make-ghil-values env loc (map retrans values)))
+      (make-ghil-values* env loc (map retrans values)))
 
      ((compile-time-environment)
       (make-ghil-reified-env env loc))
@@ -430,7 +430,9 @@
     ((<ghil-void> env loc)
      '(void))
     ((<ghil-quote> env loc obj)
-     `(,'quote ,obj))
+     (if (symbol? obj)
+         `(,'quote ,obj)
+         obj))
     ((<ghil-quasiquote> env loc exp)
      `(,'quasiquote ,(map unparse-ghil exp)))
     ((<ghil-unquote> env loc exp)
@@ -467,10 +469,10 @@
     ((<ghil-mv-call> env loc producer consumer)
      `(mv-call ,(unparse-ghil producer) ,(unparse-ghil consumer)))
     ((<ghil-inline> env loc inline args)
-     `(inline ,inline (map unparse-ghil args)))
+     `(inline ,inline ,@(map unparse-ghil args)))
     ((<ghil-values> env loc values)
-     `(values (map unparse-ghil values)))
+     `(values ,@(map unparse-ghil values)))
     ((<ghil-values*> env loc values)
-     `(values* (map unparse-ghil values)))
+     `(values* ,@(map unparse-ghil values)))
     ((<ghil-reified-env> env loc)
      `(compile-time-environment))))