webruby 0.2.7 → 0.9.1

data/modules/mruby/test/t/superclass.rb

@@ -0,0 +1,46 @@
+[
+  # [:Object, :implementation_defined_value, '15.2.2.1'],
+  [:Module, :Object, '15.2.2.2'],
+  [:Class, :Module, '15.2.3.2'],
+  [:NilClass, :Object, '15.2.4.2'],
+  [:TrueClass, :Object, '15.2.5.2'],
+  [:FalseClass, :Object, '15.2.6.2'],
+  [:Numeric, :Object, '15.2.7.2'],
+  [:Integer, :Numeric, '15.2.8.2'],
+  [:Float, :Numeric, '15.2.9.2'],
+  [:String, :Object, '15.2.10.2'],
+  [:Symbol, :Object, '15.2.11.2'],
+  [:Array, :Object, '15.2.12.2'],
+  [:Hash, :Object, '15.2.13.2'],
+  [:Range, :Object, '15.2.14.2'],
+#  [:Regexp, :Object, '15.2.15.2'],      #No Regexp in mruby core
+#  [:MatchData, :Object, '15.2.16.2'],
+  [:Proc, :Object, '15.2.17.2'],
+#  [:Struct, :Object, '15.2.18.2'],
+#  [:Time, :Object, '15.2.19.2'],
+#  [:IO, :Object, '15.2.20.2'],
+#  [:File, :IO, '15.2.21.2'],
+  [:Exception, :Object, '15.2.22.2'],
+  [:StandardError, :Exception, '15.2.23.2'],
+  [:ArgumentError, :StandardError, '15.2.24.2'],
+  [:LocalJumpError, :StandardError, '15.2.25.2'],
+  [:RangeError, :StandardError, '12.2.26.2'],
+  [:RegexpError, :StandardError, '12.2.27.2'],
+  [:RuntimeError, :StandardError, '12.2.28.2'],
+  [:TypeError, :StandardError, '12.2.29.2'],
+#  [:ZeroDivisionError, :StandardError, '12.2.30.2'],  # No ZeroDivisionError in mruby
+  [:NameError, :StandardError, '15.2.31.2'],
+  [:NoMethodError, :NameError, '15.2.32.2'],
+  [:IndexError, :StandardError, '15.2.33.2'],
+#  [:IOError, :StandardError, '12.2.34.2'],
+#  [:EOFError, :IOError, '12.2.35.2'],
+#  [:SystemCallError, :StandardError, '15.2.36.2'],
+  [:ScriptError, :Exception, '12.2.37.2'],
+  [:SyntaxError, :ScriptError, '12.2.38.2'],
+#  [:LoadError, :ScriptError, '12.2.39,2'],
+].each do |cls, super_cls, iso|
+  assert "Direct superclass of #{cls}", iso do
+    skip "#{cls} isn't defined" unless Object.const_defined? cls
+    assert_equal Object.const_get(super_cls), Object.const_get(cls).superclass
+  end
+end

data/modules/mruby/test/t/symbol.rb

@@ -5,10 +5,6 @@ assert('Symbol', '15.2.11') do
   assert_equal Class, Symbol.class
 end
 
-assert('Symbol superclass', '15.2.11.2') do
-  assert_equal Object, Symbol.superclass
-end
-
 assert('Symbol#===', '15.2.11.3.1') do
   assert_true :abc == :abc
   assert_false :abc == :cba

data/modules/mruby/test/t/syntax.rb

@@ -1,3 +1,12 @@
+assert('__FILE__') do
+  file = __FILE__
+  assert_true 'test/t/syntax.rb' == file || 'test\t\syntax.rb' == file
+end
+
+assert('__LINE__') do
+  assert_equal 7, __LINE__
+end
+
 assert('super', '11.3.4') do
   assert_raise NoMethodError do
     super
@@ -158,13 +167,50 @@ assert('Abbreviated variable assignment as returns') do
   assert_equal 1, Syntax4AbbrVarAsgnAsReturns::A.new.b
 end
 
-assert('Splat and mass assignment') do
+assert('Splat and multiple assignment') do
   *a = *[1,2,3]
   b, *c = *[7,8,9]
 
   assert_equal [1,2,3], a
   assert_equal 7, b
   assert_equal [8,9], c
+
+  (a, b), c = [1,2],3
+  assert_equal [1,2,3], [a,b,c]
+  (a, b), c = 1,2,3
+  assert_equal [1,nil,2], [a,b,c]
+end
+
+assert('Splat and multiple assignment from variable') do
+  a = [1, 2, 3]
+  b, *c = a
+
+  assert_equal 1, b
+  assert_equal [2, 3], c
+end
+
+assert('Splat and multiple assignment from variables') do
+  a = [1, 2, 3]
+  b = [4, 5, 6, 7]
+  c, d, *e, f, g = *a, *b
+
+  assert_equal 1, c
+  assert_equal 2, d
+  assert_equal [3, 4, 5], e
+  assert_equal 6, f
+  assert_equal 7, g
+end
+
+assert('Splat and multiple assignment in for') do
+  a = [1, 2, 3, 4, 5, 6, 7]
+  for b, c, *d, e, f in [a] do
+  end
+
+  assert_equal 1, b
+  assert_equal 2, c
+  assert_equal [3, 4, 5], d
+  assert_equal 6, e
+  assert_equal 7, f
 end
 
 assert('Return values of case statements') do
@@ -217,3 +263,90 @@ assert('splat in case statement') do
   assert_equal [5], resultb
   assert_equal [3,8], resultc
 end
+
+assert('External command execution.') do
+  class << Kernel
+    sym = '`'.to_sym
+    alias_method :old_cmd, sym
+
+    results = []
+    define_method(sym) do |str|
+      results.push str
+      str
+    end
+
+    `test` # NOVAL NODE_XSTR
+    `test dynamic #{sym}` # NOVAL NODE_DXSTR
+    assert_equal ['test', 'test dynamic `'], results
+
+    t = `test` # VAL NODE_XSTR
+    assert_equal 'test', t
+    assert_equal ['test', 'test dynamic `', 'test'], results
+
+    t = `test dynamic #{sym}` # VAL NODE_DXSTR
+    assert_equal 'test dynamic `', t
+    assert_equal ['test', 'test dynamic `', 'test', 'test dynamic `'], results
+
+    alias_method sym, :old_cmd
+  end
+  true
+end
+
+assert('parenthesed do-block in cmdarg') do
+  class ParenDoBlockCmdArg
+    def test(block)
+      block.call
+    end
+  end
+  x = ParenDoBlockCmdArg.new
+  result = x.test (Proc.new do :ok; end)
+  assert_equal :ok, result
+end
+
+assert('method definition in cmdarg') do
+  if false
+    bar def foo; self.each do end end
+  end
+  true
+end
+
+assert('optional argument in the rhs default expressions') do
+  class OptArgInRHS
+    def foo
+      "method called"
+    end
+    def t(foo = foo)
+      foo
+    end
+    def t2(foo = foo())
+      foo
+    end
+  end
+  o = OptArgInRHS.new
+  assert_nil(o.t)
+  assert_equal("method called", o.t2)
+end
+
+assert('optional block argument in the rhs default expressions') do
+  assert_nil(Proc.new {|foo = foo| foo}.call)
+end
+
+assert('multiline comments work correctly') do
+=begin
+this is a comment with nothing after begin and end
+=end
+=begin  this is a comment 
+this is a comment with extra after =begin
+=end
+=begin
+this is a comment that has =end with spaces after it
+=end  
+=begin this is a comment
+this is a comment that has extra after =begin and =end with spaces after it
+=end  
+  line = __LINE__
+=begin	this is a comment
+this is a comment that has extra after =begin and =end with tabs after it
+=end	xxxxxxxxxxxxxxxxxxxxxxxxxx
+  assert_equal(line + 4, __LINE__)
+end

data/modules/mruby/test/t/true.rb

@@ -5,12 +5,10 @@ assert('TrueClass', '15.2.5') do
   assert_equal Class, TrueClass.class
 end
 
-assert('TrueClass superclass', '15.2.5.2') do
-  assert_equal Object, TrueClass.superclass
-end
-
 assert('TrueClass true', '15.2.5.1') do
   assert_true true
+  assert_equal TrueClass, true.class
+  assert_false TrueClass.method_defined? :new
 end
 
 assert('TrueClass#&', '15.2.5.3.1') do

data/modules/mruby/test/t/typeerror.rb

@@ -4,8 +4,3 @@
 assert('TypeError', '15.2.29') do
   assert_equal Class, TypeError.class
 end
-
-assert('TypeError superclass', '15.2.29.2') do
-  assert_equal StandardError, TypeError.superclass
-end
-

data/modules/mruby/test/t/unicode.rb

@@ -0,0 +1,35 @@
+# Test of the \u notation
+
+assert('bare \u notation test') do
+  # Mininum and maximum one byte characters
+  assert_equal("\u0000", "\x00")
+  assert_equal("\u007F", "\x7F")
+
+  # Mininum and maximum two byte characters
+  assert_equal("\u0080", "\xC2\x80")
+  assert_equal("\u07FF", "\xDF\xBF")
+
+  # Mininum and maximum three byte characters
+  assert_equal("\u0800", "\xE0\xA0\x80")
+  assert_equal("\uFFFF", "\xEF\xBF\xBF")
+
+  # Four byte characters require the \U notation
+end
+
+assert('braced \u notation test') do
+  # Mininum and maximum one byte characters
+  assert_equal("\u{0000}", "\x00")
+  assert_equal("\u{007F}", "\x7F")
+
+  # Mininum and maximum two byte characters
+  assert_equal("\u{0080}", "\xC2\x80")
+  assert_equal("\u{07FF}", "\xDF\xBF")
+
+  # Mininum and maximum three byte characters
+  assert_equal("\u{0800}", "\xE0\xA0\x80")
+  assert_equal("\u{FFFF}", "\xEF\xBF\xBF")
+
+  # Mininum and maximum four byte characters
+  assert_equal("\u{10000}",  "\xF0\x90\x80\x80")
+  assert_equal("\u{10FFFF}", "\xF4\x8F\xBF\xBF")
+end

data/modules/mruby/tools/mrbc/mrbc.c

@@ -9,9 +9,6 @@
 #define RITEBIN_EXT ".mrb"
 #define C_EXT       ".c"
 
-void mrb_show_version(mrb_state *);
-void mrb_show_copyright(mrb_state *);
-
 struct mrbc_args {
   int argc;
   char **argv;
@@ -47,7 +44,7 @@ usage(const char *name)
 }
 
 static char *
-get_outfilename(mrb_state *mrb, char *infile, char *ext)
+get_outfilename(mrb_state *mrb, char *infile, const char *ext)
 {
   size_t infilelen;
   size_t extlen;
@@ -110,14 +107,14 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct mrbc_args *args)
         }
         break;
       case 'c':
-        args->check_syntax = 1;
+        args->check_syntax = TRUE;
         break;
       case 'v':
         if (!args->verbose) mrb_show_version(mrb);
-        args->verbose = 1;
+        args->verbose = TRUE;
         break;
       case 'g':
-        args->debug_info = 1;
+        args->debug_info = TRUE;
         break;
       case 'h':
         return -1;
@@ -130,7 +127,7 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct mrbc_args *args)
           exit(EXIT_SUCCESS);
         }
         else if (strcmp(argv[i] + 2, "verbose") == 0) {
-          args->verbose = 1;
+          args->verbose = TRUE;
           break;
         }
         else if (strcmp(argv[i] + 2, "copyright") == 0) {
@@ -186,12 +183,12 @@ load_file(mrb_state *mrb, struct mrbc_args *args)
   mrb_value result;
   char *input = args->argv[args->idx];
   FILE *infile;
-  int need_close = FALSE;
+  mrb_bool need_close = FALSE;
 
   c = mrbc_context_new(mrb);
   if (args->verbose)
-    c->dump_result = 1;
-  c->no_exec = 1;
+    c->dump_result = TRUE;
+  c->no_exec = TRUE;
   if (input[0] == '-' && input[1] == '\0') {
     infile = stdin;
   }
@@ -263,7 +260,7 @@ main(int argc, char **argv)
     fprintf(stderr, "%s: no program file given\n", args.prog);
     return EXIT_FAILURE;
   }
-  if (args.outfile == NULL) {
+  if (args.outfile == NULL && !args.check_syntax) {
     if (n + 1 == argc) {
       args.outfile = get_outfilename(mrb, argv[n], args.initname ? C_EXT : RITEBIN_EXT);
     }

data/modules/mruby/travis_config.rb

@@ -4,7 +4,10 @@ MRuby::Build.new('debug') do |conf|
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
+  conf.cc.flags += %w(-Werror=declaration-after-statement)
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_GC_STRESS MRB_GC_FIXED_ARENA)
+  end
 end
 
 MRuby::Build.new do |conf|
@@ -12,5 +15,22 @@ MRuby::Build.new do |conf|
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
+  conf.cc.flags += %w(-Werror=declaration-after-statement)
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_GC_FIXED_ARENA)
+  end
+  conf.enable_bintest
+end
+
+MRuby::Build.new('cxx_abi') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'full-core'
+  conf.cc.flags += %w(-Werror=declaration-after-statement)
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_GC_FIXED_ARENA)
+  end
+  conf.enable_bintest
+
+  enable_cxx_abi
 end