diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-09 11:35:27 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-09 11:35:27 +0900 |
| commit | d95d55089de26784f78e66700d55bf858f1be0c2 (patch) | |
| tree | 53a368d640c46859af7e61b9a8068b63d0929dc9 | |
| parent | 6abb9de7e0fed2df2ffc391e738913d5c7b5e4bb (diff) | |
| parent | 7f3b8ddb5361b5ad7102f82d8a1212520958450b (diff) | |
| download | mruby-d95d55089de26784f78e66700d55bf858f1be0c2.tar.gz mruby-d95d55089de26784f78e66700d55bf858f1be0c2.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | examples/targets/ArduinoDue.rb | 3 | ||||
| -rw-r--r-- | src/parse.y | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/examples/targets/ArduinoDue.rb b/examples/targets/ArduinoDue.rb index 6dae85ca1..59101c2cc 100644 --- a/examples/targets/ArduinoDue.rb +++ b/examples/targets/ArduinoDue.rb @@ -53,6 +53,9 @@ MRuby::CrossBuild.new("Arduino Due") do |conf| #do not build executable test conf.build_mrbtest_lib_only + #disable C++ exception + conf.disable_cxx_exception + #gems from core conf.gem :core => "mruby-print" conf.gem :core => "mruby-math" diff --git a/src/parse.y b/src/parse.y index ec27a2c51..345ac5756 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3323,7 +3323,7 @@ backref_error(parser_state *p, node *n) yyerror_i(p, "can't set variable $%c", (int)(intptr_t)n->cdr); } else { - mrb_bug(p->mrb, "Internal error in backref_error() : n=>car == %d", c); + mrb_bug(p->mrb, "Internal error in backref_error() : n=>car == %S", mrb_fixnum_value(c)); } } |