carray 2.0.1 → 3.0.0

data/ext/carray_attribute.c

@@ -1,25 +1,21 @@
 /* ---------------------------------------------------------------------------
 
-  carray_attribute.c
+  Attribute and predicate accessors for CArray (obj_type / data_type
+  / ndim / shape / dim / bytes / elements + entity? / virtual? /
+  fixlen? / boolean? / read_only? / mask_array? / etc.) plus the
+  view-chain navigators parent / root_array / ancestors.
 
-  This file is part of Ruby/CArray extension library.
-
-  Copyright (C) 2005-2025 Hiroki Motoyoshi
+  The corresponding YARD documentation lives in
+  yard-stubs/carray_attribute.rb; this file carries only the
+  implementation.
 
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "ca_obj_face.h"   /* CA_OBJ_RECORD + rb_ca_record_get_data_class */
 
 /* ------------------------------------------------------------------- */
 
-/* @overload obj_type
-
-(Attribute) 
-Returns the object type (e.g. CA_OBJ_ARRAY, CA_OBJ_BLOCK, ...).
-Since the object type can be known from the class of the object,
-this attribute methods is rarely used.
-*/
-
 VALUE
 rb_ca_obj_type (VALUE self)
 {
@@ -28,26 +24,16 @@ rb_ca_obj_type (VALUE self)
   return INT2NUM(ca->obj_type);
 }
 
-/* @overload data_type
-
-(Attribute) 
-Returns the data type of each element (e.g. CA_INT32, CA_FLOAT64, ...).
-*/
-
 VALUE
 rb_ca_data_type (VALUE self)
 {
   CArray *ca;
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  return INT2NUM(ca->data_type);
+  /* Return a Symbol via the pre-computed ID cache; the C internal
+     int8_t representation is unchanged. */
+  return ID2SYM(ca_data_type_sym[ca->data_type]);
 }
 
-/* @overload ndim
-
-(Attribute) 
-Returns the number of dimensions (e.g. 1 for 1D array, 3 for 3D array, ...).
-*/
-
 VALUE
 rb_ca_ndim (VALUE self)
 {
@@ -56,16 +42,6 @@ rb_ca_ndim (VALUE self)
   return INT2NUM(ca->ndim);
 }
 
-/* @overload bytes
-
-(Attribute) 
-Returns the byte size of each element (e.g. 4 for CA_INT32, 8 for CA_FLOAT64).
-The byte size can be obtained using CArray.sizeof(data_type)
-for the numerical data types, but
-the byte size of fixed-length data type can be known 
-only by this method.
-*/
-
 VALUE
 rb_ca_bytes (VALUE self)
 {
@@ -74,11 +50,13 @@ rb_ca_bytes (VALUE self)
   return SIZE2NUM(ca->bytes);
 }
 
-/* @overload elements
-
-(Attribute) 
-Returns the number of elements
-*/
+VALUE
+rb_ca_flags (VALUE self)
+{
+  CArray *ca;
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
+  return INT2NUM(ca->flags);
+}
 
 VALUE
 rb_ca_elements (VALUE self)
@@ -88,13 +66,6 @@ rb_ca_elements (VALUE self)
   return SIZE2NUM(ca->elements);
 }
 
-/* @overload dim
-
-(Attribute) 
-Returns the Array object contains the dimensional shape of array
-(e.g. [2,3] for 2D 2x3 array, ...).
-*/
-
 VALUE
 rb_ca_dim (VALUE self)
 {
@@ -109,13 +80,6 @@ rb_ca_dim (VALUE self)
   return dim;
 }
 
-/*
-@overload dim0
-
-(Attribute) 
-Short-hand for "dim[0]"
-*/  
-
 VALUE
 rb_ca_dim0 (VALUE self)
 {
@@ -124,13 +88,6 @@ rb_ca_dim0 (VALUE self)
   return SIZE2NUM(ca->dim[0]);
 }
 
-/*
-@overload dim1
-
-(Attribute) 
-Short-hand for "dim[1]"
-*/  
-
 VALUE
 rb_ca_dim1 (VALUE self)
 {
@@ -139,13 +96,6 @@ rb_ca_dim1 (VALUE self)
   return ( ca->ndim >= 2 ) ? SIZE2NUM(ca->dim[1]) : Qnil;
 }
 
-/*
-@overload dim2
-
-(Attribute) 
-Short-hand for 'dim[2]'
-*/  
-
 VALUE
 rb_ca_dim2 (VALUE self)
 {
@@ -154,13 +104,6 @@ rb_ca_dim2 (VALUE self)
   return ( ca->ndim >= 3 ) ? SIZE2NUM(ca->dim[2]) : Qnil;
 }
 
-/*
-@overload dim3
-
-(Attribute) 
-Short-hand for "dim[3]"
-*/  
-
 VALUE
 rb_ca_dim3 (VALUE self)
 {
@@ -169,12 +112,6 @@ rb_ca_dim3 (VALUE self)
   return ( ca->ndim >= 4 ) ? SIZE2NUM(ca->dim[3]) : Qnil;
 }
 
-/* @overload data_type_name
-
-(Attribute) 
-Returns the string representaion of the data_type (e.g. "int32", "fixlen")
-*/
-
 VALUE
 rb_ca_data_type_name (VALUE self)
 {
@@ -192,11 +129,6 @@ ca_is_scalar (void *ap)
   return ca_test_flag(ca, CA_FLAG_SCALAR);
 }
 
-/* @overload scalar?
-
-(Inquiry) Returns true if the object is a CScalar
-*/
-
 VALUE
 rb_ca_is_scalar (VALUE self)
 {
@@ -205,8 +137,6 @@ rb_ca_is_scalar (VALUE self)
   return ( ca_is_scalar(ca) ) ? Qtrue : Qfalse;
 }
 
-/* api: rb_obj_is_cscalar */
-
 VALUE
 rb_obj_is_cscalar (VALUE obj)
 {
@@ -221,46 +151,30 @@ rb_obj_is_cscalar (VALUE obj)
 /* ------------------------------------------------------------------- */
 
 int
-ca_is_virtual (void *ap)
+ca_is_view (void *ap)
 {
   CArray *ca = (CArray *) ap;
-  return ( ca_func[ca->obj_type].entity_type == CA_VIRTUAL_ARRAY ) ? 1 : 0;
+  return ( ca_func[ca->obj_type].entity_type == CA_VIEW_ARRAY ) ? 1 : 0;
 }
 
-/* @overload entity?
-
-(Inquiry) Returns true if `self` is an entity array (not a virtual array).
-*/
-
 VALUE
 rb_ca_is_entity (VALUE self)
 {
   CArray *ca;
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  return ( ca_is_virtual(ca) ) ? Qfalse : Qtrue;
+  return ( ca_is_view(ca) ) ? Qfalse : Qtrue;
 }
 
-/*
-@overload virtual?
-
-(Inquiry) Returns true if `self` is a virtural array (not an entity array).
-*/
-
 VALUE
 rb_ca_is_virtual (VALUE self)
 {
   CArray *ca;
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  return ( ca_is_virtual(ca) ) ? Qtrue : Qfalse;
+  return ( ca_is_view(ca) ) ? Qtrue : Qfalse;
 }
 
 /* ------------------------------------------------------------------- */
 
-/* @overload attached?
-
-(Inquiry) Returns true if the object is attached.
-*/
-
 VALUE
 rb_ca_is_attached (VALUE self)
 {
@@ -271,11 +185,6 @@ rb_ca_is_attached (VALUE self)
 
 /* ------------------------------------------------------------------- */
 
-/* @overload empty?
-
-(Inquiry) Returns true if the object is empty.
-*/
-
 VALUE
 rb_ca_is_empty (VALUE self)
 {
@@ -293,9 +202,22 @@ ca_is_readonly (void *ap)
   if ( ca_test_flag(ca, CA_FLAG_READ_ONLY) ) {           /* test -> true */
     return 1;
   }
+  else if ( ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+    /* multi-parent view: read-only iff ANY parent is (a whole-view write
+       cannot be honoured if any backing parent rejects writes). */
+    CAMultiParent *mp = (CAMultiParent *) ca;
+    int32_t k;
+    for ( k = 0; k < mp->n_parents; k++ ) {
+      if ( ca_is_readonly(mp->parents[k]) ) {
+        ca_set_flag(ca, CA_FLAG_READ_ONLY);
+        return 1;
+      }
+    }
+    return 0;
+  }
   else {                                                 /* test -> false */
-    if ( ca_is_virtual(ca) && CAVIRTUAL(ca)->parent ) {
-      if ( ca_is_readonly(CAVIRTUAL(ca)->parent) ) {     /* test -> true */
+    if ( ca_is_view(ca) && CAVIEW(ca)->parent ) {
+      if ( ca_is_readonly(CAVIEW(ca)->parent) ) {     /* test -> true */
         ca_set_flag(ca, CA_FLAG_READ_ONLY);
         return 1;
       }
@@ -304,11 +226,6 @@ ca_is_readonly (void *ap)
   }
 }
 
-/* @overload read_only?
-
-(Inquiry) Returns true if the object is read-only
-*/
-
 VALUE
 rb_ca_is_read_only (VALUE self)
 {
@@ -327,8 +244,13 @@ ca_is_mask_array (void *ap)
     return 1;
   }
   else {                                                   /* test -> false */
-    if ( ca_is_virtual(ca) && CAVIRTUAL(ca)->parent ) {
-      if ( ca_is_mask_array(CAVIRTUAL(ca)->parent) ) {     /* test -> true */
+    /* Identity property: a CAStack is not a mask array unless
+       flagged directly (the internal CAStackMask is).  Do not
+       inherit the property across a multi-parent fan-out — stop at
+       the boundary. */
+    if ( ca_is_view(ca) && CAVIEW(ca)->parent
+         && ! ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+      if ( ca_is_mask_array(CAVIEW(ca)->parent) ) {     /* test -> true */
         ca_set_flag(ca, CA_FLAG_MASK_ARRAY);
         return 1;
       }
@@ -337,11 +259,6 @@ ca_is_mask_array (void *ap)
   }
 }
 
-/* @overload mask_array?
-
-(Inquiry) Returns true if `self` is mask array (don't confuse with "masked array")
-*/
-
 VALUE
 rb_ca_is_mask_array (VALUE self)
 {
@@ -360,8 +277,13 @@ ca_is_value_array (void *ap)
     return 1;
   }
   else {                                                   /* test -> false */
-    if ( ca_is_virtual(ca) && CAVIRTUAL(ca)->parent ) {
-      if ( ca_is_value_array(CAVIRTUAL(ca)->parent) ) {     /* test -> true */
+    /* Identity property: a CAStack is never "the .value of" a
+       single array (s.value wraps it in a flagged CARefer).  Do
+       not inherit across a multi-parent fan-out — stop at the
+       boundary. */
+    if ( ca_is_view(ca) && CAVIEW(ca)->parent
+         && ! ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+      if ( ca_is_value_array(CAVIEW(ca)->parent) ) {     /* test -> true */
         ca_set_flag(ca, CA_FLAG_VALUE_ARRAY);
         return 1;
       }
@@ -370,11 +292,6 @@ ca_is_value_array (void *ap)
   }
 }
 
-/* @overload value_array?
-
-(Inquiry) Returns true if `self` is a value array
-*/
-
 VALUE
 rb_ca_is_value_array (VALUE self)
 {
@@ -385,6 +302,16 @@ rb_ca_is_value_array (VALUE self)
 
 /* ------------------------------------------------------------------- */
 
+VALUE
+rb_ca_is_face (VALUE self)
+{
+  CArray *ca;
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
+  return ( ca_is_face(ca) ) ? Qtrue : Qfalse;
+}
+
+/* ------------------------------------------------------------------- */
+
 int
 ca_is_fixlen_type (void *ap)
 {
@@ -392,11 +319,6 @@ ca_is_fixlen_type (void *ap)
   return ( ca->data_type == CA_FIXLEN );
 }
 
-/* @overload fixlen?
-
-(Inquiry) Returns true if `self` is fixed-length type array
-*/
-
 VALUE
 rb_ca_is_fixlen_type (VALUE self)
 {
@@ -414,11 +336,6 @@ ca_is_boolean_type (void *ap)
   return ( ca->data_type == CA_BOOLEAN );
 }
 
-/* @overload boolean?
-
-(Inquiry) Return true if `self` is boolean type array  
-*/
-
 VALUE
 rb_ca_is_boolean_type (VALUE self)
 {
@@ -437,11 +354,6 @@ ca_is_numeric_type (void *ap)
            ( ca->data_type <= CA_CMPLX256 ) );
 }
 
-/* @overload numeric?
-
-(Inquiry) Returns true if `self` is numeric type array  
-*/
-
 VALUE
 rb_ca_is_numeric_type (VALUE self)
 {
@@ -460,11 +372,6 @@ ca_is_integer_type (void *ap)
            ( ca->data_type <= CA_UINT64 ) );
 }
 
-/* @overload integer?
-
-(Inquiry) Returns true if `self` is integer type array  
-*/
-
 VALUE
 rb_ca_is_integer_type (VALUE self)
 {
@@ -475,36 +382,6 @@ rb_ca_is_integer_type (VALUE self)
 
 /* ------------------------------------------------------------------- */
 
-int
-ca_is_unsigned_type (void *ap)
-{
-  CArray *ca = (CArray *) ap;
-  switch ( ca->data_type ) {
-  case CA_UINT8:
-  case CA_UINT16:
-  case CA_UINT32:
-  case CA_UINT64:
-    return 1;
-  default:
-    return 0;
-  }
-}
-
-/* @overload unsigned?
-
-(Inquiry) Return true if `self` is unsigned integer type array  
-*/
-
-VALUE
-rb_ca_is_unsigned_type (VALUE self)
-{
-  CArray *ca;
-  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  return ca_is_unsigned_type(ca) ? Qtrue : Qfalse;
-}
-
-/* ------------------------------------------------------------------- */
-
 int
 ca_is_float_type (void *ap)
 {
@@ -513,11 +390,6 @@ ca_is_float_type (void *ap)
            ( ca->data_type <= CA_FLOAT128 ) );
 }
 
-/* @overload float?
-
-(Inquiry) Returns true if `self` is float type array  
-*/
-
 VALUE
 rb_ca_is_float_type (VALUE self)
 {
@@ -536,11 +408,6 @@ ca_is_complex_type (void *ap)
            ( ca->data_type <= CA_CMPLX256 ) );
 }
 
-/* @overload complex?
-
-(Inquiry) Returns true if `self` is complex type array  
-*/
-
 VALUE
 rb_ca_is_complex_type (VALUE self)
 {
@@ -558,11 +425,6 @@ ca_is_object_type (void *ap)
   return ( ca->data_type == CA_OBJECT );
 }
 
-/* @overload object?
-
-(Inquiry) Returns true if `self` is object type array
-*/
-
 VALUE
 rb_ca_is_object_type (VALUE self)
 {
@@ -575,13 +437,6 @@ rb_ca_is_object_type (VALUE self)
 
 static ID id_parent;
 
-/* @overload parent
-
-(Attribute) 
-Returns the parent carray if `self` has parent,
-or returns nil if `self` has no parent.
-*/
-
 VALUE
 rb_ca_parent (VALUE self)
 {
@@ -600,128 +455,44 @@ rb_ca_set_parent (VALUE self, VALUE obj)
 
 /* ------------------------------------------------------------------- */
 
-static ID id_data_class;
-
-/* @overload data_class
-
-(Attribute) 
-Returns data_class if `self` is fixed-length type and it 
-has the data class.
-*/
-
 VALUE
 rb_ca_data_class (VALUE self)
 {
-  volatile VALUE parent, data_class;
   CArray *ca;
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  if ( ca_test_flag(ca, CA_FLAG_NOT_DATA_CLASS) ) {
-    return Qnil;
-  }
-  if ( ! ca_is_fixlen_type(ca) ) {      /* not a fixlen array */
-    ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
+  /* Only a Face carries data_class; a non-Face CArray is always
+     Qnil.  CARecord stores it in its tail (reached directly via
+     obj_type, no Ruby roundtrip); numeric Faces such as
+     CATime / CATimedelta have no data_class. */
+  if ( ! ca_test_flag(ca, CA_FLAG_IS_FACE) ) {
     return Qnil;
   }
-  data_class = rb_ivar_get(self, id_data_class);
-  if ( ! NIL_P(data_class) ) {
-    return data_class;
-  }
-  else {
-    return Qnil;
-    if ( ca_is_entity(ca) ) {  /* no further parent */
-      ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
-      return Qnil;
-    }
-    else {
-      parent = rb_ca_parent(self);
-      if ( NIL_P(parent) ) {   /* no parent */
-        ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
-        return Qnil;
-      }
-      else {
-        CArray *cr;
-        TypedData_Get_Struct(parent, CArray, &carray_data_type, cr);
-        if ( cr->bytes != ca->bytes ) {  /* byte size mismatch */
-          ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
-          return Qnil;
-        }
-        else {
-          data_class = rb_ca_data_class(parent); /* parent's data class */
-          if ( ! NIL_P(data_class) ) {
-            return data_class;
-          }
-          else {
-            ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
-            return Qnil;
-          }
-        }
-      }
-    }
+  if ( ca->obj_type == CA_OBJ_RECORD ) {
+    return rb_ca_record_get_data_class(ca);
   }
+  return Qnil;
 }
 
-/* @overload has_data_class?
-
-(Inquiry) Returns true if `self` is fixed-length type and has the data class.
-*/
-
 VALUE
 rb_ca_has_data_class (VALUE self)
 {
-  CArray *ca;
-  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
-  if ( ca_test_flag(ca, CA_FLAG_NOT_DATA_CLASS) ) {
-    return Qfalse;
-  }
-  else {
-    if ( ca_is_fixlen_type(ca) ) {
-      if ( RTEST(rb_ca_data_class(self)) ) {
-        return Qtrue;
-      }
-    }
-    ca_set_flag(ca, CA_FLAG_NOT_DATA_CLASS);
-    return Qfalse;
-  }
+  return RTEST(rb_ca_data_class(self)) ? Qtrue : Qfalse;
 }
 
 /* ------------------------------------------------------------------- */
 
+/* data_class= is defined but always raises.  data_class now lives
+   on the Face (CARecord) tail; there is no way to attach one to a
+   non-Face CArray in-place.  The setter is kept only so a call
+   surfaces the migration message rather than NoMethodError.
+   NORETURN: rb_raise never returns, so neither does this function. */
+NORETURN(VALUE rb_ca_set_data_class(VALUE self, VALUE klass));
 VALUE
-rb_ca_data_type_inherit (VALUE self, VALUE other)
-{
-  if ( RTEST(rb_ca_is_fixlen_type(self)) ) {
-    VALUE data_class = rb_ca_data_class(other);
-    if ( RTEST(data_class) ) {
-      rb_ivar_set(self, rb_intern("member"), rb_hash_new());
-      return rb_ivar_set(self, id_data_class, data_class);
-    }
-  }
-  return Qnil;
-}
-
-VALUE
-rb_ca_data_type_import (VALUE self, VALUE data_type)
-{
-  if ( RTEST(rb_ca_is_fixlen_type(self)) &&
-       rb_obj_is_data_class(data_type) ) {
-    rb_ivar_set(self, rb_intern("member"), rb_hash_new());
-    return rb_ivar_set(self, id_data_class, data_type);
-  }
-  return Qnil;
-}
-
-static VALUE
 rb_ca_set_data_class (VALUE self, VALUE klass)
 {
-  if ( RTEST(rb_ca_is_fixlen_type(self)) &&
-       rb_obj_is_data_class(klass) ) {
-    rb_ivar_set(self, rb_intern("member"), rb_hash_new());
-    return rb_ivar_set(self, id_data_class, klass);
-  }
-  else {
-    rb_raise(rb_eTypeError, "invalid data_class or self is not fixlen array.");
-  }
-  return Qnil;
+  rb_raise(rb_eArgError,
+    "CArray#data_class= was removed in 3.0. "
+    "Use `CARecord.new(klass, *shape)` or `CARecord.wrap(entity, klass)`.");
 }
 
 /* ------------------------------------------------------------------- */
@@ -733,8 +504,14 @@ ca_root_array (void *ap)
   if ( ca_is_entity(ca) ) {
     return ca;
   }
+  else if ( ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+    /* Multi-parent view fans out to K roots, so the single-
+       reference chain terminates here — the view itself is the
+       root boundary. */
+    return ca;
+  }
   else {
-    CAVirtual *cr = (CAVirtual *)ca;
+    CAView *cr = (CAView *)ca;
     if ( ! cr->parent ) {
       return ca;
     }
@@ -744,12 +521,6 @@ ca_root_array (void *ap)
   }
 }
 
-/* @overload root_array
-
-(Attribute) 
-Returns the object at the root of chain of reference.
-*/
-
 static VALUE
 rb_ca_root_array (VALUE self)
 {
@@ -759,6 +530,9 @@ rb_ca_root_array (VALUE self)
   if ( ca_is_entity(ca) ) {
     return self;
   }
+  else if ( ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+    return self;   /* Multi-parent: root boundary (fans out to K roots). */
+  }
   else {
     refary = rb_ca_parent(self);
     if ( NIL_P(refary) ) {
@@ -782,6 +556,9 @@ rb_ca_ancestors_loop (VALUE self, VALUE list)
   if ( ca_is_entity(ca) ) {
     return list;
   }
+  else if ( ca_test_flag(ca, CA_FLAG_MULTI_PARENTS) ) {
+    return list;   /* Multi-parent: chain terminates here (fans out to K). */
+  }
   else {
     refary = rb_ca_parent(self);
     if ( rb_obj_is_carray(refary) ) {
@@ -793,18 +570,10 @@ rb_ca_ancestors_loop (VALUE self, VALUE list)
   }
 }
 
-/* @overload ancestors
-
-(Attribute) 
-Returns the list of objects in the chain of reference.
-*/
-
 static VALUE
 rb_ca_ancestors (VALUE self)
 {
   volatile VALUE list;
-  CArray *ca;
-  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   list = rb_ary_new();
   return rb_ca_ancestors_loop(self, list);
 }
@@ -812,17 +581,17 @@ rb_ca_ancestors (VALUE self)
 /* ------------------------------------------------------------------- */
 
 void
-Init_carray_attribute ()
+Init_carray_attribute (void)
 {
   id_parent     = rb_intern("parent");
-  id_data_class = rb_intern("data_class");
 
   rb_define_method(rb_cCArray, "obj_type", rb_ca_obj_type, 0);
   rb_define_method(rb_cCArray, "data_type", rb_ca_data_type, 0);
   rb_define_method(rb_cCArray, "bytes", rb_ca_bytes, 0);
-  rb_define_method(rb_cCArray, "ndim", rb_ca_ndim, 0); 
-  rb_define_method(rb_cCArray, "rank", rb_ca_ndim, 0); /* after carray-1.5.0 */
-  rb_define_method(rb_cCArray, "shape", rb_ca_dim, 0); /* after carray-1.5.0 */
+  rb_define_method(rb_cCArray, "flags", rb_ca_flags, 0);
+  rb_define_method(rb_cCArray, "ndim", rb_ca_ndim, 0);
+  rb_define_method(rb_cCArray, "rank", rb_ca_ndim, 0);
+  rb_define_method(rb_cCArray, "shape", rb_ca_dim, 0);
   rb_define_method(rb_cCArray, "dim", rb_ca_dim, 0);
   rb_define_method(rb_cCArray, "dim0", rb_ca_dim0, 0);
   rb_define_method(rb_cCArray, "dim1", rb_ca_dim1, 0);
@@ -845,6 +614,7 @@ Init_carray_attribute ()
   rb_define_method(rb_cCArray, "virtual?", rb_ca_is_virtual, 0);
   rb_define_method(rb_cCArray, "value_array?", rb_ca_is_value_array, 0);
   rb_define_method(rb_cCArray, "mask_array?", rb_ca_is_mask_array, 0);
+  rb_define_method(rb_cCArray, "face?", rb_ca_is_face, 0);
 
   rb_define_method(rb_cCArray, "empty?", rb_ca_is_empty, 0);
   rb_define_method(rb_cCArray, "read_only?", rb_ca_is_read_only, 0);
@@ -856,7 +626,6 @@ Init_carray_attribute ()
   rb_define_method(rb_cCArray, "boolean?",  rb_ca_is_boolean_type, 0);
   rb_define_method(rb_cCArray, "numeric?",  rb_ca_is_numeric_type, 0);
   rb_define_method(rb_cCArray, "integer?",  rb_ca_is_integer_type, 0);
-  rb_define_method(rb_cCArray, "unsigned?", rb_ca_is_unsigned_type, 0);
   rb_define_method(rb_cCArray, "float?",    rb_ca_is_float_type, 0);
   rb_define_method(rb_cCArray, "complex?",  rb_ca_is_complex_type, 0);
   rb_define_method(rb_cCArray, "object?",   rb_ca_is_object_type, 0);