ruby2d 0.12.1 → 1.0.0

data/assets/platform/include/mruby/khash.h

@@ -0,0 +1,455 @@
+/**
+** @file mruby/khash.h - Hash for mruby
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_KHASH_H
+#define MRUBY_KHASH_H
+
+#include <string.h>
+
+#include <mruby.h>
+#include "common.h"
+
+/**
+ * khash definitions used in mruby's hash table.
+ */
+MRB_BEGIN_DECL
+
+typedef uint32_t khint_t;
+typedef khint_t khiter_t;
+
+#ifndef KHASH_INITIAL_SIZE
+# define KHASH_INITIAL_SIZE 32
+#endif
+#define KHASH_MIN_SIZE 8
+#define KHASH_SMALL_LIMIT 4
+
+#define KH_UPPER_BOUND(x) ((x) - ((x)>>3))   /* 87.5% load factor */
+
+/* extern uint8_t __m[]; */
+
+/* mask for flags */
+static const uint8_t __m_empty[]  = {0x02, 0x08, 0x20, 0x80};
+static const uint8_t __m_del[]    = {0x01, 0x04, 0x10, 0x40};
+static const uint8_t __m_either[] = {0x03, 0x0c, 0x30, 0xc0};
+
+
+#define __ac_isempty(ed_flag, i) (ed_flag[(i)/4]&__m_empty[(i)%4])
+#define __ac_isdel(ed_flag, i) (ed_flag[(i)/4]&__m_del[(i)%4])
+#define __ac_iseither(ed_flag, i) (ed_flag[(i)/4]&__m_either[(i)%4])
+#define khash_power2(v) do { \
+  v--;\
+  v |= v >> 1;\
+  v |= v >> 2;\
+  v |= v >> 4;\
+  v |= v >> 8;\
+  v |= v >> 16;\
+  v++;\
+} while (0)
+#define khash_mask(h) ((h)->n_buckets-1)
+#define khash_upper_bound(h) (KH_UPPER_BOUND((h)->n_buckets))
+
+/* BREAKING CHANGE: khash structure optimized for 50% memory reduction
+ *
+ * The structure now uses a single data pointer instead of separate keys,
+ * vals, and ed_flags pointers, reducing size from 32 to 16 bytes.
+ *
+ * MIGRATION REQUIRED for field access macros:
+ * - OLD: kh_key(h, x)      NEW: kh_key(typename, h, x)
+ * - OLD: kh_val(h, x)      NEW: kh_val(typename, h, x)
+ * - OLD: kh_exist(h, x)    NEW: kh_exist(typename, h, x)
+ * - OLD: KHASH_FOREACH()   NEW: KHASH_FOREACH(typename, ...)
+ *
+ * Function-style macros (kh_get, kh_put, etc.) remain unchanged.
+ */
+
+/* declare struct kh_xxx and kh_xxx_funcs
+
+   name: hash name
+   khkey_t: key data type
+   khval_t: value data type
+   kh_is_map: (0: hash set / 1: hash map)
+*/
+#define KHASH_DECLARE(name, khkey_t, khval_t, kh_is_map)                \
+  typedef struct kh_##name {                                            \
+    void *data;          /* Single allocation: [keys][vals][flags] */   \
+    khint_t n_buckets;   /* Number of buckets (power of 2) */           \
+    khint_t size;        /* Number of elements */                       \
+  } kh_##name##_t;                                                      \
+  /* Address calculation functions for optimized memory layout */       \
+  static inline khkey_t* kh_keys_##name(const kh_##name##_t *h) {       \
+    return (khkey_t*)(h)->data;                                         \
+  }                                                                     \
+  static inline khval_t* kh_vals_##name(const kh_##name##_t *h) {       \
+    return kh_is_map ?                                                  \
+      (khval_t*)((uint8_t*)(h)->data + sizeof(khkey_t) * (h)->n_buckets) : NULL; \
+  }                                                                     \
+  static inline uint8_t* kh_flags_##name(const kh_##name##_t *h) {      \
+    return (uint8_t*)(h)->data + sizeof(khkey_t) * (h)->n_buckets +     \
+           (kh_is_map ? sizeof(khval_t) * (h)->n_buckets : 0);          \
+  }                                                                     \
+  kh_##name##_t *kh_init_##name##_size(mrb_state *mrb, khint_t size);   \
+  kh_##name##_t *kh_init_##name(mrb_state *mrb);                        \
+  void kh_destroy_##name(mrb_state *mrb, kh_##name##_t *h);             \
+  void kh_clear_##name(mrb_state *mrb, kh_##name##_t *h);               \
+  khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key);           \
+  khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret); \
+  void kh_resize_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets); \
+  void kh_del_##name(mrb_state *mrb, kh_##name##_t *h, khint_t x);                \
+  kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h);                \
+  void kh_init_data_##name(mrb_state *mrb, kh_##name##_t *h, khint_t size);       \
+  void kh_destroy_data_##name(mrb_state *mrb, kh_##name##_t *h);                  \
+  void kh_replace_##name(mrb_state *mrb, kh_##name##_t *dst, const kh_##name##_t *src);
+
+/* define kh_xxx_funcs
+
+   name: hash name
+   khkey_t: key data type
+   khval_t: value data type
+   kh_is_map: (0: hash set / 1: hash map)
+   __hash_func: hash function
+   __hash_equal: hash comparison function
+*/
+#define KHASH_DEFINE(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+  mrb_noreturn void mrb_raise_nomemory(mrb_state *mrb);                 \
+  /* Internal helper functions */                                       \
+  static inline size_t kh__kv_size_##name(khint_t count) {              \
+    return sizeof(khkey_t) * count +                                    \
+           (kh_is_map ? sizeof(khval_t) * count : 0);                   \
+  }                                                                     \
+  static inline size_t kh__htable_size_##name(khint_t n_buckets) {      \
+    return kh__kv_size_##name(n_buckets) + n_buckets / 4;               \
+  }                                                                     \
+  static inline void kh__mark_occupied_##name(kh_##name##_t *h, khint_t i) { \
+    uint8_t *flags = kh_flags_##name(h);                                \
+    flags[i/4] &= ~__m_either[i%4];  /* Clear both empty and deleted bits */ \
+  }                                                                     \
+  static inline void kh__mark_deleted_##name(kh_##name##_t *h, khint_t i) {  \
+    uint8_t *flags = kh_flags_##name(h);                                \
+    flags[i/4] |= __m_del[i%4];      /* Set deleted bit */              \
+  }                                                                     \
+  static inline khint_t kh__key_idx_##name(mrb_state *mrb, khkey_t key, kh_##name##_t *h) { \
+    return __hash_func(mrb, key) & khash_mask(h);                       \
+  }                                                                     \
+  static inline khint_t kh__next_probe_##name(khint_t k, khint_t *step, kh_##name##_t *h) { \
+    return (k+(++(*step))) & khash_mask(h);                             \
+  }                                                                     \
+  static inline khint_t kh__insert_key_##name(kh_##name##_t *h, khint_t index, khkey_t key) { \
+    khkey_t *keys = kh_keys_##name(h);                                  \
+    keys[index] = key;                                                  \
+    kh__mark_occupied_##name(h, index);                                 \
+    h->size++;                                                          \
+    return index;                                                       \
+  }                                                                     \
+  static inline void kh__clear_flags_##name(kh_##name##_t *h, khint_t n_buckets) { \
+    memset(kh_flags_##name(h), 0xaa, n_buckets/4);                      \
+  }                                                                     \
+  static inline void kh__alloc_##name(mrb_state *mrb, kh_##name##_t *h) { \
+    khint_t sz = h->n_buckets;                                          \
+    uint8_t *p = (uint8_t*)mrb_malloc(mrb, kh__htable_size_##name(sz)); \
+    h->size = 0;                                                        \
+    h->data = p;  /* Single data pointer for optimized layout */        \
+    kh__clear_flags_##name(h, sz);                                      \
+  }                                                                     \
+  /* Small table optimization functions */                              \
+  static inline int kh__is_small_##name(const kh_##name##_t *h) {       \
+    return h->n_buckets == 0;  /* Small table marker */                 \
+  }                                                                     \
+  static inline khint_t kh__get_small_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key) { \
+    khkey_t *keys = kh_keys_##name(h);                                  \
+    for (khint_t i = 0; i < h->size; i++) {                             \
+      if (__hash_equal(mrb, keys[i], key)) return i;                    \
+    }                                                                   \
+    return h->size;  /* Not found - return end position */              \
+  }                                                                     \
+  static inline void kh__rebuild_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets) { \
+    kh_##name##_t hh;                                                   \
+    hh.data = NULL;                                                     \
+    hh.size = 0;                                                        \
+    kh_init_data_##name(mrb, &hh, new_n_buckets);                       \
+    /* Rehash from old 'h' to 'hh' */                                   \
+    khkey_t *old_keys = kh_keys_##name(h);                              \
+    khval_t *old_vals = kh_vals_##name(h);                              \
+    uint8_t *old_flags = kh__is_small_##name(h) ? NULL : kh_flags_##name(h); \
+    khint_t limit = old_flags ? h->n_buckets : h->size;                 \
+    for (khint_t i = 0; i < limit; i++) {                               \
+      if (old_flags && __ac_iseither(old_flags, i)) continue;           \
+      khint_t k = kh_put_##name(mrb, &hh, old_keys[i], NULL);           \
+      if (kh_is_map) {                                                  \
+        kh_val(name, &hh, k) = old_vals[i];                             \
+      }                                                                 \
+    }                                                                   \
+    /* Final Swap */                                                    \
+    mrb_free(mrb, h->data);                                             \
+    h->data = hh.data;                                                  \
+    h->n_buckets = hh.n_buckets;                                        \
+    h->size = hh.size;                                                  \
+  }                                                                     \
+  static inline khint_t kh__put_small_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret) { \
+    /* First check if key exists */                                     \
+    khint_t pos = kh__get_small_##name(mrb, h, key);                    \
+    if (pos < h->size) {                                                \
+      if (ret) *ret = 0;  /* Key exists */                              \
+      return pos;                                                       \
+    }                                                                   \
+    /* Check if we need to convert to hash table */                     \
+    if (h->size >= KHASH_SMALL_LIMIT) {                                 \
+      /* Convert from small table to hash table */                      \
+      kh__rebuild_##name(mrb, h, KHASH_MIN_SIZE);                       \
+      /* Now add the new key using regular hash table */                \
+      return kh_put_##name(mrb, h, key, ret);                           \
+    }                                                                   \
+    /* Add new element to small table */                                \
+    khkey_t *keys = kh_keys_##name(h);                                  \
+    keys[h->size] = key;                                                \
+    h->size++;                                                          \
+    if (ret) *ret = 1;  /* New key */                                   \
+    return h->size - 1;                                                 \
+  }                                                                     \
+  kh_##name##_t *kh_init_##name##_size(mrb_state *mrb, khint_t size) {  \
+    kh_##name##_t *h = (kh_##name##_t*)mrb_calloc(mrb, 1, sizeof(kh_##name##_t)); \
+    kh_init_data_##name(mrb, h, size);                                  \
+    return h;                                                           \
+  }                                                                     \
+  kh_##name##_t *kh_init_##name(mrb_state *mrb) {                       \
+    return kh_init_##name##_size(mrb, KHASH_INITIAL_SIZE);              \
+  }                                                                     \
+  void kh_destroy_##name(mrb_state *mrb, kh_##name##_t *h)              \
+  {                                                                     \
+    kh_destroy_data_##name(mrb, h);                                     \
+    mrb_free(mrb, h);                                                   \
+  }                                                                     \
+  void kh_clear_##name(mrb_state *mrb, kh_##name##_t *h)                \
+  {                                                                     \
+    (void)mrb;                                                          \
+    if (h && h->data) {                                                 \
+      kh__clear_flags_##name(h, h->n_buckets);                          \
+      h->size = 0;                                                      \
+    }                                                                   \
+  }                                                                     \
+  khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key)  \
+  {                                                                     \
+    if (kh__is_small_##name(h)) {                                       \
+      return kh__get_small_##name(mrb, h, key);                         \
+    }                                                                   \
+    /* Cache calculated pointers for performance */                     \
+    khkey_t *keys = kh_keys_##name(h);                                  \
+    uint8_t *ed_flags = kh_flags_##name(h);                             \
+    khint_t k = kh__key_idx_##name(mrb, key, h), step = 0;              \
+    (void)mrb;                                                          \
+    while (!__ac_isempty(ed_flags, k)) {                                \
+      if (!__ac_isdel(ed_flags, k)) {                                   \
+        if (__hash_equal(mrb, keys[k], key)) return k;                  \
+      }                                                                 \
+      k = kh__next_probe_##name(k, &step, h);                           \
+    }                                                                   \
+    return kh_end(h);                                                   \
+  }                                                                     \
+  void kh_resize_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets) \
+  {                                                                     \
+    if (new_n_buckets < KHASH_MIN_SIZE)                                 \
+      new_n_buckets = KHASH_MIN_SIZE;                                   \
+    khash_power2(new_n_buckets);                                        \
+    kh__rebuild_##name(mrb, h, new_n_buckets);                          \
+  }                                                                     \
+  khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret) \
+  {                                                                     \
+    if (kh__is_small_##name(h)) {                                       \
+      return kh__put_small_##name(mrb, h, key, ret);                    \
+    }                                                                   \
+    khint_t k, del_k, step = 0;                                         \
+    if (h->size >= khash_upper_bound(h)) {                              \
+      kh_resize_##name(mrb, h, h->n_buckets*2);                         \
+    }                                                                   \
+    /* Cache calculated pointers for performance */                     \
+    khkey_t *keys = kh_keys_##name(h);                                  \
+    uint8_t *ed_flags = kh_flags_##name(h);                             \
+    k = kh__key_idx_##name(mrb, key, h);                                \
+    del_k = kh_end(h);                                                  \
+    while (!__ac_isempty(ed_flags, k)) {                                \
+      if (!__ac_isdel(ed_flags, k)) {                                   \
+        if (__hash_equal(mrb, keys[k], key)) {                          \
+          if (ret) *ret = 0;                                            \
+          return k;                                                     \
+        }                                                               \
+      }                                                                 \
+      else if (del_k == kh_end(h)) {                                    \
+        del_k = k;                                                      \
+      }                                                                 \
+      k = kh__next_probe_##name(k, &step, h);                           \
+    }                                                                   \
+    if (del_k != kh_end(h)) {                                           \
+      /* put at del */                                                  \
+      kh__insert_key_##name(h, del_k, key);                             \
+      if (ret) *ret = 2;                                                \
+      return del_k;                                                     \
+    }                                                                   \
+    else {                                                              \
+      /* put at empty */                                                \
+      kh__insert_key_##name(h, k, key);                                 \
+      if (ret) *ret = 1;                                                \
+      return k;                                                         \
+    }                                                                   \
+  }                                                                     \
+  void kh_del_##name(mrb_state *mrb, kh_##name##_t *h, khint_t x)       \
+  {                                                                     \
+    (void)mrb;                                                          \
+    if (kh__is_small_##name(h)) {                                       \
+      /* Small table deletion: shift elements down */                   \
+      mrb_assert(x < h->size);                                          \
+      khkey_t *keys = kh_keys_##name(h);                                \
+      khval_t *vals = kh_vals_##name(h);                                \
+      for (khint_t i = x; i < h->size - 1; i++) {                       \
+        keys[i] = keys[i + 1];                                          \
+        if (kh_is_map) vals[i] = vals[i + 1];                           \
+      }                                                                 \
+      h->size--;                                                        \
+    }                                                                   \
+    else {                                                              \
+      /* Regular hash table deletion */                                 \
+      mrb_assert(x != h->n_buckets && !__ac_iseither(kh_flags_##name(h), x)); \
+      kh__mark_deleted_##name(h, x);                                    \
+      h->size--;                                                        \
+    }                                                                   \
+  }                                                                     \
+  kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h)       \
+  {                                                                     \
+    kh_##name##_t *h2 = (kh_##name##_t*)mrb_calloc(mrb, 1, sizeof(kh_##name##_t)); \
+    kh_replace_##name(mrb, h2, h);                                      \
+    return h2;                                                          \
+  }                                                                     \
+  void kh_init_data_##name(mrb_state *mrb, kh_##name##_t *h, khint_t size) { \
+    if (size <= KHASH_SMALL_LIMIT) {                                    \
+      /* Start as small table */                                        \
+      h->n_buckets = 0;  /* Small table marker */                       \
+      h->data = mrb_malloc(mrb, kh__kv_size_##name(KHASH_SMALL_LIMIT)); \
+      h->size = 0;                                                      \
+    }                                                                   \
+    else {                                                              \
+      /* Start as regular hash table */                                 \
+      if (size < KHASH_MIN_SIZE)                                        \
+        size = KHASH_MIN_SIZE;                                          \
+      khash_power2(size);                                               \
+      h->n_buckets = size;                                              \
+      kh__alloc_##name(mrb, h);                                         \
+    }                                                                   \
+  }                                                                     \
+  void kh_destroy_data_##name(mrb_state *mrb, kh_##name##_t *h)         \
+  {                                                                     \
+    if (h && h->data) {                                                 \
+      mrb_free(mrb, h->data);  /* Free only the data allocation */      \
+      h->data = NULL;                                                   \
+    }                                                                   \
+  }                                                                     \
+  void kh_replace_##name(mrb_state *mrb, kh_##name##_t *dst, const kh_##name##_t *src) \
+  {                                                                     \
+    if (!src || (src->n_buckets == 0 && src->size == 0)) {              \
+      /* Empty source */                                                \
+      kh_destroy_data_##name(mrb, dst);                                 \
+      dst->data = NULL;                                                 \
+      dst->n_buckets = 0;                                               \
+      dst->size = 0;                                                    \
+    }                                                                   \
+    else if (src->n_buckets == 0) {                                     \
+      /* Small table case */                                            \
+      size_t data_size = kh__kv_size_##name(KHASH_SMALL_LIMIT);         \
+      dst->data = mrb_realloc(mrb, dst->data, data_size);               \
+      dst->size = src->size;                                            \
+      dst->n_buckets = 0;                                               \
+      /* Copy only the used portion of keys and values */               \
+      size_t copy_size = kh__kv_size_##name(src->size);                 \
+      memcpy(dst->data, src->data, copy_size);                          \
+    }                                                                   \
+    else {                                                              \
+      /* Regular hash table case */                                     \
+      size_t data_size = kh__htable_size_##name(src->n_buckets);        \
+      dst->data = mrb_realloc(mrb, dst->data, data_size);               \
+      dst->size = src->size;                                            \
+      dst->n_buckets = src->n_buckets;                                  \
+      /* Copy the entire data block: [keys][vals][flags] */             \
+      memcpy(dst->data, src->data, data_size);                          \
+    }                                                                   \
+  }
+
+
+#define khash_t(name) kh_##name##_t
+
+#define kh_init_size(name,mrb,size) kh_init_##name##_size(mrb,size)
+#define kh_init(name,mrb) kh_init_##name(mrb)
+#define kh_destroy(name, mrb, h) kh_destroy_##name(mrb, h)
+#define kh_clear(name, mrb, h) kh_clear_##name(mrb, h)
+#define kh_resize(name, mrb, h, s) kh_resize_##name(mrb, h, s)
+#define kh_put(name, mrb, h, k) kh_put_##name(mrb, h, k, NULL)
+#define kh_put2(name, mrb, h, k, r) kh_put_##name(mrb, h, k, r)
+#define kh_get(name, mrb, h, k) kh_get_##name(mrb, h, k)
+#define kh_del(name, mrb, h, k) kh_del_##name(mrb, h, k)
+#define kh_copy(name, mrb, h) kh_copy_##name(mrb, h)
+#define kh_init_data(name, mrb, h, size) kh_init_data_##name(mrb, h, size)
+#define kh_destroy_data(name, mrb, h) kh_destroy_data_##name(mrb, h)
+#define kh_replace(name, mrb, dst, src) kh_replace_##name(mrb, dst, src)
+
+/* BREAKING CHANGE: Field access macros now require type name as first parameter
+ * The macros keep their familiar names but now need the hash type name.
+ *
+ * MIGRATION: Add type name as first parameter:
+ *   kh_key(h, x)      -> kh_key(typename, h, x)
+ *   kh_val(h, x)      -> kh_val(typename, h, x)
+ *   kh_exist(h, x)    -> kh_exist(typename, h, x)
+ *   kh_value(h, x)    -> kh_value(typename, h, x)
+ */
+
+/* Type-aware access macros - same names, now with type parameter */
+#define kh_exist(name, h, x) ((h)->n_buckets == 0 ? ((x) < (h)->size) : (!__ac_iseither(kh_flags_##name(h), (x))))
+#define kh_key(name, h, x) (kh_keys_##name(h)[x])
+#define kh_val(name, h, x) (kh_vals_##name(h)[x])
+#define kh_value(name, h, x) (kh_vals_##name(h)[x])
+#define kh_begin(h) (khint_t)(0)
+#define kh_end(h) ((h)->n_buckets == 0 ? (h)->size : (h)->n_buckets)
+#define kh_is_end(h, i) ((i) >= kh_end(h))
+#define kh_size(h) ((h)->size)
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+#define kh_int_hash_func(mrb,key) mrb_int_hash_func(mrb,key)
+#define kh_int_hash_equal(mrb,a, b) (a == b)
+#define kh_int64_hash_func(mrb,key) (khint_t)((key)>>33^(key)^(key)<<11)
+#define kh_int64_hash_equal(mrb,a, b) (a == b)
+static inline khint_t __ac_X31_hash_string(const char *s)
+{
+    khint_t h = *s;
+    if (h) for (++s; *s; ++s) h = (h << 5) - h + *s;
+    return h;
+}
+#define kh_str_hash_func(mrb,key) __ac_X31_hash_string(key)
+#define kh_str_hash_equal(mrb,a, b) (strcmp(a, b) == 0)
+
+typedef const char *kh_cstr_t;
+
+MRB_END_DECL
+
+/**
+ * Macro for iterating over all elements in a khash.
+ *
+ * Usage:
+ *   KHASH_FOREACH(typename, kh, k) {
+ *     // k is the khiter_t iterator
+ *     // Access the key with kh_key(typename, kh, k)
+ *     // Access the value with kh_val(typename, kh, k) if applicable
+ *     // Your code here
+ *   }
+ *
+ * @param name The hash type name
+ * @param kh   The khash to iterate over
+ * @param k    The name to use for the khiter_t iterator variable
+ */
+/* BREAKING CHANGE: KHASH_FOREACH now requires type name as first parameter
+ * OLD: KHASH_FOREACH(mrb, kh, k)
+ * NEW: KHASH_FOREACH(name, kh, k)
+ */
+#define KHASH_FOREACH(name, kh, k) \
+  if (kh) \
+    for (khiter_t k = kh_begin(kh); !kh_is_end(kh, k); k++) \
+      if (kh_exist(name, kh, k))
+
+#endif  /* MRUBY_KHASH_H */

data/assets/platform/include/mruby/mempool.h

@@ -0,0 +1,19 @@
+/*
+** mempool.h - memory pool
+**
+** See Copyright Notice in mruby.h
+*/
+
+/* memory pool implementation */
+typedef struct mempool mempool;
+MRB_API struct mempool* mempool_open(void);
+MRB_API void mempool_close(struct mempool*);
+MRB_API void* mempool_alloc(struct mempool*, size_t);
+MRB_API void* mempool_realloc(struct mempool*, void*, size_t oldlen, size_t newlen);
+
+/* compatibility layer */
+typedef struct mempool mrb_mempool;
+#define mrb_mempool_open(m) mempool_open()
+#define mrb_mempool_close(m) mempool_close(m)
+#define mrb_mempool_alloc(m, size) mempool_alloc((m),(size))
+#define mrb_mempool_realloc(m, ptr, oldlen, newlen) mempool_realloc((m),(ptr),(oldlen),(newlen))

data/assets/{include → platform/include}/mruby/numeric.h

@@ -30,16 +30,17 @@ MRB_BEGIN_DECL
 #endif
 #endif
 
-MRB_API mrb_value mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y);
-MRB_API mrb_value mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y);
+/* utility functions */
+MRB_API mrb_value mrb_num_add(mrb_state *mrb, mrb_value x, mrb_value y);
+MRB_API mrb_value mrb_num_sub(mrb_state *mrb, mrb_value x, mrb_value y);
 MRB_API mrb_value mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+/* obsolete old names */
+#define mrb_num_plus(mrb, x, y) mrb_num_add(mrb, x, y)
+#define mrb_num_minus(mrb, x, y) mrb_num_sub(mrb, x, y)
 
 MRB_API mrb_value mrb_integer_to_str(mrb_state *mrb, mrb_value x, mrb_int base);
 MRB_API char *mrb_int_to_cstr(char *buf, size_t len, mrb_int n, mrb_int base);
 
-/* internal function(s) */
-mrb_int mrb_div_int(mrb_state *mrb, mrb_int x, mrb_int y);
-
 /* obsolete function(s); will be removed */
 #define mrb_fixnum_to_str(mrb, x, base) mrb_integer_to_str(mrb, x, base)
 
@@ -118,12 +119,12 @@ mrb_int_mul_overflow(mrb_int a, mrb_int b, mrb_int *c)
   *c = (mrb_int)n;
   return n > MRB_INT_MAX || n < MRB_INT_MIN;
 #else /* MRB_INT64 */
+  *c = a * b;
   if (a > 0 && b > 0 && a > MRB_INT_MAX / b) return TRUE;
   if (a < 0 && b > 0 && a < MRB_INT_MIN / b) return TRUE;
   if (a > 0 && b < 0 && b < MRB_INT_MIN / a) return TRUE;
   if (a < 0 && b < 0 && (a <= MRB_INT_MIN || b <= MRB_INT_MIN || -a > MRB_INT_MAX / -b))
     return TRUE;
-  *c = a * b;
   return FALSE;
 #endif
 }
@@ -166,10 +167,6 @@ mrb_float mrb_div_float(mrb_float x, mrb_float y);
 mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value x, const char *fmt);
 int mrb_format_float(mrb_float f, char *buf, size_t buf_size, char fmt, int prec, char sign);
 
-/* obsolete functions; will be removed */
-#define mrb_flo_to_fixnum(mrb, val) mrb_float_to_integer(mrb, val)
-#define mrb_to_flo(mrb, x) mrb_as_float(mrb, x)
-
 #endif /* MRB_NO_FLOAT */
 
 MRB_END_DECL

data/assets/platform/include/mruby/object.h

@@ -0,0 +1,51 @@
+/**
+** @file mruby/object.h - mruby object definition
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_OBJECT_H
+#define MRUBY_OBJECT_H
+
+#define MRB_OBJECT_HEADER \
+  struct RClass *c;       \
+  enum mrb_vtype tt:8;    \
+  unsigned int gc_color:3; \
+  unsigned int frozen:1;  \
+  uint32_t flags:20
+
+#define MRB_FLAG_TEST(obj, flag) ((obj)->flags & (flag))
+
+struct RBasic {
+  MRB_OBJECT_HEADER;
+};
+#define mrb_basic_ptr(v) ((struct RBasic*)(mrb_ptr(v)))
+
+#define MRB_OBJ_IS_FROZEN 1
+#define mrb_frozen_p(o) ((o)->frozen)
+
+/* Object shape flag -- when set, obj->iv is shaped, not iv_tbl* */
+/* Bit 5: avoids conflict with MRB_INSTANCE_TT_MASK (bits 0-4);
+   but conflicts with MRB_HASH_AR_EA_N_USED on 32-bit, so the
+   predicate must also check tt to avoid false positives */
+#define MRB_FL_OBJ_SHAPED (1 << 5)
+#define MRB_OBJ_SHAPED_P(o) ((o)->tt == MRB_TT_OBJECT && ((o)->flags & MRB_FL_OBJ_SHAPED))
+
+struct RObject {
+  MRB_OBJECT_HEADER;
+  struct iv_tbl *iv;
+};
+#define mrb_obj_ptr(v)   ((struct RObject*)(mrb_ptr(v)))
+
+#define mrb_special_const_p(x) mrb_immediate_p(x)
+
+struct RFiber {
+  MRB_OBJECT_HEADER;
+  struct mrb_context *cxt;
+};
+
+#define mrb_static_assert_object_size(st) \
+  mrb_static_assert(sizeof(st) <= sizeof(void*) * 5, \
+                    #st " size must be within 5 words")
+
+#endif  /* MRUBY_OBJECT_H */

data/assets/{include → platform/include}/mruby/opcode.h

@@ -9,20 +9,20 @@
 
 enum mrb_insn {
 #define OPCODE(x,_) OP_ ## x,
-#include "mruby/ops.h"
+#include <mruby/ops.h>
 #undef OPCODE
 };
 
+/* backward compatibility aliases */
+#define OP_LOADT OP_LOADTRUE
+#define OP_LOADF OP_LOADFALSE
+
 #define OP_L_STRICT  1
 #define OP_L_CAPTURE 2
 #define OP_L_METHOD  OP_L_STRICT
 #define OP_L_LAMBDA  (OP_L_STRICT|OP_L_CAPTURE)
 #define OP_L_BLOCK   OP_L_CAPTURE
 
-#define OP_R_NORMAL 0
-#define OP_R_BREAK  1
-#define OP_R_RETURN 2
-
 #define PEEK_B(pc) (*(pc))
 #define PEEK_S(pc) ((pc)[0]<<8|(pc)[1])
 #define PEEK_W(pc) ((pc)[0]<<16|(pc)[1]<<8|(pc)[2])