summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-02-26 00:44:43 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-02-26 02:04:32 -0800
commit255accfa7d1a0c401f267cd0381b151985fedaba (patch)
treec4fc177fb107e03adda9c6ce826f7d0ca2ff4d75
parent1eeb633406c7a5d032f7a15b39d0b98f8ddfbf67 (diff)
downloadtxr-255accfa7d1a0c401f267cd0381b151985fedaba.tar.gz
txr-255accfa7d1a0c401f267cd0381b151985fedaba.tar.bz2
txr-255accfa7d1a0c401f267cd0381b151985fedaba.zip
* parser.l (regex_parse, lisp_parse): Better formatting
for the context string that serves in place of a filename.
-rw-r--r--ChangeLog5
-rw-r--r--parser.l4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87521bd7..68cf168e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-02-26 Kaz Kylheku <kaz@kylheku.com>
+ * parser.l (regex_parse, lisp_parse): Better formatting
+ for the context string that serves in place of a filename.
+
+2014-02-26 Kaz Kylheku <kaz@kylheku.com>
+
* eval.c (expand_place): Unnecessary, buggy function removed.
It was handling silly special cases with the net effect of being
nearly equivalent to just expand, while failing to expand places
diff --git a/parser.l b/parser.l
index 0f30365a..ddc2b5d4 100644
--- a/parser.l
+++ b/parser.l
@@ -895,7 +895,7 @@ val regex_parse(val string, val error_stream)
{
int gc = gc_state(0);
spec_file_str = if3(std_error != std_null,
- format(nil, lit("regex: ~s"), string, nao),
+ format(nil, lit("regex --> ~a"), string, nao),
lit(""));
yyparse();
yylex_destroy();
@@ -913,7 +913,7 @@ val lisp_parse(val source, val error_stream)
or2(source, std_input));
val secret_token_stream = make_string_byte_input_stream(lit("@\x01" "E"));
val name = if3(stringp(source),
- format(nil, lit("expr: ~s"), source, nao),
+ format(nil, lit("expr --> ~a"), source, nao),
stream_get_prop(input_stream, name_k));
val save_stream = std_error;
yyin_stream = make_catenated_stream(list(secret_token_stream, input_stream, nao));