script_core 0.1.1 → 0.2.0

data/ext/enterprise_script_service/mruby/test/t/syntax.rb

@@ -423,10 +423,11 @@ def test(block)
 end
 
 assert('method definition in cmdarg') do
-  if false
+  result = class MethodDefinitionInCmdarg
+    def self.bar(arg); arg end
     bar def foo; self.each do end end
   end
-  true
+  assert_equal(:foo, result)
 end
 
 assert('optional argument in the rhs default expressions') do
@@ -450,6 +451,18 @@ def t2(foo = foo())
   assert_nil(Proc.new {|foo = foo| foo}.call)
 end
 
+assert('local variable definition in default value and subsequent arguments') do
+  def m(a = b = 1, c) [a, b, c] end
+  assert_equal([1, 1, :c], m(:c))
+  assert_equal([:a, nil, :c], m(:a, :c))
+
+  def m(a = b = 1, &c) [a, b, c ? true : nil] end
+  assert_equal([1, 1, nil], m)
+  assert_equal([1, 1, true], m{})
+  assert_equal([:a, nil, nil], m(:a))
+  assert_equal([:a, nil, true], m(:a){})
+end
+
 assert('multiline comments work correctly') do
 =begin
 this is a comment with nothing after begin and end
@@ -653,4 +666,8 @@ def m a, b=1, *c, d, e:, f: 2, g:, **k, &l
   result = m(1, 2, e: 3, g: 4, h: 5, i: 6, &(l = ->{}))
   assert_equal([1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l], result)
 =end
+
+  def m(a: b = 1, c:) [a, b, c] end
+  assert_equal([1, 1, :c], m(c: :c))
+  assert_equal([:a, nil, :c], m(a: :a, c: :c))
 end

data/ext/enterprise_script_service/mruby/test/t/vformat.rb

@@ -0,0 +1,92 @@
+def assert_format(exp, args)
+  assert_equal(exp, TestVFormat.format(*args))
+end
+
+def assert_format_pattern(exp_pattern, args)
+  assert_match(exp_pattern, TestVFormat.format(*args))
+end
+
+# Pass if ArgumentError is raised or return value is +exp+.
+def assert_implementation_dependent(exp, args)
+  begin
+    ret = TestVFormat.format(*args)
+  rescue ArgumentError
+    return pass
+  end
+  if ret == exp
+    pass
+  else
+    flunk "", "Expected ArgumentError is raised or #{ret.inspect} to be #{exp}."
+  end
+end
+
+def sclass(v)
+  class << v
+    self
+  end
+end
+
+assert('mrb_vformat') do
+  n = TestVFormat::Native
+  assert_format '', ['']
+  assert_format 'No specifier!', ['No specifier!']
+  assert_format '`c`: C', ['`c`: %c', n.c(?C)]
+  assert_format '`d`: 123', ['`d`: %d', n.d(123)]
+  assert_format '`d`: -79', ['`d`: %d', n.d(-79)]
+  assert_format '`i`: 514', ['`i`: %i', n.i(514)]
+  assert_format '`i`: -83', ['`i`: %i', n.i(-83)]
+  assert_format '`t`: NilClass', ['`t`: %t', nil]
+  assert_format '`t`: FalseClass', ['`t`: %t', false]
+  assert_format '`t`: TrueClass', ['`t`: %t', true]
+  assert_format '`t`: Fixnum', ['`t`: %t', 0]
+  assert_format '`t`: Hash', ['`t`: %t', k: "value"]
+  assert_format_pattern '#<Class:#<Class:#<Hash:0x*>>>', ['%t', sclass({})]
+#  assert_format 'string and length', ['string %l length', n.s('andante'), n.l(3)]
+  assert_format '`n`: sym', ['`n`: %n', n.n(:sym)]
+  assert_format '%C文字列%', ['%s', n.s('%C文字列%')]
+  assert_format '`C`: Kernel module', ['`C`: %C module', n.C(Kernel)]
+  assert_format '`C`: NilClass', ['`C`: %C', n.C(nil.class)]
+  assert_format_pattern '#<Class:#<String:0x*>>', ['%C', n.C(sclass(""))]
+  assert_format '`T`: NilClass', ['`T`: %T', nil]
+  assert_format '`T`: FalseClass', ['`T`: %T', false]
+  assert_format '`T`: TrueClass', ['`T`: %T', true]
+  assert_format '`T`: Fixnum', ['`T`: %T', 0]
+  assert_format '`T`: Hash', ['`T`: %T', k: "value"]
+  assert_format_pattern 'Class', ['%T', sclass({})]
+  assert_format '`Y`: nil', ['`Y`: %Y', nil]
+  assert_format '`Y`: false', ['`Y`: %Y', false]
+  assert_format '`Y`: true', ['`Y`: %Y', true]
+  assert_format '`Y`: Fixnum', ['`Y`: %Y', 0]
+  assert_format '`Y`: Hash', ['`Y`: %Y', k: "value"]
+  assert_format 'Class', ['%Y', sclass({})]
+  assert_format_pattern '#<Class:#<String:0x*>>', ['%v', sclass("")]
+  assert_format '`v`: 1...3', ['`v`: %v', 1...3]
+  assert_format '`S`: {:a=>1, "b"=>"c"}', ['`S`: %S', a: 1, "b" => ?c]
+  assert_format 'percent: %', ['percent: %%']
+  assert_format '"I": inspect char', ['%!c: inspect char', n.c(?I)]
+  assert_format '709: inspect mrb_int', ['%!d: inspect mrb_int', n.i(709)]
+#  assert_format '"a\x00b\xff"', ['%!l', n.s("a\000b\xFFc\000d"), n.l(4)]
+  assert_format ':"&.": inspect symbol', ['%!n: inspect symbol', n.n(:'&.')]
+  assert_format 'inspect "String"', ['inspect %!v', 'String']
+  assert_format 'inspect Array: [1, :x, {}]', ['inspect Array: %!v', [1,:x,{}]]
+  assert_format_pattern '`!C`: #<Class:0x*>', ['`!C`: %!C', n.C(Class.new)]
+  assert_format 'to_s -> to_s: ab,cd', ['to_s -> to_s: %n,%v', n.n(:ab), 'cd']
+  assert_format 'to_s -> inspect: x:y', ['to_s -> inspect: %v%!v', 'x', :y]
+  assert_format 'inspect -> to_s: "a"b', ['inspect -> to_s: %!v%n', 'a', n.n(:b)]
+  assert_format 'Y -> to_s: nile', ['Y -> to_s: %Y%v', nil, "e"]
+  assert_format '"abc":Z', ['%!s%!n', n.s('abc'), n.n('Z'.to_sym)]
+  assert_format 'escape: \\%a,b,c,d', ['escape: \\\\\%a,b,\c%v', ',d']
+
+  assert_implementation_dependent 'unknown specifier: %^',
+                                  ['unknown specifier: %^']
+  assert_implementation_dependent 'unknown specifier with modifier: %!^',
+                                  ['unknown specifier with modifier: %!^']
+  assert_implementation_dependent 'termination is \\', ['termination is \\']
+  assert_implementation_dependent 'termination is %', ['termination is %']
+  assert_implementation_dependent 'termination is %!', ['termination is %!']
+
+  skip unless Object.const_defined?(:Float)
+  assert_format '`f`: 0.0125', ['`f`: %f', n.f(0.0125)]
+  assert_format '-Infinity', ['%f', n.f(-Float::INFINITY)]
+  assert_format 'NaN: Not a Number', ['%f: Not a Number', n.f(Float::NAN)]
+end

data/ext/enterprise_script_service/mruby/travis_config.rb

@@ -18,7 +18,7 @@
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
+  conf.cc.defines += %w(MRB_ENABLE_DEBUG_HOOK)
 
   conf.enable_test
 end
@@ -40,7 +40,7 @@
   toolchain :gcc
 
   conf.gembox 'full-core'
-  conf.cc.flags += %w(-Werror=declaration-after-statement -fpermissive)
+  conf.cc.flags += %w(-fpermissive)
   conf.compilers.each do |c|
     c.defines += %w(MRB_GC_FIXED_ARENA)
   end

data/ext/enterprise_script_service/mruby_config.rb

@@ -11,6 +11,8 @@
     Pathname.new(__FILE__).dirname.join("mruby_engine")
   end
 
+# https://github.com/mruby/mruby/blob/master/doc/guides/compile.md
+
 MRuby::Build.new do |conf|
   toolchain(:gcc)
 
@@ -27,6 +29,10 @@
     cc.flags += Flags.cflags
     cc.defines += Flags.io_safe_defines
   end
+
+  conf.linker do |linker|
+    linker.library_paths += Flags.library_paths
+  end
 end
 
 MRuby::CrossBuild.new("sandbox") do |conf|
@@ -43,4 +49,8 @@
     cc.flags += Flags.cflags
     cc.defines += Flags.defines
   end
+
+  conf.linker do |linker|
+    linker.library_paths += Flags.library_paths
+  end
 end

data/ext/enterprise_script_service/mruby_engine.cpp

@@ -164,7 +164,7 @@ bool me_mruby_engine_get_quota_exception_raised(struct me_mruby_engine *self) {
 static void mruby_engine_code_fetch_hook(
   struct mrb_state* mrb,
   struct mrb_irep *irep,
-  mrb_code *pc,
+  const mrb_code *pc,
   mrb_value *regs)
 {
   (void)irep;
@@ -202,7 +202,7 @@ struct me_mruby_engine *me_mruby_engine_new(
   }
 
   mrb_define_class(self->state, "ExitException", mrb_class_get(self->state, "Exception"));
-  mrb_define_method(self->state , self->state->kernel_module, "exit", mruby_engine_exit, 1);
+  mrb_define_method(self->state , self->state->kernel_module, "exit", mruby_engine_exit, MRB_ARGS_NONE());
 
   self->instruction_quota = instruction_quota;
   self->instruction_count = 0;

data/ext/enterprise_script_service/mruby_engine.gembox

@@ -4,6 +4,7 @@ MRuby::GemBox.new do |conf|
   conf.gem(core: "mruby-math")
   conf.gem(core: "mruby-time")
   conf.gem(core: "mruby-struct")
+  conf.gem(core: "mruby-compar-ext")
   conf.gem(core: "mruby-enum-ext")
   conf.gem(core: "mruby-string-ext")
   conf.gem(core: "mruby-numeric-ext")

data/ext/enterprise_script_service/msgpack/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 2019-05-27 version 3.2.0
+
+  * Fix invalid include (#783)
+  * Add timespec support (#781)
+  * Fix unchecked fnprintf on C (#780)
+  * Improve integer overflow checking on C (#776)
+  * Fix warnings on `-Wconversion` (#770, #777, #784)
+  * Fix invalid passed by value on aligned_zone_size_visitor (#764)
+  * Improve windows support (#757, #779)
+  * Fix msgpack::object size caluclation error (#754)
+  * Fix memory error on example code (#753)
+  * Fix redundant memory allocation on C (#747)
+  * Fix msgpack::type::tuple base class conversion (#743)
+
 # 2018-09-09 version 3.1.1
 
   * Add force endian set functionality (#736)

data/ext/enterprise_script_service/msgpack/Files.cmake

@@ -190,6 +190,7 @@ IF (MSGPACK_ENABLE_CXX)
         include/msgpack/adaptor/cpp11/forward_list.hpp
         include/msgpack/adaptor/cpp11/reference_wrapper.hpp
         include/msgpack/adaptor/cpp11/shared_ptr.hpp
+        include/msgpack/adaptor/cpp11/timespec.hpp
         include/msgpack/adaptor/cpp11/tuple.hpp
         include/msgpack/adaptor/cpp11/unique_ptr.hpp
         include/msgpack/adaptor/cpp11/unordered_map.hpp
@@ -231,6 +232,7 @@ IF (MSGPACK_ENABLE_CXX)
         include/msgpack/adaptor/vector_bool.hpp
         include/msgpack/adaptor/vector_char.hpp
         include/msgpack/adaptor/vector_unsigned_char.hpp
+        include/msgpack/adaptor/wstring.hpp
         include/msgpack/cpp_config.hpp
         include/msgpack/cpp_config_decl.hpp
         include/msgpack/create_object_visitor.hpp
@@ -551,6 +553,7 @@ IF (MSGPACK_ENABLE_CXX)
         include/msgpack/v1/adaptor/cpp11/forward_list.hpp
         include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
         include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
+        include/msgpack/v1/adaptor/cpp11/timespec.hpp
         include/msgpack/v1/adaptor/cpp11/tuple.hpp
         include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
         include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
@@ -605,6 +608,7 @@ IF (MSGPACK_ENABLE_CXX)
         include/msgpack/v1/adaptor/vector_bool.hpp
         include/msgpack/v1/adaptor/vector_char.hpp
         include/msgpack/v1/adaptor/vector_unsigned_char.hpp
+        include/msgpack/v1/adaptor/wstring.hpp
         include/msgpack/v1/cpp_config.hpp
         include/msgpack/v1/cpp_config_decl.hpp
         include/msgpack/v1/detail/cpp03_zone.hpp

data/ext/enterprise_script_service/msgpack/README.md

@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 3.1.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 3.2.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
 
 It's like JSON but smaller and faster.
 

data/ext/enterprise_script_service/msgpack/appveyor.yml

@@ -1,4 +1,4 @@
-version: 3.1.1.{build}
+version: 3.2.0.{build}
 
 image:
 - Visual Studio 2015

data/ext/enterprise_script_service/msgpack/erb/v1/cpp03_msgpack_tuple.hpp.erb

@@ -121,7 +121,7 @@ inline tuple<> make_tuple()
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>)
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>)
 {
     return tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
 }

data/ext/enterprise_script_service/msgpack/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb

@@ -54,7 +54,7 @@ tuple<> make_tuple();
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>);
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>);
 <%}%>
 /// @endcond
 

data/ext/enterprise_script_service/msgpack/erb/v1/cpp03_zone.hpp.erb

@@ -55,7 +55,7 @@ class zone {
             ++m_tail;
         }
         void push_expand(void (*func)(void*), void* data) {
-            const size_t nused = m_end - m_array;
+            const size_t nused = static_cast<size_t>(m_end - m_array);
             size_t nnext;
             if(nused == 0) {
                 nnext = (sizeof(finalizer) < 72/2) ?
@@ -201,12 +201,12 @@ inline char* zone::get_aligned(char* ptr, size_t align)
 inline void* zone::allocate_align(size_t size, size_t align)
 {
     char* aligned = get_aligned(m_chunk_list.m_ptr, align);
-    size_t adjusted_size = size + (aligned - m_chunk_list.m_ptr);
+    size_t adjusted_size = size + static_cast<size_t>(aligned - m_chunk_list.m_ptr);
     if (m_chunk_list.m_free < adjusted_size) {
         size_t enough_size = size + align - 1;
         char* ptr = allocate_expand(enough_size);
         aligned = get_aligned(ptr, align);
-        adjusted_size = size + (aligned - m_chunk_list.m_ptr);
+        adjusted_size = size + static_cast<size_t>(aligned - m_chunk_list.m_ptr);
     }
     m_chunk_list.m_free -= adjusted_size;
     m_chunk_list.m_ptr  += adjusted_size;

data/ext/enterprise_script_service/msgpack/example/boost/asio_send_recv.cpp

@@ -38,8 +38,8 @@ int main() {
                     std::cout << __LINE__ << ":" << e.message() << std::endl;
                     return;
                 }
-                unp.reserve_buffer(window_size);
                 do_async_read_some = [&] {
+                    unp.reserve_buffer(window_size);
                     ss.async_read_some(
                         boost::asio::buffer(unp.buffer(), window_size),
                         [&](boost::system::error_code const& e, std::size_t bytes_transferred) {

data/ext/enterprise_script_service/msgpack/include/msgpack/adaptor/cpp11/timespec.hpp

@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2019 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP11_TIMESPEC_HPP
+#define MSGPACK_TYPE_CPP11_TIMESPEC_HPP
+
+#include "msgpack/v1/adaptor/cpp11/timespec.hpp"
+
+#endif // MSGPACK_TYPE_CPP11_TIMESPEC_HPP

data/ext/enterprise_script_service/msgpack/include/msgpack/adaptor/wstring.hpp

@@ -0,0 +1,15 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_TYPE_WSTRING_HPP
+#define MSGPACK_TYPE_WSTRING_HPP
+
+#include "msgpack/v1/adaptor/wstring.hpp"
+
+#endif // MSGPACK_TYPE_WSTRING_HPP

data/ext/enterprise_script_service/msgpack/include/msgpack/object.h

@@ -97,8 +97,10 @@ typedef struct msgpack_object_kv {
     msgpack_object val;
 } msgpack_object_kv;
 
+#if !defined(_KERNEL_MODE)
 MSGPACK_DLLEXPORT
 void msgpack_object_print(FILE* out, msgpack_object o);
+#endif
 
 MSGPACK_DLLEXPORT
 int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object o);

data/ext/enterprise_script_service/msgpack/include/msgpack/pack_template.h

@@ -34,6 +34,10 @@
 #error msgpack_pack_append_buffer callback is not defined
 #endif
 
+#if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable : 4204)   /* nonstandard extension used: non-constant aggregate initializer */
+#endif
 
 /*
  * Integer
@@ -834,31 +838,31 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
     case 1: {
         unsigned char buf[2];
         buf[0] = 0xd4;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     case 2: {
         unsigned char buf[2];
         buf[0] = 0xd5;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     case 4: {
         unsigned char buf[2];
         buf[0] = 0xd6;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     case 8: {
         unsigned char buf[2];
         buf[0] = 0xd7;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     case 16: {
         unsigned char buf[2];
         buf[0] = 0xd8;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     default:
@@ -866,19 +870,19 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
             unsigned char buf[3];
             buf[0] = 0xc7;
             buf[1] = (unsigned char)l;
-            buf[2] = type;
+            buf[2] = (unsigned char)type;
             msgpack_pack_append_buffer(x, buf, 3);
         } else if(l < 65536) {
             unsigned char buf[4];
             buf[0] = 0xc8;
             _msgpack_store16(&buf[1], l);
-            buf[3] = type;
+            buf[3] = (unsigned char)type;
             msgpack_pack_append_buffer(x, buf, 4);
         } else {
             unsigned char buf[6];
             buf[0] = 0xc9;
             _msgpack_store32(&buf[1], l);
-            buf[5] = type;
+            buf[5] = (unsigned char)type;
             msgpack_pack_append_buffer(x, buf, 6);
         }
         break;
@@ -893,7 +897,7 @@ msgpack_pack_inline_func(_ext_body)(msgpack_pack_user x, const void* b, size_t l
 msgpack_pack_inline_func(_timestamp)(msgpack_pack_user x, const msgpack_timestamp* d)
 {
     if ((((int64_t)d->tv_sec) >> 34) == 0) {
-        uint64_t data64 = ((uint64_t) d->tv_nsec << 34) | d->tv_sec;
+        uint64_t data64 = ((uint64_t) d->tv_nsec << 34) | (uint64_t)d->tv_sec;
         if ((data64 & 0xffffffff00000000L) == 0)   {
             // timestamp 32
             char buf[4];
@@ -935,3 +939,7 @@ msgpack_pack_inline_func(_timestamp)(msgpack_pack_user x, const msgpack_timestam
 #undef msgpack_pack_real_int16
 #undef msgpack_pack_real_int32
 #undef msgpack_pack_real_int64
+
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif