diff options
67 files changed, 2228 insertions, 1782 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f4179232..8f0d74f87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ pretest: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - script: "./minirake all test" + script: rake --verbose all test Test gcc-4.7 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -19,9 +19,9 @@ Test gcc-4.7 32bit: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -29,9 +29,9 @@ Test gcc-4.7 32bit_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -41,7 +41,7 @@ Test gcc-4.7 32bit_nan: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -51,7 +51,27 @@ Test gcc-4.7 32bit_nan_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.7 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.7 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test gcc-4.7 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -61,7 +81,7 @@ Test gcc-4.7 32bit_int16: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -71,7 +91,7 @@ Test gcc-4.7 32bit_int16_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -81,7 +101,7 @@ Test gcc-4.7 32bit_int16_nan: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -91,7 +111,7 @@ Test gcc-4.7 32bit_int16_nan_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -101,7 +121,7 @@ Test gcc-4.7 32bit_int64: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -111,7 +131,7 @@ Test gcc-4.7 32bit_int64_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -119,9 +139,9 @@ Test gcc-4.7 32bit_float: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -129,9 +149,29 @@ Test gcc-4.7 32bit_float_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.7 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.7 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -141,7 +181,7 @@ Test gcc-4.7 32bit_float_int16: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -151,7 +191,7 @@ Test gcc-4.7 32bit_float_int16_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -161,7 +201,7 @@ Test gcc-4.7 32bit_float_int64: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -171,7 +211,7 @@ Test gcc-4.7 32bit_float_int64_utf8: LD: gcc-4.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -179,9 +219,9 @@ Test gcc-4.7 64bit: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -189,9 +229,9 @@ Test gcc-4.7 64bit_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -201,7 +241,7 @@ Test gcc-4.7 64bit_nan: LD: gcc-4.7 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -211,7 +251,27 @@ Test gcc-4.7 64bit_nan_utf8: LD: gcc-4.7 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.7 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test gcc-4.7 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -221,7 +281,7 @@ Test gcc-4.7 64bit_int16: LD: gcc-4.7 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -231,7 +291,7 @@ Test gcc-4.7 64bit_int16_utf8: LD: gcc-4.7 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -241,7 +301,7 @@ Test gcc-4.7 64bit_int16_nan: LD: gcc-4.7 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -251,7 +311,7 @@ Test gcc-4.7 64bit_int16_nan_utf8: LD: gcc-4.7 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -259,9 +319,9 @@ Test gcc-4.7 64bit_int64: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -269,9 +329,29 @@ Test gcc-4.7 64bit_int64_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -279,9 +359,9 @@ Test gcc-4.7 64bit_float: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -289,9 +369,29 @@ Test gcc-4.7 64bit_float_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -301,7 +401,7 @@ Test gcc-4.7 64bit_float_int16: LD: gcc-4.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -311,7 +411,7 @@ Test gcc-4.7 64bit_float_int16_utf8: LD: gcc-4.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -319,9 +419,9 @@ Test gcc-4.7 64bit_float_int64: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.7 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 @@ -329,9 +429,29 @@ Test gcc-4.7 64bit_float_int64_utf8: CC: gcc-4.7 CXX: g++-4.7 LD: gcc-4.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.7 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc47_0.7 + variables: + CC: gcc-4.7 + CXX: g++-4.7 + LD: gcc-4.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -339,9 +459,9 @@ Test gcc-4.8 32bit: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -349,9 +469,9 @@ Test gcc-4.8 32bit_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -361,7 +481,7 @@ Test gcc-4.8 32bit_nan: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -371,7 +491,27 @@ Test gcc-4.8 32bit_nan_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.8 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.8 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test gcc-4.8 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -381,7 +521,7 @@ Test gcc-4.8 32bit_int16: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -391,7 +531,7 @@ Test gcc-4.8 32bit_int16_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -401,7 +541,7 @@ Test gcc-4.8 32bit_int16_nan: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -411,7 +551,7 @@ Test gcc-4.8 32bit_int16_nan_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -421,7 +561,7 @@ Test gcc-4.8 32bit_int64: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -431,7 +571,7 @@ Test gcc-4.8 32bit_int64_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -439,9 +579,9 @@ Test gcc-4.8 32bit_float: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -449,9 +589,29 @@ Test gcc-4.8 32bit_float_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.8 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.8 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -461,7 +621,7 @@ Test gcc-4.8 32bit_float_int16: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -471,7 +631,7 @@ Test gcc-4.8 32bit_float_int16_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -481,7 +641,7 @@ Test gcc-4.8 32bit_float_int64: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -491,7 +651,7 @@ Test gcc-4.8 32bit_float_int64_utf8: LD: gcc-4.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -499,9 +659,9 @@ Test gcc-4.8 64bit: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -509,9 +669,9 @@ Test gcc-4.8 64bit_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -521,7 +681,7 @@ Test gcc-4.8 64bit_nan: LD: gcc-4.8 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -531,7 +691,27 @@ Test gcc-4.8 64bit_nan_utf8: LD: gcc-4.8 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.8 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test gcc-4.8 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -541,7 +721,7 @@ Test gcc-4.8 64bit_int16: LD: gcc-4.8 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -551,7 +731,7 @@ Test gcc-4.8 64bit_int16_utf8: LD: gcc-4.8 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -561,7 +741,7 @@ Test gcc-4.8 64bit_int16_nan: LD: gcc-4.8 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -571,7 +751,7 @@ Test gcc-4.8 64bit_int16_nan_utf8: LD: gcc-4.8 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -579,9 +759,9 @@ Test gcc-4.8 64bit_int64: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -589,9 +769,29 @@ Test gcc-4.8 64bit_int64_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -599,9 +799,9 @@ Test gcc-4.8 64bit_float: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -609,9 +809,29 @@ Test gcc-4.8 64bit_float_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -621,7 +841,7 @@ Test gcc-4.8 64bit_float_int16: LD: gcc-4.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -631,7 +851,7 @@ Test gcc-4.8 64bit_float_int16_utf8: LD: gcc-4.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -639,9 +859,9 @@ Test gcc-4.8 64bit_float_int64: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.8 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 @@ -649,9 +869,29 @@ Test gcc-4.8 64bit_float_int64_utf8: CC: gcc-4.8 CXX: g++-4.8 LD: gcc-4.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.8 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc48_0.7 + variables: + CC: gcc-4.8 + CXX: g++-4.8 + LD: gcc-4.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -659,9 +899,9 @@ Test gcc-4.9 32bit: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -669,9 +909,9 @@ Test gcc-4.9 32bit_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -681,7 +921,7 @@ Test gcc-4.9 32bit_nan: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -691,7 +931,27 @@ Test gcc-4.9 32bit_nan_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.9 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.9 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test gcc-4.9 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -701,7 +961,7 @@ Test gcc-4.9 32bit_int16: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -711,7 +971,7 @@ Test gcc-4.9 32bit_int16_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -721,7 +981,7 @@ Test gcc-4.9 32bit_int16_nan: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -731,7 +991,7 @@ Test gcc-4.9 32bit_int16_nan_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -741,7 +1001,7 @@ Test gcc-4.9 32bit_int64: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -751,7 +1011,7 @@ Test gcc-4.9 32bit_int64_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -759,9 +1019,9 @@ Test gcc-4.9 32bit_float: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -769,9 +1029,29 @@ Test gcc-4.9 32bit_float_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.9 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-4.9 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -781,7 +1061,7 @@ Test gcc-4.9 32bit_float_int16: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -791,7 +1071,7 @@ Test gcc-4.9 32bit_float_int16_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -801,7 +1081,7 @@ Test gcc-4.9 32bit_float_int64: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -811,7 +1091,7 @@ Test gcc-4.9 32bit_float_int64_utf8: LD: gcc-4.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -819,9 +1099,9 @@ Test gcc-4.9 64bit: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -829,9 +1109,9 @@ Test gcc-4.9 64bit_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -841,7 +1121,7 @@ Test gcc-4.9 64bit_nan: LD: gcc-4.9 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -851,7 +1131,27 @@ Test gcc-4.9 64bit_nan_utf8: LD: gcc-4.9 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-4.9 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test gcc-4.9 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -861,7 +1161,7 @@ Test gcc-4.9 64bit_int16: LD: gcc-4.9 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -871,7 +1171,7 @@ Test gcc-4.9 64bit_int16_utf8: LD: gcc-4.9 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -881,7 +1181,7 @@ Test gcc-4.9 64bit_int16_nan: LD: gcc-4.9 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -891,7 +1191,7 @@ Test gcc-4.9 64bit_int16_nan_utf8: LD: gcc-4.9 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -899,9 +1199,9 @@ Test gcc-4.9 64bit_int64: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -909,9 +1209,29 @@ Test gcc-4.9 64bit_int64_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -919,9 +1239,9 @@ Test gcc-4.9 64bit_float: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -929,9 +1249,29 @@ Test gcc-4.9 64bit_float_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -941,7 +1281,7 @@ Test gcc-4.9 64bit_float_int16: LD: gcc-4.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -951,7 +1291,7 @@ Test gcc-4.9 64bit_float_int16_utf8: LD: gcc-4.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -959,9 +1299,9 @@ Test gcc-4.9 64bit_float_int64: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-4.9 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 @@ -969,9 +1309,29 @@ Test gcc-4.9 64bit_float_int64_utf8: CC: gcc-4.9 CXX: g++-4.9 LD: gcc-4.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-4.9 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc49_0.7 + variables: + CC: gcc-4.9 + CXX: g++-4.9 + LD: gcc-4.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -979,9 +1339,9 @@ Test gcc-5 32bit: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -989,9 +1349,9 @@ Test gcc-5 32bit_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1001,7 +1361,7 @@ Test gcc-5 32bit_nan: LD: gcc-5 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1011,7 +1371,27 @@ Test gcc-5 32bit_nan_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-5 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-5 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test gcc-5 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1021,7 +1401,7 @@ Test gcc-5 32bit_int16: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1031,7 +1411,7 @@ Test gcc-5 32bit_int16_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1041,7 +1421,7 @@ Test gcc-5 32bit_int16_nan: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1051,7 +1431,7 @@ Test gcc-5 32bit_int16_nan_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1061,7 +1441,7 @@ Test gcc-5 32bit_int64: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1071,7 +1451,7 @@ Test gcc-5 32bit_int64_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1079,9 +1459,9 @@ Test gcc-5 32bit_float: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1089,9 +1469,29 @@ Test gcc-5 32bit_float_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-5 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-5 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1101,7 +1501,7 @@ Test gcc-5 32bit_float_int16: LD: gcc-5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1111,7 +1511,7 @@ Test gcc-5 32bit_float_int16_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1121,7 +1521,7 @@ Test gcc-5 32bit_float_int64: LD: gcc-5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1131,7 +1531,7 @@ Test gcc-5 32bit_float_int64_utf8: LD: gcc-5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1139,9 +1539,9 @@ Test gcc-5 64bit: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1149,9 +1549,9 @@ Test gcc-5 64bit_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1161,7 +1561,7 @@ Test gcc-5 64bit_nan: LD: gcc-5 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1171,7 +1571,27 @@ Test gcc-5 64bit_nan_utf8: LD: gcc-5 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-5 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test gcc-5 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1181,7 +1601,7 @@ Test gcc-5 64bit_int16: LD: gcc-5 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1191,7 +1611,7 @@ Test gcc-5 64bit_int16_utf8: LD: gcc-5 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1201,7 +1621,7 @@ Test gcc-5 64bit_int16_nan: LD: gcc-5 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1211,7 +1631,7 @@ Test gcc-5 64bit_int16_nan_utf8: LD: gcc-5 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1219,9 +1639,9 @@ Test gcc-5 64bit_int64: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1229,9 +1649,29 @@ Test gcc-5 64bit_int64_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1239,9 +1679,9 @@ Test gcc-5 64bit_float: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1249,9 +1689,29 @@ Test gcc-5 64bit_float_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1261,7 +1721,7 @@ Test gcc-5 64bit_float_int16: LD: gcc-5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1271,7 +1731,7 @@ Test gcc-5 64bit_float_int16_utf8: LD: gcc-5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1279,9 +1739,9 @@ Test gcc-5 64bit_float_int64: CC: gcc-5 CXX: g++-5 LD: gcc-5 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-5 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 @@ -1289,9 +1749,29 @@ Test gcc-5 64bit_float_int64_utf8: CC: gcc-5 CXX: g++-5 LD: gcc-5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-5 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc5_0.7 + variables: + CC: gcc-5 + CXX: g++-5 + LD: gcc-5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1299,9 +1779,9 @@ Test gcc-6 32bit: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1309,9 +1789,9 @@ Test gcc-6 32bit_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1321,7 +1801,7 @@ Test gcc-6 32bit_nan: LD: gcc-6 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1331,7 +1811,27 @@ Test gcc-6 32bit_nan_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-6 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-6 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test gcc-6 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1341,7 +1841,7 @@ Test gcc-6 32bit_int16: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1351,7 +1851,7 @@ Test gcc-6 32bit_int16_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1361,7 +1861,7 @@ Test gcc-6 32bit_int16_nan: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1371,7 +1871,7 @@ Test gcc-6 32bit_int16_nan_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1381,7 +1881,7 @@ Test gcc-6 32bit_int64: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1391,7 +1891,7 @@ Test gcc-6 32bit_int64_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1399,9 +1899,9 @@ Test gcc-6 32bit_float: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1409,9 +1909,29 @@ Test gcc-6 32bit_float_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-6 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test gcc-6 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1421,7 +1941,7 @@ Test gcc-6 32bit_float_int16: LD: gcc-6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1431,7 +1951,7 @@ Test gcc-6 32bit_float_int16_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1441,7 +1961,7 @@ Test gcc-6 32bit_float_int64: LD: gcc-6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1451,7 +1971,7 @@ Test gcc-6 32bit_float_int64_utf8: LD: gcc-6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1459,9 +1979,9 @@ Test gcc-6 64bit: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1469,9 +1989,9 @@ Test gcc-6 64bit_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1481,7 +2001,7 @@ Test gcc-6 64bit_nan: LD: gcc-6 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1491,7 +2011,27 @@ Test gcc-6 64bit_nan_utf8: LD: gcc-6 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test gcc-6 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test gcc-6 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1501,7 +2041,7 @@ Test gcc-6 64bit_int16: LD: gcc-6 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1511,7 +2051,7 @@ Test gcc-6 64bit_int16_utf8: LD: gcc-6 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1521,7 +2061,7 @@ Test gcc-6 64bit_int16_nan: LD: gcc-6 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1531,7 +2071,7 @@ Test gcc-6 64bit_int16_nan_utf8: LD: gcc-6 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1539,9 +2079,9 @@ Test gcc-6 64bit_int64: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1549,9 +2089,29 @@ Test gcc-6 64bit_int64_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1559,9 +2119,9 @@ Test gcc-6 64bit_float: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1569,9 +2129,29 @@ Test gcc-6 64bit_float_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1581,7 +2161,7 @@ Test gcc-6 64bit_float_int16: LD: gcc-6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1591,7 +2171,7 @@ Test gcc-6 64bit_float_int16_utf8: LD: gcc-6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1599,9 +2179,9 @@ Test gcc-6 64bit_float_int64: CC: gcc-6 CXX: g++-6 LD: gcc-6 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test gcc-6 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 @@ -1609,9 +2189,29 @@ Test gcc-6 64bit_float_int64_utf8: CC: gcc-6 CXX: g++-6 LD: gcc-6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test gcc-6 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:gcc6_0.7 + variables: + CC: gcc-6 + CXX: g++-6 + LD: gcc-6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1619,9 +2219,9 @@ Test clang-3.5 32bit: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1629,9 +2229,9 @@ Test clang-3.5 32bit_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1641,7 +2241,7 @@ Test clang-3.5 32bit_nan: LD: clang-3.5 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1651,7 +2251,27 @@ Test clang-3.5 32bit_nan_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.5 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.5 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test clang-3.5 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1661,7 +2281,7 @@ Test clang-3.5 32bit_int16: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1671,7 +2291,7 @@ Test clang-3.5 32bit_int16_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1681,7 +2301,7 @@ Test clang-3.5 32bit_int16_nan: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1691,7 +2311,7 @@ Test clang-3.5 32bit_int16_nan_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1701,7 +2321,7 @@ Test clang-3.5 32bit_int64: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1711,7 +2331,7 @@ Test clang-3.5 32bit_int64_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1719,9 +2339,9 @@ Test clang-3.5 32bit_float: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1729,9 +2349,29 @@ Test clang-3.5 32bit_float_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.5 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.5 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1741,7 +2381,7 @@ Test clang-3.5 32bit_float_int16: LD: clang-3.5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1751,7 +2391,7 @@ Test clang-3.5 32bit_float_int16_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1761,7 +2401,7 @@ Test clang-3.5 32bit_float_int64: LD: clang-3.5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1771,7 +2411,7 @@ Test clang-3.5 32bit_float_int64_utf8: LD: clang-3.5 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1779,9 +2419,9 @@ Test clang-3.5 64bit: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1789,9 +2429,9 @@ Test clang-3.5 64bit_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1801,7 +2441,7 @@ Test clang-3.5 64bit_nan: LD: clang-3.5 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1811,7 +2451,27 @@ Test clang-3.5 64bit_nan_utf8: LD: clang-3.5 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.5 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test clang-3.5 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1821,7 +2481,7 @@ Test clang-3.5 64bit_int16: LD: clang-3.5 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1831,7 +2491,7 @@ Test clang-3.5 64bit_int16_utf8: LD: clang-3.5 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1841,7 +2501,7 @@ Test clang-3.5 64bit_int16_nan: LD: clang-3.5 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1851,7 +2511,7 @@ Test clang-3.5 64bit_int16_nan_utf8: LD: clang-3.5 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1859,9 +2519,9 @@ Test clang-3.5 64bit_int64: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1869,9 +2529,29 @@ Test clang-3.5 64bit_int64_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1879,9 +2559,9 @@ Test clang-3.5 64bit_float: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1889,9 +2569,29 @@ Test clang-3.5 64bit_float_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1901,7 +2601,7 @@ Test clang-3.5 64bit_float_int16: LD: clang-3.5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1911,7 +2611,7 @@ Test clang-3.5 64bit_float_int16_utf8: LD: clang-3.5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1919,9 +2619,9 @@ Test clang-3.5 64bit_float_int64: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.5 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang35_0.7 @@ -1929,9 +2629,29 @@ Test clang-3.5 64bit_float_int64_utf8: CC: clang-3.5 CXX: clang++-3.5 LD: clang-3.5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.5 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang35_0.7 + variables: + CC: clang-3.5 + CXX: clang++-3.5 + LD: clang-3.5 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1939,9 +2659,9 @@ Test clang-3.6 32bit: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1949,9 +2669,9 @@ Test clang-3.6 32bit_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1961,7 +2681,7 @@ Test clang-3.6 32bit_nan: LD: clang-3.6 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1971,7 +2691,27 @@ Test clang-3.6 32bit_nan_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.6 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.6 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test clang-3.6 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1981,7 +2721,7 @@ Test clang-3.6 32bit_int16: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -1991,7 +2731,7 @@ Test clang-3.6 32bit_int16_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2001,7 +2741,7 @@ Test clang-3.6 32bit_int16_nan: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2011,7 +2751,7 @@ Test clang-3.6 32bit_int16_nan_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2021,7 +2761,7 @@ Test clang-3.6 32bit_int64: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2031,7 +2771,7 @@ Test clang-3.6 32bit_int64_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2039,9 +2779,9 @@ Test clang-3.6 32bit_float: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2049,9 +2789,29 @@ Test clang-3.6 32bit_float_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.6 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.6 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2061,7 +2821,7 @@ Test clang-3.6 32bit_float_int16: LD: clang-3.6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2071,7 +2831,7 @@ Test clang-3.6 32bit_float_int16_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2081,7 +2841,7 @@ Test clang-3.6 32bit_float_int64: LD: clang-3.6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2091,7 +2851,7 @@ Test clang-3.6 32bit_float_int64_utf8: LD: clang-3.6 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2099,9 +2859,9 @@ Test clang-3.6 64bit: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2109,9 +2869,9 @@ Test clang-3.6 64bit_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2121,7 +2881,7 @@ Test clang-3.6 64bit_nan: LD: clang-3.6 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2131,7 +2891,27 @@ Test clang-3.6 64bit_nan_utf8: LD: clang-3.6 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.6 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test clang-3.6 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2141,7 +2921,7 @@ Test clang-3.6 64bit_int16: LD: clang-3.6 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2151,7 +2931,7 @@ Test clang-3.6 64bit_int16_utf8: LD: clang-3.6 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2161,7 +2941,7 @@ Test clang-3.6 64bit_int16_nan: LD: clang-3.6 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2171,7 +2951,7 @@ Test clang-3.6 64bit_int16_nan_utf8: LD: clang-3.6 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2179,9 +2959,9 @@ Test clang-3.6 64bit_int64: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2189,9 +2969,29 @@ Test clang-3.6 64bit_int64_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2199,9 +2999,9 @@ Test clang-3.6 64bit_float: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2209,9 +3009,29 @@ Test clang-3.6 64bit_float_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2221,7 +3041,7 @@ Test clang-3.6 64bit_float_int16: LD: clang-3.6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2231,7 +3051,7 @@ Test clang-3.6 64bit_float_int16_utf8: LD: clang-3.6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2239,9 +3059,9 @@ Test clang-3.6 64bit_float_int64: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.6 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang36_0.7 @@ -2249,9 +3069,29 @@ Test clang-3.6 64bit_float_int64_utf8: CC: clang-3.6 CXX: clang++-3.6 LD: clang-3.6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.6 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang36_0.7 + variables: + CC: clang-3.6 + CXX: clang++-3.6 + LD: clang-3.6 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2259,9 +3099,9 @@ Test clang-3.7 32bit: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2269,9 +3109,9 @@ Test clang-3.7 32bit_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2281,7 +3121,7 @@ Test clang-3.7 32bit_nan: LD: clang-3.7 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2291,7 +3131,27 @@ Test clang-3.7 32bit_nan_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.7 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.7 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test clang-3.7 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2301,7 +3161,7 @@ Test clang-3.7 32bit_int16: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2311,7 +3171,7 @@ Test clang-3.7 32bit_int16_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2321,7 +3181,7 @@ Test clang-3.7 32bit_int16_nan: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2331,7 +3191,7 @@ Test clang-3.7 32bit_int16_nan_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2341,7 +3201,7 @@ Test clang-3.7 32bit_int64: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2351,7 +3211,7 @@ Test clang-3.7 32bit_int64_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2359,9 +3219,9 @@ Test clang-3.7 32bit_float: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2369,9 +3229,29 @@ Test clang-3.7 32bit_float_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.7 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.7 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2381,7 +3261,7 @@ Test clang-3.7 32bit_float_int16: LD: clang-3.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2391,7 +3271,7 @@ Test clang-3.7 32bit_float_int16_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2401,7 +3281,7 @@ Test clang-3.7 32bit_float_int64: LD: clang-3.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2411,7 +3291,7 @@ Test clang-3.7 32bit_float_int64_utf8: LD: clang-3.7 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2419,9 +3299,9 @@ Test clang-3.7 64bit: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2429,9 +3309,9 @@ Test clang-3.7 64bit_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2441,7 +3321,7 @@ Test clang-3.7 64bit_nan: LD: clang-3.7 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2451,7 +3331,27 @@ Test clang-3.7 64bit_nan_utf8: LD: clang-3.7 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.7 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test clang-3.7 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2461,7 +3361,7 @@ Test clang-3.7 64bit_int16: LD: clang-3.7 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2471,7 +3371,7 @@ Test clang-3.7 64bit_int16_utf8: LD: clang-3.7 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2481,7 +3381,7 @@ Test clang-3.7 64bit_int16_nan: LD: clang-3.7 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2491,7 +3391,7 @@ Test clang-3.7 64bit_int16_nan_utf8: LD: clang-3.7 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2499,9 +3399,9 @@ Test clang-3.7 64bit_int64: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2509,9 +3409,29 @@ Test clang-3.7 64bit_int64_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2519,9 +3439,9 @@ Test clang-3.7 64bit_float: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2529,9 +3449,29 @@ Test clang-3.7 64bit_float_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2541,7 +3481,7 @@ Test clang-3.7 64bit_float_int16: LD: clang-3.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2551,7 +3491,7 @@ Test clang-3.7 64bit_float_int16_utf8: LD: clang-3.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2559,9 +3499,9 @@ Test clang-3.7 64bit_float_int64: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.7 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang37_0.7 @@ -2569,9 +3509,29 @@ Test clang-3.7 64bit_float_int64_utf8: CC: clang-3.7 CXX: clang++-3.7 LD: clang-3.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.7 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang37_0.7 + variables: + CC: clang-3.7 + CXX: clang++-3.7 + LD: clang-3.7 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2579,9 +3539,9 @@ Test clang-3.8 32bit: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2589,9 +3549,9 @@ Test clang-3.8 32bit_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2601,7 +3561,7 @@ Test clang-3.8 32bit_nan: LD: clang-3.8 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2611,7 +3571,27 @@ Test clang-3.8 32bit_nan_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.8 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.8 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test clang-3.8 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2621,7 +3601,7 @@ Test clang-3.8 32bit_int16: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2631,7 +3611,7 @@ Test clang-3.8 32bit_int16_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2641,7 +3621,7 @@ Test clang-3.8 32bit_int16_nan: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2651,7 +3631,7 @@ Test clang-3.8 32bit_int16_nan_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2661,7 +3641,7 @@ Test clang-3.8 32bit_int64: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2671,7 +3651,7 @@ Test clang-3.8 32bit_int64_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2679,9 +3659,9 @@ Test clang-3.8 32bit_float: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2689,9 +3669,29 @@ Test clang-3.8 32bit_float_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.8 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.8 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2701,7 +3701,7 @@ Test clang-3.8 32bit_float_int16: LD: clang-3.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2711,7 +3711,7 @@ Test clang-3.8 32bit_float_int16_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2721,7 +3721,7 @@ Test clang-3.8 32bit_float_int64: LD: clang-3.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2731,7 +3731,7 @@ Test clang-3.8 32bit_float_int64_utf8: LD: clang-3.8 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2739,9 +3739,9 @@ Test clang-3.8 64bit: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2749,9 +3749,9 @@ Test clang-3.8 64bit_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2761,7 +3761,7 @@ Test clang-3.8 64bit_nan: LD: clang-3.8 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2771,7 +3771,27 @@ Test clang-3.8 64bit_nan_utf8: LD: clang-3.8 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.8 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test clang-3.8 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2781,7 +3801,7 @@ Test clang-3.8 64bit_int16: LD: clang-3.8 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2791,7 +3811,7 @@ Test clang-3.8 64bit_int16_utf8: LD: clang-3.8 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2801,7 +3821,7 @@ Test clang-3.8 64bit_int16_nan: LD: clang-3.8 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2811,7 +3831,7 @@ Test clang-3.8 64bit_int16_nan_utf8: LD: clang-3.8 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2819,9 +3839,9 @@ Test clang-3.8 64bit_int64: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2829,9 +3849,29 @@ Test clang-3.8 64bit_int64_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2839,9 +3879,9 @@ Test clang-3.8 64bit_float: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2849,9 +3889,29 @@ Test clang-3.8 64bit_float_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2861,7 +3921,7 @@ Test clang-3.8 64bit_float_int16: LD: clang-3.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2871,7 +3931,7 @@ Test clang-3.8 64bit_float_int16_utf8: LD: clang-3.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2879,9 +3939,9 @@ Test clang-3.8 64bit_float_int64: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.8 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang38_0.7 @@ -2889,9 +3949,29 @@ Test clang-3.8 64bit_float_int64_utf8: CC: clang-3.8 CXX: clang++-3.8 LD: clang-3.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.8 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang38_0.7 + variables: + CC: clang-3.8 + CXX: clang++-3.8 + LD: clang-3.8 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2899,9 +3979,9 @@ Test clang-3.9 32bit: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 " LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2909,9 +3989,9 @@ Test clang-3.9 32bit_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-m32 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2921,7 +4001,7 @@ Test clang-3.9 32bit_nan: LD: clang-3.9 CFLAGS: "-m32 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2931,7 +4011,27 @@ Test clang-3.9 32bit_nan_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.9 32bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.9 32bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test Test clang-3.9 32bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2941,7 +4041,7 @@ Test clang-3.9 32bit_int16: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2951,7 +4051,7 @@ Test clang-3.9 32bit_int16_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2961,7 +4061,7 @@ Test clang-3.9 32bit_int16_nan: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2971,7 +4071,7 @@ Test clang-3.9 32bit_int16_nan_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2981,7 +4081,7 @@ Test clang-3.9 32bit_int64: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2991,7 +4091,7 @@ Test clang-3.9 32bit_int64_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -2999,9 +4099,9 @@ Test clang-3.9 32bit_float: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-m32 -DMRB_USE_FLOAT=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3009,9 +4109,29 @@ Test clang-3.9 32bit_float_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.9 32bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: "-m32" + script: env; rake --verbose all test +Test clang-3.9 32bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3021,7 +4141,7 @@ Test clang-3.9 32bit_float_int16: LD: clang-3.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3031,7 +4151,7 @@ Test clang-3.9 32bit_float_int16_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3041,7 +4161,7 @@ Test clang-3.9 32bit_float_int64: LD: clang-3.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 32bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3051,7 +4171,7 @@ Test clang-3.9 32bit_float_int64_utf8: LD: clang-3.9 CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" LDFLAGS: "-m32" - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3059,9 +4179,9 @@ Test clang-3.9 64bit: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-DMRB_WORD_BOXING=1" + CFLAGS: '' LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3069,9 +4189,9 @@ Test clang-3.9 64bit_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + CFLAGS: "-DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3081,7 +4201,7 @@ Test clang-3.9 64bit_nan: LD: clang-3.9 CFLAGS: "-DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3091,7 +4211,27 @@ Test clang-3.9 64bit_nan_utf8: LD: clang-3.9 CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test +Test clang-3.9 64bit_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test Test clang-3.9 64bit_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3101,7 +4241,7 @@ Test clang-3.9 64bit_int16: LD: clang-3.9 CFLAGS: "-DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3111,7 +4251,7 @@ Test clang-3.9 64bit_int16_utf8: LD: clang-3.9 CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_int16_nan: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3121,7 +4261,7 @@ Test clang-3.9 64bit_int16_nan: LD: clang-3.9 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_int16_nan_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3131,7 +4271,7 @@ Test clang-3.9 64bit_int16_nan_utf8: LD: clang-3.9 CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3139,9 +4279,9 @@ Test clang-3.9 64bit_int64: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3149,9 +4289,29 @@ Test clang-3.9 64bit_int64_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 + CFLAGS: "-DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3159,9 +4319,9 @@ Test clang-3.9 64bit_float: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3169,9 +4329,29 @@ Test clang-3.9 64bit_float_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_float_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_float_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float_int16: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3181,7 +4361,7 @@ Test clang-3.9 64bit_float_int16: LD: clang-3.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float_int16_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3191,7 +4371,7 @@ Test clang-3.9 64bit_float_int16_utf8: LD: clang-3.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float_int64: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3199,9 +4379,9 @@ Test clang-3.9 64bit_float_int64: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 - CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test Test clang-3.9 64bit_float_int64_utf8: stage: test image: registry.gitlab.com/dabroz/mruby:clang39_0.7 @@ -3209,6 +4389,26 @@ Test clang-3.9 64bit_float_int64_utf8: CC: clang-3.9 CXX: clang++-3.9 LD: clang-3.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_float_int64_word: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 + CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1" + LDFLAGS: '' + script: env; rake --verbose all test +Test clang-3.9 64bit_float_int64_word_utf8: + stage: test + image: registry.gitlab.com/dabroz/mruby:clang39_0.7 + variables: + CC: clang-3.9 + CXX: clang++-3.9 + LD: clang-3.9 CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1" LDFLAGS: '' - script: env; ./minirake --verbose all test + script: env; rake --verbose all test diff --git a/.travis.yml b/.travis.yml index 9ef7009a6..fde7f7525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,6 @@ matrix: - os: osx osx_image: xcode7.1 -addons: - apt: - packages: - - gperf - env: - MRUBY_CONFIG=travis_config.rb -script: "./minirake -j4 all test" +script: "rake -m && rake test" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a7428a88..0b632f51c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ things in mind before submitting your pull request: * Work on the latest possible state of **mruby/master** * Create a branch which is dedicated to your change -* Test your changes before creating a pull request (```./minirake test```) +* Test your changes before creating a pull request (```rake test```) * If possible write a test case which confirms your change * Don't mix several features or bug-fixes in one pull request * Create a meaningful commit message @@ -1,8 +1,6 @@ # mruby is using Rake (http://rake.rubyforge.org) as a build tool. -# We provide a minimalistic version called minirake inside of our -# codebase. -RAKE = ruby ./minirake +RAKE = rake all : $(RAKE) @@ -44,11 +44,7 @@ See the [compile.md](https://github.com/mruby/mruby/blob/master/doc/guides/compi To run the tests, execute the following from the project's root directory. - $ make test - -Or - - $ ruby ./minirake test + $ rake test ## Building documentation @@ -5,6 +5,8 @@ MRUBY_ROOT = File.dirname(File.expand_path(__FILE__)) MRUBY_BUILD_HOST_IS_CYGWIN = RUBY_PLATFORM.include?('cygwin') MRUBY_BUILD_HOST_IS_OPENBSD = RUBY_PLATFORM.include?('openbsd') +Rake.verbose(false) if Rake.verbose == Rake::DSL::DEFAULT + $LOAD_PATH << File.join(MRUBY_ROOT, "lib") # load build systems @@ -33,10 +35,9 @@ load "#{MRUBY_ROOT}/tasks/gitlab.rake" load "#{MRUBY_ROOT}/tasks/doc.rake" def install_D(src, dst) - opts = { :verbose => $verbose } - FileUtils.rm_f dst, opts - FileUtils.mkdir_p File.dirname(dst), opts - FileUtils.cp src, dst, opts + rm_f dst + mkdir_p File.dirname(dst) + cp src, dst end ############################## @@ -144,16 +145,16 @@ end desc "clean all built and in-repo installed artifacts" task :clean do MRuby.each_target do |t| - FileUtils.rm_rf t.build_dir, { :verbose => $verbose } + rm_rf t.build_dir end - FileUtils.rm_f depfiles, { :verbose => $verbose } + rm_f depfiles puts "Cleaned up target build folder" end desc "clean everything!" task :deep_clean => ["clean", "clean_doc"] do MRuby.each_target do |t| - FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose } + rm_rf t.gem_clone_dir end puts "Cleaned up mrbgems build folder" end diff --git a/appveyor_config.rb b/appveyor_config.rb index b50a9e4ef..fd14f4a4c 100644 --- a/appveyor_config.rb +++ b/appveyor_config.rb @@ -1,23 +1,10 @@ -MRuby::Build.new('debug') do |conf| - toolchain :visualcpp - enable_debug - - # include all core GEMs - conf.gembox 'full-core' - conf.compilers.each do |c| - c.defines += %w(MRB_GC_STRESS MRB_GC_FIXED_ARENA MRB_METHOD_CACHE) - end - - build_mrbc_exec -end - MRuby::Build.new('full-debug') do |conf| toolchain :visualcpp enable_debug # include all core GEMs conf.gembox 'full-core' - conf.cc.defines += %w(MRB_ENABLE_DEBUG_HOOK) + conf.cc.defines += %w(MRB_GC_STRESS MRB_METHOD_CACHE MRB_ENABLE_DEBUG_HOOK) conf.enable_test end diff --git a/doc/guides/compile.md b/doc/guides/compile.md index 6a093310a..ba23fcfb4 100644 --- a/doc/guides/compile.md +++ b/doc/guides/compile.md @@ -32,10 +32,10 @@ All tools necessary to compile mruby can be set or modified here. In case you want to maintain an additional *build_config.rb* you can define a customized path using the *$MRUBY_CONFIG* environment variable. -To compile just call `./minirake` inside of the mruby source root. To -generate and execute the test tools call `./minirake test`. To clean -all build files call `./minirake clean`. To see full command line on -build, call `./minirake -v`. +To compile just call `rake` inside of the mruby source root. To +generate and execute the test tools call `rake test`. To clean +all build files call `rake clean`. To see full command line on +build, call `rake -v`. ## Build Configuration diff --git a/doc/guides/mrbgems.md b/doc/guides/mrbgems.md index 184f62954..ffbf17f26 100644 --- a/doc/guides/mrbgems.md +++ b/doc/guides/mrbgems.md @@ -45,8 +45,8 @@ conf.gem mgem: 'mruby-redis', checksum_hash: '3446d19fc4a3f9697b5ddbf2a904f301c4 If there is missing dependencies, mrbgem dependencies solver will reference mrbgem from core or mgem-list. -To pull all gems from remote GIT repository on build, call ```./minirake -p```, -or ```./minirake --pull-gems```. +To pull all gems from remote GIT repository on build, call ```rake -p```, +or ```rake --pull-gems```. NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version. @@ -235,7 +235,7 @@ So it is recommended not to put GEM's local header files on include/. These exports are retroactive. For example: when B depends to C and A depends to B, A will get include paths exported by C. -Exported include_paths are automatically appended to GEM local include_paths by Minirake. +Exported include_paths are automatically appended to GEM local include_paths by rake. You can use `spec.export_include_paths` accessor if you want more complex build. diff --git a/include/mruby.h b/include/mruby.h index 04e0c0df7..671053ff9 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -1232,6 +1232,7 @@ MRB_API mrb_noreturn void mrb_raise(mrb_state *mrb, struct RClass *c, const char MRB_API mrb_noreturn void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...); MRB_API mrb_noreturn void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...); MRB_API mrb_noreturn void mrb_frozen_error(mrb_state *mrb, void *frozen_obj); +MRB_API mrb_noreturn void mrb_argnum_error(mrb_state *mrb, mrb_int argc, int min, int max); MRB_API void mrb_warn(mrb_state *mrb, const char *fmt, ...); MRB_API mrb_noreturn void mrb_bug(mrb_state *mrb, const char *fmt, ...); MRB_API void mrb_print_backtrace(mrb_state *mrb); diff --git a/include/mruby/class.h b/include/mruby/class.h index 7c925f3b3..cbf96fef2 100644 --- a/include/mruby/class.h +++ b/include/mruby/class.h @@ -90,10 +90,17 @@ mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv); void mrb_class_name_class(mrb_state*, struct RClass*, struct RClass*, mrb_sym); mrb_bool mrb_const_name_p(mrb_state*, const char*, mrb_int); mrb_value mrb_class_find_path(mrb_state*, struct RClass*); +mrb_value mrb_mod_to_s(mrb_state*, mrb_value); void mrb_gc_mark_mt(mrb_state*, struct RClass*); size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*); void mrb_gc_free_mt(mrb_state*, struct RClass*); +#ifdef MRB_METHOD_CACHE +void mrb_mc_clear_by_class(mrb_state *mrb, struct RClass* c); +#else +#define mrb_mc_clear_by_class(mrb,c) +#endif + MRB_END_DECL #endif /* MRUBY_CLASS_H */ diff --git a/include/mruby/string.h b/include/mruby/string.h index 80b8fbaf8..a518d9147 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -447,7 +447,7 @@ MRB_API int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2); */ MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str); -mrb_value mrb_str_pool(mrb_state *mrb, mrb_value str); +mrb_value mrb_str_pool(mrb_state *mrb, const char *s, mrb_int len, mrb_bool nofree); uint32_t mrb_str_hash(mrb_state *mrb, mrb_value str); mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str); diff --git a/lib/mruby-core-ext.rb b/lib/mruby-core-ext.rb index 7b78bfa91..433f1bb1a 100644 --- a/lib/mruby-core-ext.rb +++ b/lib/mruby-core-ext.rb @@ -20,27 +20,8 @@ class String end end -$pp_show = true - -if $verbose.nil? - if Rake.respond_to?(:verbose) && !Rake.verbose.nil? - if Rake.verbose.class == TrueClass - # verbose message logging - $pp_show = false - else - $pp_show = true - Rake.verbose(false) - end - else - # could not identify rake version - $pp_show = false - end -else - $pp_show = false if $verbose -end - def _pp(cmd, src, tgt=nil, options={}) - return unless $pp_show + return if Rake.verbose width = 5 template = options[:indent] ? "%#{width*options[:indent]}s %s %s" : "%-#{width}s %s %s" diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 55b82cd2b..1e0ef67d7 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -173,7 +173,7 @@ module MRuby obj = objfile(cxx_src) if obj.nil? file cxx_src => [src, __FILE__] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name IO.write t.name, <<EOS #define __STDC_CONSTANT_MACROS #define __STDC_LIMIT_MACROS @@ -280,7 +280,7 @@ EOS if name.is_a?(Array) name.flatten.map { |n| cygwin_filename(n) } else - `cygpath -w "#{filename(name)}"`.strip + '"%s"' % `cygpath -w "#{filename(name)}"`.strip end end @@ -320,7 +320,7 @@ EOS end def verbose_flag - $verbose ? ' -v' : '' + Rake.verbose ? ' -v' : '' end def run_test @@ -386,7 +386,7 @@ EOS end def run_test - @test_runner.runner_options << ' -v' if $verbose + @test_runner.runner_options << verbose_flag mrbtest = exefile("#{build_dir}/bin/mrbtest") if (@test_runner.command == nil) puts "You should run #{mrbtest} on target device." diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index 0a6d6b818..03d814800 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -89,7 +89,7 @@ module MRuby end def run(outfile, infile, _defines=[], _include_paths=[], _flags=[]) - FileUtils.mkdir_p File.dirname(outfile) + mkdir_p File.dirname(outfile) _pp "CC", infile.relative_path, outfile.relative_path if MRUBY_BUILD_HOST_IS_CYGWIN _run compile_options, { :flags => all_flags(_defines, _include_paths, _flags), @@ -205,7 +205,7 @@ module MRuby end def run(outfile, objfiles, _libraries=[], _library_paths=[], _flags=[], _flags_before_libraries=[], _flags_after_libraries=[]) - FileUtils.mkdir_p File.dirname(outfile) + mkdir_p File.dirname(outfile) library_flags = [libraries, _libraries].flatten.map { |d| option_library % d } _pp "LD", outfile.relative_path @@ -235,7 +235,7 @@ module MRuby end def run(outfile, objfiles) - FileUtils.mkdir_p File.dirname(outfile) + mkdir_p File.dirname(outfile) _pp "AR", outfile.relative_path if MRUBY_BUILD_HOST_IS_CYGWIN _run archive_options, { :outfile => cygwin_filename(outfile), :objs => cygwin_filename(objfiles).join(' ') } @@ -255,7 +255,7 @@ module MRuby end def run(outfile, infile) - FileUtils.mkdir_p File.dirname(outfile) + mkdir_p File.dirname(outfile) _pp "YACC", infile.relative_path, outfile.relative_path _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) } end @@ -271,7 +271,7 @@ module MRuby end def run(outfile, infile) - FileUtils.mkdir_p File.dirname(outfile) + mkdir_p File.dirname(outfile) _pp "GPERF", infile.relative_path, outfile.relative_path _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) } end @@ -279,36 +279,42 @@ module MRuby class Command::Git < Command attr_accessor :flags - attr_accessor :clone_options, :pull_options, :checkout_options, :reset_options + attr_accessor :clone_options, :pull_options, :checkout_options, :checkout_detach_options, :reset_options def initialize(build) super @command = 'git' @flags = %w[] @clone_options = "clone %{flags} %{url} %{dir}" - @pull_options = "--git-dir #{shellquote("%{repo_dir}/.git")} --work-tree #{shellquote("%{repo_dir}")} pull" - @checkout_options = "--git-dir #{shellquote("%{repo_dir}/.git")} --work-tree #{shellquote("%{repo_dir}")} checkout %{checksum_hash}" - @reset_options = "--git-dir #{shellquote("%{repo_dir}/.git")} --work-tree #{shellquote("%{repo_dir}")} reset %{checksum_hash}" + @pull_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} pull" + @checkout_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} checkout %{checksum_hash}" + @checkout_detach_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} checkout --detach %{checksum_hash}" + @reset_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} reset %{checksum_hash}" end def run_clone(dir, url, _flags = []) _pp "GIT", url, dir.relative_path - _run clone_options, { :flags => [flags, _flags].flatten.join(' '), :url => url, :dir => filename(dir) } + _run clone_options, { :flags => [flags, _flags].flatten.join(' '), :url => shellquote(url), :dir => shellquote(filename(dir)) } end def run_pull(dir, url) _pp "GIT PULL", url, dir.relative_path - _run pull_options, { :repo_dir => dir } + _run pull_options, { :repo_dir => shellquote(dir) } end def run_checkout(dir, checksum_hash) - _pp "GIT CHECKOUT", checksum_hash - _run checkout_options, { :checksum_hash => checksum_hash, :repo_dir => dir } + _pp "GIT CHECKOUT", dir, checksum_hash + _run checkout_options, { :checksum_hash => checksum_hash, :repo_dir => shellquote(dir) } + end + + def run_checkout_detach(dir, checksum_hash) + _pp "GIT CHECKOUT DETACH", dir, checksum_hash + _run checkout_detach_options, { :checksum_hash => checksum_hash, :repo_dir => shellquote(dir) } end def run_reset_hard(dir, checksum_hash) - _pp "GIT RESET", checksum_hash - _run reset_options, { :checksum_hash => checksum_hash, :repo_dir => dir } + _pp "GIT RESET", dir, checksum_hash + _run reset_options, { :checksum_hash => checksum_hash, :repo_dir => shellquote(dir) } end def commit_hash(dir) @@ -336,7 +342,7 @@ module MRuby _pp "MRBC", f.relative_path, nil, :indent => 2 end cmd = "#{filename @command} #{@compile_options % {:funcname => funcname}} #{filename(infiles).join(' ')}" - print("#{cmd}\n") if $verbose + puts cmd if Rake.verbose IO.popen(cmd, 'r+') do |io| out.puts io.read end diff --git a/lib/mruby/build/load_gems.rb b/lib/mruby/build/load_gems.rb index f6deb5168..522b8a17e 100644 --- a/lib/mruby/build/load_gems.rb +++ b/lib/mruby/build/load_gems.rb @@ -57,7 +57,7 @@ module MRuby if File.exist? mgem_list_dir git.run_pull mgem_list_dir, mgem_list_url if $pull_gems else - FileUtils.mkdir_p mgem_list_dir + mkdir_p mgem_list_dir git.run_clone mgem_list_dir, mgem_list_url, "--depth 1" end @@ -86,28 +86,27 @@ module MRuby if File.exist?(gemdir) if $pull_gems - git.run_pull gemdir, url # Jump to the top of the branch - git.run_checkout(gemdir, branch) - git.run_reset_hard gemdir, "origin/#{branch}" + git.run_checkout gemdir, branch + git.run_pull gemdir, url elsif params[:checksum_hash] - git.run_reset_hard(gemdir, params[:checksum_hash]) + git.run_checkout_detach gemdir, params[:checksum_hash] elsif lock - git.run_reset_hard(gemdir, lock['commit']) + git.run_checkout_detach gemdir, lock['commit'] end else options = [params[:options]] || [] options << "--recursive" options << "--branch \"#{branch}\"" options << "--depth 1" unless params[:checksum_hash] - FileUtils.mkdir_p "#{gem_clone_dir}" + mkdir_p "#{gem_clone_dir}" git.run_clone gemdir, url, options # Jump to the specified commit if params[:checksum_hash] - git.run_reset_hard gemdir, params[:checksum_hash] + git.run_checkout_detach gemdir, params[:checksum_hash] elsif lock - git.run_reset_hard gemdir, lock['commit'] + git.run_checkout_detach gemdir, lock['commit'] end end diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb index a1cdb28af..4214ceb08 100644 --- a/lib/mruby/gem.rb +++ b/lib/mruby/gem.rb @@ -157,7 +157,7 @@ module MRuby def define_gem_init_builder file objfile("#{build_dir}/gem_init") => [ "#{build_dir}/gem_init.c", File.join(dir, "mrbgem.rake") ] file "#{build_dir}/gem_init.c" => [build.mrbcfile, __FILE__] + [rbfiles].flatten do |t| - FileUtils.mkdir_p build_dir + mkdir_p build_dir generate_gem_init("#{build_dir}/gem_init.c") end end @@ -1,621 +1,2 @@ -#!/usr/bin/env ruby - -# Original is https://github.com/jimweirich/rake/ -# Copyright (c) 2003 Jim Weirich -# License: MIT-LICENSE - -require 'getoptlong' -require 'fileutils' - -$rake_fiber_table = {} -$rake_jobs = 1 -$rake_failed = [] - -class String - def ext(newext='') - return self.dup if ['.', '..'].include? self - if newext != '' - newext = (newext =~ /^\./) ? newext : ("." + newext) - end - self.chomp(File.extname(self)) << newext - end - - def pathmap(spec=nil, &block) - return self if spec.nil? - result = '' - spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag| - case frag - when '%f' - result << File.basename(self) - when '%n' - result << File.basename(self).ext - when '%d' - result << File.dirname(self) - when '%x' - result << File.extname(self) - when '%X' - result << self.ext - when '%p' - result << self - when '%s' - result << (File::ALT_SEPARATOR || File::SEPARATOR) - when '%-' - # do nothing - when '%%' - result << "%" - when /%(-?\d+)d/ - result << pathmap_partial($1.to_i) - when /^%\{([^}]*)\}(\d*[dpfnxX])/ - patterns, operator = $1, $2 - result << pathmap('%' + operator).pathmap_replace(patterns, &block) - when /^%/ - fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'" - else - result << frag - end - end - result - end -end - -module MiniRake - class Task - TASKS = Hash.new - RULES = Array.new - - # List of prerequisites for a task. - attr_reader :prerequisites - - # Source dependency for rule synthesized tasks. Nil if task was not - # sythesized from a rule. - attr_accessor :source - - # Create a task named +task_name+ with no actions or prerequisites.. - # use +enhance+ to add actions and prerequisites. - def initialize(task_name) - @name = task_name - @prerequisites = [] - @actions = [] - end - - # Enhance a task with prerequisites or actions. Returns self. - def enhance(deps=nil, &block) - @prerequisites |= deps if deps - @actions << block if block_given? - self - end - - # Name of the task. - def name - @name.to_s - end - - def done?; @done end - def running?; @running end - - # Invoke the task if it is needed. Prerequisites are invoked first. - def invoke - puts "Invoke #{name} (already=[#{@already_invoked}], needed=[#{needed?}])" if $trace - return if @already_invoked - prerequisites = @prerequisites.collect{ |n| n.is_a?(Proc) ? n.call(name) : n }.flatten - prerequisites.each do |n| - t = Task[n] - unless t.done? - return prerequisites.select{|v| v = Task[v]; v && (!v.done? || !v.running?) } - end - end - - @already_invoked = true - - if needed? - @running = true - if $rake_root_fiber - return Fiber.new do - self.execute - $rake_root_fiber.transfer - end - else - self.execute - end - end - - @done = true - end - - # Execute the actions associated with this task. - def execute - puts "Execute #{name}" if $trace - self.class.enhance_with_matching_rule(name) if @actions.empty? - unless $dryrun - @actions.each { |act| act.call(self) } - end - @done = true - @running = false - end - - # Is this task needed? - def needed? - true - end - - # Timestamp for this task. Basic tasks return the current time for - # their time stamp. Other tasks can be more sophisticated. - def timestamp - Time.now - end - - # Class Methods ---------------------------------------------------- - - class << self - - # Clear the task list. This cause rake to immediately forget all - # the tasks that have been assigned. (Normally used in the unit - # tests.) - def clear - TASKS.clear - RULES.clear - end - - # List of all defined tasks. - def tasks - TASKS.keys.sort.collect { |tn| Task[tn] } - end - - # Return a task with the given name. If the task is not currently - # known, try to synthesize one from the defined rules. If no - # rules are found, but an existing file matches the task name, - # assume it is a file task with no dependencies or actions. - def [](task_name) - task_name = task_name.to_s - if task = TASKS[task_name] - return task - end - if task = enhance_with_matching_rule(task_name) - return task - end - if File.exist?(task_name) - return FileTask.define_task(task_name) - end - fail "Don't know how to rake #{task_name}" - end - - # Define a task given +args+ and an option block. If a rule with - # the given name already exists, the prerequisites and actions are - # added to the existing task. - def define_task(args, &block) - task_name, deps = resolve_args(args) - lookup(task_name).enhance([deps].flatten, &block) - end - - # Define a rule for synthesizing tasks. - def create_rule(args, &block) - pattern, deps = resolve_args(args) - pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern - RULES << [pattern, deps, block] - end - - - # Lookup a task. Return an existing task if found, otherwise - # create a task of the current type. - def lookup(task_name) - name = task_name.to_s - TASKS[name] ||= self.new(name) - end - - # If a rule can be found that matches the task name, enhance the - # task with the prerequisites and actions from the rule. Set the - # source attribute of the task appropriately for the rule. Return - # the enhanced task or nil of no rule was found. - def enhance_with_matching_rule(task_name, level=0) - fail "Rule Recursion Too Deep: #{task_name}" if level >= 16 - RULES.each do |pattern, extensions, block| - next unless pattern && pattern.match(task_name) - sources = extensions.flat_map do |ext| - case ext - when /%/ - task_name.pathmap(ext) - when %r{/} - ext - when /^\./ - source = task_name.sub(pattern, ext) - source == ext ? task_name.ext(ext) : source - when String - ext - when Proc, Method - ext.arity == 1 ? ext.call(task_name) : ext.call - else - fail "Don't know how to handle rule dependent: #{ext.inspect}" - end - end - prereqs = sources.map do |source| - if File.exist?(source) || TASKS[source] - source - elsif parent = enhance_with_matching_rule(source, level + 1) - parent.name - else - break nil - end - end - if prereqs - task = FileTask.define_task(task_name => prereqs, &block) - task.source = prereqs.first - return task - end - end - nil - end - - private - - # Resolve the arguments for a task/rule. - def resolve_args(args) - case args - when Hash - fail "Too Many Task Names: #{args.keys.join(' ')}" if args.size > 1 - fail "No Task Name Given" if args.size < 1 - task_name = args.keys[0] - deps = args[task_name] - deps = [deps] if (String===deps) || (Regexp===deps) || (Proc===deps) - else - task_name = args - deps = [] - end - [task_name, deps] - end - end - end - - - ###################################################################### - class FileTask < Task - # Is this file task needed? Yes if it doesn't exist, or if its time - # stamp is out of date. - def needed? - return true unless File.exist?(name) - prerequisites = @prerequisites.collect{ |n| n.is_a?(Proc) ? n.call(name) : n }.flatten - latest_prereq = prerequisites.collect{|n| Task[n].timestamp}.max - return false if latest_prereq.nil? - timestamp < latest_prereq - end - - # Time stamp for file task. - def timestamp - return Time.at(0) unless File.exist?(name) - stat = File::stat(name.to_s) - stat.directory? ? Time.at(0) : stat.mtime - end - end - - module DSL - # Declare a basic task. - def task(args, &block) - MiniRake::Task.define_task(args, &block) - end - - # Declare a file task. - def file(args, &block) - MiniRake::FileTask.define_task(args, &block) - end - - # Declare a set of files tasks to create the given directories on - # demand. - def directory(args, &block) - MiniRake::FileTask.define_task(args) do |t| - block.call(t) unless block.nil? - dir = args.is_a?(Hash) ? args.keys.first : args - (dir.split(File::SEPARATOR) + ['']).inject do |acc, part| - (acc + File::SEPARATOR).tap do |d| - Dir.mkdir(d) unless File.exists? d - end + part - end - end - end - - # Declare a rule for auto-tasks. - def rule(args, &block) - MiniRake::Task.create_rule(args, &block) - end - - # Write a message to standard out if $verbose is enabled. - def log(msg) - print " " if $trace && $verbose - puts msg if $verbose - end - - # Run the system command +cmd+. - def sh(cmd) - puts cmd if $verbose - - if !$rake_root_fiber || Fiber.current == $rake_root_fiber - system(cmd) or fail "Command Failed: [#{cmd}]" - return - end - - pid = Process.spawn(cmd) - $rake_fiber_table[pid] = { - fiber: Fiber.current, - command: cmd, - process_waiter: Process.detach(pid) - } - $rake_root_fiber.transfer - end - - def desc(text) - end - end -end - -Rake = MiniRake -extend MiniRake::DSL - - -###################################################################### -# Task Definition Functions ... - -###################################################################### -# Rake main application object. When invoking +rake+ from the command -# line, a RakeApp object is created and run. -# -class RakeApp - RAKEFILES = ['rakefile', 'Rakefile'] - - OPTIONS = [ - ['--dry-run', '-n', GetoptLong::NO_ARGUMENT, - "Do a dry run without executing actions."], - ['--help', '-H', GetoptLong::NO_ARGUMENT, - "Display this help message."], - ['--libdir', '-I', GetoptLong::REQUIRED_ARGUMENT, - "Include LIBDIR in the search path for required modules."], - ['--nosearch', '-N', GetoptLong::NO_ARGUMENT, - "Do not search parent directories for the Rakefile."], - ['--quiet', '-q', GetoptLong::NO_ARGUMENT, - "Do not log messages to standard output (default)."], - ['--rakefile', '-f', GetoptLong::REQUIRED_ARGUMENT, - "Use FILE as the rakefile."], - ['--require', '-r', GetoptLong::REQUIRED_ARGUMENT, - "Require MODULE before executing rakefile."], - ['--tasks', '-T', GetoptLong::NO_ARGUMENT, - "Display the tasks and dependencies, then exit."], - ['--pull-gems','-p', GetoptLong::NO_ARGUMENT, - "Pull all git mrbgems."], - ['--trace', '-t', GetoptLong::NO_ARGUMENT, - "Turn on invoke/execute tracing."], - ['--usage', '-h', GetoptLong::NO_ARGUMENT, - "Display usage."], - ['--verbose', '-v', GetoptLong::NO_ARGUMENT, - "Log message to standard output."], - ['--directory', '-C', GetoptLong::REQUIRED_ARGUMENT, - "Change executing directory of rakefiles."], - ['--jobs', '-j', GetoptLong::REQUIRED_ARGUMENT, - 'Execute rake with parallel jobs.'] - ] - - # Create a RakeApp object. - def initialize - @rakefile = nil - @nosearch = false - end - - # True if one of the files in RAKEFILES is in the current directory. - # If a match is found, it is copied into @rakefile. - def have_rakefile - RAKEFILES.each do |fn| - if File.exist?(fn) - @rakefile = fn - return true - end - end - return false - end - - # Display the program usage line. - def usage - puts "rake [-f rakefile] {options} targets..." - end - - # Display the rake command line help. - def help - usage - puts - puts "Options are ..." - puts - OPTIONS.sort.each do |long, short, mode, desc| - if mode == GetoptLong::REQUIRED_ARGUMENT - if desc =~ /\b([A-Z]{2,})\b/ - long = long + "=#{$1}" - end - end - printf " %-20s (%s)\n", long, short - printf " %s\n", desc - end - end - - # Display the tasks and dependencies. - def display_tasks - MiniRake::Task.tasks.each do |t| - puts "#{t.class} #{t.name}" - t.prerequisites.each { |pre| puts " #{pre}" } - end - end - - # Return a list of the command line options supported by the - # program. - def command_line_options - OPTIONS.collect { |lst| lst[0..-2] } - end - - # Do the option defined by +opt+ and +value+. - def do_option(opt, value) - case opt - when '--dry-run' - $dryrun = true - $trace = true - when '--help' - help - exit - when '--libdir' - $:.push(value) - when '--nosearch' - @nosearch = true - when '--quiet' - $verbose = false - when '--rakefile' - RAKEFILES.clear - RAKEFILES << value - when '--require' - require value - when '--tasks' - $show_tasks = true - when '--pull-gems' - $pull_gems = true - when '--trace' - $trace = true - when '--usage' - usage - exit - when '--verbose' - $verbose = true - when '--version' - puts "rake, version #{RAKEVERSION}" - exit - when '--directory' - Dir.chdir value - when '--jobs' - $rake_jobs = [value.to_i, 1].max - else - fail "Unknown option: #{opt}" - end - end - - # Read and handle the command line options. - def handle_options - $verbose = false - $pull_gems = false - opts = GetoptLong.new(*command_line_options) - opts.each { |opt, value| do_option(opt, value) } - end - - # Run the +rake+ application. - def run - handle_options - - unless $rake_root_fiber - require 'fiber' - $rake_root_fiber = Fiber.current - end - - begin - here = Dir.pwd - while ! have_rakefile - Dir.chdir("..") - if Dir.pwd == here || @nosearch - fail "No Rakefile found (looking for: #{RAKEFILES.join(', ')})" - end - here = Dir.pwd - end - root_tasks = [] - ARGV.each do |task_name| - if /^(\w+)=(.*)/.match(task_name) - ENV[$1] = $2 - else - root_tasks << task_name - end - end - puts "(in #{Dir.pwd})" - $rakefile = @rakefile - load @rakefile - if $show_tasks - display_tasks - else - root_tasks.push("default") if root_tasks.empty? - # revese tasks for popping - root_tasks.reverse! - - tasks = [] - until root_tasks.empty? - root_name = root_tasks.pop - tasks << root_name - until tasks.empty? - task_name = tasks.pop - t = MiniRake::Task[task_name] - f = t.invoke - - # append additional tasks to task queue - if f.kind_of?(Array) - tasks.push(*f) - tasks.uniq! - end - - unless f.kind_of? Fiber - tasks.insert 0, task_name unless t.done? - if root_name == task_name - wait_process - end - next - end - - wait_process while $rake_fiber_table.size >= $rake_jobs - - f.transfer - end - end - - wait_process until $rake_fiber_table.empty? - end - rescue Exception => e - begin - $rake_failed << e - wait_process until $rake_fiber_table.empty? - rescue Exception => next_e - e = next_e - retry - end - end - - return if $rake_failed.empty? - - puts "rake aborted!" - $rake_failed.each do |ex| - puts ex.message - if $trace || $verbose - puts ex.backtrace.join("\n") - else - puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || "" - end - end - exit 1 - end - - def wait_process(count = 0) - dur = [0.0001 * (10 ** count), 1].min - sleep dur - - exited = [] - $rake_fiber_table.each do |pid, v| - exited << pid unless v[:process_waiter].alive? - end - - exited.each do |pid| - ent = $rake_fiber_table.delete pid - st = ent[:process_waiter].value - - # ignore process that isn't created by `sh` method - return if ent.nil? - - if st.exitstatus != 0 - raise "Command Failed: [#{ent[:command]}]" - end - - fail 'task scheduling bug!' if $rake_fiber_table.size >= $rake_jobs - - ent[:fiber].transfer - end - - wait_process(count + 1) if !$rake_fiber_table.empty? && exited.empty? - end - -end - -if __FILE__ == $0 then - RakeApp.new.run -end +#! /usr/bin/env ruby +exec "rake", *ARGV diff --git a/mrbgems/mruby-bin-config/mrbgem.rake b/mrbgems/mruby-bin-config/mrbgem.rake index 3a0a1b897..6005a876d 100644 --- a/mrbgems/mruby-bin-config/mrbgem.rake +++ b/mrbgems/mruby-bin-config/mrbgem.rake @@ -17,7 +17,7 @@ unless MRuby::Build.current.kind_of?(MRuby::CrossBuild) }] tmplt = File.read(tmplt_path) File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config)) - FileUtils.chmod(0755, t.name) + chmod(0755, t.name) end end end diff --git a/mrbgems/mruby-bin-debugger/bintest/print.rb b/mrbgems/mruby-bin-debugger/bintest/print.rb index 6675392b8..a8401963f 100644 --- a/mrbgems/mruby-bin-debugger/bintest/print.rb +++ b/mrbgems/mruby-bin-debugger/bintest/print.rb @@ -1,9 +1,10 @@ require 'open3' require 'tempfile' +require 'strscan' class BinTest_MrubyBinDebugger - @debug1=false - @debug2=true +# @debug1=false +# @debug2=true def self.test(rubysource, testcase) script, bin = Tempfile.new(['test', '.rb']), Tempfile.new(['test', '.mrb']) @@ -19,10 +20,20 @@ class BinTest_MrubyBinDebugger stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n" + prompt = /^\(#{Regexp.escape(script.path)}:\d+\) / ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd| o, s = Open3.capture2(cmd, :stdin_data => stdin_data) + scanner = StringScanner.new(o) + scanner.skip_until(prompt) + testcase.each do |tc| + exp = tc[:exp] + if exp + act = scanner.scan_until(/\n/) + break unless assert_operator act, :start_with?, exp + end + scanner.skip_until(prompt) + end - exp_vals = testcase.map{|t| t.fetch(:exp, nil)} =begin if @debug1 o.split("\n").each_with_index do |i,actual| @@ -41,14 +52,6 @@ end assert_true actual.include?(exp) unless exp.nil? end =end - idx = 0 - exp_vals.each do |exp| - next if exp.nil? - idx = o.index(exp, idx) - assert_false idx.nil? - break unless idx - idx += 1 - end end end end @@ -90,8 +93,8 @@ assert('mruby-bin-debugger(print) error') do # test case tc = [] - tc << {:cmd=>"p (1+2", :exp=>'$1 = SyntaxError'} - tc << {:cmd=>"p bar", :exp=>'$2 = (eval):2: undefined method'} + tc << {:cmd=>"p (1+2", :exp=>'$1 = line 1: syntax error'} + tc << {:cmd=>"p bar", :exp=>'$2 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -588,7 +591,7 @@ SRC tc << {:cmd=>'p foo=[foo,bar,baz]', :exp=>'$2 = ["foo", "bar", "baz"]'} tc << {:cmd=>'p undefined=-1', :exp=>'$3 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$4 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$4 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -626,7 +629,7 @@ SRC tc << {:cmd=>'p [a,b]', :exp=>'$13 = [20, 10]'} tc << {:cmd=>'p undefined=-1', :exp=>'$14 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -694,8 +697,7 @@ SRC tc << {:cmd=>'p [a,b]', :exp=>'$13 = [20, 10]'} tc << {:cmd=>'p undefined=-1', :exp=>'$14 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end - diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index 4c8c680cb..716b79c88 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -183,7 +183,7 @@ partial_hook(struct mrb_parser_state *p) return -1; } fn = args->argv[args->idx++]; - p->f = fopen(fn, "r"); + p->f = fopen(fn, "rb"); if (p->f == NULL) { fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, fn); return -1; @@ -210,7 +210,7 @@ load_file(mrb_state *mrb, struct mrbc_args *args) } else { need_close = TRUE; - if ((infile = fopen(input, "r")) == NULL) { + if ((infile = fopen(input, "rb")) == NULL) { fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, input); return mrb_nil_value(); } diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 89343f16d..717d9eb9a 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -599,7 +599,7 @@ new_lit(codegen_scope *s, mrb_value val) switch (mrb_type(val)) { case MRB_TT_STRING: - *pv = mrb_str_pool(s->mrb, val); + *pv = mrb_str_pool(s->mrb, RSTRING_PTR(val), RSTRING_LEN(val), RSTR_NOFREE_P(RSTRING(val))); break; #ifndef MRB_WITHOUT_FLOAT @@ -771,7 +771,7 @@ lambda_body(codegen_scope *s, node *tree, int blk) s->ainfo = (((ma+oa) & 0x3f) << 7) /* (12bits = 5:1:5:1) */ | ((ra & 0x1) << 6) | ((pa & 0x1f) << 1) - | (kd & 0x1); + | ((ka | kd) != 0 ? 0x01 : 0x00); genop_W(s, OP_ENTER, a); /* generate jump table for optional arguments initializer */ pos = new_label(s); diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index cf5f5230f..993cbca8c 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -74,8 +74,6 @@ typedef unsigned int stack_type; #define NUM_SUFFIX_R (1<<0) #define NUM_SUFFIX_I (1<<1) -#define NUMPARAM_MAX 9 - static inline mrb_sym intern_cstr_gen(parser_state *p, const char *s) { @@ -320,19 +318,19 @@ locals_node(parser_state *p) static void nvars_nest(parser_state *p) { - p->nvars = cons(p->nvars, nint(0)); + p->nvars = cons(nint(0), p->nvars); } static void nvars_block(parser_state *p) { - p->nvars = cons(p->nvars, nint(-2)); + p->nvars = cons(nint(-2), p->nvars); } static void nvars_unnest(parser_state *p) { - p->nvars = p->nvars->car; + p->nvars = p->nvars->cdr; } /* (:scope (vars..) (prog...)) */ @@ -673,12 +671,9 @@ new_cvar(parser_state *p, mrb_sym sym) static node* new_nvar(parser_state *p, int num) { - if (!p->nvars || intn(p->nvars->cdr) < -1) { - yyerror(p, "numbered parameter outside block"); - } else { - int nvars = intn(p->nvars->cdr); - p->nvars->cdr = nint(nvars > num ? nvars : num); - } + int nvars = intn(p->nvars->car); + + p->nvars->car = nint(nvars > num ? nvars : num); return cons((node*)NODE_NVAR, nint(num)); } @@ -840,16 +835,17 @@ new_block_arg(parser_state *p, node *a) } static node* -setup_args(parser_state *p, node *a) +setup_numparams(parser_state *p, node *a) { - int nvars = intn(p->nvars->cdr); + int nvars = intn(p->nvars->car); if (nvars > 0) { int i; mrb_sym sym; // m || opt || rest || tail if (a && (a->car || (a->cdr && a->cdr->car) || (a->cdr->cdr && a->cdr->cdr->car) || (a->cdr->cdr->cdr->cdr && a->cdr->cdr->cdr->cdr->car))) { yyerror(p, "ordinary parameter is defined"); - } else { + } + else { node* args = 0; for (i = nvars; i > 0; i--) { char buf[3]; @@ -871,7 +867,7 @@ setup_args(parser_state *p, node *a) static node* new_block(parser_state *p, node *a, node *b) { - a = setup_args(p, a); + a = setup_numparams(p, a); return list4((node*)NODE_BLOCK, locals_node(p), a, b); } @@ -879,7 +875,6 @@ new_block(parser_state *p, node *a, node *b) static node* new_lambda(parser_state *p, node *a, node *b) { - a = setup_args(p, a); return list4((node*)NODE_LAMBDA, locals_node(p), a, b); } @@ -1312,7 +1307,6 @@ heredoc_end(parser_state *p) p->parsing_heredoc = p->parsing_heredoc->cdr; if (p->parsing_heredoc == NULL) { p->lstate = EXPR_BEG; - p->cmd_start = TRUE; end_strterm(p); p->lex_strterm = p->lex_strterm_before_heredoc; p->lex_strterm_before_heredoc = NULL; @@ -1957,6 +1951,10 @@ lhs : variable backref_error(p, $1); $$ = 0; } + | tNUMPARAM + { + yyerror(p, "can't assign to numbered parameter"); + } ; cname : tIDENTIFIER @@ -2347,7 +2345,7 @@ opt_block_arg : comma block_arg ; comma : ',' - | ',' heredoc_bodies + | ',' opt_nl heredoc_bodies ; args : arg @@ -2482,7 +2480,6 @@ primary : literal | tLAMBDA { local_nest(p); - nvars_nest(p); $<num>$ = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } @@ -2496,7 +2493,6 @@ primary : literal p->lpar_beg = $<num>2; $$ = new_lambda(p, $3, $5); local_unnest(p); - nvars_unnest(p); p->cmdarg_stack = $<stack>4; CMDARG_LEXPOP(); } @@ -3282,6 +3278,10 @@ var_lhs : variable { assignable(p, $1); } + | tNUMPARAM + { + yyerror(p, "can't assign to numbered parameter"); + } ; var_ref : variable @@ -3542,6 +3542,11 @@ f_bad_arg : tCONSTANT yyerror(p, "formal argument cannot be a class variable"); $$ = 0; } + | tNUMPARAM + { + yyerror(p, "formal argument cannot be a numbered parameter"); + $$ = 0; + } ; f_norm_arg : f_bad_arg @@ -3703,24 +3708,28 @@ assocs : assoc $$ = list1($1); NODE_LINENO($$, $1); } - | assocs ',' assoc + | assocs comma assoc { $$ = push($1, $3); } ; +label_tag : tLABEL_TAG + | tLABEL_TAG heredoc_bodies + ; + assoc : arg tASSOC arg { void_expr_error(p, $1); void_expr_error(p, $3); $$ = cons($1, $3); } - | tIDENTIFIER tLABEL_TAG arg + | tIDENTIFIER label_tag arg { void_expr_error(p, $3); $$ = cons(new_sym(p, $1), $3); } - | string_fragment tLABEL_TAG arg + | string_fragment label_tag arg { void_expr_error(p, $3); if ($1->car == (node*)NODE_DSTR) { @@ -3988,6 +3997,13 @@ nextc(parser_state *p) if (c >= 0) { p->column++; } + if (c == '\r') { + const int lf = nextc(p); + if (lf == '\n') { + return '\n'; + } + pushback(p, lf); + } return c; eof: @@ -5952,32 +5968,36 @@ parser_yylex(parser_state *p) break; case '_': - if (toklen(p) == 2 && ISDIGIT(tok(p)[1])) { + if (toklen(p) == 2 && ISDIGIT(tok(p)[1]) && p->nvars) { int n = tok(p)[1] - '0'; - node *nvars = p->nvars->car; + int nvar; + + if (n > 0) { + node *nvars = p->nvars->cdr; - while (nvars) { - if (intn(nvars->cdr) > 0) { - yywarning(p, "numbered parameter in nested block"); - break; + while (nvars) { + nvar = intn(nvars->car); + if (nvar == -2) break; /* top of the scope */ + if (nvar > 0) { + yywarning(p, "numbered parameter used in outer block"); + break; + } + nvars->car = nint(-1); + nvars = nvars->cdr; + } + nvar = intn(p->nvars->car); + if (nvar == -1) { + yywarning(p, "numbered parameter used in inner block"); + } + if (nvar >= -1) { + pylval.num = n; + p->lstate = EXPR_END; + return tNUMPARAM; + } + else { + yywarning(p, "identifier for numbered parameter; consider another name"); } - nvars->cdr = nint(-1); - nvars = nvars->car; - } - if (intn(p->nvars->cdr) < 0) { - yywarning(p, "numbered parameter in nested block"); - } - if (n == 0) { - yyerror(p, "_0 is not available"); - return 0; - } - if (n > NUMPARAM_MAX) { - yyerror(p, "too large numbered parameter"); - return 0; } - pylval.num = n; - p->lstate = EXPR_END; - return tNUMPARAM; } /* fall through */ default: @@ -5995,6 +6015,15 @@ parser_yylex(parser_state *p) else { pushback(p, c); } + if ((c = nextc(p)) == '=' && !peek(p, '~') && !peek(p, '>') && + (!peek(p, '=') || (peek_n(p, '>', 1)))) { + result = tIDENTIFIER; + tokadd(p, c); + tokfix(p); + } + else { + pushback(p, c); + } } if (result == 0 && ISUPPER(tok(p)[0])) { result = tCONSTANT; diff --git a/mrbgems/mruby-compiler/mrbgem.rake b/mrbgems/mruby-compiler/mrbgem.rake index fa191e69b..2118ef433 100644 --- a/mrbgems/mruby-compiler/mrbgem.rake +++ b/mrbgems/mruby-compiler/mrbgem.rake @@ -26,7 +26,7 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec| # Parser file "#{current_build_dir}/core/y.tab.c" => ["#{current_dir}/core/parse.y", lex_def] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name yacc.run t.name, t.prerequisites.first end diff --git a/mrbgems/mruby-complex/mrbgem.rake b/mrbgems/mruby-complex/mrbgem.rake index 19612e74d..8f782ae18 100644 --- a/mrbgems/mruby-complex/mrbgem.rake +++ b/mrbgems/mruby-complex/mrbgem.rake @@ -3,8 +3,5 @@ MRuby::Gem::Specification.new('mruby-complex') do |spec| spec.author = 'mruby developers' spec.summary = 'Complex class' - spec.add_dependency 'mruby-metaprog', core: 'mruby-metaprog' - spec.add_dependency 'mruby-object-ext', core: 'mruby-object-ext' - spec.add_dependency 'mruby-numeric-ext', core: 'mruby-numeric-ext' spec.add_dependency 'mruby-math', core: 'mruby-math' end diff --git a/mrbgems/mruby-complex/mrblib/complex.rb b/mrbgems/mruby-complex/mrblib/complex.rb index f32b84c8b..ea8530919 100644 --- a/mrbgems/mruby-complex/mrblib/complex.rb +++ b/mrbgems/mruby-complex/mrblib/complex.rb @@ -8,7 +8,7 @@ class Complex < Numeric end def to_s - "#{real}#{'+' unless imaginary.negative?}#{imaginary}i" + "#{real}#{'+' unless imaginary < 0}#{imaginary}i" end def +@ @@ -56,7 +56,7 @@ class Complex < Numeric if rhs.is_a? Complex real == rhs.real && imaginary == rhs.imaginary elsif rhs.is_a? Numeric - imaginary.zero? && real == rhs + imaginary == 0 && real == rhs end end @@ -106,14 +106,14 @@ class Complex < Numeric [Fixnum, Float].each do |cls| [:+, :-, :*, :/, :==].each do |op| - cls.instance_exec do + cls.instance_eval do original_operator_name = "__original_operator_#{op}_complex" alias_method original_operator_name, op define_method op do |rhs| if rhs.is_a? Complex - Complex(self).send(op, rhs) + Complex(self).__send__(op, rhs) else - send(original_operator_name, rhs) + __send__(original_operator_name, rhs) end end end diff --git a/mrbgems/mruby-io/README.md b/mrbgems/mruby-io/README.md index ccf56f970..2c5b762d8 100644 --- a/mrbgems/mruby-io/README.md +++ b/mrbgems/mruby-io/README.md @@ -171,6 +171,7 @@ Add the line below to your `build_config.rb`: ## License Copyright (c) 2013 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-io/mrbgem.rake b/mrbgems/mruby-io/mrbgem.rake index e4f0b7bb6..bd20f6d20 100644 --- a/mrbgems/mruby-io/mrbgem.rake +++ b/mrbgems/mruby-io/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-io') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan Inc.' + spec.authors = ['Internet Initiative Japan Inc.', 'mruby developers'] spec.summary = 'IO and File class' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-io/mrblib/file.rb b/mrbgems/mruby-io/mrblib/file.rb index 710333d6f..d3a4b1ec7 100644 --- a/mrbgems/mruby-io/mrblib/file.rb +++ b/mrbgems/mruby-io/mrblib/file.rb @@ -55,46 +55,46 @@ class File < IO s end - def self.expand_path(path, default_dir = '.') - def concat_path(path, base_path) - if path[0] == "/" || path[1] == ':' # Windows root! - expanded_path = path - elsif path[0] == "~" - if (path[1] == "/" || path[1] == nil) - dir = path[1, path.size] - home_dir = _gethome - - unless home_dir - raise ArgumentError, "couldn't find HOME environment -- expanding '~'" - end - - expanded_path = home_dir - expanded_path += dir if dir - expanded_path += "/" - else - splitted_path = path.split("/") - user = splitted_path[0][1, splitted_path[0].size] - dir = "/" + splitted_path[1, splitted_path.size].join("/") + def self._concat_path(path, base_path) + if path[0] == "/" || path[1] == ':' # Windows root! + expanded_path = path + elsif path[0] == "~" + if (path[1] == "/" || path[1] == nil) + dir = path[1, path.size] + home_dir = _gethome + + unless home_dir + raise ArgumentError, "couldn't find HOME environment -- expanding '~'" + end - home_dir = _gethome(user) + expanded_path = home_dir + expanded_path += dir if dir + expanded_path += "/" + else + splitted_path = path.split("/") + user = splitted_path[0][1, splitted_path[0].size] + dir = "/" + splitted_path[1, splitted_path.size].join("/") - unless home_dir - raise ArgumentError, "user #{user} doesn't exist" - end + home_dir = _gethome(user) - expanded_path = home_dir - expanded_path += dir if dir - expanded_path += "/" + unless home_dir + raise ArgumentError, "user #{user} doesn't exist" end - else - expanded_path = concat_path(base_path, _getwd) - expanded_path += "/" + path - end - expanded_path + expanded_path = home_dir + expanded_path += dir if dir + expanded_path += "/" + end + else + expanded_path = _concat_path(base_path, _getwd) + expanded_path += "/" + path end - expanded_path = concat_path(path, default_dir) + expanded_path + end + + def self.expand_path(path, default_dir = '.') + expanded_path = _concat_path(path, default_dir) drive_prefix = "" if File::ALT_SEPARATOR && expanded_path.size > 2 && ("A".."Z").include?(expanded_path[0].upcase) && expanded_path[1] == ":" diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c index 120c24d4a..9d5bc8ca2 100644 --- a/mrbgems/mruby-io/src/file.c +++ b/mrbgems/mruby-io/src/file.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c index 445bafde9..aadd1ac1c 100644 --- a/mrbgems/mruby-io/src/file_test.c +++ b/mrbgems/mruby-io/src/file_test.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 5bc88e047..df5bd007b 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -10,12 +10,7 @@ #include "mruby/string.h" #include "mruby/variable.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> @@ -66,14 +61,6 @@ static int mrb_io_modestr_to_flags(mrb_state *mrb, const char *modestr); static int mrb_io_flags_to_modenum(mrb_state *mrb, int flags); static void fptr_finalize(mrb_state *mrb, struct mrb_io *fptr, int quiet); -#if MRUBY_RELEASE_NO < 10000 -static struct RClass * -mrb_module_get(mrb_state *mrb, const char *name) -{ - return mrb_class_get(mrb, name); -} -#endif - static struct mrb_io * io_get_open_fptr(mrb_state *mrb, mrb_value self) { @@ -1060,7 +1047,7 @@ mrb_io_s_select(mrb_state *mrb, mrb_value klass) mrb_get_args(mrb, "*", &argv, &argc); if (argc < 1 || argc > 4) { - mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%i for 1..4)", argc); + mrb_argnum_error(mrb, argc, 1, 4); } timeout = mrb_nil_value(); diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c index f5c55499b..3cf1c6111 100644 --- a/mrbgems/mruby-io/test/mruby_io_test.c +++ b/mrbgems/mruby-io/test/mruby_io_test.c @@ -18,7 +18,15 @@ typedef int mode_t; #define open _open #define close _close -#ifdef _MSC_VER +#if defined(__MINGW64_VERSION_MAJOR) +# define MRB_MINGW64_VERSION (__MINGW64_VERSION_MAJOR * 1000 + __MINGW64_VERSION_MINOR) +#elif defined(__MINGW32_MAJOR_VERSION) +# define MRB_MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 1000 + __MINGW32_MINOR_VERSION) +#endif + +#if defined(_MSC_VER) || \ + (defined(MRB_MINGW32_VERSION) && MRB_MINGW32_VERSION < 3021) || \ + (defined(MRB_MINGW64_VERSION) && MRB_MINGW64_VERSION < 4000) #include <sys/stat.h> static int diff --git a/mrbgems/mruby-kernel-ext/test/kernel.rb b/mrbgems/mruby-kernel-ext/test/kernel.rb index f782510aa..cf78faaad 100644 --- a/mrbgems/mruby-kernel-ext/test/kernel.rb +++ b/mrbgems/mruby-kernel-ext/test/kernel.rb @@ -80,6 +80,7 @@ assert('Kernel#Float') do assert_operator(12.34, :eql?, Float('1_2.3_4')) assert_operator(0.9, :eql?, Float('.9')) assert_operator(0.9, :eql?, Float(" \t\r\n\f\v.9 \t\r\n\f\v")) + assert_operator(16.0, :eql?, Float("0x10")) assert_raise(TypeError) { Float(nil) } assert_raise(ArgumentError) { Float("1. 5") } assert_raise(ArgumentError) { Float("1.5a") } diff --git a/mrbgems/mruby-metaprog/src/metaprog.c b/mrbgems/mruby-metaprog/src/metaprog.c index bca8ab34c..f00c4493b 100644 --- a/mrbgems/mruby-metaprog/src/metaprog.c +++ b/mrbgems/mruby-metaprog/src/metaprog.c @@ -172,7 +172,7 @@ mrb_local_variables(mrb_state *mrb, mrb_value self) KHASH_DECLARE(st, mrb_sym, char, FALSE) static void -method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) +method_entry_loop(mrb_state *mrb, struct RClass *klass, khash_t(st) *set, khash_t(st) *undef) { khint_t i; @@ -181,20 +181,28 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) for (i=0;i<kh_end(h);i++) { if (kh_exist(h, i)) { mrb_method_t m = kh_value(h, i); - if (MRB_METHOD_UNDEF_P(m)) continue; - kh_put(st, mrb, set, kh_key(h, i)); + if (MRB_METHOD_UNDEF_P(m)) { + if (undef) { + kh_put(st, mrb, undef, kh_key(h, i)); + } + } + else if (undef == NULL || + kh_get(st, mrb, undef, kh_key(h, i)) == kh_end(undef)) { + kh_put(st, mrb, set, kh_key(h, i)); + } } } } static mrb_value -mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* klass, int obj) +mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass *klass, int obj) { khint_t i; mrb_value ary; mrb_bool prepended = FALSE; - struct RClass* oldklass; - khash_t(st)* set = kh_init(st, mrb); + struct RClass *oldklass; + khash_t(st) *set = kh_init(st, mrb); + khash_t(st) *undef = (recur ? kh_init(st, mrb) : NULL); if (!recur && (klass->flags & MRB_FL_CLASS_IS_PREPENDED)) { MRB_CLASS_ORIGIN(klass); @@ -203,7 +211,7 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl oldklass = 0; while (klass && (klass != oldklass)) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); if ((klass->tt == MRB_TT_ICLASS && !prepended) || (klass->tt == MRB_TT_SCLASS)) { } @@ -221,6 +229,7 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl } } kh_destroy(st, mrb, set); + if (undef) kh_destroy(st, mrb, undef); return ary; } @@ -313,18 +322,19 @@ mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj) { khint_t i; mrb_value ary; - struct RClass* klass; - khash_t(st)* set = kh_init(st, mrb); + struct RClass *klass; + khash_t(st) *set = kh_init(st, mrb); + khash_t(st) *undef = (recur ? kh_init(st, mrb) : NULL); klass = mrb_class(mrb, obj); if (klass && (klass->tt == MRB_TT_SCLASS)) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); klass = klass->super; } if (recur) { while (klass && ((klass->tt == MRB_TT_SCLASS) || (klass->tt == MRB_TT_ICLASS))) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); klass = klass->super; } } @@ -336,6 +346,7 @@ mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj) } } kh_destroy(st, mrb, set); + if (undef) kh_destroy(st, mrb, undef); return ary; } diff --git a/mrbgems/mruby-pack/README.md b/mrbgems/mruby-pack/README.md index 95733e2d5..c8a653fba 100644 --- a/mrbgems/mruby-pack/README.md +++ b/mrbgems/mruby-pack/README.md @@ -49,6 +49,7 @@ There is no dependency on other mrbgems. ## License Copyright (c) 2012 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-pack/mrbgem.rake b/mrbgems/mruby-pack/mrbgem.rake index 6e8375d1e..f1c0306b1 100644 --- a/mrbgems/mruby-pack/mrbgem.rake +++ b/mrbgems/mruby-pack/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-pack') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan Inc.' + spec.authors = ['Internet Initiative Japan Inc.', 'mruby developers'] spec.summary = 'Array#pack and String#unpack method' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-sleep/mrbgem.rake b/mrbgems/mruby-sleep/mrbgem.rake index 8827b3580..7a303b81c 100644 --- a/mrbgems/mruby-sleep/mrbgem.rake +++ b/mrbgems/mruby-sleep/mrbgem.rake @@ -1,5 +1,5 @@ MRuby::Gem::Specification.new('mruby-sleep') do |spec| spec.license = 'MIT' - spec.authors = 'MATSUMOTO Ryosuke' + spec.authors = ['MATSUMOTO Ryosuke', 'mruby developers'] spec.version = '0.0.1' end diff --git a/mrbgems/mruby-sleep/src/mrb_sleep.c b/mrbgems/mruby-sleep/src/mrb_sleep.c index 3f8ef90cf..ac9b07e85 100644 --- a/mrbgems/mruby-sleep/src/mrb_sleep.c +++ b/mrbgems/mruby-sleep/src/mrb_sleep.c @@ -2,6 +2,7 @@ ** mrb_sleep - sleep methods for mruby ** ** Copyright (c) mod_mruby developers 2012- +** Copyright (c) mruby developers 2018 ** ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/mrbgems/mruby-socket/README.md b/mrbgems/mruby-socket/README.md index ceb50c651..947a24e9e 100644 --- a/mrbgems/mruby-socket/README.md +++ b/mrbgems/mruby-socket/README.md @@ -35,6 +35,7 @@ Date: Tue, 21 May 2013 04:31:30 GMT ## License Copyright (c) 2013 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-socket/mrbgem.rake b/mrbgems/mruby-socket/mrbgem.rake index b0894e095..24d6f953d 100644 --- a/mrbgems/mruby-socket/mrbgem.rake +++ b/mrbgems/mruby-socket/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-socket') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan' + spec.authors = ['Internet Initiative Japan', 'mruby developers'] spec.summary = 'standard socket class' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c index 53cd9f4aa..8a0d9df6b 100644 --- a/mrbgems/mruby-socket/src/socket.c +++ b/mrbgems/mruby-socket/src/socket.c @@ -476,7 +476,7 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self) optname = mrb_fixnum(mrb_funcall(mrb, so, "optname", 0)); optval = mrb_funcall(mrb, so, "data", 0); } else { - mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%i for 3)", argc); + mrb_argnum_error(mrb, argc, 3, 3); } s = socket_fd(mrb, self); diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index 2d82c2466..f42a5f1ea 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -274,7 +274,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) name = mrb_nil_value(); mrb_get_args(mrb, "*&", &argv, &argc, &b); if (argc == 0) { /* special case to avoid crash */ - mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); + mrb_argnum_error(mrb, argc, 1, -1); } else { pargv = argv; diff --git a/mrbgems/mruby-test/mrbgem.rake b/mrbgems/mruby-test/mrbgem.rake index bf90e0791..6ce24bc94 100644 --- a/mrbgems/mruby-test/mrbgem.rake +++ b/mrbgems/mruby-test/mrbgem.rake @@ -40,7 +40,7 @@ MRuby::Gem::Specification.new('mruby-test') do |spec| file test_rbobj => g.test_rbireps file g.test_rbireps => [g.test_rbfiles, build.mrbcfile].flatten do |t| - FileUtils.mkdir_p File.dirname(t.name) + mkdir_p File.dirname(t.name) open(t.name, 'w') do |f| g.print_gem_test_header(f) test_preload = g.test_preload and [g.dir, MRUBY_ROOT].map {|dir| @@ -149,15 +149,10 @@ MRuby::Gem::Specification.new('mruby-test') do |spec| # of the test gem depending on a change to the gem # selection active_gems_path = "#{build_dir}/active_gems_path.lst" - active_gem_list = if File.exist? active_gems_path - File.read active_gems_path - else - FileUtils.mkdir_p File.dirname(active_gems_path) - nil - end + active_gem_list = File.read active_gems_path if File.exist? active_gems_path current_gem_list = build.gems.map(&:name).join("\n") task active_gems_path do |_t| - FileUtils.mkdir_p File.dirname(active_gems_path) + mkdir_p File.dirname(active_gems_path) File.write active_gems_path, current_gem_list end file clib => active_gems_path if active_gem_list != current_gem_list @@ -165,7 +160,7 @@ MRuby::Gem::Specification.new('mruby-test') do |spec| file mlib => clib file clib => [build.mrbcfile, __FILE__] do |_t| _pp "GEN", "*.rb", "#{clib.relative_path}" - FileUtils.mkdir_p File.dirname(clib) + mkdir_p File.dirname(clib) open(clib, 'w') do |f| f.puts %Q[/*] f.puts %Q[ * This file contains a list of all] diff --git a/mrbgems/mruby-test/vformat.c b/mrbgems/mruby-test/vformat.c index 6984aaeb1..e7ada02da 100644 --- a/mrbgems/mruby-test/vformat.c +++ b/mrbgems/mruby-test/vformat.c @@ -4,197 +4,176 @@ #include <mruby/data.h> #include <mruby/string.h> -#ifdef MRB_WITHOUT_FLOAT -typedef mrb_int mrb_float; -#define mrb_float(o) mrb_fixnum(o) +/* no argument */ +static mrb_value +vf_s_format_0(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str; + const char *fmt; + + mrb_get_args(mrb, "S", &fmt_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt); +} + +/* c char */ +static mrb_value +vf_s_format_c(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_str; + const char *fmt; + char c; + + mrb_get_args(mrb, "SS", &fmt_str, &arg_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + c = RSTRING_CSTR(mrb, arg_str)[0]; + + return mrb_format(mrb, fmt, c); +} + +/* d int */ +static mrb_value +vf_s_format_d(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str; + const char *fmt; + mrb_int i; + int d; + + mrb_get_args(mrb, "Si", &fmt_str, &i); + fmt = RSTRING_CSTR(mrb, fmt_str); + d = (int)i; + + return mrb_format(mrb, fmt, d); +} + +#ifndef MRB_WITHOUT_FLOAT +/* f float */ +static mrb_value +vf_s_format_f(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str; + const char *fmt; + mrb_float f; + + mrb_get_args(mrb, "Sf", &fmt_str, &f); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt, f); +} #endif -#define NATIVE_TYPES \ - char c; \ - int d; \ - mrb_float f; \ - mrb_int i; \ -/* size_t l; */\ - mrb_sym n; \ - char *s; \ - struct RClass *C - -#define NATIVE_DEFINE_TYPE_FUNC(t) \ - static mrb_value \ - native_s_##t(mrb_state *mrb, mrb_value klass) \ - { \ - mrb_value obj, type = mrb_fixnum_value(ARG_##t); \ - mrb_get_args(mrb, "o", &obj); \ - return mrb_funcall(mrb, klass, "new", 2, type, obj); \ - } - -#define NATIVE_DEFINE_TYPE_METHOD(t) \ - mrb_define_class_method(mrb, n, #t, native_s_##t, MRB_ARGS_REQ(1)) - -typedef enum { - ARG_c, - ARG_d, - ARG_f, - ARG_i, -/* ARG_l,*/ - ARG_n, - ARG_s, - ARG_C, - ARG_v, -} VFArgumentType; - -typedef struct { - VFArgumentType type; - union { NATIVE_TYPES; }; -} VFNative; - -typedef struct { - VFArgumentType type; - union { - NATIVE_TYPES; - mrb_value v; - }; -} VFArgument; - -static void -native_free(mrb_state *mrb, void *data) +/* i fixnum */ +static mrb_value +vf_s_format_i(mrb_state *mrb, mrb_value klass) { - VFNative *native = (VFNative*)data; - if (native->type == ARG_s) mrb_free(mrb, native->s); - mrb_free(mrb, native); + mrb_value fmt_str; + const char *fmt; + mrb_int i; + + mrb_get_args(mrb, "Si", &fmt_str, &i); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt, i); } -static const struct mrb_data_type native_data_type = { - "TestVFormat::Native", native_free -}; +/* l char*, size_t */ +static mrb_value +vf_s_format_l(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_str; + const char *fmt; + const char *s; + mrb_int i; + size_t len; + + mrb_get_args(mrb, "SSi", &fmt_str, &arg_str, &i); + fmt = RSTRING_CSTR(mrb, fmt_str); + s = RSTRING_PTR(arg_str); + len = (size_t)i; + if (len > (size_t)RSTRING_LEN(arg_str)) len = (size_t)RSTRING_LEN(arg_str); + + return mrb_format(mrb, fmt, s, len); +} +/* n symbol */ static mrb_value -native_initialize(mrb_state *mrb, mrb_value self) +vf_s_format_n(mrb_state *mrb, mrb_value klass) { - VFNative data, *datap; - mrb_int type; - mrb_value obj; - - mrb_get_args(mrb, "io", &type, &obj); - data.type = (VFArgumentType)type; - switch (data.type) { - case ARG_c: data.c = RSTRING_PTR(obj)[0]; break; - case ARG_d: data.d = (int)mrb_fixnum(obj); break; - case ARG_f: data.f = mrb_float(obj); break; - case ARG_i: data.i = mrb_fixnum(obj); break; -/* case ARG_l: data.l = (size_t)mrb_fixnum(obj); break;*/ - case ARG_n: data.n = mrb_symbol(obj); break; - case ARG_s: data.s = (char*)mrb_malloc(mrb, RSTRING_LEN(obj) + 1); - memcpy(data.s, RSTRING_PTR(obj), RSTRING_LEN(obj)); - data.s[RSTRING_LEN(obj)] = '\0'; break; - case ARG_C: data.C = mrb_class_ptr(obj); break; - default: mrb_raise(mrb, E_ARGUMENT_ERROR, "unknown type"); - } - datap = (VFNative*)mrb_malloc(mrb, sizeof(VFNative)); - *datap = data; - mrb_data_init(self, datap, &native_data_type); - return self; + mrb_value fmt_str; + const char *fmt; + mrb_sym sym; + + mrb_get_args(mrb, "Sn", &fmt_str, &sym); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt, sym); } -NATIVE_DEFINE_TYPE_FUNC(c) -NATIVE_DEFINE_TYPE_FUNC(d) -NATIVE_DEFINE_TYPE_FUNC(f) -NATIVE_DEFINE_TYPE_FUNC(i) -/*NATIVE_DEFINE_TYPE_FUNC(l)*/ -NATIVE_DEFINE_TYPE_FUNC(n) -NATIVE_DEFINE_TYPE_FUNC(s) -NATIVE_DEFINE_TYPE_FUNC(C) - -static VFArgument* -arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class, - VFArgument *vf_arg) +/* s char* */ +static mrb_value +vf_s_format_s(mrb_state *mrb, mrb_value klass) { - if (mrb_obj_is_instance_of(mrb, obj, native_class)) { - const VFNative *native = (VFNative*)DATA_PTR(obj); - *(VFNative*)vf_arg = *native; - } - else { - vf_arg->v = obj; - vf_arg->type = ARG_v; - } - return vf_arg; + mrb_value fmt_str, arg_str; + const char *fmt; + const char *s; + + mrb_get_args(mrb, "SS", &fmt_str, &arg_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + s = RSTRING_CSTR(mrb, arg_str); + + return mrb_format(mrb, fmt, s); } -#define VF_FORMAT_INIT(klass) \ - struct RClass *vf_native_class = \ - mrb_class_get_under(mrb, mrb_class_ptr(klass), "Native"); \ - VFArgument vf_args[2]; - -#define VF_ARG(args, idx) \ - arg_from_obj(mrb, args[idx], vf_native_class, &vf_args[idx]) - -#define VF_FORMAT0(fmt) mrb_format(mrb, fmt); -#define VF_FORMAT1(fmt, args) \ - (VF_ARG(args, 0), VF_FORMAT_TYPED(fmt, 1, vf_args, NULL)) -#define VF_FORMAT2(fmt, args) ( \ - VF_ARG(args, 0), VF_ARG(args, 1), \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, c) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, d) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, f) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, i) : \ -/* VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, l) : */\ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, n) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, s) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, C) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, v) : \ - mrb_nil_value() /* not reached */ \ -) -#define VF_FORMAT2_COND_EXPR(fmt, a1, a2, t) \ - a1->type == ARG_##t ? VF_FORMAT_TYPED(fmt, 2, a2, (a1)->t) -#define VF_FORMAT_TYPED(fmt, n_arg, type_a, v1) \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, c) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, d) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, f) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, i) : \ -/* VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, l) : */\ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, n) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, s) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, C) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, v) : \ - mrb_nil_value() /* not reached */ -#define VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, t) \ - (type_a)->type == ARG_##t ? n_arg == 1 ? \ - mrb_format(mrb, fmt, (type_a)->t) : mrb_format(mrb, fmt, v1, (type_a)->t) +/* C RClass */ +static mrb_value +vf_s_format_C(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_cls; + const char *fmt; + struct RClass *c; + + mrb_get_args(mrb, "SC", &fmt_str, &arg_cls); + fmt = RSTRING_CSTR(mrb, fmt_str); + c = mrb_class_ptr(arg_cls); + return mrb_format(mrb, fmt, c); +} + +/* v value */ static mrb_value -vf_s_format(mrb_state *mrb, mrb_value klass) +vf_s_format_v(mrb_state *mrb, mrb_value klass) { - mrb_value fmt_str, args[2]; - mrb_int argc = mrb_get_args(mrb, "S|oo", &fmt_str, args, args+1); - const char *fmt = RSTRING_CSTR(mrb, fmt_str); - - VF_FORMAT_INIT(klass); - - switch (argc) { - case 1: return VF_FORMAT0(fmt); - case 2: return VF_FORMAT1(fmt, args); - case 3: return VF_FORMAT2(fmt, args); - default: return mrb_nil_value(); /* not reached */ - } + mrb_value fmt_str, arg_v; + const char *fmt; + + mrb_get_args(mrb, "So", &fmt_str, &arg_v); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt, arg_v); } void mrb_init_test_vformat(mrb_state *mrb) { - struct RClass *vf, *n; + struct RClass *vf; vf = mrb_define_module(mrb, "TestVFormat"); - mrb_define_class_method(mrb, vf, "format", vf_s_format, MRB_ARGS_ARG(1,2)); - - n = mrb_define_class_under(mrb, vf, "Native", mrb->object_class); - MRB_SET_INSTANCE_TT(n, MRB_TT_DATA); - NATIVE_DEFINE_TYPE_METHOD(c); - NATIVE_DEFINE_TYPE_METHOD(d); - NATIVE_DEFINE_TYPE_METHOD(f); - NATIVE_DEFINE_TYPE_METHOD(i); -/* NATIVE_DEFINE_TYPE_METHOD(l);*/ - NATIVE_DEFINE_TYPE_METHOD(n); - NATIVE_DEFINE_TYPE_METHOD(s); - NATIVE_DEFINE_TYPE_METHOD(C); - mrb_define_method(mrb, n, "initialize", native_initialize, MRB_ARGS_REQ(2)); + mrb_define_class_method(mrb, vf, "z", vf_s_format_0, MRB_ARGS_REQ(1)); + +#define VF_DEFINE_FORMAT_METHOD(t) VF_DEFINE_FORMAT_METHOD_n(t,2) +#define VF_DEFINE_FORMAT_METHOD_n(t,n) mrb_define_class_method(mrb, vf, #t, vf_s_format_##t, MRB_ARGS_REQ(n)); + + VF_DEFINE_FORMAT_METHOD(c); + VF_DEFINE_FORMAT_METHOD(d); +#ifndef MRB_WITHOUT_FLOAT + VF_DEFINE_FORMAT_METHOD(f); +#endif + VF_DEFINE_FORMAT_METHOD(i); + VF_DEFINE_FORMAT_METHOD_n(l,3); + VF_DEFINE_FORMAT_METHOD(n); + VF_DEFINE_FORMAT_METHOD(s); + VF_DEFINE_FORMAT_METHOD(C); + VF_DEFINE_FORMAT_METHOD(v); } diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 62de406ab..7197b634c 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -257,7 +257,7 @@ mrb_to_time_t(mrb_state *mrb, mrb_value obj, time_t *usec) { mrb_int i = mrb_int(mrb, obj); - if ((MRB_INT_MAX > MRB_TIME_MAX && i > 0 && i > MRB_TIME_MAX) || + if ((MRB_INT_MAX > MRB_TIME_MAX && i > 0 && i > (mrb_int)MRB_TIME_MAX) || (MRB_TIME_MIN > MRB_INT_MIN && MRB_TIME_MIN > i)) { goto out_of_range; } diff --git a/mrblib/mrblib.rake b/mrblib/mrblib.rake index e96decb27..6fba0adc1 100644 --- a/mrblib/mrblib.rake +++ b/mrblib/mrblib.rake @@ -8,7 +8,7 @@ MRuby.each_target do file objfile("#{current_build_dir}/mrblib") => "#{current_build_dir}/mrblib.c" file "#{current_build_dir}/mrblib.c" => [mrbcfile, __FILE__] + Dir.glob("#{current_dir}/*.rb").sort do |t| _, _, *rbfiles = t.prerequisites - FileUtils.mkdir_p File.dirname(t.name) + mkdir_p File.dirname(t.name) open(t.name, 'w') do |f| _pp "GEN", "*.rb", "#{t.name.relative_path}" f.puts File.read("#{current_dir}/init_mrblib.c") diff --git a/src/backtrace.c b/src/backtrace.c index 803c5e285..186009523 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -25,6 +25,9 @@ typedef void (*each_backtrace_func)(mrb_state*, const struct backtrace_location* static const mrb_data_type bt_type = { "Backtrace", mrb_free }; +mrb_value mrb_exc_inspect(mrb_state *mrb, mrb_value exc); +mrb_value mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace); + static void each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, const mrb_code *pc0, each_backtrace_func func, void *data) { @@ -74,66 +77,27 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, const mrb_code *pc0, each_backtr #ifndef MRB_DISABLE_STDIO static void -print_backtrace(mrb_state *mrb, mrb_value backtrace) +print_backtrace(mrb_state *mrb, struct RObject *exc, mrb_value backtrace) { int i; - mrb_int n; + mrb_int n = RARRAY_LEN(backtrace); + mrb_value *loc, mesg; FILE *stream = stderr; - n = RARRAY_LEN(backtrace) - 1; - if (n == 0) return; - - fprintf(stream, "trace (most recent call last):\n"); - for (i=0; i<n; i++) { - mrb_value entry = RARRAY_PTR(backtrace)[n-i-1]; - - if (mrb_string_p(entry)) { - fprintf(stream, "\t[%d] %.*s\n", i, (int)RSTRING_LEN(entry), RSTRING_PTR(entry)); + if (n != 0) { + fprintf(stream, "trace (most recent call last):\n"); + for (i=n-1,loc=&RARRAY_PTR(backtrace)[i]; i>0; i--,loc--) { + if (mrb_string_p(*loc)) { + fprintf(stream, "\t[%d] %.*s\n", + i, (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc)); + } } - } -} - -static int -packed_bt_len(const struct backtrace_location *bt, int n) -{ - int len = 0; - int i; - - for (i=0; i<n; i++) { - if (!bt[i].filename && !bt[i].lineno && !bt[i].method_id) - continue; - len++; - } - return len; -} - -static void -print_packed_backtrace(mrb_state *mrb, mrb_value packed) -{ - FILE *stream = stderr; - const struct backtrace_location *bt; - int n, i; - int ai = mrb_gc_arena_save(mrb); - - bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, packed, &bt_type); - if (bt == NULL) return; - n = (mrb_int)RDATA(packed)->flags; - - if (packed_bt_len(bt, n) == 0) return; - fprintf(stream, "trace (most recent call last):\n"); - for (i = 0; i<n; i++) { - const struct backtrace_location *entry = &bt[n-i-1]; - if (entry->filename == NULL) continue; - fprintf(stream, "\t[%d] %s:%d", i, entry->filename, entry->lineno); - if (entry->method_id != 0) { - const char *method_name; - - method_name = mrb_sym_name(mrb, entry->method_id); - fprintf(stream, ":in %s", method_name); - mrb_gc_arena_restore(mrb, ai); + if (mrb_string_p(*loc)) { + fprintf(stream, "%.*s: ", (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc)); } - fprintf(stream, "\n"); } + mesg = mrb_exc_inspect(mrb, mrb_obj_value(exc)); + fprintf(stream, "%.*s\n", (int)RSTRING_LEN(mesg), RSTRING_PTR(mesg)); } /* mrb_print_backtrace @@ -152,12 +116,8 @@ mrb_print_backtrace(mrb_state *mrb) backtrace = mrb_obj_iv_get(mrb, mrb->exc, mrb_intern_lit(mrb, "backtrace")); if (mrb_nil_p(backtrace)) return; - if (mrb_array_p(backtrace)) { - print_backtrace(mrb, backtrace); - } - else { - print_packed_backtrace(mrb, backtrace); - } + if (!mrb_array_p(backtrace)) backtrace = mrb_unpack_backtrace(mrb, backtrace); + print_backtrace(mrb, mrb->exc, backtrace); } #else @@ -175,7 +135,6 @@ count_backtrace_i(mrb_state *mrb, { int *lenp = (int*)data; - if (loc->filename == NULL) return; (*lenp)++; } @@ -187,7 +146,6 @@ pack_backtrace_i(mrb_state *mrb, struct backtrace_location **pptr = (struct backtrace_location**)data; struct backtrace_location *ptr = *pptr; - if (loc->filename == NULL) return; *ptr = *loc; *pptr = ptr+1; } @@ -205,7 +163,7 @@ packed_backtrace(mrb_state *mrb) size = len * sizeof(struct backtrace_location); ptr = mrb_malloc(mrb, size); backtrace = mrb_data_object_alloc(mrb, NULL, ptr, &bt_type); - backtrace->flags = (unsigned int)len; + backtrace->flags = (uint32_t)len; each_backtrace(mrb, ciidx, mrb->c->ci->pc, pack_backtrace_i, &ptr); return mrb_obj_value(backtrace); } @@ -245,8 +203,7 @@ mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace) const struct backtrace_location *entry = &bt[i]; mrb_value btline; - if (entry->filename == NULL) continue; - btline = mrb_format(mrb, "%s:%d", entry->filename, entry->lineno); + btline = mrb_format(mrb, "%s:%d", entry->filename, (int)entry->lineno); if (entry->method_id != 0) { mrb_str_cat_lit(mrb, btline, ":in "); mrb_str_cat_cstr(mrb, btline, mrb_sym_name(mrb, entry->method_id)); diff --git a/src/class.c b/src/class.c index e0196fe0a..a7d9ebf37 100644 --- a/src/class.c +++ b/src/class.c @@ -285,11 +285,9 @@ mrb_define_class(mrb_state *mrb, const char *name, struct RClass *super) static mrb_value mrb_bob_init(mrb_state *mrb, mrb_value); #ifdef MRB_METHOD_CACHE static void mc_clear_all(mrb_state *mrb); -static void mc_clear_by_class(mrb_state *mrb, struct RClass*); static void mc_clear_by_id(mrb_state *mrb, struct RClass*, mrb_sym); #else #define mc_clear_all(mrb) -#define mc_clear_by_class(mrb,c) #define mc_clear_by_id(mrb,c,s) #endif @@ -303,7 +301,7 @@ mrb_class_inherited(mrb_state *mrb, struct RClass *super, struct RClass *klass) super = mrb->object_class; super->flags |= MRB_FL_CLASS_IS_INHERITED; s = mrb_obj_value(super); - mc_clear_by_class(mrb, klass); + mrb_mc_clear_by_class(mrb, klass); mid = mrb_intern_lit(mrb, "inherited"); if (!mrb_func_basic_p(mrb, s, mid, mrb_bob_init)) { mrb_value c = mrb_obj_value(klass); @@ -591,7 +589,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) char c; mrb_int i = 0; va_list ap; - mrb_int arg_i = 0; mrb_int argc = mrb->c->ci->argc; mrb_value *array_argv = mrb->c->stack+1; mrb_bool argv_on_stack = argc >= 0; @@ -679,8 +676,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_value*); if (i < argc) { - *p = argv[arg_i++]; - i++; + *p = argv[i++]; } } break; @@ -692,12 +688,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) if (i < argc) { mrb_value ss; - ss = argv[arg_i++]; + ss = argv[i++]; if (!class_ptr_p(ss)) { mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", ss); } *p = ss; - i++; } } break; @@ -707,8 +702,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_value*); if (i < argc) { - *p = argv[arg_i++]; - i++; + *p = argv[i++]; if (!(altmode && mrb_nil_p(*p))) { mrb_to_str(mrb, *p); } @@ -721,8 +715,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_value*); if (i < argc) { - *p = argv[arg_i++]; - i++; + *p = argv[i++]; if (!(altmode && mrb_nil_p(*p))) { *p = to_ary(mrb, *p); } @@ -735,8 +728,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_value*); if (i < argc) { - *p = argv[arg_i++]; - i++; + *p = argv[i++]; if (!(altmode && mrb_nil_p(*p))) { *p = to_hash(mrb, *p); } @@ -752,8 +744,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) ps = va_arg(ap, char**); pl = va_arg(ap, mrb_int*); if (i < argc) { - ss = argv[arg_i++]; - i++; + ss = argv[i++]; if (altmode && mrb_nil_p(ss)) { *ps = NULL; *pl = 0; @@ -773,8 +764,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) ps = va_arg(ap, const char**); if (i < argc) { - ss = argv[arg_i++]; - i++; + ss = argv[i++]; if (altmode && mrb_nil_p(ss)) { *ps = NULL; } @@ -795,8 +785,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) pb = va_arg(ap, mrb_value**); pl = va_arg(ap, mrb_int*); if (i < argc) { - aa = argv[arg_i++]; - i++; + aa = argv[i++]; if (altmode && mrb_nil_p(aa)) { *pb = 0; *pl = 0; @@ -817,14 +806,12 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, void**); if (i < argc) { - ss = argv[arg_i]; + ss = argv[i++]; if (!mrb_istruct_p(ss)) { mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", ss); } *p = mrb_istruct_ptr(ss); - arg_i++; - i++; } } break; @@ -835,9 +822,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_float*); if (i < argc) { - *p = mrb_to_flo(mrb, argv[arg_i]); - arg_i++; - i++; + *p = mrb_to_flo(mrb, argv[i++]); } } break; @@ -848,9 +833,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_int*); if (i < argc) { - *p = mrb_fixnum(mrb_to_int(mrb, argv[arg_i])); - arg_i++; - i++; + *p = mrb_fixnum(mrb_to_int(mrb, argv[i++])); } } break; @@ -859,9 +842,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_bool *boolp = va_arg(ap, mrb_bool*); if (i < argc) { - mrb_value b = argv[arg_i++]; + mrb_value b = argv[i++]; *boolp = mrb_test(b); - i++; } } break; @@ -873,9 +855,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) if (i < argc) { mrb_value ss; - ss = argv[arg_i++]; + ss = argv[i++]; *symp = to_sym(mrb, ss); - i++; } } break; @@ -887,8 +868,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) datap = va_arg(ap, void**); type = va_arg(ap, struct mrb_data_type const*); if (i < argc) { - mrb_value dd = argv[arg_i++]; - i++; + mrb_value dd = argv[i++]; if (altmode && mrb_nil_p(dd)) { *datap = 0; } @@ -917,7 +897,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) } break; case '|': - if (opt_skip && i == argc) return argc; + if (opt_skip && i == argc) goto finish; opt = TRUE; break; case '?': @@ -941,16 +921,15 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) *pl = argc-i; if (*pl > 0) { if (nocopy) { - *var = argv+arg_i; + *var = argv+i; } else { - mrb_value args = mrb_ary_new_from_values(mrb, *pl, argv+arg_i); + mrb_value args = mrb_ary_new_from_values(mrb, *pl, argv+i); RARRAY(args)->c = NULL; *var = RARRAY_PTR(args); } } i = argc; - arg_i += *pl; } else { *pl = 0; @@ -1025,6 +1004,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) if (!c && argc > i) { mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); } + +finish: va_end(ap); return i; } @@ -1109,7 +1090,7 @@ include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, stru m->flags |= MRB_FL_CLASS_IS_INHERITED; ins_pos->super = ic; mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ic); - mc_clear_by_class(mrb, ins_pos); + mrb_mc_clear_by_class(mrb, ins_pos); ins_pos = ic; skip: m = m->super; @@ -1322,8 +1303,8 @@ mc_clear_all(mrb_state *mrb) } } -static void -mc_clear_by_class(mrb_state *mrb, struct RClass *c) +void +mrb_mc_clear_by_class(mrb_state *mrb, struct RClass *c) { struct mrb_cache_entry *mc = mrb->cache; int i; @@ -2323,7 +2304,9 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, mod, "dup", mrb_mod_dup, MRB_ARGS_NONE()); mrb_undef_method(mrb, cls, "append_features"); + mrb_undef_method(mrb, cls, "prepend_features"); mrb_undef_method(mrb, cls, "extend_object"); + mrb_undef_method(mrb, cls, "module_function"); mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class); mrb_define_singleton_method(mrb, mrb->top_self, "inspect", inspect_main, MRB_ARGS_NONE()); diff --git a/src/error.c b/src/error.c index 43b09ec66..260ca7a3d 100644 --- a/src/error.c +++ b/src/error.c @@ -13,7 +13,6 @@ #include <mruby/proc.h> #include <mruby/string.h> #include <mruby/variable.h> -#include <mruby/debug.h> #include <mruby/error.h> #include <mruby/class.h> #include <mruby/throw.h> @@ -88,7 +87,7 @@ exc_exception(mrb_state *mrb, mrb_value self) * no message is set). */ -static mrb_value +mrb_value exc_to_s(mrb_state *mrb, mrb_value exc) { mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg")); @@ -128,37 +127,13 @@ exc_message(mrb_state *mrb, mrb_value exc) * returns message and class name. */ -static mrb_value -exc_inspect(mrb_state *mrb, mrb_value exc) +mrb_value +mrb_exc_inspect(mrb_state *mrb, mrb_value exc) { - mrb_value str, mesg, file, line; - mrb_bool append_mesg; - const char *cname; - - mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg")); - file = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "file")); - line = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "line")); - - append_mesg = !mrb_nil_p(mesg); - if (append_mesg) { - mesg = mrb_obj_as_string(mrb, mesg); - append_mesg = RSTRING_LEN(mesg) > 0; - } - - cname = mrb_obj_classname(mrb, exc); - str = mrb_str_new_cstr(mrb, cname); - if (mrb_string_p(file) && mrb_fixnum_p(line)) { - if (append_mesg) { - str = mrb_format(mrb, "%v:%v: %v (%v)", file, line, mesg, str); - } - else { - str = mrb_format(mrb, "%v:%v: %v", file, line, str); - } - } - else if (append_mesg) { - str = mrb_format(mrb, "%v: %v", str, mesg); - } - return str; + mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg")); + mrb_value cname = mrb_mod_to_s(mrb, mrb_obj_value(mrb_obj_class(mrb, exc))); + mesg = mrb_obj_as_string(mrb, mesg); + return RSTRING_LEN(mesg) == 0 ? cname : mrb_format(mrb, "%v (%v)", mesg, cname); } void mrb_keep_backtrace(mrb_state *mrb, mrb_value exc); @@ -192,33 +167,6 @@ exc_set_backtrace(mrb_state *mrb, mrb_value exc) return backtrace; } -static void -exc_debug_info(mrb_state *mrb, struct RObject *exc) -{ - mrb_callinfo *ci = mrb->c->ci; - const mrb_code *pc = ci->pc; - - if (mrb_obj_iv_defined(mrb, exc, mrb_intern_lit(mrb, "file"))) return; - while (ci >= mrb->c->cibase) { - const mrb_code *err = ci->err; - - if (!err && pc) err = pc - 1; - if (err && ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) { - mrb_irep *irep = ci->proc->body.irep; - - int32_t const line = mrb_debug_get_line(mrb, irep, err - irep->iseq); - char const* file = mrb_debug_get_filename(mrb, irep, err - irep->iseq); - if (line != -1 && file) { - mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "file"), mrb_str_new_cstr(mrb, file)); - mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "line"), mrb_fixnum_value(line)); - return; - } - } - pc = ci->pc; - ci--; - } -} - void mrb_exc_set(mrb_state *mrb, mrb_value exc) { @@ -232,7 +180,6 @@ mrb_exc_set(mrb_state *mrb, mrb_value exc) mrb->gc.arena_idx--; } if (!mrb->gc.out_of_memory && !mrb_frozen_p(mrb->exc)) { - exc_debug_info(mrb, mrb->exc); mrb_keep_backtrace(mrb, exc); } } @@ -355,7 +302,11 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap) mrb_gc_arena_restore(mrb, ai); break; case 'n': +#if UINT32_MAX < INT_MAX + obj = mrb_symbol_value((mrb_sym)va_arg(ap, int)); +#else obj = mrb_symbol_value(va_arg(ap, mrb_sym)); +#endif goto L_cat_obj; case 's': chars = va_arg(ap, char*); @@ -530,7 +481,7 @@ exception_call: break; default: - mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%i for 0..3)", argc); + mrb_argnum_error(mrb, argc, 0, 3); break; } if (argc > 0) { @@ -586,6 +537,19 @@ mrb_frozen_error(mrb_state *mrb, void *frozen_obj) mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %t", mrb_obj_value(frozen_obj)); } +MRB_API mrb_noreturn void +mrb_argnum_error(mrb_state *mrb, mrb_int argc, int min, int max) +{ +#define FMT(exp) "wrong number of arguments (given %i, expected " exp ")" + if (min == max) + mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d"), argc, min); + else if (max < 0) + mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d+"), argc, min); + else + mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d..%d"), argc, min, max); +#undef FMT +} + void mrb_init_exception(mrb_state *mrb) { @@ -598,7 +562,7 @@ mrb_init_exception(mrb_state *mrb) mrb_define_method(mrb, exception, "initialize", exc_initialize, MRB_ARGS_OPT(1)); mrb_define_method(mrb, exception, "to_s", exc_to_s, MRB_ARGS_NONE()); mrb_define_method(mrb, exception, "message", exc_message, MRB_ARGS_NONE()); - mrb_define_method(mrb, exception, "inspect", exc_inspect, MRB_ARGS_NONE()); + mrb_define_method(mrb, exception, "inspect", mrb_exc_inspect, MRB_ARGS_NONE()); mrb_define_method(mrb, exception, "backtrace", mrb_exc_backtrace, MRB_ARGS_NONE()); mrb_define_method(mrb, exception, "set_backtrace", exc_set_backtrace, MRB_ARGS_REQ(1)); diff --git a/src/fmt_fp.c b/src/fmt_fp.c index 1f1af6764..b77abe7b5 100644 --- a/src/fmt_fp.c +++ b/src/fmt_fp.c @@ -30,7 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <limits.h> #include <string.h> -#include <stdint.h> #include <math.h> #include <float.h> #include <ctype.h> @@ -807,10 +807,12 @@ obj_free(mrb_state *mrb, struct RBasic *obj, int end) case MRB_TT_SCLASS: mrb_gc_free_mt(mrb, (struct RClass*)obj); mrb_gc_free_iv(mrb, (struct RObject*)obj); + mrb_mc_clear_by_class(mrb, (struct RClass*)obj); break; case MRB_TT_ICLASS: if (MRB_FLAG_TEST(obj, MRB_FL_CLASS_IS_ORIGIN)) mrb_gc_free_mt(mrb, (struct RClass*)obj); + mrb_mc_clear_by_class(mrb, (struct RClass*)obj); break; case MRB_TT_ENV: { diff --git a/src/hash.c b/src/hash.c index d94fc23b0..70f437358 100644 --- a/src/hash.c +++ b/src/hash.c @@ -800,7 +800,7 @@ mrb_hash_init(mrb_state *mrb, mrb_value hash) mrb_hash_modify(mrb, hash); if (!mrb_nil_p(block)) { if (ifnone_p) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); + mrb_argnum_error(mrb, 1, 0, 0); } RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT; ifnone = block; diff --git a/src/kernel.c b/src/kernel.c index 69a7311e0..8bb837eca 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -384,7 +384,7 @@ mrb_obj_extend(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value obj) mrb_int i; if (argc == 0) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (at least 1)"); + mrb_argnum_error(mrb, argc, 1, -1); } for (i = 0; i < argc; i++) { mrb_check_type(mrb, argv[i], MRB_TT_MODULE); diff --git a/src/load.c b/src/load.c index 471ff3841..e624c52d5 100644 --- a/src/load.c +++ b/src/load.c @@ -42,22 +42,22 @@ offset_crc_body(void) } #ifndef MRB_WITHOUT_FLOAT +double mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck); + static double -str_to_double(mrb_state *mrb, mrb_value str) +str_to_double(mrb_state *mrb, const char *p, size_t len) { - const char *p = RSTRING_PTR(str); - mrb_int len = RSTRING_LEN(str); - /* `i`, `inf`, `infinity` */ if (len > 0 && p[0] == 'i') return INFINITY; /* `I`, `-inf`, `-infinity` */ if (p[0] == 'I' || (len > 1 && p[0] == '-' && p[1] == 'i')) return -INFINITY; - - return mrb_str_to_dbl(mrb, str, TRUE); + return mrb_str_len_to_dbl(mrb, p, len, TRUE); } #endif +mrb_value mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck); + static mrb_irep* read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags) { @@ -119,21 +119,17 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * plen); for (i = 0; i < plen; i++) { - mrb_value s; + const char *s; + mrb_bool st = (flags & FLAG_SRC_MALLOC)==0; tt = *src++; /* pool TT */ pool_data_len = bin_to_uint16(src); /* pool data length */ src += sizeof(uint16_t); - if (flags & FLAG_SRC_MALLOC) { - s = mrb_str_new(mrb, (char *)src, pool_data_len); - } - else { - s = mrb_str_new_static(mrb, (char *)src, pool_data_len); - } + s = (const char*)src; src += pool_data_len; switch (tt) { /* pool data */ case IREP_TT_FIXNUM: { - mrb_value num = mrb_str_to_inum(mrb, s, 10, FALSE); + mrb_value num = mrb_str_len_to_inum(mrb, s, pool_data_len, 10, FALSE); #ifdef MRB_WITHOUT_FLOAT irep->pool[i] = num; #else @@ -144,12 +140,12 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag #ifndef MRB_WITHOUT_FLOAT case IREP_TT_FLOAT: - irep->pool[i] = mrb_float_pool(mrb, str_to_double(mrb, s)); + irep->pool[i] = mrb_float_pool(mrb, str_to_double(mrb, s, pool_data_len)); break; #endif case IREP_TT_STRING: - irep->pool[i] = mrb_str_pool(mrb, s); + irep->pool[i] = mrb_str_pool(mrb, s, pool_data_len, st); break; default: diff --git a/src/print.c b/src/print.c index 03b5eadfa..7d2d16086 100644 --- a/src/print.c +++ b/src/print.c @@ -31,7 +31,6 @@ MRB_API void mrb_print_error(mrb_state *mrb) { mrb_print_backtrace(mrb); - printstr(mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0), stderr); } MRB_API void diff --git a/src/string.c b/src/string.c index 5a0a6a233..7b6a11a6f 100644 --- a/src/string.c +++ b/src/string.c @@ -553,7 +553,7 @@ str_share(mrb_state *mrb, struct RString *orig, struct RString *s) size_t len = (size_t)orig->as.heap.len; mrb_assert(!RSTR_EMBED_P(orig)); - if (RSTR_NOFREE_P(orig) || RSTR_POOL_P(orig)) { + if (RSTR_NOFREE_P(orig)) { str_init_nofree(s, orig->as.heap.ptr, len); } else if (RSTR_SHARED_P(orig)) { @@ -562,7 +562,7 @@ str_share(mrb_state *mrb, struct RString *orig, struct RString *s) else if (RSTR_FSHARED_P(orig)) { str_init_fshared(orig, s, orig->as.heap.aux.fshared); } - else if (mrb_frozen_p(orig)) { + else if (mrb_frozen_p(orig) && !RSTR_POOL_P(orig)) { str_init_fshared(orig, s, orig); } else { @@ -576,12 +576,9 @@ str_share(mrb_state *mrb, struct RString *orig, struct RString *s) } mrb_value -mrb_str_pool(mrb_state *mrb, mrb_value str) +mrb_str_pool(mrb_state *mrb, const char *p, mrb_int len, mrb_bool nofree) { struct RString *s = (struct RString *)mrb_malloc(mrb, sizeof(struct RString)); - struct RString *orig = mrb_str_ptr(str); - const char *p = RSTR_PTR(orig); - size_t len = (size_t)RSTR_LEN(orig); s->tt = MRB_TT_STRING; s->c = mrb->string_class; @@ -590,7 +587,7 @@ mrb_str_pool(mrb_state *mrb, mrb_value str) if (RSTR_EMBEDDABLE_P(len)) { str_init_embed(s, p, len); } - else if (RSTR_NOFREE_P(orig)) { + else if (nofree) { str_init_nofree(s, p, len); } else { @@ -1095,7 +1092,6 @@ mrb_str_equal_m(mrb_state *mrb, mrb_value str1) return mrb_bool_value(mrb_str_equal(mrb, str1, str2)); } /* ---------------------------------- */ -mrb_value mrb_mod_to_s(mrb_state *mrb, mrb_value klass); MRB_API mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str) @@ -2243,7 +2239,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) return result; } -static mrb_value +mrb_value mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck) { const char *p = str; @@ -2492,20 +2488,65 @@ mrb_str_to_i(mrb_state *mrb, mrb_value self) } #ifndef MRB_WITHOUT_FLOAT -MRB_API double -mrb_cstr_to_dbl(mrb_state *mrb, const char * s, mrb_bool badcheck) +double +mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck) { - const char *p = s; - char *end; char buf[DBL_DIG * 4 + 10]; + const char *p; + const char *pend = s + len; + char *end; + char *n; + char prev = 0; double d; - if (!p) return 0.0; - while (ISSPACE(*p)) p++; + if (!s) return 0.0; + while (ISSPACE(*s)) s++; + p = s; + + if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { + mrb_value x; - if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { - return 0.0; + x = mrb_str_len_to_inum(mrb, p, pend-p, 0, badcheck); + if (mrb_fixnum_p(x)) + d = (double)mrb_fixnum(x); + else /* if (mrb_float_p(x)) */ + d = mrb_float(x); + return d; + } + while (p < pend) { + if (!*p) { + if (badcheck && p < pend) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "string for Float contains null byte"); + /* not reached */ + } + pend = p; + p = s; + goto nocopy; + } + if (*p == '_') break; + p++; + } + p = s; + n = buf; + while (p < pend) { + char c = *p++; + if (c == '_') { + /* remove an underscore between digits */ + if (n == buf || !ISDIGIT(prev) || p == pend) { + if (badcheck) goto bad; + break; + } + } + else if (badcheck && prev == '_' && !ISDIGIT(c)) goto bad; + else { + *n++ = c; + } + prev = c; } + *n = '\0'; + p = buf; + pend = n; +nocopy: d = mrb_float_read(p, &end); if (p == end) { if (badcheck) { @@ -2515,44 +2556,24 @@ bad: } return d; } - if (*end) { - char *n = buf; - char *e = buf + sizeof(buf) - 1; - char prev = 0; - - while (p < end && n < e) prev = *n++ = *p++; - while (*p) { - if (*p == '_') { - /* remove an underscore between digits */ - if (n == buf || !ISDIGIT(prev) || (++p, !ISDIGIT(*p))) { - if (badcheck) goto bad; - break; - } - } - prev = *p++; - if (n < e) *n++ = prev; - } - *n = '\0'; - p = buf; - - if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { - return 0.0; - } - - d = mrb_float_read(p, &end); - if (badcheck) { - if (!end || p == end) goto bad; - while (*end && ISSPACE(*end)) end++; - if (*end) goto bad; - } + if (badcheck) { + if (!end || p == end) goto bad; + while (end<pend && ISSPACE(*end)) end++; + if (end<pend) goto bad; } return d; } MRB_API double +mrb_cstr_to_dbl(mrb_state *mrb, const char *s, mrb_bool badcheck) +{ + return mrb_str_len_to_dbl(mrb, s, strlen(s), badcheck); +} + +MRB_API double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck) { - return mrb_cstr_to_dbl(mrb, RSTRING_CSTR(mrb, str), badcheck); + return mrb_str_len_to_dbl(mrb, RSTRING_PTR(str), RSTRING_LEN(str), badcheck); } /* 15.2.10.5.39 */ diff --git a/tasks/doc.rake b/tasks/doc.rake index 4aec2d0a1..11b76bb3f 100644 --- a/tasks/doc.rake +++ b/tasks/doc.rake @@ -25,12 +25,12 @@ end desc 'clean all built docs' task :clean_api_doc do - FileUtils.rm_rf 'doc/api' + rm_rf 'doc/api' end desc 'clean all built docs' task :clean_capi_doc do - FileUtils.rm_rf 'doc/capi' + rm_rf 'doc/capi' end desc 'clean all built docs' diff --git a/tasks/gitlab.rake b/tasks/gitlab.rake index 471172377..31c8c044a 100644 --- a/tasks/gitlab.rake +++ b/tasks/gitlab.rake @@ -80,7 +80,7 @@ task :gitlab_config do _info += int_conf['16'] ? 'int16 ' : '' _info += int_conf['64'] ? 'int64 ' : '' _info += boxing_conf['NAN'] ? 'nan ' : '' - _info += boxing_conf['word'] ? 'word ' : '' + _info += boxing_conf['WORD'] ? 'word ' : '' _info += utf8_conf['UTF8'] ? 'utf8 ' : '' _info = _info.gsub(/ +/, ' ').strip.tr(' ', '_') configs << { '_info' => _info, 'CFLAGS' => "#{bit}#{env}", 'LDFLAGS' => bit.strip.to_s } @@ -110,7 +110,7 @@ task :gitlab_config do 'stage' => 'test', 'image' => ci_docker_tag(compiler), 'variables' => hash, - 'script' => 'env; ./minirake --verbose all test' + 'script' => 'env; rake --verbose all test' } end end diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index ab5a15b4a..17f8534e2 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -4,7 +4,7 @@ MRuby.each_target do end file "#{build_dir}/lib/libmruby.flags.mak" => [__FILE__, libmruby_static] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name open(t.name, 'w') do |f| f.puts "MRUBY_CFLAGS = #{cc.all_flags}" diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake index fb76856e5..8168e4fab 100644 --- a/tasks/mrbgems.rake +++ b/tasks/mrbgems.rake @@ -8,7 +8,7 @@ MRuby.each_target do self.libmruby_objs << objfile("#{build_dir}/mrbgems/gem_init") file objfile("#{build_dir}/mrbgems/gem_init") => ["#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"] file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG, __FILE__] do |t| - FileUtils.mkdir_p "#{build_dir}/mrbgems" + mkdir_p "#{build_dir}/mrbgems" open(t.name, 'w') do |f| gem_func_gems = gems.select { |g| g.generate_functions } gem_func_decls = gem_func_gems.each_with_object('') do |g, s| @@ -53,7 +53,7 @@ MRuby.each_target do # legal documents file "#{build_dir}/LEGAL" => [MRUBY_CONFIG, __FILE__] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name open(t.name, 'w+') do |f| f.puts <<LEGAL Copyright (c) #{Time.now.year} mruby developers diff --git a/tasks/toolchains/android.rake b/tasks/toolchains/android.rake index c7df9ef80..0ac4d000c 100644 --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake @@ -67,7 +67,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter end def home_path - @home_path ||= Pathname( + @home_path ||= Pathname.new( params[:ndk_home] || ENV['ANDROID_NDK_HOME'] || DEFAULT_NDK_HOMES.find { |path| @@ -124,7 +124,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*') Dir.glob(path.to_s){ |item| next if File.file?(item) - path = Pathname(item) + path = Pathname.new(item) break } path.basename diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 1a28026bf..e9ea2550c 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -15,7 +15,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| compiler.option_include_path = '-I%s' compiler.option_define = '-D%s' compiler.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' - compiler.cxx_compile_flag = '-x c++ -std=c++03' + compiler.cxx_compile_flag = '-x c++ -std=gnu++03' compiler.cxx_exception_flag = '-fexceptions' compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags end diff --git a/test/t/exception.rb b/test/t/exception.rb index bdf277c1e..a6f69eef6 100644 --- a/test/t/exception.rb +++ b/test/t/exception.rb @@ -352,8 +352,10 @@ assert('Exception 19') do assert_equal [true, true], Class4Exception19.new.a end -assert('Exception#inspect without message') do +assert('Exception#inspect') do assert_equal "Exception", Exception.new.inspect + assert_equal "Exception", Exception.new("").inspect + assert_equal "error! (Exception)", Exception.new("error!").inspect end assert('Exception#backtrace') do diff --git a/test/t/syntax.rb b/test/t/syntax.rb index af63fcef9..436c06601 100644 --- a/test/t/syntax.rb +++ b/test/t/syntax.rb @@ -672,11 +672,12 @@ assert 'keyword arguments' do assert_equal([:a, nil, :c], m(a: :a, c: :c)) end - assert('numbered parameters') do assert_equal(15, [1,2,3,4,5].reduce {_1+_2}) - assert_equal(3, ->{_1+_2}.call(1,2)) - assert_equal(4, ->(a=->{_1}){a}.call.call(4)) - assert_equal(5, -> a: ->{_1} {a}.call.call(5)) assert_equal(45, Proc.new do _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 end.call(*[1, 2, 3, 4, 5, 6, 7, 8, 9])) end + +assert('_0 is not numbered parameter') do + _0 = :l + assert_equal(:l, ->{_0}.call) +end diff --git a/test/t/vformat.rb b/test/t/vformat.rb index 679f30407..df6950ee6 100644 --- a/test/t/vformat.rb +++ b/test/t/vformat.rb @@ -1,25 +1,4 @@ -def assert_format(exp, args) - assert_equal(exp, TestVFormat.format(*args)) -end - -def assert_format_pattern(exp_pattern, args) - assert_match(exp_pattern, TestVFormat.format(*args)) -end - -# Pass if ArgumentError is raised or return value is +exp+. -def assert_implementation_dependent(exp, args) - begin - ret = TestVFormat.format(*args) - rescue ArgumentError - return pass - end - if ret == exp - pass - else - flunk "", "Expected ArgumentError is raised or #{ret.inspect} to be #{exp}." - end -end - +# coding: utf-8-emacs def sclass(v) class << v self @@ -27,66 +6,53 @@ def sclass(v) end assert('mrb_vformat') do - n = TestVFormat::Native - assert_format '', [''] - assert_format 'No specifier!', ['No specifier!'] - assert_format '`c`: C', ['`c`: %c', n.c(?C)] - assert_format '`d`: 123', ['`d`: %d', n.d(123)] - assert_format '`d`: -79', ['`d`: %d', n.d(-79)] - assert_format '`i`: 514', ['`i`: %i', n.i(514)] - assert_format '`i`: -83', ['`i`: %i', n.i(-83)] - assert_format '`t`: NilClass', ['`t`: %t', nil] - assert_format '`t`: FalseClass', ['`t`: %t', false] - assert_format '`t`: TrueClass', ['`t`: %t', true] - assert_format '`t`: Fixnum', ['`t`: %t', 0] - assert_format '`t`: Hash', ['`t`: %t', k: "value"] - assert_format_pattern '#<Class:#<Class:#<Hash:0x*>>>', ['%t', sclass({})] -# assert_format 'string and length', ['string %l length', n.s('andante'), n.l(3)] - assert_format '`n`: sym', ['`n`: %n', n.n(:sym)] - assert_format '%C文字列%', ['%s', n.s('%C文字列%')] - assert_format '`C`: Kernel module', ['`C`: %C module', n.C(Kernel)] - assert_format '`C`: NilClass', ['`C`: %C', n.C(nil.class)] - assert_format_pattern '#<Class:#<String:0x*>>', ['%C', n.C(sclass(""))] - assert_format '`T`: NilClass', ['`T`: %T', nil] - assert_format '`T`: FalseClass', ['`T`: %T', false] - assert_format '`T`: TrueClass', ['`T`: %T', true] - assert_format '`T`: Fixnum', ['`T`: %T', 0] - assert_format '`T`: Hash', ['`T`: %T', k: "value"] - assert_format_pattern 'Class', ['%T', sclass({})] - assert_format '`Y`: nil', ['`Y`: %Y', nil] - assert_format '`Y`: false', ['`Y`: %Y', false] - assert_format '`Y`: true', ['`Y`: %Y', true] - assert_format '`Y`: Fixnum', ['`Y`: %Y', 0] - assert_format '`Y`: Hash', ['`Y`: %Y', k: "value"] - assert_format 'Class', ['%Y', sclass({})] - assert_format_pattern '#<Class:#<String:0x*>>', ['%v', sclass("")] - assert_format '`v`: 1...3', ['`v`: %v', 1...3] - assert_format '`S`: {:a=>1, "b"=>"c"}', ['`S`: %S', a: 1, "b" => ?c] - assert_format 'percent: %', ['percent: %%'] - assert_format '"I": inspect char', ['%!c: inspect char', n.c(?I)] - assert_format '709: inspect mrb_int', ['%!d: inspect mrb_int', n.i(709)] -# assert_format '"a\x00b\xff"', ['%!l', n.s("a\000b\xFFc\000d"), n.l(4)] - assert_format ':"&.": inspect symbol', ['%!n: inspect symbol', n.n(:'&.')] - assert_format 'inspect "String"', ['inspect %!v', 'String'] - assert_format 'inspect Array: [1, :x, {}]', ['inspect Array: %!v', [1,:x,{}]] - assert_format_pattern '`!C`: #<Class:0x*>', ['`!C`: %!C', n.C(Class.new)] - assert_format 'to_s -> to_s: ab,cd', ['to_s -> to_s: %n,%v', n.n(:ab), 'cd'] - assert_format 'to_s -> inspect: x:y', ['to_s -> inspect: %v%!v', 'x', :y] - assert_format 'inspect -> to_s: "a"b', ['inspect -> to_s: %!v%n', 'a', n.n(:b)] - assert_format 'Y -> to_s: nile', ['Y -> to_s: %Y%v', nil, "e"] - assert_format '"abc":Z', ['%!s%!n', n.s('abc'), n.n('Z'.to_sym)] - assert_format 'escape: \\%a,b,c,d', ['escape: \\\\\%a,b,\c%v', ',d'] - - assert_implementation_dependent 'unknown specifier: %^', - ['unknown specifier: %^'] - assert_implementation_dependent 'unknown specifier with modifier: %!^', - ['unknown specifier with modifier: %!^'] - assert_implementation_dependent 'termination is \\', ['termination is \\'] - assert_implementation_dependent 'termination is %', ['termination is %'] - assert_implementation_dependent 'termination is %!', ['termination is %!'] + vf = TestVFormat + assert_equal '', vf.z('') + assert_equal 'No specifier!', vf.z('No specifier!') + assert_equal '`c`: C', vf.c('`c`: %c', ?C) + assert_equal '`d`: 123', vf.d('`d`: %d', 123) + assert_equal '`d`: -79', vf.d('`d`: %d', -79) + assert_equal '`i`: 514', vf.i('`i`: %i', 514) + assert_equal '`i`: -83', vf.i('`i`: %i', -83) + assert_equal '`t`: NilClass', vf.v('`t`: %t', nil) + assert_equal '`t`: FalseClass', vf.v('`t`: %t', false) + assert_equal '`t`: TrueClass', vf.v('`t`: %t', true) + assert_equal '`t`: Fixnum', vf.v('`t`: %t', 0) + assert_equal '`t`: Hash', vf.v('`t`: %t', {k: "value"}) + assert_match '#<Class:#<Class:#<Hash:0x*>>>', vf.v('%t', sclass({})) + assert_equal 'string and length', vf.l('string %l length', 'andante', 3) + assert_equal '`n`: sym', vf.n('`n`: %n', :sym) + assert_equal '%C文字列����%', vf.s('%s', '%C文字列����%') + assert_equal '`C`: Kernel module', vf.C('`C`: %C module', Kernel) + assert_equal '`C`: NilClass', vf.C('`C`: %C', nil.class) + assert_match '#<Class:#<String:0x*>>', vf.C('%C', sclass("")) + assert_equal '`T`: NilClass', vf.v('`T`: %T', nil) + assert_equal '`T`: FalseClass', vf.v('`T`: %T', false) + assert_equal '`T`: TrueClass', vf.v('`T`: %T', true) + assert_equal '`T`: Fixnum', vf.v('`T`: %T', 0) + assert_equal '`T`: Hash', vf.v('`T`: %T', {k: "value"}) + assert_match 'Class', vf.v('%T', sclass({})) + assert_equal '`Y`: nil', vf.v('`Y`: %Y', nil) + assert_equal '`Y`: false', vf.v('`Y`: %Y', false) + assert_equal '`Y`: true', vf.v('`Y`: %Y', true) + assert_equal '`Y`: Fixnum', vf.v('`Y`: %Y', 0) + assert_equal '`Y`: Hash', vf.v('`Y`: %Y', {k: "value"}) + assert_equal 'Class', vf.v('%Y', sclass({})) + assert_match '#<Class:#<String:0x*>>', vf.v('%v', sclass("")) + assert_equal '`v`: 1...3', vf.v('`v`: %v', 1...3) + assert_equal '`S`: {:a=>1, "b"=>"c"}', vf.v('`S`: %S', {a: 1, "b" => ?c}) + assert_equal 'percent: %', vf.z('percent: %%') + assert_equal '"I": inspect char', vf.c('%!c: inspect char', ?I) + assert_equal '709: inspect mrb_int', vf.i('%!d: inspect mrb_int', 709) + assert_equal '"a\x00b\xff"', vf.l('%!l', "a\000b\xFFc\000d", 4) + assert_equal ':"&.": inspect symbol', vf.n('%!n: inspect symbol', :'&.') + assert_equal 'inspect "String"', vf.v('inspect %!v', 'String') + assert_equal 'inspect Array: [1, :x, {}]', vf.v('inspect Array: %!v', [1,:x,{}]) + assert_match '`!C`: #<Class:0x*>', vf.C('`!C`: %!C', Class.new) + assert_equal 'escape: \\%a,b,c,d', vf.v('escape: \\\\\%a,b,\c%v', ',d') skip unless Object.const_defined?(:Float) - assert_format '`f`: 0.0125', ['`f`: %f', n.f(0.0125)] - assert_format '-Infinity', ['%f', n.f(-Float::INFINITY)] - assert_format 'NaN: Not a Number', ['%f: Not a Number', n.f(Float::NAN)] + assert_equal '`f`: 0.0125', vf.f('`f`: %f', 0.0125) + assert_equal '-Infinity', vf.f('%f', -Float::INFINITY) + assert_equal 'NaN: Not a Number', vf.f('%f: Not a Number', Float::NAN) end diff --git a/travis_config.rb b/travis_config.rb index 94cd4aadc..2263bac25 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -18,7 +18,8 @@ MRuby::Build.new('full-debug') do |conf| # include all core GEMs conf.gembox 'full-core' - conf.cc.defines += %w(MRB_ENABLE_DEBUG_HOOK) + conf.cc.flags += %w(-Werror=declaration-after-statement) + conf.cc.defines += %w(MRB_GC_STRESS MRB_METHOD_CACHE MRB_ENABLE_DEBUG_HOOK) conf.enable_test end |