From d9f9ae14ba19c519b08ac41467d9c8ab94b2280f Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 22 Apr 2016 06:06:53 -0700 Subject: Don't quote path in load and @(load) diagnostics. * eval.c (sys_load): Use ~a format specifier rather than ~s for the load path (if already known to be a string). * match.c (v_load): Likewise. --- eval.c | 2 +- match.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eval.c b/eval.c index d9aca0df..73eaf95b 100644 --- a/eval.c +++ b/eval.c @@ -3269,7 +3269,7 @@ static val sys_load(val target, val sloc) if (!read_eval_stream(stream, std_error, nil)) { rlset(sloc, sloc); close_stream(stream, nil); - eval_error(sloc, lit("load: ~s contains errors"), path, nao); + eval_error(sloc, lit("load: ~a contains errors"), path, nao); } close_stream(stream, nil); diff --git a/match.c b/match.c index 8f0bf6bc..e941c543 100644 --- a/match.c +++ b/match.c @@ -3747,7 +3747,7 @@ static val v_load(match_files_ctx *c) close_stream(stream, nil); if (parser.errors) - sem_error(specline, lit("~s: errors encountered in ~s"), sym, path, nao); + sem_error(specline, lit("~s: errors encountered in ~a"), sym, path, nao); if (sym == include_s) { return parser.syntax_tree; @@ -3756,7 +3756,7 @@ static val v_load(match_files_ctx *c) val result = match_files(mf_spec(*c, spec)); if (!result) { - debuglf(specline, lit("load: ~s failed"), path, nao); + debuglf(specline, lit("load: ~a failed"), path, nao); return nil; } else { cons_bind (new_bindings, success, result); @@ -3765,13 +3765,13 @@ static val v_load(match_files_ctx *c) if (consp(success)) { debuglf(specline, - lit("load: ~s matched; " + lit("load: ~a matched; " "advancing from line ~d to ~d"), path, c->data_lineno, cdr(success), nao); c->data = car(success); c->data_lineno = cdr(success); } else { - debuglf(specline, lit("load: ~s consumed entire file"), path, + debuglf(specline, lit("load: ~a consumed entire file"), path, nao); c->data = nil; } @@ -3782,7 +3782,7 @@ static val v_load(match_files_ctx *c) } else { if (!read_eval_stream(stream, std_error, nil)){ close_stream(stream, nil); - sem_error(specline, lit("load: ~s contains errors"), path, nao); + sem_error(specline, lit("load: ~a contains errors"), path, nao); } close_stream(stream, nil); return (sym == include_s) ? nil : next_spec_k; -- cgit v1.2.3