fix let*-values with mixed values #322

CHANGELOG.md

@@ -49,6 +49,7 @@
 * fix `repr` of delay expressions [#315](https://github.com/jcubic/lips/issues/315)
 * fix `try..catch` [#317](https://github.com/jcubic/lips/issues/317)
 * fix handling `^` and `$` syntax extension [#318](https://github.com/jcubic/lips/issues/318)
+* fix mixed values in `let*-values` [#322](https://github.com/jcubic/lips/issues/322)
 
 ## 1.0.0-beta.18
 ### Breaking

Makefile

@@ -99,10 +99,10 @@ publish:
 jest-test: dist/lips.js
 	@$(JEST) --coverage spec/*.spec.js
 
-test: dist/lips.js dist/std.min.scm
+test: dist/lips.js dist/std.xcb
 	@$(NPM) run test
 
-test-file: dist/lips.js dist/std.min.scm
+test-file: dist/lips.js dist/std.xcb
 	@$(NPM) run test -- -- -f $(FILE)
 
 test-update: dist/lips.js dist/std.scm

README.md

@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/badge/npm-1.0.0%E2%80%93beta.18.1-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
 ![1.0.0 Complete](https://img.shields.io/github/milestones/progress-percent/jcubic/lips/1?label=1.0.0%20Complete)
 [![Build and test](https://github.com/jcubic/lips/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/lips/actions/workflows/build.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=devel&f565a6f71eb6e66a96e6192bc9d35925)](https://coveralls.io/github/jcubic/lips?branch=devel)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=devel&d6071503773f4af852fb53b8e700b12d)](https://coveralls.io/github/jcubic/lips?branch=devel)
 [![Join Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jcubic/lips)
 ![NPM Download Count](https://img.shields.io/npm/dm/@jcubic/lips)
 ![JSDelivr Download count](https://img.shields.io/jsdelivr/npm/hm/@jcubic/lips)

lib/R7RS.scm

@@ -210,13 +210,15 @@
 
 ;; -----------------------------------------------------------------------------
 (define-syntax let*-values
-  (syntax-rules ()
+  (syntax-rules (multi single)
     ((_ ()) nil)
     ((_ () body ...) (begin body ...))
-    ((_ ((bind values) rest ...) . body)
+    ((_ ((bind obj) rest ...) . body)
      (apply (lambda bind
               (let*-values (rest ...) . body))
-            (vector->list ((. values "valueOf"))))))
+            (if (instanceof lips.Values obj)
+                (vector->list (obj.valueOf))
+                (list obj)))))
   "(let*-values binding body ...)
 
    The macro work similar to let* but variable is list of values and value

templates/Makefile

@@ -99,10 +99,10 @@ publish:
 jest-test: dist/lips.js
 	@$(JEST) --coverage spec/*.spec.js
 
-test: dist/lips.js dist/std.min.scm
+test: dist/lips.js dist/std.xcb
 	@$(NPM) run test
 
-test-file: dist/lips.js dist/std.min.scm
+test-file: dist/lips.js dist/std.xcb
 	@$(NPM) run test -- -- -f $(FILE)
 
 test-update: dist/lips.js dist/std.scm

tests/std.scm

@@ -102,6 +102,17 @@
                 (cons x (cons y (cons z a))))
               '(1 2 3 4 5))))
 
+(test "std: let*-values mixed values"
+      (lambda (t)
+        (define (div-mul x y)
+          (values (/ x y) (* x y)))
+
+        (t.is (let*-values (((x) 2)
+                            ((y) 10)
+                            ((div mul) (div-mul x y)))
+                (+ div mul))
+              101/5)))
+
 (test "std: should render SXML string"
       (lambda (t)
         (define preact (require "preact"))