diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
| commit | e69a13a20e0f145de644d1e229280713fe91cf6f (patch) | |
| tree | 26503e78864d41062aaa3c53c1f55cc72cf50993 /mrbgems/mruby-struct/src | |
| parent | 6954153fa06630aa9aaf642f8f1221cddb01793a (diff) | |
| parent | f719b0e7fff2d4754d91826b69d142c66635c3cf (diff) | |
| download | mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.tar.gz mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.zip | |
resolve conflict
Diffstat (limited to 'mrbgems/mruby-struct/src')
| -rw-r--r-- | mrbgems/mruby-struct/src/struct.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index 082843f12..da3200fb9 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -66,7 +66,8 @@ mrb_struct_members(mrb_state *mrb, mrb_value s) mrb_value members = mrb_struct_s_members(mrb, mrb_obj_value(mrb_obj_class(mrb, s))); if (!strcmp(mrb_class_name(mrb, mrb_obj_class(mrb, s)), "Struct")) { if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) { - mrb_raisef(mrb, E_TYPE_ERROR, "struct size differs (%ld required %ld given)", + mrb_raisef(mrb, E_TYPE_ERROR, + "struct size differs (%" PRIdMRB_INT " required %" PRIdMRB_INT " given)", RARRAY_LEN(members), RSTRUCT_LEN(s)); } } @@ -578,10 +579,12 @@ mrb_struct_aref_n(mrb_state *mrb, mrb_value s, mrb_value idx) i = mrb_fixnum(idx); if (i < 0) i = RSTRUCT_LEN(s) + i; if (i < 0) - mrb_raisef(mrb, E_INDEX_ERROR, "offset %ld too small for struct(size:%ld)", + mrb_raisef(mrb, E_INDEX_ERROR, + "offset %" PRIdMRB_INT " too small for struct(size:%" PRIdMRB_INT ")", i, RSTRUCT_LEN(s)); if (RSTRUCT_LEN(s) <= i) - mrb_raisef(mrb, E_INDEX_ERROR, "offset %ld too large for struct(size:%ld)", + mrb_raisef(mrb, E_INDEX_ERROR, + "offset %" PRIdMRB_INT " too large for struct(size:%" PRIdMRB_INT ")", i, RSTRUCT_LEN(s)); return RSTRUCT_PTR(s)[i]; } @@ -604,7 +607,8 @@ mrb_struct_aset_id(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val) members = mrb_struct_members(mrb, s); len = RARRAY_LEN(members); if (RSTRUCT_LEN(s) != len) { - mrb_raisef(mrb, E_TYPE_ERROR, "struct size differs (%ld required %ld given)", + mrb_raisef(mrb, E_TYPE_ERROR, + "struct size differs (%" PRIdMRB_INT " required %" PRIdMRB_INT " given)", len, RSTRUCT_LEN(s)); } ptr = RSTRUCT_PTR(s); @@ -657,11 +661,13 @@ mrb_struct_aset(mrb_state *mrb, mrb_value s) i = mrb_fixnum(idx); if (i < 0) i = RSTRUCT_LEN(s) + i; if (i < 0) { - mrb_raisef(mrb, E_INDEX_ERROR, "offset %ld too small for struct(size:%ld)", + mrb_raisef(mrb, E_INDEX_ERROR, + "offset %" PRIdMRB_INT " too small for struct(size:%" PRIdMRB_INT ")", i, RSTRUCT_LEN(s)); } if (RSTRUCT_LEN(s) <= i) { - mrb_raisef(mrb, E_INDEX_ERROR, "offset %ld too large for struct(size:%ld)", + mrb_raisef(mrb, E_INDEX_ERROR, + "offset %" PRIdMRB_INT " too large for struct(size:%" PRIdMRB_INT ")", i, RSTRUCT_LEN(s)); } return RSTRUCT_PTR(s)[i] = val; |