diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-05-18 10:58:02 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-05-18 10:58:02 -0700 |
| commit | 545527e8cfedc43dc6b862af23691affcb1285f7 (patch) | |
| tree | 9b71a521bc78bafd60d26396d2edcaf605c0e1fc /ruby/ext | |
| parent | 32e3d7a1098fa09a7773a90d7c8bf175c73fee23 (diff) | |
Ruby oneofs: return default instead of nil for unset fields.
Diffstat (limited to 'ruby/ext')
| -rw-r--r-- | ruby/ext/google/protobuf_c/storage.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/storage.c b/ruby/ext/google/protobuf_c/storage.c index b1f65f41..5dae5aec 100644 --- a/ruby/ext/google/protobuf_c/storage.c +++ b/ruby/ext/google/protobuf_c/storage.c @@ -57,6 +57,28 @@ size_t native_slot_size(upb_fieldtype_t type) { } } +VALUE value_from_default(const upb_fielddef *field) { + switch (upb_fielddef_type(field)) { + case UPB_TYPE_FLOAT: return DBL2NUM(upb_fielddef_defaultfloat(field)); + case UPB_TYPE_DOUBLE: return DBL2NUM(upb_fielddef_defaultdouble(field)); + case UPB_TYPE_BOOL: + return upb_fielddef_defaultbool(field) ? Qtrue : Qfalse; + case UPB_TYPE_MESSAGE: return Qnil; + case UPB_TYPE_ENUM: return INT2NUM(upb_fielddef_defaultint32(field)); + case UPB_TYPE_INT32: return INT2NUM(upb_fielddef_defaultint32(field)); + case UPB_TYPE_INT64: return LL2NUM(upb_fielddef_defaultint64(field));; + case UPB_TYPE_UINT32: return UINT2NUM(upb_fielddef_defaultuint32(field)); + case UPB_TYPE_UINT64: return ULL2NUM(upb_fielddef_defaultuint64(field)); + case UPB_TYPE_STRING: + case UPB_TYPE_BYTES: { + size_t size; + const char *str = upb_fielddef_defaultstr(field, &size); + return rb_str_new(str, size); + } + default: return Qnil; + } +} + static bool is_ruby_num(VALUE value) { return (TYPE(value) == T_FLOAT || TYPE(value) == T_FIXNUM || @@ -537,7 +559,7 @@ VALUE layout_get(MessageLayout* layout, if (upb_fielddef_containingoneof(field)) { if (*oneof_case != upb_fielddef_number(field)) { - return Qnil; + return value_from_default(field); } return native_slot_get(upb_fielddef_type(field), field_type_class(field), |