script_core 0.1.1 → 0.2.0

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

@@ -102,25 +102,28 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
   uint8_t c;
   mrb_code insn;
   int argc = irep_argc(irep);
+  mrb_code *iseq = (mrb_code *)irep->iseq;
+
+  mrb_assert((irep->flags & MRB_ISEQ_NO_FREE) == 0);
 
   for (i = 0; i < irep->ilen; ) {
-    insn = irep->iseq[i];
+    insn = iseq[i];
     switch(insn){
     case OP_EPUSH:
-      b = PEEK_S(irep->iseq+i+1);
-      patch_irep(mrb, irep->reps[b], bnest + 1, top);
+      a = PEEK_B(iseq+i+1);
+      patch_irep(mrb, irep->reps[a], bnest + 1, top);
       break;
 
     case OP_LAMBDA:
     case OP_BLOCK:
-      a = PEEK_B(irep->iseq+i+1);
-      b = PEEK_B(irep->iseq+i+2);
+      a = PEEK_B(iseq+i+1);
+      b = PEEK_B(iseq+i+2);
       patch_irep(mrb, irep->reps[b], bnest + 1, top);
       break;
 
     case OP_SEND:
-      b = PEEK_B(irep->iseq+i+2);
-      c = PEEK_B(irep->iseq+i+3);
+      b = PEEK_B(iseq+i+2);
+      c = PEEK_B(iseq+i+3);
       if (c != 0) {
         break;
       }
@@ -128,24 +131,24 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
         uint16_t arg = search_variable(mrb, irep->syms[b], bnest);
         if (arg != 0) {
           /* must replace */
-          irep->iseq[i] = OP_GETUPVAR;
-          irep->iseq[i+2] = arg >> 8;
-          irep->iseq[i+3] = arg & 0xff;
+          iseq[i] = OP_GETUPVAR;
+          iseq[i+2] = arg >> 8;
+          iseq[i+3] = arg & 0xff;
         }
       }
       break;
 
     case OP_MOVE:
-      a = PEEK_B(irep->iseq+i+1);
-      b = PEEK_B(irep->iseq+i+2);
+      a = PEEK_B(iseq+i+1);
+      b = PEEK_B(iseq+i+2);
       /* src part */
       if (potential_upvar_p(irep->lv, b, argc, irep->nlocals)) {
         uint16_t arg = search_variable(mrb, irep->lv[b - 1].name, bnest);
         if (arg != 0) {
           /* must replace */
-          irep->iseq[i] = insn = OP_GETUPVAR;
-          irep->iseq[i+2] = arg >> 8;
-          irep->iseq[i+3] = arg & 0xff;
+          iseq[i] = insn = OP_GETUPVAR;
+          iseq[i+2] = arg >> 8;
+          iseq[i+3] = arg & 0xff;
         }
       }
       /* dst part */
@@ -153,18 +156,18 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
         uint16_t arg = search_variable(mrb, irep->lv[a - 1].name, bnest);
         if (arg != 0) {
           /* must replace */
-          irep->iseq[i] = insn = OP_SETUPVAR;
-          irep->iseq[i+1] = (mrb_code)b;
-          irep->iseq[i+2] = arg >> 8;
-          irep->iseq[i+3] = arg & 0xff;
+          iseq[i] = insn = OP_SETUPVAR;
+          iseq[i+1] = (mrb_code)b;
+          iseq[i+2] = arg >> 8;
+          iseq[i+3] = arg & 0xff;
         }
       }
       break;
 
     case OP_GETUPVAR:
-      a = PEEK_B(irep->iseq+i+1);
-      b = PEEK_B(irep->iseq+i+2);
-      c = PEEK_B(irep->iseq+i+3);
+      a = PEEK_B(iseq+i+1);
+      b = PEEK_B(iseq+i+2);
+      c = PEEK_B(iseq+i+3);
       {
         int lev = c+1;
         mrb_irep *tmp = search_irep(top, bnest, lev, irep);
@@ -172,18 +175,18 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
           uint16_t arg = search_variable(mrb, tmp->lv[b-1].name, bnest);
           if (arg != 0) {
             /* must replace */
-            irep->iseq[i] = OP_GETUPVAR;
-            irep->iseq[i+2] = arg >> 8;
-            irep->iseq[i+3] = arg & 0xff;
+            iseq[i] = OP_GETUPVAR;
+            iseq[i+2] = arg >> 8;
+            iseq[i+3] = arg & 0xff;
           }
         }
       }
       break;
 
     case OP_SETUPVAR:
-      a = PEEK_B(irep->iseq+i+1);
-      b = PEEK_B(irep->iseq+i+2);
-      c = PEEK_B(irep->iseq+i+3);
+      a = PEEK_B(iseq+i+1);
+      b = PEEK_B(iseq+i+2);
+      c = PEEK_B(iseq+i+3);
       {
         int lev = c+1;
         mrb_irep *tmp = search_irep(top, bnest, lev, irep);
@@ -191,25 +194,25 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
           uint16_t arg = search_variable(mrb, tmp->lv[b-1].name, bnest);
           if (arg != 0) {
             /* must replace */
-            irep->iseq[i] = OP_SETUPVAR;
-            irep->iseq[i+1] = a;
-            irep->iseq[i+2] = arg >> 8;
-            irep->iseq[i+3] = arg & 0xff;
+            iseq[i] = OP_SETUPVAR;
+            iseq[i+1] = a;
+            iseq[i+2] = arg >> 8;
+            iseq[i+3] = arg & 0xff;
           }
         }
       }
       break;
 
     case OP_EXT1:
-      insn = PEEK_B(irep->iseq+i+1);
+      insn = PEEK_B(iseq+i+1);
       i += mrb_insn_size1[insn]+1;
       continue;
     case OP_EXT2:
-      insn = PEEK_B(irep->iseq+i+1);
+      insn = PEEK_B(iseq+i+1);
       i += mrb_insn_size2[insn]+1;
       continue;
     case OP_EXT3:
-      insn = PEEK_B(irep->iseq+i+1);
+      insn = PEEK_B(iseq+i+1);
       i += mrb_insn_size3[insn]+1;
       continue;
     }
@@ -235,7 +238,7 @@ create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding,
   }
 
   cxt = mrbc_context_new(mrb);
-  cxt->lineno = (short)line;
+  cxt->lineno = (uint16_t)line;
 
   mrbc_filename(mrb, cxt, file ? file : "(eval)");
   cxt->capture_errors = TRUE;
@@ -254,15 +257,15 @@ create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding,
     mrb_value str;
 
     if (file) {
-      str = mrb_format(mrb, " file %S line %S: %S",
-                       mrb_str_new_cstr(mrb, file),
-                       mrb_fixnum_value(p->error_buffer[0].lineno),
-                       mrb_str_new_cstr(mrb, p->error_buffer[0].message));
+      str = mrb_format(mrb, "file %s line %d: %s",
+                       file,
+                       p->error_buffer[0].lineno,
+                       p->error_buffer[0].message);
     }
     else {
-      str = mrb_format(mrb, " line %S: %S",
-                       mrb_fixnum_value(p->error_buffer[0].lineno),
-                       mrb_str_new_cstr(mrb, p->error_buffer[0].message));
+      str = mrb_format(mrb, "line %d: %s",
+                       p->error_buffer[0].lineno,
+                       p->error_buffer[0].message);
     }
     mrb_parser_free(p);
     mrbc_context_free(mrb, cxt);
@@ -387,7 +390,7 @@ void
 mrb_mruby_eval_gem_init(mrb_state* mrb)
 {
   mrb_define_module_function(mrb, mrb->kernel_module, "eval", f_eval, MRB_ARGS_ARG(1, 3));
-  mrb_define_method(mrb, mrb->kernel_module, "instance_eval", f_instance_eval, MRB_ARGS_ARG(1, 2));
+  mrb_define_method(mrb, mrb_class_get(mrb, "BasicObject"), "instance_eval", f_instance_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
 }
 
 void

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

@@ -80,7 +80,7 @@ def const_string
   assert_equal('class') { obj.const_string }
 end
 
-assert('Object#instance_eval with begin-rescue-ensure execution order') do
+assert('BasicObject#instance_eval with begin-rescue-ensure execution order') do
   class HellRaiser
     def raise_hell
       order = [:enter_raise_hell]
@@ -100,7 +100,7 @@ def raise_hell
   assert_equal([:enter_raise_hell, :begin, :rescue, :ensure], hell_raiser.raise_hell)
 end
 
-assert('Kernel#instance_eval() to define singleton methods Issue #3141') do
+assert('BasicObject#instance_eval to define singleton methods Issue #3141') do
   foo_class = Class.new do
     def bar(x)
       instance_eval "def baz; #{x}; end"

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

@@ -4,12 +4,17 @@
 static mrb_value
 f_exit(mrb_state *mrb, mrb_value self)
 {
-  mrb_int i = EXIT_SUCCESS;
+  mrb_value status = mrb_true_value();
+  int istatus;
+
+  mrb_get_args(mrb, "|o", &status);
+  istatus = mrb_true_p(status) ? EXIT_SUCCESS :
+            mrb_false_p(status) ? EXIT_FAILURE :
+            (int)mrb_int(mrb, status);
+  exit(istatus);
 
-  mrb_get_args(mrb, "|i", &i);
-  exit((int)i);
   /* not reached */
-  return mrb_nil_value();
+  return status;
 }
 
 void

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

@@ -72,14 +72,11 @@ fiber_init(mrb_state *mrb, mrb_value self)
   mrb_value blk;
   size_t slen;
 
-  mrb_get_args(mrb, "&", &blk);
+  mrb_get_args(mrb, "&!", &blk);
 
   if (f->cxt) {
     mrb_raise(mrb, E_RUNTIME_ERROR, "cannot initialize twice");
   }
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Fiber object without a block");
-  }
   p = mrb_proc_ptr(blk);
   if (MRB_PROC_CFUNC_P(p)) {
     mrb_raise(mrb, E_FIBER_ERROR, "tried to create Fiber from C defined method");
@@ -191,14 +188,21 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
 
   fiber_check_cfunc(mrb, c);
   status = c->status;
-  if (resume && status == MRB_FIBER_TRANSFERRED) {
-    mrb_raise(mrb, E_FIBER_ERROR, "resuming transferred fiber");
-  }
-  if (status == MRB_FIBER_RUNNING || status == MRB_FIBER_RESUMED) {
+  switch (status) {
+  case MRB_FIBER_TRANSFERRED:
+    if (resume) {
+      mrb_raise(mrb, E_FIBER_ERROR, "resuming transferred fiber");
+    }
+    break;
+  case MRB_FIBER_RUNNING:
+  case MRB_FIBER_RESUMED:
     mrb_raise(mrb, E_FIBER_ERROR, "double resume");
-  }
-  if (status == MRB_FIBER_TERMINATED) {
+    break;
+  case MRB_FIBER_TERMINATED:
     mrb_raise(mrb, E_FIBER_ERROR, "resuming dead fiber");
+    break;
+  default:
+    break;
   }
   old_c->status = resume ? MRB_FIBER_RESUMED : MRB_FIBER_TRANSFERRED;
   c->prev = resume ? mrb->c : (c->prev ? c->prev : mrb->root_c);
@@ -290,7 +294,7 @@ fiber_eq(mrb_state *mrb, mrb_value self)
   mrb_value other;
   mrb_get_args(mrb, "o", &other);
 
-  if (mrb_type(other) != MRB_TT_FIBER) {
+  if (!mrb_fiber_p(other)) {
     return mrb_false_value();
   }
   return mrb_bool_value(fiber_ptr(self) == fiber_ptr(other));
@@ -405,7 +409,7 @@ mrb_mruby_fiber_gem_init(mrb_state* mrb)
   c = mrb_define_class(mrb, "Fiber", mrb->object_class);
   MRB_SET_INSTANCE_TT(c, MRB_TT_FIBER);
 
-  mrb_define_method(mrb, c, "initialize", fiber_init,    MRB_ARGS_NONE());
+  mrb_define_method(mrb, c, "initialize", fiber_init,    MRB_ARGS_NONE()|MRB_ARGS_BLOCK());
   mrb_define_method(mrb, c, "resume",     fiber_resume,  MRB_ARGS_ANY());
   mrb_define_method(mrb, c, "transfer",   fiber_transfer, MRB_ARGS_ANY());
   mrb_define_method(mrb, c, "alive?",     fiber_alive_p, MRB_ARGS_NONE());

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

@@ -76,7 +76,7 @@
 end
 
 assert('Fiber with splat in the block argument list') {
-  Fiber.new{|*x|x}.resume(1) == [1]
+  assert_equal([1], Fiber.new{|*x|x}.resume(1))
 }
 
 assert('Fiber raises on resume when dead') do

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

@@ -2,7 +2,5 @@
   spec.license = 'MIT'
   spec.author  = 'mruby developers'
   spec.summary = 'Hash class extension'
-  spec.add_dependency 'mruby-enum-ext', core: 'mruby-enum-ext'
   spec.add_dependency 'mruby-array-ext', core: 'mruby-array-ext'
-  spec.add_test_dependency 'mruby-enumerator', core: 'mruby-enumerator'
 end

data/ext/enterprise_script_service/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb

@@ -494,4 +494,7 @@ def fetch_values(*keys, &block)
       self.fetch(k, &block)
     end
   end
+
+  alias filter select
+  alias filter! select!
 end

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

@@ -269,10 +269,8 @@
                h.transform_keys{|k| k+"!"})
   assert_equal({1 => 100, 2 => 200},
                h.transform_keys{|k|k.to_i})
-  assert_equal({"1.0" => 100, "2.1" => 200},
-               h.transform_keys.with_index{|k, i| "#{k}.#{i}"})
-  assert_equal(h, h.transform_keys!{|k|k.to_i})
-  assert_equal(h, {1 => 100, 2 => 200})
+  assert_same(h, h.transform_keys!{|k|k.to_i})
+  assert_equal({1 => 100, 2 => 200}, h)
 end
 
 assert("Hash#transform_values") do
@@ -281,9 +279,7 @@
                h.transform_values{|v| v * v + 1})
   assert_equal({a: "1", b: "2", c: "3"},
                h.transform_values{|v|v.to_s})
-  assert_equal({a: "1.0", b: "2.1", c: "3.2"},
-               h.transform_values.with_index{|v, i| "#{v}.#{i}"})
-  assert_equal(h, h.transform_values!{|v|v.to_s})
+  assert_same(h, h.transform_values!{|v|v.to_s})
   assert_equal({a: "1", b: "2", c: "3"}, h)
 end
 

data/ext/enterprise_script_service/mruby/mrbgems/mruby-io/README.md

@@ -1,7 +1,5 @@
 mruby-io
 ========
-[![Build Status](https://travis-ci.org/iij/mruby-io.svg?branch=master)](https://travis-ci.org/iij/mruby-io)
-
 
 `IO` and `File` classes for mruby
 
@@ -9,7 +7,7 @@ mruby-io
 Add the line below to your `build_config.rb`:
 
 ```
-  conf.gem :github => 'iij/mruby-io'
+  conf.gem core: 'mruby-io'
 ```
 
 ## Implemented methods

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

@@ -6,7 +6,7 @@
   spec.cc.include_paths << "#{build.root}/src"
 
   case RUBY_PLATFORM
-  when /mingw|mswin/
+  when /mingw|mswin|msys/
     spec.linker.libraries += ['Ws2_32']
     #spec.cc.include_paths += ["C:/Windows/system/include"]
     spec.linker.library_paths += ["C:/Windows/system"]

data/ext/enterprise_script_service/mruby/mrbgems/mruby-io/mrblib/file.rb

@@ -1,9 +1,4 @@
 class File < IO
-  class FileError < Exception; end
-  class NoFileError < FileError; end
-  class UnableToStat < FileError; end
-  class PermissionError < FileError; end
-
   attr_accessor :path
 
   def initialize(fd_or_path, mode = "r", perm = 0666)

data/ext/enterprise_script_service/mruby/mrbgems/mruby-io/mrblib/io.rb

@@ -123,8 +123,8 @@ def hash
 
   def write(string)
     str = string.is_a?(String) ? string : string.to_s
-    return str.size unless str.size > 0
-    if 0 < @buf.length
+    return 0 if str.empty?
+    unless @buf.empty?
       # reset real pos ignore buf
       seek(pos, SEEK_SET)
     end
@@ -140,8 +140,8 @@ def <<(str)
   def eof?
     _check_readable
     begin
-      buf = _read_buf
-      return buf.size == 0
+      _read_buf
+      return @buf.empty?
     rescue EOFError
       return true
     end
@@ -150,7 +150,7 @@ def eof?
 
   def pos
     raise IOError if closed?
-    sysseek(0, SEEK_CUR) - @buf.length
+    sysseek(0, SEEK_CUR) - @buf.bytesize
   end
   alias_method :tell, :pos
 
@@ -170,8 +170,13 @@ def seek(i, whence = SEEK_SET)
   end
 
   def _read_buf
-    return @buf if @buf && @buf.size > 0
-    @buf = sysread(BUF_SIZE)
+    return @buf if @buf && @buf.bytesize >= 4 # maximum UTF-8 character is 4 bytes
+    @buf ||= ""
+    begin
+      @buf += sysread(BUF_SIZE)
+    rescue EOFError => e
+      raise e if @buf.empty?
+    end
   end
 
   def ungetc(substr)
@@ -207,9 +212,8 @@ def read(length = nil, outbuf = "")
       end
 
       if length
-        consume = (length <= @buf.size) ? length : @buf.size
-        array.push @buf[0, consume]
-        @buf = @buf[consume, @buf.size - consume]
+        consume = (length <= @buf.bytesize) ? length : @buf.bytesize
+        array.push IO._bufread(@buf, consume)
         length -= consume
         break if length == 0
       else
@@ -226,12 +230,12 @@ def read(length = nil, outbuf = "")
     end
   end
 
-  def readline(arg = $/, limit = nil)
+  def readline(arg = "\n", limit = nil)
     case arg
     when String
       rs = arg
     when Fixnum
-      rs = $/
+      rs = "\n"
       limit = arg
     else
       raise ArgumentError
@@ -242,7 +246,7 @@ def readline(arg = $/, limit = nil)
     end
 
     if rs == ""
-      rs = $/ + $/
+      rs = "\n\n"
     end
 
     array = []
@@ -256,12 +260,12 @@ def readline(arg = $/, limit = nil)
 
       if limit && limit <= @buf.size
         array.push @buf[0, limit]
-        @buf = @buf[limit, @buf.size - limit]
+        @buf[0, limit] = ""
         break
       elsif idx = @buf.index(rs)
         len = idx + rs.size
         array.push @buf[0, len]
-        @buf = @buf[len, @buf.size - len]
+        @buf[0, len] = ""
         break
       else
         array.push @buf
@@ -285,7 +289,7 @@ def gets(*args)
   def readchar
     _read_buf
     c = @buf[0]
-    @buf = @buf[1, @buf.size]
+    @buf[0] = ""
     c
   end
 
@@ -299,6 +303,8 @@ def getc
 
   # 15.2.20.5.3
   def each(&block)
+    return to_enum unless block
+
     while line = self.gets
       block.call(line)
     end
@@ -307,6 +313,8 @@ def each(&block)
 
   # 15.2.20.5.4
   def each_byte(&block)
+    return to_enum(:each_byte) unless block
+
     while char = self.getc
       block.call(char)
     end
@@ -364,25 +372,3 @@ def printf(*args)
 $stdin  = STDIN
 $stdout = STDOUT
 $stderr = STDERR
-
-module Kernel
-  def print(*args)
-    $stdout.print(*args)
-  end
-
-  def puts(*args)
-    $stdout.puts(*args)
-  end
-
-  def printf(*args)
-    $stdout.printf(*args)
-  end
-
-  def gets(*args)
-    $stdin.gets(*args)
-  end
-
-  def getc(*args)
-    $stdin.getc(*args)
-  end
-end