script_core 0.2.7 → 0.3.0

data/ext/enterprise_script_service/mruby/lib/mruby/lockfile.rb

@@ -39,7 +39,7 @@ def build(target_name)
     end
 
     def write
-      locks = {"mruby_version" => mruby}
+      locks = {"mruby" => mruby}
       locks["builds"] = @builds if @builds
       File.write(@filename, YAML.dump(locks))
     end

data/ext/enterprise_script_service/mruby/lib/mruby/presym.rb

@@ -0,0 +1,132 @@
+module MRuby
+  class Presym
+    include Rake::DSL
+
+    OPERATORS = {
+      "!" => "not",
+      "%" => "mod",
+      "&" => "and",
+      "*" => "mul",
+      "+" => "add",
+      "-" => "sub",
+      "/" => "div",
+      "<" => "lt",
+      ">" => "gt",
+      "^" => "xor",
+      "`" => "tick",
+      "|" => "or",
+      "~" => "neg",
+      "!=" => "neq",
+      "!~" => "nmatch",
+      "&&" => "andand",
+      "**" => "pow",
+      "+@" => "plus",
+      "-@" => "minus",
+      "<<" => "lshift",
+      "<=" => "le",
+      "==" => "eq",
+      "=~" => "match",
+      ">=" => "ge",
+      ">>" => "rshift",
+      "[]" => "aref",
+      "||" => "oror",
+      "<=>" => "cmp",
+      "===" => "eqq",
+      "[]=" => "aset",
+    }.freeze
+
+    SYMBOL_TO_MACRO = {
+    #      Symbol      =>      Macro
+    # [prefix, suffix] => [prefix, suffix]
+      ["@@"  , ""    ] => ["CV"  , ""    ],
+      ["@"   , ""    ] => ["IV"  , ""    ],
+      [""    , "!"   ] => [""    , "_B"  ],
+      [""    , "?"   ] => [""    , "_Q"  ],
+      [""    , "="   ] => [""    , "_E"  ],
+      [""    , ""    ] => [""    , ""    ],
+    }.freeze
+
+    C_STR_LITERAL_RE = /"(?:[^\\\"]|\\.)*"/
+
+    def initialize(build)
+      @build = build
+    end
+
+    def scan(paths)
+      presym_hash = {}
+      paths.each {|path| read_preprocessed(presym_hash, path)}
+      presym_hash.keys.sort_by!{|sym| [c_literal_size(sym), sym]}
+    end
+
+    def read_list
+      File.readlines(list_path, mode: "r:binary").each(&:chomp!)
+    end
+
+    def write_list(presyms)
+      _pp "GEN", list_path.relative_path
+      File.binwrite(list_path, presyms.join("\n") << "\n")
+    end
+
+    def write_id_header(presyms)
+      prefix_re = Regexp.union(*SYMBOL_TO_MACRO.keys.map(&:first).uniq)
+      suffix_re = Regexp.union(*SYMBOL_TO_MACRO.keys.map(&:last).uniq)
+      sym_re = /\A(#{prefix_re})?([\w&&\D]\w*)(#{suffix_re})?\z/o
+      _pp "GEN", id_header_path.relative_path
+      File.open(id_header_path, "w:binary") do |f|
+        f.puts "enum mruby_presym {"
+        presyms.each.with_index(1) do |sym, num|
+          if sym_re =~ sym && (affixes = SYMBOL_TO_MACRO[[$1, $3]])
+            f.puts "  MRB_#{affixes * 'SYM'}__#{$2} = #{num},"
+          elsif name = OPERATORS[sym]
+            f.puts "  MRB_OPSYM__#{name} = #{num},"
+          end
+        end
+        f.puts "};"
+        f.puts
+        f.puts "#define MRB_PRESYM_MAX #{presyms.size}"
+      end
+    end
+
+    def write_table_header(presyms)
+      _pp "GEN", table_header_path.relative_path
+      File.open(table_header_path, "w:binary") do |f|
+        f.puts "static const uint16_t presym_length_table[] = {"
+        presyms.each{|sym| f.puts "  #{sym.bytesize},\t/* #{sym} */"}
+        f.puts "};"
+        f.puts
+        f.puts "static const char * const presym_name_table[] = {"
+        presyms.each{|sym| f.puts %|  "#{sym}",|}
+        f.puts "};"
+      end
+    end
+
+    def list_path
+      @list_pat ||= "#{@build.build_dir}/presym".freeze
+    end
+
+    def header_dir;
+      @header_dir ||= "#{@build.build_dir}/include/mruby/presym".freeze
+    end
+
+    def id_header_path
+      @id_header_path ||= "#{header_dir}/id.h".freeze
+    end
+
+    def table_header_path
+      @table_header_path ||= "#{header_dir}/table.h".freeze
+    end
+
+    private
+
+    def read_preprocessed(presym_hash, path)
+      File.binread(path).scan(/<@! (.*?) !@>/) do |part,|
+        literals = part.scan(C_STR_LITERAL_RE)
+        presym_hash[literals.map{|l| l[1..-2]}.join] = true unless literals.empty?
+      end
+    end
+
+    def c_literal_size(literal_without_quote)
+      literal_without_quote.size  # TODO: consider escape sequence
+    end
+  end
+end

data/ext/enterprise_script_service/mruby/mrbgems/default-no-fpu.gembox

@@ -0,0 +1,3 @@
+MRuby::GemBox.new do |conf|
+  conf.gembox "stdlib"
+end

data/ext/enterprise_script_service/mruby/mrbgems/default-no-stdio.gembox

@@ -0,0 +1,4 @@
+MRuby::GemBox.new do |conf|
+  conf.gembox "stdlib"
+  conf.gembox "math"
+end

data/ext/enterprise_script_service/mruby/mrbgems/default.gembox

@@ -1,79 +1,12 @@
 MRuby::GemBox.new do |conf|
-  # Meta-programming features
-  conf.gem :core => "mruby-metaprog"
+  conf.gembox "stdlib"
+  conf.gembox "stdlib-ext"
+  conf.gembox "stdlib-io"
+  conf.gembox "math"
+  conf.gembox "metaprog"
 
-  # Use standard IO/File class
-  conf.gem :core => "mruby-io"
-
-  # Use standard Array#pack, String#unpack methods
-  conf.gem :core => "mruby-pack"
-
-  # Use standard Kernel#sprintf method
-  conf.gem :core => "mruby-sprintf"
-
-  # Use standard print/puts/p
-  conf.gem :core => "mruby-print"
-
-  # Use standard Math module
-  conf.gem :core => "mruby-math"
-
-  # Use standard Time class
-  conf.gem :core => "mruby-time"
-
-  # Use standard Struct class
-  conf.gem :core => "mruby-struct"
-
-  # Use Comparable module extension
-  conf.gem :core => "mruby-compar-ext"
-
-  # Use Enumerable module extension
-  conf.gem :core => "mruby-enum-ext"
-
-  # Use String class extension
-  conf.gem :core => "mruby-string-ext"
-
-  # Use Numeric class extension
-  conf.gem :core => "mruby-numeric-ext"
-
-  # Use Array class extension
-  conf.gem :core => "mruby-array-ext"
-
-  # Use Hash class extension
-  conf.gem :core => "mruby-hash-ext"
-
-  # Use Range class extension
-  conf.gem :core => "mruby-range-ext"
-
-  # Use Proc class extension
-  conf.gem :core => "mruby-proc-ext"
-
-  # Use Symbol class extension
-  conf.gem :core => "mruby-symbol-ext"
-
-  # Use Random class
-  conf.gem :core => "mruby-random"
-
-  # Use Object class extension
-  conf.gem :core => "mruby-object-ext"
-
-  # Use ObjectSpace class
-  conf.gem :core => "mruby-objectspace"
-
-  # Use Fiber class
-  conf.gem :core => "mruby-fiber"
-
-  # Use Enumerator class (require mruby-fiber)
-  conf.gem :core => "mruby-enumerator"
-
-  # Use Enumerator::Lazy class (require mruby-enumerator)
-  conf.gem :core => "mruby-enum-lazy"
-
-  # Use toplevel object (main) methods extension
-  conf.gem :core => "mruby-toplevel-ext"
-
-  # Use Rational/Complex numbers
-  conf.gem :core => "mruby-rational"
-  conf.gem :core => "mruby-complex"
+  # Generate mrbc command
+  conf.gem :core => "mruby-bin-mrbc"
 
   # Generate mirb command
   conf.gem :core => "mruby-bin-mirb"
@@ -84,18 +17,6 @@ MRuby::GemBox.new do |conf|
   # Generate mruby-strip command
   conf.gem :core => "mruby-bin-strip"
 
-  # Use Kernel module extension
-  conf.gem :core => "mruby-kernel-ext"
-
-  # Use class/module extension
-  conf.gem :core => "mruby-class-ext"
-
-  # Use Method/UnboundMethod class
-  conf.gem :core => "mruby-method"
-
-  # Use eval()
-  conf.gem :core => "mruby-eval"
-
-  # Use mruby-compiler to build other mrbgems
-  conf.gem :core => "mruby-compiler"
+  # Generate mruby-config command
+  conf.gem :core => "mruby-bin-config"
 end

data/ext/enterprise_script_service/mruby/mrbgems/full-core.gembox

@@ -1,9 +1,6 @@
 MRuby::GemBox.new do |conf|
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-
   Dir.glob("#{root}/mrbgems/mruby-*/mrbgem.rake") do |x|
     g = File.basename File.dirname x
-    conf.gem :core => g unless g =~ /^mruby-(print|sprintf|bin-debugger|test)$/
+    conf.gem :core => g unless g =~ /^mruby-(?:bin-debugger|test)$/
   end
 end

data/ext/enterprise_script_service/mruby/mrbgems/math.gembox

@@ -0,0 +1,10 @@
+# It also works with MRB_NO_STDIO.
+
+MRuby::GemBox.new do |conf|
+  # Use standard Math module
+  conf.gem :core => "mruby-math"
+
+  # Use Rational/Complex numbers
+  conf.gem :core => "mruby-rational"
+  conf.gem :core => "mruby-complex"
+end

data/ext/enterprise_script_service/mruby/mrbgems/metaprog.gembox

@@ -0,0 +1,15 @@
+# It also works with MRB_NO_STDIO and MRB_NO_FLOAT.
+
+MRuby::GemBox.new do |conf|
+  # Meta-programming features
+  conf.gem :core => "mruby-metaprog"
+
+  # Use Method/UnboundMethod class
+  conf.gem :core => "mruby-method"
+
+  # Use eval()
+  conf.gem :core => "mruby-eval"
+
+  # Use mruby-compiler to build other mrbgems
+  conf.gem :core => "mruby-compiler"
+end

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

@@ -209,7 +209,7 @@ def intersection(*args)
   #    a.flatten(1)              #=> [1, 2, 3, [4, 5]]
   #
   def flatten(depth=nil)
-    res = dup
+    res = Array.new(self)
     res.flatten! depth
     res
   end

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

@@ -3,6 +3,7 @@
 #include <mruby/array.h>
 #include <mruby/range.h>
 #include <mruby/hash.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:
@@ -97,7 +98,7 @@ static mrb_value
 mrb_ary_values_at(mrb_state *mrb, mrb_value self)
 {
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);
 
@@ -148,11 +149,11 @@ mrb_ary_slice_bang(mrb_state *mrb, mrb_value self)
       else {
         return mrb_nil_value();
       }
-    case MRB_TT_FIXNUM:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
+    case MRB_TT_INTEGER:
+      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
       return val;
     default:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
+      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
       return val;
     }
   }

data/ext/enterprise_script_service/mruby/mrbgems/mruby-bin-config/mrbgem.rake

@@ -1,26 +1,35 @@
-unless MRuby::Build.current.kind_of?(MRuby::CrossBuild)
-  MRuby::Gem::Specification.new('mruby-bin-config') do |spec|
-    name = 'mruby-config'
-    spec.license = 'MIT'
-    spec.author  = 'mruby developers'
-    spec.summary = "#{name} command"
+iscross = MRuby::Build.current.kind_of?(MRuby::CrossBuild)
 
+MRuby::Gem::Specification.new('mruby-bin-config') do |spec|
+  name = 'mruby-config'
+  spec.license = 'MIT'
+  spec.author  = 'mruby developers'
+  spec.summary = "#{name} command"
+
+  if iscross
+    mruby_config_dir = "#{build.build_dir}/host-bin"
+  else
     mruby_config_dir = "#{build.build_dir}/bin"
-    mruby_config = name + (ENV['OS'] == 'Windows_NT' ? '.bat' : '')
-    mruby_config_path = "#{mruby_config_dir}/#{mruby_config}"
-    make_cfg = "#{build.build_dir}/lib/libmruby.flags.mak"
-    tmplt_path = "#{__dir__}/#{mruby_config}"
+  end
+  mruby_config = name + (ENV['OS'] == 'Windows_NT' ? '.bat' : '')
+  mruby_config_path = "#{mruby_config_dir}/#{mruby_config}"
+  make_cfg = "#{build.build_dir}/lib/libmruby.flags.mak"
+  tmplt_path = "#{__dir__}/#{mruby_config}"
+
+  if iscross
+    build.products << mruby_config_path
+  else
     build.bins << mruby_config
+  end
 
-    directory mruby_config_dir
+  directory mruby_config_dir
 
-    file mruby_config_path => [mruby_config_dir, make_cfg, tmplt_path] do |t|
-      config = Hash[File.readlines(make_cfg).map!(&:chomp).map! {|l|
-        l.gsub('\\"', '"').split(' = ', 2).map! {|s| s.sub(/^(?=.)/, 'echo ')}
-      }]
-      tmplt = File.read(tmplt_path)
-      File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config))
-      chmod(0755, t.name)
-    end
+  file mruby_config_path => [mruby_config_dir, make_cfg, tmplt_path] do |t|
+    config = Hash[File.readlines(make_cfg).map!(&:chomp).map! {|l|
+      l.gsub('\\"', '"').split(' = ', 2).map! {|s| s.sub(/^(?=.)/, 'echo ')}
+    }]
+    tmplt = File.read(tmplt_path)
+    File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config))
+    chmod(0755, t.name)
   end
 end

data/ext/enterprise_script_service/mruby/mrbgems/mruby-bin-config/mruby-config

@@ -1,5 +1,22 @@
 #!/bin/sh
 
+print_help()
+{
+  echo "Usage: mruby-config [switches]"
+  echo "  switches:"
+  echo "  --cflags                    print flags passed to compiler"
+  echo "  --ldflags                   print flags passed to linker"
+  echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
+  echo "  --libs                      print linked libraries"
+  echo "  --libmruby-path             print libmruby path"
+  echo "  --help                      print this help"
+  exit 0
+}
+
+if [ $# -eq 0 ]; then
+   print_help
+fi
+
 while [ $# -gt 0 ]; do
   case $1 in
     --cflags) echo MRUBY_CFLAGS;;
@@ -7,14 +24,7 @@ while [ $# -gt 0 ]; do
     --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;;
     --libs) echo MRUBY_LIBS;;
     --libmruby-path) echo MRUBY_LIBMRUBY_PATH;;
-    --help) echo "Usage: mruby-config [switches]"
-            echo "  switches:"
-            echo "  --cflags                    print flags passed to compiler"
-            echo "  --ldflags                   print flags passed to linker"
-            echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
-            echo "  --libs                      print linked libraries"
-            echo "  --libmruby-path             print libmruby path"
-            exit 0;;
+    *) print_help;;
   esac
   shift
 done

data/ext/enterprise_script_service/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb

@@ -13,14 +13,14 @@ def self.test(rubysource, testcase)
     script.flush
 
     # compile
-    `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"`
+    `#{cmd("mrbc")} -g -o "#{bin.path}" "#{script.path}"`
 
     # add mrdb quit
     testcase << {:cmd=>"quit"}
 
     stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n"
 
-    ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd|
+    ["#{cmd('mrdb')} #{script.path}", "#{cmd('mrdb')} -b #{bin.path}"].each do |cmd|
       o, s = Open3.capture2(cmd, :stdin_data => stdin_data)
 
       exp_vals = testcase.map{|t| t.fetch(:exp, nil)}
@@ -63,10 +63,7 @@ def self.test(rubysource, testcase)
   # ruby source
   src = "foo = 'foo'\n"
 
-  str = ""
-  103.times {
-    str += "1234567890"
-  }
+  str = ":#{'abcdefghij' * 103}"
   cmd = "p a=#{str}"
 
   # test case