Merge pull request #244 from picrin-scheme/better-error-message

better error messages against invalid use of auxiliary syntax
picrin-scheme · Jan 19, 2015 · 9d2ed44 · 9d2ed44
2 parents 5e3bd1e + 6dbf528
commit 9d2ed44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/extlib/benz/boot.c b/extlib/benz/boot.c
@@ -52,7 +52,7 @@ my $src = <<'EOL';
        (list (r 'define-syntax) (cadr expr)
              (list (r 'lambda) '_
                    (list (r 'lambda) '_
-                         (list (r 'error) "invalid use of auxiliary syntax")))))))
+                         (list (r 'error) (list (r 'string-append) "invalid use of auxiliary syntax: '" (symbol->string (cadr expr)) "'"))))))))
 
   (define-auxiliary-syntax else)
   (define-auxiliary-syntax =>)
@@ -452,7 +452,7 @@ const char pic_boot[] =
 "       (list (r 'define-syntax) (cadr expr)\n"
 "             (list (r 'lambda) '_\n"
 "                   (list (r 'lambda) '_\n"
-"                         (list (r 'error) \"invalid use of auxiliary syntax\")))))))\n"
+"                         (list (r 'error) (list (r 'string-append) \"invalid use of auxiliary syntax: '\" (symbol->string (cadr expr)) \"'\"))))))))\n"
 "\n"
 "  (define-auxiliary-syntax else)\n"
 "  (define-auxiliary-syntax =>)\n"

diff --git a/piclib/picrin/syntax-rules.scm b/piclib/picrin/syntax-rules.scm
@@ -8,7 +8,7 @@
        (list (r 'define-syntax) (cadr expr)
              (list (r 'lambda) '_
                    (list (r 'lambda) '_
-                         (list (r 'error) "invalid use of auxiliary syntax")))))))
+                         (list (r 'error) (list (r 'string-append) "invalid use of auxiliary syntax: '" (symbol->string (cadr expr)) "'"))))))))
 
   (define-auxiliary-syntax _)
   (define-auxiliary-syntax ...)