From 9f29aebaeb12938f9db0932f991cb2f5b08634a4 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 16 Jul 2009 17:43:49 +0000 Subject: [PATCH] * read.scm (parse-error): Don't print single entry args as a list. (-reader-process-expanded-1): Convert symbol to string for string-append. --- ChangeLog | 4 ++++ read.scm | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43b08a6..227ec98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-07-16 Doug Evans + * read.scm (parse-error): Don't print single entry args as a list. + (-reader-process-expanded-1): Convert symbol to string for + string-append. + * insn.scm (multi-insn-instantiate!): Tweak logging message. 2009-07-15 Doug Evans diff --git a/read.scm b/read.scm index 6fa456a..e3c6422 100644 --- a/read.scm +++ b/read.scm @@ -286,9 +286,15 @@ ) ; Signal a parse error while reading a .cpu file. +; FIXME: Add expr arg and change args to optional help text. (define (parse-error errtxt message . args) - (reader-error (string-append errtxt ": " message ":") args "") + (cond ((null? args) + (reader-error (string-append errtxt ": " message ":") "" "")) + ((= (length args) 1) + (reader-error (string-append errtxt ": " message ":") (car args) "")) + (else + (reader-error (string-append errtxt ": " message ":") args ""))) ) ; Process a macro-expanded entry. @@ -304,7 +310,7 @@ ; Variable number of trailing arguments. (if (< (length (cdr entry)) (car num-args)) (reader-error (string-append "Incorrect number of arguments to " - (car entry) + (symbol->string (car entry)) ", expecting at least " (number->string (car num-args))) entry @@ -313,7 +319,7 @@ ; Fixed number of arguments. (if (!= (length (cdr entry)) (car num-args)) (reader-error (string-append "Incorrect number of arguments to " - (car entry) + (symbol->string (car entry)) ", expecting " (number->string (car num-args))) entry -- 2.43.5