summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-11-17 17:12:11 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2016-11-17 17:19:49 +0900
commit8438792d27bac2a236d5eef9824d36f815c0472f (patch)
tree65ef92685fddf3d4dd7ea1d637a4fcf3e50d1e8c /src
parent4cca8bac6bbdab02eba11e6527f793f2e9a5e75d (diff)
downloadmruby-8438792d27bac2a236d5eef9824d36f815c0472f.tar.gz
mruby-8438792d27bac2a236d5eef9824d36f815c0472f.zip
renamed "inline" to "istruct" to represent inline struct; ref #3251
Diffstat (limited to 'src')
-rw-r--r--src/class.c6
-rw-r--r--src/etc.c2
-rw-r--r--src/kernel.c6
-rw-r--r--src/object.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/class.c b/src/class.c
index 53354d02a..d02253c57 100644
--- a/src/class.c
+++ b/src/class.c
@@ -14,7 +14,7 @@
#include <mruby/variable.h>
#include <mruby/error.h>
#include <mruby/data.h>
-#include <mruby/inline.h>
+#include <mruby/istruct.h>
KHASH_DEFINE(mt, mrb_sym, struct RProc*, TRUE, kh_int_hash_func, kh_int_hash_equal)
@@ -712,11 +712,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
p = va_arg(ap, void**);
if (i < argc) {
ss = ARGV[arg_i];
- if (mrb_type(ss) != MRB_TT_INLINE)
+ if (mrb_type(ss) != MRB_TT_ISTRUCT)
{
mrb_raisef(mrb, E_TYPE_ERROR, "%S is not inline struct", ss);
}
- *p = mrb_inline_ptr(ss);
+ *p = mrb_istruct_ptr(ss);
arg_i++;
i++;
}
diff --git a/src/etc.c b/src/etc.c
index c89549da6..e0810d589 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -139,7 +139,7 @@ mrb_obj_id(mrb_value obj)
case MRB_TT_EXCEPTION:
case MRB_TT_FILE:
case MRB_TT_DATA:
- case MRB_TT_INLINE:
+ case MRB_TT_ISTRUCT:
default:
return MakeID(mrb_ptr(obj));
}
diff --git a/src/kernel.c b/src/kernel.c
index 4a4b6b414..8b1ef80a0 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -11,7 +11,7 @@
#include <mruby/string.h>
#include <mruby/variable.h>
#include <mruby/error.h>
-#include <mruby/inline.h>
+#include <mruby/istruct.h>
typedef enum {
NOEX_PUBLIC = 0x00,
@@ -302,8 +302,8 @@ init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj)
case MRB_TT_EXCEPTION:
mrb_iv_copy(mrb, dest, obj);
break;
- case MRB_TT_INLINE:
- mrb_inline_copy(dest, obj);
+ case MRB_TT_ISTRUCT:
+ mrb_istruct_copy(dest, obj);
break;
default:
diff --git a/src/object.c b/src/object.c
index af66d93d0..392432b0f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -348,7 +348,7 @@ mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const
{
mrb_value v;
- if (mrb_type(val) == type && type != MRB_TT_DATA && type != MRB_TT_INLINE) return val;
+ if (mrb_type(val) == type && type != MRB_TT_DATA && type != MRB_TT_ISTRUCT) return val;
v = convert_type(mrb, val, tname, method, FALSE);
if (mrb_nil_p(v) || mrb_type(v) != type) return mrb_nil_value();
return v;
@@ -390,7 +390,7 @@ mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t)
enum mrb_vtype xt;
xt = mrb_type(x);
- if ((xt != t) || (xt == MRB_TT_DATA) || (xt == MRB_TT_INLINE)) {
+ if ((xt != t) || (xt == MRB_TT_DATA) || (xt == MRB_TT_ISTRUCT)) {
while (type->type < MRB_TT_MAXDEFINE) {
if (type->type == t) {
const char *etype;