X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fconcord.git;a=blobdiff_plain;f=cos.c;h=5df8af21bf99b34c7801246bbe7cad803f7a6dcd;hp=6fc2f3f9c18b872cb9b4df5f5e342c48c2a9e06e;hb=e99e93e4773c5f3472b088db2659f7a848cbcc21;hpb=b6aac1bd870245ed92193dae35e439c2ed214039

diff --git a/cos.c b/cos.c
index 6fc2f3f..5df8af2 100644
--- 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,
@@ -50,6 +67,12 @@ cos_make_int (COS_C_Int num)
   return (COS_object)((COS_INT)(num << 1) | 1);
 }
 
+int
+cos_int_p (COS_object obj)
+{
+  return COS_OBJECT_INT_P (obj);
+}
+
 COS_C_Int
 cos_int_value (COS_object obj)
 {
@@ -58,12 +81,6 @@ cos_int_value (COS_object obj)
   return INTPTR_MIN;
 }
 
-int
-cos_int_p (COS_object obj)
-{
-  return COS_OBJECT_INT_P (obj);
-}
-
 
 COS_object
 cos_make_char (int code)
@@ -72,17 +89,17 @@ cos_make_char (int code)
 }
 
 int
-cos_char_id (COS_object obj)
+cos_char_p (COS_object obj)
 {
-  if (COS_OBJECT_CHAR_P (obj))
-    return ((COS_INT)obj) >> 2;
-  return -1;
+  return COS_OBJECT_CHAR_P (obj);
 }
 
 int
-cos_char_p (COS_object obj)
+cos_char_id (COS_object obj)
 {
-  return COS_OBJECT_CHAR_P (obj);
+  if (COS_OBJECT_CHAR_P (obj))
+    return (((COS_INT)obj) >> 2) & 0x7FFFFFFF;
+  return -1;
 }
 
 
@@ -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)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_P (obj))
+    {
+      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
+	((COS_Object)obj)->header.reference_count--;
+    }
+  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)
@@ -181,6 +211,11 @@ cos_release_string (COS_Object obj)
   return 0;
 }
 
+int cos_string_p (COS_object obj)
+{
+  return COS_OBJECT_STRING_P (obj);
+}
+
 size_t
 cos_string_size (COS_String string)
 {
@@ -194,6 +229,96 @@ 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;
+}
+
+int
+cos_cons_p (COS_object obj)
+{
+  return COS_OBJECT_CONS_P (obj);
+}
+
+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;
+}
+
+COS_Cons
+cos_assoc (COS_object key, COS_Cons alist)
+{
+  COS_Cons rest = alist;
+
+  while ( COS_OBJECT_CONS_P (rest) )
+    {
+      COS_Cons cell = cos_car (rest);
+
+      if ( cos_car (cell) == key )
+	return cell;
+
+      rest = cos_cdr (rest);
+    }
+  return NULL;
+}
+
+COS_object
+cos_alist_get (COS_Cons alist, COS_object key)
+{
+  return cos_cdr (cos_assoc (key, alist));
+}
+
+
+int
+cos_retain_container (COS_Object obj)
+{
+  return 0;
+}
+
 int
 cos_release_container (COS_Object obj)
 {
@@ -202,6 +327,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;
@@ -209,6 +340,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;
@@ -238,11 +375,23 @@ 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);
 }
 
+int
+concord_ds_p (COS_object obj)
+{
+  return COS_OBJECT_DS_P (obj);
+}
+
 
 COS_Genre
 concord_get_genre (COS_object ds, COS_object genre)
@@ -257,6 +406,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);
@@ -288,6 +443,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);
@@ -316,6 +477,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);
@@ -323,6 +490,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;
@@ -336,67 +509,47 @@ concord_decode_object (COS_object ds, COS_object genre,
   char* id_str;
   char buf[256];
   CONCORD_String_Tank obj_st;
-  COS_String obj_string;
   int cid;
   size_t end;
 
   if (index == NULL)
     return NULL;
 
-  printf ("decoding id (%lX)...", id);
   if (COS_OBJECT_INT_P (id))
     {
-      printf ("(id is an int)...");
       snprintf(buf, 256, "%ld", cos_int_value (id));
       id_str = buf;
     }
   else if (COS_OBJECT_CHAR_P (id))
     {
-      printf ("(id is a char)...");
-      snprintf(buf, 256, "%ld", cos_char_id (id));
+      snprintf(buf, 256, "%d", cos_char_id (id));
       id_str = buf;
     }
   else if (COS_OBJECT_SYMBOL_P (id))
     {
-      printf ("(id is a symbol)....");
       id_str = cos_string_data (cos_symbol_name ((COS_Symbol)id));
     }
   else if (COS_OBJECT_C_STRING_P (id))
     {
-      printf ("(id is a C-string)....");
       id_str = (char*)id;
     }
   else if (COS_OBJECT_STRING_P (id))
     {
-      printf ("(id is a string)....");
       id_str = cos_string_data ((COS_String)id);
     }
   else
     return NULL;
-  printf ("done (%s).\n", id_str);
 
   if ( concord_index_strid_get_obj_string (index, id_str, &obj_st) )
     return NULL;
 
-  obj_string = cos_make_string ((char*)CONCORD_String_data (&obj_st),
-				CONCORD_String_size (&obj_st));
-
   cid = cos_read_char (CONCORD_String_data (&obj_st),
 		       CONCORD_String_size (&obj_st),
 		       0, &end);
   if ( cid >= 0 )
     {
-      printf ("obj = %s (%d, U+%04X), len = %d, end = %d\n",
-	      cos_string_data (obj_string),
-	      cid, cid,
-	      CONCORD_String_size (&obj_st), end);
-      cos_release_object (obj_string);
       return cos_make_char (cid);
     }
-  else
-    printf ("obj = %s\n", cos_string_data (obj_string));
-
-  cos_release_object (obj_string);
 
   return NULL;
 }
@@ -405,32 +558,36 @@ COS_object
 concord_object_get_feature_value (COS_object object, COS_object feature)
 {
   char id_buf[256];
+  CONCORD_Genre gobj;
   CONCORD_Feature fobj;
   CONCORD_String_Tank val_st;
-  COS_String val_string;
+  size_t end;
 
   if (COS_OBJECT_CHAR_P (object))
     {
-      cos_utf8_print_char (object, id_buf, 256);
-      printf ("Object[char:0x%lX]'s id is %s.\n", object, id_buf);
+      cos_utf8_print_char (object, (unsigned char*)id_buf, 256);
     }
   else
     return NULL;
 
-  fobj = concord_get_feature (concord_current_env,
-			      "character", feature);
+  if (!COS_OBJECT_DS_P (concord_current_env))
+    {
+      concord_current_env = NULL;
+      return NULL;
+    }
+
+  gobj = concord_get_genre (concord_current_env, "character");
+  if (gobj == NULL)
+    return NULL;
+
+  fobj = concord_get_feature (concord_current_env, gobj, feature);
   if (fobj == NULL)
     return NULL;
 
   if ( concord_obj_get_feature_value_string (id_buf, fobj, &val_st) )
     return NULL;
 
-  val_string = cos_make_string ((char*)CONCORD_String_data (&val_st),
-				CONCORD_String_size (&val_st));
-  printf ("obj[%s]'s %s = %s\n",
-	  id_buf,
-	  concord_feature_get_name (fobj),
-	  cos_string_data (val_string));
-
-  return NULL;
+  return cos_read_object (CONCORD_String_data (&val_st),
+			  CONCORD_String_size (&val_st),
+			  0, &end);
 }