summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-09-22 06:45:36 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-09-22 06:45:36 -0700
commit492cfcf350bb4aa787482ce919b7aed2c2c8c66a (patch)
treed5e5cdc9398762a6c62cb08b2e09f4f967eb3780 /lib.c
parente3d17617a33941fea6c2f365151e93201aaf152d (diff)
downloadtxr-492cfcf350bb4aa787482ce919b7aed2c2c8c66a.tar.gz
txr-492cfcf350bb4aa787482ce919b7aed2c2c8c66a.tar.bz2
txr-492cfcf350bb4aa787482ce919b7aed2c2c8c66a.zip
Regexes now callable as functions.
* lib.c (generic_funcall): Add case for regexes. Handle arguments in such a way that the string is always rightmost, with a view to convenient partial application. * txr.1: Documented in multiple places.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/lib.c b/lib.c
index 20ffd069..245f49c5 100644
--- a/lib.c
+++ b/lib.c
@@ -5357,6 +5357,22 @@ val generic_funcall(val fun, struct args *args_in)
default:
callerror(fun, lit("too many arguments"));
}
+ } else if (fun->co.cls == regex_s) {
+ bug_unless (args->argc >= ARGS_MIN);
+ args_normalize(args, 3);
+
+ switch (args->fill) {
+ case 0:
+ callerror(fun, lit("missing required arguments"));
+ case 1:
+ return search_regst(z(args->arg[0]), fun, nil, nil);
+ case 2:
+ return search_regst(z(args->arg[1]), fun, z(args->arg[0]), nil);
+ case 3:
+ return search_regst(z(args->arg[2]), fun, z(args->arg[0]), z(args->arg[1]));
+ default:
+ callerror(fun, lit("too many arguments"));
+ }
} else if (structp(fun)) {
fun = method(fun, lambda_s);
break;