summaryrefslogtreecommitdiffhomepage
path: root/include
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 /include
parent4cca8bac6bbdab02eba11e6527f793f2e9a5e75d (diff)
downloadmruby-8438792d27bac2a236d5eef9824d36f815c0472f.tar.gz
mruby-8438792d27bac2a236d5eef9824d36f815c0472f.zip
renamed "inline" to "istruct" to represent inline struct; ref #3251
Diffstat (limited to 'include')
-rw-r--r--include/mruby/inline.h47
-rw-r--r--include/mruby/istruct.h47
-rw-r--r--include/mruby/value.h2
3 files changed, 48 insertions, 48 deletions
diff --git a/include/mruby/inline.h b/include/mruby/inline.h
deleted file mode 100644
index e773aa118..000000000
--- a/include/mruby/inline.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-** mruby/inline.h - Inline structures
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_INLINE_H
-#define MRUBY_INLINE_H
-
-#include "common.h"
-#include <string.h>
-
-/**
- * Inline structures that fit in RVALUE
- *
- * They cannot have finalizer, and cannot have instance variables.
- */
-MRB_BEGIN_DECL
-
-#define INLINE_DATA_SIZE (sizeof(void*) * 3)
-
-struct RInline {
- MRB_OBJECT_HEADER;
- char inline_data[INLINE_DATA_SIZE];
-};
-
-#define RINLINE(obj) ((struct RInline*)(mrb_ptr(obj)))
-#define INLINE_PTR(obj) (RINLINE(obj)->inline_data)
-
-MRB_INLINE mrb_int mrb_inline_size()
-{
- return INLINE_DATA_SIZE;
-}
-
-MRB_INLINE void* mrb_inline_ptr(mrb_value object)
-{
- return INLINE_PTR(object);
-}
-
-MRB_INLINE void mrb_inline_copy(mrb_value dest, mrb_value src)
-{
- memcpy(INLINE_PTR(dest), INLINE_PTR(src), INLINE_DATA_SIZE);
-}
-
-MRB_END_DECL
-
-#endif /* MRUBY_INLINE_H */
diff --git a/include/mruby/istruct.h b/include/mruby/istruct.h
new file mode 100644
index 000000000..293a13788
--- /dev/null
+++ b/include/mruby/istruct.h
@@ -0,0 +1,47 @@
+/*
+** mruby/instruct.h - Inline structures
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_ISTRUCT_H
+#define MRUBY_ISTRUCT_H
+
+#include "common.h"
+#include <string.h>
+
+/**
+ * Inline structures that fit in RVALUE
+ *
+ * They cannot have finalizer, and cannot have instance variables.
+ */
+MRB_BEGIN_DECL
+
+#define ISTRUCT_DATA_SIZE (sizeof(void*) * 3)
+
+struct RIstruct {
+ MRB_OBJECT_HEADER;
+ char inline_data[ISTRUCT_DATA_SIZE];
+};
+
+#define RISTRUCT(obj) ((struct RIstruct*)(mrb_ptr(obj)))
+#define ISTRUCT_PTR(obj) (RISTRUCT(obj)->inline_data)
+
+MRB_INLINE mrb_int mrb_istruct_size()
+{
+ return ISTRUCT_DATA_SIZE;
+}
+
+MRB_INLINE void* mrb_istruct_ptr(mrb_value object)
+{
+ return ISTRUCT_PTR(object);
+}
+
+MRB_INLINE void mrb_istruct_copy(mrb_value dest, mrb_value src)
+{
+ memcpy(ISTRUCT_PTR(dest), ISTRUCT_PTR(src), ISTRUCT_DATA_SIZE);
+}
+
+MRB_END_DECL
+
+#endif /* MRUBY_ISTRUCT_H */
diff --git a/include/mruby/value.h b/include/mruby/value.h
index eb3f931e1..6b29ab273 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -116,7 +116,7 @@ enum mrb_vtype {
MRB_TT_ENV, /* 20 */
MRB_TT_DATA, /* 21 */
MRB_TT_FIBER, /* 22 */
- MRB_TT_INLINE, /* 23 */
+ MRB_TT_ISTRUCT, /* 23 */
MRB_TT_MAXDEFINE /* 24 */
};