(cos_make_symbol): Use `cos_retain_object' for `obj->name'.

[chise/concord.git] / cos.c

diff --git a/cos.c b/cos.c
index 303b2dd..4a842b8 100644 (file)
--- a/cos.c
+++ b/cos.c
@@ -28,11 +28,28 @@ const char concord_system_db_dir[] = CONCORD_SI_DB_DIR;
 
 CONCORD_DS concord_current_env = NULL;
 
+int (*COS_Object_retain_function_table
+     [COS_OBJECT_TYPE_MAX - COS_Object_Type_char])
+  (COS_Object)
+  = { cos_retain_string,
+      cos_retain_symbol,
+      cos_retain_cons,
+      cos_retain_container,
+      cos_retain_sexp,
+      cos_retain_binary,
+      cos_retain_ds,
+      cos_retain_genre,
+      cos_retain_feature,
+      cos_retain_index,
+      cos_retain_db_object
+};
+
 int (*COS_Object_release_function_table
      [COS_OBJECT_TYPE_MAX - COS_Object_Type_char])
   (COS_Object)
   = { cos_release_string,
       cos_release_symbol,
+      cos_release_cons,
       cos_release_container,
       cos_release_sexp,
       cos_release_binary,
@@ -104,22 +121,29 @@ cos_allocate_object_0 (enum COS_Object_Type type, size_t size)
 COS_Object
 cos_retain_object (COS_Object obj)
 {
-  obj->header.reference_count++;
-
+  if (COS_OBJECT_P (obj))
+    {
+      obj->header.reference_count++;
+      (*COS_Object_retain_function_table
+       [((COS_Object)obj)->header.type
+       - COS_FAT_OBJECT_TYPE_MIN])(obj);
+    }
   return obj;
 }
 
 int
 cos_release_object (COS_object obj)
 {
-  ((COS_Object)obj)->header.reference_count--;
+  if (COS_OBJECT_P (obj))
+    {
+      ((COS_Object)obj)->header.reference_count--;
 
-  if ( ((COS_Object)obj)->header.reference_count <= 0 )
-    return (*COS_Object_release_function_table
-           [((COS_Object)obj)->header.type
-            - COS_FAT_OBJECT_TYPE_MIN])(obj);
-  else
-    return 0;
+      if ( ((COS_Object)obj)->header.reference_count <= 0 )
+       return (*COS_Object_release_function_table
+               [((COS_Object)obj)->header.type
+                - COS_FAT_OBJECT_TYPE_MIN])(obj);
+    }
+  return 0;
 }
 
 
@@ -170,6 +194,12 @@ cos_build_string (char* str)
 }
 
 int
+cos_retain_string (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_string (COS_Object obj)
 {
   if (obj == NULL)
@@ -199,6 +229,67 @@ cos_string_data (COS_String string)
 }
 
 
+COS_Cons
+cos_cons (COS_object car, COS_object cdr)
+{
+  COS_Cons obj = COS_ALLOCATE_OBJECT (Cons);
+
+  if (obj == NULL)
+    return NULL;
+
+  obj->car = car;
+  obj->cdr = cdr;
+  cos_retain_object (car);
+  cos_retain_object (cdr);
+
+  return obj;
+}
+
+int
+cos_retain_cons (COS_Object obj)
+{
+  cos_retain_object (COS_CAR (obj));
+  cos_retain_object (COS_CDR (obj));
+  return 0;
+}
+
+int
+cos_release_cons (COS_Object obj)
+{
+  if (obj == NULL)
+    return 0;
+
+  cos_release_object (COS_CAR (obj));
+  cos_release_object (COS_CDR (obj));
+  free (obj);
+  return 0;
+}
+
+COS_object
+cos_car (COS_Cons pair)
+{
+  if (COS_OBJECT_CONS_P (pair))
+    return COS_CAR (pair);
+  else
+    return NULL;
+}
+
+COS_object
+cos_cdr (COS_Cons pair)
+{
+  if (COS_OBJECT_CONS_P (pair))
+    return COS_CDR (pair);
+  else
+    return NULL;
+}
+
+
+int
+cos_retain_container (COS_Object obj)
+{
+  return 0;
+}
+
 int
 cos_release_container (COS_Object obj)
 {
@@ -207,6 +298,12 @@ cos_release_container (COS_Object obj)
 
 
 int
+cos_retain_sexp (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_sexp (COS_Object obj)
 {
   return 0;
@@ -214,6 +311,12 @@ cos_release_sexp (COS_Object obj)
 
 
 int
+cos_retain_binary (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_binary (COS_Object obj)
 {
   return 0;
@@ -243,6 +346,12 @@ concord_open_env (COS_object ds)
 }
 
 int
+cos_retain_ds (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_ds (COS_Object obj)
 {
   return concord_close_ds ((COS_DS)obj);
@@ -262,6 +371,12 @@ concord_get_genre (COS_object ds, COS_object genre)
 }
 
 int
+cos_retain_genre (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_genre (COS_Object obj)
 {
   return concord_close_genre ((COS_Genre)obj);
@@ -293,6 +408,12 @@ concord_get_feature (COS_object ds,
 }
 
 int
+cos_retain_feature (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_feature (COS_Object obj)
 {
   return concord_close_feature ((COS_Feature)obj);
@@ -321,6 +442,12 @@ concord_get_feature_index (COS_object ds,
 }
 
 int
+cos_retain_index (COS_Object obj)
+{
+  return concord_close_index ((COS_Feature_INDEX)obj);
+}
+
+int
 cos_release_index (COS_Object obj)
 {
   return concord_close_index ((COS_Feature_INDEX)obj);
@@ -328,6 +455,12 @@ cos_release_index (COS_Object obj)
 
 
 int
+cos_retain_db_object (COS_Object obj)
+{
+  return 0;
+}
+
+int
 cos_release_db_object (COS_Object obj)
 {
   return 0;