google-protobuf 3.0.0.alpha.3 → 3.0.0.alpha.3.1.pre

data/ext/google/protobuf_c/repeated_field.c

@@ -47,30 +47,6 @@ RepeatedField* ruby_to_RepeatedField(VALUE _self) {
   return self;
 }
 
-static int index_position(VALUE _index, RepeatedField* repeated_field) {
-  int index = NUM2INT(_index);
-  if (index < 0 && repeated_field->size > 0) {
-    index = repeated_field->size + index;
-  }
-  return index;
-}
-
-VALUE RepeatedField_subarray(VALUE _self, long beg, long len) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  int element_size = native_slot_size(self->field_type);
-  upb_fieldtype_t field_type = self->field_type;
-  VALUE field_type_class = self->field_type_class;
-
-  size_t off = beg * element_size;
-  VALUE ary = rb_ary_new2(len);
-  for (int i = beg; i < beg + len; i++, off += element_size) {
-    void* mem = ((uint8_t *)self->elements) + off;
-    VALUE elem = native_slot_get(field_type, field_type_class, mem);
-    rb_ary_push(ary, elem);
-  }
-  return ary;
-}
-
 /*
  * call-seq:
  *     RepeatedField.each(&block)
@@ -91,58 +67,29 @@ VALUE RepeatedField_each(VALUE _self) {
     VALUE val = native_slot_get(field_type, field_type_class, memory);
     rb_yield(val);
   }
-  return _self;
+  return Qnil;
 }
 
-
 /*
  * call-seq:
  *     RepeatedField.[](index) => value
  *
- * Accesses the element at the given index. Returns nil on out-of-bounds
+ * Accesses the element at the given index. Throws an exception on out-of-bounds
+ * errors.
  */
-VALUE RepeatedField_index(int argc, VALUE* argv, VALUE _self) {
+VALUE RepeatedField_index(VALUE _self, VALUE _index) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
   int element_size = native_slot_size(self->field_type);
   upb_fieldtype_t field_type = self->field_type;
   VALUE field_type_class = self->field_type_class;
 
-  VALUE arg = argv[0];
-  long beg, len;
-
-  if (argc == 1){
-    if (FIXNUM_P(arg)) {
-      /* standard case */
-      int index = index_position(argv[0], self);
-      if (index < 0 || index >= self->size) {
-        return Qnil;
-      }
-      void* memory = (void *) (((uint8_t *)self->elements) +
-                               index * element_size);
-      return native_slot_get(field_type, field_type_class, memory);
-    }else{
-      /* check if idx is Range */
-      size_t off;
-      switch (rb_range_beg_len(arg, &beg, &len, self->size, 0)) {
-        case Qfalse:
-          break;
-        case Qnil:
-          return Qnil;
-        default:
-          return RepeatedField_subarray(_self, beg, len);
-      }
-    }
-  }
-  /* assume 2 arguments */
-  beg = NUM2LONG(argv[0]);
-  len = NUM2LONG(argv[1]);
-  if (beg < 0) {
-    beg += self->size;
-  }
-  if (beg >= self->size) {
-    return Qnil;
+  int index = NUM2INT(_index);
+  if (index < 0 || index >= self->size) {
+    rb_raise(rb_eRangeError, "Index out of range");
   }
-  return RepeatedField_subarray(_self, beg, len);
+
+  void* memory = (void *) (((uint8_t *)self->elements) + index * element_size);
+  return native_slot_get(field_type, field_type_class, memory);
 }
 
 /*
@@ -158,9 +105,9 @@ VALUE RepeatedField_index_set(VALUE _self, VALUE _index, VALUE val) {
   VALUE field_type_class = self->field_type_class;
   int element_size = native_slot_size(field_type);
 
-  int index = index_position(_index, self);
+  int index = NUM2INT(_index);
   if (index < 0 || index >= (INT_MAX - 1)) {
-    return Qnil;
+    rb_raise(rb_eRangeError, "Index out of range");
   }
   if (index >= self->size) {
     RepeatedField_reserve(self, index + 1);
@@ -218,7 +165,6 @@ VALUE RepeatedField_push(VALUE _self, VALUE val) {
   return _self;
 }
 
-
 // Used by parsing handlers.
 void RepeatedField_push_native(VALUE _self, void* data) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
@@ -239,15 +185,19 @@ void* RepeatedField_index_native(VALUE _self, int index) {
 }
 
 /*
- * Private ruby method, used by RepeatedField.pop
+ * call-seq:
+ *     RepeatedField.pop => value
+ *
+ * Removes the last element and returns it. Throws an exception if the repeated
+ * field is empty.
  */
-VALUE RepeatedField_pop_one(VALUE _self) {
+VALUE RepeatedField_pop(VALUE _self) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
   upb_fieldtype_t field_type = self->field_type;
   VALUE field_type_class = self->field_type_class;
   int element_size = native_slot_size(field_type);
   if (self->size == 0) {
-    return Qnil;
+    rb_raise(rb_eRangeError, "Pop from empty repeated field is not allowed.");
   }
   int index = self->size - 1;
   void* memory = (void *) (((uint8_t *)self->elements) + index * element_size);
@@ -256,6 +206,19 @@ VALUE RepeatedField_pop_one(VALUE _self) {
   return ret;
 }
 
+/*
+ * call-seq:
+ *     RepeatedField.insert(*args)
+ *
+ * Pushes each arg in turn onto the end of the repeated field.
+ */
+VALUE RepeatedField_insert(int argc, VALUE* argv, VALUE _self) {
+  for (int i = 0; i < argc; i++) {
+    RepeatedField_push(_self, argv[i]);
+  }
+  return Qnil;
+}
+
 /*
  * call-seq:
  *     RepeatedField.replace(list)
@@ -269,7 +232,7 @@ VALUE RepeatedField_replace(VALUE _self, VALUE list) {
   for (int i = 0; i < RARRAY_LEN(list); i++) {
     RepeatedField_push(_self, rb_ary_entry(list, i));
   }
-  return list;
+  return Qnil;
 }
 
 /*
@@ -281,7 +244,7 @@ VALUE RepeatedField_replace(VALUE _self, VALUE list) {
 VALUE RepeatedField_clear(VALUE _self) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
   self->size = 0;
-  return _self;
+  return Qnil;
 }
 
 /*
@@ -370,6 +333,7 @@ VALUE RepeatedField_to_ary(VALUE _self) {
   for (int i = 0; i < self->size; i++, off += elem_size) {
     void* mem = ((uint8_t *)self->elements) + off;
     VALUE elem = native_slot_get(field_type, self->field_type_class, mem);
+
     rb_ary_push(ary, elem);
   }
   return ary;
@@ -445,6 +409,19 @@ VALUE RepeatedField_hash(VALUE _self) {
   return hash;
 }
 
+/*
+ * call-seq:
+ *     RepeatedField.inspect => string
+ *
+ * Returns a string representing this repeated field's elements. It will be
+ * formated as "[<element>, <element>, ...]", with each element's string
+ * representation computed by its own #inspect method.
+ */
+VALUE RepeatedField_inspect(VALUE _self) {
+  VALUE self_ary = RepeatedField_to_ary(_self);
+  return rb_funcall(self_ary, rb_intern("inspect"), 0);
+}
+
 /*
  * call-seq:
  *     RepeatedField.+(other) => repeated field
@@ -481,30 +458,14 @@ VALUE RepeatedField_plus(VALUE _self, VALUE list) {
   return dupped;
 }
 
-/*
- * call-seq:
- *     RepeatedField.concat(other) => self
- *
- * concats the passed in array to self.  Returns a Ruby array.
- */
-VALUE RepeatedField_concat(VALUE _self, VALUE list) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  Check_Type(list, T_ARRAY);
-  for (int i = 0; i < RARRAY_LEN(list); i++) {
-    RepeatedField_push(_self, rb_ary_entry(list, i));
-  }
-  return _self;
-}
-
-
 void validate_type_class(upb_fieldtype_t type, VALUE klass) {
-  if (rb_ivar_get(klass, descriptor_instancevar_interned) == Qnil) {
+  if (rb_iv_get(klass, kDescriptorInstanceVar) == Qnil) {
     rb_raise(rb_eArgError,
              "Type class has no descriptor. Please pass a "
              "class or enum as returned by the DescriptorPool.");
   }
   if (type == UPB_TYPE_MESSAGE) {
-    VALUE desc = rb_ivar_get(klass, descriptor_instancevar_interned);
+    VALUE desc = rb_iv_get(klass, kDescriptorInstanceVar);
     if (!RB_TYPE_P(desc, T_DATA) || !RTYPEDDATA_P(desc) ||
         RTYPEDDATA_TYPE(desc) != &_Descriptor_type) {
       rb_raise(rb_eArgError, "Descriptor has an incorrect type.");
@@ -514,7 +475,7 @@ void validate_type_class(upb_fieldtype_t type, VALUE klass) {
                "Message class was not returned by the DescriptorPool.");
     }
   } else if (type == UPB_TYPE_ENUM) {
-    VALUE enumdesc = rb_ivar_get(klass, descriptor_instancevar_interned);
+    VALUE enumdesc = rb_iv_get(klass, kDescriptorInstanceVar);
     if (!RB_TYPE_P(enumdesc, T_DATA) || !RTYPEDDATA_P(enumdesc) ||
         RTYPEDDATA_TYPE(enumdesc) != &_EnumDescriptor_type) {
       rb_raise(rb_eArgError, "Descriptor has an incorrect type.");
@@ -616,23 +577,22 @@ void RepeatedField_register(VALUE module) {
   rb_define_method(klass, "initialize",
                    RepeatedField_init, -1);
   rb_define_method(klass, "each", RepeatedField_each, 0);
-  rb_define_method(klass, "[]", RepeatedField_index, -1);
-  rb_define_method(klass, "at", RepeatedField_index, -1);
+  rb_define_method(klass, "[]", RepeatedField_index, 1);
   rb_define_method(klass, "[]=", RepeatedField_index_set, 2);
   rb_define_method(klass, "push", RepeatedField_push, 1);
   rb_define_method(klass, "<<", RepeatedField_push, 1);
-  rb_define_private_method(klass, "pop_one", RepeatedField_pop_one, 0);
+  rb_define_method(klass, "pop", RepeatedField_pop, 0);
+  rb_define_method(klass, "insert", RepeatedField_insert, -1);
   rb_define_method(klass, "replace", RepeatedField_replace, 1);
   rb_define_method(klass, "clear", RepeatedField_clear, 0);
   rb_define_method(klass, "length", RepeatedField_length, 0);
-  rb_define_method(klass, "size", RepeatedField_length, 0);
   rb_define_method(klass, "dup", RepeatedField_dup, 0);
   // Also define #clone so that we don't inherit Object#clone.
   rb_define_method(klass, "clone", RepeatedField_dup, 0);
   rb_define_method(klass, "==", RepeatedField_eq, 1);
   rb_define_method(klass, "to_ary", RepeatedField_to_ary, 0);
   rb_define_method(klass, "hash", RepeatedField_hash, 0);
+  rb_define_method(klass, "inspect", RepeatedField_inspect, 0);
   rb_define_method(klass, "+", RepeatedField_plus, 1);
-  rb_define_method(klass, "concat", RepeatedField_concat, 1);
   rb_include_module(klass, rb_mEnumerable);
 }

data/ext/google/protobuf_c/storage.c

@@ -155,9 +155,7 @@ void native_slot_set_value_and_case(upb_fieldtype_t type, VALUE type_class,
       break;
     }
     case UPB_TYPE_MESSAGE: {
-      if (CLASS_OF(value) == CLASS_OF(Qnil)) {
-        value = Qnil;
-      } else if (CLASS_OF(value) != type_class) {
+      if (CLASS_OF(value) != type_class) {
         rb_raise(rb_eTypeError,
                  "Invalid type %s to assign to submessage field.",
                  rb_class2name(CLASS_OF(value)));
@@ -415,8 +413,7 @@ MessageLayout* create_layout(const upb_msgdef* msgdef) {
     // Align current offset up to |size| granularity.
     off = align_up_to(off, field_size);
     layout->fields[upb_fielddef_index(field)].offset = off;
-    layout->fields[upb_fielddef_index(field)].case_offset =
-        MESSAGE_FIELD_NO_CASE;
+    layout->fields[upb_fielddef_index(field)].case_offset = MESSAGE_FIELD_NO_CASE;
     off += field_size;
   }