summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-12-23 20:09:04 -0800
committerKaz Kylheku <kaz@kylheku.com>2016-12-23 20:09:04 -0800
commitd45338dd1be5dae9e0c3d979d846398677ee5699 (patch)
tree97a169b23cc977617ced8d3392c6ce5ccfe93de7
parentc968457672379368478a3aa064e1d7f2d00280a7 (diff)
downloadtxr-d45338dd1be5dae9e0c3d979d846398677ee5699.tar.gz
txr-d45338dd1be5dae9e0c3d979d846398677ee5699.tar.bz2
txr-d45338dd1be5dae9e0c3d979d846398677ee5699.zip
Tweak terminology in some parser error messages.
Eliminate references to a "list expression". This term specifically denotes (list ...) and not any compound expression. * parser.y (define_clause): Change "unterminated list expression" to "unterminated define directive". (output_clause): Change "unterminated list expression" to "unterminated output directive". (list): Change "list expression" to "expression".
-rw-r--r--parser.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/parser.y b/parser.y
index 5703bef0..3391c5f3 100644
--- a/parser.y
+++ b/parser.y
@@ -557,7 +557,7 @@ define_clause : DEFINE exprs ')' newl
END newl { $$ = list(define_s, nil, $4, nao);
rl($$, num($1)); }
| DEFINE error { $$ = nil;
- yybadtok(yychar, lit("list expression")); }
+ yybadtok(yychar, lit("define directive")); }
| DEFINE exprs ')' newl
error { $$ = nil; yybadtok(yychar, lit("define")); }
| DEFINE ')' newl
@@ -628,7 +628,7 @@ output_clause : OUTPUT ')' o_elems '\n'
yyerr("invalid combination of old and "
"new syntax in output directive"); }
| OUTPUT error { $$ = nil;
- yybadtok(yychar, lit("list expression")); }
+ yybadtok(yychar, lit("output directive")); }
| OUTPUT ')' o_elems '\n'
error { $$ = nil;
yybadtok(yychar, lit("output clause")); }
@@ -868,7 +868,7 @@ list : '(' n_exprs ')' { $$ = rl($2, num($1)); }
$$ = rl(cons(var_s, cons($2, nil)),
num($1)); }
| '(' error { $$ = nil;
- yybadtok(yychar, lit("list expression")); }
+ yybadtok(yychar, lit("expression")); }
| '[' error { $$ = nil;
yybadtok(yychar, lit("DWIM expression")); }
| '@' error { $$ = nil;