ignore multiple-value return from interleaved init expressions in top…

…-level-program
gongchengra · Mar 27, 2019 · f5fd9d1 · f5fd9d1
1 parent ed4ca61
commit f5fd9d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/LOG b/LOG
@@ -1251,3 +1251,6 @@
   embed git revision in exported source archives
     bintar/Makefile Mf-install.in wininstall/*nt.wxs
     s/Mf-base s/.gitattributes s/update-revision
+- ignore multiple-value return from interleaved init expressions in
+  top-level-program
+    syntax.ss, 8.ms
diff --git a/mats/8.ms b/mats/8.ms
@@ -10715,6 +10715,18 @@
          (remprop 'tlp-spam 'spam)
          (remprop 'tlp-spam 'tlp)
          #t))
+  ; make sure we ignore return value(s) of interleaved init expressions
+  (equal?
+   (with-output-to-string
+     (lambda ()
+       ; prevent cp0 from fixing the problem
+       (parameterize ([run-cp0 (lambda (f x) x)])
+         (eval '(top-level-program (import (scheme))
+                  (define (f) (printf "hello\n") (values 1 2 3))
+                  (f)
+                  (define x 'world)
+                  (pretty-print x))))))
+   "hello\nworld\n")
 )
 
 (mat library-meta

diff --git a/s/syntax.ss b/s/syntax.ss
@@ -2830,7 +2830,8 @@
                   [interleaved-init (frob)
                    (process-bindings mb* r
                      (cons (build-lexical-var no-source 't) dv*)
-                     (cons frob de*))]
+                     (cons (make-frob #`(begin #,(frob-e frob) (void)) (frob-meta? frob))
+                      de*))]
                   [else (process-bindings mb* r dv* de*)]))))))))
 
 (define chi-top-module