From 536697f41e7e2844b67f2cc9dac76c14e631af81 Mon Sep 17 00:00:00 2001 From: yui-knk Date: Sat, 31 May 2014 14:00:30 +0900 Subject: Fix to not print unnecessary comma. When `n2->car` is 0 and `n2->cdd` is not 0, unnecessary comma was printed before first local variables. --- src/parse.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/parse.y b/src/parse.y index c6795fb65..9f185ee73 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5855,6 +5855,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) printf("NODE_SCOPE:\n"); { node *n2 = tree->car; + mrb_bool first_lval = TRUE; if (n2 && (n2->car || n2->cdr)) { dump_prefix(offset+1); @@ -5862,8 +5863,9 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) dump_prefix(offset+2); while (n2) { if (n2->car) { - if (n2 != tree->car) printf(", "); + if (!first_lval) printf(", "); printf("%s", mrb_sym2name(mrb, sym(n2->car))); + first_lval = FALSE; } n2 = n2->cdr; } @@ -6240,6 +6242,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) tree = tree->cdr; { node *n2 = tree->car; + mrb_bool first_lval = TRUE; if (n2 && (n2->car || n2->cdr)) { dump_prefix(offset+1); @@ -6247,8 +6250,9 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) dump_prefix(offset+2); while (n2) { if (n2->car) { - if (n2 != tree->car) printf(", "); + if (!first_lval) printf(", "); printf("%s", mrb_sym2name(mrb, sym(n2->car))); + first_lval = FALSE; } n2 = n2->cdr; } -- cgit v1.2.3 From 8d5f67e6f346353c8134e5aa896f7de6c2a05309 Mon Sep 17 00:00:00 2001 From: Santa Zhang Date: Tue, 24 Jun 2014 15:16:13 -0400 Subject: add a few const qualifier --- include/mruby/value.h | 2 +- mrbgems/mruby-random/src/mt19937ar.c | 4 ++-- mrbgems/mruby-string-utf8/src/string.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mruby/value.h b/include/mruby/value.h index 98af9626d..ab3adbd63 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -91,7 +91,7 @@ typedef short mrb_sym; # define PRIo64 "I64o" # define PRIx64 "I64x" # define PRIX64 "I64X" -static unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000; +static const unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000; # define INFINITY (*(float *)&IEEE754_INFINITY_BITS_SINGLE) # define NAN ((float)(INFINITY - INFINITY)) # else diff --git a/mrbgems/mruby-random/src/mt19937ar.c b/mrbgems/mruby-random/src/mt19937ar.c index 0e1279b34..310a276fa 100644 --- a/mrbgems/mruby-random/src/mt19937ar.c +++ b/mrbgems/mruby-random/src/mt19937ar.c @@ -32,7 +32,7 @@ void mrb_random_init_genrand(mt_state *t, unsigned long s) unsigned long mrb_random_genrand_int32(mt_state *t) { unsigned long y; - static unsigned long mag01[2]={0x0UL, MATRIX_A}; + static const unsigned long mag01[2]={0x0UL, MATRIX_A}; /* mag01[x] = x * MATRIX_A for x=0,1 */ if (t->mti >= N) { /* generate N words at one time */ @@ -126,7 +126,7 @@ void init_by_array(unsigned long init_key[], int key_length) unsigned long genrand_int32(void) { unsigned long y; - static unsigned long mag01[2]={0x0UL, MATRIX_A}; + static const unsigned long mag01[2]={0x0UL, MATRIX_A}; /* mag01[x] = x * MATRIX_A for x=0,1 */ if (mti >= N) { /* generate N words at one time */ diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c index 874fa8dbb..67f54ee02 100644 --- a/mrbgems/mruby-string-utf8/src/string.c +++ b/mrbgems/mruby-string-utf8/src/string.c @@ -19,7 +19,7 @@ static const char utf8len_codepage[256] = 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1, }; -static char utf8len_codepage_zero[256] = +static const char utf8len_codepage_zero[256] = { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, -- cgit v1.2.3