summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-12-01 15:36:18 -0800
committerKaz Kylheku <kaz@kylheku.com>2011-12-01 15:36:18 -0800
commitea7e47310617551ada9e165918351805c8cfe6f9 (patch)
tree3450b94a6b1539dc8d66b7c2b4e58e07411ef488
parent2496d222fb0a451372989e846a1db0ec4e6e6fa6 (diff)
downloadtxr-ea7e47310617551ada9e165918351805c8cfe6f9.tar.gz
txr-ea7e47310617551ada9e165918351805c8cfe6f9.tar.bz2
txr-ea7e47310617551ada9e165918351805c8cfe6f9.zip
* match.c (v_skip): Bugfix: Nov 12 commit caused regression:
skip min/max arguments not working! * RELNOTES: Updated.
-rw-r--r--ChangeLog7
-rw-r--r--RELNOTES3
-rw-r--r--match.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84b220cf..9a26ae90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-12-01 Kaz Kylheku <kaz@kylheku.com>
+ * match.c (v_skip): Bugfix: Nov 12 commit caused regression:
+ skip min/max arguments not working!
+
+ * RELNOTES: Updated.
+
+2011-12-01 Kaz Kylheku <kaz@kylheku.com>
+
Dropping the silly cons return value from txeval.
Two interfaces are provided to the function. One throws
on unbound variable, the other which evaluates them to the
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);