From: Keith Packard <keithp@keithp.com>
Date: Tue, 19 Dec 2017 19:37:33 +0000 (-0800)
Subject: altos/scheme: (define (foo . bar)) has a pair, not list as card
X-Git-Tag: 1.8.4~1^2~13
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=53b99e0419cb44c7983e41026bf0430deae58940

altos/scheme: (define (foo . bar)) has a pair, not list as card

When defining a lambda with varargs, the args are not a list as the
final element is not a pair or nil. Use pair? instead of list? to
detect this form correctly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/scheme/ao_scheme_const.scheme b/src/scheme/ao_scheme_const.scheme
index 060fd955..4616477f 100644
--- a/src/scheme/ao_scheme_const.scheme
+++ b/src/scheme/ao_scheme_const.scheme
@@ -248,7 +248,7 @@
    (macro (first . rest)
 					; check for alternate lambda definition form
 
-	  (cond ((list? first)
+	  (cond ((pair? first)
 		 (set! rest
 		       (append
 			(list
@@ -640,7 +640,7 @@
 (char-whitespace? #\0)
 (char-whitespace? #\space)
 
-(define (char->integer c) c)
+(define char->integer (macro (v) v))
 (define integer->char char->integer)
 
 (define (char-upcase c) (if (char-lower-case? c) (+ c (- #\A #\a)) c))