update.

[chise/concord.git] / cos.c

diff --git a/cos.c b/cos.c
index 4a842b8..7e5a51d 100644 (file)
--- a/cos.c
+++ b/cos.c
@@ -67,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)
 {
@@ -75,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)
@@ -89,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;
 }
 
 
@@ -136,12 +136,12 @@ cos_release_object (COS_object obj)
 {
   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
+       ((COS_Object)obj)->header.reference_count--;
     }
   return 0;
 }
@@ -248,8 +248,8 @@ cos_cons (COS_object car, COS_object cdr)
 int
 cos_retain_cons (COS_Object obj)
 {
-  cos_retain_object (COS_CAR (obj));
-  cos_retain_object (COS_CDR (obj));
+  //cos_retain_object (COS_CAR (obj));
+  //cos_retain_object (COS_CDR (obj));
   return 0;
 }
 
@@ -265,6 +265,12 @@ cos_release_cons (COS_Object obj)
   return 0;
 }
 
+int
+cos_cons_p (COS_object obj)
+{
+  return COS_OBJECT_CONS_P (obj);
+}
+
 COS_object
 cos_car (COS_Cons pair)
 {
@@ -283,6 +289,29 @@ cos_cdr (COS_Cons pair)
     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)
@@ -547,9 +576,6 @@ concord_object_get_feature_value (COS_object object, COS_object feature)
   CONCORD_String_Tank val_st;
   COS_String val_string;
   size_t end;
-  int val_cid;
-  COS_String val_str;
-  COS_object val_obj;
 
   if (COS_OBJECT_CHAR_P (object))
     {
@@ -574,23 +600,7 @@ concord_object_get_feature_value (COS_object object, COS_object feature)
          concord_feature_get_name (fobj),
          cos_string_data (val_string));
 
-  val_obj = cos_read_int (CONCORD_String_data (&val_st),
+  return cos_read_object (CONCORD_String_data (&val_st),
                          CONCORD_String_size (&val_st),
                          0, &end);
-  if ( val_obj != NULL )
-    return val_obj;
-
-  val_cid = cos_read_char (CONCORD_String_data (&val_st),
-                          CONCORD_String_size (&val_st),
-                          0, &end);
-  if ( val_cid >= 0 )
-    return cos_make_char (val_cid);
-
-  val_str = cos_read_string (CONCORD_String_data (&val_st),
-                            CONCORD_String_size (&val_st),
-                            0, &end);
-  if ( val_str != NULL )
-    return val_str;
-
-  return NULL;
 }