diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2016-04-22 06:06:53 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2016-04-22 06:06:53 -0700 |
commit | d9f9ae14ba19c519b08ac41467d9c8ab94b2280f (patch) | |
tree | fb7faa34eec8109deb61a8c94686c6b48308ac4c /match.c | |
parent | 368a4d05039d41eb31120f8624b9cf7037035d2e (diff) | |
download | txr-d9f9ae14ba19c519b08ac41467d9c8ab94b2280f.tar.gz txr-d9f9ae14ba19c519b08ac41467d9c8ab94b2280f.tar.bz2 txr-d9f9ae14ba19c519b08ac41467d9c8ab94b2280f.zip |
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.
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; |