Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / module / language / scheme / decompile-tree-il.scm

diff --git a/module/language/scheme/decompile-tree-il.scm b/module/language/scheme/decompile-tree-il.scm
index f94661d..c065474 100644 (file)
--- a/module/language/scheme/decompile-tree-il.scm
+++ b/module/language/scheme/decompile-tree-il.scm
@@ -219,10 +219,12 @@
              exp
              `(quote ,exp)))
 
-        ((<sequence> exps)
-         (build-begin (map recurse exps)))
+        ((<seq> head tail)
+         (build-begin (cons (recurse head)
+                            (build-begin-body
+                             (recurse tail)))))
 
-        ((<application> proc args)
+        ((<call> proc args)
          (match `(,(recurse proc) ,@(map recurse args))
            ((('lambda (formals ...) body ...) args ...)
             (=> failure)
@@ -231,6 +233,9 @@
                 (failure)))
            (e e)))
 
+        ((<primcall> name args)
+         `(,name ,@(map recurse args)))
+
         ((<primitive-ref> name)
          name)
 
@@ -658,7 +663,7 @@
             ((<void>)  (primitive 'if)) ; (if #f #f)
             ((<const>) (primitive 'quote))
 
-            ((<application> proc args)
+            ((<call> proc args)
              (if (lexical-ref? proc)
                  (let* ((gensym (lexical-ref-gensym proc))
                         (name (source-name gensym)))
@@ -673,6 +678,7 @@
              (for-each recurse args))
 
             ((<primitive-ref> name) (primitive name))
+            ((<primcall> name args) (primitive name) (for-each recurse args))
 
             ((<lexical-ref> gensym) (lexical gensym))
             ((<lexical-set> gensym exp)
@@ -695,7 +701,9 @@
              (primitive 'if)
              (recurse test) (recurse consequent) (recurse alternate))
 
-            ((<sequence> exps) (primitive 'begin) (for-each recurse exps))
+            ((<seq> head tail)
+             (primitive 'begin) (recurse head) (recurse tail))
+
             ((<lambda> body)
              (if body (recurse body)))