summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parser.y4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 054b978c..c2522163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-10-02 Kaz Kylheku <kaz@kylheku.com>
+ * parser.y (rep_elem): Bugfix: forgotten o_elems_transform on
+ syntax tree of o_elems constituent, leading to problems with
+ consecutive variables in a @(rep).
+
+2011-10-02 Kaz Kylheku <kaz@kylheku.com>
+
* match.c (match_line): Handle trailer_s directive.
(match_files): Remove check against trailer_s not having trailing
material. If it doesn't, it's a vertical directive processed here,
diff --git a/parser.y b/parser.y
index 27a7d44e..d767be50 100644
--- a/parser.y
+++ b/parser.y
@@ -420,7 +420,9 @@ o_elem : TEXT { $$ = string_own($1); }
;
rep_elem : REP o_elems
- rep_parts_opt END { $$ = repeat_rep_helper(rep_s, $2, $3); }
+ rep_parts_opt END { $$ = repeat_rep_helper(rep_s,
+ o_elems_transform($2),
+ $3); }
| REP error { $$ = nil;
yybadtoken(yychar, lit("rep clause")); }
;