From f05580f1bc3bf22c54b4f9f3c2e3d55020e579bf Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Mon, 15 Jul 2013 01:52:47 +0900 Subject: Add comments. --- include/mruby/irep.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/mruby/irep.h b/include/mruby/irep.h index 856b12099..498b58ca3 100644 --- a/include/mruby/irep.h +++ b/include/mruby/irep.h @@ -11,10 +11,11 @@ extern "C" { #endif +/* Program data array struct */ typedef struct mrb_irep { uint32_t idx; - uint16_t nlocals; - uint16_t nregs; + uint16_t nlocals; /* Number of local variables */ + uint16_t nregs; /* Number of register variables */ uint8_t flags; mrb_code *iseq; -- cgit v1.2.3 From 7be117df4c0e9470e2c806e6132d57e98fbbc27b Mon Sep 17 00:00:00 2001 From: Carson McDonald Date: Wed, 17 Jul 2013 09:42:48 -0400 Subject: Fix string test for so that it works for int16 --- test/t/string.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/t/string.rb b/test/t/string.rb index ddae92d4a..c208835b4 100644 --- a/test/t/string.rb +++ b/test/t/string.rb @@ -399,12 +399,12 @@ end assert('String#to_i', '15.2.10.5.38') do a = ''.to_i - b = '123456789'.to_i + b = '32143'.to_i c = 'a'.to_i(16) d = '100'.to_i(2) assert_equal a, 0 - assert_equal b, 123456789 + assert_equal b, 32143 assert_equal c, 10 assert_equal d, 4 end -- cgit v1.2.3 From 4306fe798fc92e3a59c1dd3b020f6131c2e80ab4 Mon Sep 17 00:00:00 2001 From: kyab Date: Thu, 18 Jul 2013 00:14:03 +0900 Subject: Save mirb history when readline enabled --- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index eb7194f30..9f030c112 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -15,11 +15,19 @@ #include #include #ifdef ENABLE_READLINE +#include #include #include #endif #include + +#ifdef ENABLE_READLINE +static const char *history_file_name = ".mirb_history"; +char history_path[PATH_MAX]; +#endif + + static void p(mrb_state *mrb, mrb_value obj, int prompt) { @@ -268,6 +276,16 @@ main(int argc, char **argv) if (args.verbose) cxt->dump_result = 1; ai = mrb_gc_arena_save(mrb); + +#ifdef ENABLE_READLINE + using_history(); + strcpy(history_path, getenv("HOME")); + strcat(history_path, "/"); + strcat(history_path, history_file_name); + read_history(history_path); +#endif + + while (TRUE) { #ifndef ENABLE_READLINE print_cmdline(code_block_open); @@ -361,5 +379,9 @@ main(int argc, char **argv) mrbc_context_free(mrb, cxt); mrb_close(mrb); +#ifdef ENABLE_READLINE + write_history(history_path); +#endif + return 0; } -- cgit v1.2.3 From 1fe65b2522fb480a5c70a2ac5925c223efd9c492 Mon Sep 17 00:00:00 2001 From: kyab Date: Thu, 18 Jul 2013 18:15:05 +0900 Subject: Use env[USERPROFILE] for Windows --- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 9f030c112..3111eea8f 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -253,6 +253,7 @@ main(int argc, char **argv) int n; int code_block_open = FALSE; int ai; + char *home = NULL; /* new interpreter instance */ mrb = mrb_open(); @@ -279,7 +280,12 @@ main(int argc, char **argv) #ifdef ENABLE_READLINE using_history(); - strcpy(history_path, getenv("HOME")); + home = getenv("HOME"); +#ifdef _WIN32 + if (!home) + home = getenv("USERPROFILE"); +#endif + strcpy(history_path, home); strcat(history_path, "/"); strcat(history_path, history_file_name); read_history(history_path); -- cgit v1.2.3 From b9a32e434ab4e796c75aa98d29c65fb89024f3b0 Mon Sep 17 00:00:00 2001 From: Carson McDonald Date: Thu, 18 Jul 2013 09:47:48 -0400 Subject: Changed use of MRB_INT_MAX to MRB_INT_MAX-1 --- src/array.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/array.c b/src/array.c index ed087515a..b5bbdf0fa 100644 --- a/src/array.c +++ b/src/array.c @@ -19,7 +19,7 @@ #define ARY_DEFAULT_LEN 4 #define ARY_SHRINK_RATIO 5 /* must be larger than 2 */ #define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value)) -#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX) +#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX-1) static inline mrb_value ary_elt(mrb_value ary, mrb_int offset) @@ -40,7 +40,7 @@ ary_new_capa(mrb_state *mrb, mrb_int capa) if (capa > ARY_MAX_SIZE) { mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); } - blen = capa * sizeof(mrb_value) ; + blen = capa * sizeof(mrb_value); if (blen < capa) { mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); } -- cgit v1.2.3