Renaming some functions for consistency.

* combi.c (perm_list, perm_str, rperm_list, reperm_gen_fun,
rperm_vec, comb_vec, rcomb_list, rcomb_vec, rcomb_str):
Follow rename of list_vector to list_vec.

* eval.c (vector_list_s): Global variable renamed to
vec_list_s.
(expand_qquote): Follow vector_list_s to vec_list_s.
(eval_init): Follow renames of all identifiers. Functions
num-chr, chr-num, vector-list and list-vector are
registered under new names, while remaining registered
under old names.

* eval.h (vector_list_s): Declaration renamed.

* filter.c (url_encode): Follow chr_num to chr_int rename.

* lib.c (make_like, interpose, shuffle): Follow vector_list to vec_list rename.
(tolist, replace, replace_list): Follow list_vector to list_vec rename.
(num_chr): Renamed to int_chr.
(chr_num): Renamed to chr_int.
(vector_list): Renamed to vec_list.
(list_vector): Renamed to list_vec.

* lib.h (num_chr, chr_num, list_vector, vector_list):
* Declarations renamed.

* parser.y (vector): Follow vector_list to vec_list rename.

* txr.1: Updated documentation for num-chr, chr-num,
list-vector and vector-list with new names, and notes
about the old names being supported, but obsolescent.

1 files changed, 8 insertions, 8 deletions

diff --git a/combi.c b/combi.c
index afb42792..8a7697a5 100644
--- a/combi.c
+++ b/combi.c
@@ -164,7 +164,7 @@ static val perm_list(val p, val k)
   if (k == zero || (!k && !p)) {
     return cons(nil, nil);
   } else {
-    val state = perm_init_common(vector_list(p), k);
+    val state = perm_init_common(vec_list(p), k);
     if (!state)
       return nil;
     return generate(func_f0(state, perm_while_fun),
@@ -193,7 +193,7 @@ static val perm_str(val p, val k)
   if (k == zero) {
     return cons(string(L""), nil);
   } else {
-    val state = perm_init_common(vector_list(list_str(p)), k);
+    val state = perm_init_common(vec_list(list_str(p)), k);
     if (!state)
       return nil;
     return generate(func_f0(state, perm_while_fun),
@@ -268,12 +268,12 @@ static val rperm_list(val list, val k)
 static val rperm_vec_gen_fun(val env)
 {
   val list = rperm_gen_fun(env);
-  return vector_list(list);
+  return vec_list(list);
 }
 
 static val rperm_vec(val ve, val k)
 {
-  val list = list_vector(ve);
+  val list = list_vec(ve);
   val vec = vector(k, list);
   val env = cons(list, vec);
   return generate(func_f0(env, rperm_while_fun),
@@ -400,7 +400,7 @@ static val comb_vec_gen_fun(val state)
 
 static val comb_vec(val vec, val k)
 {
-  val state = nreverse(k_conses(list_vector(vec), k));
+  val state = nreverse(k_conses(list_vec(vec), k));
   return generate(func_f0(state, comb_while_fun),
                   func_f0(state, comb_vec_gen_fun));
 }
@@ -537,7 +537,7 @@ static val rcomb_list_gen_fun(val state)
 
 static val rcomb_list(val list, val k)
 {
-  val state = nreverse(list_vector(vector(k, list)));
+  val state = nreverse(list_vec(vector(k, list)));
   return generate(func_f0(state, rcomb_while_fun),
                   func_f0(state, rcomb_list_gen_fun));
 }
@@ -557,7 +557,7 @@ static val rcomb_vec_gen_fun(val state)
 
 static val rcomb_vec(val vec, val k)
 {
-  val state = nreverse(list_vector(vector(k, list_vector(vec))));
+  val state = nreverse(list_vec(vector(k, list_vec(vec))));
   return generate(func_f0(state, rcomb_while_fun),
                   func_f0(state, rcomb_vec_gen_fun));
 }
@@ -579,7 +579,7 @@ static val rcomb_str_gen_fun(val state)
 
 static val rcomb_str(val str, val k)
 {
-  val state = nreverse(list_vector(vector(k, list_str(str))));
+  val state = nreverse(list_vec(vector(k, list_str(str))));
   return generate(func_f0(state, rcomb_while_fun),
                   func_f0(state, rcomb_str_gen_fun));
 }