admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2548 from take-cheeze/mrb_data_init

Browse Source 
Add API `mrb_data_init` to initialize `MRB_TT_DATA` tagged instance.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-08-20 23:42:05 +09:00
parent ae28365341 b3d0585fe5
commit 4d72d65db1
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/data.h
+8
View File
@@ -51,6 +51,14 @@ MRB_API void *mrb_data_check_get_ptr(mrb_state *mrb, mrb_value, const mrb_data_t
*(void**)&sval = mrb_data_get_ptr(mrb, obj, type); \
} while (0)
static inline void
mrb_data_init(mrb_value v, void *ptr, const mrb_data_type *type)
{
mrb_assert(mrb_type(v) == MRB_TT_DATA);
DATA_PTR(v) = ptr;
DATA_TYPE(v) = type;
}
#if defined(__cplusplus)
} /* extern "C" { */
#endif
mrbgems/mruby-random/src/random.c
+2 -4
View File
@@ -129,9 +129,7 @@ mrb_random_init(mrb_state *mrb, mrb_value self)
if (t) {
mrb_free(mrb, t);
}
DATA_TYPE(self) = &mt_state_type;
DATA_PTR(self) = NULL;
mrb_data_init(self, NULL, &mt_state_type);
t = (mt_state *)mrb_malloc(mrb, sizeof(mt_state));
t->mti = N + 1;
@@ -147,7 +145,7 @@ mrb_random_init(mrb_state *mrb, mrb_value self)
t->seed = mrb_fixnum(seed);
}
DATA_PTR(self) = t;
mrb_data_init(self, t, &mt_state_type);
return self;
}
mrbgems/mruby-time/src/time.c
+3 -5
View File
@@ -561,8 +561,7 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
if (tm) {
mrb_free(mrb, tm);
}
DATA_TYPE(self) = &mrb_time_type;
DATA_PTR(self) = NULL;
mrb_data_init(self, NULL, &mrb_time_type);
n = mrb_get_args(mrb, "|iiiiiii",
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
@@ -572,7 +571,7 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
else {
tm = time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL);
}
DATA_PTR(self) = tm;
mrb_data_init(self, tm, &mrb_time_type);
return self;
}
@@ -589,8 +588,7 @@ mrb_time_initialize_copy(mrb_state *mrb, mrb_value copy)
mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
}
if (!DATA_PTR(copy)) {
DATA_PTR(copy) = mrb_malloc(mrb, sizeof(struct mrb_time));
DATA_TYPE(copy) = &mrb_time_type;
mrb_data_init(copy, mrb_malloc(mrb, sizeof(struct mrb_time)), &mrb_time_type);
}
*(struct mrb_time *)DATA_PTR(copy) = *(struct mrb_time *)DATA_PTR(src);
return copy;