From ea7e47310617551ada9e165918351805c8cfe6f9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 1 Dec 2011 15:36:18 -0800 Subject: * match.c (v_skip): Bugfix: Nov 12 commit caused regression: skip min/max arguments not working! * RELNOTES: Updated. --- ChangeLog | 7 +++++++ RELNOTES | 3 +++ match.c | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84b220cf..9a26ae90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-12-01 Kaz Kylheku + + * match.c (v_skip): Bugfix: Nov 12 commit caused regression: + skip min/max arguments not working! + + * RELNOTES: Updated. + 2011-12-01 Kaz Kylheku Dropping the silly cons return value from txeval. diff --git a/RELNOTES b/RELNOTES index 16ddc511..31e1dfd1 100644 --- a/RELNOTES +++ b/RELNOTES @@ -14,6 +14,9 @@ - Regression in source location tracking (line numbers shown in debugger and trace output). + - Regression in vertical skip directive caused it to ignore + its arguments. + - Fixed :vars () in collect/coll not working as intended. This should prevent any bindings from being collected, and allows iteration with collect without accumulating memory. diff --git a/match.c b/match.c index e942faf2..ebd382a8 100644 --- a/match.c +++ b/match.c @@ -1699,7 +1699,7 @@ typedef val (*v_match_func)(match_files_ctx *cout); static val v_skip(match_files_ctx *c) { - val specline = rest(first(c->spec)); + spec_bind (specline, first_spec, c->spec); if (rest(specline)) return decline_k; @@ -1711,7 +1711,6 @@ static val v_skip(match_files_ctx *c) { val skipspec = first(first(c->spec)); - val first_spec = first(specline); val args = rest(first_spec); val max = first(args); val min = second(args); -- cgit v1.2.3