From 9f039218345989a770322611704c3d7ff9a76a12 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 21 Sep 2016 21:05:43 -0700 Subject: Move regex intrinsic registrations to regex.c. * eval.c (eval_init): Remove all regex-related function registrations from here. * regex.c (regex_init): Move regex-related function registrations here. --- eval.c | 14 -------------- regex.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eval.c b/eval.c index 66b33aa1..c7578c01 100644 --- a/eval.c +++ b/eval.c @@ -5123,20 +5123,6 @@ void eval_init(void) reg_fun(intern(lit("mask"), user_package), func_n0v(maskv)); reg_fun(intern(lit("width"), user_package), func_n1(width)); - reg_fun(intern(lit("regex-compile"), user_package), func_n2o(regex_compile, 1)); - reg_fun(intern(lit("regexp"), user_package), func_n1(regexp)); - reg_fun(intern(lit("search-regex"), user_package), func_n4o(search_regex, 2)); - reg_fun(intern(lit("range-regex"), user_package), func_n4o(range_regex, 2)); - reg_fun(intern(lit("search-regst"), user_package), func_n4o(search_regst, 2)); - reg_fun(intern(lit("match-regex"), user_package), func_n3o(match_regex, 2)); - reg_fun(intern(lit("match-regst"), user_package), func_n3o(match_regst, 2)); - reg_fun(intern(lit("match-regex-right"), user_package), - func_n3o(match_regex_right, 2)); - reg_fun(intern(lit("match-regst-right"), user_package), - func_n3o(match_regst_right, 2)); - reg_fun(intern(lit("regsub"), user_package), func_n3(regsub)); - reg_fun(intern(lit("regex-parse"), user_package), func_n2o(regex_parse, 1)); - reg_fun(intern(lit("sort-group"), user_package), func_n3o(sort_group, 1)); reg_fun(intern(lit("unique"), user_package), func_n2ov(unique, 1)); reg_fun(intern(lit("uniq"), user_package), func_n1(uniq)); diff --git a/regex.c b/regex.c index 18f1d074..2930e2e9 100644 --- a/regex.c +++ b/regex.c @@ -2720,6 +2720,20 @@ void regex_init(void) cdigit_k = intern(lit("cdigit"), keyword_package); cword_char_k = intern(lit("cword-char"), keyword_package); + reg_fun(intern(lit("regex-compile"), user_package), func_n2o(regex_compile, 1)); + reg_fun(intern(lit("regexp"), user_package), func_n1(regexp)); + reg_fun(intern(lit("search-regex"), user_package), func_n4o(search_regex, 2)); + reg_fun(intern(lit("range-regex"), user_package), func_n4o(range_regex, 2)); + reg_fun(intern(lit("search-regst"), user_package), func_n4o(search_regst, 2)); + reg_fun(intern(lit("match-regex"), user_package), func_n3o(match_regex, 2)); + reg_fun(intern(lit("match-regst"), user_package), func_n3o(match_regst, 2)); + reg_fun(intern(lit("match-regex-right"), user_package), + func_n3o(match_regex_right, 2)); + reg_fun(intern(lit("match-regst-right"), user_package), + func_n3o(match_regst_right, 2)); + reg_fun(intern(lit("regsub"), user_package), func_n3(regsub)); + reg_fun(intern(lit("regex-parse"), user_package), func_n2o(regex_parse, 1)); + reg_fun(intern(lit("reg-expand-nongreedy"), system_package), func_n1(reg_expand_nongreedy)); reg_fun(intern(lit("reg-optimize"), system_package), func_n1(reg_optimize)); -- cgit v1.2.3