From 79f55cbf6c6e7412473e119a02aa637e985721f5 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 10 Jun 2014 07:29:56 -0700 Subject: * eval.c (eval_init): Change registration of string_cmp to cmp_str. Add registrations for str_eq, str_lt, str_gt, str_le, and str_lt. * lib.c (string_cmp): Name changes to cmp_str, and the function fixed so that it actually works. The name change doesn't affect anyone because the function was too broken to use due to the incorrect type dispatch. (string_lt): Name changes to str_lt. (str_eq, str_gt, str_le, str_ge): New functions. * lib.h (string_cmp, string_lt): Declarations renamed. (str_eq, str_gt, str_le, str_ge): New declarations. * txr.1: Document string-cmp to cmp-str rename, that string-lt is deprecated, and the new str<, str>, str>=, str<= and str= functions. --- eval.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 068e1a9e..bbae73a6 100644 --- a/eval.c +++ b/eval.c @@ -3446,8 +3446,13 @@ void eval_init(void) reg_fun(intern(lit("tok-str"), user_package), func_n3o(tok_str, 1)); reg_fun(intern(lit("list-str"), user_package), func_n1(list_str)); reg_fun(intern(lit("trim-str"), user_package), func_n1(trim_str)); - reg_fun(intern(lit("string-cmp"), user_package), func_n2(string_cmp)); - reg_fun(intern(lit("string-lt"), user_package), func_n2(string_lt)); + reg_fun(intern(lit("cmp-str"), user_package), func_n2(cmp_str)); + reg_fun(intern(lit("string-lt"), user_package), func_n2(str_lt)); + reg_fun(intern(lit("str="), user_package), func_n2(str_eq)); + reg_fun(intern(lit("str<"), user_package), func_n2(str_lt)); + reg_fun(intern(lit("str>"), user_package), func_n2(str_gt)); + reg_fun(intern(lit("str<="), user_package), func_n2(str_le)); + reg_fun(intern(lit("str>="), user_package), func_n2(str_ge)); reg_fun(intern(lit("int-str"), user_package), func_n2o(int_str, 1)); reg_fun(intern(lit("flo-str"), user_package), func_n1(flo_str)); reg_fun(intern(lit("num-str"), user_package), func_n1(num_str)); -- cgit v1.2.3