script_core 0.1.1 → 0.2.0

data/ext/enterprise_script_service/mruby/mrbgems/mruby-symbol-ext/src/symbol.c

@@ -46,10 +46,10 @@ mrb_sym_length(mrb_state *mrb, mrb_value self)
   mrb_int len;
 #ifdef MRB_UTF8_STRING
   mrb_int byte_len;
-  const char *name = mrb_sym2name_len(mrb, mrb_symbol(self), &byte_len);
+  const char *name = mrb_sym_name_len(mrb, mrb_symbol(self), &byte_len);
   len = mrb_utf8_len(name, byte_len);
 #else
-  mrb_sym2name_len(mrb, mrb_symbol(self), &len);
+  mrb_sym_name_len(mrb, mrb_symbol(self), &len);
 #endif
   return mrb_fixnum_value(len);
 }

data/ext/enterprise_script_service/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb

@@ -14,7 +14,7 @@
   assert("Symbol##{n}") do
     assert_equal 5, :hello.__send__(n)
     assert_equal 4, :"aA\0b".__send__(n)
-    if "あ".size == 1  # enable MRB_UTF8_STRING?
+    if __ENCODING__ == "UTF-8"
       assert_equal 8, :"こんにちは世界!".__send__(n)
       assert_equal 4, :"aあ\0b".__send__(n)
     else

data/ext/enterprise_script_service/mruby/mrbgems/mruby-test/driver.c

@@ -21,6 +21,7 @@
 extern const uint8_t mrbtest_assert_irep[];
 
 void mrbgemtest_init(mrb_state* mrb);
+void mrb_init_test_vformat(mrb_state* mrb);
 
 /* Print a short remark for the user */
 static void
@@ -51,9 +52,10 @@ t_print(mrb_state *mrb, mrb_value self)
 {
   mrb_value *argv;
   mrb_int argc;
+  mrb_int i;
 
   mrb_get_args(mrb, "*!", &argv, &argc);
-  for (mrb_int i = 0; i < argc; ++i) {
+  for (i = 0; i < argc; ++i) {
     mrb_value s = mrb_obj_as_string(mrb, argv[i]);
     fwrite(RSTRING_PTR(s), RSTRING_LEN(s), 1, stdout);
   }
@@ -62,6 +64,151 @@ t_print(mrb_state *mrb, mrb_value self)
   return mrb_nil_value();
 }
 
+#define UNESCAPE(p, endp) ((p) != (endp) && *(p) == '\\' ? (p)+1 : (p))
+#define CHAR_CMP(c1, c2) ((unsigned char)(c1) - (unsigned char)(c2))
+
+static const char *
+str_match_bracket(const char *p, const char *pat_end,
+                  const char *s, const char *str_end)
+{
+  mrb_bool ok = FALSE, negated = FALSE;
+
+  if (p == pat_end) return NULL;
+  if (*p == '!' || *p == '^') {
+    negated = TRUE;
+    ++p;
+  }
+
+  while (*p != ']') {
+    const char *t1 = p;
+    if ((t1 = UNESCAPE(t1, pat_end)) == pat_end) return NULL;
+    if ((p = t1 + 1) == pat_end) return NULL;
+    if (p[0] == '-' && p[1] != ']') {
+      const char *t2 = p + 1;
+      if ((t2 = UNESCAPE(t2, pat_end)) == pat_end) return NULL;
+      p = t2 + 1;
+      if (!ok && CHAR_CMP(*t1, *s) <= 0 && CHAR_CMP(*s, *t2) <= 0) ok = TRUE;
+    }
+    else {
+      if (!ok && CHAR_CMP(*t1, *s) == 0) ok = TRUE;
+    }
+  }
+
+  return ok == negated ? NULL : p + 1;
+}
+
+static mrb_bool
+str_match_no_brace_p(const char *pat, mrb_int pat_len,
+                     const char *str, mrb_int str_len)
+{
+  const char *p = pat, *s = str;
+  const char *pat_end = pat + pat_len, *str_end = str + str_len;
+  const char *p_tmp = NULL, *s_tmp = NULL;
+
+  for (;;) {
+    if (p == pat_end) return s == str_end;
+    switch (*p) {
+      case '*':
+        do { ++p; } while (p != pat_end && *p == '*');
+        if (UNESCAPE(p, pat_end) == pat_end) return TRUE;
+        if (s == str_end) return FALSE;
+        p_tmp = p;
+        s_tmp = s;
+        continue;
+      case '?':
+        if (s == str_end) return FALSE;
+        ++p;
+        ++s;
+        continue;
+      case '[': {
+        const char *t;
+        if (s == str_end) return FALSE;
+        if ((t = str_match_bracket(p+1, pat_end, s, str_end))) {
+          p = t;
+          ++s;
+          continue;
+        }
+        goto L_failed;
+      }
+    }
+
+    /* ordinary */
+    p = UNESCAPE(p, pat_end);
+    if (s == str_end) return p == pat_end;
+    if (p == pat_end) goto L_failed;
+    if (*p++ != *s++) goto L_failed;
+    continue;
+
+    L_failed:
+    if (p_tmp && s_tmp) {
+      /* try next '*' position */
+      p = p_tmp;
+      s = ++s_tmp;
+      continue;
+    }
+
+    return FALSE;
+  }
+}
+
+#define COPY_AND_INC(dst, src, len) \
+  do { memcpy(dst, src, len); dst += len; } while (0)
+
+static mrb_bool
+str_match_p(mrb_state *mrb,
+            const char *pat, mrb_int pat_len,
+            const char *str, mrb_int str_len)
+{
+  const char *p = pat, *pat_end = pat + pat_len;
+  const char *lbrace = NULL, *rbrace = NULL;
+  int nest = 0;
+  mrb_bool ret = FALSE;
+
+  for (; p != pat_end; ++p) {
+    if (*p == '{' && nest++ == 0) lbrace = p;
+    else if (*p == '}' && lbrace && --nest == 0) { rbrace = p; break; }
+    else if (*p == '\\' && ++p == pat_end) break;
+  }
+
+  if (lbrace && rbrace) {
+    /* expand brace */
+    char *ex_pat = (char *)mrb_malloc(mrb, pat_len-2);  /* expanded pattern */
+    char *ex_p = ex_pat;
+
+    COPY_AND_INC(ex_p, pat, lbrace-pat);
+    p = lbrace;
+    while (p < rbrace) {
+      char *orig_ex_p = ex_p;
+      const char *t = ++p;
+      for (nest = 0; p < rbrace && !(*p == ',' && nest == 0); ++p) {
+        if (*p == '{') ++nest;
+        else if (*p == '}') --nest;
+        else if (*p == '\\' && ++p == rbrace) break;
+      }
+      COPY_AND_INC(ex_p, t, p-t);
+      COPY_AND_INC(ex_p, rbrace+1, pat_end-rbrace-1);
+      if ((ret = str_match_p(mrb, ex_pat, ex_p-ex_pat, str, str_len))) break;
+      ex_p = orig_ex_p;
+    }
+    mrb_free(mrb, ex_pat);
+  }
+  else if (!lbrace && !rbrace) {
+    ret = str_match_no_brace_p(pat, pat_len, str, str_len);
+  }
+
+  return ret;
+}
+
+static mrb_value
+m_str_match_p(mrb_state *mrb, mrb_value self)
+{
+  const char *pat, *str;
+  mrb_int pat_len, str_len;
+
+  mrb_get_args(mrb, "ss", &pat, &pat_len, &str, &str_len);
+  return mrb_bool_value(str_match_p(mrb, pat, pat_len, str, str_len));
+}
+
 void
 mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
 {
@@ -69,6 +216,7 @@ mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
 
   krn = mrb->kernel_module;
   mrb_define_method(mrb, krn, "t_print", t_print, MRB_ARGS_ANY());
+  mrb_define_method(mrb, krn, "_str_match?", m_str_match_p, MRB_ARGS_REQ(2));
 
   mrbtest = mrb_define_module(mrb, "Mrbtest");
 
@@ -84,6 +232,8 @@ mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
 #endif
 #endif
 
+  mrb_init_test_vformat(mrb);
+
   if (verbose) {
     mrb_gv_set(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"), mrb_true_value());
   }
@@ -111,6 +261,7 @@ mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)
   TEST_COUNT_PASS(ok_test);
   TEST_COUNT_PASS(ko_test);
   TEST_COUNT_PASS(kill_test);
+  TEST_COUNT_PASS(warning_test);
   TEST_COUNT_PASS(skip_test);
 
 #undef TEST_COUNT_PASS

data/ext/enterprise_script_service/mruby/mrbgems/mruby-test/mrbgem.rake

@@ -15,8 +15,9 @@
   mrbtest_lib = libfile("#{build_dir}/mrbtest")
   mrbtest_objs = []
 
-  driver_obj = objfile("#{build_dir}/driver")
-  # driver = "#{spec.dir}/driver.c"
+  driver_objs = Dir.glob("#{dir}/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
+    objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
+  end
 
   assert_c = "#{build_dir}/assert.c"
   assert_rb = "#{MRUBY_ROOT}/test/assert.rb"
@@ -133,7 +134,7 @@
   end
 
   unless build.build_mrbtest_lib_only?
-    file exec => [driver_obj, mlib, mrbtest_lib, build.libmruby_static] do |t|
+    file exec => [*driver_objs, mlib, mrbtest_lib, build.libmruby_static] do |t|
       gem_flags = build.gems.map { |g| g.linker.flags }
       gem_flags_before_libraries = build.gems.map { |g| g.linker.flags_before_libraries }
       gem_flags_after_libraries = build.gems.map { |g| g.linker.flags_after_libraries }

data/ext/enterprise_script_service/mruby/mrbgems/mruby-test/vformat.c

@@ -0,0 +1,200 @@
+#include <string.h>
+#include <mruby.h>
+#include <mruby/class.h>
+#include <mruby/data.h>
+#include <mruby/string.h>
+
+#ifdef MRB_WITHOUT_FLOAT
+typedef mrb_int mrb_float;
+#define mrb_float(o) mrb_fixnum(o)
+#endif
+
+#define NATIVE_TYPES                                                        \
+  char c;                                                                   \
+  int d;                                                                    \
+  mrb_float f;                                                              \
+  mrb_int i;                                                                \
+/*  size_t l;                                                             */\
+  mrb_sym n;                                                                \
+  char *s;                                                                  \
+  struct RClass *C
+
+#define NATIVE_DEFINE_TYPE_FUNC(t)                                          \
+  static mrb_value                                                          \
+  native_s_##t(mrb_state *mrb, mrb_value klass)                             \
+  {                                                                         \
+    mrb_value obj, type = mrb_fixnum_value(ARG_##t);                        \
+    mrb_get_args(mrb, "o", &obj);                                           \
+    return mrb_funcall(mrb, klass, "new", 2, type, obj);                    \
+  }
+
+#define NATIVE_DEFINE_TYPE_METHOD(t) \
+  mrb_define_class_method(mrb, n, #t, native_s_##t, MRB_ARGS_REQ(1))
+
+typedef enum {
+  ARG_c,
+  ARG_d,
+  ARG_f,
+  ARG_i,
+/*  ARG_l,*/
+  ARG_n,
+  ARG_s,
+  ARG_C,
+  ARG_v,
+} VFArgumentType;
+
+typedef struct {
+  VFArgumentType type;
+  union { NATIVE_TYPES; };
+} VFNative;
+
+typedef struct {
+  VFArgumentType type;
+  union {
+    NATIVE_TYPES;
+    mrb_value v;
+  };
+} VFArgument;
+
+static void
+native_free(mrb_state *mrb, void *data)
+{
+  VFNative *native = (VFNative*)data;
+  if (native->type == ARG_s) mrb_free(mrb, native->s);
+  mrb_free(mrb, native);
+}
+
+static const struct mrb_data_type native_data_type = {
+  "TestVFormat::Native", native_free
+};
+
+static mrb_value
+native_initialize(mrb_state *mrb, mrb_value self)
+{
+  VFNative data, *datap;
+  mrb_int type;
+  mrb_value obj;
+
+  mrb_get_args(mrb, "io", &type, &obj);
+  data.type = (VFArgumentType)type;
+  switch (data.type) {
+    case ARG_c: data.c = RSTRING_PTR(obj)[0]; break;
+    case ARG_d: data.d = (int)mrb_fixnum(obj); break;
+    case ARG_f: data.f = mrb_float(obj); break;
+    case ARG_i: data.i = mrb_fixnum(obj); break;
+/*    case ARG_l: data.l = (size_t)mrb_fixnum(obj); break;*/
+    case ARG_n: data.n = mrb_symbol(obj); break;
+    case ARG_s: data.s = (char*)mrb_malloc(mrb, RSTRING_LEN(obj) + 1);
+                memcpy(data.s, RSTRING_PTR(obj), RSTRING_LEN(obj));
+                data.s[RSTRING_LEN(obj)] = '\0'; break;
+    case ARG_C: data.C = mrb_class_ptr(obj); break;
+    default: mrb_raise(mrb, E_ARGUMENT_ERROR, "unknown type");
+  }
+  datap = (VFNative*)mrb_malloc(mrb, sizeof(VFNative));
+  *datap = data;
+  mrb_data_init(self, datap, &native_data_type);
+  return self;
+}
+
+NATIVE_DEFINE_TYPE_FUNC(c)
+NATIVE_DEFINE_TYPE_FUNC(d)
+NATIVE_DEFINE_TYPE_FUNC(f)
+NATIVE_DEFINE_TYPE_FUNC(i)
+/*NATIVE_DEFINE_TYPE_FUNC(l)*/
+NATIVE_DEFINE_TYPE_FUNC(n)
+NATIVE_DEFINE_TYPE_FUNC(s)
+NATIVE_DEFINE_TYPE_FUNC(C)
+
+static VFArgument*
+arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
+             VFArgument *vf_arg)
+{
+  if (mrb_obj_is_instance_of(mrb, obj, native_class)) {
+    const VFNative *native = (VFNative*)DATA_PTR(obj);
+    *(VFNative*)vf_arg = *native;
+  }
+  else {
+    vf_arg->v = obj;
+    vf_arg->type = ARG_v;
+  }
+  return vf_arg;
+}
+
+#define VF_FORMAT_INIT(klass)                                               \
+  struct RClass *vf_native_class =                                          \
+    mrb_class_get_under(mrb, mrb_class_ptr(klass), "Native");               \
+  VFArgument vf_args[2];
+
+#define VF_ARG(args, idx) \
+  arg_from_obj(mrb, args[idx], vf_native_class, &vf_args[idx])
+
+#define VF_FORMAT0(fmt) mrb_format(mrb, fmt);
+#define VF_FORMAT1(fmt, args) \
+  (VF_ARG(args, 0), VF_FORMAT_TYPED(fmt, 1, vf_args, NULL))
+#define VF_FORMAT2(fmt, args) (                                             \
+  VF_ARG(args, 0), VF_ARG(args, 1),                                         \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, c) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, d) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, f) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, i) :                        \
+/*  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, l) :                    */\
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, n) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, s) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, C) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, v) :                        \
+  mrb_nil_value()  /* not reached */                                        \
+)
+#define VF_FORMAT2_COND_EXPR(fmt, a1, a2, t) \
+  a1->type == ARG_##t ? VF_FORMAT_TYPED(fmt, 2, a2, (a1)->t)
+#define VF_FORMAT_TYPED(fmt, n_arg, type_a, v1)                             \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, c) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, d) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, f) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, i) :                    \
+/*  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, l) :                */\
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, n) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, s) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, C) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, v) :                    \
+  mrb_nil_value()  /* not reached */
+#define VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, t)                \
+  (type_a)->type == ARG_##t ? n_arg == 1 ?                                  \
+    mrb_format(mrb, fmt, (type_a)->t) : mrb_format(mrb, fmt, v1, (type_a)->t)
+
+static mrb_value
+vf_s_format(mrb_state *mrb, mrb_value klass)
+{
+  mrb_value fmt_str, args[2];
+  mrb_int argc = mrb_get_args(mrb, "S|oo", &fmt_str, args, args+1);
+  const char *fmt = RSTRING_CSTR(mrb, fmt_str);
+
+  VF_FORMAT_INIT(klass);
+
+  switch (argc) {
+    case 1: return VF_FORMAT0(fmt);
+    case 2: return VF_FORMAT1(fmt, args);
+    case 3: return VF_FORMAT2(fmt, args);
+    default: return mrb_nil_value();  /* not reached */
+  }
+}
+
+void
+mrb_init_test_vformat(mrb_state *mrb)
+{
+  struct RClass *vf, *n;
+
+  vf = mrb_define_module(mrb, "TestVFormat");
+  mrb_define_class_method(mrb, vf, "format", vf_s_format, MRB_ARGS_ARG(1,2));
+
+  n = mrb_define_class_under(mrb, vf, "Native", mrb->object_class);
+  MRB_SET_INSTANCE_TT(n, MRB_TT_DATA);
+  NATIVE_DEFINE_TYPE_METHOD(c);
+  NATIVE_DEFINE_TYPE_METHOD(d);
+  NATIVE_DEFINE_TYPE_METHOD(f);
+  NATIVE_DEFINE_TYPE_METHOD(i);
+/*  NATIVE_DEFINE_TYPE_METHOD(l);*/
+  NATIVE_DEFINE_TYPE_METHOD(n);
+  NATIVE_DEFINE_TYPE_METHOD(s);
+  NATIVE_DEFINE_TYPE_METHOD(C);
+  mrb_define_method(mrb, n, "initialize", native_initialize, MRB_ARGS_REQ(2));
+}

data/ext/enterprise_script_service/mruby/mrbgems/mruby-time/include/mruby/time.h

@@ -8,6 +8,7 @@
 #define MRUBY_TIME_H
 
 #include "mruby/common.h"
+#include <time.h>
 
 MRB_BEGIN_DECL
 
@@ -18,7 +19,7 @@ typedef enum mrb_timezone {
   MRB_TIMEZONE_LAST   = 3
 } mrb_timezone;
 
-MRB_API mrb_value mrb_time_at(mrb_state *mrb, double sec, double usec, mrb_timezone timezone);
+MRB_API mrb_value mrb_time_at(mrb_state *mrb, time_t sec, time_t usec, mrb_timezone timezone);
 
 MRB_END_DECL