From 7a0eabb574f773d3fb1d47e5de34f20b42d5e81c Mon Sep 17 00:00:00 2001 From: mimaki Date: Fri, 13 Jan 2023 09:12:08 +0900 Subject: [PATCH 1/7] Update version to 3.2.0RC. --- README.md | 2 +- include/mruby/version.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dd8661754..cba0d33f9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ of the Ministry of Economy, Trade and Industry of Japan. ## How to get mruby -The stable version 3.1.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.1.0.zip](https://github.com/mruby/mruby/archive/3.1.0.zip) +The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc.zip](https://github.com/mruby/mruby/archive/3.2.0-rc.zip) The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master) diff --git a/include/mruby/version.h b/include/mruby/version.h index cf713da2b..87587b1c3 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -27,7 +27,7 @@ MRB_BEGIN_DECL /* * The version of Ruby used by mruby. */ -#define MRUBY_RUBY_VERSION "3.1" +#define MRUBY_RUBY_VERSION "3.2" /* * Ruby engine. @@ -42,7 +42,7 @@ MRB_BEGIN_DECL /* * Minor release version number. */ -#define MRUBY_RELEASE_MINOR 1 +#define MRUBY_RELEASE_MINOR 2 /* * Tiny release version number. @@ -57,7 +57,7 @@ MRB_BEGIN_DECL /* * Patch level string. (optional) */ -#define MRUBY_PATCHLEVEL_STR "" +#define MRUBY_PATCHLEVEL_STR "RC" #ifndef MRUBY_PATCHLEVEL_STR # if MRUBY_PATCHLEVEL < 0 @@ -80,17 +80,17 @@ MRB_BEGIN_DECL /* * Release year. */ -#define MRUBY_RELEASE_YEAR 2022 +#define MRUBY_RELEASE_YEAR 2023 /* * Release month. */ -#define MRUBY_RELEASE_MONTH 5 +#define MRUBY_RELEASE_MONTH 1 /* * Release day. */ -#define MRUBY_RELEASE_DAY 12 +#define MRUBY_RELEASE_DAY 13 /* * Release date as a string. From 23aa5f91bc6f580c064b382de3ee0ab53388bd20 Mon Sep 17 00:00:00 2001 From: mimaki Date: Wed, 18 Jan 2023 10:26:58 +0900 Subject: [PATCH 2/7] Update version to 3.2.0RC2. --- README.md | 2 +- include/mruby/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99300a385..61c32b85e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ of the Ministry of Economy, Trade and Industry of Japan. ## How to get mruby -The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc.zip](https://github.com/mruby/mruby/archive/3.2.0-rc.zip) +The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc2.zip](https://github.com/mruby/mruby/archive/3.2.0-rc2.zip) The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master) diff --git a/include/mruby/version.h b/include/mruby/version.h index 87587b1c3..dec157123 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -57,7 +57,7 @@ MRB_BEGIN_DECL /* * Patch level string. (optional) */ -#define MRUBY_PATCHLEVEL_STR "RC" +#define MRUBY_PATCHLEVEL_STR "RC2" #ifndef MRUBY_PATCHLEVEL_STR # if MRUBY_PATCHLEVEL < 0 @@ -90,7 +90,7 @@ MRB_BEGIN_DECL /* * Release day. */ -#define MRUBY_RELEASE_DAY 13 +#define MRUBY_RELEASE_DAY 18 /* * Release date as a string. From 6b82843e7237a397978cba97f989bc1fa99c420a Mon Sep 17 00:00:00 2001 From: mimaki Date: Mon, 23 Jan 2023 10:16:15 +0900 Subject: [PATCH 3/7] Update version to 3.2.0RC3. --- README.md | 2 +- include/mruby/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 61c32b85e..5a862aa42 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ of the Ministry of Economy, Trade and Industry of Japan. ## How to get mruby -The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc2.zip](https://github.com/mruby/mruby/archive/3.2.0-rc2.zip) +The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc3.zip](https://github.com/mruby/mruby/archive/3.2.0-rc3.zip) The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master) diff --git a/include/mruby/version.h b/include/mruby/version.h index dec157123..1f51f10af 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -57,7 +57,7 @@ MRB_BEGIN_DECL /* * Patch level string. (optional) */ -#define MRUBY_PATCHLEVEL_STR "RC2" +#define MRUBY_PATCHLEVEL_STR "RC3" #ifndef MRUBY_PATCHLEVEL_STR # if MRUBY_PATCHLEVEL < 0 @@ -90,7 +90,7 @@ MRB_BEGIN_DECL /* * Release day. */ -#define MRUBY_RELEASE_DAY 18 +#define MRUBY_RELEASE_DAY 23 /* * Release date as a string. From 762ca43c1668718a37e0ebf494017d74736f9d31 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 7 Feb 2023 15:44:24 +0900 Subject: [PATCH 4/7] mruby-bin-mirb: add bintest for multi-line input; ref #5922 --- mrbgems/mruby-bin-mirb/bintest/mirb.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mrbgems/mruby-bin-mirb/bintest/mirb.rb b/mrbgems/mruby-bin-mirb/bintest/mirb.rb index 62f863c27..57f8dc8f4 100644 --- a/mrbgems/mruby-bin-mirb/bintest/mirb.rb +++ b/mrbgems/mruby-bin-mirb/bintest/mirb.rb @@ -7,6 +7,12 @@ assert('mirb normal operations') do assert_true o.include?('=> 2') end +assert('mirb multi-line') do + o, s = Open3.capture2(cmd("mirb"), :stdin_data => "def a(b)\n return b\n end\na(1)\n") + assert_true o.include?('=> :a') + assert_true o.include?('=> 1') +end + assert('regression for #1563') do o, s = Open3.capture2(cmd("mirb"), :stdin_data => "a=1;b=2;c=3\nb\nc") assert_true o.include?('=> 3') From 056cda72be25c0e0122feb00b5874b16c2e335db Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 7 Feb 2023 15:45:11 +0900 Subject: [PATCH 5/7] mruby-bin-mirb: fix multi-line input issue; fix #5922 Bison changed the message for the end-of-file error. `mirb` should be updated for the new message. --- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 4ee4ab44a..78c3ed40f 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -150,7 +150,7 @@ is_code_block_open(struct mrb_parser_state *parser) /* check if parser error are available */ if (0 < parser->nerr) { - const char unexpected_end[] = "syntax error, unexpected $end"; + const char unexpected_end[] = "syntax error, unexpected end of file"; const char *message = parser->error_buffer[0].message; /* a parser error occur, we have to check if */ From 4ca21298891be77ef6d6f7098892136b5f45e3fb Mon Sep 17 00:00:00 2001 From: mimaki Date: Wed, 8 Feb 2023 10:04:29 +0900 Subject: [PATCH 6/7] Update version to 3.2.0RC4. --- README.md | 2 +- include/mruby/version.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5a862aa42..e696a8a79 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ of the Ministry of Economy, Trade and Industry of Japan. ## How to get mruby -The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc3.zip](https://github.com/mruby/mruby/archive/3.2.0-rc3.zip) +The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc4.zip](https://github.com/mruby/mruby/archive/3.2.0-rc4.zip) The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master) diff --git a/include/mruby/version.h b/include/mruby/version.h index 1f51f10af..9329880f7 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -57,7 +57,7 @@ MRB_BEGIN_DECL /* * Patch level string. (optional) */ -#define MRUBY_PATCHLEVEL_STR "RC3" +#define MRUBY_PATCHLEVEL_STR "RC4" #ifndef MRUBY_PATCHLEVEL_STR # if MRUBY_PATCHLEVEL < 0 @@ -85,12 +85,12 @@ MRB_BEGIN_DECL /* * Release month. */ -#define MRUBY_RELEASE_MONTH 1 +#define MRUBY_RELEASE_MONTH 2 /* * Release day. */ -#define MRUBY_RELEASE_DAY 23 +#define MRUBY_RELEASE_DAY 8 /* * Release date as a string. From 87260e7bb1a9edfb2ce9b41549c4142129061ca5 Mon Sep 17 00:00:00 2001 From: mimaki Date: Fri, 24 Feb 2023 19:51:12 +0900 Subject: [PATCH 7/7] Update version and release date. (mruby 3.2.0 (2023-02-24)) --- LICENSE | 2 +- README.md | 2 +- include/mruby.h | 2 +- include/mruby/version.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 6881f4df6..7461282a3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010-2022 mruby developers +Copyright (c) 2010-2023 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/README.md b/README.md index e696a8a79..cf310e01a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ of the Ministry of Economy, Trade and Industry of Japan. ## How to get mruby -The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc4.zip](https://github.com/mruby/mruby/archive/3.2.0-rc4.zip) +The stable version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0.zip](https://github.com/mruby/mruby/archive/3.2.0.zip) The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master) diff --git a/include/mruby.h b/include/mruby.h index 0b8975788..2d96b25e0 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -1,7 +1,7 @@ /* ** mruby - An embeddable Ruby implementation ** -** Copyright (c) mruby developers 2010-2022 +** Copyright (c) mruby developers 2010-2023 ** ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/include/mruby/version.h b/include/mruby/version.h index 9329880f7..01492e0ca 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -57,7 +57,7 @@ MRB_BEGIN_DECL /* * Patch level string. (optional) */ -#define MRUBY_PATCHLEVEL_STR "RC4" +#define MRUBY_PATCHLEVEL_STR "" #ifndef MRUBY_PATCHLEVEL_STR # if MRUBY_PATCHLEVEL < 0 @@ -90,7 +90,7 @@ MRB_BEGIN_DECL /* * Release day. */ -#define MRUBY_RELEASE_DAY 8 +#define MRUBY_RELEASE_DAY 24 /* * Release date as a string.