summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--match.c2
-rw-r--r--tests/001/query-3.txr2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index accf2a84..36f9205d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-10-26 Kaz Kylheku <kaz@kylheku.com>
+ * match.c (v_cat): Bugfix: unterminated variable argument list.
+
+ * tests/001/query-3.txr: Updated to new cat syntax.
+
+2011-10-26 Kaz Kylheku <kaz@kylheku.com>
+
Fixed lame @(cat) directive, without obsolescence phase.
* match.c (v_cat): Rewritten.
diff --git a/match.c b/match.c
index 4b163af8..92baac50 100644
--- a/match.c
+++ b/match.c
@@ -2246,7 +2246,7 @@ static val v_cat(match_files_ctx c, match_files_ctx *cout)
val sep_form = third(first_spec);
if (rest(specline))
- sem_error(spec_linenum, lit("cat: obsolete syntax"));
+ sem_error(spec_linenum, lit("obsolete cat syntax: trailing material"), nao);
if (!bindable(sym)) {
sem_error(spec_linenum,
diff --git a/tests/001/query-3.txr b/tests/001/query-3.txr
index ec12c9f2..f66aa3c3 100644
--- a/tests/001/query-3.txr
+++ b/tests/001/query-3.txr
@@ -6,7 +6,7 @@
@(collect)
@ (coll)@{TOKEN /[^ ]+/}@(end)
@ (bind (UID PID PPID C STIME TTY TIME . CMD) TOKEN)
-@ (cat CMD) @#
+@ (cat CMD)
@ (forget TOKEN)
@(end)
@(output)