From 670cd824884bd31a775eb02286600eb71dc53fde Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Mon, 10 Dec 2018 23:58:33 +0800 Subject: [PATCH 1/3] ignore generated file with derived char-sets --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e65defaf..71aaa9bf 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ tmp js/chibi.* +build-lib/chibi/char-set/derived.scm From c912f1e24fa9fb601d846283c4a9a19294c5814a Mon Sep 17 00:00:00 2001 From: Edwin Watkeys Date: Tue, 11 Dec 2018 12:21:07 +0100 Subject: [PATCH 2/3] fix order of arguments to parse-fold --- lib/chibi/parse/parse.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chibi/parse/parse.scm b/lib/chibi/parse/parse.scm index 25bdaa35..d2fc3091 100644 --- a/lib/chibi/parse/parse.scm +++ b/lib/chibi/parse/parse.scm @@ -307,7 +307,7 @@ (define (parse->list f source . o) (let ((index (if (pair? o) (car o) 0))) - (reverse (parse-fold cons '() f source index)))) + (reverse (parse-fold f cons '() source index)))) ;;> As \scheme{parse->list} but requires the entire source be parsed ;;> with no left over characters, signalling an error otherwise. From 6c9e5d3c5421bce3b308a8b039d0f946ec899363 Mon Sep 17 00:00:00 2001 From: Edwin Watkeys Date: Tue, 11 Dec 2018 14:08:45 +0100 Subject: [PATCH 3/3] fix invocation of main --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 9c72a1c9..6c31c3e3 100644 --- a/main.c +++ b/main.c @@ -614,7 +614,7 @@ sexp run_main (int argc, char **argv) { sym = sexp_intern(ctx, main_symbol, -1); tmp = sexp_env_ref(ctx, env, sym, SEXP_FALSE); if (sexp_procedurep(tmp)) { - args = sexp_list1(ctx, sexp_cdr(args)); + args = sexp_list1(ctx, args); check_exception(ctx, sexp_apply(ctx, tmp, args)); } else { fprintf(stderr, "couldn't find main binding: %s in %s\n", main_symbol, main_module ? main_module : argv[i]);