rename li_table->ar_table (and related names).

* internal.h: rename the following names:
  * li_table -> ar_table. "li" means linear (from linear search),
    but we use the word "array" (from data layout).
  * RHASH_ARRAY -> RHASH_AR_TABLE. AR_TABLE is more clear.
  * rb_hash_array_* -> rb_hash_ar_table_*.
  * RHASH_TABLE_P() -> RHASH_ST_TABLE_P(). more clear.
  * RHASH_CLEAR() -> RHASH_ST_CLEAR().

* hash.c: rename "linear_" prefix functions to "ar_" prefix.

* hash.c (linear_init_table): rename to ar_alloc_table.

* debug_counter.h: rename obj_hash_array to obj_hash_ar.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 10 deletions

diff --git a/gc.c b/gc.c
index a8e7192e25..528dabaca9 100644
--- a/gc.c
+++ b/gc.c
@@ -2271,15 +2271,15 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
             RB_DEBUG_COUNTER_INC(obj_hash_empty);
         }
 
-        if (RHASH_ARRAY_P(obj)) {
-            RB_DEBUG_COUNTER_INC(obj_hash_array);
+        if (RHASH_AR_TABLE_P(obj)) {
+            RB_DEBUG_COUNTER_INC(obj_hash_ar);
         }
         else {
             RB_DEBUG_COUNTER_INC(obj_hash_st);
         }
 #endif
-        if (/* RHASH_ARRAY_P(obj) */ !FL_TEST_RAW(obj, RHASH_ST_TABLE_FLAG)) {
-            li_table *tab = RHASH(obj)->as.li;
+        if (/* RHASH_AR_TABLE_P(obj) */ !FL_TEST_RAW(obj, RHASH_ST_TABLE_FLAG)) {
+            ar_table *tab = RHASH(obj)->as.ar;
 
             if (tab) {
                 if (RHASH_TRANSIENT_P(obj)) {
@@ -2291,7 +2291,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
             }
         }
         else {
-            GC_ASSERT(RHASH_TABLE_P(obj));
+            GC_ASSERT(RHASH_ST_TABLE_P(obj));
             st_free_table(RHASH(obj)->as.st);
         }
 	break;
@@ -3355,8 +3355,8 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	size += rb_ary_memsize(obj);
 	break;
       case T_HASH:
-        if (RHASH_ARRAY_P(obj)) {
-            size += sizeof(li_table);
+        if (RHASH_AR_TABLE_P(obj)) {
+            size += sizeof(ar_table);
 	}
         else {
             VM_ASSERT(RHASH_ST_TABLE(obj) != NULL);
@@ -4254,9 +4254,9 @@ mark_hash(rb_objspace_t *objspace, VALUE hash)
 {
     rb_hash_stlike_foreach(hash, mark_keyvalue, (st_data_t)objspace);
 
-    if (RHASH_ARRAY_P(hash)) {
+    if (RHASH_AR_TABLE_P(hash)) {
         if (objspace->mark_func_data == NULL && RHASH_TRANSIENT_P(hash)) {
-            rb_transient_heap_mark(hash, RHASH_ARRAY(hash));
+            rb_transient_heap_mark(hash, RHASH_AR_TABLE(hash));
         }
     }
     else {
@@ -9710,7 +9710,7 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 	  }
           case T_HASH: {
               snprintf(buff, buff_size, "%s [%c%c] %d", buff,
-                       RHASH_ARRAY_P(obj) ? 'A' : 'S',
+                       RHASH_AR_TABLE_P(obj) ? 'A' : 'S',
                        RHASH_TRANSIENT_P(obj) ? 'T' : ' ',
                        (int)RHASH_SIZE(obj));
               break;