From aeb981111113f3374fabc1df2fd063ca1cc0e38b Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.r@gmail.com>
Date: Wed, 28 Sep 2016 18:13:36 -0400
Subject: [PATCH] expanded-filter UT

---
 c/reg_test/expected/out | 18 ++++++++++++++++++
 c/reg_test/run          |  8 ++++++++
 c/todo.txt              |  4 ----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/c/reg_test/expected/out b/c/reg_test/expected/out
index 644bbe8dc..b09f303e6 100644
--- a/c/reg_test/expected/out
+++ b/c/reg_test/expected/out
@@ -12488,6 +12488,24 @@ mlr --from ./reg_test/input/abixy filter
 
 a=zee,b=pan,i=6,x=0.5271261600918548,y=0.49322128674835697
 
+mlr --from ./reg_test/input/abixy filter 
+  subr s(n) {
+    print "NR is ".n
+  }
+  call s(NR);
+  false
+
+NR is 1
+NR is 2
+NR is 3
+NR is 4
+NR is 5
+NR is 6
+NR is 7
+NR is 8
+NR is 9
+NR is 10
+
 mlr --from ./reg_test/input/abixy filter 
   local a = 5;
   local b = 7;
diff --git a/c/reg_test/run b/c/reg_test/run
index fbaafd62f..b66d2ce43 100755
--- a/c/reg_test/run
+++ b/c/reg_test/run
@@ -999,6 +999,14 @@ run_mlr --from $indir/abixy filter '
   f(NR) == 5
 '
 
+run_mlr --from $indir/abixy filter '
+  subr s(n) {
+    print "NR is ".n
+  }
+  call s(NR);
+  false
+'
+
 run_mlr --from $indir/abixy filter '
   local a = 5;
   local b = 7;
diff --git a/c/todo.txt b/c/todo.txt
index bbc3820a6..7953f076d 100644
--- a/c/todo.txt
+++ b/c/todo.txt
@@ -21,14 +21,10 @@ PRE-RELEASE 4.6.0:
 ----------------------------------------------------------------
 UT FOR 4.6.0:
 
-* UT/mlh/mld func @ filter
-* disallow filter() inside filter
-* insist on final bare boolean; allow others before that (incl. begin/end) (many tests)
 * UT/mlh/mld -e, and mixed -f and -e, for filter/put
 * no begin/end/func/subr within subr
 * print/printn zary
 * no begin/end/func/subr within func
-* func no subr call
 * func no srec assignment x 3, no oosvar assignment x 2, no filter, no unset
 * func no tee, emitfx3; but allow print, dump.
 * disallow func/subr redefines