diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-02-20 23:15:27 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-02-20 23:15:27 +0900 |
| commit | 7317ba97e2b14f9466514030e135e3c2064223d7 (patch) | |
| tree | 25d7806a6983423738bd85bcecf2462750ed1fb1 | |
| parent | 8b44e8dbd8a86466625fffa3f4f17f755f0de61a (diff) | |
| parent | 1d40ae6c2461f2597577ed7e47e867c76f4982de (diff) | |
| download | mruby-7317ba97e2b14f9466514030e135e3c2064223d7.tar.gz mruby-7317ba97e2b14f9466514030e135e3c2064223d7.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | src/parse.y | 3 | ||||
| -rw-r--r-- | tasks/mrbgems_test.rake | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/parse.y b/src/parse.y index 3f9e91b69..365bc5f18 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3462,9 +3462,8 @@ parse_string(parser_state *p, int term) pushback(p, c); if (toklen(p)) { char msg[128]; - free(s); tokfix(p); - snprintf(msg, sizeof(msg), "unknown regexp option %s - %s", + snprintf(msg, sizeof(msg), "unknown regexp option%s - %s", toklen(p) > 1 ? "s" : "", tok(p)); yyerror(p, msg); } diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index 96b7b8522..2c8ee2ab2 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -16,7 +16,7 @@ MRuby.each_target do f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {] unless g.test_rbfiles.empty? f.puts %Q[ mrb_state *mrb2;] - f.puts %Q[ mrb_value val1, val2, ary1, ary2;] + f.puts %Q[ mrb_value val1, val2, ary1, ary2, test_args_hash;] f.puts %Q[ int ai;] g.test_rbfiles.count.times do |i| f.puts %Q[ ai = mrb_gc_arena_save(mrb);] @@ -29,7 +29,7 @@ MRuby.each_target do f.puts %Q[ mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));] if not g.test_args.empty? - f.puts %Q[ mrb_value test_args_hash = mrb_hash_new_capa(mrb, #{g.test_args.length}); ] + f.puts %Q[ test_args_hash = mrb_hash_new_capa(mrb, #{g.test_args.length}); ] g.test_args.each do |arg_name, arg_value| escaped_arg_name = arg_name.gsub('\\', '\\\\\\\\').gsub('"', '\"') escaped_arg_value = arg_value.gsub('\\', '\\\\\\\\').gsub('"', '\"') |