# HG changeset patch
# User Arne Babenhauserheide <arne_bab@web.de>
# Date 1710889929 -3600
#      Wed Mar 20 00:12:09 2024 +0100
# Branch stable
# Node ID 7c6239a779656cd55225ad24e15cc29bc896f834
# Parent  0fc029225cb344e4492519a316c03c2a12c16e04
# Parent  a42242fc7ca9fbfd3dd31d02ca3644f40cae9f65
wisp 1.0.12: improve compatibility and output

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,8 @@
 guile_install_go_files = install-nobase_goDATA
 $(guile_install_go_files): install-nobase_siteDATA
 
-EXTRA_DIST = $(WISP) bootstrap.sh bootstrap-reader.sh language examples tests wisp-repl-guile.sh testrunner.w wisp.py wisp.scm wisp.in m4 ob-wisp.el wisp-mode.el AUTHORS.in
-CLEANFILES = 1 2 $(GOBJECTS)
+EXTRA_DIST = $(WISP) bootstrap.sh bootstrap-reader.sh language $(wildcard examples/*.w) $(wildcard examples/*.scm) $(wildcard examples/*.csv) examples/files/test tests wisp-repl-guile.sh testrunner.w wisp.py wisp.scm wisp.in m4 ob-wisp.el wisp-mode.el AUTHORS.in
+CLEANFILES = 1 2 $(GOBJECTS) $(wildcard *~)
 DISTCLEANFILES = $(bin_SCRIPTS) $(nobase_site_DATA) .wisp-repl
 # don't spout out lots of stuff at each distcheck. Disable for debugging.
 AM_DISTCHECK_CONFIGURE_FLAGS="--quiet"
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+wisp 1.0.12 (2024-03-20):
+- do not include doctest output in examples (this broke install on Apple systems, because ._-files are interpreted as mac metadata)
+- better error reporting: Note in "chunk not at zero indentation" that a new chunk starts after two blank lines.
+- allow setting guile with GUILE= in tests/runtests-scheme-reader.sh (so you can run tests with a custom build of Guile)
+- do not test partial indent in tests/receive.w (that is a tolerated error, but not guaranteed)
+- examples/evaluate-r7rs-benchmark.w: sort the slowdown, too
+
 wisp 1.0.11 (2023-03-20):
 - increase resilience of make check for multi-job make in Guix
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [1.0.11],
+AC_INIT([wisp], [1.0.12],
         [arne_bab@web.de])
 # Add macros in m4/ to ensure that wisp builds without having Guile in the aclocal path
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/examples/evaluate-r7rs-benchmark.w b/examples/evaluate-r7rs-benchmark.w
--- a/examples/evaluate-r7rs-benchmark.w
+++ b/examples/evaluate-r7rs-benchmark.w
@@ -144,7 +144,9 @@
       pretty-print : sort guile-data (λ (x y) (string<? (car x) (car y)))
       newline
       format #t "=== ~a slowdown ===\n\n" : string-locale-titlecase project-prefix
-      pretty-print : get-multiples-alist guile-data data-min-by-test
+      pretty-print
+        sort : get-multiples-alist guile-data data-min-by-test
+             λ (x y) (string<? (car x) (car y))
       newline
       format #t "=== ~a Geometric Mean slowdown (successful tests / total tests) ===\n\n" : string-locale-titlecase project-prefix
       format #t "~a (~a / ~a)"
diff --git a/tests/receive.w b/tests/receive.w
--- a/tests/receive.w
+++ b/tests/receive.w
@@ -2,4 +2,4 @@
 write 
     receive : car cdr
               car+cdr '(car . cdr)
-      . car
+              . car
diff --git a/tests/runtests-scheme-reader.sh b/tests/runtests-scheme-reader.sh
--- a/tests/runtests-scheme-reader.sh
+++ b/tests/runtests-scheme-reader.sh
@@ -6,6 +6,12 @@
 # command. AC_CONFIG_LINKS in autoconf.ac ensures that this exists in
 # the build dir. Still this could be nicer.
 
+# set Guile if unset
+if [ -z ${GUILE+x} ]; then
+        GUILE=guile
+fi
+
+
 if [[ x"$1" == x"" || x"$1" == x"." ]]; then
     srcdir="$(./tests/realpath.sh "$(pwd)")"
 else
@@ -21,10 +27,10 @@
 failed=0
 cd ${builddir}
 for i in ${srcdir}/tests/*.w; do
-    if guile -L ${builddir} --language=wisp ${srcdir}/testrunner.w "${i}" "${srcdir}/tests/$(basename "${i}" .w).scm" | grep -q "have equivalent content"; then
+    if $GUILE -L ${builddir} --language=wisp ${srcdir}/testrunner.w "${i}" "${srcdir}/tests/$(basename "${i}" .w).scm" | grep -q "have equivalent content"; then
         continue
     fi
-    echo test "$i" failed. Diff: $(guile -L ${builddir} --language=wisp ${srcdir}/testrunner.w "${i}" "${srcdir}/tests/$(basename "${i}" .w).scm")
+    echo test "$i" failed. Diff: $($GUILE -L ${builddir} --language=wisp ${srcdir}/testrunner.w "${i}" "${srcdir}/tests/$(basename "${i}" .w).scm")
     failed=$((failed + 1))
 done
 cd - >/dev/null # undo dir change
diff --git a/wisp-scheme.w b/wisp-scheme.w
--- a/wisp-scheme.w
+++ b/wisp-scheme.w
@@ -472,7 +472,7 @@
                       cons 0 : cdr : car lines
                       cdr lines
              throw 'wisp-syntax-error
-               format #f "The first symbol in a chunk must start at zero indentation. Indentation and line: ~A"
+               format #f "The first symbol in a chunk must start at zero indentation. Two blank lines start a new chunk. Indentation and line: ~A"
                  car lines
          let loop
            : processed '()