From 27ddb6e99848c397a415b785315896ab50308076 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 01:01:17 +0900 Subject: [PATCH 001/878] Warn also numbered parameter like parameters [Feature #16433] --- parse.y | 14 ++++++++++---- test/ripper/test_scanner_events.rb | 2 +- test/ruby/test_syntax.rb | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/parse.y b/parse.y index 7de84ee70006f3..33c1c89c3d654f 100644 --- a/parse.y +++ b/parse.y @@ -11829,19 +11829,25 @@ node_newnode_with_locals(struct parser_params *p, enum node_type type, VALUE a1, #endif +static void +numparam_name(struct parser_params *p, ID id) +{ + if (!NUMPARAM_ID_P(id)) return; + rb_warn1("`_%d' is used as numbered parameter", + WARN_I(NUMPARAM_ID_TO_IDX(id))); +} + static void arg_var(struct parser_params *p, ID id) { + numparam_name(p, id); vtable_add(p->lvtbl->args, id); } static void local_var(struct parser_params *p, ID id) { - if (NUMPARAM_ID_P(id)) { - rb_warn1("`_%d' is used as numbered parameter", - WARN_I(NUMPARAM_ID_TO_IDX(id))); - } + numparam_name(p, id); vtable_add(p->lvtbl->vars, id); if (p->lvtbl->used) { vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline); diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb index ffe2ea1e37b3cc..cef584c157770d 100644 --- a/test/ripper/test_scanner_events.rb +++ b/test/ripper/test_scanner_events.rb @@ -31,7 +31,7 @@ def scan(target, str, &error) alias compile_error on_error end end - lexer.lex.select {|_1,type,_2| type == sym }.map {|_1,_2,tok| tok } + lexer.lex.select {|_,type,_| type == sym }.map {|_,_,tok| tok } end def test_tokenize diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 286beb7074b95b..b292b248949ca8 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1439,6 +1439,8 @@ def test_numbered_parameter assert_syntax_error('proc {_1; _1 = nil}', /Can't assign to numbered parameter _1/) assert_warn(/`_1' is used as numbered parameter/) {eval('proc {_1 = nil}')} assert_warn(/`_2' is used as numbered parameter/) {eval('_2=1')} + assert_warn(/`_3' is used as numbered parameter/) {eval('proc {|_3|}')} + assert_warn(/`_4' is used as numbered parameter/) {instance_eval('def x(_4) end')} assert_raise_with_message(NameError, /undefined local variable or method `_1'/) { eval('_1') } From 844f1fada6f364dc26bd6eb6de2c4299a69e272a Mon Sep 17 00:00:00 2001 From: git Date: Fri, 20 Dec 2019 01:37:11 +0900 Subject: [PATCH 002/878] * 2019-12-20 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 178369ded32048..fa1805ec43d61a 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" From 3816cd945d68eac7ca8fecbc9d71f878ff3e7b3d Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 20 Dec 2019 01:40:00 +0900 Subject: [PATCH 003/878] Add `URI#open` to warning message --- lib/open-uri.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open-uri.rb b/lib/open-uri.rb index c099eba6a0cdc3..c52f67f525c25c 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -15,7 +15,7 @@ def open(name, *rest, **kw, &block) # :nodoc: (name.respond_to?(:to_str) && %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name && (uri = URI.parse(name)).respond_to?(:open)) - warn('calling URI.open via Kernel#open is deprecated, call URI.open directly', uplevel: 1) + warn('calling URI.open via Kernel#open is deprecated, call URI.open directly or use URI#open', uplevel: 1) URI.open(name, *rest, **kw, &block) else open_uri_original_open(name, *rest, **kw, &block) From 2898367b3a1de00ca78067cc17dd4d1f8df37778 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 08:18:19 +0900 Subject: [PATCH 004/878] Warn also numbered parameter like methods --- parse.y | 3 +++ test/ruby/test_syntax.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/parse.y b/parse.y index 33c1c89c3d654f..7247afafa3332f 100644 --- a/parse.y +++ b/parse.y @@ -188,6 +188,7 @@ numparam_id_p(ID id) unsigned int idx = NUMPARAM_ID_TO_IDX(id); return idx > 0 && idx <= NUMPARAM_MAX; } +static void numparam_name(struct parser_params *p, ID id); #define DVARS_INHERIT ((void*)1) #define DVARS_TOPSCOPE NULL @@ -2981,6 +2982,7 @@ primary : literal } | k_def fname { + numparam_name(p, get_id($2)); local_push(p, 0); $$ = p->cur_arg; p->cur_arg = 0; @@ -3007,6 +3009,7 @@ primary : literal } | k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname { + numparam_name(p, get_id($5)); $4 = p->in_def; p->in_def = 1; SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */ diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index b292b248949ca8..5eb69c514422ec 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1441,6 +1441,8 @@ def test_numbered_parameter assert_warn(/`_2' is used as numbered parameter/) {eval('_2=1')} assert_warn(/`_3' is used as numbered parameter/) {eval('proc {|_3|}')} assert_warn(/`_4' is used as numbered parameter/) {instance_eval('def x(_4) end')} + assert_warn(/`_5' is used as numbered parameter/) {instance_eval('def _5; end')} + assert_warn(/`_6' is used as numbered parameter/) {instance_eval('def self._6; end')} assert_raise_with_message(NameError, /undefined local variable or method `_1'/) { eval('_1') } From db166290088fb7d39d01f68b9860253893d4f1a7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 09:19:39 +0900 Subject: [PATCH 005/878] Fixed misspellings Fixed misspellings reported at [Bug #16437], only in ruby and rubyspec. --- basictest/test.rb | 2 +- compile.c | 2 +- cont.c | 2 +- defs/gmake.mk | 2 +- defs/separated_version.mk | 2 +- doc/NEWS-2.5.0 | 2 +- doc/contributing.rdoc | 2 +- doc/extension.rdoc | 2 +- doc/syntax/miscellaneous.rdoc | 2 +- gc.c | 2 +- include/ruby/backward/cxxanyargs.hpp | 42 +++++++++---------- iseq.c | 4 +- man/ruby.1 | 2 +- misc/rb_optparse.zsh | 2 +- process.c | 2 +- range.c | 4 +- regparse.c | 2 +- sample/drb/old_tuplespace.rb | 2 +- sample/trick2013/kinaba/remarks.markdown | 2 +- sample/trick2015/ksk_2/remarks.markdown | 4 +- spec/ruby/core/argf/binmode_spec.rb | 2 +- spec/ruby/core/env/delete_spec.rb | 2 +- spec/ruby/core/file/chmod_spec.rb | 2 +- spec/ruby/core/integer/comparison_spec.rb | 2 +- .../core/kernel/singleton_methods_spec.rb | 12 +++--- spec/ruby/core/module/alias_method_spec.rb | 2 +- spec/ruby/core/module/autoload_spec.rb | 2 +- spec/ruby/core/string/undump_spec.rb | 2 +- spec/ruby/core/time/new_spec.rb | 2 +- spec/ruby/language/regexp/modifiers_spec.rb | 2 +- .../library/socket/ipsocket/recvfrom_spec.rb | 2 +- spec/ruby/optional/capi/io_spec.rb | 2 +- st.c | 2 +- .../popen_deadlock/test_popen_deadlock.rb | 2 +- test/ruby/sentence.rb | 2 +- test/ruby/test_assignment.rb | 2 +- test/ruby/test_struct.rb | 2 +- time.c | 2 +- tool/lib/tracepointchecker.rb | 2 +- tool/mkconfig.rb | 2 +- tool/redmine-backporter.rb | 4 +- vm.c | 6 +-- vm_dump.c | 2 +- vm_insnhelper.c | 8 ++-- win32/file.c | 2 +- 45 files changed, 79 insertions(+), 79 deletions(-) diff --git a/basictest/test.rb b/basictest/test.rb index 10ea28d320701f..25a42982341beb 100755 --- a/basictest/test.rb +++ b/basictest/test.rb @@ -1732,7 +1732,7 @@ def shift_test(a) test_ok(defined?(a)) test_ok(a == nil) -# multiple asignment +# multiple assignment a, b = 1, 2 test_ok(a == 1 && b == 2) diff --git a/compile.c b/compile.c index 1e6400448c75c5..98ee34afd02d1d 100644 --- a/compile.c +++ b/compile.c @@ -6827,7 +6827,7 @@ delegate_call_p(const rb_iseq_t *iseq, unsigned int argc, const LINK_ANCHOR *arg } } else { - goto fail; // level != 0 is unsupport + goto fail; // level != 0 is unsupported } } else { diff --git a/cont.c b/cont.c index 87f1fd0157a598..793bce018bc195 100644 --- a/cont.c +++ b/cont.c @@ -2367,7 +2367,7 @@ rb_fiber_pool_initialize(int argc, VALUE* argv, VALUE self) VALUE size = Qnil, count = Qnil, vm_stack_size = Qnil; struct fiber_pool * fiber_pool = NULL; - // Maybe these should be keyworkd arguments. + // Maybe these should be keyword arguments. rb_scan_args(argc, argv, "03", &size, &count, &vm_stack_size); if (NIL_P(size)) { diff --git a/defs/gmake.mk b/defs/gmake.mk index 8ff17d993f8016..226e1066a529bf 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -90,7 +90,7 @@ sudo-precheck: test yes-test-testframework no-test-testframework install-prereq: sudo-precheck yes-test-all no-test-all: install endif -# Cross referece needs to parse all files at once +# Cross reference needs to parse all files at once love install reinstall: RDOCFLAGS = --force-update $(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c diff --git a/defs/separated_version.mk b/defs/separated_version.mk index f086f4b24a4f7c..72ee093da73663 100644 --- a/defs/separated_version.mk +++ b/defs/separated_version.mk @@ -1,6 +1,6 @@ # ******** FOR DEVELEPERS ONLY ******** # Separate version.o into a shared library which varies every -# revisions, in order to make the rest sharable. +# revisions, in order to make the rest shareable. include $(firstword $(wildcard GNUmakefile Makefile)) diff --git a/doc/NEWS-2.5.0 b/doc/NEWS-2.5.0 index 221c0328c10ce5..c891317b61ca45 100644 --- a/doc/NEWS-2.5.0 +++ b/doc/NEWS-2.5.0 @@ -68,7 +68,7 @@ with all sufficient information, see the ChangeLog file or Redmine * File.rename releases GVL. [Feature #13951] * File::Stat#atime, File::Stat#mtime and File::Stat#ctime support fractional second timestamps on Windows 8 and later. [Feature #13726] - * File::Stat#ino and File.indentical? support ReFS 128bit ino on Windows 8.1 + * File::Stat#ino and File.identical? support ReFS 128bit ino on Windows 8.1 and later. [Feature #13731] * File.readable?, File.readable_real?, File.writable?, File.writable_real?, File.executable?, File.executable_real?, File.mkfifo, File.readlink, diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc index 95e5b6dd285e00..68dda66e461204 100644 --- a/doc/contributing.rdoc +++ b/doc/contributing.rdoc @@ -389,7 +389,7 @@ When you're ready to commit: This will open your editor in which you write your commit message. Use the following style for commit messages: -* Use a succint subject line. +* Use a succinct subject line. * Include reasoning behind the change in the commit message, focusing on why the change is being made. * Refer to redmine issue (such as Fixes [Bug #1234] or Implements diff --git a/doc/extension.rdoc b/doc/extension.rdoc index 79d25e4249dd1b..79eb96d518005a 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -726,7 +726,7 @@ RUBY_TYPED_FREE_IMMEDIATELY :: You can specify this flag if the dfree never unlocks Ruby's internal lock (GVL). - If this flag is not set, Ruby defers invokation of dfree() + If this flag is not set, Ruby defers invocation of dfree() and invokes dfree() at the same time as finalizers. RUBY_TYPED_WB_PROTECTED :: diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc index d5691f8d6083b2..87ec059ae79110 100644 --- a/doc/syntax/miscellaneous.rdoc +++ b/doc/syntax/miscellaneous.rdoc @@ -13,7 +13,7 @@ most frequently used with ruby -e. Ruby does not require any indentation. Typically, ruby programs are indented two spaces. -If you run ruby with warnings enabled and have an indentation mis-match, you +If you run ruby with warnings enabled and have an indentation mismatch, you will receive a warning. == +alias+ diff --git a/gc.c b/gc.c index 0f9361a03cdd86..ab7662b534ad0e 100644 --- a/gc.c +++ b/gc.c @@ -86,7 +86,7 @@ #pragma intrinsic(_umul128) #endif -/* Expecting this struct to be elminated by function inlinings */ +/* Expecting this struct to be eliminated by function inlinings */ struct optional { bool left; size_t right; diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index a2e63f2943e2f6..3585f678b8d77a 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -47,7 +47,7 @@ typedef int int_type(ANYARGS); /// @name Hooking global variables /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -63,7 +63,7 @@ rb_define_virtual_variable(const char *q, type *w, void_type *e) ::rb_define_virtual_variable(q, r, t); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -78,7 +78,7 @@ rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, void_type *e) ::rb_define_virtual_variable(q, w, t); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -93,7 +93,7 @@ rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e) ::rb_define_virtual_variable(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -110,7 +110,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, void_type *r) ::rb_define_hooked_variable(q, w, t, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -126,7 +126,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, void_typ ::rb_define_hooked_variable(q, w, e, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -146,7 +146,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r) /// @name Exceptions and tag jumps /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Old way to implement iterators. /// @param[in] q A function that can yield. /// @param[in] w Passed to `q`. @@ -163,7 +163,7 @@ rb_iterate(VALUE(*q)(VALUE), VALUE w, type *e, VALUE r) return ::rb_iterate(q, w, t, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Call a method with a block. /// @param[in] q The self. /// @param[in] w The method. @@ -181,7 +181,7 @@ rb_block_call(VALUE q, ID w, int e, const VALUE *r, type *t, VALUE y) return ::rb_block_call(q, w, e, r, u, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `rescue` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -204,7 +204,7 @@ rb_rescue(type *q, VALUE w, type *e, VALUE r) return ::rb_rescue(t, w, y, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `rescue` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -232,7 +232,7 @@ rb_rescue2(type *q, VALUE w, type *e, VALUE r, ...) return ret; } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `ensure` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -253,7 +253,7 @@ rb_ensure(type *q, VALUE w, type *e, VALUE r) return ::rb_ensure(t, w, y, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `Kernel#catch`. /// @param[in] q The "tag" string. /// @param[in] w A function that can throw. @@ -272,7 +272,7 @@ rb_catch(const char *q, type *w, VALUE e) return ::rb_catch(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `Kernel#catch`. /// @param[in] q The "tag" object. /// @param[in] w A function that can throw. @@ -295,7 +295,7 @@ rb_catch_obj(VALUE q, type *w, VALUE e) /// @name Procs, Fibers and Threads /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cFiber instance. /// @param[in] q The fiber body. /// @param[in] w Passed to `q`. @@ -311,7 +311,7 @@ rb_fiber_new(type *q, VALUE w) return ::rb_fiber_new(e, w); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cProc instance. /// @param[in] q The proc body. /// @param[in] w Passed to `q`. @@ -327,7 +327,7 @@ rb_proc_new(type *q, VALUE w) return ::rb_proc_new(e, w); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cThread instance. /// @param[in] q The thread body. /// @param[in] w Passed to `q`. @@ -348,7 +348,7 @@ rb_thread_create(type *q, void *w) /// @name Hash and st_table /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -366,7 +366,7 @@ st_foreach(st_table *q, int_type *w, st_data_t e) return ::st_foreach(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -384,7 +384,7 @@ st_foreach_check(st_table *q, int_type *w, st_data_t e, st_data_t) return ::st_foreach_check(q, t, e, 0); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -400,7 +400,7 @@ st_foreach_safe(st_table *q, int_type *w, st_data_t e) ::st_foreach_safe(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given hash. /// @param[in] q A hash to scan. /// @param[in] w A function to iterate. @@ -416,7 +416,7 @@ rb_hash_foreach(VALUE q, int_type *w, VALUE e) ::rb_hash_foreach(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over each instance variable of the object. /// @param[in] q An object. /// @param[in] w A function to iterate. diff --git a/iseq.c b/iseq.c index f5f84378821699..cbf62176bd6467 100644 --- a/iseq.c +++ b/iseq.c @@ -932,7 +932,7 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt) iseq_type = iseq_type_from_sym(type); if (iseq_type == (enum iseq_type)-1) { - rb_raise(rb_eTypeError, "unsupport type: :%"PRIsVALUE, rb_sym2str(type)); + rb_raise(rb_eTypeError, "unsupported type: :%"PRIsVALUE, rb_sym2str(type)); } node_id = rb_hash_aref(misc, ID2SYM(rb_intern("node_id"))); @@ -3404,7 +3404,7 @@ iseqw_s_load_from_binary_extra_data(VALUE self, VALUE str) * To lookup the lineno of insn4, calculate rank("10100001", 8) = 3, so * the line (B) is the entry in question. * - * A naive implementatoin of succinct bit-vector works really well + * A naive implementation of succinct bit-vector works really well * not only for large size but also for small size. However, it has * tiny overhead for very small size. So, this implementation consist * of two parts: one part is the "immediate" table that keeps rank result diff --git a/man/ruby.1 b/man/ruby.1 index 4dd19054d3c4f0..1888312d261fa0 100644 --- a/man/ruby.1 +++ b/man/ruby.1 @@ -419,7 +419,7 @@ Disables (or enables) all features. .El .Pp .It Fl -dump Ns = Ns Ar target -Dump some informations. +Dump some information. .Pp Prints the specified target. .Ar target diff --git a/misc/rb_optparse.zsh b/misc/rb_optparse.zsh index d53170c5f78be9..7407e87c03a5a8 100755 --- a/misc/rb_optparse.zsh +++ b/misc/rb_optparse.zsh @@ -13,7 +13,7 @@ # # (3) restart zsh. # -# (4) geneate completion files once. +# (4) generate completion files once. # generate-complete-function/ruby/optparse COMMAND1 # generate-complete-function/ruby/optparse COMMAND2 # diff --git a/process.c b/process.c index ad303203fd4e09..60d1523fde392a 100644 --- a/process.c +++ b/process.c @@ -6472,7 +6472,7 @@ proc_setmaxgroups(VALUE obj, VALUE val) int ngroups_max = get_sc_ngroups_max(); if (ngroups <= 0) - rb_raise(rb_eArgError, "maxgroups %d shold be positive", ngroups); + rb_raise(rb_eArgError, "maxgroups %d should be positive", ngroups); if (ngroups > RB_MAX_GROUPS) ngroups = RB_MAX_GROUPS; diff --git a/range.c b/range.c index f701c16e6d62ce..b4fab53eac06b9 100644 --- a/range.c +++ b/range.c @@ -1610,12 +1610,12 @@ static VALUE range_count(int argc, VALUE *argv, VALUE range) { if (argc != 0) { - /* It is odd for instace (1...).count(0) to return Infinity. Just let + /* It is odd for instance (1...).count(0) to return Infinity. Just let * it loop. */ return rb_call_super(argc, argv); } else if (rb_block_given_p()) { - /* Likewise it is odd for instace (1...).count {|x| x == 0 } to return + /* Likewise it is odd for instance (1...).count {|x| x == 0 } to return * Infinity. Just let it loop. */ return rb_call_super(argc, argv); } diff --git a/regparse.c b/regparse.c index 5f118900de4127..a96c8c2fa7d673 100644 --- a/regparse.c +++ b/regparse.c @@ -4663,7 +4663,7 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e p = psave; for (i = 1; i < len; i++) { (void)fetch_token_in_cc(tok, &p, end, env); - /* no need to check the retun value (already checked above) */ + /* no need to check the return value (already checked above) */ } fetched = 0; } diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb index 8be1542c06a841..2d5310086e9362 100644 --- a/sample/drb/old_tuplespace.rb +++ b/sample/drb/old_tuplespace.rb @@ -31,7 +31,7 @@ def match(tuple) def initialize @que = {} @waiting = {} - @que.taint # enable tainted comunication + @que.taint # enable tainted communication @waiting.taint self.taint end diff --git a/sample/trick2013/kinaba/remarks.markdown b/sample/trick2013/kinaba/remarks.markdown index 73a4ea9875cd02..dcdce7e9ae9e7d 100644 --- a/sample/trick2013/kinaba/remarks.markdown +++ b/sample/trick2013/kinaba/remarks.markdown @@ -20,7 +20,7 @@ The algorithm is the obvious loop "32.upto(126){|x| putc x}". It is not so hard to transform it to use each character *at most once*. The only slight difficulty comes from the constraint that we cannot "declare and then use" variables, because then the code will contain the variable name twice. This restriction is worked around by the $. global variable, the best friend of Ruby golfers. -The relatively interesting part is to use all the charcters *at least once*. Of course, this is easily accomplished by putting everything into a comment (i.e., #unused...) or to a string literal (%(unused...), note that normal string literals are forbidden since they use quotation marks twice). Hey, but that's not fun at all! I tried to minimize the escapeway. +The relatively interesting part is to use all the characters *at least once*. Of course, this is easily accomplished by putting everything into a comment (i.e., #unused...) or to a string literal (%(unused...), note that normal string literals are forbidden since they use quotation marks twice). Hey, but that's not fun at all! I tried to minimize the escapeway. * "@THEqQUICKbBROWNfFXjJMPSvVLAZYDGgkyz". Trash box of unused alphabet. I wish I could have used "gkyz" somewhere else. diff --git a/sample/trick2015/ksk_2/remarks.markdown b/sample/trick2015/ksk_2/remarks.markdown index bb9b7057733bc7..187a6804d21e68 100644 --- a/sample/trick2015/ksk_2/remarks.markdown +++ b/sample/trick2015/ksk_2/remarks.markdown @@ -199,6 +199,6 @@ succeed to return 0. The meaning of ``\1nn`` in regular expression seems to depend on the existence of capturing expressions. In spite of these Ruby's behaviors, we have a good news! The present -SAT sover does not suffer from the issues because the program cannot +SAT solver does not suffer from the issues because the program cannot return solutions in practical time for inputs with variables more than -40. \ No newline at end of file +40. diff --git a/spec/ruby/core/argf/binmode_spec.rb b/spec/ruby/core/argf/binmode_spec.rb index c2dd578d957d1e..bdcc6aa30ab197 100644 --- a/spec/ruby/core/argf/binmode_spec.rb +++ b/spec/ruby/core/argf/binmode_spec.rb @@ -22,7 +22,7 @@ end end - it "puts alls subsequent stream reading through ARGF into binmode" do + it "puts all subsequent streams reading through ARGF into binmode" do argf [@bin_file, @bin_file] do @argf.binmode @argf.gets.should == "test\r\n" diff --git a/spec/ruby/core/env/delete_spec.rb b/spec/ruby/core/env/delete_spec.rb index b7fe1ee67573b6..f11860b21dd0a6 100644 --- a/spec/ruby/core/env/delete_spec.rb +++ b/spec/ruby/core/env/delete_spec.rb @@ -30,7 +30,7 @@ ScratchPad.recorded.should == "foo" end - it "does not evaluate the block if the envirionment variable exists" do + it "does not evaluate the block if the environment variable exists" do ENV["foo"] = "bar" ENV.delete("foo") { |name| fail "Should not happen" } ENV["foo"].should == nil diff --git a/spec/ruby/core/file/chmod_spec.rb b/spec/ruby/core/file/chmod_spec.rb index 86171691f6efeb..5ca15c97486d4b 100644 --- a/spec/ruby/core/file/chmod_spec.rb +++ b/spec/ruby/core/file/chmod_spec.rb @@ -105,7 +105,7 @@ File.chmod(0, mock_to_path(@file)) end - it "throws a TypeError if the given path is not coercable into a string" do + it "throws a TypeError if the given path is not coercible into a string" do -> { File.chmod(0, []) }.should raise_error(TypeError) end diff --git a/spec/ruby/core/integer/comparison_spec.rb b/spec/ruby/core/integer/comparison_spec.rb index 762af51535ccc7..2ff557c7c62abf 100644 --- a/spec/ruby/core/integer/comparison_spec.rb +++ b/spec/ruby/core/integer/comparison_spec.rb @@ -174,7 +174,7 @@ (infinity_value <=> Float::MAX.to_i*2).should == 1 end - it "returns -1 when self is negative and other is Infinty" do + it "returns -1 when self is negative and other is Infinity" do (-Float::MAX.to_i*2 <=> infinity_value).should == -1 end diff --git a/spec/ruby/core/kernel/singleton_methods_spec.rb b/spec/ruby/core/kernel/singleton_methods_spec.rb index eb4cede110fe0a..a127a439de2496 100644 --- a/spec/ruby/core/kernel/singleton_methods_spec.rb +++ b/spec/ruby/core/kernel/singleton_methods_spec.rb @@ -52,7 +52,7 @@ end describe :kernel_singleton_methods_supers, shared: true do - it "returns the names of singleton methods for an object extented with a module" do + it "returns the names of singleton methods for an object extended with a module" do ReflectSpecs.oe.singleton_methods(*@object).should include(:m_pro, :m_pub) end @@ -62,11 +62,11 @@ r.should == [:pro, :pub] end - it "returns the names of singleton methods for an object extented with two modules" do + it "returns the names of singleton methods for an object extended with two modules" do ReflectSpecs.oee.singleton_methods(*@object).should include(:m_pro, :m_pub, :n_pro, :n_pub) end - it "returns the names of singleton methods for an object extented with a module including a module" do + it "returns the names of singleton methods for an object extended with a module including a module" do ReflectSpecs.oei.singleton_methods(*@object).should include(:n_pro, :n_pub, :m_pro, :m_pub) end @@ -112,7 +112,7 @@ ReflectSpecs.oee.singleton_methods(*@object).should_not include(:m_pri) end - it "does not return private singleton methods for an object extented with a module including a module" do + it "does not return private singleton methods for an object extended with a module including a module" do ReflectSpecs.oei.singleton_methods(*@object).should_not include(:n_pri, :m_pri) end @@ -165,11 +165,11 @@ it_behaves_like :kernel_singleton_methods_modules, nil, false it_behaves_like :kernel_singleton_methods_private_supers, nil, false - it "returns an empty Array for an object extented with a module" do + it "returns an empty Array for an object extended with a module" do ReflectSpecs.oe.singleton_methods(false).should == [] end - it "returns an empty Array for an object extented with two modules" do + it "returns an empty Array for an object extended with two modules" do ReflectSpecs.oee.singleton_methods(false).should == [] end diff --git a/spec/ruby/core/module/alias_method_spec.rb b/spec/ruby/core/module/alias_method_spec.rb index b14f5430a8b624..662e91011ffddd 100644 --- a/spec/ruby/core/module/alias_method_spec.rb +++ b/spec/ruby/core/module/alias_method_spec.rb @@ -14,7 +14,7 @@ @object.double(12).should == @object.public_two(12) end - it "creates methods that are == to eachother" do + it "creates methods that are == to each other" do @class.make_alias :uno, :public_one @object.method(:uno).should == @object.method(:public_one) end diff --git a/spec/ruby/core/module/autoload_spec.rb b/spec/ruby/core/module/autoload_spec.rb index db95704cc71f47..99646023477cf1 100644 --- a/spec/ruby/core/module/autoload_spec.rb +++ b/spec/ruby/core/module/autoload_spec.rb @@ -23,7 +23,7 @@ ModuleSpecs::Autoload::Child.autoload?(:InheritedAutoload, false).should be_nil end - it "returns the name of the file that will be loaded if recursion is disabled but the autoload is defined on the classs itself" do + it "returns the name of the file that will be loaded if recursion is disabled but the autoload is defined on the class itself" do ModuleSpecs::Autoload::Child.autoload :ChildAutoload, "child_autoload.rb" ModuleSpecs::Autoload::Child.autoload?(:ChildAutoload, false).should == "child_autoload.rb" end diff --git a/spec/ruby/core/string/undump_spec.rb b/spec/ruby/core/string/undump_spec.rb index e83c53ce89aefe..d45c4bae1b3660 100644 --- a/spec/ruby/core/string/undump_spec.rb +++ b/spec/ruby/core/string/undump_spec.rb @@ -38,7 +38,7 @@ ].should be_computed_by(:undump) end - it "returns a string with unescaped sequencies \" and \\" do + it "returns a string with unescaped sequences \" and \\" do [ ['"\\""' , "\""], ['"\\\\"', "\\"] ].should be_computed_by(:undump) diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb index 01ee47faa1c0f4..a5cfa2a7dfe574 100644 --- a/spec/ruby/core/time/new_spec.rb +++ b/spec/ruby/core/time/new_spec.rb @@ -298,7 +298,7 @@ def zone.local_to_utc(t) # At loading marshaled data, a timezone name will be converted to a timezone object # by find_timezone class method, if the method is defined. - # Similary, that class method will be called when a timezone argument does not have + # Similarly, that class method will be called when a timezone argument does not have # the necessary methods mentioned above. context "subject's class implements .find_timezone method" do it "calls .find_timezone to build a time object at loading marshaled data" do diff --git a/spec/ruby/language/regexp/modifiers_spec.rb b/spec/ruby/language/regexp/modifiers_spec.rb index 9f3cf8acf8ebc1..2f5522bc8aec6f 100644 --- a/spec/ruby/language/regexp/modifiers_spec.rb +++ b/spec/ruby/language/regexp/modifiers_spec.rb @@ -104,7 +104,7 @@ def o.to_s /./m.match("\n").to_a.should == ["\n"] end - it "supports ASII/Unicode modifiers" do + it "supports ASCII/Unicode modifiers" do eval('/(?a)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a"] eval('/(?d)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a\u3042"] eval('/(?u)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a\u3042"] diff --git a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb index 3bcb7b8f02e913..2af86ea70d92fd 100644 --- a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb +++ b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb @@ -64,7 +64,7 @@ data.size.should == 2 data.first.should == "hel" - # This does not apply to every platform, dependant on recvfrom(2) + # This does not apply to every platform, dependent on recvfrom(2) # data.last.should == nil end end diff --git a/spec/ruby/optional/capi/io_spec.rb b/spec/ruby/optional/capi/io_spec.rb index 7947a48eac74b5..4d61fc87557bee 100644 --- a/spec/ruby/optional/capi/io_spec.rb +++ b/spec/ruby/optional/capi/io_spec.rb @@ -220,7 +220,7 @@ end describe "rb_io_check_writable" do - it "does not raise an exeption if the IO is opened for writing" do + it "does not raise an exception if the IO is opened for writing" do # The MRI function is void, so we use should_not raise_error -> { @o.rb_io_check_writable(@w_io) }.should_not raise_error end diff --git a/st.c b/st.c index 5d0c00cc0afb54..2b973ea75d2191 100644 --- a/st.c +++ b/st.c @@ -714,7 +714,7 @@ st_free_table(st_table *tab) free(tab); } -/* Return byte size of memory allocted for table TAB. */ +/* Return byte size of memory allocated for table TAB. */ size_t st_memsize(const st_table *tab) { diff --git a/test/-ext-/popen_deadlock/test_popen_deadlock.rb b/test/-ext-/popen_deadlock/test_popen_deadlock.rb index 97892e50083176..e6ba5e7c1aef34 100644 --- a/test/-ext-/popen_deadlock/test_popen_deadlock.rb +++ b/test/-ext-/popen_deadlock/test_popen_deadlock.rb @@ -26,7 +26,7 @@ def assert_popen_without_deadlock end private :assert_popen_without_deadlock - # 10 test methods are defined for showing progess reports + # 10 test methods are defined for showing progress reports 10.times do |i| define_method("test_popen_without_deadlock_#{i}") { assert_popen_without_deadlock diff --git a/test/ruby/sentence.rb b/test/ruby/sentence.rb index 28fb5d1cf8eb5b..9bfd7c75992f2d 100644 --- a/test/ruby/sentence.rb +++ b/test/ruby/sentence.rb @@ -353,7 +353,7 @@ def Sentence.each(syntax, sym, limit) # * No rule derives to empty sequence # * Underivable rule simplified # * No channel rule - # * Symbols which has zero or one choices are not appered in rhs. + # * Symbols which has zero or one choices are not appeared in rhs. # # Note that the rules which can derive empty and non-empty # sequences are modified to derive only non-empty sequences. diff --git a/test/ruby/test_assignment.rb b/test/ruby/test_assignment.rb index bf6602ab1364df..5a6ec97e67244d 100644 --- a/test/ruby/test_assignment.rb +++ b/test/ruby/test_assignment.rb @@ -456,7 +456,7 @@ def test_massign assert(defined?(a)) assert_nil(a) - # multiple asignment + # multiple assignment a, b = 1, 2 assert_equal 1, a assert_equal 2, b diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 884fbe00ed222d..9438160a6ffb00 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -113,7 +113,7 @@ def test_struct_new_with_keyword_init assert_equal @Struct::KeywordInitTrue.new(a: 1, b: 2).values, @Struct::KeywordInitFalse.new(1, 2).values assert_equal "#{@Struct}::KeywordInitFalse", @Struct::KeywordInitFalse.inspect assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect - # eval is neede to prevent the warning duplication filter + # eval is needed to prevent the warning duplication filter k = eval("Class.new(@Struct::KeywordInitFalse) {def initialize(**) end}") assert_warn(/The last argument is used as the keyword parameter/) {k.new(a: 1, b: 2)} k = Class.new(@Struct::KeywordInitTrue) {def initialize(**) end} diff --git a/time.c b/time.c index 021421cdbfeaa2..1016537501a4df 100644 --- a/time.c +++ b/time.c @@ -5801,7 +5801,7 @@ rb_time_zone_abbreviation(VALUE zone, VALUE time) * At loading marshaled data, a timezone name will be converted to a timezone * object by +find_timezone+ class method, if the method is defined. * - * Similary, that class method will be called when a timezone argument does + * Similarly, that class method will be called when a timezone argument does * not have the necessary methods mentioned above. */ diff --git a/tool/lib/tracepointchecker.rb b/tool/lib/tracepointchecker.rb index 47822ecef54db5..3254e59357d493 100644 --- a/tool/lib/tracepointchecker.rb +++ b/tool/lib/tracepointchecker.rb @@ -80,7 +80,7 @@ def self.start verbose: false, stop_at_failure: false call_stack.push method STATE[:count] += 1 - verbose_out :psuh, method if verbose + verbose_out :push, method if verbose } TRACES << TracePoint.new(*return_events){|tp| diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index bcd53078413831..038fbf64289cf0 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -268,7 +268,7 @@ module RbConfig CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_version.dump} EOS print < "Whats the big deal" + * thr.join #=> "What's the big deal" * * If we don't call +thr.join+ before the main thread terminates, then all * other threads including +thr+ will be killed. @@ -3028,7 +3028,7 @@ Init_VM(void) * once, like in the following example: * * threads = [] - * threads << Thread.new { puts "Whats the big deal" } + * threads << Thread.new { puts "What's the big deal" } * threads << Thread.new { 3.times { puts "Threads are fun!" } } * * After creating a few threads we wait for them all to finish diff --git a/vm_dump.c b/vm_dump.c index 9ada7a959f1f45..c778e1b4ddac3d 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -349,7 +349,7 @@ vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *c } } else { - rb_bug("unsupport frame type: %08lx", VM_FRAME_TYPE(cfp)); + rb_bug("unsupported frame type: %08lx", VM_FRAME_TYPE(cfp)); } } #endif diff --git a/vm_insnhelper.c b/vm_insnhelper.c index e35000e758678f..2ac006a60592aa 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -165,7 +165,7 @@ vm_check_frame_detail(VALUE type, int req_block, int req_me, int req_cref, VALUE if ((type & VM_FRAME_MAGIC_MASK) == VM_FRAME_MAGIC_DUMMY) { VM_ASSERT(iseq == NULL || - RUBY_VM_NORMAL_ISEQ_P(iseq) /* argument error. it shold be fixed */); + RUBY_VM_NORMAL_ISEQ_P(iseq) /* argument error. it should be fixed */); } else { VM_ASSERT(is_cframe == !RUBY_VM_NORMAL_ISEQ_P(iseq)); @@ -226,7 +226,7 @@ vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) return; } else { - /* we are going to call metods below; squash the canary to + /* we are going to call methods below; squash the canary to * prevent infinite loop. */ sp[0] = Qundef; } @@ -1334,7 +1334,7 @@ vm_throw_start(const rb_execution_context_t *ec, rb_control_frame_t *const reg_c /* do nothing */ } else { - rb_bug("isns(throw): unsupport throw type"); + rb_bug("isns(throw): unsupported throw type"); } ec->tag->state = state; @@ -1536,7 +1536,7 @@ rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass) * - It scans the array from left to right, looking for the expected class * serial. If it finds that at `cc->class_serial[0]` (this branch * probability is 98% according to @shyouhei's experiment), just returns - * true. If it reaches the end of the array without finding anytihng, + * true. If it reaches the end of the array without finding anything, * returns false. This is done in the #1 loop below. * * - What needs to be complicated is when the class serial is found at either diff --git a/win32/file.c b/win32/file.c index 275520215a8210..9d213700193092 100644 --- a/win32/file.c +++ b/win32/file.c @@ -552,7 +552,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na /* Determine require buffer size */ size = GetFullPathNameW(buffer, PATH_BUFFER_SIZE, wfullpath_buffer, NULL); if (size > PATH_BUFFER_SIZE) { - /* allocate more memory than alloted originally by PATH_BUFFER_SIZE */ + /* allocate more memory than allotted originally by PATH_BUFFER_SIZE */ wfullpath = ALLOC_N(wchar_t, size); size = GetFullPathNameW(buffer, size, wfullpath, NULL); } From fac60be324260cd834478fedf934e59b97935dbf Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 09:39:50 +0900 Subject: [PATCH 006/878] shell.rb is no longer bundled [ci skip] --- doc/shell.rd.ja | 335 ------------------------------------------------ 1 file changed, 335 deletions(-) delete mode 100644 doc/shell.rd.ja diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja deleted file mode 100644 index a9507fe92a991f..00000000000000 --- a/doc/shell.rd.ja +++ /dev/null @@ -1,335 +0,0 @@ - -- shell.rb - $Release Version: 0.6.0 $ - $Revision$ - by Keiju ISHITSUKA(keiju@ishitsuka.com) - -=begin - -= 目的 - -ruby上でsh/cshのようにコマンドの実行及びフィルタリングを手軽に行う. -sh/cshの制御文はrubyの機能を用いて実現する. - -= 主なクラス一覧 - -== Shell - -Shellオブジェクトはカレントディレクトリを持ち, コマンド実行はそこからの -相対パスになります. - ---- Shell#cwd ---- Shell#dir ---- Shell#getwd ---- Shell#pwd - - カレントディレクトリを返す。 - ---- Shell#system_path - - コマンドサーチパスの配列を返す。 - ---- Shell#umask - - umaskを返す。 - -== Filter - -コマンドの実行結果はすべてFilterとしてかえります. Enumerableをincludeし -ています. - -= 主なメソッド一覧 - -== コマンド定義 - -OS上のコマンドを実行するにはまず, Shellのメソッドとして定義します. - -注) コマンドを定義しなくとも直接実行できるShell#systemコマンドもあります. - ---- Shell.def_system_command(command, path = command) - - Shellのメソッドとしてcommandを登録します. - - 例) - Shell.def_system_command "ls" - ls を定義 - - Shell.def_system_command "sys_sort", "sort" - sortコマンドをsys_sortとして定義 - ---- Shell.undef_system_command(command) - - commandを削除します. - ---- Shell.alias_command(ali, command, *opts) {...} - - commandのaliasをします. - - 例) - Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars" - Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]} - ---- Shell.unalias_command(ali) - - commandのaliasを削除します. - ---- Shell.install_system_commands(pre = "sys_") - - system_path上にある全ての実行可能ファイルをShellに定義する. メソッ - ド名は元のファイル名の頭にpreをつけたものとなる. - -== 生成 - ---- Shell.new - - プロセスのカレントディレクトリをカレントディレクトリとするShellオ - ブジェクトを生成します. - ---- Shell.cd(path) - - pathをカレントディレクトリとするShellオブジェクトを生成します. - -== プロセス管理 - ---- Shell#jobs - - スケジューリングされているjobの一覧を返す. - ---- Shell#kill sig, job - - jobにシグナルsigを送る - -== カレントディレクトリ操作 - ---- Shell#cd(path, &block) ---- Shell#chdir - - カレントディレクトリをpathにする. イテレータとして呼ばれたときには - ブロック実行中のみカレントディレクトリを変更する. - ---- Shell#pushd(path = nil, &block) ---- Shell#pushdir - - カレントディレクトリをディレクトリスタックにつみ, カレントディレク - トリをpathにする. pathが省略されたときには, カレントディレクトリと - ディレクトリスタックのトップを交換する. イテレータとして呼ばれたと - きには, ブロック実行中のみpushdする. - ---- Shell#popd ---- Shell#popdir - - ディレクトリスタックからポップし, それをカレントディレクトリにする. - -== ファイル/ディレクトリ操作 - ---- Shell#foreach(path = nil, &block) - - pathがファイルなら, File#foreach - pathがディレクトリなら, Dir#foreach - ---- Shell#open(path, mode) - - pathがファイルなら, File#open - pathがディレクトリなら, Dir#open - ---- Shell#unlink(path) - - pathがファイルなら, File#unlink - pathがディレクトリなら, Dir#unlink - ---- Shell#test(command, file1, file2) ---- Shell#[command, file1, file2] - - ファイルテスト関数testと同じ. - 例) - sh[?e, "foo"] - sh[:e, "foo"] - sh["e", "foo"] - sh[:exists?, "foo"] - sh["exists?", "foo"] - ---- Shell#mkdir(*path) - - Dir.mkdirと同じ(複数可) - ---- Shell#rmdir(*path) - - Dir.rmdirと同じ(複数可) - -== コマンド実行 - ---- System#system(command, *opts) - - commandを実行する. - 例) - print sh.system("ls", "-l") - sh.system("ls", "-l") | sh.head > STDOUT - ---- System#rehash - - リハッシュする - ---- Shell#transact &block - - ブロック中ではshellをselfとして実行する. - 例) - sh.transact{system("ls", "-l") | head > STDOUT} - ---- Shell#out(dev = STDOUT, &block) - - transactを呼び出しその結果をdevに出力する. - -== 内部コマンド - ---- Shell#echo(*strings) ---- Shell#cat(*files) ---- Shell#glob(patten) ---- Shell#tee(file) - - これらは実行すると, それらを内容とするFilterオブジェクトを返します. - ---- Filter#each &block - - フィルタの一行ずつをblockに渡す. - ---- Filter#<(src) - - srcをフィルタの入力とする. srcが, 文字列ならばファイルを, IOであれ - ばそれをそのまま入力とする. - ---- Filter#>(to) - - srcをフィルタの出力とする. toが, 文字列ならばファイルに, IOであれ - ばそれをそのまま出力とする. - ---- Filter#>>(to) - - srcをフィルタに追加する. toが, 文字列ならばファイルに, IOであれば - それをそのまま出力とする. - ---- Filter#|(filter) - - パイプ結合 - ---- Filter#+(filter) - - filter1 + filter2 は filter1の出力の後, filter2の出力を行う. - ---- Filter#to_a ---- Filter#to_s - -== 組込みコマンド - ---- Shell#atime(file) ---- Shell#basename(file, *opt) ---- Shell#chmod(mode, *files) ---- Shell#chown(owner, group, *file) ---- Shell#ctime(file) ---- Shell#delete(*file) ---- Shell#dirname(file) ---- Shell#ftype(file) ---- Shell#join(*file) ---- Shell#link(file_from, file_to) ---- Shell#lstat(file) ---- Shell#mtime(file) ---- Shell#readlink(file) ---- Shell#rename(file_from, file_to) ---- Shell#split(file) ---- Shell#stat(file) ---- Shell#symlink(file_from, file_to) ---- Shell#truncate(file, length) ---- Shell#utime(atime, mtime, *file) - - これらはFileクラスにある同名のクラスメソッドと同じです. - ---- Shell#blockdev?(file) ---- Shell#chardev?(file) ---- Shell#directory?(file) ---- Shell#executable?(file) ---- Shell#executable_real?(file) ---- Shell#exist?(file)/Shell#exists?(file) ---- Shell#file?(file) ---- Shell#grpowned?(file) ---- Shell#owned?(file) ---- Shell#pipe?(file) ---- Shell#readable?(file) ---- Shell#readable_real?(file) ---- Shell#setgid?(file) ---- Shell#setuid?(file) ---- Shell#size(file)/Shell#size?(file) ---- Shell#socket?(file) ---- Shell#sticky?(file) ---- Shell#symlink?(file) ---- Shell#writable?(file) ---- Shell#writable_real?(file) ---- Shell#zero?(file) - - これらはFileTestクラスにある同名のクラスメソッドと同じです. - ---- Shell#syscopy(filename_from, filename_to) ---- Shell#copy(filename_from, filename_to) ---- Shell#move(filename_from, filename_to) ---- Shell#compare(filename_from, filename_to) ---- Shell#safe_unlink(*filenames) ---- Shell#makedirs(*filenames) ---- Shell#install(filename_from, filename_to, mode) - - これらはFileToolsクラスにある同名のクラスメソッドと同じです. - - その他, 以下のものがエイリアスされています. - ---- Shell#cmp <- Shell#compare ---- Shell#mv <- Shell#move ---- Shell#cp <- Shell#copy ---- Shell#rm_f <- Shell#safe_unlink ---- Shell#mkpath <- Shell#makedirs - -= サンプル - -== ex1 - - sh = Shell.cd("/tmp") - sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1") - sh.cd("shell-test-1") - for dir in ["dir1", "dir3", "dir5"] - if !sh.exists?(dir) - sh.mkdir dir - sh.cd(dir) do - f = sh.open("tmpFile", "w") - f.print "TEST\n" - f.close - end - print sh.pwd - end - end - -== ex2 - - sh = Shell.cd("/tmp") - sh.transact do - mkdir "shell-test-1" unless exists?("shell-test-1") - cd("shell-test-1") - for dir in ["dir1", "dir3", "dir5"] - if !exists?(dir) - mkdir dir - cd(dir) do - f = open("tmpFile", "w") - f.print "TEST\n" - f.close - end - print pwd - end - end - end - -== ex3 - - sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2" - (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12" - sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2" - (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12" - -== ex4 - - print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/} - -=end From e672494cd737b8fea3a186aeb5c2c17d1a18cb96 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 20 Dec 2019 11:50:32 +0900 Subject: [PATCH 007/878] Merge RubyGems 3.1.2 --- lib/rubygems.rb | 2 +- lib/rubygems/commands/setup_command.rb | 43 ++++++++---- lib/rubygems/test_case.rb | 44 +++++++++++++ test/rubygems/test_gem.rb | 15 ++--- .../test_gem_commands_setup_command.rb | 66 ++++++++++++++++--- test/rubygems/test_gem_installer.rb | 33 +++------- 6 files changed, 145 insertions(+), 58 deletions(-) diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 8eedc97bca1875..57cb70cc2b8030 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ require 'rbconfig' module Gem - VERSION = "3.1.1".freeze + VERSION = "3.1.2".freeze end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 7844e9d19957a2..579776df7ea583 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -17,6 +17,7 @@ def initialize super 'setup', 'Install RubyGems', :format_executable => true, :document => %w[ri], + :force => true, :site_or_vendor => 'sitelibdir', :destdir => '', :prefix => '', :previous_version => '', :regenerate_binstubs => true @@ -88,6 +89,11 @@ def initialize options[:regenerate_binstubs] = value end + add_option '-f', '--[no-]force', + 'Forcefully overwrite binstubs' do |value, options| + options[:force] = value + end + add_option('-E', '--[no-]env-shebang', 'Rewrite executables with a shebang', 'of /usr/bin/env') do |value, options| @@ -199,10 +205,10 @@ def execute say say "RubyGems installed the following executables:" - say @bin_file_names.map { |name| "\t#{name}\n" } + say bin_file_names.map { |name| "\t#{name}\n" } say - unless @bin_file_names.grep(/#{File::SEPARATOR}gem$/) + unless bin_file_names.grep(/#{File::SEPARATOR}gem$/) say "If `gem` was installed by a previous RubyGems installation, you may need" say "to remove it by hand." say @@ -235,8 +241,6 @@ def execute end def install_executables(bin_dir) - @bin_file_names = [] - prog_mode = options[:prog_mode] || 0755 executables = { 'gem' => 'bin' } @@ -249,13 +253,7 @@ def install_executables(bin_dir) bin_files -= %w[update_rubygems] bin_files.each do |bin_file| - bin_file_formatted = if options[:format_executable] - Gem.default_exec_format % bin_file - else - bin_file - end - - dest_file = File.join bin_dir, bin_file_formatted + dest_file = target_bin_path(bin_dir, bin_file) bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}" begin @@ -267,7 +265,7 @@ def install_executables(bin_dir) end install bin_tmp_file, dest_file, :mode => prog_mode - @bin_file_names << dest_file + bin_file_names << dest_file ensure rm bin_tmp_file end @@ -429,13 +427,15 @@ def install_default_bundler_gem(bin_dir) Dir.chdir("bundler") do built_gem = Gem::Package.build(bundler_spec) begin - installer = Gem::Installer.at(built_gem, env_shebang: options[:env_shebang], format_executable: options[:format_executable], install_as_default: true, bin_dir: bin_dir, wrappers: true) + installer = Gem::Installer.at(built_gem, env_shebang: options[:env_shebang], format_executable: options[:format_executable], force: options[:force], install_as_default: true, bin_dir: bin_dir, wrappers: true) installer.install ensure FileUtils.rm_f built_gem end end + bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) } + say "Bundler #{bundler_spec.version} installed" end @@ -592,7 +592,7 @@ def show_release_notes history_string = "" until versions.length == 0 or - versions.shift < options[:previous_version] do + versions.shift <= options[:previous_version] do history_string += version_lines.shift + text.shift end @@ -626,4 +626,19 @@ def regenerate_binstubs command.invoke(*args) end + private + + def target_bin_path(bin_dir, bin_file) + bin_file_formatted = if options[:format_executable] + Gem.default_exec_format % bin_file + else + bin_file + end + File.join bin_dir, bin_file_formatted + end + + def bin_file_names + @bin_file_names ||= [] + end + end diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 5ecf2ab1d820df..206497c6512980 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -164,6 +164,50 @@ def vendordir(value) end end + ## + # Sets the bindir entry in RbConfig::CONFIG to +value+ and restores the + # original value when the block ends + # + def bindir(value) + bindir = RbConfig::CONFIG['bindir'] + + if value + RbConfig::CONFIG['bindir'] = value + else + RbConfig::CONFIG.delete 'bindir' + end + + yield + ensure + if bindir + RbConfig::CONFIG['bindir'] = bindir + else + RbConfig::CONFIG.delete 'bindir' + end + end + + ## + # Sets the EXEEXT entry in RbConfig::CONFIG to +value+ and restores the + # original value when the block ends + # + def exeext(value) + exeext = RbConfig::CONFIG['EXEEXT'] + + if value + RbConfig::CONFIG['EXEEXT'] = value + else + RbConfig::CONFIG.delete 'EXEEXT' + end + + yield + ensure + if exeext + RbConfig::CONFIG['EXEEXT'] = exeext + else + RbConfig::CONFIG.delete 'EXEEXT' + end + end + # TODO: move to minitest def refute_path_exists(path, msg = nil) msg = message(msg) { "Expected path '#{path}' to not exist" } diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index a0debb488c9254..6d223b7d69c0a3 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1917,16 +1917,11 @@ def ruby_install_name(name) end def with_bindir_and_exeext(bindir, exeext) - orig_bindir = RbConfig::CONFIG['bindir'] - orig_exe_ext = RbConfig::CONFIG['EXEEXT'] - - RbConfig::CONFIG['bindir'] = bindir - RbConfig::CONFIG['EXEEXT'] = exeext - - yield - ensure - RbConfig::CONFIG['bindir'] = orig_bindir - RbConfig::CONFIG['EXEEXT'] = orig_exe_ext + bindir(bindir) do + exeext(exeext) do + yield + end + end end def with_clean_path_to_ruby diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index 02171ece9db96e..c63f7177c77cf7 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -123,6 +123,18 @@ def test_execute_no_regenerate_binstubs assert_equal "I changed it!\n", File.read(gem_bin_path) end + def test_execute_informs_about_installed_executables + use_ui @ui do + @cmd.execute + end + + out = @ui.output.split "\n" + + exec_line = out.shift until exec_line == "RubyGems installed the following executables:" + assert_equal "\t#{default_gem_bin_path}", out.shift + assert_equal "\t#{default_bundle_bin_path}", out.shift + end + def test_env_shebang_flag gem_bin_path = gem_install 'a' write_file gem_bin_path do |io| @@ -133,10 +145,6 @@ def test_env_shebang_flag @cmd.options[:env_shebang] = true @cmd.execute - gem_exec = sprintf Gem.default_exec_format, 'gem' - default_gem_bin_path = File.join @install_dir, 'bin', gem_exec - bundle_exec = sprintf Gem.default_exec_format, 'bundle' - default_bundle_bin_path = File.join @install_dir, 'bin', bundle_exec ruby_exec = sprintf Gem.default_exec_format, 'ruby' if Gem.win_platform? @@ -212,10 +220,41 @@ def test_install_default_bundler_gem # TODO: We need to assert to remove same version of bundler on gem_dir directory(It's not site_ruby dir) - # expect to not remove bundler-* direcotyr. + # expect to not remove bundler-* directory. assert_path_exists 'default/gems/bundler-audit-1.0.0' end + def test_install_default_bundler_gem_with_force_flag + @cmd.extend FileUtils + + bin_dir = File.join(@gemhome, 'bin') + bundle_bin = File.join(bin_dir, 'bundle') + + write_file bundle_bin do |f| + f.puts '#!/usr/bin/ruby' + f.puts '' + f.puts 'echo "hello"' + end + + bindir(bin_dir) do + @cmd.options[:force] = true + + @cmd.install_default_bundler_gem bin_dir + + bundler_spec = Gem::Specification.load("bundler/bundler.gemspec") + default_spec_path = File.join(Gem.default_specifications_dir, "#{bundler_spec.full_name}.gemspec") + spec = Gem::Specification.load(default_spec_path) + + spec.executables.each do |e| + if Gem.win_platform? + assert_path_exists File.join(bin_dir, "#{e}.bat") + end + + assert_path_exists File.join bin_dir, Gem.default_exec_format % e + end + end + end + def test_remove_old_lib_files lib = File.join @install_dir, 'lib' lib_rubygems = File.join lib, 'rubygems' @@ -308,11 +347,6 @@ def test_show_release_notes * Fixed release note display for LANG=C when installing rubygems * π is tasty -=== 2.0.2 / 2013-03-06 - -* Bug fixes: - * Other bugs fixed - EXPECTED output = @ui.output @@ -323,4 +357,16 @@ def test_show_release_notes @ui.outs.set_encoding @default_external if @default_external end + private + + def default_gem_bin_path + gem_exec = sprintf Gem.default_exec_format, 'gem' + File.join @install_dir, 'bin', gem_exec + end + + def default_bundle_bin_path + bundle_exec = sprintf Gem.default_exec_format, 'bundle' + File.join @install_dir, 'bin', bundle_exec + end + end unless Gem.java_platform? diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 7a5fb972a40901..731a1ac01de48e 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -104,32 +104,19 @@ def test_check_executable_overwrite def test_check_executable_overwrite_default_bin_dir installer = setup_base_installer - if defined?(RUBY_FRAMEWORK_VERSION) - orig_RUBY_FRAMEWORK_VERSION = RUBY_FRAMEWORK_VERSION - Object.send :remove_const, :RUBY_FRAMEWORK_VERSION - end - orig_bindir = RbConfig::CONFIG['bindir'] - RbConfig::CONFIG['bindir'] = Gem.bindir + bindir(Gem.bindir) do + util_conflict_executable false - util_conflict_executable false + ui = Gem::MockGemUi.new "n\n" + use_ui ui do + e = assert_raises Gem::InstallError do + installer.generate_bin + end - ui = Gem::MockGemUi.new "n\n" - use_ui ui do - e = assert_raises Gem::InstallError do - installer.generate_bin + conflicted = File.join @gemhome, 'bin', 'executable' + assert_match %r%\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z%, + e.message end - - conflicted = File.join @gemhome, 'bin', 'executable' - assert_match %r%\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z%, - e.message - end - ensure - Object.const_set :RUBY_FRAMEWORK_VERSION, orig_RUBY_FRAMEWORK_VERSION if - orig_RUBY_FRAMEWORK_VERSION - if orig_bindir - RbConfig::CONFIG['bindir'] = orig_bindir - else - RbConfig::CONFIG.delete 'bindir' end end From e68999c82c4863d33a6f893661fba1b7538c5671 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 12:19:45 +0900 Subject: [PATCH 008/878] Fixed misspellings Fixed misspellings reported at [Bug #16437], for default gems. --- lib/irb.rb | 2 +- lib/irb/extend-command.rb | 2 +- lib/net/ftp.rb | 2 +- lib/racc/parser-text.rb | 2 +- lib/racc/parser.rb | 2 +- lib/rdoc/rd/block_parser.rb | 2 +- lib/rdoc/rd/inline_parser.rb | 2 +- lib/reline/line_editor.rb | 2 +- lib/tracer.rb | 2 +- lib/webrick/httpservlet/filehandler.rb | 2 +- libexec/y2racc | 2 +- .../mspec/lib/mspec/runner/formatters/specdoc.rb | 2 +- spec/mspec/lib/mspec/utils/options.rb | 4 ++-- spec/mspec/spec/expectations/should.rb | 2 +- spec/mspec/spec/expectations/should_spec.rb | 2 +- spec/mspec/spec/matchers/base_spec.rb | 4 ++-- spec/mspec/spec/matchers/complain_spec.rb | 2 +- spec/mspec/spec/runner/formatters/dotted_spec.rb | 2 +- spec/mspec/spec/utils/script_spec.rb | 2 +- test/date/test_date_parse.rb | 2 +- .../spell_checking/test_class_name_check.rb | 2 +- test/logger/test_logdevice.rb | 2 +- test/openssl/test_config.rb | 16 ++++++++-------- test/racc/assets/nasl.y | 2 +- test/racc/regress/nasl | 2 +- .../Markdown Documentation - Basics.text | 4 ++-- test/rdoc/test_rdoc_markdown_test.rb | 4 ++-- test/rdoc/test_rdoc_parser_ruby.rb | 2 +- 28 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lib/irb.rb b/lib/irb.rb index f6fc9690f2e41e..a907894fe29f9c 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -319,7 +319,7 @@ # # check if Foo#foo is available # irb(main):005:0> Foo.instance_methods #=> [:foo, ...] # -# # change the active sesssion +# # change the active session # irb(main):006:0> fg 2 # # define Foo#bar in the context of Foo # irb.2(Foo):005:0> def bar diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb index fe246606b30f90..de145e962db85d 100644 --- a/lib/irb/extend-command.rb +++ b/lib/irb/extend-command.rb @@ -32,7 +32,7 @@ def irb_exit(ret = 0) # Displays current configuration. # - # Modifing the configuration is achieved by sending a message to IRB.conf. + # Modifying the configuration is achieved by sending a message to IRB.conf. def irb_context IRB.CurrentContext end diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 2b7d19a66203c1..d1e545c0c8c055 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1242,7 +1242,7 @@ def abort # Returns the status (STAT command). # # pathname:: when stat is invoked with pathname as a parameter it acts like - # list but alot faster and over the same tcp session. + # list but a lot faster and over the same tcp session. # def status(pathname = nil) line = pathname ? "STAT #{pathname}" : "STAT" diff --git a/lib/racc/parser-text.rb b/lib/racc/parser-text.rb index 028af61e4c9195..31b8e2c01ff4d6 100644 --- a/lib/racc/parser-text.rb +++ b/lib/racc/parser-text.rb @@ -199,7 +199,7 @@ class Parser else require 'racc/cparse' end - # Racc_Runtime_Core_Version_C = (defined in extention) + # Racc_Runtime_Core_Version_C = (defined in extension) Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2] unless new.respond_to?(:_racc_do_parse_c, true) raise LoadError, 'old cparse.so' diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb index dd446d1aa178c6..56b4af9deab2d4 100644 --- a/lib/racc/parser.rb +++ b/lib/racc/parser.rb @@ -197,7 +197,7 @@ class Parser else require 'racc/cparse' end - # Racc_Runtime_Core_Version_C = (defined in extention) + # Racc_Runtime_Core_Version_C = (defined in extension) Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2] unless new.respond_to?(:_racc_do_parse_c, true) raise LoadError, 'old cparse.so' diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb index 37b35a59248ea8..f7353268625f53 100644 --- a/lib/rdoc/rd/block_parser.rb +++ b/lib/rdoc/rd/block_parser.rb @@ -2,7 +2,7 @@ # # DO NOT MODIFY!!!! # This file is automatically generated by Racc 1.4.14 -# from Racc grammer file "". +# from Racc grammar file "". # require 'racc/parser.rb' diff --git a/lib/rdoc/rd/inline_parser.rb b/lib/rdoc/rd/inline_parser.rb index 85e4215964a8bb..f73b81ba9de3fc 100644 --- a/lib/rdoc/rd/inline_parser.rb +++ b/lib/rdoc/rd/inline_parser.rb @@ -2,7 +2,7 @@ # # DO NOT MODIFY!!!! # This file is automatically generated by Racc 1.4.14 -# from Racc grammer file "". +# from Racc grammar file "". # require 'racc/parser.rb' diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 42a2b5b519ac14..0ddafb420b48c2 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -553,7 +553,7 @@ def editing_mode preposing, target, postposing = retrieve_completion_block list = list.select { |i| if i and not Encoding.compatible?(target.encoding, i.encoding) - raise Encoding::CompatibilityError, "#{target.encoding.name} is not comaptible with #{i.encoding.name}" + raise Encoding::CompatibilityError, "#{target.encoding.name} is not compatible with #{i.encoding.name}" end if @config.completion_ignore_case i&.downcase&.start_with?(target.downcase) diff --git a/lib/tracer.rb b/lib/tracer.rb index 8011ad239909db..c1540b8d233d42 100644 --- a/lib/tracer.rb +++ b/lib/tracer.rb @@ -241,7 +241,7 @@ def Tracer.off end ## - # Register an event handler p which is called everytime a line + # Register an event handler p which is called every time a line # in +file_name+ is executed. # # Example: diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index 601882ef4cc007..7cac05d818f3bd 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -214,7 +214,7 @@ def initialize(server, root, options={}, default=Config::FileHandler) def service(req, res) # if this class is mounted on "/" and /~username is requested. - # we're going to override path informations before invoking service. + # we're going to override path information before invoking service. if defined?(Etc) && @options[:UserDir] && req.script_name.empty? if %r|^(/~([^/]+))| =~ req.path_info script_name, user = $1, $2 diff --git a/libexec/y2racc b/libexec/y2racc index 38bd3669a2387f..7933f94153dc8a 100755 --- a/libexec/y2racc +++ b/libexec/y2racc @@ -6,7 +6,7 @@ # # This program is free software. # You can distribute/modify this program under the terms of -# the GNU LGPL, Lesser General Public Lisence version 2.1. +# the GNU LGPL, Lesser General Public License version 2.1. # For details of the GNU LGPL, see the file "COPYING". # diff --git a/spec/mspec/lib/mspec/runner/formatters/specdoc.rb b/spec/mspec/lib/mspec/runner/formatters/specdoc.rb index 35092018f623e6..d3a5c3d729d2a9 100644 --- a/spec/mspec/lib/mspec/runner/formatters/specdoc.rb +++ b/spec/mspec/lib/mspec/runner/formatters/specdoc.rb @@ -24,7 +24,7 @@ def before(state) # the sequential number of the exception raised. If # there has already been an exception raised while # evaluating this example, it prints another +it+ - # block description string so that each discription + # block description string so that each description # string has an associated 'ERROR' or 'FAILED' def exception(exception) print "\n- #{exception.it}" if exception? diff --git a/spec/mspec/lib/mspec/utils/options.rb b/spec/mspec/lib/mspec/utils/options.rb index af9a9b3f0e8dea..3e3f708a2fdf8a 100644 --- a/spec/mspec/lib/mspec/utils/options.rb +++ b/spec/mspec/lib/mspec/utils/options.rb @@ -94,7 +94,7 @@ def match?(opt) @options.find { |o| o.match? opt } end - # Processes an option. Calles the #on_extra block (or default) for + # Processes an option. Calls the #on_extra block (or default) for # unrecognized options. For registered options, possibly fetches an # argument and invokes the option's block if it is not nil. def process(argv, entry, opt, arg) @@ -414,7 +414,7 @@ def obj.load end def interrupt - on("--int-spec", "Control-C interupts the current spec only") do + on("--int-spec", "Control-C interrupts the current spec only") do config[:abort] = false end end diff --git a/spec/mspec/spec/expectations/should.rb b/spec/mspec/spec/expectations/should.rb index 24b1cf2bf8570f..48503b1631b9ee 100644 --- a/spec/mspec/spec/expectations/should.rb +++ b/spec/mspec/spec/expectations/should.rb @@ -41,7 +41,7 @@ def finish :sym.should be_kind_of(Symbol) end - it "causes a failue to be recorded" do + it "causes a failure to be recorded" do 1.should == 2 end diff --git a/spec/mspec/spec/expectations/should_spec.rb b/spec/mspec/spec/expectations/should_spec.rb index 2c896f1c3bf790..b8bda8f86f670e 100644 --- a/spec/mspec/spec/expectations/should_spec.rb +++ b/spec/mspec/spec/expectations/should_spec.rb @@ -13,7 +13,7 @@ it "records failures" do @out.should include <<-EOS 1) -MSpec expectation method #should causes a failue to be recorded FAILED +MSpec expectation method #should causes a failure to be recorded FAILED Expected 1 == 2 to be truthy but was false EOS diff --git a/spec/mspec/spec/matchers/base_spec.rb b/spec/mspec/spec/matchers/base_spec.rb index 4694d754f7dafc..762822bf097fc9 100644 --- a/spec/mspec/spec/matchers/base_spec.rb +++ b/spec/mspec/spec/matchers/base_spec.rb @@ -52,7 +52,7 @@ end end -describe SpecPositiveOperatorMatcher, "< operater" do +describe SpecPositiveOperatorMatcher, "< operator" do it "provides a failure message that 'Expected x to be less than y'" do lambda { SpecPositiveOperatorMatcher.new(5) < 4 @@ -64,7 +64,7 @@ end end -describe SpecPositiveOperatorMatcher, "<= operater" do +describe SpecPositiveOperatorMatcher, "<= operator" do it "provides a failure message that 'Expected x to be less than or equal to y'" do lambda { SpecPositiveOperatorMatcher.new(5) <= 4 diff --git a/spec/mspec/spec/matchers/complain_spec.rb b/spec/mspec/spec/matchers/complain_spec.rb index 83ecb70622447c..90f94c36842b04 100644 --- a/spec/mspec/spec/matchers/complain_spec.rb +++ b/spec/mspec/spec/matchers/complain_spec.rb @@ -8,7 +8,7 @@ ComplainMatcher.new(nil).matches?(proc).should == true end - it "maches when executing the proc results in the expected output to $stderr" do + it "matches when executing the proc results in the expected output to $stderr" do proc = lambda { warn "Que haces?" } ComplainMatcher.new("Que haces?\n").matches?(proc).should == true ComplainMatcher.new("Que pasa?\n").matches?(proc).should == false diff --git a/spec/mspec/spec/runner/formatters/dotted_spec.rb b/spec/mspec/spec/runner/formatters/dotted_spec.rb index 1e9b06f6e1f320..5af2ff55f8c4f9 100644 --- a/spec/mspec/spec/runner/formatters/dotted_spec.rb +++ b/spec/mspec/spec/runner/formatters/dotted_spec.rb @@ -91,7 +91,7 @@ @formatter.exception?.should be_true end - it "addes the exception to the list of exceptions" do + it "adds the exception to the list of exceptions" do @formatter.exceptions.should == [] @formatter.exception @error @formatter.exception @failure diff --git a/spec/mspec/spec/utils/script_spec.rb b/spec/mspec/spec/utils/script_spec.rb index e3188ab5ff5901..3cc85fa1e22f5b 100644 --- a/spec/mspec/spec/utils/script_spec.rb +++ b/spec/mspec/spec/utils/script_spec.rb @@ -406,7 +406,7 @@ class MSSClass < MSpecScript; end @script = MSpecScript.new end - it "accumlates the values returned by #entries" do + it "accumulates the values returned by #entries" do @script.should_receive(:entries).and_return(["file1"], ["file2"]) @script.files(["a", "b"]).should == ["file1", "file2"] end diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb index 660d083799fc30..9f92635387b78d 100644 --- a/test/date/test_date_parse.rb +++ b/test/date/test_date_parse.rb @@ -208,7 +208,7 @@ def test__parse [['08-DEC-0088',false],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__], [['08-DEC-0088',true],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__], - # swaped vms + # swapped vms [['DEC-08-1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__], [['JAN-31-1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__], [['JAN-31--1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__], diff --git a/test/did_you_mean/spell_checking/test_class_name_check.rb b/test/did_you_mean/spell_checking/test_class_name_check.rb index 388dbe89a7044e..ffe7a4c31ba657 100644 --- a/test/did_you_mean/spell_checking/test_class_name_check.rb +++ b/test/did_you_mean/spell_checking/test_class_name_check.rb @@ -70,7 +70,7 @@ def test_does_not_suggest_user_input # This is a weird require, but in a multi-threaded condition, a constant may # be loaded between when a NameError occurred and when the spell checker - # attemps to find a possible suggestion. The manual require here simulates + # attempts to find a possible suggestion. The manual require here simulates # a race condition a single test. require_relative '../fixtures/book' diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb index eaea4c85227270..2a01dab17f129c 100644 --- a/test/logger/test_logdevice.rb +++ b/test/logger/test_logdevice.rb @@ -51,7 +51,7 @@ def test_initialize ensure logdev.close end - # create logfile whitch is already exist. + # create logfile which is already exist. logdev = d(@filename) begin assert_predicate(logdev.dev, :sync) diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb index 8096375c072abf..3606c67d65cf4b 100644 --- a/test/openssl/test_config.rb +++ b/test/openssl/test_config.rb @@ -61,14 +61,14 @@ def test_s_parse_format [default1 default2]\t\t # space is allowed in section name fo =b ar # space allowed in value [emptysection] - [doller ] + [dollar ] foo=bar bar = $(foo) baz = 123$(default::bar)456${foo}798 qux = ${baz} quxx = $qux.$qux __EOC__ - assert_equal(['default', 'default1 default2', 'doller', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) + assert_equal(['default', 'default1 default2', 'dollar', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) assert_equal(['', 'a', 'bar', 'baz', 'd', 'dq', 'dq2', 'esc', 'foo\\bar', 'sq'], c['default'].keys.sort) assert_equal('c', c['default']['']) assert_equal('', c['default']['a']) @@ -84,12 +84,12 @@ def test_s_parse_format assert_equal('baz', c['foo\\bar']['foo\\bar']) assert_equal('b ar', c['default1 default2']['fo']) - # dolloer - assert_equal('bar', c['doller']['foo']) - assert_equal('bar', c['doller']['bar']) - assert_equal('123baz456bar798', c['doller']['baz']) - assert_equal('123baz456bar798', c['doller']['qux']) - assert_equal('123baz456bar798.123baz456bar798', c['doller']['quxx']) + # dollar + assert_equal('bar', c['dollar']['foo']) + assert_equal('bar', c['dollar']['bar']) + assert_equal('123baz456bar798', c['dollar']['baz']) + assert_equal('123baz456bar798', c['dollar']['qux']) + assert_equal('123baz456bar798.123baz456bar798', c['dollar']['quxx']) excn = assert_raise(OpenSSL::ConfigError) do OpenSSL::Config.parse("foo = $bar") diff --git a/test/racc/assets/nasl.y b/test/racc/assets/nasl.y index e68dd699f89ac5..c7b8e465510a24 100644 --- a/test/racc/assets/nasl.y +++ b/test/racc/assets/nasl.y @@ -586,7 +586,7 @@ def n(cls, *args) rescue puts "An exception occurred during the creation of a #{cls} instance." puts - puts "The arguments passed to the constructer were:" + puts "The arguments passed to the constructor were:" puts args puts puts @tok.last.context diff --git a/test/racc/regress/nasl b/test/racc/regress/nasl index 2904866ee67a41..ea473430012538 100644 --- a/test/racc/regress/nasl +++ b/test/racc/regress/nasl @@ -56,7 +56,7 @@ def n(cls, *args) rescue puts "An exception occurred during the creation of a #{cls} instance." puts - puts "The arguments passed to the constructer were:" + puts "The arguments passed to the constructor were:" puts args puts puts @tok.last.context diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text index 6c5a6fdb4bfcfd..b499390f2dc50a 100644 --- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text +++ b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text @@ -270,7 +270,7 @@ it easy to use Markdown to write about HTML example code: I strongly recommend against using any `` tags. I wish SmartyPants used named entities like `—` - instead of decimal-encoded entites like `—`. + instead of decimal-encoded entities like `—`. Output: @@ -279,7 +279,7 @@ Output:

I wish SmartyPants used named entities like &mdash; instead of decimal-encoded - entites like &#8212;.

+ entities like &#8212;.

To specify an entire block of pre-formatted code, indent every line of diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb index fff68818b5f551..0ecd0001361247 100644 --- a/test/rdoc/test_rdoc_markdown_test.rb +++ b/test/rdoc/test_rdoc_markdown_test.rb @@ -744,7 +744,7 @@ def test_markdown_documentation_basics "I strongly recommend against using any `` tags.\n", "\n", "I wish SmartyPants used named entities like `—`\n", - "instead of decimal-encoded entites like `—`.\n"), + "instead of decimal-encoded entities like `—`.\n"), para("Output:"), @@ -753,7 +753,7 @@ def test_markdown_documentation_basics "\n", "

I wish SmartyPants used named entities like\n", "&mdash; instead of decimal-encoded\n", - "entites like &#8212;.

\n"), + "entities like &#8212;.

\n"), para("To specify an entire block of pre-formatted code, indent every line of\n" + "the block by 4 spaces or 1 tab. Just like with code spans, &, <,\n" + diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb index d9de1e734e0a6e..99f4de2fcb7854 100644 --- a/test/rdoc/test_rdoc_parser_ruby.rb +++ b/test/rdoc/test_rdoc_parser_ruby.rb @@ -3504,7 +3504,7 @@ def test_scan_block_comment_notflush # # The previous test assumes that between the =begin/=end blocks that there # is only one line, or minima formatting directives. This test tests for - # those who use the =begin bloc with longer / more advanced formatting + # those who use the =begin block with longer / more advanced formatting # within. # ## From 216b62aa87f069c51085e9f9abb548930370bc53 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 20 Dec 2019 14:10:37 +0900 Subject: [PATCH 009/878] use UTC to use previous day in midnight --- tool/format-release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/format-release b/tool/format-release index 85efd31c5a2283..366e1e5afb527c 100755 --- a/tool/format-release +++ b/tool/format-release @@ -168,7 +168,7 @@ eom orig_data = File.read(File.join(wwwdir, filename)) data = orig_data.dup - date = Time.now + date = Time.now.utc # use utc to use previous day in midnight entry = < " + STDERR.puts "usage: format-release " exit end wwwdir = ARGV.shift From 435a4ca2a38f3be1f5d2db0f71487a52c8285e9c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 14:14:07 +0900 Subject: [PATCH 010/878] Makes the receiver to FrozenError.new a keyword parameter [Feature #16419] --- error.c | 23 ++++++++++++------- spec/ruby/core/exception/frozen_error_spec.rb | 2 +- test/ruby/test_exception.rb | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/error.c b/error.c index e5dc0c38527caf..b261f2ea0476d6 100644 --- a/error.c +++ b/error.c @@ -1431,9 +1431,16 @@ exit_success_p(VALUE exc) return Qfalse; } +static VALUE +err_init_recv(VALUE exc, VALUE recv) +{ + if (recv != Qundef) rb_ivar_set(exc, id_recv, recv); + return exc; +} + /* * call-seq: - * FrozenError.new(msg=nil, receiver=nil) -> frozen_error + * FrozenError.new(msg=nil, receiver: nil) -> frozen_error * * Construct a new FrozenError exception. If given the receiver * parameter may subsequently be examined using the FrozenError#receiver @@ -1446,14 +1453,14 @@ exit_success_p(VALUE exc) static VALUE frozen_err_initialize(int argc, VALUE *argv, VALUE self) { - VALUE mesg, recv; + ID keywords[1]; + VALUE values[numberof(keywords)], options; - argc = rb_scan_args(argc, argv, "02", &mesg, &recv); - if (argc > 1) { - argc--; - rb_ivar_set(self, id_recv, recv); - } + argc = rb_scan_args(argc, argv, "*:", NULL, &options); + keywords[0] = id_receiver; + rb_get_kwargs(options, keywords, 0, numberof(values), values); rb_call_super(argc, argv); + err_init_recv(self, values[0]); return self; } @@ -1503,7 +1510,7 @@ name_err_init_attr(VALUE exc, VALUE recv, VALUE method) rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp); cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp); rb_ivar_set(exc, id_name, method); - if (recv != Qundef) rb_ivar_set(exc, id_recv, recv); + err_init_recv(exc, recv); if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq)); return exc; } diff --git a/spec/ruby/core/exception/frozen_error_spec.rb b/spec/ruby/core/exception/frozen_error_spec.rb index 7b356253c4bd1f..1b5ea711482567 100644 --- a/spec/ruby/core/exception/frozen_error_spec.rb +++ b/spec/ruby/core/exception/frozen_error_spec.rb @@ -12,7 +12,7 @@ ruby_version_is "2.7" do it "should take optional receiver argument" do o = Object.new - FrozenError.new("msg", o).receiver.should equal(o) + FrozenError.new("msg", receiver: o).receiver.should equal(o) end end end diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index c7cfe816b006b4..94b59dac472272 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -845,7 +845,7 @@ def test_frozen_error_receiver def test_frozen_error_initialize obj = Object.new - exc = FrozenError.new("bar", obj) + exc = FrozenError.new("bar", receiver: obj) assert_equal("bar", exc.message) assert_same(obj, exc.receiver) From a8bddb3a189545a2bef8ee7cffdb328d8de7974c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 14:29:42 +0900 Subject: [PATCH 011/878] Refined the warning message for numbered-parameter like variables [Bug #16438] --- parse.y | 2 +- test/ruby/test_syntax.rb | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/parse.y b/parse.y index 7247afafa3332f..05e2c1d552aaba 100644 --- a/parse.y +++ b/parse.y @@ -11836,7 +11836,7 @@ static void numparam_name(struct parser_params *p, ID id) { if (!NUMPARAM_ID_P(id)) return; - rb_warn1("`_%d' is used as numbered parameter", + rb_warn1("`_%d' is reserved as numbered parameter", WARN_I(NUMPARAM_ID_TO_IDX(id))); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 5eb69c514422ec..540ab7b84a3233 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1437,12 +1437,13 @@ def test_numbered_parameter assert_syntax_error('-> {_1; -> {_2}}', /numbered parameter is already used/) assert_syntax_error('-> {-> {_1}; _2}', /numbered parameter is already used/) assert_syntax_error('proc {_1; _1 = nil}', /Can't assign to numbered parameter _1/) - assert_warn(/`_1' is used as numbered parameter/) {eval('proc {_1 = nil}')} - assert_warn(/`_2' is used as numbered parameter/) {eval('_2=1')} - assert_warn(/`_3' is used as numbered parameter/) {eval('proc {|_3|}')} - assert_warn(/`_4' is used as numbered parameter/) {instance_eval('def x(_4) end')} - assert_warn(/`_5' is used as numbered parameter/) {instance_eval('def _5; end')} - assert_warn(/`_6' is used as numbered parameter/) {instance_eval('def self._6; end')} + mesg = proc {|n| /`_#{n}' is reserved as numbered parameter/} + assert_warn(mesg[1]) {eval('proc {_1 = nil}')} + assert_warn(mesg[2]) {eval('_2=1')} + assert_warn(mesg[3]) {eval('proc {|_3|}')} + assert_warn(mesg[4]) {instance_eval('def x(_4) end')} + assert_warn(mesg[5]) {instance_eval('def _5; end')} + assert_warn(mesg[6]) {instance_eval('def self._6; end')} assert_raise_with_message(NameError, /undefined local variable or method `_1'/) { eval('_1') } From 7a94225e7d04f17ddd37433c3904b04fec97f281 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 14:54:44 +0900 Subject: [PATCH 012/878] Refined the warning message for numbered-parameter like variables [Bug #16438] --- NEWS | 2 +- parse.y | 2 +- test/ruby/test_syntax.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index bfd93a4df8f5bc..e0efad8100f38a 100644 --- a/NEWS +++ b/NEWS @@ -127,7 +127,7 @@ sufficient information, see the ChangeLog file or Redmine You can still define a local variable named _1 and so on, and that is honored when present, but renders warning. - _1 = 0 #=> warning: `_1' is used as numbered parameter + _1 = 0 #=> warning: `_1' is reserved for numbered parameter; consider another name [1].each { p _1 } # prints 0 instead of 1 ==== proc/lambda without block is deprecated diff --git a/parse.y b/parse.y index 05e2c1d552aaba..9f7e3a650d4591 100644 --- a/parse.y +++ b/parse.y @@ -11836,7 +11836,7 @@ static void numparam_name(struct parser_params *p, ID id) { if (!NUMPARAM_ID_P(id)) return; - rb_warn1("`_%d' is reserved as numbered parameter", + rb_warn1("`_%d' is reserved for numbered parameter; consider another name", WARN_I(NUMPARAM_ID_TO_IDX(id))); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 540ab7b84a3233..d50c325a8e661c 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1437,7 +1437,7 @@ def test_numbered_parameter assert_syntax_error('-> {_1; -> {_2}}', /numbered parameter is already used/) assert_syntax_error('-> {-> {_1}; _2}', /numbered parameter is already used/) assert_syntax_error('proc {_1; _1 = nil}', /Can't assign to numbered parameter _1/) - mesg = proc {|n| /`_#{n}' is reserved as numbered parameter/} + mesg = proc {|n| /`_#{n}' is reserved for numbered parameter/} assert_warn(mesg[1]) {eval('proc {_1 = nil}')} assert_warn(mesg[2]) {eval('_2=1')} assert_warn(mesg[3]) {eval('proc {|_3|}')} From 2b2030f265e4ec0782de9c8dd9f8828a1a0af1b5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 15:05:10 +0900 Subject: [PATCH 013/878] Refined the warning message for $, and $; [Bug #16438] --- io.c | 2 +- string.c | 2 +- test/ruby/test_string.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/io.c b/io.c index caef68c7695436..42528c0fd58ad5 100644 --- a/io.c +++ b/io.c @@ -7543,7 +7543,7 @@ rb_output_fs_setter(VALUE val, ID id, VALUE *var) { rb_str_setter(val, id, &val); if (!NIL_P(val)) { - rb_warn("non-nil $, will be deprecated"); + rb_warn_deprecated("`$,'", NULL); } *var = val; } diff --git a/string.c b/string.c index 22ced326b8d0f5..d6fd73115bfdcb 100644 --- a/string.c +++ b/string.c @@ -10092,7 +10092,7 @@ rb_fs_setter(VALUE val, ID id, VALUE *var) rb_id2str(id)); } if (!NIL_P(val)) { - rb_warn("non-nil $; will be deprecated"); + rb_warn_deprecated("`$;'", NULL); } *var = val; } diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 0276d6a14d9c29..09d099bb4afaf5 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1771,7 +1771,7 @@ def test_fs begin fs = $; - assert_warn(/\$; will be deprecated/) {$; = " "} + assert_warn(/`\$;' is deprecated/) {$; = " "} ensure EnvUtil.suppress_warning {$; = fs} end From f7aee584987e24768670e96b1455ed1193f91ef2 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Fri, 20 Dec 2019 19:41:15 +0900 Subject: [PATCH 014/878] vm_args.c: rephrase the warning message of keyword argument separation (old) test.rb:4: warning: The last argument is used as the keyword parameter test.rb:1: warning: for `foo' defined here; maybe ** should be added to the call? (new) test.rb:4: warning: The last argument is used as keyword parameters; maybe ** should be added to the call test.rb:1: warning: The called method `foo' is defined here --- class.c | 2 +- include/ruby/ruby.h | 2 +- test/-ext-/funcall/test_passing_block.rb | 6 +- test/ruby/test_exception.rb | 4 +- test/ruby/test_io.rb | 2 +- test/ruby/test_keyword.rb | 616 +++++++++++------------ test/ruby/test_numeric.rb | 2 +- test/ruby/test_proc.rb | 56 +-- test/ruby/test_struct.rb | 2 +- test/ruby/test_syntax.rb | 4 +- test/test_delegate.rb | 2 +- vm_args.c | 16 +- 12 files changed, 357 insertions(+), 357 deletions(-) diff --git a/class.c b/class.c index 4129647bdc458d..cceba6a1894de0 100644 --- a/class.c +++ b/class.c @@ -2051,7 +2051,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st if (!keyword_given && !last_hash_keyword) { /* Warn if treating positional as keyword, as in Ruby 3, this will be an error */ - rb_warn("The last argument is used as the keyword parameter"); + rb_warn("The last argument is used as keyword parameters"); } argc--; } diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 8a5aacb42bf5ab..57b5075ffdf5c2 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2569,7 +2569,7 @@ rb_scan_args_set(int argc, const VALUE *argv, if (!keyword_given) { /* Warn if treating positional as keyword, as in Ruby 3, this will be an error */ - rb_warn("The last argument is used as the keyword parameter"); + rb_warn("The last argument is used as keyword parameters"); } argc--; } diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb index c2d7639b520ab3..dd67b7c7de922f 100644 --- a/test/-ext-/funcall/test_passing_block.rb +++ b/test/-ext-/funcall/test_passing_block.rb @@ -29,7 +29,7 @@ def test_with_funcall_passing_block_kw assert_equal([[{}], {}], Relay.with_funcall_passing_block_kw(2, {}, **{}, &block)) assert_equal([[], {a: 1}], Relay.with_funcall_passing_block_kw(3, a: 1, &block)) assert_equal([[{a: 1}], {}], Relay.with_funcall_passing_block_kw(3, {a: 1}, **{}, &block)) - assert_warn(/warning: The keyword argument is passed as the last hash parameter.*for method/m) do + assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method is defined here/m) do assert_equal({}, Relay.with_funcall_passing_block_kw(3, **{}, &->(a){a})) end end @@ -53,7 +53,7 @@ def o.baz(arg) assert_equal([[], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 3, a: 1)) assert_equal([[{a: 1}], {}], Relay.with_funcallv_public_kw(o, :foo, 3, {a: 1}, **{})) assert_raise(NoMethodError) { Relay.with_funcallv_public_kw(o, :bar, 3, {a: 1}, **{}) } - assert_warn(/warning: The keyword argument is passed as the last hash parameter.*for `baz'/m) do + assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method `baz'/m) do assert_equal({}, Relay.with_funcallv_public_kw(o, :baz, 3, **{})) end end @@ -64,7 +64,7 @@ def test_with_yield_splat_kw assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(1, [{a: 1}], &block)) assert_equal([[1], {a: 1}], Relay.with_yield_splat_kw(1, [1, {a: 1}], &block)) assert_equal([[{}], {}], Relay.with_yield_splat_kw(2, [{}], **{}, &block)) - assert_warn(/warning: The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/warning: The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(3, [{a: 1}], &block)) end assert_equal([[{a: 1}], {}], Relay.with_yield_splat_kw(3, [{a: 1}], **{}, &block)) diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 94b59dac472272..b1f4681ac5132f 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1208,8 +1208,8 @@ def (obj = Object.new).w(n) warn("test warning", uplevel: n) end assert_raise(ArgumentError) {warn("test warning", uplevel: -1)} assert_in_out_err(["-e", "warn 'ok', uplevel: 1"], '', [], /warning:/) warning = capture_warning_warn {warn("test warning", {uplevel: 0})} - assert_equal("#{__FILE__}:#{__LINE__-1}: warning: The last argument is used as the keyword parameter\n", warning[0]) - assert_match(/warning: for method defined here|warning: test warning/, warning[1]) + assert_equal("#{__FILE__}:#{__LINE__-1}: warning: The last argument is used as keyword parameters; maybe ** should be added to the call\n", warning[0]) + assert_match(/warning: The called method (?:`.*' )?is defined here|warning: test warning/, warning[1]) warning = capture_warning_warn {warn("test warning", **{uplevel: 0})} assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) warning = capture_warning_warn {warn("test warning", {uplevel: 0}, **{})} diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index f3b08154c85d10..9a3a0f8e1a5d92 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2284,7 +2284,7 @@ def test_open_redirect_keyword def o.to_open(**kw); kw; end assert_equal({:a=>1}, open(o, a: 1)) - w = /The last argument is used as the keyword parameter.*for `(to_)?open'/m + w = /The last argument is used as keyword parameters.*The called method `(to_)?open'/m redefined = nil w.singleton_class.define_method(:===) do |s| match = super(s) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 874b09bcfaf1ab..3d5cb2dd20d489 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -24,7 +24,7 @@ def f2(x, str: "foo", num: 424242) def test_f2 assert_equal([:xyz, "foo", 424242], f2(:xyz)) - assert_warn(/The keyword argument is passed as the last hash parameter.* for `f2'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `f2'/m) do assert_equal([{"bar"=>42}, "foo", 424242], f2("bar"=>42)) end end @@ -224,10 +224,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(kw, c.m(kw, **kw)) @@ -248,11 +248,11 @@ def c.m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -260,25 +260,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end assert_equal([h, kw], c.m(h)) @@ -296,11 +296,11 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.m(**h2)) assert_equal([1, h3], c.m(**h3)) assert_equal([1, h3], c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal([1, h], c.m(h)) end assert_equal([h2, kw], c.m(h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_equal([h2, h], c.m(h3)) end end @@ -357,11 +357,11 @@ def m(args) args end end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -383,11 +383,11 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -398,31 +398,31 @@ def m(arg, **args) end end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**{}) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**kw) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -493,11 +493,11 @@ def m(args) args end end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -519,11 +519,11 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -534,31 +534,31 @@ def m(arg, **args) end end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**{}) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.m(**kw) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -612,34 +612,34 @@ def test_lambda_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/The last argument is used as the keyword parameter.*for `\[\]'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `\[\]'/m) do assert_equal(h, f[h]) end assert_raise(ArgumentError) { f[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*for `\[\]'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `\[\]'/m) do assert_raise(ArgumentError) { f[h3] } end f = ->(a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([{}, {}], f[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([{}, {}], f[**kw]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([h, {}], f[**h]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([h, {}], f[a: 1]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([h2, {}], f[**h2]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([h3, {}], f[**h3]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `\[\]'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do assert_equal([h3, {}], f[a: 1, **h2]) end @@ -691,11 +691,11 @@ def test_lambda_method_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(h, f[h]) end assert_raise(ArgumentError) { f[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_raise(ArgumentError) { f[h3] } end @@ -771,11 +771,11 @@ def test_Thread_new_kwsplat assert_equal(h2, t.new(**h2, &f).value) assert_equal(h3, t.new(**h3, &f).value) assert_equal(h3, t.new(a: 1, **h2, &f).value) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(h, t.new(h, &f).value) end assert_raise(ArgumentError) { t.new(h2, &f).value } - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_raise(ArgumentError) { t.new(h3, &f).value } end @@ -850,11 +850,11 @@ def test_Fiber_resume_kwsplat assert_equal(h2, t.new(&f).resume(**h2)) assert_equal(h3, t.new(&f).resume(**h3)) assert_equal(h3, t.new(&f).resume(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(h, t.new(&f).resume(h)) end assert_raise(ArgumentError) { t.new(&f).resume(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_raise(ArgumentError) { t.new(&f).resume(h3) } end @@ -927,11 +927,11 @@ def test_Enumerator_Generator_each_kwsplat assert_equal(h2, g.new(&f).each(**h2)) assert_equal(h3, g.new(&f).each(**h3)) assert_equal(h3, g.new(&f).each(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(h, g.new(&f).each(h)) end assert_raise(ArgumentError) { g.new(&f).each(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_raise(ArgumentError) { g.new(&f).each(h3) } end @@ -1004,11 +1004,11 @@ def test_Enumerator_Yielder_yield_kwsplat assert_equal(h2, g.new{|y| y.yield(**h2)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(**h3)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(a: 1, **h2)}.each(&f)) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(h, g.new{|y| y.yield(h)}.each(&f)) end assert_raise(ArgumentError) { g.new{|y| y.yield(h2)}.each(&f) } - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_raise(ArgumentError) { g.new{|y| y.yield(h3)}.each(&f) } end @@ -1087,10 +1087,10 @@ def initialize(args) @args = args end end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal(kw, c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal(kw, c[**kw].args) end assert_equal(h, c[**h].args) @@ -1111,11 +1111,11 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/The last argument is used as the keyword parameter.*for `initialize'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do assert_equal(h, c[h].args) end assert_raise(ArgumentError) { c[h2].args } - assert_warn(/The last argument is split into positional and keyword parameters.*for `initialize'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `initialize'/m) do assert_raise(ArgumentError) { c[h3].args } end @@ -1124,25 +1124,25 @@ def initialize(arg, **args) @args = [arg, args] end end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([kw, kw], c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([kw, kw], c[**kw].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h, kw], c[**h].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h, kw], c[a: 1].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h2, kw], c[**h2].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h3, kw], c[**h3].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h3, kw], c[a: 1, **h2].args) end @@ -1199,10 +1199,10 @@ def initialize(args) @args = args end end.method(:new) - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal(kw, c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal(kw, c[**kw].args) end assert_equal(h, c[**h].args) @@ -1223,11 +1223,11 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/The last argument is used as the keyword parameter.*for `initialize'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do assert_equal(h, c[h].args) end assert_raise(ArgumentError) { c[h2].args } - assert_warn(/The last argument is split into positional and keyword parameters.*for `initialize'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `initialize'/m) do assert_raise(ArgumentError) { c[h3].args } end @@ -1236,25 +1236,25 @@ def initialize(arg, **args) @args = [arg, args] end end.method(:new) - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([kw, kw], c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([kw, kw], c[**kw].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h, kw], c[**h].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h, kw], c[a: 1].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h2, kw], c[**h2].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h3, kw], c[**h3].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `initialize'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do assert_equal([h3, kw], c[a: 1, **h2].args) end @@ -1304,10 +1304,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.method(:m)[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.method(:m)[**kw]) end assert_equal(h, c.method(:m)[**h]) @@ -1327,11 +1327,11 @@ def c.m(**args) assert_equal(h2, c.method(:m)[**h2]) assert_equal(h3, c.method(:m)[**h3]) assert_equal(h3, c.method(:m)[a: 1, **h2]) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.method(:m)[h]) end assert_raise(ArgumentError) { c.method(:m)[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.method(:m)[h3] } end @@ -1339,25 +1339,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], c.method(:m)[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], c.method(:m)[**kw]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.method(:m)[**h]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.method(:m)[a: 1]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.method(:m)[**h2]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.method(:m)[**h3]) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.method(:m)[a: 1, **h2]) end @@ -1407,10 +1407,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, sc.instance_method(:m).bind_call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, sc.instance_method(:m).bind_call(c, **kw)) end assert_equal(h, sc.instance_method(:m).bind_call(c, **h)) @@ -1430,11 +1430,11 @@ def c.m(**args) assert_equal(h2, sc.instance_method(:m).bind_call(c, **h2)) assert_equal(h3, sc.instance_method(:m).bind_call(c, **h3)) assert_equal(h3, sc.instance_method(:m).bind_call(c, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, sc.instance_method(:m).bind_call(c, h)) end assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h3) } end @@ -1442,25 +1442,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], sc.instance_method(:m).bind_call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], sc.instance_method(:m).bind_call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], sc.instance_method(:m).bind_call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, a: 1, **h2)) end @@ -1509,10 +1509,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.send(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.send(:m, **kw)) end assert_equal(h, c.send(:m, **h)) @@ -1532,11 +1532,11 @@ def c.m(**args) assert_equal(h2, c.send(:m, **h2)) assert_equal(h3, c.send(:m, **h3)) assert_equal(h3, c.send(:m, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.send(:m, h)) end assert_raise(ArgumentError) { c.send(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.send(:m, h3) } end @@ -1544,25 +1544,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.send(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.send(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.send(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.send(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.send(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.send(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.send(:m, a: 1, **h2)) end @@ -1611,10 +1611,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.public_send(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.public_send(:m, **kw)) end assert_equal(h, c.public_send(:m, **h)) @@ -1634,11 +1634,11 @@ def c.m(**args) assert_equal(h2, c.public_send(:m, **h2)) assert_equal(h3, c.public_send(:m, **h3)) assert_equal(h3, c.public_send(:m, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.public_send(:m, h)) end assert_raise(ArgumentError) { c.public_send(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.public_send(:m, h3) } end @@ -1646,25 +1646,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.public_send(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do c.public_send(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.public_send(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.public_send(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.public_send(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.public_send(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.public_send(:m, a: 1, **h2)) end @@ -1716,10 +1716,10 @@ def c.m(args) args end m = c.method(:send) - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, m.call(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, m.call(:m, **kw)) end assert_equal(h, m.call(:m, **h)) @@ -1740,11 +1740,11 @@ def c.m(**args) assert_equal(h2, m.call(:m, **h2)) assert_equal(h3, m.call(:m, **h3)) assert_equal(h3, m.call(:m, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, m.call(:m, h)) end assert_raise(ArgumentError) { m.call(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { m.call(:m, h3) } end @@ -1753,25 +1753,25 @@ def c.m(arg, **args) [arg, args] end m = c.method(:send) - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do m.call(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do m.call(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], m.call(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], m.call(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], m.call(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], m.call(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], m.call(:m, a: 1, **h2)) end @@ -1821,10 +1821,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, :m.to_proc.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, :m.to_proc.call(c, **kw)) end assert_equal(h, :m.to_proc.call(c, **h)) @@ -1844,11 +1844,11 @@ def c.m(**args) assert_equal(h2, :m.to_proc.call(c, **h2)) assert_equal(h3, :m.to_proc.call(c, **h3)) assert_equal(h3, :m.to_proc.call(c, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, :m.to_proc.call(c, h)) end assert_raise(ArgumentError) { :m.to_proc.call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { :m.to_proc.call(c, h3) } end @@ -1856,25 +1856,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], :m.to_proc.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], :m.to_proc.call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], :m.to_proc.call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], :m.to_proc.call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], :m.to_proc.call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], :m.to_proc.call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], :m.to_proc.call(c, a: 1, **h2)) end @@ -1924,10 +1924,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, m.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, m.call(c, **kw)) end assert_equal(h, m.call(c, **h)) @@ -1947,11 +1947,11 @@ def c.m(**args) assert_equal(h2, m.call(c, **h2)) assert_equal(h3, m.call(c, **h3)) assert_equal(h3, m.call(c, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, m.call(c, h)) end assert_raise(ArgumentError) { m.call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { m.call(c, h3) } end @@ -1959,25 +1959,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], m.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], m.call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], m.call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], m.call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], m.call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], m.call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], m.call(c, a: 1, **h2)) end @@ -2026,10 +2026,10 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2049,11 +2049,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2061,25 +2061,25 @@ def c.method_missing(_, **args) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2137,11 +2137,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2161,11 +2161,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `m'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `m'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2178,31 +2178,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2252,10 +2252,10 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2275,11 +2275,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2287,25 +2287,25 @@ def c.method_missing(_, **args) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2379,7 +2379,7 @@ class << c assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } @@ -2429,10 +2429,10 @@ class << c class << c define_method(:m) {|*args, **opt| [args, opt] } end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[], h], c.m(h)) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[h], h], c.m(h, h)) end @@ -2440,10 +2440,10 @@ class << c class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_equal([h2, 1], c.m(h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_equal([h2, 1], c.m(**h3)) end end @@ -2509,7 +2509,7 @@ class << c assert_equal(h2, m.call(**h2)) assert_equal(h3, m.call(**h3)) assert_equal(h3, m.call(a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal(h, m.call(h)) end assert_raise(ArgumentError) { m.call(h2) } @@ -2562,10 +2562,10 @@ class << c define_method(:m) {|*args, **opt| [args, opt] } end m = c.method(:m) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[], h], m.call(h)) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[h], h], m.call(h, h)) end @@ -2574,10 +2574,10 @@ class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end m = c.method(:m) - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_equal([h2, 1], m.call(h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for method/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do assert_equal([h2, 1], m.call(**h3)) end end @@ -2691,7 +2691,7 @@ def test_proc_ruby2_keywords assert_equal([[1], h1], foo.call(1, :a=>1, &->(*args, **kw){[args, kw]})) assert_equal([1, h1], foo.call(1, :a=>1, &->(*args){args})) - assert_warn(/The last argument is used as the keyword parameter/) do + assert_warn(/The last argument is used as keyword parameters/) do assert_equal([[1], h1], foo.call(1, {:a=>1}, &->(*args, **kw){[args, kw]})) end assert_equal([1, h1], foo.call(1, {:a=>1}, &->(*args){args})) @@ -2907,19 +2907,19 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_foo_bar(h1, **{})) assert_equal([h1], o.foo_foo_baz(h1, **{})) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.foo(:bar, 1, h1)) end assert_equal([1, h1], o.foo(:baz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.bfoo(:bar, 1, h1)) end assert_equal([1, h1], o.bfoo(:baz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.store_foo(:bar, 1, h1)) end assert_equal([1, h1], o.store_foo(:baz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.foo_bar(1, h1)) end assert_equal([1, h1], o.foo_baz(1, h1)) @@ -2971,33 +2971,33 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_dbar(h1, **{})) assert_equal([h1], o.foo_dbaz(h1, **{})) - assert_warn(/The last argument is used as the keyword parameter.* for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[1], h1], o.foo(:dbar, 1, h1)) end assert_equal([1, h1], o.foo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[1], h1], o.bfoo(:dbar, 1, h1)) end assert_equal([1, h1], o.bfoo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[1], h1], o.store_foo(:dbar, 1, h1)) end assert_equal([1, h1], o.store_foo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as the keyword parameter.* for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal([[1], h1], o.foo_dbar(1, h1)) end assert_equal([1, h1], o.foo_dbaz(1, h1)) assert_equal([[1], h1], o.block(1, :a=>1)) assert_equal([[1], h1], o.block(1, **h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal([[1], h1], o.block(1, h1)) end assert_equal([[h1], {}], o.block(h1, **{})) assert_equal([[1], h1], o.cfunc(1, :a=>1)) assert_equal([[1], h1], o.cfunc(1, **h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `initialize'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do assert_equal([[1], h1], o.cfunc(1, h1)) end assert_equal([[h1], {}], o.cfunc(h1, **{})) @@ -3005,7 +3005,7 @@ def method_missing(*args) o = mmkw.new assert_equal([[:b, 1], h1], o.b(1, :a=>1)) assert_equal([[:b, 1], h1], o.b(1, **h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal([[:b, 1], h1], o.b(1, h1)) end assert_equal([[:b, h1], {}], o.b(h1, **{})) @@ -3019,7 +3019,7 @@ def method_missing(*args) o = implicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.bar(1, h1)) end assert_equal([[h1], {}], o.bar(h1, **{})) @@ -3032,7 +3032,7 @@ def method_missing(*args) o = explicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.bar(1, h1)) end assert_equal([[h1], {}], o.bar(h1, **{})) @@ -3048,11 +3048,11 @@ def bar(*args, **kw) [args, kw] end end - assert_warn(/The last argument is used as the keyword parameter.* for `bar'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do assert_equal([[1], h1], o.foo(:pass_bar, 1, :a=>1)) end - assert_warn(/The last argument is used as the keyword parameter.* for `initialize'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do assert_equal([[1], h1], o.foo(:pass_cfunc, 1, :a=>1)) end @@ -3142,23 +3142,23 @@ def c.dig(**args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal(h, [c].dig(0, **h)) end - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal(h, [c].dig(0, a: 1)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, **h3) } end - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } end - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal(h, [c].dig(0, h)) end assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, h3) } end @@ -3180,24 +3180,24 @@ def c.dig(arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, **h)) end - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, a: 1)) end assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, **h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, a: 1, **h2)) end - assert_warn(/The last argument is used as the keyword parameter.*for `dig'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, h)) end assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `dig'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, h3)) end assert_equal([h, kw], [c].dig(0, h, **{})) @@ -3252,23 +3252,23 @@ def c.method_missing(_, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, **h)) end - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, a: 1)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, **h3) } end - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } end - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, h)) end assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, h3) } end @@ -3290,24 +3290,24 @@ def c.method_missing(_, arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, **h)) end - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, a: 1)) end assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, **h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, a: 1, **h2)) end - assert_warn(/The last argument is used as the keyword parameter.*for `method_missing'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, h)) end assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `method_missing'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, h3)) end assert_equal([h, kw], [c].dig(0, h, **{})) @@ -3363,7 +3363,7 @@ def test_enumerator_size_kwsplat assert_equal(h2, c.to_enum(:each, **h2, &m).size) assert_equal(h3, c.to_enum(:each, **h3, &m).size) assert_equal(h3, c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal(h, c.to_enum(:each, h, &m).size) end assert_raise(ArgumentError) { c.to_enum(:each, h2, &m).size } @@ -3405,7 +3405,7 @@ def test_enumerator_size_kwsplat assert_equal([1, h2], c.to_enum(:each, **h2, &m).size) assert_equal([1, h3], c.to_enum(:each, **h3, &m).size) assert_equal([1, h3], c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal([1, h], c.to_enum(:each, h, &m).size) end assert_equal([h2, kw], c.to_enum(:each, h2, &m).size) @@ -3461,7 +3461,7 @@ def test_instance_exec_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/) do + assert_warn(/The last argument is used as keyword parameters/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } @@ -3503,7 +3503,7 @@ def test_instance_exec_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) @@ -3573,7 +3573,7 @@ def c.m(**args) assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/) do + assert_warn(/The last argument is used as keyword parameters/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } @@ -3623,7 +3623,7 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) @@ -3693,7 +3693,7 @@ def test_instance_exec_define_method_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/) do + assert_warn(/The last argument is used as keyword parameters/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } @@ -3743,7 +3743,7 @@ def test_instance_exec_define_method_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) @@ -3809,7 +3809,7 @@ def c.m(**args) assert_equal(h2, c.instance_exec(c, **h2, &:m)) assert_equal(h3, c.instance_exec(c, **h3, &:m)) assert_equal(h3, c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/The last argument is used as the keyword parameter/) do + assert_warn(/The last argument is used as keyword parameters/) do assert_equal(h, c.instance_exec(c, h, &:m)) end assert_raise(ArgumentError) { c.instance_exec(c, h2, &:m) } @@ -3857,7 +3857,7 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(c, **h2, &:m)) assert_equal([1, h3], c.instance_exec(c, **h3, &:m)) assert_equal([1, h3], c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/The last argument is used as the keyword parameter/m) do + assert_warn(/The last argument is used as keyword parameters/m) do assert_equal([1, h], c.instance_exec(c, h, &:m)) end assert_equal([h2, kw], c.instance_exec(c, h2, &:m)) @@ -3902,10 +3902,10 @@ def c.c; end def c.c(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal(kw, c.m(:c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal(kw, c.m(:c, **kw)) end assert_equal(kw, c.m(:c, kw, **kw)) @@ -3927,11 +3927,11 @@ def c.c(**args) assert_equal([h2, h2], c.m(:c, **h2, &m)) assert_equal([h3, h3], c.m(:c, **h3, &m)) assert_equal([h3, h3], c.m(:c, a: 1, **h2, &m)) - assert_warn(/The last argument is used as the keyword parameter.*for `c'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `c'/m) do assert_equal([h, h], c.m(:c, h, &m)) end assert_raise(ArgumentError) { c.m(:c, h2, &m) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `c'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `c'/m) do assert_raise(ArgumentError) { c.m(:c, h3, &m) } end @@ -3939,25 +3939,25 @@ def c.c(**args) def c.c(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([kw, kw], c.m(:c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([kw, kw], c.m(:c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([h, kw], c.m(:c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([h, kw], c.m(:c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([h2, kw], c.m(:c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([h3, kw], c.m(:c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `c'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do assert_equal([h3, kw], c.m(:c, a: 1, **h2)) end assert_equal([h, kw], c.m(:c, h)) @@ -3975,11 +3975,11 @@ def c.c(arg=1, **args) assert_equal([1, h2], c.m(:c, **h2)) assert_equal([1, h3], c.m(:c, **h3)) assert_equal([1, h3], c.m(:c, a: 1, **h2)) - assert_warn(/The last argument is used as the keyword parameter.*for `c'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `c'/m) do assert_equal([1, h], c.m(:c, h)) end assert_equal([h2, kw], c.m(:c, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*for `c'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `c'/m) do assert_equal([h2, h], c.m(:c, h3)) end end @@ -4110,22 +4110,22 @@ def test_rest_keyrest bug7665 = '[ruby-core:51278]' bug8463 = '[ruby-core:55203] [Bug #8463]' expect = [*%w[foo bar], {zzz: 42}] - assert_warn(/The last argument is used as the keyword parameter.* for `rest_keyrest'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `rest_keyrest'/m) do assert_equal(expect, rest_keyrest(*expect), bug7665) end pr = proc {|*args, **opt| next *args, opt} - assert_warn(/The last argument is used as the keyword parameter.* for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(expect, pr.call(*expect), bug7665) end - assert_warn(/The last argument is used as the keyword parameter.* for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(expect, pr.call(expect), bug8463) end pr = proc {|a, *b, **opt| next a, *b, opt} - assert_warn(/The last argument is used as the keyword parameter.* for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(expect, pr.call(expect), bug8463) end pr = proc {|a, **opt| next a, opt} - assert_warn(/The last argument is used as the keyword parameter.* for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(expect.values_at(0, -1), pr.call(expect), bug8463) end end @@ -4143,13 +4143,13 @@ def splat_plus_keyword(*a, **h) end def test_keyword_split - assert_warn(/The keyword argument is passed as the last hash parameter.* for `req_plus_keyword'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do assert_equal([{:a=>1}, {}], req_plus_keyword(:a=>1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `req_plus_keyword'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do assert_equal([{"a"=>1}, {}], req_plus_keyword("a"=>1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `req_plus_keyword'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do assert_equal([{"a"=>1, :a=>1}, {}], req_plus_keyword("a"=>1, :a=>1)) end assert_equal([{:a=>1}, {}], req_plus_keyword({:a=>1})) @@ -4159,22 +4159,22 @@ def test_keyword_split assert_equal([1, {:a=>1}], opt_plus_keyword(:a=>1)) assert_equal([1, {"a"=>1}], opt_plus_keyword("a"=>1)) assert_equal([1, {"a"=>1, :a=>1}], opt_plus_keyword("a"=>1, :a=>1)) - assert_warn(/The last argument is used as the keyword parameter.* for `opt_plus_keyword'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `opt_plus_keyword'/m) do assert_equal([1, {:a=>1}], opt_plus_keyword({:a=>1})) end assert_equal([{"a"=>1}, {}], opt_plus_keyword({"a"=>1})) - assert_warn(/The last argument is split into positional and keyword parameters.* for `opt_plus_keyword'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `opt_plus_keyword'/m) do assert_equal([{"a"=>1}, {:a=>1}], opt_plus_keyword({"a"=>1, :a=>1})) end assert_equal([[], {:a=>1}], splat_plus_keyword(:a=>1)) assert_equal([[], {"a"=>1}], splat_plus_keyword("a"=>1)) assert_equal([[], {"a"=>1, :a=>1}], splat_plus_keyword("a"=>1, :a=>1)) - assert_warn(/The last argument is used as the keyword parameter.* for `splat_plus_keyword'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `splat_plus_keyword'/m) do assert_equal([[], {:a=>1}], splat_plus_keyword({:a=>1})) end assert_equal([[{"a"=>1}], {}], splat_plus_keyword({"a"=>1})) - assert_warn(/The last argument is split into positional and keyword parameters.* for `splat_plus_keyword'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `splat_plus_keyword'/m) do assert_equal([[{"a"=>1}], {:a=>1}], splat_plus_keyword({"a"=>1, :a=>1})) end end @@ -4361,7 +4361,7 @@ def foo(a, b, c=1, *d, e, f:2, **g) [a, b, c, d, e, f, g] end end - assert_warn(/The keyword argument is passed as the last hash parameter.* for `foo'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `foo'/m) do assert_equal([1, 2, 1, [], {:f=>5}, 2, {}], a.new.foo(1, 2, f:5), bug8993) end end @@ -4396,10 +4396,10 @@ def test_implicit_hash_conversion o = Object.new def o.to_hash() { k: 9 } end assert_equal([1, 42, [], o, :key, {}, nil], f9(1, o)) - assert_warn(/The last argument is used as the keyword parameter.* for `m1'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m1'/m) do assert_equal([1, 9], m1(1, o) {|a, k: 0| break [a, k]}, bug10016) end - assert_warn(/The last argument is used as the keyword parameter.* for `m1'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `m1'/m) do assert_equal([1, 9], m1(1, o, &->(a, k: 0) {break [a, k]}), bug10016) end end @@ -4708,11 +4708,11 @@ def c.m(args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal(kw, c.call(**kw, &:m)) end assert_equal(h, c.call(**h, &:m)) @@ -4732,11 +4732,11 @@ def c.m(**args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(h, c.call(h, &:m)) end assert_raise(ArgumentError) { c.call(h2, &:m) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `call'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m) } end @@ -4749,31 +4749,31 @@ def c.m(arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([kw, kw], c.call(**kw, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.call(**h, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h, kw], c.call(a: 1, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h2, kw], c.call(**h2, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.call(**h3, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `m'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) end @@ -4828,11 +4828,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.call(**kw, &:m)) end assert_equal(h, c.call(**h, &:m)) @@ -4852,11 +4852,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(h, c.call(h, &:m2)) end assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `call'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m2) } end @@ -4869,31 +4869,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**kw, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(**h, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(a: 1, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h2, kw], c.call(**h2, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(**h3, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) end @@ -4948,11 +4948,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.call(**{}, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal(kw, c.call(**kw, &:m2)) end assert_equal(h, c.call(**h, &:m2)) @@ -4972,11 +4972,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m2)) assert_equal(h3, c.call(**h3, &:m2)) assert_equal(h3, c.call(a: 1, **h2, &:m2)) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(h, c.call(h, &:m2)) end assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/The last argument is split into positional and keyword parameters.*for `call'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m2) } end @@ -4989,31 +4989,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**{}, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**kw, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(**h, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(a: 1, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h2, kw], c.call(**h2, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(**h3, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.* for `method_missing'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m2)) end diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 797fd209af6139..2cd363c29a3c77 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -293,7 +293,7 @@ def test_step assert_raise(ArgumentError, bug9811) { 1.step(10, 1, by: 11).size } - e = assert_warn(/The last argument is used as the keyword parameter/) { + e = assert_warn(/The last argument is used as keyword parameters/) { 1.step(10, {by: "1"}) } assert_warn('') { diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index ea3fe823f07ca6..cd5c4458b05e5d 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1485,27 +1485,27 @@ def test_compose_keywords g = ->(kw) { kw.merge(:a=>2) } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1515,27 +1515,27 @@ def test_compose_keywords_method f = ->(**kw) { kw.merge(:a=>1) }.method(:call) g = ->(kw) { kw.merge(:a=>2) }.method(:call) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1549,27 +1549,27 @@ def g.to_proc; method(:call).to_proc; end def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*for `call'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `call'/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1582,27 +1582,27 @@ def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end assert_equal(1, (f << g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (g << f).call(a: 3)[:a]) end assert_equal(1, (g >> f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end assert_equal(1, (f << g).call(**{})[:a]) - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call(**{})[:a]) end end diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 9438160a6ffb00..6f31b334b16f96 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -115,7 +115,7 @@ def test_struct_new_with_keyword_init assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect # eval is needed to prevent the warning duplication filter k = eval("Class.new(@Struct::KeywordInitFalse) {def initialize(**) end}") - assert_warn(/The last argument is used as the keyword parameter/) {k.new(a: 1, b: 2)} + assert_warn(/The last argument is used as keyword parameters/) {k.new(a: 1, b: 2)} k = Class.new(@Struct::KeywordInitTrue) {def initialize(**) end} assert_warn('') {k.new(a: 1, b: 2)} diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index d50c325a8e661c..4ad46403989ab7 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -182,7 +182,7 @@ def test_keyword_duplicated_splat h = {k3: 31} assert_raise(ArgumentError) {o.kw(**h)} h = {"k1"=>11, k2: 12} - assert_warn(/The last argument is split into positional and keyword parameters.* for `kw'/m) do + assert_warn(/The last argument is split into positional and keyword parameters.*The called method `kw'/m) do assert_raise(ArgumentError) {o.kw(**h)} end end @@ -1523,7 +1523,7 @@ def obj3.bar(*args, &block) assert_warning('') { assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5)) } - warning = "warning: The last argument is used as the keyword parameter" + warning = "warning: The last argument is used as keyword parameters" assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { assert_equal([[], {}], obj.foo({}) {|*x| x}) } diff --git a/test/test_delegate.rb b/test/test_delegate.rb index 7f6e7c1326962e..a8e938c08ef564 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -190,7 +190,7 @@ def foo.foo(*args, **kw) assert_equal([], d.bar) assert_equal([[], {:a=>1}], d.foo(:a=>1)) assert_equal([{:a=>1}], d.bar(:a=>1)) - assert_warn(/The last argument is used as the keyword parameter.* for `foo'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `foo'/m) do assert_equal([[], {:a=>1}], d.foo({:a=>1})) end assert_equal([{:a=>1}], d.bar({:a=>1})) diff --git a/vm_args.c b/vm_args.c index 924af7157d46b1..47ab8ee66a4590 100644 --- a/vm_args.c +++ b/vm_args.c @@ -658,11 +658,11 @@ rb_warn_keyword_to_last_hash(rb_execution_context_t * const ec, struct rb_callin rb_warn("The keyword argument is passed as the last hash parameter"); if (name) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for `%"PRIsVALUE"' defined here", name); + "The called method `%"PRIsVALUE"' is defined here", name); } else { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for method defined here"); + "The called method is defined here"); } } } @@ -683,11 +683,11 @@ rb_warn_split_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_ rb_warn("The last argument is split into positional and keyword parameters"); if (calling->recv != Qundef) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for `%"PRIsVALUE"' defined here", name); + "The called method `%"PRIsVALUE"' is defined here", name); } else { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for method defined here"); + "The called method is defined here"); } } } @@ -701,18 +701,18 @@ rb_warn_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_callin name = rb_id2str(ci->mid); loc = rb_iseq_location(iseq); if (NIL_P(loc)) { - rb_warn("The last argument for `%"PRIsVALUE"' is used as the keyword parameter; maybe ** should be added to the call?", + rb_warn("The last argument for `%"PRIsVALUE"' is used as keyword parameters; maybe ** should be added to the call", name); } else { - rb_warn("The last argument is used as the keyword parameter"); + rb_warn("The last argument is used as keyword parameters; maybe ** should be added to the call"); if (calling->recv != Qundef) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for `%"PRIsVALUE"' defined here; maybe ** should be added to the call?", name); + "The called method `%"PRIsVALUE"' is defined here", name); } else { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "for method defined here; maybe ** should be added to the call?"); + "The called method is defined here"); } } } From 1fea3a7636cfaf25baba1e9f208c68a8a8ba52cc Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Fri, 20 Dec 2019 21:37:46 +0900 Subject: [PATCH 015/878] NEWS: Update the explanation of pattern matching Add an example of " in ", an example of NoMatchingPatternError, and mention that the slides are slightly obsolete. --- NEWS | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index e0efad8100f38a..a67d16ba555bee 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,11 @@ sufficient information, see the ChangeLog file or Redmine p var #=> 1 end + case -1 + in 0 then :unreachable + in 1 then :unreachable + end #=> NoMatchingPatternError + json = < 2 - end + + JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: name, age: age}]} + + p name #=> "Bob" + p age #=> 2 + + JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]} + #=> NoMatchingPatternError * See the following slides in detail * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7 + * Note that the slides are slightly obsolete ==== The spec of keyword arguments is changed towards 3.0 From 6876aa38f607cdd6fb24910e54143d9110d025c9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 22:50:46 +0900 Subject: [PATCH 016/878] Added `FEATURE_SET_RESTORE` macro --- ruby.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruby.c b/ruby.c index 60c57d62598cc0..dae928a675c611 100644 --- a/ruby.c +++ b/ruby.c @@ -144,6 +144,7 @@ rb_feature_set_to(ruby_features_t *feat, unsigned int bit_mask, unsigned int bit #define FEATURE_SET_TO(feat, bit_mask, bit_set) \ rb_feature_set_to(&(feat), bit_mask, bit_set) #define FEATURE_SET(feat, bits) FEATURE_SET_TO(feat, bits, bits) +#define FEATURE_SET_RESTORE(feat, save) FEATURE_SET_TO(feat, (save).mask, (save).set & (save).mask) #define FEATURE_SET_P(feat, bits) ((feat).set & (bits)) struct ruby_cmdline_options { @@ -1582,7 +1583,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) opt->ext.enc.name = ext_enc_name; if (int_enc_name) opt->intern.enc.name = int_enc_name; - FEATURE_SET_TO(opt->features, feat.mask, feat.set & feat.mask); + FEATURE_SET_RESTORE(opt->features, feat); } if (opt->src.enc.name) From a84ad24386d27269b90794146c2a351c1d79471b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 23:05:22 +0900 Subject: [PATCH 017/878] Added -W: command line option To manage `Warning[category]` flags. Only `-W:deprecated` and `-W:no-deprecated` are available now. [Feature #16345] --- error.c | 7 +++++++ ruby.c | 30 +++++++++++++++++++++++++++++- test/ruby/test_rubyoptions.rb | 9 +++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/error.c b/error.c index b261f2ea0476d6..e662b4f08aed5d 100644 --- a/error.c +++ b/error.c @@ -150,6 +150,13 @@ rb_warning_category_from_name(VALUE category) return cat; } +void +rb_warning_category_update(unsigned int mask, unsigned int bits) +{ + warning_disabled_categories &= ~mask; + warning_disabled_categories |= mask & ~bits; +} + MJIT_FUNC_EXPORTED bool rb_warning_category_enabled_p(rb_warning_category_t category) { diff --git a/ruby.c b/ruby.c index dae928a675c611..f6785e47368020 100644 --- a/ruby.c +++ b/ruby.c @@ -69,6 +69,8 @@ char *getenv(); #define DEFAULT_RUBYGEMS_ENABLED "enabled" #endif +void rb_warning_category_update(unsigned int mask, unsigned int bits); + #define COMMA , #define FEATURE_BIT(bit) (1U << feature_##bit) #define EACH_FEATURES(X, SEP) \ @@ -159,6 +161,7 @@ struct ruby_cmdline_options { } src, ext, intern; VALUE req_list; ruby_features_t features; + ruby_features_t warn; unsigned int dump; #if USE_MJIT struct mjit_options mjit; @@ -266,7 +269,7 @@ usage(const char *name, int help) M("-S", "", "look for the script using PATH environment variable"), M("-v", "", "print the version number, then turn on verbose mode"), M("-w", "", "turn warnings on for your script"), - M("-W[level=2]", "", "set warning level; 0=silence, 1=medium, 2=verbose"), + M("-W[level=2|:category]", "", "set warning level; 0=silence, 1=medium, 2=verbose"), M("-x[directory]", "", "strip off text before #!ruby line and perhaps cd to directory"), M("--jit", "", "enable JIT with default options (experimental)"), M("--jit-[option]","", "enable JIT with an option (experimental)"), @@ -297,6 +300,9 @@ usage(const char *name, int help) M("frozen-string-literal", "", "freeze all string literals (default: disabled)"), M("jit", "", "JIT compiler (default: disabled)"), }; + static const struct message warn_categories[] = { + M("deprecated", "", "deprecated features"), + }; static const struct message mjit_options[] = { M("--jit-warnings", "", "Enable printing JIT warnings"), M("--jit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), @@ -324,6 +330,9 @@ usage(const char *name, int help) puts("Features:"); for (i = 0; i < numberof(features); ++i) SHOW(features[i]); + puts("Warning categories:"); + for (i = 0; i < numberof(warn_categories); ++i) + SHOW(warn_categories[i]); puts("JIT options (experimental):"); for (i = 0; i < numberof(mjit_options); ++i) SHOW(mjit_options[i]); @@ -1060,6 +1069,21 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) goto reswitch; case 'W': + if (s[1] == ':') { + unsigned int bits = 0; + static const char no_prefix[] = "no-"; + int enable = strncmp(s += 2, no_prefix, sizeof(no_prefix)-1) != 0; + if (!enable) s += sizeof(no_prefix)-1; + size_t len = strlen(s); + if (NAME_MATCH_P("deprecated", s, len)) { + bits = 1U << RB_WARN_CATEGORY_DEPRECATED; + } + else { + rb_warn("unknown warning category: `%s'", s); + } + if (bits) FEATURE_SET_TO(opt->warn, bits, enable ? bits : 0); + break; + } { size_t numlen; int v = 2; /* -W as -W2 */ @@ -1574,6 +1598,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) VALUE ext_enc_name = opt->ext.enc.name; VALUE int_enc_name = opt->intern.enc.name; ruby_features_t feat = opt->features; + ruby_features_t warn = opt->warn; opt->src.enc.name = opt->ext.enc.name = opt->intern.enc.name = 0; moreswitches(s, opt, 1); @@ -1584,6 +1609,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) if (int_enc_name) opt->intern.enc.name = int_enc_name; FEATURE_SET_RESTORE(opt->features, feat); + FEATURE_SET_RESTORE(opt->warn, warn); } if (opt->src.enc.name) @@ -1777,6 +1803,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) ruby_set_script_name(progname); rb_parser_set_options(parser, opt->do_print, opt->do_loop, opt->do_line, opt->do_split); + rb_warning_category_update(opt->warn.mask, opt->warn.set); ast = rb_parser_compile_string(parser, opt->script, opt->e_script, 1); } else { @@ -2015,6 +2042,7 @@ load_file_internal(VALUE argp_v) } rb_parser_set_options(parser, opt->do_print, opt->do_loop, opt->do_line, opt->do_split); + rb_warning_category_update(opt->warn.mask, opt->warn.set); if (NIL_P(f)) { f = rb_str_new(0, 0); rb_enc_associate(f, enc); diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 496a51b970d392..04a7016ae93f1a 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -75,6 +75,9 @@ def test_warning assert_in_out_err(%w(-Wx -e) + ['p $-W'], "", %w(1), []) assert_in_out_err(%w(-W -e) + ['p $-W'], "", %w(2), []) assert_in_out_err(%w(-w -W0 -e) + ['p $-W'], "", %w(0), []) + assert_in_out_err(%w(-W:deprecated -e) + ['p Warning[:deprecated]'], "", %w(true), []) + assert_in_out_err(%w(-W:no-deprecated -e) + ['p Warning[:deprecated]'], "", %w(false), []) + assert_in_out_err(%w(-W:qux), "", [], /unknown warning category: `qux'/) ensure ENV['RUBYOPT'] = save_rubyopt end @@ -328,6 +331,12 @@ def test_rubyopt assert_in_out_err(%w(), "p $VERBOSE", ["true"]) assert_in_out_err(%w(-W1), "p $VERBOSE", ["false"]) assert_in_out_err(%w(-W0), "p $VERBOSE", ["nil"]) + ENV['RUBYOPT'] = '-W:deprecated' + assert_in_out_err(%w(), "p Warning[:deprecated]", ["true"]) + ENV['RUBYOPT'] = '-W:no-deprecated' + assert_in_out_err(%w(), "p Warning[:deprecated]", ["false"]) + ENV['RUBYOPT'] = '-W:qux' + assert_in_out_err(%w(), "", [], /unknown warning category: `qux'/) ensure if rubyopt_orig ENV['RUBYOPT'] = rubyopt_orig From dd7f0c87c9da8e695c38a6529deb6e0f24f6d06c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 23:36:19 +0900 Subject: [PATCH 018/878] Hoisted out new_case3 --- parse.y | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/parse.y b/parse.y index 9f7e3a650d4591..3aaa29111a802d 100644 --- a/parse.y +++ b/parse.y @@ -472,6 +472,7 @@ static NODE *new_array_pattern(struct parser_params *p, NODE *constant, NODE *pr static NODE *new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, ID rest_arg, NODE *post_args, const YYLTYPE *loc); static NODE *new_hash_pattern(struct parser_params *p, NODE *constant, NODE *hshptn, const YYLTYPE *loc); static NODE *new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, const YYLTYPE *loc); +static NODE *new_case3(struct parser_params *p, NODE *val, NODE *pat, const YYLTYPE *loc); static NODE *new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc); static NODE *args_with_numbered(struct parser_params*,NODE*,int); @@ -1572,8 +1573,7 @@ expr : command_call { p->in_kwarg = !!$3; /*%%%*/ - $$ = NEW_CASE3($1, NEW_IN($5, 0, 0, &@5), &@$); - rb_warn0L(nd_line($$), "Pattern matching is experimental, and the behavior may change in future versions of Ruby!"); + $$ = new_case3(p, $1, NEW_IN($5, 0, 0, &@5), &@$); /*% %*/ /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ } @@ -2860,8 +2860,7 @@ primary : literal k_end { /*%%%*/ - $$ = NEW_CASE3($2, $4, &@$); - rb_warn0L(nd_line($$), "Pattern matching is experimental, and the behavior may change in future versions of Ruby!"); + $$ = new_case3(p, $2, $4, &@$); /*% %*/ /*% ripper: case!($2, $4) %*/ } @@ -11453,6 +11452,15 @@ new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, co return node; } +static NODE * +new_case3(struct parser_params *p, NODE *val, NODE *pat, const YYLTYPE *loc) +{ + NODE *node = NEW_CASE3(val, pat, loc); + + rb_warn0L(nd_line(node), "Pattern matching is experimental, and the behavior may change in future versions of Ruby!"); + return node; +} + static NODE* dsym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc) { From 07e595fdbd75ed44473073cdf8cd758572d11709 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 23:48:15 +0900 Subject: [PATCH 019/878] Added `experimental` warning category [Feature #16420] --- error.c | 3 +++ internal.h | 1 + parse.y | 3 ++- test/ruby/test_exception.rb | 1 + test/ruby/test_pattern_matching.rb | 26 ++++++++++++++++++++++---- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/error.c b/error.c index e662b4f08aed5d..a70d0214849cc0 100644 --- a/error.c +++ b/error.c @@ -144,6 +144,9 @@ rb_warning_category_from_name(VALUE category) if (category == ID2SYM(rb_intern("deprecated"))) { cat = RB_WARN_CATEGORY_DEPRECATED; } + else if (category == ID2SYM(rb_intern("experimental"))) { + cat = RB_WARN_CATEGORY_EXPERIMENTAL; + } else { rb_raise(rb_eArgError, "unknown category: %"PRIsVALUE, category); } diff --git a/internal.h b/internal.h index 2812b631be39f7..baefb36c020894 100644 --- a/internal.h +++ b/internal.h @@ -1558,6 +1558,7 @@ PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fm typedef enum { RB_WARN_CATEGORY_NONE, RB_WARN_CATEGORY_DEPRECATED, + RB_WARN_CATEGORY_EXPERIMENTAL, } rb_warning_category_t; rb_warning_category_t rb_warning_category_from_name(VALUE category); bool rb_warning_category_enabled_p(rb_warning_category_t category); diff --git a/parse.y b/parse.y index 3aaa29111a802d..6d9bfc9f4185ce 100644 --- a/parse.y +++ b/parse.y @@ -11457,7 +11457,8 @@ new_case3(struct parser_params *p, NODE *val, NODE *pat, const YYLTYPE *loc) { NODE *node = NEW_CASE3(val, pat, loc); - rb_warn0L(nd_line(node), "Pattern matching is experimental, and the behavior may change in future versions of Ruby!"); + if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_EXPERIMENTAL)) + rb_warn0L(nd_line(node), "Pattern matching is experimental, and the behavior may change in future versions of Ruby!"); return node; } diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index b1f4681ac5132f..df7a4e7cf53792 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1266,6 +1266,7 @@ def test_warning_category assert_raise(TypeError) {Warning[nil]} assert_raise(ArgumentError) {Warning[:XXXX]} assert_include([true, false], Warning[:deprecated]) + assert_include([true, false], Warning[:experimental]) end def test_undefined_backtrace diff --git a/test/ruby/test_pattern_matching.rb b/test/ruby/test_pattern_matching.rb index 5308ec3281f0ed..dc72aa029c0ed3 100644 --- a/test/ruby/test_pattern_matching.rb +++ b/test/ruby/test_pattern_matching.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'test/unit' -verbose, $VERBOSE = $VERBOSE, nil # suppress "warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!" +experimental, Warning[:experimental] = Warning[:experimental], false # suppress "warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!" eval "\n#{<<~'END_of_GUARD'}", binding, __FILE__, __LINE__ class TestPatternMatching < Test::Unit::TestCase class C @@ -92,7 +92,8 @@ def test_basic end assert_block do - verbose, $VERBOSE = $VERBOSE, nil # suppress "warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!" + # suppress "warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!" + experimental, Warning[:experimental] = Warning[:experimental], false eval(%q{ case true in a @@ -100,7 +101,7 @@ def test_basic end }) ensure - $VERBOSE = verbose + Warning[:experimental] = experimental end assert_block do @@ -1274,6 +1275,23 @@ def test_modifier_in 1 in a: }, /unexpected/, '[ruby-core:95098]') end + + def assert_experimental_warning(code) + w = Warning[:experimental] + + Warning[:experimental] = false + assert_warn('') {eval(code)} + + Warning[:experimental] = true + assert_warn(/Pattern matching is experimental/) {eval(code)} + ensure + Warning[:experimental] = w + end + + def test_experimental_warning + assert_experimental_warning("case 0; in 0; end") + assert_experimental_warning("0 in 0") + end end END_of_GUARD -$VERBOSE = verbose +Warning[:experimental] = experimental From 484c1be8956b7bb7a0253c6d6c7a740c341487fa Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Dec 2019 23:51:17 +0900 Subject: [PATCH 020/878] Added `-W:experimental` command line option [Feature #16420] --- ruby.c | 3 +++ test/ruby/test_rubyoptions.rb | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/ruby.c b/ruby.c index f6785e47368020..e0ef3e946e2428 100644 --- a/ruby.c +++ b/ruby.c @@ -1078,6 +1078,9 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) if (NAME_MATCH_P("deprecated", s, len)) { bits = 1U << RB_WARN_CATEGORY_DEPRECATED; } + else if (NAME_MATCH_P("experimental", s, len)) { + bits = 1U << RB_WARN_CATEGORY_EXPERIMENTAL; + } else { rb_warn("unknown warning category: `%s'", s); } diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 04a7016ae93f1a..cac420422d542b 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -77,6 +77,8 @@ def test_warning assert_in_out_err(%w(-w -W0 -e) + ['p $-W'], "", %w(0), []) assert_in_out_err(%w(-W:deprecated -e) + ['p Warning[:deprecated]'], "", %w(true), []) assert_in_out_err(%w(-W:no-deprecated -e) + ['p Warning[:deprecated]'], "", %w(false), []) + assert_in_out_err(%w(-W:experimental -e) + ['p Warning[:experimental]'], "", %w(true), []) + assert_in_out_err(%w(-W:no-experimental -e) + ['p Warning[:experimental]'], "", %w(false), []) assert_in_out_err(%w(-W:qux), "", [], /unknown warning category: `qux'/) ensure ENV['RUBYOPT'] = save_rubyopt @@ -335,6 +337,10 @@ def test_rubyopt assert_in_out_err(%w(), "p Warning[:deprecated]", ["true"]) ENV['RUBYOPT'] = '-W:no-deprecated' assert_in_out_err(%w(), "p Warning[:deprecated]", ["false"]) + ENV['RUBYOPT'] = '-W:experimental' + assert_in_out_err(%w(), "p Warning[:experimental]", ["true"]) + ENV['RUBYOPT'] = '-W:no-experimental' + assert_in_out_err(%w(), "p Warning[:experimental]", ["false"]) ENV['RUBYOPT'] = '-W:qux' assert_in_out_err(%w(), "", [], /unknown warning category: `qux'/) ensure From 63ce77929ab0ebe992e91a1bad436a5d8e6488a9 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 21 Dec 2019 00:07:13 +0900 Subject: [PATCH 021/878] * 2019-12-21 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index fa1805ec43d61a..b5602692ce30ea 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" From 9eded02446e34d4db1051f5f18c2d7d554e792d3 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 20 Dec 2019 10:47:56 -0800 Subject: [PATCH 022/878] Add Array#minmax, Range#minmax, and Proc#ruby2_keywords to NEWS --- NEWS | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a67d16ba555bee..5d4097dd353552 100644 --- a/NEWS +++ b/NEWS @@ -226,10 +226,13 @@ sufficient information, see the ChangeLog file or Redmine Array:: - New method:: + New methods:: * Added Array#intersection. [Feature #16155] + * Added Array#minmax, with a faster implementation than Enumerable#minmax. + [Bug #15929] + Comparable:: Modified method:: @@ -390,6 +393,22 @@ ObjectSpace::WeakMap:: * ObjectSpace::WeakMap#[]= now accepts special objects as either key or values. [Feature #16035] +Proc:: + + New method:: + + * Added Proc#ruby2_keywords for marking the proc as passing keyword + arguments through a regular argument splat, useful when delegating + all arguments to another method or proc in a way that can be backwards + compatible with older Ruby versions. [Feature #16404] + +Range:: + + New method:: + + * Added Range#minmax, with a faster implementation than Enumerable#minmax. + [Bug #15807] + RubyVM:: Removed method:: From ea405ee8ed00c03e0521ff4b852d8f3bea849243 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 21 Dec 2019 10:06:14 +0900 Subject: [PATCH 023/878] test/ruby/test_pattern_matching.rb: suppress "unused variable" warning --- test/ruby/test_pattern_matching.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/ruby/test_pattern_matching.rb b/test/ruby/test_pattern_matching.rb index dc72aa029c0ed3..6dbb25ca86408f 100644 --- a/test/ruby/test_pattern_matching.rb +++ b/test/ruby/test_pattern_matching.rb @@ -264,6 +264,7 @@ def test_var_pattern assert_block do case 0 in a + assert_equal(0, a) true in a flunk @@ -471,6 +472,7 @@ def test_array_pattern [[0], C.new([0])].all? do |i| case i in *a, 0, 1 + raise a # suppress "unused variable: a" warning else true end @@ -637,6 +639,7 @@ def test_array_pattern assert_block do case [] in [0, *a] + raise a # suppress "unused variable: a" warning else true end @@ -652,6 +655,7 @@ def test_array_pattern assert_block do case [0] in [0, *a, 1] + raise a # suppress "unused variable: a" warning else true end @@ -696,6 +700,7 @@ def test_array_pattern assert_block do case [] in [0, *a] + raise a # suppress "unused variable: a" warning else true end @@ -792,6 +797,7 @@ def test_hash_pattern [{}, C.new({})].all? do |i| case i in a: + raise a # suppress "unused variable: a" warning else true end @@ -874,6 +880,8 @@ def test_hash_pattern [{}, C.new({})].all? do |i| case i in a:, **b + raise a # suppress "unused variable: a" warning + raise b # suppress "unused variable: b" warning else true end @@ -921,6 +929,7 @@ def test_hash_pattern [{a: 0}, C.new({a: 0})].all? do |i| case i in a:, **nil + assert_equal(0, a) true end end @@ -930,6 +939,7 @@ def test_hash_pattern [{a: 0, b: 1}, C.new({a: 0, b: 1})].all? do |i| case i in a:, **nil + assert_equal(0, a) else true end @@ -1130,6 +1140,7 @@ def test_deconstruct_keys assert_block do case C.new({a: 0, b: 0, c: 0}) in {a: 0, b:} + assert_equal(0, b) C.keys == [:a, :b] end end @@ -1137,6 +1148,7 @@ def test_deconstruct_keys assert_block do case C.new({a: 0, b: 0, c: 0}) in {a: 0, b:, **} + assert_equal(0, b) C.keys == [:a, :b] end end @@ -1144,6 +1156,8 @@ def test_deconstruct_keys assert_block do case C.new({a: 0, b: 0, c: 0}) in {a: 0, b:, **r} + assert_equal(0, b) + assert_equal({c: 0}, r) C.keys == nil end end @@ -1158,6 +1172,7 @@ def test_deconstruct_keys assert_block do case C.new({a: 0, b: 0, c: 0}) in {**r} + assert_equal({a: 0, b: 0, c: 0}, r) C.keys == nil end end @@ -1250,6 +1265,8 @@ def test_struct s = Struct.new(:a, :b, keyword_init: true) case s[a: 0, b: 1] in a:, c: + raise a # suppress "unused variable: a" warning + raise c # suppress "unused variable: c" warning flunk in a:, b:, c: flunk From e0b336c8ce84e1456fc6126ca232289667db3e19 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Sun, 14 Jul 2019 23:41:43 -0400 Subject: [PATCH 024/878] Add specs for calling into Kernel#lambda with super --- spec/ruby/core/kernel/fixtures/classes.rb | 22 ++++++++++++++++++++++ spec/ruby/core/kernel/lambda_spec.rb | 17 ++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/spec/ruby/core/kernel/fixtures/classes.rb b/spec/ruby/core/kernel/fixtures/classes.rb index 2909a621a9783a..2f2bbf1b23195e 100644 --- a/spec/ruby/core/kernel/fixtures/classes.rb +++ b/spec/ruby/core/kernel/fixtures/classes.rb @@ -337,6 +337,28 @@ def inner end end + module LambdaSpecs + module ZSuper + def lambda + super + end + end + + class ForwardBlockWithZSuper + prepend(ZSuper) + end + + module Ampersand + def lambda(&block) + super(&block) + end + end + + class SuperAmpersand + prepend(Ampersand) + end + end + class RespondViaMissing def respond_to_missing?(method, priv=false) case method diff --git a/spec/ruby/core/kernel/lambda_spec.rb b/spec/ruby/core/kernel/lambda_spec.rb index 4796d65352cb70..537ac2628c6ca7 100644 --- a/spec/ruby/core/kernel/lambda_spec.rb +++ b/spec/ruby/core/kernel/lambda_spec.rb @@ -31,13 +31,28 @@ l.lambda?.should be_true end - it "returned the passed Proc if given an existing Proc" do + it "returns the passed Proc if given an existing Proc" do some_proc = proc {} l = lambda(&some_proc) l.should equal(some_proc) l.lambda?.should be_false end + it "creates a lambda-style Proc when called with zsuper" do + l = KernelSpecs::LambdaSpecs::ForwardBlockWithZSuper.new.lambda { 42 } + l.lambda?.should be_true + l.call.should == 42 + + lambda { l.call(:extra) }.should raise_error(ArgumentError) + end + + it "returns the passed Proc if given an existing Proc through super" do + some_proc = proc { } + l = KernelSpecs::LambdaSpecs::SuperAmpersand.new.lambda(&some_proc) + l.should equal(some_proc) + l.lambda?.should be_false + end + it "checks the arity of the call when no args are specified" do l = lambda { :called } l.call.should == :called From ddb6023d64a8c96348b4e67603753e2916a04f28 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Mon, 15 Jul 2019 00:35:30 -0400 Subject: [PATCH 025/878] Add spec for capturing Kernel#lambda with Kernel#method --- spec/ruby/core/kernel/lambda_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/ruby/core/kernel/lambda_spec.rb b/spec/ruby/core/kernel/lambda_spec.rb index 537ac2628c6ca7..5c30511270b300 100644 --- a/spec/ruby/core/kernel/lambda_spec.rb +++ b/spec/ruby/core/kernel/lambda_spec.rb @@ -53,6 +53,13 @@ l.lambda?.should be_false end + it "does not create lambda-style Procs when captured with #method" do + kernel_lambda = method(:lambda) + l = kernel_lambda.call { 42 } + l.lambda?.should be_false + l.call(:extra).should == 42 + end + it "checks the arity of the call when no args are specified" do l = lambda { :called } l.call.should == :called From 85a337f986fe6da99c7f8358f790f17b122b3903 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Sat, 13 Jul 2019 12:04:01 -0400 Subject: [PATCH 026/878] Kernel#lambda: return forwarded block as non-lambda proc Before this commit, Kernel#lambda can't tell the difference between a directly passed literal block and one passed with an ampersand. A block passed with an ampersand is semantically speaking already a non-lambda proc. When Kernel#lambda receives a non-lambda proc, it should simply return it. Implementation wise, when the VM calls a method with a literal block, it places the code for the block on the calling control frame and passes a pointer (block handler) to the callee. Before this commit, the VM forwards block arguments by simply forwarding the block handler, which leaves the slot for block code unused when a control frame forwards its block argument. I use the vacant space to indicate that a frame has forwarded its block argument and inspect that in Kernel#lambda to detect forwarded blocks. This is a very ad-hoc solution and relies *heavily* on the way block passing works in the VM. However, it's the most self-contained solution I have. [Bug #15620] --- proc.c | 10 +++++++++- test/ruby/test_lambda.rb | 20 ++++++++++++++++++++ vm_args.c | 5 ++++- vm_core.h | 8 +++++++- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/proc.c b/proc.c index 54b044f42158c5..b4899d2f1f64f0 100644 --- a/proc.c +++ b/proc.c @@ -792,8 +792,16 @@ proc_new(VALUE klass, int8_t is_lambda, int8_t kernel) break; case block_handler_type_ifunc: - case block_handler_type_iseq: return rb_vm_make_proc_lambda(ec, VM_BH_TO_CAPT_BLOCK(block_handler), klass, is_lambda); + case block_handler_type_iseq: + { + const struct rb_captured_block *captured = VM_BH_TO_CAPT_BLOCK(block_handler); + rb_control_frame_t *last_ruby_cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp); + if (is_lambda && last_ruby_cfp && vm_cfp_forwarded_bh_p(last_ruby_cfp, block_handler)) { + is_lambda = false; + } + return rb_vm_make_proc_lambda(ec, captured, klass, is_lambda); + } } VM_UNREACHABLE(proc_new); return Qnil; diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb index b9412d4540e108..03b501a6c9aab2 100644 --- a/test/ruby/test_lambda.rb +++ b/test/ruby/test_lambda.rb @@ -74,6 +74,26 @@ def test_call_block_from_lambda assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]} end + def pass_along(&block) + lambda(&block) + end + + def pass_along2(&block) + pass_along(&block) + end + + def test_create_non_lambda_for_proc_one_level + f = pass_along {} + refute_predicate(f, :lambda?, '[Bug #15620]') + assert_nothing_raised(ArgumentError) { f.call(:extra_arg) } + end + + def test_create_non_lambda_for_proc_two_levels + f = pass_along2 {} + refute_predicate(f, :lambda?, '[Bug #15620]') + assert_nothing_raised(ArgumentError) { f.call(:extra_arg) } + end + def test_instance_exec bug12568 = '[ruby-core:76300] [Bug #12568]' assert_nothing_raised(ArgumentError, bug12568) do diff --git a/vm_args.c b/vm_args.c index 47ab8ee66a4590..444abf90868397 100644 --- a/vm_args.c +++ b/vm_args.c @@ -1204,7 +1204,10 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t * return VM_BLOCK_HANDLER_NONE; } else if (block_code == rb_block_param_proxy) { - return VM_CF_BLOCK_HANDLER(reg_cfp); + VM_ASSERT(!VM_CFP_IN_HEAP_P(GET_EC(), reg_cfp)); + VALUE handler = VM_CF_BLOCK_HANDLER(reg_cfp); + reg_cfp->block_code = (const void *) handler; + return handler; } else if (SYMBOL_P(block_code) && rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) { const rb_cref_t *cref = vm_env_cref(reg_cfp->ep); diff --git a/vm_core.h b/vm_core.h index cd7bf74b5d0d81..12c3ac37755162 100644 --- a/vm_core.h +++ b/vm_core.h @@ -763,7 +763,7 @@ typedef struct rb_control_frame_struct { const rb_iseq_t *iseq; /* cfp[2] */ VALUE self; /* cfp[3] / block[0] */ const VALUE *ep; /* cfp[4] / block[1] */ - const void *block_code; /* cfp[5] / block[2] */ /* iseq or ifunc */ + const void *block_code; /* cfp[5] / block[2] */ /* iseq or ifunc or forwarded block handler */ VALUE *__bp__; /* cfp[6] */ /* outside vm_push_frame, use vm_base_ptr instead. */ #if VM_DEBUG_BP_CHECK @@ -1494,6 +1494,12 @@ vm_block_handler_verify(MAYBE_UNUSED(VALUE block_handler)) (vm_block_handler_type(block_handler), 1)); } +static inline int +vm_cfp_forwarded_bh_p(const rb_control_frame_t *cfp, VALUE block_handler) +{ + return ((VALUE) cfp->block_code) == block_handler; +} + static inline enum rb_block_type vm_block_type(const struct rb_block *block) { From 7fd6077d9896cc10244fb9416ef87ae461c079db Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 14 Dec 2019 11:01:49 +0900 Subject: [PATCH 027/878] [ruby/reline] Consider Reline::ANSI.input at prep https://github.com/ruby/reline/commit/b111cde3c3 --- lib/reline/ansi.rb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index e29ee755376c06..21c05403ab4c4b 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -120,20 +120,29 @@ def self.set_winch_handler(&handler) def self.prep retrieve_keybuffer int_handle = Signal.trap('INT', 'IGNORE') - otio = `stty -g`.chomp - setting = ' -echo -icrnl cbreak -ixoff -iexten' - stty = `stty -a` - if /-parenb\b/ =~ stty - setting << ' pass8' + begin + otio = IO.popen(%w[stty -g], in: @@input, &:read).chomp + rescue ArgumentError + else + setting = %w'-echo -icrnl cbreak -ixoff -iexten' + stty = IO.popen(%w[stty -a], in: @@input, &:read) + if /-parenb\b/ =~ stty + setting << 'pass8' + end + system("stty", *setting, in: @@input) end - `stty #{setting}` Signal.trap('INT', int_handle) otio end def self.deprep(otio) int_handle = Signal.trap('INT', 'IGNORE') - system("stty #{otio}", err: File::NULL) + if otio + begin + system("stty #{otio}", in: @@input, err: File::NULL) + rescue ArgumentError + end + end Signal.trap('INT', int_handle) Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler end From ec1de789a98923417cf983cb3cdaed003c0f8be6 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 14 Dec 2019 15:46:42 +0900 Subject: [PATCH 028/878] [ruby/reline] Preserve the input buffer across cursor_pos The old version of cursor_pos discards the input buffer, which made IRB ignore the input immediately after IRB is invoked. This change keeps the input before cursor_pos by using ungetc. https://github.com/ruby/reline/commit/4a8cca331f --- lib/reline/ansi.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 21c05403ab4c4b..376439dc74e55c 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -60,14 +60,18 @@ def self.set_screen_size(rows, columns) def self.cursor_pos begin res = '' + m = nil @@input.raw do |stdin| @@output << "\e[6n" @@output.flush while (c = stdin.getc) != 'R' res << c if c end + m = res.match(/\e\[(?\d+);(?\d+)/) + (m.pre_match + m.post_match).chars.reverse_each do |ch| + stdin.ungetc ch + end end - m = res.match(/(?\d+);(?\d+)/) column = m[:column].to_i - 1 row = m[:row].to_i - 1 rescue Errno::ENOTTY From a3cc2a2fbde23637fb924f75e977599b7a475118 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 14 Dec 2019 16:07:21 +0900 Subject: [PATCH 029/878] [ruby/irb] Fix auto-indent for `1.times do` Fixes #47 https://github.com/ruby/irb/commit/6b8eca4635 --- lib/irb/ruby-lex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 24074f323d30be..a012d49f69fd80 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -336,7 +336,7 @@ def check_newline_depth_difference next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME) case t[2] when 'do' - if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN) + if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN | Ripper::EXPR_ARG) # method_with_block do; end depth_difference += 1 else From 616f1357c3030fad73c42ea061a7f21b0df57fb5 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 14 Dec 2019 16:14:43 +0900 Subject: [PATCH 030/878] [ruby/irb] Make nesting level up for `1.times do` Follow up of the previous commit https://github.com/ruby/irb/commit/ab207353d3 --- lib/irb/ruby-lex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index a012d49f69fd80..b4c31c16fe5ccc 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -293,7 +293,7 @@ def process_nesting_level next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME) case t[2] when 'do' - if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN) + if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN | Ripper::EXPR_ARG) # method_with_block do; end indent += 1 else From 0835a971ef84dfebefbc73ddd468450cbfb90974 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 18 Dec 2019 22:57:25 +0900 Subject: [PATCH 031/878] Remove TODO comment --- lib/reline/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/config.rb b/lib/reline/config.rb index 04357c3694b12a..fdc2b39c1b68ea 100644 --- a/lib/reline/config.rb +++ b/lib/reline/config.rb @@ -157,7 +157,7 @@ def handle_directive(directive, file, no) case directive when 'if' condition = false - case args # TODO: variables + case args when 'mode' when 'term' when 'version' From 29ea228efc5af08a0e91fafe155617f20e22976b Mon Sep 17 00:00:00 2001 From: git Date: Sun, 22 Dec 2019 01:58:02 +0900 Subject: [PATCH 032/878] * 2019-12-22 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index b5602692ce30ea..f2868a2f6b609b 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" From 61aff0cd189e67fa6f2565639ad0128fa33b88fc Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku Date: Sun, 22 Dec 2019 02:36:55 +0900 Subject: [PATCH 033/878] Should return "." for File.extname("file.") also on Windows But not changes another cases, such as "file.rb." [Bug #15267] --- file.c | 22 +++++++++++++++++----- spec/ruby/core/file/extname_spec.rb | 4 ++-- test/ruby/test_file_exhaustive.rb | 6 +++--- test/ruby/test_path.rb | 6 +----- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/file.c b/file.c index c46377b93324c9..170455ab0ae8e8 100644 --- a/file.c +++ b/file.c @@ -4711,13 +4711,26 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc) while (*p) { if (*p == '.' || istrailinggarbage(*p)) { #if USE_NTFS - const char *last = p++, *dot = last; + const char *first = 0, *last, *dot; + if (*p == '.') first = p; + last = p++; + dot = last; while (istrailinggarbage(*p)) { - if (*p == '.') dot = p; + if (*p == '.') { + dot = p; + if (!first) { + first = p; + } + } p++; } if (!*p || isADS(*p)) { - p = last; + if (first == dot && e == 0) { + e = first; + } + else { + p = last; + } break; } if (*last == '.' || dot > last) e = dot; @@ -4766,8 +4779,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc) * File.extname("test.rb") #=> ".rb" * File.extname("a/b/d/test.rb") #=> ".rb" * File.extname(".a/b/d/test.rb") #=> ".rb" - * File.extname("foo.") #=> "" on Windows - * File.extname("foo.") #=> "." on non-Windows + * File.extname("foo.") #=> "." * File.extname("test") #=> "" * File.extname(".profile") #=> "" * File.extname(".profile.sh") #=> ".sh" diff --git a/spec/ruby/core/file/extname_spec.rb b/spec/ruby/core/file/extname_spec.rb index e9b53bc24d014e..79290960fbd143 100644 --- a/spec/ruby/core/file/extname_spec.rb +++ b/spec/ruby/core/file/extname_spec.rb @@ -23,14 +23,14 @@ end describe "for a filename ending with a dot" do - guard -> { platform_is :windows or ruby_version_is ""..."2.7" } do + ruby_version_is ""..."2.7" do it "returns ''" do File.extname(".foo.").should == "" File.extname("foo.").should == "" end end - guard -> { platform_is_not :windows and ruby_version_is "2.7" } do + ruby_version_is "2.7" do it "returns '.'" do File.extname(".foo.").should == "." File.extname("foo.").should == "." diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 975bcb6bc2d660..de4c21e5ca39d7 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -1268,19 +1268,19 @@ def test_extname infixes2 = infixes + [".ext "] appendixes = [""] if NTFS - appendixes << " " << "." << "::$DATA" << "::$DATA.bar" + appendixes << " " << [".", ".", ""] << "::$DATA" << "::$DATA.bar" else appendixes << [".", "."] end prefixes.each do |prefix| - appendixes.each do |appendix, ext = ""| + appendixes.each do |appendix, ext = "", ext2 = ext| infixes.each do |infix| path = "#{prefix}foo#{infix}#{appendix}" assert_equal(ext, File.extname(path), "File.extname(#{path.inspect})") end infixes2.each do |infix| path = "#{prefix}foo#{infix}.ext#{appendix}" - assert_equal(ext.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})") + assert_equal(ext2.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})") end end end diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb index b35e942a2a037d..64111ee805765c 100644 --- a/test/ruby/test_path.rb +++ b/test/ruby/test_path.rb @@ -239,11 +239,7 @@ def test_extname ext = '.' end assert_equal(ext, File.extname('a.rb.')) - if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM - # trailing spaces and dots are ignored on NTFS. - ext = '' - end - assert_equal(ext, File.extname('a.')) + assert_equal('.', File.extname('a.')) assert_equal('', File.extname('.x')) assert_equal('', File.extname('..x')) end From 3a29f05ba5ba7ed4b821ba5f566eeb3ff3c5c3b1 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Sun, 22 Dec 2019 01:39:17 +0900 Subject: [PATCH 034/878] Move stats under a dict --- tool/format-release | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tool/format-release b/tool/format-release index 366e1e5afb527c..ec2d535ac45be4 100755 --- a/tool/format-release +++ b/tool/format-release @@ -86,7 +86,7 @@ eom # show diff shortstat tag = "v#{version.gsub(/[.\-]/, '_')}" stat = `git diff --shortstat #{prev_tag}..#{tag}` - total_files, insertions, deletions = stat.scan(/\d+/) + files_changed, insertions, deletions = stat.scan(/\d+/) end xy = version[/\A\d+\.\d+/] @@ -96,7 +96,7 @@ eom #end update_branches_yml(version, xy, wwwdir) update_downloads_yml(version, xy, wwwdir) - update_releases_yml(version, xy, tarballs, wwwdir, total_files, insertions, deletions) + update_releases_yml(version, xy, tarballs, wwwdir, files_changed, insertions, deletions) tarballs end @@ -163,7 +163,7 @@ eom end end - def self.update_releases_yml(ver, xy, ary, wwwdir, total_files, insertions, deletions) + def self.update_releases_yml(ver, xy, ary, wwwdir, files_changed, insertions, deletions) filename = "_data/releases.yml" orig_data = File.read(File.join(wwwdir, filename)) data = orig_data.dup @@ -173,9 +173,10 @@ eom - version: #{ver} date: #{date.strftime("%Y-%m-%d")} post: /en/news/#{date.strftime("%Y/%m/%d")}/ruby-#{ver.tr('.', '-')}-released/ - total_files: #{total_files} - insertions: #{insertions} - deletions: #{deletions} + stats: + files_changed: #{files_changed} + insertions: #{insertions} + deletions: #{deletions} url: gz: https://cache.ruby-lang.org/pub/ruby/#{xy}/ruby-#{ver}.tar.gz zip: https://cache.ruby-lang.org/pub/ruby/#{xy}/ruby-#{ver}.zip From 75acbd5f0076970d48bc423c2b058adbdb5da9e8 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 22 Dec 2019 03:31:27 +0900 Subject: [PATCH 035/878] compile.c: avoid newarraykwsplat for arguments `foo(*rest, post, **empty_kw)` is compiled like `foo(*rest + [post, **empty_kw])`, and `**empty_kw` is removed by "newarraykwsplat" instruction. However, the method call still has a flag of KW_SPLAT, so "post" is considered as a keyword hash, which caused a segfault. Note that the flag cannot be removed if "empty_kw" is not always empty. This change fixes the issue by compiling arguments with "newarray" instead of "newarraykwsplat". [Bug #16442] --- compile.c | 9 ++++++++- test/ruby/test_keyword.rb | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/compile.c b/compile.c index 98ee34afd02d1d..c19112c85303a0 100644 --- a/compile.c +++ b/compile.c @@ -5017,7 +5017,14 @@ setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, case NODE_ARGSPUSH: { int next_is_list = (nd_type(argn->nd_head) == NODE_LIST); VALUE argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL); - NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body)); + if (nd_type(argn->nd_body) == NODE_LIST) { + /* This branch is needed to avoid "newarraykwsplat" [Bug #16442] */ + int rest_len = compile_args(iseq, args, argn->nd_body, NULL, NULL); + ADD_INSN1(args, nd_line(argn), newarray, INT2FIX(rest_len)); + } + else { + NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body)); + } if (flag) { *flag |= VM_CALL_ARGS_SPLAT; /* This is a dirty hack. It traverses the AST twice. diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 3d5cb2dd20d489..bfdec6fc7470cf 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -4654,6 +4654,12 @@ def test_many_kwargs def test_splat_empty_hash_with_block_passing assert_valid_syntax("bug15087(**{}, &nil)") end + + def test_do_not_use_newarraykwsplat + assert_equal([42, "foo", 424242], f2(*[], 42, **{})) + a = [1, 2, 3] + assert_equal([[1,2,3,4,5,6], "foo", 424242, {:k=>:k}], f7(*a, 4,5,6, k: :k)) + end end class TestKeywordArgumentsSymProcRefinements < Test::Unit::TestCase From 644336eef54c8ee2aeb7fd6c55fcd5620bcfa5b4 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sun, 22 Dec 2019 05:20:08 +0900 Subject: [PATCH 036/878] add a NEWS entry for [Feature #16163] --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 5d4097dd353552..b56875eea5e769 100644 --- a/NEWS +++ b/NEWS @@ -703,6 +703,11 @@ JIT:: * Default value of +--jit-min-calls+ is changed from 5 to 10,000 +RubyVM::InstructionSequence:: + + * RubyVM::InstructionSequence#to_binary method generate compiled binary. + The binary size is reduced. [Feature #16163] + === Miscellaneous changes * Support for IA64 architecture has been removed. Hardware for testing was From fa1bf8ab37caad5fa0679adc0ecb8f6f5cec2eea Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 19 Dec 2019 23:13:21 +0900 Subject: [PATCH 037/878] [ruby/reline] Support Ctrl+right as em_next_word, and Ctrl+left as ed_prev_word https://github.com/ruby/reline/commit/e98ad3b486 --- lib/reline/ansi.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 376439dc74e55c..4862cfb13f91bd 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -11,6 +11,8 @@ class Reline::ANSI [27, 91, 70] => :ed_move_to_end, # End [27, 32] => :em_set_mark, # M- [24, 24] => :em_exchange_mark, # C-x C-x TODO also add Windows + [27, 91, 49, 59, 53, 67] => :em_next_word, # Ctrl+→ + [27, 91, 49, 59, 53, 68] => :ed_prev_word, # Ctrl+← } @@input = STDIN From cf59e1476d01be27dc88cbee5f6c6cf87f007043 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sun, 22 Dec 2019 06:28:13 +0900 Subject: [PATCH 038/878] fix a thread test. * Use Queue for synchronization. * Don't use `sleep 0.2` and use `th.join` because created thread can raise an exception after 0.2 seconds. --- test/ruby/test_thread.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index bf61a28f4d9fdc..f8127d878609b3 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -795,14 +795,15 @@ def test_handle_interrupt_with_break end def test_handle_interrupt_blocking - r=:ng - e=Class.new(Exception) + r = nil + q = Queue.new + e = Class.new(Exception) th_s = Thread.current - th = Thread.start{ + th = Thread.start { assert_raise(RuntimeError) { Thread.handle_interrupt(Object => :on_blocking){ begin - Thread.pass until r == :wait + q.pop Thread.current.raise RuntimeError, "will raise in sleep" r = :ok sleep @@ -812,9 +813,8 @@ def test_handle_interrupt_blocking } } } - assert_raise(e) {r = :wait; sleep 0.2} - th.join - assert_equal(:ok,r) + assert_raise(e) {q << true; th.join} + assert_equal(:ok, r) end def test_handle_interrupt_and_io From efd4a11ada731ce18f5eb1500c76f77b4d0f313f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 11:46:09 +0900 Subject: [PATCH 039/878] Support multibyte input --- lib/reline/ansi.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 4862cfb13f91bd..6246a27107031c 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -30,7 +30,8 @@ def self.getc unless @@buf.empty? return @@buf.shift end - @@input.getbyte + c = @@input.getbyte + (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c end def self.ungetc(c) From ced4c5dace63dcb5aabe4d9c480e02e7581b8816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Sun, 22 Dec 2019 11:40:07 +0900 Subject: [PATCH 040/878] add NEWS about cache improvement [ci skip] --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index b56875eea5e769..cf0afb03d9bd1d 100644 --- a/NEWS +++ b/NEWS @@ -729,3 +729,7 @@ RubyVM::InstructionSequence:: * Support built-in methods in Ruby with `__builtin_` syntax. [Feature #16254] Some methods are defined in *.rb (such as trace_point.rb). For example, it is easy to define a method which accepts keyword arguments. + +* Per-call-site method cache, which has been there since around 1.9, was + improved: cache hit rate raised from 89% to 94%. + https://github.com/ruby/ruby/pull/2583 From 58527a79263c6572bd4f97d0a0e0359c0ace6f3c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 13:52:59 +0900 Subject: [PATCH 041/878] [ruby/io-console] bump up to 0.5.3 --- ext/io/console/io-console.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index b592d54c92f81d..fac9bff9b77018 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -1,5 +1,5 @@ # -*- ruby -*- -_VERSION = "0.5.2" +_VERSION = "0.5.3" date = %w$Date:: $[1] Gem::Specification.new do |s| From d2ac6d4d9f57b34eeb94bd6302b54a632051ce64 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 14:45:42 +0900 Subject: [PATCH 042/878] Manage deprecation warning by the flag --- compile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compile.c b/compile.c index c19112c85303a0..56b91bfb461199 100644 --- a/compile.c +++ b/compile.c @@ -7108,8 +7108,10 @@ check_yield_place(const rb_iseq_t *iseq, int line) return FALSE; case ISEQ_TYPE_CLASS: file = rb_iseq_path(iseq); - rb_compile_warn(RSTRING_PTR(file), line, - "`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]"); + if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) { + rb_compile_warn(RSTRING_PTR(file), line, + "`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]"); + } return TRUE; default: return TRUE; From d76c8cfecdaa2960153b5b24ccd0d61f9af60abd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 15:18:22 +0900 Subject: [PATCH 043/878] RDoc of Warning.[] and .[]= [Feature #16345] [ci skip] --- error.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/error.c b/error.c index a70d0214849cc0..6c222115e52931 100644 --- a/error.c +++ b/error.c @@ -166,6 +166,23 @@ rb_warning_category_enabled_p(rb_warning_category_t category) return !(warning_disabled_categories & (1U << category)); } +/* + * call-seq + * Warning[category] -> true or false + * + * Returns the flag to show the warning messages for +category+. + * Supported categories are: + * + * +:deprecated+ :: deprecation warnings + * * assignemnt of non-nil value to $, and $; + * * keyword arguments + * * proc/lambda without block + * etc. + * + * +:experimental+ :: experimental features + * * Pattern matching + */ + static VALUE rb_warning_s_aref(VALUE mod, VALUE category) { @@ -175,6 +192,14 @@ rb_warning_s_aref(VALUE mod, VALUE category) return Qfalse; } +/* + * call-seq + * Warning[category] = flag -> flag + * + * Sets the warning flags for +category+. + * See Warning.[] for the categories. + */ + static VALUE rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag) { From 7c33ee5ddfafe737add2a7f4c4975108f9196dbd Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 22 Dec 2019 11:39:22 +0100 Subject: [PATCH 044/878] Move version guard outside to make it clear the method was added in Ruby 2.5 --- spec/ruby/core/thread/to_s_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/ruby/core/thread/to_s_spec.rb b/spec/ruby/core/thread/to_s_spec.rb index 942d2716cff9b9..85976177dc7a99 100644 --- a/spec/ruby/core/thread/to_s_spec.rb +++ b/spec/ruby/core/thread/to_s_spec.rb @@ -1,8 +1,8 @@ require_relative '../../spec_helper' require_relative 'shared/to_s' -describe "Thread#to_s" do - ruby_version_is "2.5" do +ruby_version_is "2.5" do + describe "Thread#to_s" do it_behaves_like :thread_to_s, :to_s end end From cc87037f1c5a143af8089555e704505fcf0b2879 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 22:49:17 +0900 Subject: [PATCH 045/878] Fixed misspellings Fixed misspellings reported at [Bug #16437], missed and a new typo. --- debug_counter.h | 2 +- enc/trans/JIS/JISX0212%UCS.src | 2 +- enc/trans/JIS/UCS%JISX0212.src | 2 +- error.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debug_counter.h b/debug_counter.h index a549120566aa5e..ee00d9df4be49d 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -31,7 +31,7 @@ * * mc_miss_by_refine: ... by ment being refined. * * mc_miss_by_visi: ... by visibility change. * * mc_miss_spurious: spurious inline mc misshit. - * * mc_miss_reuse_call: count of resue of cc->call. + * * mc_miss_reuse_call: count of reuse of cc->call. */ RB_DEBUG_COUNTER(mc_inline_hit) RB_DEBUG_COUNTER(mc_inline_miss) diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src index aa51257b990a95..0e1ab4c9b9516d 100644 --- a/enc/trans/JIS/JISX0212%UCS.src +++ b/enc/trans/JIS/JISX0212%UCS.src @@ -67,7 +67,7 @@ BEGIN_MAP # # However, JIS X 0212 maintains the distinction between # the lowercase forms of these two elements at 0x2942 and 0x2943. -# Given the structre of these JIS encodings, it is clear that +# Given the structure of these JIS encodings, it is clear that # 0x2922 and 0x2942 are intended to be a capital/small pair. # Consequently, in the Unicode mapping, 0x2922 is treated as # LATIN CAPITAL LETTER D WITH STROKE. diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src index 65383a1c9f6501..c7711c8ac0cc1d 100644 --- a/enc/trans/JIS/UCS%JISX0212.src +++ b/enc/trans/JIS/UCS%JISX0212.src @@ -67,7 +67,7 @@ BEGIN_MAP # # However, JIS X 0212 maintains the distinction between # the lowercase forms of these two elements at 0x2942 and 0x2943. -# Given the structre of these JIS encodings, it is clear that +# Given the structure of these JIS encodings, it is clear that # 0x2922 and 0x2942 are intended to be a capital/small pair. # Consequently, in the Unicode mapping, 0x2922 is treated as # LATIN CAPITAL LETTER D WITH STROKE. diff --git a/error.c b/error.c index 6c222115e52931..bc5539c328043b 100644 --- a/error.c +++ b/error.c @@ -174,7 +174,7 @@ rb_warning_category_enabled_p(rb_warning_category_t category) * Supported categories are: * * +:deprecated+ :: deprecation warnings - * * assignemnt of non-nil value to $, and $; + * * assignment of non-nil value to $, and $; * * keyword arguments * * proc/lambda without block * etc. From 9654241d5d5717b7cd6ddedb6c192e971f9d473a Mon Sep 17 00:00:00 2001 From: QuestionDriven Date: Tue, 17 Dec 2019 07:05:17 +0000 Subject: [PATCH 046/878] [Doc] Fix wrong example in Encoding.aliases --- encoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/encoding.c b/encoding.c index 50093df601658c..ebc2852f064cd4 100644 --- a/encoding.c +++ b/encoding.c @@ -1699,8 +1699,8 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg) * Returns the hash of available encoding alias and original encoding name. * * Encoding.aliases - * #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII", - * "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"} + * #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1968"=>"US-ASCII", + * "SJIS"=>"Windows-31J", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"} * */ From 54be15f3256fd2dbb0d5d7962e9dfac2b87c797b Mon Sep 17 00:00:00 2001 From: QuestionDriven Date: Tue, 17 Dec 2019 07:11:02 +0000 Subject: [PATCH 047/878] [Doc] Fix sample in Encoding#names --- encoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encoding.c b/encoding.c index ebc2852f064cd4..69015cc8fda092 100644 --- a/encoding.c +++ b/encoding.c @@ -1174,7 +1174,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args) * * Returns the list of name and aliases of the encoding. * - * Encoding::WINDOWS_31J.names #=> ["Windows-31J", "CP932", "csWindows31J"] + * Encoding::WINDOWS_31J.names #=> ["Windows-31J", "CP932", "csWindows31J", "SJIS", "PCK"] */ static VALUE enc_names(VALUE self) From 890c834ec6bb03fab4fee6f5b14f99660a64d207 Mon Sep 17 00:00:00 2001 From: BurdetteLamar Date: Mon, 16 Dec 2019 16:58:53 -0600 Subject: [PATCH 048/878] Enhancements for ENV doc --- hash.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/hash.c b/hash.c index 79f69f63be55f4..82383e9a93fb95 100644 --- a/hash.c +++ b/hash.c @@ -5217,9 +5217,17 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj) * ENV.each_key { |name| block } -> ENV * ENV.each_key -> Enumerator * - * Yields each environment variable name. - * - * An Enumerator is returned if no block is given. + * Yields each environment variable name: + * ENV.replace('foo' => '0', 'bar' => '1') # => ENV + * names = [] + * ENV.each_key { |name| names.push(name) } # => ENV + * names # => ["bar", "foo"] + * + * Returns an Enumerator if no block given: + * e = ENV.each_key # => #"1", "foo"=>"0"}:each_key> + * names = [] + * e.each { |name| names.push(name) } # => ENV + * names # => ["bar", "foo"] */ static VALUE env_each_key(VALUE ehash) @@ -5258,9 +5266,16 @@ env_values(void) * call-seq: * ENV.values -> Array * - * Returns every environment variable value as an Array + * Returns all environment variable values in an Array: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.values # => ['1', '0'] + * The order of the values is OS-dependent. + * See {About Ordering}[#class-ENV-label-About+Ordering]. + * + * Returns the empty Array if ENV is empty: + * ENV.clear + * ENV.values # => [] */ - static VALUE env_f_values(VALUE _) { @@ -5272,9 +5287,17 @@ env_f_values(VALUE _) * ENV.each_value { |value| block } -> ENV * ENV.each_value -> Enumerator * - * Yields each environment variable +value+. - * - * An Enumerator is returned if no block was given. + * Yields each environment variable value: + * ENV.replace('foo' => '0', 'bar' => '1') # => ENV + * values = [] + * ENV.each_value { |value| values.push(value) } # => ENV + * values # => ["1", "0"] + * + * Returns an Enumerator if no block given: + * e = ENV.each_value # => #"1", "foo"=>"0"}:each_value> + * values = [] + * e.each { |value| values.push(value) } # => ENV + * values # => ["1", "0"] */ static VALUE env_each_value(VALUE ehash) @@ -5297,9 +5320,16 @@ env_each_value(VALUE ehash) * ENV.each_pair { |name, value| block } -> ENV * ENV.each_pair -> Enumerator * - * Yields each environment variable +name+ and +value+. + * Yields each environment variable name and its value as a 2-element Array: + * h = {} + * ENV.each_pair { |name, value| h[name] = value } # => ENV + * h # => {"bar"=>"1", "foo"=>"0"} * - * If no block is given an Enumerator is returned. + * Returns an Enumerator if no block given: + * h = {} + * e = ENV.each_pair # => #"1", "foo"=>"0"}:each_pair> + * e.each { |name, value| h[name] = value } # => ENV + * h # => {"bar"=>"1", "foo"=>"0"} */ static VALUE env_each_pair(VALUE ehash) @@ -5340,9 +5370,21 @@ env_each_pair(VALUE ehash) * ENV.reject! { |name, value| block } -> ENV or nil * ENV.reject! -> Enumerator * - * Equivalent to ENV.delete_if but returns +nil+ if no changes were made. - * - * Returns an Enumerator if no block was given. + * Similar to ENV.delete_if, but returns +nil+ if no changes were made. + * + * Deletes each environment variable for which the block returns a truthy value, + * returning ENV (if any deletions) or +nil+ (if not): + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.reject! { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"foo"=>"0"} + * ENV.reject! { |name, value| name.start_with?('b') } # => nil + * + * Returns an Enumerator if no block given: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * e = ENV.reject! # => #"1", "baz"=>"2", "foo"=>"0"}:reject!> + * e.each { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"foo"=>"0"} + * e.each { |name, value| name.start_with?('b') } # => nil */ static VALUE env_reject_bang(VALUE ehash) From 03b983d54c17615e36d56d2937a685fc8c3f2cdb Mon Sep 17 00:00:00 2001 From: zverok Date: Fri, 20 Dec 2019 22:51:22 +0200 Subject: [PATCH 049/878] Document numbered block parameters --- proc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/proc.c b/proc.c index b4899d2f1f64f0..2e5654a6879d96 100644 --- a/proc.c +++ b/proc.c @@ -3819,6 +3819,56 @@ proc_ruby2_keywords(VALUE procval) * Since +return+ and +break+ exits the block itself in lambdas, * lambdas cannot be orphaned. * + * == Numbered parameters + * + * Numbered parameters are implicitly defined block parameters intended to + * simplify writing short blocks: + * + * # Explicit parameter: + * %w[test me please].each { |str| puts str.upcase } # prints TEST, ME, PLEASE + * (1..5).map { |i| i**2 } # => [1, 4, 9, 16, 25] + * + * # Implicit parameter: + * %w[test me please].each { puts _1.upcase } # prints TEST, ME, PLEASE + * (1..5).map { _1**2 } # => [1, 4, 9, 16, 25] + * + * Parameter names from +_1+ to +_9+ are supported: + * + * [10, 20, 30].zip([40, 50, 60], [70, 80, 90]).map { _1 + _2 + _3 } + * # => [120, 150, 180] + * + * Though, it is advised to resort to them wisely, probably limiting + * yourself to +_1+ and +_2+, and to one-line blocks. + * + * Numbered parameters can't be used together with explicitly named + * ones: + * + * [10, 20, 30].map { |x| _1**2 } + * # SyntaxError (ordinary parameter is defined) + * + * To avoid conflicts, naming local variables or method + * arguments +_1+, +_2+ and so on, causes a warning. + * + * _1 = 'test' + * # warning: `_1' is reserved as numbered parameter + * + * Using implicit numbered parameters affects block's arity: + * + * p = proc { _1 + _2 } + * l = lambda { _1 + _2 } + * p.parameters # => [[:opt, :_1], [:opt, :_2]] + * p.arity # => 2 + * l.parameters # => [[:req, :_1], [:req, :_2]] + * l.arity # => 2 + * + * Blocks with numbered parameters can't be nested: + * + * %w[test me].each { _1.each_char { p _1 } } + * # SyntaxError (numbered parameter is already used in outer block here) + * # %w[test me].each { _1.each_char { p _1 } } + * # ^~ + * + * Numbered parameter was introduced in Ruby 2.7. */ From e568bb5649a93c60aaa51c1e5308054079815bcc Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 22:17:35 +0200 Subject: [PATCH 050/878] Update private visibility explanation --- doc/syntax/modules_and_classes.rdoc | 38 ++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc index 8fc84d522a48bc..6122f6e08e85af 100644 --- a/doc/syntax/modules_and_classes.rdoc +++ b/doc/syntax/modules_and_classes.rdoc @@ -190,9 +190,41 @@ Here is an example: b.n b #=> 1 -- m called on defining class a.n b # raises NoMethodError A is not a subclass of B -The third visibility is +private+. A private method may not be called with a -receiver, not even if it equals +self+. If a private method is called with a -receiver other than a literal +self+ a NoMethodError will be raised. +The third visibility is +private+. A private method may only be called from +inside the owner class without a receiver, or with a literal +self+ +as a receiver. If a private method is called with a +receiver other than a literal +self+, a NoMethodError will be raised. + + class A + def without + m + end + + def with_self + self.m + end + + def with_other + A.new.m + end + + def with_renamed + copy = self + copy.m + end + + def m + 1 + end + + private :m + end + + a = A.new + a.without #=> 1 + a.with_self #=> 1 + a.with_other # NoMethodError (private method `m' called for #) + a.with_renamed # NoMethodError (private method `m' called for #) === +alias+ and +undef+ From d78fcfb7ab351fd4861e42985db34e9bda3509a7 Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 22:21:20 +0200 Subject: [PATCH 051/878] Fix FrozenError#receiver and #initialize docs --- error.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/error.c b/error.c index bc5539c328043b..9557d8552bfbb8 100644 --- a/error.c +++ b/error.c @@ -1482,7 +1482,7 @@ err_init_recv(VALUE exc, VALUE recv) * method. * * a = [].freeze - * raise FrozenError.new("can't modify frozen array", a) + * raise FrozenError.new("can't modify frozen array", receiver: a) */ static VALUE @@ -1500,6 +1500,7 @@ frozen_err_initialize(int argc, VALUE *argv, VALUE self) } /* + * Document-method: FrozenError#receiver * call-seq: * frozen_error.receiver -> object * From 5fa9c2eeb04a2e44a2a028d933bc95f219a6a282 Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 22:31:30 +0200 Subject: [PATCH 052/878] Actualize Method#inspect docs --- proc.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/proc.c b/proc.c index 2e5654a6879d96..73d9464ca0e1a8 100644 --- a/proc.c +++ b/proc.c @@ -2766,11 +2766,30 @@ rb_method_parameters(VALUE method) * * Returns a human-readable description of the underlying method. * - * "cat".method(:count).inspect #=> "#" - * (1..3).method(:map).inspect #=> "#" + * "cat".method(:count).inspect #=> "#" + * (1..3).method(:map).inspect #=> "#" * * In the latter case, the method description includes the "owner" of the * original method (+Enumerable+ module, which is included into +Range+). + * + * +inspect+ also provides, when possible, method argument names (call + * sequence) and source location. + * + * require 'net/http' + * Net::HTTP.method(:get).inspect + * #=> "#/lib/ruby/2.7.0/net/http.rb:457>" + * + * ... in argument definition means argument is optional (has + * some default value). + * + * For methods defined in C (language core and extensions), location and + * argument names can't be extracted, and only generic information is provided + * in form of * (any number of arguments) or _ (some + * positional argument). + * + * "cat".method(:count).inspect #=> "#" + * "cat".method(:+).inspect #=> "#"" + */ static VALUE From 4988843188c7a1666b11e1390acd7b991941c3a8 Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 22:37:35 +0200 Subject: [PATCH 053/878] Actualize Time#inspect docs --- time.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/time.c b/time.c index 1016537501a4df..8c5422df0b0d86 100644 --- a/time.c +++ b/time.c @@ -4091,14 +4091,15 @@ time_to_s(VALUE time) * call-seq: * time.inspect -> string * - * Returns a detailed string representing _time_. + * Returns a detailed string representing _time_. Inlike to_s, preserves + * nanoseconds in representation for easier debugging. * * t = Time.now - * t.to_s #=> "2012-11-10 18:16:12 +0100" - * t.strftime "%Y-%m-%d %H:%M:%S %z" #=> "2012-11-10 18:16:12 +0100" + * t.inspect #=> "2012-11-10 18:16:12.261257655 +0100" + * t.strftime "%Y-%m-%d %H:%M:%S.%N %z" #=> "2012-11-10 18:16:12.261257655 +0100" * - * t.utc.to_s #=> "2012-11-10 17:16:12 UTC" - * t.strftime "%Y-%m-%d %H:%M:%S UTC" #=> "2012-11-10 17:16:12 UTC" + * t.utc.inspect #=> "2012-11-10 17:16:12.261257655 UTC" + * t.strftime "%Y-%m-%d %H:%M:%S.%N UTC" #=> "2012-11-10 17:16:12.261257655 UTC" */ static VALUE From 5a0102cb615f27f2daef8af6d9ae996926b2d167 Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 22:58:14 +0200 Subject: [PATCH 054/878] Enhance Range docs * Change === docs to mention it uses cover? * Add different example to === docs to showcase behavior better * Change include? docs to mention cover? and clarify the difference --- range.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/range.c b/range.c index b4fab53eac06b9..fe956197c6bd53 100644 --- a/range.c +++ b/range.c @@ -1373,19 +1373,26 @@ static VALUE range_include_internal(VALUE range, VALUE val, int string_use_cover * call-seq: * rng === obj -> true or false * - * Returns true if +obj+ is an element of the range, - * false otherwise. Conveniently, === is the - * comparison operator used by case statements. + * Returns true if +obj+ is between begin and end of range, + * false otherwise (same as #cover?). Conveniently, + * === is the comparison operator used by case + * statements. * * case 79 - * when 1..50 then print "low\n" - * when 51..75 then print "medium\n" - * when 76..100 then print "high\n" + * when 1..50 then puts "low" + * when 51..75 then puts "medium" + * when 76..100 then puts "high" * end + * # Prints "high" * - * produces: + * case "2.6.5" + * when ..."2.4" then puts "EOL" + * when "2.4"..."2.5" then puts "maintenance" + * when "2.5"..."2.7" then puts "stable" + * when "2.7".. then puts "upcoming" + * end + * # Prints "stable" * - * high */ static VALUE @@ -1403,12 +1410,19 @@ range_eqq(VALUE range, VALUE val) * rng.include?(obj) -> true or false * * Returns true if +obj+ is an element of - * the range, false otherwise. If begin and end are - * numeric, comparison is done according to the magnitude of the values. + * the range, false otherwise. * * ("a".."z").include?("g") #=> true * ("a".."z").include?("A") #=> false * ("a".."z").include?("cc") #=> false + * + * If you need to ensure +obj+ is between +begin+ and +end+, use #cover? + * + * ("a".."z").cover?("cc") #=> true + * + * If begin and end are numeric, #include? behaves like #cover? + * + * (1..3).include?(1.5) # => true */ static VALUE From d339de9d1a11923cd6d435d995ee479d08791720 Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 23:05:45 +0200 Subject: [PATCH 055/878] Enhance docs for Module#deprecate_constant --- variable.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/variable.c b/variable.c index 4d5c9a6f54e20e..42c4cb7cd4611d 100644 --- a/variable.c +++ b/variable.c @@ -2992,7 +2992,19 @@ rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj) * call-seq: * mod.deprecate_constant(symbol, ...) => mod * - * Makes a list of existing constants deprecated. + * Makes a list of existing constants deprecated. Attempt + * to refer to them will produce a warning. + * + * module HTTP + * NotFound = Exception.new + * NOT_FOUND = NotFound # previous version of the library used this name + * + * deprecate_constant :NOT_FOUND + * end + * + * HTTP::NOT_FOUND + * # warning: constant HTTP::NOT_FOUND is deprecated + * */ VALUE From 1bf8d5e9797f6304b2e27cb7f42d467f84de0ff4 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 23 Dec 2019 00:16:51 +0900 Subject: [PATCH 056/878] Changed behavior on windows platforms too [ci skip] at 61aff0cd189e67fa6f2565639ad0128fa33b88fc [Bug #15267] --- NEWS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cf0afb03d9bd1d..ac71d7dafdb5da 100644 --- a/NEWS +++ b/NEWS @@ -308,8 +308,7 @@ File:: Modified method:: - * File.extname now returns a dot string at a name ending with a dot on - non-Windows platforms. [Bug #15267] + * File.extname now returns a dot string at a name ending with a dot. [Bug #15267] File.extname("foo.") #=> "." From 3a18e43caac4ce31702c9b79de3b6e8af05ef173 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 23 Dec 2019 00:17:25 +0900 Subject: [PATCH 057/878] * 2019-12-23 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index f2868a2f6b609b..1c2507479d45af 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" From 679bc4f9cb6a5471df903436c6240ca2157986dd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 8 Sep 2019 21:04:46 +0900 Subject: [PATCH 058/878] [ruby/reline] Use IO#raw to read one byte https://github.com/ruby/reline/commit/be17740e82 --- lib/reline/ansi.rb | 23 ++++------------------- lib/reline/reline.gemspec | 1 + 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 6246a27107031c..8d83da854ccd49 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -1,3 +1,5 @@ +require 'io/console' + class Reline::ANSI RAW_KEYSTROKE_CONFIG = { [27, 91, 65] => :ed_prev_history, # ↑ @@ -30,7 +32,7 @@ def self.getc unless @@buf.empty? return @@buf.shift end - c = @@input.getbyte + c = @@input.raw(intr: true, &:getbyte) (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c end @@ -127,29 +129,12 @@ def self.set_winch_handler(&handler) def self.prep retrieve_keybuffer int_handle = Signal.trap('INT', 'IGNORE') - begin - otio = IO.popen(%w[stty -g], in: @@input, &:read).chomp - rescue ArgumentError - else - setting = %w'-echo -icrnl cbreak -ixoff -iexten' - stty = IO.popen(%w[stty -a], in: @@input, &:read) - if /-parenb\b/ =~ stty - setting << 'pass8' - end - system("stty", *setting, in: @@input) - end Signal.trap('INT', int_handle) - otio + nil end def self.deprep(otio) int_handle = Signal.trap('INT', 'IGNORE') - if otio - begin - system("stty #{otio}", in: @@input, err: File::NULL) - rescue ArgumentError - end - end Signal.trap('INT', int_handle) Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler end diff --git a/lib/reline/reline.gemspec b/lib/reline/reline.gemspec index d0b12ed36dddc5..3ced4b8488c174 100644 --- a/lib/reline/reline.gemspec +++ b/lib/reline/reline.gemspec @@ -19,6 +19,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new('>= 2.5') + spec.add_dependency 'io-console', '~> 0.5' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake' spec.add_development_dependency 'test-unit' From 7c37f2cb1ad248a1db327f3522a8e3ffa5c5412f Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 22 Dec 2019 19:46:24 +0100 Subject: [PATCH 059/878] Some fixes in Enumerator::Lazy docs * fix list in #flat_map * fix wrong indentation in #filter_map and #with_index * other small fixes --- enumerator.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/enumerator.c b/enumerator.c index 73bca61df2f06d..0aa395a8baf971 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1736,7 +1736,7 @@ lazy_generator_init(VALUE enumerator, VALUE procs) /* * call-seq: - * Lazy.new(obj, size=nil) { |yielder, *values| ... } + * Lazy.new(obj, size=nil) { |yielder, *values| block } * * Creates a new Lazy enumerator. When the enumerator is actually enumerated * (e.g. by calling #force), +obj+ will be enumerated and each value passed @@ -1899,10 +1899,10 @@ lazy_to_enum_i(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator /* * call-seq: - * lzy.to_enum(method = :each, *args) -> lazy_enum - * lzy.enum_for(method = :each, *args) -> lazy_enum - * lzy.to_enum(method = :each, *args) {|*args| block} -> lazy_enum - * lzy.enum_for(method = :each, *args){|*args| block} -> lazy_enum + * lzy.to_enum(method = :each, *args) -> lazy_enum + * lzy.enum_for(method = :each, *args) -> lazy_enum + * lzy.to_enum(method = :each, *args) {|*args| block } -> lazy_enum + * lzy.enum_for(method = :each, *args) {|*args| block } -> lazy_enum * * Similar to Object#to_enum, except it returns a lazy enumerator. * This makes it easy to define Enumerable methods that will @@ -2080,19 +2080,19 @@ lazy_flat_map_proc(RB_BLOCK_CALL_FUNC_ARGLIST(val, m)) * lazy.flat_map { |obj| block } -> a_lazy_enumerator * * Returns a new lazy enumerator with the concatenated results of running - * block once for every element in lazy. + * +block+ once for every element in the lazy enumerator. * * ["foo", "bar"].lazy.flat_map {|i| i.each_char.lazy}.force * #=> ["f", "o", "o", "b", "a", "r"] * - * A value x returned by block is decomposed if either of + * A value +x+ returned by +block+ is decomposed if either of * the following conditions is true: * - * * a) x responds to both each and force, which means that - * x is a lazy enumerator. - * * b) x is an array or responds to to_ary. + * * +x+ responds to both each and force, which means that + * +x+ is a lazy enumerator. + * * +x+ is an array or responds to to_ary. * - * Otherwise, x is contained as-is in the return value. + * Otherwise, +x+ is contained as-is in the return value. * * [{a:1}, {b:2}].lazy.flat_map {|i| i}.force * #=> [{:a=>1}, {:b=>2}] @@ -2159,7 +2159,8 @@ static const lazyenum_funcs lazy_filter_map_funcs = { * * Like Enumerable#filter_map, but chains operation to be lazy-evaluated. * - * (1..).lazy.filter_map { |i| i * 2 if i.even? }.first(5) #=> [4, 8, 12, 16, 20] + * (1..).lazy.filter_map { |i| i * 2 if i.even? }.first(5) + * #=> [4, 8, 12, 16, 20] */ static VALUE @@ -2631,8 +2632,8 @@ static const lazyenum_funcs lazy_uniq_funcs = { /* * call-seq: - * lazy.uniq -> lazy_enumerator - * lazy.uniq { |item| ... } -> lazy_enumerator + * lazy.uniq -> lazy_enumerator + * lazy.uniq { |item| block } -> lazy_enumerator * * Like Enumerable#uniq, but chains operation to be lazy-evaluated. */ @@ -2674,20 +2675,20 @@ static const lazyenum_funcs lazy_with_index_funcs = { }; /* - * call-seq: - * lazy.with_index(offset = 0) {|(*args), idx| ... } - * lazy.with_index(offset = 0) + * call-seq: + * lazy.with_index(offset = 0) {|(*args), idx| block } + * lazy.with_index(offset = 0) * - * If a block is given, iterates the given block for each element - * with an index, which starts from +offset+, and returns a - * lazy enumerator that yields the same values (without the index). + * If a block is given, iterates the given block for each element + * with an index, which starts from +offset+, and returns a + * lazy enumerator that yields the same values (without the index). * - * If a block is not given, returns a new lazy enumerator that - * includes the index, starting from +offset+. + * If a block is not given, returns a new lazy enumerator that + * includes the index, starting from +offset+. * * +offset+:: the starting index to use * - * see Enumerator#with_index. + * See Enumerator#with_index. */ static VALUE lazy_with_index(int argc, VALUE *argv, VALUE obj) From bb05cdcd78b3e3d54f0ad9afc01de383ed33dc1c Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 22 Dec 2019 22:36:14 +0100 Subject: [PATCH 060/878] [DOC] Improve documentation for Enumerable#tally --- enum.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/enum.c b/enum.c index db5f4d3b6fe88b..cc77964ff93137 100644 --- a/enum.c +++ b/enum.c @@ -1002,11 +1002,11 @@ tally_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) * call-seq: * enum.tally -> a_hash * - * Tallys the collection. Returns a hash where the keys are the - * elements and the values are numbers of elements in the collection - * that correspond to the key. + * Tallies the collection, i.e., counts the occurrences of each element. + * Returns a hash with the elements of the collection as keys and the + * corresponding counts as values. * - * ["a", "b", "c", "b"].tally #=> {"a"=>1, "b"=>2, "c"=>1} + * ["a", "b", "c", "b"].tally #=> {"a"=>1, "b"=>2, "c"=>1} */ static VALUE From ade6543f4cf7dfb1ab4585a1bfca20f3d64d5add Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Sun, 22 Dec 2019 18:21:13 -0500 Subject: [PATCH 061/878] Adjust sentence in doc [ci skip] --- proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proc.c b/proc.c index 73d9464ca0e1a8..01890b11bb5790 100644 --- a/proc.c +++ b/proc.c @@ -3887,7 +3887,7 @@ proc_ruby2_keywords(VALUE procval) * # %w[test me].each { _1.each_char { p _1 } } * # ^~ * - * Numbered parameter was introduced in Ruby 2.7. + * Numbered parameters were introduced in Ruby 2.7. */ From c1bd1bf27236b33965dd92c1b2297edc91327cfb Mon Sep 17 00:00:00 2001 From: zverok Date: Fri, 13 Dec 2019 18:59:23 +0200 Subject: [PATCH 062/878] Document Module#const_source_location --- object.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/object.c b/object.c index 4d2d006c792e55..0bb0e0f8e8fc0c 100644 --- a/object.c +++ b/object.c @@ -2706,6 +2706,53 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) return Qtrue; } +/* + * call-seq: + * mod.const_source_location(sym, inherit=true) -> [String, Integer] + * mod.const_source_location(str, inherit=true) -> [String, Integer] + * + * Returns the Ruby source filename and line number containing first definition + * of constant specified. If the named constant is not found, +nil+ is returned. + * If the constant is found, but its source location can not be extracted + * (constant is defined in C code), empty array is returned. + * + * _inherit_ specifies whether to lookup in mod.ancestors (+true+ + * by default). + * + * # test.rb: + * class A + * C1 = 1 + * end + * + * module M + * C2 = 2 + * end + * + * class B < A + * include M + * C3 = 3 + * end + * + * class A # continuation of A definition + * end + * + * p B.const_source_location('C3') # => ["test.rb", 11] + * p B.const_source_location('C2') # => ["test.rb", 6] + * p B.const_source_location('C1') # => ["test.rb", 2] + * + * p B.const_source_location('C2', false) # => nil -- don't lookup in ancestors + * + * p Object.const_source_location('B') # => ["test.rb", 9] + * p Object.const_source_location('A') # => ["test.rb", 1] -- note it is first entry, not "continuation" + * + * p B.const_source_location('A') # => ["test.rb", 1] -- because Object is in ancestors + * p M.const_source_location('A') # => ["test.rb", 1] -- Object is not ancestor, but additionally checked for modules + * + * p Object.const_source_location('A::C1') # => ["test.rb", 2] -- nesting is supported + * p Object.const_source_location('String') # => [] -- constant is defined in C code + * + * + */ static VALUE rb_mod_const_source_location(int argc, VALUE *argv, VALUE mod) { From a4b99f97642d31fc8ddd537155ff6cf61be6a43c Mon Sep 17 00:00:00 2001 From: zverok Date: Sun, 22 Dec 2019 22:56:44 +0200 Subject: [PATCH 063/878] Fix typos of previous docs PR In #2612 I made two typos (extra ,, and copy-pasted same line of code instead of showing two different ones), fixing them. --- doc/syntax/exceptions.rdoc | 2 +- enumerator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/syntax/exceptions.rdoc b/doc/syntax/exceptions.rdoc index 7fd58c83e8b2ff..31e2f0175c5f7e 100644 --- a/doc/syntax/exceptions.rdoc +++ b/doc/syntax/exceptions.rdoc @@ -17,7 +17,7 @@ wish to limit the scope of rescued exceptions: # ... end -The same is true for, +class+, +module+, and +block+: +The same is true for a +class+, +module+, and +block+: [0, 1, 2].map do |i| 10 / i diff --git a/enumerator.c b/enumerator.c index 0aa395a8baf971..e8ee9e57375238 100644 --- a/enumerator.c +++ b/enumerator.c @@ -316,7 +316,7 @@ proc_entry_ptr(VALUE proc_entry) * some_method(a.to_enum) * * # String#split in block form is more memory-effective: - * very_large_string.to_enum(:split, "|") { |chunk| return chunk if chunk.include?('DATE') } + * very_large_string.split("|") { |chunk| return chunk if chunk.include?('DATE') } * # This could be rewritten more idiomatically with to_enum: * very_large_string.to_enum(:split, "|").lazy.grep(/DATE/).first * From f85e8d2a8b2a37740334db4fd92ef820f05ddbc5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 23 Dec 2019 08:31:46 +0900 Subject: [PATCH 064/878] Fixed misspellings Fixed misspellings reported at [Bug #16437] --- ruby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.c b/ruby.c index e0ef3e946e2428..303fc3de663c00 100644 --- a/ruby.c +++ b/ruby.c @@ -306,7 +306,7 @@ usage(const char *name, int help) static const struct message mjit_options[] = { M("--jit-warnings", "", "Enable printing JIT warnings"), M("--jit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), - M("--jit-wait", "", "Wait until JIT compilation is finished everytime (for testing)"), + M("--jit-wait", "", "Wait until JIT compilation is finished every time (for testing)"), M("--jit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"), M("--jit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"), M("--jit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 100)"), From f156f70b3192ddab41e432e743936a09a5aaae09 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 23 Dec 2019 09:02:49 +0900 Subject: [PATCH 065/878] Revert "Fixed misspellings" This reverts commit f85e8d2a8b2a37740334db4fd92ef820f05ddbc5. It violated the limit of width (> 80) and caused the test failure --- ruby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.c b/ruby.c index 303fc3de663c00..e0ef3e946e2428 100644 --- a/ruby.c +++ b/ruby.c @@ -306,7 +306,7 @@ usage(const char *name, int help) static const struct message mjit_options[] = { M("--jit-warnings", "", "Enable printing JIT warnings"), M("--jit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), - M("--jit-wait", "", "Wait until JIT compilation is finished every time (for testing)"), + M("--jit-wait", "", "Wait until JIT compilation is finished everytime (for testing)"), M("--jit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"), M("--jit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"), M("--jit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 100)"), From 4de2297d74fbc0a0e69ac8bcc2aad5b192fd11b6 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 22 Dec 2019 16:07:07 -0800 Subject: [PATCH 066/878] Re-apply f85e8d2a8b keeping characters < 80 --- ruby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.c b/ruby.c index e0ef3e946e2428..5a7aa62168f826 100644 --- a/ruby.c +++ b/ruby.c @@ -306,7 +306,7 @@ usage(const char *name, int help) static const struct message mjit_options[] = { M("--jit-warnings", "", "Enable printing JIT warnings"), M("--jit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), - M("--jit-wait", "", "Wait until JIT compilation is finished everytime (for testing)"), + M("--jit-wait", "", "Wait until JIT compilation finishes every time (for testing)"), M("--jit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"), M("--jit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"), M("--jit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 100)"), From 80d5d220b948517306e23b18260768ab8fe008bc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 23 Dec 2019 08:42:53 +0900 Subject: [PATCH 067/878] Fix typo in commit logs by log-fix notes --- tool/lib/vcs.rb | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index 1868553e7492d6..3553ed51a9b0ee 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -613,6 +613,8 @@ def export_changelog(url, from, to, path) chdir: @srcdir, exception: false) abort "Could not fetch notes/commits tree" end + system(*%W"#{COMMAND} fetch origin refs/notes/log-fix:refs/notes/log-fix", + chdir: @srcdir, exception: false) to ||= url.to_str if from arg = ["#{from}^..#{to}"] @@ -628,14 +630,32 @@ def export_changelog(url, from, to, path) def format_changelog(path, arg) env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'} - cmd = %W"#{COMMAND} log --format=medium --notes=commits --topo-order --no-merges" + cmd = %W"#{COMMAND} log --format=medium --notes=commits --notes=log-fix --topo-order --no-merges" date = "--date=iso-local" unless system(env, *cmd, date, chdir: @srcdir, out: NullDevice, exception: false) date = "--date=iso" end cmd << date cmd.concat(arg) - system(env, *cmd, chdir: @srcdir, out: path) + File.open(path, 'w') do |w| + cmd_pipe(env, cmd, chdir: @srcdir) do |r| + while s = r.gets("\ncommit ") + if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '') + fix = $1 + h, s = s.split(/^$/, 2) + s = s.lines + fix.each_line do |x| + if %r[^ +(\d+)s/(.+)/(.+)/] =~ x + s[$1.to_i][$2] = $3 + end + end + s = [h, s.join('')].join('') + end + s.gsub!(/ +\n/, "\n") + w.print s + end + end + end end def format_changelog_as_svn(path, arg) From 5f18635a800eee29fd051ea758a2ec561f090ebe Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 23 Dec 2019 10:10:23 +0900 Subject: [PATCH 068/878] make-snapshot: fixed mode "X" must be used in conjunction with "+". --- tool/make-snapshot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/make-snapshot b/tool/make-snapshot index 78816c2d8521cc..79289d6bfb3d3f 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -316,7 +316,7 @@ def package(vcs, rev, destdir, tmp = nil) FileUtils.mkpath(File.dirname(dest)) begin FileUtils.cp_r(file, dest) - FileUtils.chmod_R("u=rwX,go=rX", dest) + FileUtils.chmod_R("a+rwX,go-w", dest) rescue SystemCallError end end From 5de284ec78220e75643f89b454ce999da0c1c195 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 23 Dec 2019 10:37:30 +0900 Subject: [PATCH 069/878] Fixed a typo in an exception class name --- tool/mk_builtin_loader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/mk_builtin_loader.rb b/tool/mk_builtin_loader.rb index b7d7c172915543..dcd4b935326047 100644 --- a/tool/mk_builtin_loader.rb +++ b/tool/mk_builtin_loader.rb @@ -117,7 +117,7 @@ def mk_builtin_header file begin f = open(ofile, 'w') - rescue Errno::EACCESS + rescue Errno::EACCES # Fall back to the current directory f = open(File.basename(ofile), 'w') end From 1ed87dd3c4fb085955bb3848579a3ed7aba38507 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2019 13:56:20 +0900 Subject: [PATCH 070/878] Add NEWS about Warning.[] [Feature #16345] [ci skip] --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index ac71d7dafdb5da..a80495306b9cbd 100644 --- a/NEWS +++ b/NEWS @@ -474,6 +474,12 @@ UnboundMethod:: p Foo.instance_method(:add_1).bind(obj).call(1) #=> 2 p Foo.instance_method(:add_1).bind_call(obj, 1) #=> 2 +Warning:: + + New method:: + + * Added Warning.[] and Warning.[]= to manage emit/suppress some categories of + warnings. [Feature #16345] $LOAD_PATH:: From 48d1acdf25b13bd9e28bf6baa3f74ec082a27a00 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Sun, 22 Dec 2019 18:33:19 -0500 Subject: [PATCH 071/878] [ruby/matrix] Bump version --- lib/matrix/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matrix/version.rb b/lib/matrix/version.rb index f88bf38d9672c7..e6f91dae3c3e83 100644 --- a/lib/matrix/version.rb +++ b/lib/matrix/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class Matrix - VERSION = "0.1.0" + VERSION = "0.2.0" end From 49d94248ebfb7a51e342f8102d21ad132a40f91a Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Sun, 22 Dec 2019 19:34:42 -0500 Subject: [PATCH 072/878] [ruby/ostruct] Move gemspec --- lib/{ => ostruct}/ostruct.gemspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/{ => ostruct}/ostruct.gemspec (100%) diff --git a/lib/ostruct.gemspec b/lib/ostruct/ostruct.gemspec similarity index 100% rename from lib/ostruct.gemspec rename to lib/ostruct/ostruct.gemspec From 9be3295d53b6fd9f8a3ad8157aa0655b1976d8ac Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Sun, 22 Dec 2019 19:40:32 -0500 Subject: [PATCH 073/878] [ruby/ostruct] Create OpenStruct::VERSION --- lib/ostruct.rb | 3 +++ lib/ostruct/ostruct.gemspec | 11 +++++++++-- lib/ostruct/version.rb | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 lib/ostruct/version.rb diff --git a/lib/ostruct.rb b/lib/ostruct.rb index 4d1f0ce4de0c82..c40c897ff6ce3f 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -72,6 +72,9 @@ # the objects that are created, as there is much more overhead in the setting # of these properties compared to using a Hash or a Struct. # + +require_relative 'ostruct/version' + class OpenStruct # diff --git a/lib/ostruct/ostruct.gemspec b/lib/ostruct/ostruct.gemspec index 4faf5b84aa16ce..4f8507045eea48 100644 --- a/lib/ostruct/ostruct.gemspec +++ b/lib/ostruct/ostruct.gemspec @@ -1,8 +1,15 @@ # frozen_string_literal: true +begin + require_relative "lib/ostruct/version" +rescue LoadError + # for Ruby core repository + require_relative "version" +end + Gem::Specification.new do |spec| spec.name = "ostruct" - spec.version = "0.1.0" + spec.version = OpenStruct::VERSION spec.authors = ["Marc-Andre Lafortune"] spec.email = ["ruby-core@marc-andre.ca"] @@ -11,7 +18,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/ruby/ostruct" spec.license = "BSD-2-Clause" - spec.files = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "ostruct.gemspec"] + spec.files = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "lib/ostruct/version.rb", "ostruct.gemspec"] spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] diff --git a/lib/ostruct/version.rb b/lib/ostruct/version.rb new file mode 100644 index 00000000000000..4e26af990960e3 --- /dev/null +++ b/lib/ostruct/version.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class OpenStruct + VERSION = "0.1.0" +end From 446c243da35831de701ff6dd6c3c6da8252b6a10 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Sun, 22 Dec 2019 19:44:43 -0500 Subject: [PATCH 074/878] [ruby/ostruct] Bump version --- lib/ostruct/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ostruct/version.rb b/lib/ostruct/version.rb index 4e26af990960e3..91a40440941dd2 100644 --- a/lib/ostruct/version.rb +++ b/lib/ostruct/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class OpenStruct - VERSION = "0.1.0" + VERSION = "0.2.0" end From 048f797bf019cdf303d70494fba63d4a4e606462 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Sun, 22 Dec 2019 20:54:50 -0500 Subject: [PATCH 075/878] [ruby/prime] Bump version --- lib/prime.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prime.rb b/lib/prime.rb index 3aa20f8def95a1..5be12f24f5ba01 100644 --- a/lib/prime.rb +++ b/lib/prime.rb @@ -96,7 +96,7 @@ def Integer.each_prime(ubound, &block) # :yields: prime class Prime - VERSION = "0.1.0" + VERSION = "0.1.1" include Enumerable include Singleton From 204dc3f39f12b4e2640555306bd1dd4530344277 Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku Date: Mon, 23 Dec 2019 11:54:25 +0900 Subject: [PATCH 076/878] Revert "Should return "." for File.extname("file.") also on Windows" We want to introduce consistency and better compatibility with unixen, but the Windows APIs doues not have consistency fundamentally and we can not found any logical way... This reverts commit 61aff0cd189e67fa6f2565639ad0128fa33b88fc. --- file.c | 22 +++++----------------- spec/ruby/core/file/extname_spec.rb | 4 ++-- test/ruby/test_file_exhaustive.rb | 6 +++--- test/ruby/test_path.rb | 6 +++++- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/file.c b/file.c index 170455ab0ae8e8..c46377b93324c9 100644 --- a/file.c +++ b/file.c @@ -4711,26 +4711,13 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc) while (*p) { if (*p == '.' || istrailinggarbage(*p)) { #if USE_NTFS - const char *first = 0, *last, *dot; - if (*p == '.') first = p; - last = p++; - dot = last; + const char *last = p++, *dot = last; while (istrailinggarbage(*p)) { - if (*p == '.') { - dot = p; - if (!first) { - first = p; - } - } + if (*p == '.') dot = p; p++; } if (!*p || isADS(*p)) { - if (first == dot && e == 0) { - e = first; - } - else { - p = last; - } + p = last; break; } if (*last == '.' || dot > last) e = dot; @@ -4779,7 +4766,8 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc) * File.extname("test.rb") #=> ".rb" * File.extname("a/b/d/test.rb") #=> ".rb" * File.extname(".a/b/d/test.rb") #=> ".rb" - * File.extname("foo.") #=> "." + * File.extname("foo.") #=> "" on Windows + * File.extname("foo.") #=> "." on non-Windows * File.extname("test") #=> "" * File.extname(".profile") #=> "" * File.extname(".profile.sh") #=> ".sh" diff --git a/spec/ruby/core/file/extname_spec.rb b/spec/ruby/core/file/extname_spec.rb index 79290960fbd143..e9b53bc24d014e 100644 --- a/spec/ruby/core/file/extname_spec.rb +++ b/spec/ruby/core/file/extname_spec.rb @@ -23,14 +23,14 @@ end describe "for a filename ending with a dot" do - ruby_version_is ""..."2.7" do + guard -> { platform_is :windows or ruby_version_is ""..."2.7" } do it "returns ''" do File.extname(".foo.").should == "" File.extname("foo.").should == "" end end - ruby_version_is "2.7" do + guard -> { platform_is_not :windows and ruby_version_is "2.7" } do it "returns '.'" do File.extname(".foo.").should == "." File.extname("foo.").should == "." diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index de4c21e5ca39d7..975bcb6bc2d660 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -1268,19 +1268,19 @@ def test_extname infixes2 = infixes + [".ext "] appendixes = [""] if NTFS - appendixes << " " << [".", ".", ""] << "::$DATA" << "::$DATA.bar" + appendixes << " " << "." << "::$DATA" << "::$DATA.bar" else appendixes << [".", "."] end prefixes.each do |prefix| - appendixes.each do |appendix, ext = "", ext2 = ext| + appendixes.each do |appendix, ext = ""| infixes.each do |infix| path = "#{prefix}foo#{infix}#{appendix}" assert_equal(ext, File.extname(path), "File.extname(#{path.inspect})") end infixes2.each do |infix| path = "#{prefix}foo#{infix}.ext#{appendix}" - assert_equal(ext2.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})") + assert_equal(ext.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})") end end end diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb index 64111ee805765c..b35e942a2a037d 100644 --- a/test/ruby/test_path.rb +++ b/test/ruby/test_path.rb @@ -239,7 +239,11 @@ def test_extname ext = '.' end assert_equal(ext, File.extname('a.rb.')) - assert_equal('.', File.extname('a.')) + if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM + # trailing spaces and dots are ignored on NTFS. + ext = '' + end + assert_equal(ext, File.extname('a.')) assert_equal('', File.extname('.x')) assert_equal('', File.extname('..x')) end From 3142a6beb28db36dc9150f1ad6752cd1e19a8712 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 23 Dec 2019 12:07:15 +0900 Subject: [PATCH 077/878] Revert "Changed behavior on windows platforms too [ci skip]" This reverts commit 1bf8d5e9797f6304b2e27cb7f42d467f84de0ff4. Because 204dc3f39f12b4e2640555306bd1dd4530344277 reverts 61aff0cd189e67fa6f2565639ad0128fa33b88fc --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a80495306b9cbd..cbd162bcb594c2 100644 --- a/NEWS +++ b/NEWS @@ -308,7 +308,8 @@ File:: Modified method:: - * File.extname now returns a dot string at a name ending with a dot. [Bug #15267] + * File.extname now returns a dot string at a name ending with a dot on + non-Windows platforms. [Bug #15267] File.extname("foo.") #=> "." From 92d0958257965adf426e6f6c654c5935a690bf5b Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 23 Dec 2019 13:23:08 +0900 Subject: [PATCH 078/878] FrozenError.new accepts :receiver instead of 2nd argument [ci skip] [ruby-core:96227] [Feature #16419] --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cbd162bcb594c2..53f9109d445c3d 100644 --- a/NEWS +++ b/NEWS @@ -319,8 +319,8 @@ FrozenError:: * Added FrozenError#receiver to return the frozen object that modification was attempted on. To set this object when raising - FrozenError in Ruby code, pass it as the second argument to - FrozenError.new. [Feature #15751] + FrozenError in Ruby code, FrozenError.new accepts a +:receiver+ + option. [Feature #15751] GC:: From 672a61b97fe0cdb256611c707e7cc69856208467 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Mon, 23 Dec 2019 00:47:03 -0500 Subject: [PATCH 079/878] Port https://github.com/ruby/did_you_mean/commit/dd1dd86e6c3188c36224d5dd4389676e6653a727 --- .../{tree_spell_checker_test.rb => test_tree_spell_checker.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/did_you_mean/{tree_spell_checker_test.rb => test_tree_spell_checker.rb} (100%) diff --git a/test/did_you_mean/tree_spell_checker_test.rb b/test/did_you_mean/test_tree_spell_checker.rb similarity index 100% rename from test/did_you_mean/tree_spell_checker_test.rb rename to test/did_you_mean/test_tree_spell_checker.rb From a96f8cecc2488126d7298ea304da8bad3dde1792 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 23 Dec 2019 15:02:14 +0900 Subject: [PATCH 080/878] ObjectSpace._id2ref should check liveness. objspace->id_to_obj_tbl can contain died objects because of lazy sweep, so that it should check liveness. --- gc.c | 3 ++- test/ruby/test_objectspace.rb | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gc.c b/gc.c index ab7662b534ad0e..f6e75e8c78d057 100644 --- a/gc.c +++ b/gc.c @@ -3644,7 +3644,8 @@ id2ref(VALUE objid) } } - if (st_lookup(objspace->id_to_obj_tbl, objid, &orig)) { + if (st_lookup(objspace->id_to_obj_tbl, objid, &orig) && + is_live_object(objspace, orig)) { return orig; } diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb index c352b75b705e59..243e9f681c567f 100644 --- a/test/ruby/test_objectspace.rb +++ b/test/ruby/test_objectspace.rb @@ -35,6 +35,26 @@ def self.deftest_id2ref(obj) deftest_id2ref(false) deftest_id2ref(nil) + def test_id2ref_liveness + assert_normal_exit <<-EOS + ids = [] + 10.times{ + 1_000.times{ + ids << 'hello'.object_id + } + objs = ids.map{|id| + begin + ObjectSpace._id2ref(id) + rescue RangeError + nil + end + } + GC.start + objs.each{|e| e.inspect} + } + EOS + end + def test_count_objects h = {} ObjectSpace.count_objects(h) From 7df2503b7770147a8589a594bf30726f733b1d86 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 01:37:45 -0500 Subject: [PATCH 081/878] NEWS: Hint at potential incompatibility with Range#minmax [#15807] --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 53f9109d445c3d..bc9cf8d43f9721 100644 --- a/NEWS +++ b/NEWS @@ -407,7 +407,7 @@ Range:: New method:: * Added Range#minmax, with a faster implementation than Enumerable#minmax. - [Bug #15807] + It returns a maximum that now corresponds to Range#max. [Bug #15807] RubyVM:: From 3e1adf573110ddce8f900d9473dde7fa7de9c0e2 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 01:48:38 -0500 Subject: [PATCH 082/878] README: Improve wording [DOC] --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index bc9cf8d43f9721..28f7d0474b63e3 100644 --- a/NEWS +++ b/NEWS @@ -624,7 +624,7 @@ Proc:: === Stdlib compatibility issues (excluding feature bug fixes) * Promote stdlib to default gems - * The following default gems was published at rubygems.org + * The following default gems are also published at rubygems.org * benchmark * cgi * delegate From dadf1255b6e13578f888c239f0dc6fb201fd40bb Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 01:55:39 -0500 Subject: [PATCH 083/878] README: Add Range#minmax to the list of potential incompatibilities [#15929] [DOC] --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 28f7d0474b63e3..2f249a07423f88 100644 --- a/NEWS +++ b/NEWS @@ -621,6 +621,12 @@ StringScanner:: Proc:: * Proc#to_s format was changed. [Feature #16101] +Range:: + * Range#minmax used to iterate on the range to determine the maximum. + It now uses the same algorithm as Range#max. In rare cases (e.g. + ranges of Float or Strings), this may yield different results. + [Bug #15929] + === Stdlib compatibility issues (excluding feature bug fixes) * Promote stdlib to default gems From 7779ade48c2786992e41c0ab87761ab467f4be49 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 01:59:17 -0500 Subject: [PATCH 084/878] NEWS: Fix issue reference [#15807] [DOC] --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2f249a07423f88..5a4e0eda40a6b1 100644 --- a/NEWS +++ b/NEWS @@ -625,7 +625,7 @@ Range:: * Range#minmax used to iterate on the range to determine the maximum. It now uses the same algorithm as Range#max. In rare cases (e.g. ranges of Float or Strings), this may yield different results. - [Bug #15929] + [Bug #15807] === Stdlib compatibility issues (excluding feature bug fixes) From 9eeaae432b9a894e28e3906435f3d454d8fd025c Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 23 Dec 2019 16:30:45 +0900 Subject: [PATCH 085/878] add more debug counters to count numeric objects. --- debug_counter.h | 18 +++++++++++------- gc.c | 8 ++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debug_counter.h b/debug_counter.h index ee00d9df4be49d..b9515f4802262a 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -247,8 +247,6 @@ RB_DEBUG_COUNTER(obj_struct_embed) RB_DEBUG_COUNTER(obj_struct_transient) RB_DEBUG_COUNTER(obj_struct_ptr) -RB_DEBUG_COUNTER(obj_regexp_ptr) - RB_DEBUG_COUNTER(obj_data_empty) RB_DEBUG_COUNTER(obj_data_xfree) RB_DEBUG_COUNTER(obj_data_imm_free) @@ -258,9 +256,19 @@ RB_DEBUG_COUNTER(obj_match_under4) RB_DEBUG_COUNTER(obj_match_ge4) RB_DEBUG_COUNTER(obj_match_ge8) RB_DEBUG_COUNTER(obj_match_ptr) -RB_DEBUG_COUNTER(obj_file_ptr) + +RB_DEBUG_COUNTER(obj_iclass_ptr) +RB_DEBUG_COUNTER(obj_class_ptr) +RB_DEBUG_COUNTER(obj_module_ptr) + RB_DEBUG_COUNTER(obj_bignum_ptr) +RB_DEBUG_COUNTER(obj_bignum_embed) +RB_DEBUG_COUNTER(obj_float) +RB_DEBUG_COUNTER(obj_complex) +RB_DEBUG_COUNTER(obj_rational) +RB_DEBUG_COUNTER(obj_regexp_ptr) +RB_DEBUG_COUNTER(obj_file_ptr) RB_DEBUG_COUNTER(obj_symbol) RB_DEBUG_COUNTER(obj_imemo_ment) @@ -275,10 +283,6 @@ RB_DEBUG_COUNTER(obj_imemo_ifunc) RB_DEBUG_COUNTER(obj_imemo_memo) RB_DEBUG_COUNTER(obj_imemo_parser_strterm) -RB_DEBUG_COUNTER(obj_iclass_ptr) -RB_DEBUG_COUNTER(obj_class_ptr) -RB_DEBUG_COUNTER(obj_module_ptr) - /* ar_table */ RB_DEBUG_COUNTER(artable_hint_hit) RB_DEBUG_COUNTER(artable_hint_miss) diff --git a/gc.c b/gc.c index f6e75e8c78d057..728aea94089279 100644 --- a/gc.c +++ b/gc.c @@ -2750,7 +2750,11 @@ obj_free(rb_objspace_t *objspace, VALUE obj) } break; case T_RATIONAL: + RB_DEBUG_COUNTER_INC(obj_rational); + break; case T_COMPLEX: + RB_DEBUG_COUNTER_INC(obj_complex); + break; case T_MOVED: break; case T_ICLASS: @@ -2774,6 +2778,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) break; case T_FLOAT: + RB_DEBUG_COUNTER_INC(obj_float); break; case T_BIGNUM: @@ -2781,6 +2786,9 @@ obj_free(rb_objspace_t *objspace, VALUE obj) xfree(BIGNUM_DIGITS(obj)); RB_DEBUG_COUNTER_INC(obj_bignum_ptr); } + else { + RB_DEBUG_COUNTER_INC(obj_bignum_embed); + } break; case T_NODE: From 100fc2750b8f2c4dbe0aaa6c622bbf5f6d61e3c0 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 23 Dec 2019 17:04:31 +0900 Subject: [PATCH 086/878] fix wmap_finalize. wmap_finalize expects id2ref() returns a corresponding object even if the object is dead. Make id2ref_obj_tbl() for this purpose. --- gc.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gc.c b/gc.c index 728aea94089279..131ffb82460627 100644 --- a/gc.c +++ b/gc.c @@ -3608,6 +3608,18 @@ rb_objspace_garbage_object_p(VALUE obj) return is_garbage_object(objspace, obj); } +static VALUE +id2ref_obj_tbl(rb_objspace_t *objspace, VALUE objid) +{ + VALUE orig; + if (st_lookup(objspace->id_to_obj_tbl, objid, &orig)) { + return orig; + } + else { + return Qundef; + } +} + /* * call-seq: * ObjectSpace._id2ref(object_id) -> an_object @@ -3652,7 +3664,7 @@ id2ref(VALUE objid) } } - if (st_lookup(objspace->id_to_obj_tbl, objid, &orig) && + if ((orig = id2ref_obj_tbl(objspace, objid)) != Qundef && is_live_object(objspace, orig)) { return orig; } @@ -10442,7 +10454,9 @@ wmap_finalize(RB_BLOCK_CALL_FUNC_ARGLIST(objid, self)) TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w); /* Get reference from object id. */ - obj = id2ref(objid); + if ((obj = id2ref_obj_tbl(&rb_objspace, objid)) == Qundef) { + rb_bug("wmap_finalize: objid is not found."); + } /* obj is original referenced object and/or weak reference. */ orig = (st_data_t)obj; From bbde77cd2694e87646842777e873d849bbf5703e Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 09:46:08 +0100 Subject: [PATCH 087/878] NEWS: fix some typos, grammar, and language --- NEWS | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index 5a4e0eda40a6b1..cba1b1f276c4fb 100644 --- a/NEWS +++ b/NEWS @@ -63,10 +63,10 @@ sufficient information, see the ChangeLog file or Redmine deprecated, and conversion will be removed in Ruby 3. [Feature #14183] * When a method call passes a Hash at the last argument, and when it - passes no keywords, and when the called method accepts keywords, a - warning is emitted. To continue treating as keywords, add a double - splat operator to avoid the warning and ensure correct behavior in - Ruby 3. + passes no keywords, and when the called method accepts keywords, + a warning is emitted. To continue treating the hash as keywords, + add a double splat operator to avoid the warning and ensure + correct behavior in Ruby 3. def foo(key: 42); end; foo({key: 42}) # warned def foo(**kw); end; foo({key: 42}) # warned @@ -100,7 +100,7 @@ sufficient information, see the ChangeLog file or Redmine def foo(opt={}); end; foo( key: 42 ) # OK -* Non-symbols are allowed as a keyword argument keys if method accepts +* Non-symbols are allowed as keyword argument keys if the method accepts arbitrary keywords. [Feature #14183] * Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0, @@ -160,7 +160,7 @@ sufficient information, see the ChangeLog file or Redmine ==== Other miscellaneous changes * A beginless range is experimentally introduced. It might not be as useful - as an endless range, but would be good for DSL purpose. [Feature #14799] + as an endless range, but would be good for DSL purposes. [Feature #14799] ary[..3] # identical to ary[0..3] where(sales: ..100) @@ -382,7 +382,7 @@ NilClass / TrueClass / FalseClass:: Modified methods:: - * NilClass#to_s, TrueClass#to_s and FalseClass#to_s now always return a + * NilClass#to_s, TrueClass#to_s, and FalseClass#to_s now always return a frozen String. The returned String is always the same for each of these values. This change is experimental. [Feature #16150] @@ -599,7 +599,7 @@ RSS:: RubyGems:: - * Upgrade to RubyGems 3.1.1 + * Upgrade to RubyGems 3.1.1. See https://github.com/rubygems/rubygems/releases/tag/v3.1.0 StringScanner:: @@ -630,7 +630,7 @@ Range:: === Stdlib compatibility issues (excluding feature bug fixes) * Promote stdlib to default gems - * The following default gems are also published at rubygems.org + * The following default gems were published on rubygems.org * benchmark * cgi * delegate @@ -640,7 +640,8 @@ Range:: * open3 * pstore * singleton - * The following default gems only promoted ruby-core, Not yet published at rubygems.org. + * The following default gems were only promoted at ruby-core, + but not yet published on rubygems.org. * monitor * observer * timeout @@ -711,9 +712,9 @@ JIT:: * Method inlining is performed when a method is considered as pure. This optimization is still experimental and many methods are NOT considered as pure yet. - * Default value of +--jit-max-cache+ is changed from 1,000 to 100 + * The default value of +--jit-max-cache+ is changed from 1,000 to 100. - * Default value of +--jit-min-calls+ is changed from 5 to 10,000 + * The default value of +--jit-min-calls+ is changed from 5 to 10,000. RubyVM::InstructionSequence:: From de1a462454f4196490263c9be8be16a44513f5a0 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 14:45:24 +0100 Subject: [PATCH 088/878] NEWS: revise grammar, language, markup, etc. --- NEWS | 141 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/NEWS b/NEWS index cba1b1f276c4fb..a71feac2d0ed5f 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,7 @@ releases except for bug fixes. Note that each entry is kept so brief that no reason behind or reference information is supplied with. For a full list of changes with all sufficient information, see the ChangeLog file or Redmine -(e.g. https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER) +(e.g. https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER). == Changes since the 2.6.0 release @@ -53,9 +53,9 @@ sufficient information, see the ChangeLog file or Redmine JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]} #=> NoMatchingPatternError -* See the following slides in detail +* See the following slides for more details: * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7 - * Note that the slides are slightly obsolete + * Note that the slides are slightly obsolete. ==== The spec of keyword arguments is changed towards 3.0 @@ -128,14 +128,16 @@ sufficient information, see the ChangeLog file or Redmine h = {}; def foo(*a) a end; foo(h) # [{}] h = {}; def foo(a) a end; foo(h) # {} -==== Numbered parameter +==== Numbered parameters -* Numbered parameter as the default block parameter is introduced as an - experimental feature. [Feature #4475] +* Numbered parameters as default block parameters are introduced + as an experimental feature. [Feature #4475] - [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] + [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] + [[1, 2], [3, 4]].map { _1 + _2 } #=> [3, 7] - You can still define a local variable named _1 and so on, and that is honored when present, but renders warning. + You can still define a local variable named +_1+ and so on, + and that is honored when present, but renders a warning. _1 = 0 #=> warning: `_1' is reserved for numbered parameter; consider another name [1].each { p _1 } # prints 0 instead of 1 @@ -165,13 +167,13 @@ sufficient information, see the ChangeLog file or Redmine ary[..3] # identical to ary[0..3] where(sales: ..100) -* Setting $; to non-nil value is warned now. Use of it in - String#split is warned too. +* Setting $; to a non-nil value is warned now. + Use of it in String#split is warned too. -* Setting $, to non-nil value is warned now. Use of it in - Array#join is warned too. +* Setting $, to a non-nil value is warned now. + Use of it in Array#join is warned too. -* Quoted here-document identifier must end within the same line. +* Quoted here-document identifiers must end within the same line. <<"EOS " # This had been warned since 2.4; Now it raises a SyntaxError @@ -185,7 +187,7 @@ sufficient information, see the ChangeLog file or Redmine # .bar .baz # => foo.baz -* Calling a private method with a literal self as the receiver +* Calling a private method with a literal +self+ as the receiver is now allowed. [Feature #11297] [Feature #16123] * Modifier rescue now operates the same for multiple assignment as single @@ -195,7 +197,7 @@ sufficient information, see the ChangeLog file or Redmine # Previously parsed as: (a, b = raise) rescue [1, 2] # Now parsed as: a, b = (raise rescue [1, 2]) -* +yield+ in singleton class syntax is warned and will be deprecated later [Feature #15575]. +* +yield+ in singleton class syntax is warned and will be deprecated later. [Feature #15575]. def foo class << Object.new @@ -212,7 +214,8 @@ sufficient information, see the ChangeLog file or Redmine All arguments to +foo+ are forwarded to +bar+, including keyword and block arguments. - Note that the parentheses are mandatory. `bar ...` is parsed as an endless range. + Note that the parentheses are mandatory. bar ... is parsed + as an endless range. * Access and setting of $SAFE is now always warned. $SAFE will become a normal global variable in Ruby 3.0. [Feature #16131] @@ -230,8 +233,7 @@ Array:: * Added Array#intersection. [Feature #16155] - * Added Array#minmax, with a faster implementation than Enumerable#minmax. - [Bug #15929] + * Added Array#minmax, with a faster implementation than Enumerable#minmax. [Bug #15929] Comparable:: @@ -247,7 +249,8 @@ Complex:: New method:: - * Added Complex#<=>. So 0 <=> 0i will not raise NoMethodError. [Bug #15857] + * Added Complex#<=>. + So 0 <=> 0i will not raise NoMethodError. [Bug #15857] Dir:: @@ -260,7 +263,7 @@ Encoding:: New encoding:: - * Added new encoding CESU-8 [Feature #15931] + * Added new encoding CESU-8. [Feature #15931] Enumerable:: @@ -278,12 +281,12 @@ Enumerator:: New methods:: - * Added Enumerator.produce to generate Enumerator from any custom - data-transformation. [Feature #14781] + * Added Enumerator.produce to generate an Enumerator from any custom + data transformation. [Feature #14781] - require 'date' + require "date" dates = Enumerator.produce(Date.today, &:succ) #=> infinite sequence of dates - dates.detect(&:tuesday?) #=> next tuesday + dates.detect(&:tuesday?) #=> next Tuesday * Added Enumerator::Lazy#eager that generates a non-lazy enumerator from a lazy enumerator. [Feature #15901] @@ -308,7 +311,7 @@ File:: Modified method:: - * File.extname now returns a dot string at a name ending with a dot on + * File.extname now returns a dot string for names ending with a dot on non-Windows platforms. [Bug #15267] File.extname("foo.") #=> "." @@ -317,8 +320,8 @@ FrozenError:: New method:: - * Added FrozenError#receiver to return the frozen object that - modification was attempted on. To set this object when raising + * Added FrozenError#receiver to return the frozen object on which + modification was attempted. To set this object when raising FrozenError in Ruby code, FrozenError.new accepts a +:receiver+ option. [Feature #15751] @@ -344,18 +347,18 @@ Integer:: Modified method:: - * Integer#[] now supports range operation. [Feature #8842] + * Integer#[] now supports range operations. [Feature #8842] 0b01001101[2, 4] #=> 0b0011 0b01001100[2..5] #=> 0b0011 0b01001100[2...6] #=> 0b0011 - ^^^^ + # ^^^^ Method:: Modified method:: - * Method#inspect shows much information. [Feature #14145] + * Method#inspect shows more information. [Feature #14145] Module:: @@ -371,7 +374,7 @@ Module:: Modified methods:: - * Module#autoload? now takes an +inherit+ optional argument, like as + * Module#autoload? now takes an +inherit+ optional argument, like Module#const_defined?. [Feature #15777] * Module#name now always returns a frozen String. The returned String is @@ -426,13 +429,13 @@ String:: * Update Unicode version to 12.1.0, adding support for U+32FF SQUARE ERA NAME REIWA. [Feature #15195] - * Update Unicode Emoji version to 12.1 [Feature #16272] + * Update Unicode Emoji version to 12.1. [Feature #16272] Symbol:: New methods:: - * Added Symbol#start_with? and Symbol#end_with? method. [Feature #16348] + * Added Symbol#start_with? and Symbol#end_with? methods. [Feature #16348] Time:: @@ -444,8 +447,8 @@ Time:: Modified method:: - * Time#inspect is separated from Time#to_s and it shows its sub - second. [Feature #15958] + * Time#inspect is separated from Time#to_s and it shows + the time's sub second. [Feature #15958] UnboundMethod:: @@ -456,7 +459,7 @@ UnboundMethod:: umethod.bind_call(obj, ...) is semantically equivalent to umethod.bind(obj).call(...). This idiom is used in some libraries to call a method that is overridden. The added - method does the same without allocation of intermediate Method + method does the same without allocation of an intermediate Method object. class Foo @@ -477,10 +480,10 @@ UnboundMethod:: Warning:: - New method:: + New methods:: - * Added Warning.[] and Warning.[]= to manage emit/suppress some categories of - warnings. [Feature #16345] + * Added Warning.[] and Warning.[]= to manage emit/suppress of + some categories of warnings. [Feature #16345] $LOAD_PATH:: @@ -492,13 +495,13 @@ $LOAD_PATH:: Bundler:: - * Upgrade to Bundler 2.1.0 + * Upgrade to Bundler 2.1.0. See https://github.com/bundler/bundler/releases/tag/v2.1.0 CGI:: - * CGI.escapeHTML becomes 2~5x faster when there's at least one escaped character. - https://github.com/ruby/ruby/pull/2226 + * CGI.escapeHTML becomes 2~5x faster when there is at least one escaped character. + See https://github.com/ruby/ruby/pull/2226 CSV:: @@ -521,12 +524,12 @@ ERB:: IRB:: - * Introduce syntax highlight inspired by pry.gem to Binding#irb source lines, - REPL input, and inspect output of some core-class objects. + * Introduce syntax highlighting inspired by the Pry gem to Binding#irb + source lines, REPL input, and inspect output of some core-class objects. - * Introduce multiline mode by Reline. + * Introduce multiline editing mode provided by Reline. - * Show documents when completion. + * Show documentation when completion. * Enable auto indent and save/load history by default. @@ -537,8 +540,8 @@ Net::FTP:: Net::HTTP:: - * Add ipaddr optional parameter to Net::HTTP#start to replace the address for - TCP/IP connection [Feature #5180] + * Add +ipaddr+ optional parameter to Net::HTTP#start to replace the address for + the TCP/IP connection. [Feature #5180] Net::IMAP:: @@ -549,16 +552,16 @@ open-uri:: * Warn open-uri's "open" method at Kernel. Use URI.open instead. [Misc #15893] - * The default charset of text/* media type is UTF-8 instead of + * The default charset of "text/*" media type is UTF-8 instead of ISO-8859-1. [Bug #15933] OptionParser:: - * Now show "Did you mean?" for unknown option. [Feature #16256] + * Now show "Did you mean?" for unknown options. [Feature #16256] test.rb: - require 'optparse' + require "optparse" OptionParser.new do |opts| opts.on("-f", "--foo", "foo") {|v| } opts.on("-b", "--bar", "bar") {|v| } @@ -576,7 +579,7 @@ OptionParser:: Pathname:: * Delegates 3 arguments from Pathname.glob to Dir.glob to - accept base: keyword. + accept +base+ keyword. Racc:: @@ -584,8 +587,8 @@ Racc:: Reline:: - * New stdlib that is compatible with readline stdlib by pure Ruby and also - has a multiline mode. + * New stdlib that is compatible with the readline stdlib but is + implemented in pure Ruby. It also provides a multiline editing mode. REXML:: @@ -619,13 +622,12 @@ StringScanner:: * E2MM (e2mmap gem) Proc:: - * Proc#to_s format was changed. [Feature #16101] + * The Proc#to_s format was changed. [Feature #16101] Range:: * Range#minmax used to iterate on the range to determine the maximum. It now uses the same algorithm as Range#max. In rare cases (e.g. - ranges of Float or Strings), this may yield different results. - [Bug #15807] + ranges of Floats or Strings), this may yield different results. [Bug #15807] === Stdlib compatibility issues (excluding feature bug fixes) @@ -658,7 +660,7 @@ pathname:: profile.rb, Profiler__:: - * Removed from standard library. No one maintains it from Ruby 2.0.0. + * Removed from standard library. It was unmaintained since Ruby 2.0.0. === C API updates @@ -671,18 +673,18 @@ profile.rb, Profiler__:: treated as keyword arguments. Passing a positional hash instead of keyword arguments will emit a deprecation warning. -* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+ - https://github.com/ruby/ruby/pull/2404 +* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+. + See https://github.com/ruby/ruby/pull/2404 === Implementation improvements Fiber:: - * Allow selecting different coroutine implementation by using - `--with-coroutine=`, e.g. + * Allow selecting different coroutine implementations by using + +--with-coroutine=+, e.g. - ./configure --with-coroutine=ucontext - ./configure --with-coroutine=copy + $ ./configure --with-coroutine=ucontext + $ ./configure --with-coroutine=copy * Replace previous stack cache with fiber pool cache. The fiber pool allocates many stacks in a single memory region. Stack allocation @@ -703,7 +705,7 @@ Thread:: * VM stack memory allocation is now combined with native thread stack, improving thread allocation performance and reducing allocation related - failures. ~10x performance improvement was measured in micro-benchmarks. + failures. Around 10x performance improvement was measured in micro-benchmarks. JIT:: @@ -718,7 +720,7 @@ JIT:: RubyVM::InstructionSequence:: - * RubyVM::InstructionSequence#to_binary method generate compiled binary. + * RubyVM::InstructionSequence#to_binary method generates compiled binary. The binary size is reduced. [Feature #16163] === Miscellaneous changes @@ -727,7 +729,7 @@ RubyVM::InstructionSequence:: difficult to find, native fiber code is difficult to implement, and it added non-trivial complexity to the interpreter. [Feature #15894] -* Require compilers to support C99 [Misc #15347] +* Require compilers to support C99. [Misc #15347] * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/C99 @@ -739,10 +741,11 @@ RubyVM::InstructionSequence:: * RUBY_DESCRIPTION includes Git revision instead of Subversion's one. -* Support built-in methods in Ruby with `__builtin_` syntax. [Feature #16254] +* Support built-in methods in Ruby with the _\_builtin_ syntax. [Feature #16254] + Some methods are defined in *.rb (such as trace_point.rb). For example, it is easy to define a method which accepts keyword arguments. * Per-call-site method cache, which has been there since around 1.9, was improved: cache hit rate raised from 89% to 94%. - https://github.com/ruby/ruby/pull/2583 + See https://github.com/ruby/ruby/pull/2583 From 9a42e0c7ed4dcc57043a8a35a50686625adba686 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 14:46:58 +0100 Subject: [PATCH 089/878] NEWS: add reference for [Feature #14405] --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a71feac2d0ed5f..98cb8376c99eeb 100644 --- a/NEWS +++ b/NEWS @@ -578,8 +578,8 @@ OptionParser:: Pathname:: - * Delegates 3 arguments from Pathname.glob to Dir.glob to - accept +base+ keyword. + * Pathname.glob now delegates 3 arguments to Dir.glob + to accept +base+ keyword. [Feature #14405] Racc:: From 16fddfe352828d26aaa6cdbce696e62de04511ce Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 15:02:59 +0100 Subject: [PATCH 090/878] [DOC] Improve readability of requirements for <=> --- compar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compar.c b/compar.c index e9b1d4bfcc6310..94072c9fc1f0cd 100644 --- a/compar.c +++ b/compar.c @@ -253,9 +253,9 @@ cmp_clamp(int argc, VALUE *argv, VALUE x) /* * The Comparable mixin is used by classes whose objects may be * ordered. The class must define the <=> operator, - * which compares the receiver against another object, returning - * a value less than 0, 0, or a value greater than 0, depending on - * whether the receiver is less than, equal to, + * which compares the receiver against another object, returning a + * value less than 0, returning 0, or returning a value greater than 0, + * depending on whether the receiver is less than, equal to, * or greater than the other object. If the other object is not * comparable then the <=> operator should return +nil+. * Comparable uses <=> to implement the conventional From f201700051cc107b55c425bf331ce6d7ad3ef22b Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 24 Dec 2019 04:16:40 +0900 Subject: [PATCH 091/878] move a NEWS entry about inline method cache --- NEWS | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 98cb8376c99eeb..c76e2d9098e807 100644 --- a/NEWS +++ b/NEWS @@ -718,6 +718,12 @@ JIT:: * The default value of +--jit-min-calls+ is changed from 5 to 10,000. +RubyVM:: + + * Per-call-site method cache, which has been there since around 1.9, was + improved: cache hit rate raised from 89% to 94%. + See https://github.com/ruby/ruby/pull/2583 + RubyVM::InstructionSequence:: * RubyVM::InstructionSequence#to_binary method generates compiled binary. @@ -745,7 +751,3 @@ RubyVM::InstructionSequence:: Some methods are defined in *.rb (such as trace_point.rb). For example, it is easy to define a method which accepts keyword arguments. - -* Per-call-site method cache, which has been there since around 1.9, was - improved: cache hit rate raised from 89% to 94%. - See https://github.com/ruby/ruby/pull/2583 From aa01441fd29be8be28644db7abac9f7940fcc814 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 24 Dec 2019 04:17:11 +0900 Subject: [PATCH 092/878] * 2019-12-24 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1c2507479d45af..ce47613f6d55e7 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" From ba9ccef81811e9387c0189d596189236b25d0dba Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 22:04:59 +0100 Subject: [PATCH 093/878] [DOC] Various fixes in bug triaging guide --- doc/bug_triaging.rdoc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/doc/bug_triaging.rdoc b/doc/bug_triaging.rdoc index 310eff1aeb2793..83fe88cabe6bd6 100644 --- a/doc/bug_triaging.rdoc +++ b/doc/bug_triaging.rdoc @@ -27,12 +27,12 @@ If you cannot reproduce the example with the master branch, but can reproduce the issue on the latest version for the branch, then it is likely the bug has already been fixed, but it has not been backported yet. Try to determine which commit fixed it, and update the issue noting that the issue has been -fixed but not yet backported. If the ruby version is in the security +fixed but not yet backported. If the Ruby version is in the security maintenance phase or no longer supported, change the status to Closed. This -change be made without adding a note to avoid spamming the mailing list. +change can be made without adding a note to avoid spamming the mailing list. For issues that may require backwards incompatible changes or may benefit from -general committer attention or discussion, considering adding them as agenda +general committer attention or discussion, consider adding them as agenda items for the next committer meeting (https://bugs.ruby-lang.org/issues/14770). == Crash Bugs Without Reproducers @@ -41,27 +41,26 @@ Many bugs reported have little more than a crash report, often with no way to reproduce the issue. These bugs are difficult to triage as they often do not contain enough information. - -For these bugs, if the ruby version is the master branch or is the latest +For these bugs, if the Ruby version is the master branch or is the latest release for the branch and the branch is in normal maintenance phase, look at the backtrace and see if you can determine what could be causing the issue. -If you can guess would could be causing the issue, see if you can put together +If you can guess what could be causing the issue, see if you can put together a reproducible example (this is in general quite difficult). If you cannot guess what could be causing the issue, or cannot put together a reproducible example yourself, please ask the reporter to provide a reproducible example, and change the status to Feedback. -if the ruby version is no longer current (e.g. 2.5.0 when the latest version -on the ruby 2.5 branch is 2.5.5), add a note to the issue asking the reporter -to try the latest ruby version for the branch and report back, and change the -status to Feedback. If the ruby version is in the security maintenance phase +If the Ruby version is no longer current (e.g. 2.5.0 when the latest version +on the Ruby 2.5 branch is 2.5.5), add a note to the issue asking the reporter +to try the latest Ruby version for the branch and report back, and change the +status to Feedback. If the Ruby version is in the security maintenance phase or no longer supported, change the status to Closed. This change can be made without adding a note. == Crash Bugs With 3rd Party C Extensions -If the crash happens inside a 3rd party C extension, try to figure out which -C extension it happens inside, and add a note to the issue to report the +If the crash happens inside a 3rd party C extension, try to figure out inside +which C extension it happens, and add a note to the issue to report the issue to that C extension, and set the status to Third Party's Issue. == Non-Bug reports @@ -75,6 +74,6 @@ improvements) or Misc. This change can be made without adding a note. There are many issues that are stale, with no updates in months or even years. For stale issues in Feedback state, where the feedback has not been received, you can change the status to Closed without adding a note. For stale issues -in Assigned state, you can reach out the assignee and see if they can update +in Assigned state, you can reach out to the assignee and see if they can update the issue. If the assignee is no longer an active committer, remove them as the assignee and change the status to Open. From a7b5018495c4a6b82d779958b086647226ce61e7 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 22:07:02 +0100 Subject: [PATCH 094/878] [DOC] Use capitalized "Ruby" --- doc/globals.rdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/globals.rdoc b/doc/globals.rdoc index 233e2bb0856cea..89b94e9a8ff8bc 100644 --- a/doc/globals.rdoc +++ b/doc/globals.rdoc @@ -64,9 +64,9 @@ TOPLEVEL_BINDING:: The Binding of the top level scope. RUBY_VERSION:: The Ruby language version. RUBY_RELEASE_DATE:: The release date string. RUBY_PLATFORM:: The platform identifier. -RUBY_PATCHLEVEL:: The patchlevel for this ruby. If this is a development build of ruby the patchlevel will be -1. -RUBY_REVISION:: The GIT commit hash for this ruby. -RUBY_COPYRIGHT:: The copyright string for ruby. +RUBY_PATCHLEVEL:: The patchlevel for this Ruby. If this is a development build of Ruby the patchlevel will be -1. +RUBY_REVISION:: The GIT commit hash for this Ruby. +RUBY_COPYRIGHT:: The copyright string for Ruby. RUBY_ENGINE:: The name of the Ruby implementation. RUBY_ENGINE_VERSION:: The version of the Ruby implementation. RUBY_DESCRIPTION:: The same as ruby --version, a String describing various aspects of the Ruby implementation. From df6f5c44af1f261fa940ec3954468be8b820450e Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Mon, 23 Dec 2019 22:41:58 +0100 Subject: [PATCH 095/878] [DOC] Fix invalid code to make it syntax highlighted --- vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm.c b/vm.c index 4645c3577f99b8..bb3ffae078d393 100644 --- a/vm.c +++ b/vm.c @@ -3057,7 +3057,7 @@ Init_VM(void) * * The class method ::kill, is meant to exit a given thread: * - * thr = Thread.new { ... } + * thr = Thread.new { sleep } * Thread.kill(thr) # sends exit() to thr * * Alternatively, you can use the instance method #exit, or any of its From 819b604037c317d2b53a1aaca67aef25da2d5ec9 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 02:34:16 -0500 Subject: [PATCH 096/878] Reword keyword arguments warning messages to convey these are deprecation warnings --- class.c | 6 +- include/ruby/ruby.h | 6 +- test/-ext-/funcall/test_passing_block.rb | 8 +- test/-ext-/test_scan_args.rb | 26 +- test/ruby/test_exception.rb | 2 +- test/ruby/test_io.rb | 2 +- test/ruby/test_keyword.rb | 870 +++++++++++------------ test/ruby/test_numeric.rb | 2 +- test/ruby/test_proc.rb | 56 +- test/ruby/test_struct.rb | 2 +- test/ruby/test_syntax.rb | 4 +- test/test_delegate.rb | 2 +- vm_args.c | 14 +- vm_eval.c | 2 +- 14 files changed, 501 insertions(+), 501 deletions(-) diff --git a/class.c b/class.c index cceba6a1894de0..c866d1d72721af 100644 --- a/class.c +++ b/class.c @@ -2051,7 +2051,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st if (!keyword_given && !last_hash_keyword) { /* Warn if treating positional as keyword, as in Ruby 3, this will be an error */ - rb_warn("The last argument is used as keyword parameters"); + rb_warn("Using the last argument as keyword parameters is deprecated"); } argc--; } @@ -2066,7 +2066,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st } else if (arg->f_hash && keyword_given && arg->n_mand == argc) { /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */ - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } } if (arg->f_hash && arg->n_mand == argc+1 && empty_keyword_given) { @@ -2075,7 +2075,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st ptr[argc] = rb_hash_new(); argc++; *(&argv) = ptr; - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } arg->argc = argc; diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 57b5075ffdf5c2..9b7c9842f8fd30 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2569,7 +2569,7 @@ rb_scan_args_set(int argc, const VALUE *argv, if (!keyword_given) { /* Warn if treating positional as keyword, as in Ruby 3, this will be an error */ - rb_warn("The last argument is used as keyword parameters"); + rb_warn("Using the last argument as keyword parameters is deprecated"); } argc--; } @@ -2584,7 +2584,7 @@ rb_scan_args_set(int argc, const VALUE *argv, } else if (f_hash && keyword_given && n_mand == argc) { /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */ - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } } if (f_hash && n_mand > 0 && n_mand == argc+1 && empty_keyword_given) { @@ -2593,7 +2593,7 @@ rb_scan_args_set(int argc, const VALUE *argv, ptr[argc] = rb_hash_new(); argc++; *(&argv) = ptr; - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb index dd67b7c7de922f..d1164871b09c27 100644 --- a/test/-ext-/funcall/test_passing_block.rb +++ b/test/-ext-/funcall/test_passing_block.rb @@ -29,7 +29,7 @@ def test_with_funcall_passing_block_kw assert_equal([[{}], {}], Relay.with_funcall_passing_block_kw(2, {}, **{}, &block)) assert_equal([[], {a: 1}], Relay.with_funcall_passing_block_kw(3, a: 1, &block)) assert_equal([[{a: 1}], {}], Relay.with_funcall_passing_block_kw(3, {a: 1}, **{}, &block)) - assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method is defined here/m) do + assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method is defined here/m) do assert_equal({}, Relay.with_funcall_passing_block_kw(3, **{}, &->(a){a})) end end @@ -53,7 +53,7 @@ def o.baz(arg) assert_equal([[], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 3, a: 1)) assert_equal([[{a: 1}], {}], Relay.with_funcallv_public_kw(o, :foo, 3, {a: 1}, **{})) assert_raise(NoMethodError) { Relay.with_funcallv_public_kw(o, :bar, 3, {a: 1}, **{}) } - assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method `baz'/m) do + assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method `baz'/m) do assert_equal({}, Relay.with_funcallv_public_kw(o, :baz, 3, **{})) end end @@ -64,11 +64,11 @@ def test_with_yield_splat_kw assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(1, [{a: 1}], &block)) assert_equal([[1], {a: 1}], Relay.with_yield_splat_kw(1, [1, {a: 1}], &block)) assert_equal([[{}], {}], Relay.with_yield_splat_kw(2, [{}], **{}, &block)) - assert_warn(/warning: The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/warning: Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(3, [{a: 1}], &block)) end assert_equal([[{a: 1}], {}], Relay.with_yield_splat_kw(3, [{a: 1}], **{}, &block)) - assert_warn(/warning: The keyword argument is passed as the last hash parameter/) do + assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal({}, Relay.with_yield_splat_kw(3, [], **{}, &->(a){a})) end end diff --git a/test/-ext-/test_scan_args.rb b/test/-ext-/test_scan_args.rb index 949495dd0d11a1..dda016d6aff68e 100644 --- a/test/-ext-/test_scan_args.rb +++ b/test/-ext-/test_scan_args.rb @@ -93,12 +93,12 @@ def test_lead_hash assert_equal([1, "a", nil], Bug::ScanArgs.lead_hash("a")) assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash("a", "b")} assert_equal([1, "a", {b: 1}], Bug::ScanArgs.lead_hash("a", b: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {b: 1}, nil], Bug::ScanArgs.lead_hash(b: 1)) end assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.lead_hash({"a"=>0, b: 1}, **{})) assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(1, {"a"=>0, b: 1}, **{})} - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {}, nil], Bug::ScanArgs.lead_hash(**{})) end end @@ -120,7 +120,7 @@ def test_lead_opt_hash assert_equal([2, "a", "b", nil], Bug::ScanArgs.lead_opt_hash("a", "b")) assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b", c: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.lead_opt_hash(c: 1)) end assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b", "c")} @@ -145,7 +145,7 @@ def test_lead_var_hash assert_equal([2, "a", ["b"], nil], Bug::ScanArgs.lead_var_hash("a", "b")) assert_equal([2, "a", ["b"], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b", c: 1)) assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.lead_var_hash("a", c: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {c: 1}, [], nil], Bug::ScanArgs.lead_var_hash(c: 1)) end assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.lead_var_hash("a", "b", "c")) @@ -173,7 +173,7 @@ def test_lead_opt_var_hash assert_equal([2, "a", "b", [], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b")) assert_equal([2, "a", "b", [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", c: 1)) assert_equal([1, "a", nil, [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", c: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {c: 1}, nil, [], nil], Bug::ScanArgs.lead_opt_var_hash(c: 1)) end assert_equal([3, "a", "b", ["c"], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c")) @@ -189,7 +189,7 @@ def test_opt_trail_hash assert_equal([2, "a", "b", nil], Bug::ScanArgs.opt_trail_hash("a", "b")) assert_equal([1, nil, "a", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b", c: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, nil, {c: 1}, nil], Bug::ScanArgs.opt_trail_hash(c: 1)) end assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash("a", "b", "c")} @@ -203,7 +203,7 @@ def test_lead_opt_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a")} assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash(c: 1)} assert_equal([2, "a", nil, "b", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b")) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([2, "a", nil, {c: 1}, nil], Bug::ScanArgs.lead_opt_trail_hash("a", c: 1)) end assert_equal([2, "a", nil, "b", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", c: 1)) @@ -221,7 +221,7 @@ def test_var_trail_hash assert_equal([2, ["a"], "b", nil], Bug::ScanArgs.var_trail_hash("a", "b")) assert_equal([1, [], "a", {c: 1}], Bug::ScanArgs.var_trail_hash("a", c: 1)) assert_equal([2, ["a"], "b", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", c: 1)) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, [], {c: 1}, nil], Bug::ScanArgs.var_trail_hash(c: 1)) end assert_equal([3, ["a", "b"], "c", nil], Bug::ScanArgs.var_trail_hash("a", "b", "c")) @@ -235,7 +235,7 @@ def test_lead_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash()} assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a")} assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash(c: 1)} - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([2, "a", [], {c: 1}, nil], Bug::ScanArgs.lead_var_trail_hash("a", c: 1)) end assert_equal([2, "a", [], "b", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b")) @@ -250,7 +250,7 @@ def test_lead_var_trail_hash def test_opt_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash()} assert_equal([1, nil, [], "a", nil], Bug::ScanArgs.opt_var_trail_hash("a")) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, nil, [], {c: 1}, nil], Bug::ScanArgs.opt_var_trail_hash(c: 1)) end assert_equal([1, nil, [], "a", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", c: 1)) @@ -266,7 +266,7 @@ def test_opt_var_trail_hash def test_lead_opt_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash()} assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a")} - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([2, "a", nil, [], {b: 1}, nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", b: 1)) end assert_equal([2, "a", nil, [], "b", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b")) @@ -285,7 +285,7 @@ def test_k_lead_opt_hash assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", {c: 1})) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", {c: 1})) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.k_lead_opt_hash(c: 1)) end assert_warn(/The last argument is split into positional and keyword parameters/) do @@ -294,7 +294,7 @@ def test_k_lead_opt_hash end def test_e_lead_opt_hash - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([1, {}, nil, nil], Bug::ScanArgs.e_lead_opt_hash) end assert_equal([1, "a", nil, nil], Bug::ScanArgs.e_lead_opt_hash("a")) diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index df7a4e7cf53792..79ac11ab26fb20 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1208,7 +1208,7 @@ def (obj = Object.new).w(n) warn("test warning", uplevel: n) end assert_raise(ArgumentError) {warn("test warning", uplevel: -1)} assert_in_out_err(["-e", "warn 'ok', uplevel: 1"], '', [], /warning:/) warning = capture_warning_warn {warn("test warning", {uplevel: 0})} - assert_equal("#{__FILE__}:#{__LINE__-1}: warning: The last argument is used as keyword parameters; maybe ** should be added to the call\n", warning[0]) + assert_equal("#{__FILE__}:#{__LINE__-1}: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call\n", warning[0]) assert_match(/warning: The called method (?:`.*' )?is defined here|warning: test warning/, warning[1]) warning = capture_warning_warn {warn("test warning", **{uplevel: 0})} assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 9a3a0f8e1a5d92..c66446d2e8399e 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2284,7 +2284,7 @@ def test_open_redirect_keyword def o.to_open(**kw); kw; end assert_equal({:a=>1}, open(o, a: 1)) - w = /The last argument is used as keyword parameters.*The called method `(to_)?open'/m + w = /Using the last argument as keyword parameters is deprecated.*The called method `(to_)?open'/m redefined = nil w.singleton_class.define_method(:===) do |s| match = super(s) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index bfdec6fc7470cf..bbf3953c17cfb6 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -24,7 +24,7 @@ def f2(x, str: "foo", num: 424242) def test_f2 assert_equal([:xyz, "foo", 424242], f2(:xyz)) - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `f2'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `f2'/m) do assert_equal([{"bar"=>42}, "foo", 424242], f2("bar"=>42)) end end @@ -224,10 +224,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(kw, c.m(kw, **kw)) @@ -248,11 +248,11 @@ def c.m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -260,25 +260,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end assert_equal([h, kw], c.m(h)) @@ -296,11 +296,11 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.m(**h2)) assert_equal([1, h3], c.m(**h3)) assert_equal([1, h3], c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal([1, h], c.m(h)) end assert_equal([h2, kw], c.m(h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_equal([h2, h], c.m(h3)) end end @@ -357,11 +357,11 @@ def m(args) args end end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -383,11 +383,11 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -398,31 +398,31 @@ def m(arg, **args) end end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**{}) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**kw) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -493,11 +493,11 @@ def m(args) args end end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -519,11 +519,11 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -534,31 +534,31 @@ def m(arg, **args) end end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**{}) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.m(**kw) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -592,10 +592,10 @@ def test_lambda_kwsplat_call assert_raise(ArgumentError) { f[**h3] } f = ->(a) { a } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, f[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, f[**kw]) end assert_equal(h, f[**h]) @@ -612,34 +612,34 @@ def test_lambda_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/The last argument is used as keyword parameters.*The called method `\[\]'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `\[\]'/m) do assert_equal(h, f[h]) end assert_raise(ArgumentError) { f[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `\[\]'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `\[\]'/m) do assert_raise(ArgumentError) { f[h3] } end f = ->(a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([{}, {}], f[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([{}, {}], f[**kw]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([h, {}], f[**h]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([h, {}], f[a: 1]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([h2, {}], f[**h2]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([h3, {}], f[**h3]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `\[\]'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do assert_equal([h3, {}], f[a: 1, **h2]) end @@ -670,10 +670,10 @@ def test_lambda_method_kwsplat_call f = ->(a) { a } f = f.method(:call) - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, f[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, f[**kw]) end assert_equal(h, f[**h]) @@ -691,35 +691,35 @@ def test_lambda_method_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(h, f[h]) end assert_raise(ArgumentError) { f[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_raise(ArgumentError) { f[h3] } end f = ->(a, **x) { [a,x] } f = f.method(:call) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], f[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], f[**kw]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], f[**h]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], f[a: 1]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, {}], f[**h2]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], f[**h3]) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], f[a: 1, **h2]) end @@ -751,10 +751,10 @@ def test_Thread_new_kwsplat assert_raise(ArgumentError) { t.new(**h3, &f).value } f = ->(a) { a } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, t.new(**{}, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, t.new(**kw, &f).value) end assert_equal(h, t.new(**h, &f).value) @@ -771,34 +771,34 @@ def test_Thread_new_kwsplat assert_equal(h2, t.new(**h2, &f).value) assert_equal(h3, t.new(**h3, &f).value) assert_equal(h3, t.new(a: 1, **h2, &f).value) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(h, t.new(h, &f).value) end assert_raise(ArgumentError) { t.new(h2, &f).value } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_raise(ArgumentError) { t.new(h3, &f).value } end f = ->(a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], t.new(**{}, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], t.new(**kw, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], t.new(**h, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], t.new(a: 1, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, {}], t.new(**h2, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], t.new(**h3, &f).value) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], t.new(a: 1, **h2, &f).value) end @@ -830,10 +830,10 @@ def test_Fiber_resume_kwsplat assert_raise(ArgumentError) { t.new(&f).resume(**h3) } f = ->(a) { a } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, t.new(&f).resume(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, t.new(&f).resume(**kw)) end assert_equal(h, t.new(&f).resume(**h)) @@ -850,34 +850,34 @@ def test_Fiber_resume_kwsplat assert_equal(h2, t.new(&f).resume(**h2)) assert_equal(h3, t.new(&f).resume(**h3)) assert_equal(h3, t.new(&f).resume(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(h, t.new(&f).resume(h)) end assert_raise(ArgumentError) { t.new(&f).resume(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_raise(ArgumentError) { t.new(&f).resume(h3) } end f = ->(a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], t.new(&f).resume(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], t.new(&f).resume(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], t.new(&f).resume(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], t.new(&f).resume(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, {}], t.new(&f).resume(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], t.new(&f).resume(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], t.new(&f).resume(a: 1, **h2)) end @@ -907,10 +907,10 @@ def test_Enumerator_Generator_each_kwsplat assert_raise(ArgumentError) { g.new(&f).each(**h3) } f = ->(_, a) { a } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, g.new(&f).each(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, g.new(&f).each(**kw)) end assert_equal(h, g.new(&f).each(**h)) @@ -927,34 +927,34 @@ def test_Enumerator_Generator_each_kwsplat assert_equal(h2, g.new(&f).each(**h2)) assert_equal(h3, g.new(&f).each(**h3)) assert_equal(h3, g.new(&f).each(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(h, g.new(&f).each(h)) end assert_raise(ArgumentError) { g.new(&f).each(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_raise(ArgumentError) { g.new(&f).each(h3) } end f = ->(_, a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], g.new(&f).each(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], g.new(&f).each(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], g.new(&f).each(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], g.new(&f).each(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, {}], g.new(&f).each(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], g.new(&f).each(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], g.new(&f).each(a: 1, **h2)) end @@ -984,10 +984,10 @@ def test_Enumerator_Yielder_yield_kwsplat assert_raise(ArgumentError) { g.new{|y| y.yield(**h3)}.each(&f) } f = ->(a) { a } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, g.new{|y| y.yield(**{})}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, g.new{|y| y.yield(**kw)}.each(&f)) end assert_equal(h, g.new{|y| y.yield(**h)}.each(&f)) @@ -1004,34 +1004,34 @@ def test_Enumerator_Yielder_yield_kwsplat assert_equal(h2, g.new{|y| y.yield(**h2)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(**h3)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(a: 1, **h2)}.each(&f)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(h, g.new{|y| y.yield(h)}.each(&f)) end assert_raise(ArgumentError) { g.new{|y| y.yield(h2)}.each(&f) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_raise(ArgumentError) { g.new{|y| y.yield(h3)}.each(&f) } end f = ->(a, **x) { [a,x] } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], g.new{|y| y.yield(**{})}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([{}, {}], g.new{|y| y.yield(**kw)}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], g.new{|y| y.yield(**h)}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, {}], g.new{|y| y.yield(a: 1)}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, {}], g.new{|y| y.yield(**h2)}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], g.new{|y| y.yield(**h3)}.each(&f)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, {}], g.new{|y| y.yield(a: 1, **h2)}.each(&f)) end @@ -1087,10 +1087,10 @@ def initialize(args) @args = args end end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal(kw, c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal(kw, c[**kw].args) end assert_equal(h, c[**h].args) @@ -1111,11 +1111,11 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do assert_equal(h, c[h].args) end assert_raise(ArgumentError) { c[h2].args } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `initialize'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `initialize'/m) do assert_raise(ArgumentError) { c[h3].args } end @@ -1124,25 +1124,25 @@ def initialize(arg, **args) @args = [arg, args] end end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([kw, kw], c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([kw, kw], c[**kw].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h, kw], c[**h].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h, kw], c[a: 1].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h2, kw], c[**h2].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h3, kw], c[**h3].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h3, kw], c[a: 1, **h2].args) end @@ -1199,10 +1199,10 @@ def initialize(args) @args = args end end.method(:new) - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal(kw, c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal(kw, c[**kw].args) end assert_equal(h, c[**h].args) @@ -1223,11 +1223,11 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do assert_equal(h, c[h].args) end assert_raise(ArgumentError) { c[h2].args } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `initialize'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `initialize'/m) do assert_raise(ArgumentError) { c[h3].args } end @@ -1236,25 +1236,25 @@ def initialize(arg, **args) @args = [arg, args] end end.method(:new) - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([kw, kw], c[**{}].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([kw, kw], c[**kw].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h, kw], c[**h].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h, kw], c[a: 1].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h2, kw], c[**h2].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h3, kw], c[**h3].args) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `initialize'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do assert_equal([h3, kw], c[a: 1, **h2].args) end @@ -1304,10 +1304,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.method(:m)[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.method(:m)[**kw]) end assert_equal(h, c.method(:m)[**h]) @@ -1327,11 +1327,11 @@ def c.m(**args) assert_equal(h2, c.method(:m)[**h2]) assert_equal(h3, c.method(:m)[**h3]) assert_equal(h3, c.method(:m)[a: 1, **h2]) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.method(:m)[h]) end assert_raise(ArgumentError) { c.method(:m)[h2] } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.method(:m)[h3] } end @@ -1339,25 +1339,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], c.method(:m)[**{}]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], c.method(:m)[**kw]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.method(:m)[**h]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.method(:m)[a: 1]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.method(:m)[**h2]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.method(:m)[**h3]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.method(:m)[a: 1, **h2]) end @@ -1407,10 +1407,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, sc.instance_method(:m).bind_call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, sc.instance_method(:m).bind_call(c, **kw)) end assert_equal(h, sc.instance_method(:m).bind_call(c, **h)) @@ -1430,11 +1430,11 @@ def c.m(**args) assert_equal(h2, sc.instance_method(:m).bind_call(c, **h2)) assert_equal(h3, sc.instance_method(:m).bind_call(c, **h3)) assert_equal(h3, sc.instance_method(:m).bind_call(c, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, sc.instance_method(:m).bind_call(c, h)) end assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h3) } end @@ -1442,25 +1442,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], sc.instance_method(:m).bind_call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], sc.instance_method(:m).bind_call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], sc.instance_method(:m).bind_call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, a: 1, **h2)) end @@ -1509,10 +1509,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.send(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.send(:m, **kw)) end assert_equal(h, c.send(:m, **h)) @@ -1532,11 +1532,11 @@ def c.m(**args) assert_equal(h2, c.send(:m, **h2)) assert_equal(h3, c.send(:m, **h3)) assert_equal(h3, c.send(:m, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.send(:m, h)) end assert_raise(ArgumentError) { c.send(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.send(:m, h3) } end @@ -1544,25 +1544,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.send(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.send(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.send(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.send(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.send(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.send(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.send(:m, a: 1, **h2)) end @@ -1611,10 +1611,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.public_send(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.public_send(:m, **kw)) end assert_equal(h, c.public_send(:m, **h)) @@ -1634,11 +1634,11 @@ def c.m(**args) assert_equal(h2, c.public_send(:m, **h2)) assert_equal(h3, c.public_send(:m, **h3)) assert_equal(h3, c.public_send(:m, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.public_send(:m, h)) end assert_raise(ArgumentError) { c.public_send(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.public_send(:m, h3) } end @@ -1646,25 +1646,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.public_send(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do c.public_send(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.public_send(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.public_send(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.public_send(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.public_send(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.public_send(:m, a: 1, **h2)) end @@ -1716,10 +1716,10 @@ def c.m(args) args end m = c.method(:send) - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, m.call(:m, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, m.call(:m, **kw)) end assert_equal(h, m.call(:m, **h)) @@ -1740,11 +1740,11 @@ def c.m(**args) assert_equal(h2, m.call(:m, **h2)) assert_equal(h3, m.call(:m, **h3)) assert_equal(h3, m.call(:m, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, m.call(:m, h)) end assert_raise(ArgumentError) { m.call(:m, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { m.call(:m, h3) } end @@ -1753,25 +1753,25 @@ def c.m(arg, **args) [arg, args] end m = c.method(:send) - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do m.call(:m, **{}) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do m.call(:m, **kw) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], m.call(:m, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], m.call(:m, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], m.call(:m, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], m.call(:m, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], m.call(:m, a: 1, **h2)) end @@ -1821,10 +1821,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, :m.to_proc.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, :m.to_proc.call(c, **kw)) end assert_equal(h, :m.to_proc.call(c, **h)) @@ -1844,11 +1844,11 @@ def c.m(**args) assert_equal(h2, :m.to_proc.call(c, **h2)) assert_equal(h3, :m.to_proc.call(c, **h3)) assert_equal(h3, :m.to_proc.call(c, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, :m.to_proc.call(c, h)) end assert_raise(ArgumentError) { :m.to_proc.call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { :m.to_proc.call(c, h3) } end @@ -1856,25 +1856,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], :m.to_proc.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], :m.to_proc.call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], :m.to_proc.call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], :m.to_proc.call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], :m.to_proc.call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], :m.to_proc.call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], :m.to_proc.call(c, a: 1, **h2)) end @@ -1924,10 +1924,10 @@ def c.m; end def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, m.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, m.call(c, **kw)) end assert_equal(h, m.call(c, **h)) @@ -1947,11 +1947,11 @@ def c.m(**args) assert_equal(h2, m.call(c, **h2)) assert_equal(h3, m.call(c, **h3)) assert_equal(h3, m.call(c, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, m.call(c, h)) end assert_raise(ArgumentError) { m.call(c, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { m.call(c, h3) } end @@ -1959,25 +1959,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], m.call(c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], m.call(c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], m.call(c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], m.call(c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], m.call(c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], m.call(c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], m.call(c, a: 1, **h2)) end @@ -2026,10 +2026,10 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2049,11 +2049,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2061,25 +2061,25 @@ def c.method_missing(_, **args) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2137,11 +2137,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2161,11 +2161,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `m'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2178,31 +2178,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2252,10 +2252,10 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2275,11 +2275,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2287,25 +2287,25 @@ def c.method_missing(_, **args) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.m(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2344,10 +2344,10 @@ class << c class << c define_method(:m) {|arg| arg } end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, c.m(**kw)) end assert_equal(h, c.m(**h)) @@ -2379,11 +2379,11 @@ class << c assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal(h, c.m(h)) end assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/The last argument is split into positional and keyword parameters/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do assert_raise(ArgumentError) { c.m(h3) } end @@ -2391,25 +2391,25 @@ class << c class << c define_method(:m) {|arg, **opt| [arg, opt] } end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([kw, kw], c.m(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([kw, kw], c.m(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], c.m(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], c.m(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h2, kw], c.m(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], c.m(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], c.m(a: 1, **h2)) end @@ -2429,10 +2429,10 @@ class << c class << c define_method(:m) {|*args, **opt| [args, opt] } end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[], h], c.m(h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[h], h], c.m(h, h)) end @@ -2440,10 +2440,10 @@ class << c class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([h2, 1], c.m(h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([h2, 1], c.m(**h3)) end end @@ -2472,10 +2472,10 @@ class << c define_method(:m) {|arg| arg } end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, m.call(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, m.call(**kw)) end assert_equal(h, m.call(**h)) @@ -2509,11 +2509,11 @@ class << c assert_equal(h2, m.call(**h2)) assert_equal(h3, m.call(**h3)) assert_equal(h3, m.call(a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal(h, m.call(h)) end assert_raise(ArgumentError) { m.call(h2) } - assert_warn(/The last argument is split into positional and keyword parameters/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do assert_raise(ArgumentError) { m.call(h3) } end @@ -2522,25 +2522,25 @@ class << c define_method(:m) {|arg, **opt| [arg, opt] } end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([kw, kw], m.call(**{})) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([kw, kw], m.call(**kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], m.call(**h)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], m.call(a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h2, kw], m.call(**h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], m.call(**h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], m.call(a: 1, **h2)) end @@ -2562,10 +2562,10 @@ class << c define_method(:m) {|*args, **opt| [args, opt] } end m = c.method(:m) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[], h], m.call(h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[h], h], m.call(h, h)) end @@ -2574,10 +2574,10 @@ class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end m = c.method(:m) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([h2, 1], m.call(h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method is defined here/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([h2, 1], m.call(**h3)) end end @@ -2631,10 +2631,10 @@ def test_attr_writer_kwsplat class << c attr_writer :m end - assert_warn(/The keyword argument for `m=' is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument for `m=' as the last hash parameter is deprecated/) do c.send(:m=, **{}) end - assert_warn(/The keyword argument for `m=' is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument for `m=' as the last hash parameter is deprecated/) do c.send(:m=, **kw) end assert_equal(h, c.send(:m=, **h)) @@ -2663,10 +2663,10 @@ class << c attr_writer :m end m = c.method(:m=) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do m.call(**{}) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do m.call(**kw) end assert_equal(h, m.call(**h)) @@ -2691,11 +2691,11 @@ def test_proc_ruby2_keywords assert_equal([[1], h1], foo.call(1, :a=>1, &->(*args, **kw){[args, kw]})) assert_equal([1, h1], foo.call(1, :a=>1, &->(*args){args})) - assert_warn(/The last argument is used as keyword parameters/) do + assert_warn(/Using the last argument as keyword parameters is deprecated/) do assert_equal([[1], h1], foo.call(1, {:a=>1}, &->(*args, **kw){[args, kw]})) end assert_equal([1, h1], foo.call(1, {:a=>1}, &->(*args){args})) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h1, {}], foo.call(:a=>1, &->(arg, **kw){[arg, kw]})) end assert_equal(h1, foo.call(:a=>1, &->(arg){arg})) @@ -2907,19 +2907,19 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_foo_bar(h1, **{})) assert_equal([h1], o.foo_foo_baz(h1, **{})) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.foo(:bar, 1, h1)) end assert_equal([1, h1], o.foo(:baz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.bfoo(:bar, 1, h1)) end assert_equal([1, h1], o.bfoo(:baz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.store_foo(:bar, 1, h1)) end assert_equal([1, h1], o.store_foo(:baz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.foo_bar(1, h1)) end assert_equal([1, h1], o.foo_baz(1, h1)) @@ -2971,33 +2971,33 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_dbar(h1, **{})) assert_equal([h1], o.foo_dbaz(h1, **{})) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[1], h1], o.foo(:dbar, 1, h1)) end assert_equal([1, h1], o.foo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[1], h1], o.bfoo(:dbar, 1, h1)) end assert_equal([1, h1], o.bfoo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[1], h1], o.store_foo(:dbar, 1, h1)) end assert_equal([1, h1], o.store_foo(:dbaz, 1, h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal([[1], h1], o.foo_dbar(1, h1)) end assert_equal([1, h1], o.foo_dbaz(1, h1)) assert_equal([[1], h1], o.block(1, :a=>1)) assert_equal([[1], h1], o.block(1, **h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal([[1], h1], o.block(1, h1)) end assert_equal([[h1], {}], o.block(h1, **{})) assert_equal([[1], h1], o.cfunc(1, :a=>1)) assert_equal([[1], h1], o.cfunc(1, **h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do assert_equal([[1], h1], o.cfunc(1, h1)) end assert_equal([[h1], {}], o.cfunc(h1, **{})) @@ -3005,7 +3005,7 @@ def method_missing(*args) o = mmkw.new assert_equal([[:b, 1], h1], o.b(1, :a=>1)) assert_equal([[:b, 1], h1], o.b(1, **h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([[:b, 1], h1], o.b(1, h1)) end assert_equal([[:b, h1], {}], o.b(h1, **{})) @@ -3019,7 +3019,7 @@ def method_missing(*args) o = implicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.bar(1, h1)) end assert_equal([[h1], {}], o.bar(h1, **{})) @@ -3032,7 +3032,7 @@ def method_missing(*args) o = explicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.bar(1, h1)) end assert_equal([[h1], {}], o.bar(h1, **{})) @@ -3048,11 +3048,11 @@ def bar(*args, **kw) [args, kw] end end - assert_warn(/The last argument is used as keyword parameters.*The called method `bar'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do assert_equal([[1], h1], o.foo(:pass_bar, 1, :a=>1)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `initialize'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do assert_equal([[1], h1], o.foo(:pass_cfunc, 1, :a=>1)) end @@ -3142,23 +3142,23 @@ def c.dig(**args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal(h, [c].dig(0, **h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal(h, [c].dig(0, a: 1)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, **h3) } end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } end - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal(h, [c].dig(0, h)) end assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_raise(ArgumentError) { [c].dig(0, h3) } end @@ -3180,24 +3180,24 @@ def c.dig(arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, **h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, a: 1)) end assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, **h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, a: 1, **h2)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `dig'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([1, h], [c].dig(0, h)) end assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `dig'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do assert_equal([h2, h], [c].dig(0, h3)) end assert_equal([h, kw], [c].dig(0, h, **{})) @@ -3252,23 +3252,23 @@ def c.method_missing(_, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, **h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, a: 1)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, **h3) } end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } end - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal(h, [c].dig(0, h)) end assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_raise(ArgumentError) { [c].dig(0, h3) } end @@ -3290,24 +3290,24 @@ def c.method_missing(_, arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, **h)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, a: 1)) end assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, **h3)) end - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, a: 1, **h2)) end - assert_warn(/The last argument is used as keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([1, h], [c].dig(0, h)) end assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `method_missing'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do assert_equal([h2, h], [c].dig(0, h3)) end assert_equal([h, kw], [c].dig(0, h, **{})) @@ -3342,10 +3342,10 @@ def test_enumerator_size_kwsplat assert_raise(ArgumentError) { c.to_enum(:each, a: 1, **h2, &m).size } m = ->(args){ args } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, c.to_enum(:each, **{}, &m).size) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal(kw, c.to_enum(:each, **kw, &m).size) end assert_equal(kw, c.to_enum(:each, kw, **kw, &m).size) @@ -3363,34 +3363,34 @@ def test_enumerator_size_kwsplat assert_equal(h2, c.to_enum(:each, **h2, &m).size) assert_equal(h3, c.to_enum(:each, **h3, &m).size) assert_equal(h3, c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal(h, c.to_enum(:each, h, &m).size) end assert_raise(ArgumentError) { c.to_enum(:each, h2, &m).size } - assert_warn(/The last argument is split into positional and keyword parameters/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do assert_raise(ArgumentError) { c.to_enum(:each, h3, &m).size } end m = ->(arg, **args){ [arg, args] } - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do c.to_enum(:each, **{}, &m).size end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do c.to_enum(:each, **kw, &m).size end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], c.to_enum(:each, **h, &m).size) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h, kw], c.to_enum(:each, a: 1, &m).size) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h2, kw], c.to_enum(:each, **h2, &m).size) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], c.to_enum(:each, **h3, &m).size) end - assert_warn(/The keyword argument is passed as the last hash parameter/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do assert_equal([h3, kw], c.to_enum(:each, a: 1, **h2, &m).size) end assert_equal([h, kw], c.to_enum(:each, h, &m).size) @@ -3405,11 +3405,11 @@ def test_enumerator_size_kwsplat assert_equal([1, h2], c.to_enum(:each, **h2, &m).size) assert_equal([1, h3], c.to_enum(:each, **h3, &m).size) assert_equal([1, h3], c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal([1, h], c.to_enum(:each, h, &m).size) end assert_equal([h2, kw], c.to_enum(:each, h2, &m).size) - assert_warn(/The last argument is split into positional and keyword parameters/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do assert_equal([h2, h], c.to_enum(:each, h3, &m).size) end end @@ -3440,10 +3440,10 @@ def test_instance_exec_kwsplat assert_raise(ArgumentError) { c.instance_exec(a: 1, **h2, &m) } m = ->(args) { args } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**{}, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**kw, &m)) end assert_equal(kw, c.instance_exec(kw, **kw, &m)) @@ -3461,34 +3461,34 @@ def test_instance_exec_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/) do + assert_warn(/Using the last argument as keyword parameters is deprecated/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_raise(ArgumentError) { c.instance_exec(h3, &m) } end m = ->(arg, **args) { [arg, args] } - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**{}, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**kw, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(**h, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(a: 1, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, kw], c.instance_exec(**h2, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(**h3, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) end assert_equal([h, kw], c.instance_exec(h, &m)) @@ -3503,11 +3503,11 @@ def test_instance_exec_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/The last argument is split into positional and keyword parameters/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do assert_equal([h2, h], c.instance_exec(h3, &m)) end end @@ -3548,10 +3548,10 @@ def c.m(args) args end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**{}, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**kw, &m)) end assert_equal(kw, c.instance_exec(kw, **kw, &m)) @@ -3573,11 +3573,11 @@ def c.m(**args) assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/) do + assert_warn(/Using the last argument as keyword parameters is deprecated/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_raise(ArgumentError) { c.instance_exec(h3, &m) } end @@ -3586,25 +3586,25 @@ def c.m(arg, **args) [arg, args] end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**{}, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**kw, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(**h, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(a: 1, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, kw], c.instance_exec(**h2, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(**h3, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) end assert_equal([h, kw], c.instance_exec(h, &m)) @@ -3623,11 +3623,11 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_equal([h2, h], c.instance_exec(h3, &m)) end end @@ -3668,10 +3668,10 @@ def test_instance_exec_define_method_kwsplat args end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**{}, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(**kw, &m)) end assert_equal(kw, c.instance_exec(kw, **kw, &m)) @@ -3693,11 +3693,11 @@ def test_instance_exec_define_method_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/) do + assert_warn(/Using the last argument as keyword parameters is deprecated/) do assert_equal(h, c.instance_exec(h, &m)) end assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_raise(ArgumentError) { c.instance_exec(h3, &m) } end @@ -3706,25 +3706,25 @@ def test_instance_exec_define_method_kwsplat [arg, args] end m = c.method(:m) - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**{}, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(**kw, &m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(**h, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(a: 1, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, kw], c.instance_exec(**h2, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(**h3, &m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) end assert_equal([h, kw], c.instance_exec(h, &m)) @@ -3743,11 +3743,11 @@ def test_instance_exec_define_method_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal([1, h], c.instance_exec(h, &m)) end assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_equal([h2, h], c.instance_exec(h3, &m)) end end @@ -3785,10 +3785,10 @@ def c.m def c.m(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(c, **{}, &:m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal(kw, c.instance_exec(c, **kw, &:m)) end assert_equal(kw, c.instance_exec(c, kw, **kw, &:m)) @@ -3809,11 +3809,11 @@ def c.m(**args) assert_equal(h2, c.instance_exec(c, **h2, &:m)) assert_equal(h3, c.instance_exec(c, **h3, &:m)) assert_equal(h3, c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/The last argument is used as keyword parameters/) do + assert_warn(/Using the last argument as keyword parameters is deprecated/) do assert_equal(h, c.instance_exec(c, h, &:m)) end assert_raise(ArgumentError) { c.instance_exec(c, h2, &:m) } - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_raise(ArgumentError) { c.instance_exec(c, h3, &:m) } end @@ -3821,25 +3821,25 @@ def c.m(**args) def c.m(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(c, **{}, &:m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do c.instance_exec(c, **kw, &:m) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(c, **h, &:m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h, kw], c.instance_exec(c, a: 1, &:m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h2, kw], c.instance_exec(c, **h2, &:m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(c, **h3, &:m)) end - assert_warn(/The keyword argument is passed as the last hash parameter/) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do assert_equal([h3, kw], c.instance_exec(c, a: 1, **h2, &:m)) end assert_equal([h, kw], c.instance_exec(c, h, &:m)) @@ -3857,11 +3857,11 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(c, **h2, &:m)) assert_equal([1, h3], c.instance_exec(c, **h3, &:m)) assert_equal([1, h3], c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/The last argument is used as keyword parameters/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated/m) do assert_equal([1, h], c.instance_exec(c, h, &:m)) end assert_equal([h2, kw], c.instance_exec(c, h2, &:m)) - assert_warn(/The last argument is split into positional and keyword parameters/) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do assert_equal([h2, h], c.instance_exec(c, h3, &:m)) end end @@ -3902,10 +3902,10 @@ def c.c; end def c.c(args) args end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal(kw, c.m(:c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal(kw, c.m(:c, **kw)) end assert_equal(kw, c.m(:c, kw, **kw)) @@ -3927,11 +3927,11 @@ def c.c(**args) assert_equal([h2, h2], c.m(:c, **h2, &m)) assert_equal([h3, h3], c.m(:c, **h3, &m)) assert_equal([h3, h3], c.m(:c, a: 1, **h2, &m)) - assert_warn(/The last argument is used as keyword parameters.*The called method `c'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `c'/m) do assert_equal([h, h], c.m(:c, h, &m)) end assert_raise(ArgumentError) { c.m(:c, h2, &m) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `c'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `c'/m) do assert_raise(ArgumentError) { c.m(:c, h3, &m) } end @@ -3939,25 +3939,25 @@ def c.c(**args) def c.c(arg, **args) [arg, args] end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([kw, kw], c.m(:c, **{})) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([kw, kw], c.m(:c, **kw)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([h, kw], c.m(:c, **h)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([h, kw], c.m(:c, a: 1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([h2, kw], c.m(:c, **h2)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([h3, kw], c.m(:c, **h3)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `c'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do assert_equal([h3, kw], c.m(:c, a: 1, **h2)) end assert_equal([h, kw], c.m(:c, h)) @@ -3975,11 +3975,11 @@ def c.c(arg=1, **args) assert_equal([1, h2], c.m(:c, **h2)) assert_equal([1, h3], c.m(:c, **h3)) assert_equal([1, h3], c.m(:c, a: 1, **h2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `c'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `c'/m) do assert_equal([1, h], c.m(:c, h)) end assert_equal([h2, kw], c.m(:c, h2)) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `c'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `c'/m) do assert_equal([h2, h], c.m(:c, h3)) end end @@ -4110,22 +4110,22 @@ def test_rest_keyrest bug7665 = '[ruby-core:51278]' bug8463 = '[ruby-core:55203] [Bug #8463]' expect = [*%w[foo bar], {zzz: 42}] - assert_warn(/The last argument is used as keyword parameters.*The called method `rest_keyrest'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `rest_keyrest'/m) do assert_equal(expect, rest_keyrest(*expect), bug7665) end pr = proc {|*args, **opt| next *args, opt} - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(expect, pr.call(*expect), bug7665) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(expect, pr.call(expect), bug8463) end pr = proc {|a, *b, **opt| next a, *b, opt} - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(expect, pr.call(expect), bug8463) end pr = proc {|a, **opt| next a, opt} - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(expect.values_at(0, -1), pr.call(expect), bug8463) end end @@ -4143,13 +4143,13 @@ def splat_plus_keyword(*a, **h) end def test_keyword_split - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do assert_equal([{:a=>1}, {}], req_plus_keyword(:a=>1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do assert_equal([{"a"=>1}, {}], req_plus_keyword("a"=>1)) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `req_plus_keyword'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do assert_equal([{"a"=>1, :a=>1}, {}], req_plus_keyword("a"=>1, :a=>1)) end assert_equal([{:a=>1}, {}], req_plus_keyword({:a=>1})) @@ -4159,22 +4159,22 @@ def test_keyword_split assert_equal([1, {:a=>1}], opt_plus_keyword(:a=>1)) assert_equal([1, {"a"=>1}], opt_plus_keyword("a"=>1)) assert_equal([1, {"a"=>1, :a=>1}], opt_plus_keyword("a"=>1, :a=>1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `opt_plus_keyword'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `opt_plus_keyword'/m) do assert_equal([1, {:a=>1}], opt_plus_keyword({:a=>1})) end assert_equal([{"a"=>1}, {}], opt_plus_keyword({"a"=>1})) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `opt_plus_keyword'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `opt_plus_keyword'/m) do assert_equal([{"a"=>1}, {:a=>1}], opt_plus_keyword({"a"=>1, :a=>1})) end assert_equal([[], {:a=>1}], splat_plus_keyword(:a=>1)) assert_equal([[], {"a"=>1}], splat_plus_keyword("a"=>1)) assert_equal([[], {"a"=>1, :a=>1}], splat_plus_keyword("a"=>1, :a=>1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `splat_plus_keyword'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `splat_plus_keyword'/m) do assert_equal([[], {:a=>1}], splat_plus_keyword({:a=>1})) end assert_equal([[{"a"=>1}], {}], splat_plus_keyword({"a"=>1})) - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `splat_plus_keyword'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `splat_plus_keyword'/m) do assert_equal([[{"a"=>1}], {:a=>1}], splat_plus_keyword({"a"=>1, :a=>1})) end end @@ -4361,7 +4361,7 @@ def foo(a, b, c=1, *d, e, f:2, **g) [a, b, c, d, e, f, g] end end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `foo'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `foo'/m) do assert_equal([1, 2, 1, [], {:f=>5}, 2, {}], a.new.foo(1, 2, f:5), bug8993) end end @@ -4396,10 +4396,10 @@ def test_implicit_hash_conversion o = Object.new def o.to_hash() { k: 9 } end assert_equal([1, 42, [], o, :key, {}, nil], f9(1, o)) - assert_warn(/The last argument is used as keyword parameters.*The called method `m1'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m1'/m) do assert_equal([1, 9], m1(1, o) {|a, k: 0| break [a, k]}, bug10016) end - assert_warn(/The last argument is used as keyword parameters.*The called method `m1'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m1'/m) do assert_equal([1, 9], m1(1, o, &->(a, k: 0) {break [a, k]}), bug10016) end end @@ -4714,11 +4714,11 @@ def c.m(args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal(kw, c.call(**kw, &:m)) end assert_equal(h, c.call(**h, &:m)) @@ -4738,11 +4738,11 @@ def c.m(**args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(h, c.call(h, &:m)) end assert_raise(ArgumentError) { c.call(h2, &:m) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m) } end @@ -4755,31 +4755,31 @@ def c.m(arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([kw, kw], c.call(**kw, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.call(**h, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h, kw], c.call(a: 1, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h2, kw], c.call(**h2, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.call(**h3, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `m'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) end @@ -4834,11 +4834,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.call(**kw, &:m)) end assert_equal(h, c.call(**h, &:m)) @@ -4858,11 +4858,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(h, c.call(h, &:m2)) end assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m2) } end @@ -4875,31 +4875,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**{}, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**kw, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(**h, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(a: 1, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h2, kw], c.call(**h2, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(**h3, &:m)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) end @@ -4954,11 +4954,11 @@ def c.method_missing(_, args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.call(**{}, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal(kw, c.call(**kw, &:m2)) end assert_equal(h, c.call(**h, &:m2)) @@ -4978,11 +4978,11 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m2)) assert_equal(h3, c.call(**h3, &:m2)) assert_equal(h3, c.call(a: 1, **h2, &:m2)) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(h, c.call(h, &:m2)) end assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `call'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do assert_raise(ArgumentError) { c.call(h3, &:m2) } end @@ -4995,31 +4995,31 @@ def c.method_missing(_, arg, **args) END end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**{}, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([kw, kw], c.call(**kw, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(**h, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h, kw], c.call(a: 1, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h2, kw], c.call(**h2, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(**h3, &:m2)) end redef[] - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `method_missing'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do assert_equal([h3, kw], c.call(a: 1, **h2, &:m2)) end diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 2cd363c29a3c77..636f827fe33753 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -293,7 +293,7 @@ def test_step assert_raise(ArgumentError, bug9811) { 1.step(10, 1, by: 11).size } - e = assert_warn(/The last argument is used as keyword parameters/) { + e = assert_warn(/Using the last argument as keyword parameters is deprecated/) { 1.step(10, {by: "1"}) } assert_warn('') { diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index cd5c4458b05e5d..c6572ec1bae56f 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1485,27 +1485,27 @@ def test_compose_keywords g = ->(kw) { kw.merge(:a=>2) } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1515,27 +1515,27 @@ def test_compose_keywords_method f = ->(**kw) { kw.merge(:a=>1) }.method(:call) g = ->(kw) { kw.merge(:a=>2) }.method(:call) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1549,27 +1549,27 @@ def g.to_proc; method(:call).to_proc; end def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `call'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `call'/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1582,27 +1582,27 @@ def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end assert_equal(1, (f << g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (g << f).call(a: 3)[:a]) end assert_equal(1, (g >> f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end assert_equal(1, (f << g).call(**{})[:a]) - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call(**{})[:a]) end end diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 6f31b334b16f96..f13afbbdd4e30b 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -115,7 +115,7 @@ def test_struct_new_with_keyword_init assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect # eval is needed to prevent the warning duplication filter k = eval("Class.new(@Struct::KeywordInitFalse) {def initialize(**) end}") - assert_warn(/The last argument is used as keyword parameters/) {k.new(a: 1, b: 2)} + assert_warn(/Using the last argument as keyword parameters is deprecated/) {k.new(a: 1, b: 2)} k = Class.new(@Struct::KeywordInitTrue) {def initialize(**) end} assert_warn('') {k.new(a: 1, b: 2)} diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 4ad46403989ab7..72f539068d7493 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -182,7 +182,7 @@ def test_keyword_duplicated_splat h = {k3: 31} assert_raise(ArgumentError) {o.kw(**h)} h = {"k1"=>11, k2: 12} - assert_warn(/The last argument is split into positional and keyword parameters.*The called method `kw'/m) do + assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `kw'/m) do assert_raise(ArgumentError) {o.kw(**h)} end end @@ -1523,7 +1523,7 @@ def obj3.bar(*args, &block) assert_warning('') { assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5)) } - warning = "warning: The last argument is used as keyword parameters" + warning = "warning: Using the last argument as keyword parameters is deprecated" assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { assert_equal([[], {}], obj.foo({}) {|*x| x}) } diff --git a/test/test_delegate.rb b/test/test_delegate.rb index a8e938c08ef564..02a343358fbecb 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -190,7 +190,7 @@ def foo.foo(*args, **kw) assert_equal([], d.bar) assert_equal([[], {:a=>1}], d.foo(:a=>1)) assert_equal([{:a=>1}], d.bar(:a=>1)) - assert_warn(/The last argument is used as keyword parameters.*The called method `foo'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `foo'/m) do assert_equal([[], {:a=>1}], d.foo({:a=>1})) end assert_equal([{:a=>1}], d.bar({:a=>1})) diff --git a/vm_args.c b/vm_args.c index 444abf90868397..7bf61cefe73a1e 100644 --- a/vm_args.c +++ b/vm_args.c @@ -645,17 +645,17 @@ rb_warn_keyword_to_last_hash(rb_execution_context_t * const ec, struct rb_callin VALUE name, loc; if (calling->recv == Qundef) { - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); return; } name = rb_id2str(ci->mid); loc = rb_iseq_location(iseq); if (NIL_P(loc)) { - rb_warn("The keyword argument for `%"PRIsVALUE"' is passed as the last hash parameter", + rb_warn("Passing the keyword argument for `%"PRIsVALUE"' as the last hash parameter is deprecated", name); } else { - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); if (name) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), "The called method `%"PRIsVALUE"' is defined here", name); @@ -676,11 +676,11 @@ rb_warn_split_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_ name = rb_id2str(ci->mid); loc = rb_iseq_location(iseq); if (NIL_P(loc)) { - rb_warn("The last argument for `%"PRIsVALUE"' is split into positional and keyword parameters", + rb_warn("Splitting the last argument for `%"PRIsVALUE"' into positional and keyword parameters is deprecated", name); } else { - rb_warn("The last argument is split into positional and keyword parameters"); + rb_warn("Splitting the last argument into positional and keyword parameters is deprecated"); if (calling->recv != Qundef) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), "The called method `%"PRIsVALUE"' is defined here", name); @@ -701,11 +701,11 @@ rb_warn_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_callin name = rb_id2str(ci->mid); loc = rb_iseq_location(iseq); if (NIL_P(loc)) { - rb_warn("The last argument for `%"PRIsVALUE"' is used as keyword parameters; maybe ** should be added to the call", + rb_warn("Using the last argument for `%"PRIsVALUE"' as keyword parameters is deprecated; maybe ** should be added to the call", name); } else { - rb_warn("The last argument is used as keyword parameters; maybe ** should be added to the call"); + rb_warn("Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call"); if (calling->recv != Qundef) { rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), "The called method `%"PRIsVALUE"' is defined here", name); diff --git a/vm_eval.c b/vm_eval.c index bd30b89a2f321a..24d8dcfdf6901c 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -145,7 +145,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc RB_TYPE_P(argv[calling->argc-1], T_HASH) && RHASH_EMPTY_P(argv[calling->argc-1])) { if (calling->argc == 1) { - rb_warn("The keyword argument is passed as the last hash parameter"); + rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } else { calling->argc--; From e50e55269358520dc55595a9c3e074d351d96b66 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 07:00:35 +0900 Subject: [PATCH 097/878] [ruby/rdoc] Treat Proc#call syntax sugar for constant correctly https://github.com/ruby/rdoc/commit/957d041ae0 --- lib/rdoc/parser/ruby.rb | 4 ++++ test/rdoc/test_rdoc_parser_ruby.rb | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index c87765b75a052f..dffe30482b4e33 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -379,6 +379,10 @@ def get_class_or_module container, ignore_constants = false get_tk skip_tkspace_without_nl + if :on_lparen == peek_tk[:kind] # ProcObjectInConstant::() + parse_method_or_yield_parameters + break + end name_t = get_tk unless :on_const == name_t[:kind] || :on_ident == name_t[:kind] raise RDoc::Error, "Invalid class or module definition: #{given_name}" diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb index 99f4de2fcb7854..8673225cadf6f8 100644 --- a/test/rdoc/test_rdoc_parser_ruby.rb +++ b/test/rdoc/test_rdoc_parser_ruby.rb @@ -830,6 +830,17 @@ class Foo assert_equal @top_level, blah.file end + def test_parse_call_syntax_sugar_for_constant + util_parser <<-CODE +Foo = proc{} +Foo::() + CODE + + assert_nothing_raised do + @parser.scan + end + end + def test_parse_class_multi_ghost_methods util_parser <<-'CLASS' class Foo From adc9b3ca7f4e75e368731fe8a7092ce078bcec04 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 07:41:37 +0900 Subject: [PATCH 098/878] [ruby/rdoc] Support newline in the middle of constant definition https://github.com/ruby/rdoc/commit/74d3984324 --- lib/rdoc/parser/ruby.rb | 2 +- test/rdoc/test_rdoc_parser_ruby.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index dffe30482b4e33..8d021f3c6db745 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -378,7 +378,7 @@ def get_class_or_module container, ignore_constants = false record_location container get_tk - skip_tkspace_without_nl + skip_tkspace if :on_lparen == peek_tk[:kind] # ProcObjectInConstant::() parse_method_or_yield_parameters break diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb index 8673225cadf6f8..0c81906090a536 100644 --- a/test/rdoc/test_rdoc_parser_ruby.rb +++ b/test/rdoc/test_rdoc_parser_ruby.rb @@ -100,7 +100,7 @@ def test_get_class_or_module assert_equal 'E', name_t[:text] assert_equal 'D::E', given_name - assert_raise RDoc::Error do + assert_nothing_raised do util_parser("A::\nB").get_class_or_module ctxt end end From 2bf0743edcf6fd70cd73952e1e023821c4549a9e Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 07:58:49 +0900 Subject: [PATCH 099/878] Update parsers of RDoc that are generated by Racc --- lib/rdoc/rd/block_parser.rb | 2 +- lib/rdoc/rd/inline_parser.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb index f7353268625f53..be0b786bfc55c0 100644 --- a/lib/rdoc/rd/block_parser.rb +++ b/lib/rdoc/rd/block_parser.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # # DO NOT MODIFY!!!! -# This file is automatically generated by Racc 1.4.14 +# This file is automatically generated by Racc 1.4.16 # from Racc grammar file "". # diff --git a/lib/rdoc/rd/inline_parser.rb b/lib/rdoc/rd/inline_parser.rb index f73b81ba9de3fc..a64102cac7e05f 100644 --- a/lib/rdoc/rd/inline_parser.rb +++ b/lib/rdoc/rd/inline_parser.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # # DO NOT MODIFY!!!! -# This file is automatically generated by Racc 1.4.14 +# This file is automatically generated by Racc 1.4.16 # from Racc grammar file "". # From 30c5e8c4b9353dfb716033901cec7529eace3922 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 08:03:00 +0900 Subject: [PATCH 100/878] [ruby/rdoc] Version 6.2.1 https://github.com/ruby/rdoc/commit/c65e14d112 --- lib/rdoc/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rdoc/version.rb b/lib/rdoc/version.rb index bf15aa7d79ff94..5c707440610f68 100644 --- a/lib/rdoc/version.rb +++ b/lib/rdoc/version.rb @@ -3,6 +3,6 @@ module RDoc ## # RDoc version you are using - VERSION = '6.2.0' + VERSION = '6.2.1' end From 0231661939310951c8ed339d8600a53a21015918 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 00:13:46 +0100 Subject: [PATCH 101/878] [DOC] Fix wording in Math::E documentation --- math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.c b/math.c index b28cabd881245a..d98467ca0a54bf 100644 --- a/math.c +++ b/math.c @@ -984,7 +984,7 @@ InitVM_Math(void) rb_define_const(rb_mMath, "PI", DBL2NUM(M_PI)); #ifdef M_E - /* Definition of the mathematical constant for Euler's number E (e) as a Float number. */ + /* Definition of the mathematical constant E for Euler's number (e) as a Float number. */ rb_define_const(rb_mMath, "E", DBL2NUM(M_E)); #else rb_define_const(rb_mMath, "E", DBL2NUM(exp(1.0))); From 0e528ae9cb5c1078e4d07287e403cb548e97f0a3 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 09:53:43 +0900 Subject: [PATCH 102/878] [ruby/irb] Remove warning message to bundle on Ruby 2.7.0 https://github.com/ruby/irb/commit/d9a7844f50 --- lib/irb/context.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/irb/context.rb b/lib/irb/context.rb index cba2618d25617f..686738cd40faf9 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -83,12 +83,6 @@ def initialize(irb, workspace = nil, input_method = nil) when nil if STDIN.tty? && IRB.conf[:PROMPT_MODE] != :INF_RUBY && !use_singleline? # Both of multiline mode and singleline mode aren't specified. - puts <<~EOM - This version of IRB is drastically different from the previous version. - If you hit any issues, you can use "irb --legacy" to run the old version. - If you want to just erase this message, please use "irb --multiline" or - add `IRB.conf[:USE_MULTILINE] = true` to your ~/.irbrc file. - EOM @io = ReidlineInputMethod.new else @io = nil From 8316b330fb04413bb480462941cb6b14c5352e2e Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 09:54:38 +0900 Subject: [PATCH 103/878] [ruby/irb] Version 1.2.1 https://github.com/ruby/irb/commit/8da0c74640 --- lib/irb/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/irb/version.rb b/lib/irb/version.rb index e95783dc1922ca..9b8bd9b161b4f8 100644 --- a/lib/irb/version.rb +++ b/lib/irb/version.rb @@ -11,7 +11,7 @@ # module IRB # :nodoc: - VERSION = "1.2.0" + VERSION = "1.2.1" @RELEASE_VERSION = VERSION - @LAST_UPDATE_DATE = "2019-12-07" + @LAST_UPDATE_DATE = "2019-12-24" end From 5e17834fc900a699241764ef0baacd53992d7f07 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 09:55:05 +0900 Subject: [PATCH 104/878] [ruby/reline] Version 0.1.0 https://github.com/ruby/reline/commit/55d4dfec1e --- lib/reline/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/version.rb b/lib/reline/version.rb index 44ee2d59c4871d..5c68b1c26c4d55 100644 --- a/lib/reline/version.rb +++ b/lib/reline/version.rb @@ -1,3 +1,3 @@ module Reline - VERSION = '0.0.7' + VERSION = '0.1.0' end From 360f153fcaab637486aa2669d354d53e0eb1c3d2 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 24 Dec 2019 10:23:38 +0900 Subject: [PATCH 105/878] remove "experimental" from numbered parameter. Numbered parameter is not an experimental feature, confirmed by Matz. https://twitter.com/yukihiro_matz/status/1209271452798607361 --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c76e2d9098e807..0d4b798ca4eac0 100644 --- a/NEWS +++ b/NEWS @@ -130,8 +130,8 @@ sufficient information, see the ChangeLog file or Redmine ==== Numbered parameters -* Numbered parameters as default block parameters are introduced - as an experimental feature. [Feature #4475] +* Numbered parameters as default block parameters are introduced. + [Feature #4475] [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] [[1, 2], [3, 4]].map { _1 + _2 } #=> [3, 7] From f09a4ff265093742c356c69bcf56db68bd6cf064 Mon Sep 17 00:00:00 2001 From: manga_osyo Date: Tue, 24 Dec 2019 09:53:36 +0900 Subject: [PATCH 106/878] Added NEWS for Feature 15373 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 0d4b798ca4eac0..4ebe7f00764dc4 100644 --- a/NEWS +++ b/NEWS @@ -225,6 +225,8 @@ sufficient information, see the ChangeLog file or Redmine warned in verbose mode. This warning will be disabled even in non-verbose mode in Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131] +* Refinements take place at Object#method and Module#instance_method. [Feature #15373] + === Core classes updates (outstanding ones only) Array:: From 992aa2cda50140abbca165024682eae998756e2d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 10:24:45 +0900 Subject: [PATCH 107/878] enc/x_emoji.h: fixed dead-links [ci skip] English version pages seem no longer provided. --- enc/x_emoji.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/enc/x_emoji.h b/enc/x_emoji.h index 23efa1dd9e7d3f..c0a3613f1bb971 100644 --- a/enc/x_emoji.h +++ b/enc/x_emoji.h @@ -2,8 +2,8 @@ /* * Name: UTF8-DoCoMo, SJIS-DoCoMo - * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/basic/index.html - * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/extention/index.html + * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/basic/index.html + * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/extent%69on/index.html */ ENC_REPLICATE("UTF8-DoCoMo", "UTF-8") ENC_REPLICATE("SJIS-DoCoMo", "Windows-31J") From e954be14d07e54b8dbf71c0fa227e5818eaa01e6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 10:27:18 +0900 Subject: [PATCH 108/878] Get rid of false positive misspellings [Bug #16437] --- missing/procstat_vm.c | 2 +- spec/ruby/core/file/readlink_spec.rb | 2 +- test/openssl/test_x509name.rb | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/missing/procstat_vm.c b/missing/procstat_vm.c index f56c406bf923af..76fd8f61ba2b50 100644 --- a/missing/procstat_vm.c +++ b/missing/procstat_vm.c @@ -19,7 +19,7 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) #endif fprintf(stderr, "%*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n", ptrwidth, "START", ptrwidth, "END", "PRT", "RES", - "PRES", "REF", "SHD", "FL", "TP", "PATH"); + "P""RES", "REF", "SHD", "FL", "TP", "PATH"); #ifdef HAVE_PROCSTAT_GETVMMAP freep = procstat_getvmmap(procstat, kipp, &cnt); diff --git a/spec/ruby/core/file/readlink_spec.rb b/spec/ruby/core/file/readlink_spec.rb index eb3bfda30e3c37..20741ba121fe89 100644 --- a/spec/ruby/core/file/readlink_spec.rb +++ b/spec/ruby/core/file/readlink_spec.rb @@ -26,7 +26,7 @@ it "raises an Errno::ENOENT if there is no such file" do # TODO: missing_file - -> { File.readlink("/this/surely/doesnt/exist") }.should raise_error(Errno::ENOENT) + -> { File.readlink("/this/surely/does/not/exist") }.should raise_error(Errno::ENOENT) end it "raises an Errno::EINVAL if called with a normal file" do diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index f0146595d613f5..8a4596ea6ed3a3 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -242,15 +242,16 @@ def test_s_parse_rfc2253 assert_match(/^multi-valued RDN is not supported: #{dn_r}/, ex.message) } + bad_dc = "exa#{"pm"}le" # <- typo of "example" [ - ["DC=org,DC=exapmle,CN", "CN"], + ["DC=org,DC=#{bad_dc},CN", "CN"], ["DC=org,DC=example,", ""], - ["DC=org,DC=exapmle,CN=www.example.org;", "CN=www.example.org;"], - ["DC=org,DC=exapmle,CN=#www.example.org", "CN=#www.example.org"], - ["DC=org,DC=exapmle,CN=#777777.example.org", "CN=#777777.example.org"], - ["DC=org,DC=exapmle,CN=\"www.example\".org", "CN=\"www.example\".org"], - ["DC=org,DC=exapmle,CN=www.\"example.org\"", "CN=www.\"example.org\""], - ["DC=org,DC=exapmle,CN=www.\"example\".org", "CN=www.\"example\".org"], + ["DC=org,DC=#{bad_dc},CN=www.example.org;", "CN=www.example.org;"], + ["DC=org,DC=#{bad_dc},CN=#www.example.org", "CN=#www.example.org"], + ["DC=org,DC=#{bad_dc},CN=#777777.example.org", "CN=#777777.example.org"], + ["DC=org,DC=#{bad_dc},CN=\"www.example\".org", "CN=\"www.example\".org"], + ["DC=org,DC=#{bad_dc},CN=www.\"example.org\"", "CN=www.\"example.org\""], + ["DC=org,DC=#{bad_dc},CN=www.\"example\".org", "CN=www.\"example\".org"], ].each{|dn, msg| ex = scanner.call(dn) rescue $! assert_match(/^malformed RDN: .*=>#{Regexp.escape(msg)}/, ex.message) From f2e1e6cba451375d8eb839bf2e7c9a39bccc044c Mon Sep 17 00:00:00 2001 From: zverok Date: Sat, 21 Dec 2019 23:23:20 +0200 Subject: [PATCH 109/878] Enhance explanations for beginless range and #clamp, and add missing feature --- NEWS | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4ebe7f00764dc4..c34ffaeca2e201 100644 --- a/NEWS +++ b/NEWS @@ -161,10 +161,19 @@ sufficient information, see the ChangeLog file or Redmine ==== Other miscellaneous changes -* A beginless range is experimentally introduced. It might not be as useful - as an endless range, but would be good for DSL purposes. [Feature #14799] +* A beginless range is experimentally introduced. It might be useful + in +case+, new call-sequence of the Comparable#clamp, + constants and DSLs. [Feature #14799] ary[..3] # identical to ary[0..3] + + case RUBY_VERSION + when ..."2.4" then puts "EOL" + # ... + end + + age.clamp(..100) + where(sales: ..100) * Setting $; to a non-nil value is warned now. @@ -246,6 +255,10 @@ Comparable:: -1.clamp(0..2) #=> 0 1.clamp(0..2) #=> 1 3.clamp(0..2) #=> 2 + # With beginless and endless ranges: + -1.clamp(0..) #=> 0 + 3.clamp(..2) #=> 2 + Complex:: @@ -414,6 +427,12 @@ Range:: * Added Range#minmax, with a faster implementation than Enumerable#minmax. It returns a maximum that now corresponds to Range#max. [Bug #15807] + Modified method:: + + * Range#=== now uses #cover? for String arguments, too (in Ruby 2.6, it was + changed from #include? for all types except strings). [Bug #15449] + + RubyVM:: Removed method:: From 5a62fb1277fb351a1a11b89b0f8510c8f1a0cdff Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 11:14:13 +0900 Subject: [PATCH 110/878] Mentioned `-W:` command option in NEWS [ci skip] --- NEWS | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c34ffaeca2e201..e6b6351bed3b15 100644 --- a/NEWS +++ b/NEWS @@ -236,6 +236,30 @@ sufficient information, see the ChangeLog file or Redmine * Refinements take place at Object#method and Module#instance_method. [Feature #15373] +* Command line option +-W+ has been extended with a following +:+, to manage categorized + warnings. [Feature #16345] [Feature #16420] + + # deprecation warning + $ ruby -e '$; = ""' + -e:1: warning: `$;' is deprecated + + # suppress the deprecation warning + $ ruby -W:no-deprecated -e '$; = //' + + # works with RUBYOPT environment variable + $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' + + # experimental feature warning + $ ruby -e '0 in a' + -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! + + # suppress experimental feature warning + $ ruby -W:no-experimental -e '0 in a' + + # suppress both by using RUBYOPT + $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' + + === Core classes updates (outstanding ones only) Array:: @@ -504,7 +528,7 @@ Warning:: New methods:: * Added Warning.[] and Warning.[]= to manage emit/suppress of - some categories of warnings. [Feature #16345] + some categories of warnings. [Feature #16345] [Feature #16420] $LOAD_PATH:: From d0f1eb3e4ef7cde2d78b493b3ba1561eee79b18f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 11:28:18 +0900 Subject: [PATCH 111/878] Separated command line option in NEWS [ci skip] --- NEWS | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index e6b6351bed3b15..36d7af3e9ea633 100644 --- a/NEWS +++ b/NEWS @@ -236,30 +236,6 @@ sufficient information, see the ChangeLog file or Redmine * Refinements take place at Object#method and Module#instance_method. [Feature #15373] -* Command line option +-W+ has been extended with a following +:+, to manage categorized - warnings. [Feature #16345] [Feature #16420] - - # deprecation warning - $ ruby -e '$; = ""' - -e:1: warning: `$;' is deprecated - - # suppress the deprecation warning - $ ruby -W:no-deprecated -e '$; = //' - - # works with RUBYOPT environment variable - $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' - - # experimental feature warning - $ ruby -e '0 in a' - -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! - - # suppress experimental feature warning - $ ruby -W:no-experimental -e '0 in a' - - # suppress both by using RUBYOPT - $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' - - === Core classes updates (outstanding ones only) Array:: @@ -707,6 +683,31 @@ profile.rb, Profiler__:: * Removed from standard library. It was unmaintained since Ruby 2.0.0. +=== Command line option + +* +-W+ option has been extended with a following +:+, to manage categorized + warnings. [Feature #16345] [Feature #16420] + + # deprecation warning + $ ruby -e '$; = ""' + -e:1: warning: `$;' is deprecated + + # suppress the deprecation warning + $ ruby -W:no-deprecated -e '$; = //' + + # works with RUBYOPT environment variable + $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' + + # experimental feature warning + $ ruby -e '0 in a' + -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! + + # suppress experimental feature warning + $ ruby -W:no-experimental -e '0 in a' + + # suppress both by using RUBYOPT + $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' + === C API updates * Many *_kw functions have been added for setting whether From 3739ddc36f462b794ec05c0cfc36458a8d1e17a7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 12:11:42 +0900 Subject: [PATCH 112/878] Added `-W:experimental` to `--help` [Feature #16420] --- ruby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.c b/ruby.c index 5a7aa62168f826..7903f583fe0bec 100644 --- a/ruby.c +++ b/ruby.c @@ -302,6 +302,7 @@ usage(const char *name, int help) }; static const struct message warn_categories[] = { M("deprecated", "", "deprecated features"), + M("experimental", "", "experimental features"), }; static const struct message mjit_options[] = { M("--jit-warnings", "", "Enable printing JIT warnings"), From 302e896833bc611ba39c8697712313fd2dbd70cc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 13:12:28 +0900 Subject: [PATCH 113/878] Added warning.rb to .document --- .document | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.document b/.document index b8e2d44a80ecb2..8a418e5d4ae571 100644 --- a/.document +++ b/.document @@ -11,11 +11,12 @@ prelude.rb rbconfig.rb -trace_point.rb ast.rb -io.rb gc.rb +io.rb pack.rb +trace_point.rb +warning.rb # the lib/ directory (which has its own .document file) lib From adf498b84f56e57b74b72a3ddcc512f6d2078cef Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 13:24:41 +0900 Subject: [PATCH 114/878] Moved warning option section and added a reference [ci skip] --- NEWS | 56 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index 36d7af3e9ea633..b14cfdf7faa95d 100644 --- a/NEWS +++ b/NEWS @@ -236,6 +236,37 @@ sufficient information, see the ChangeLog file or Redmine * Refinements take place at Object#method and Module#instance_method. [Feature #15373] +=== Command line option + +==== Warning option + ++-W+ option has been extended with a following +:+, to manage categorized +warnings. [Feature #16345] [Feature #16420] + +* To suppress the deprecation warning: + + $ ruby -e '$; = ""' + -e:1: warning: `$;' is deprecated + + $ ruby -W:no-deprecated -e '$; = //' + +* It works with the +RUBYOPT+ environment variable: + + $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' + +* To suppress experimental feature warning: + + $ ruby -e '0 in a' + -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! + + $ ruby -W:no-experimental -e '0 in a' + +* To suppress both by using +RUBYOPT+, set space separated values: + + $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' + +See also Warning in {Core classes updates}[#label-Core+classes+updates+-28outstanding+ones+only-29]. + === Core classes updates (outstanding ones only) Array:: @@ -683,31 +714,6 @@ profile.rb, Profiler__:: * Removed from standard library. It was unmaintained since Ruby 2.0.0. -=== Command line option - -* +-W+ option has been extended with a following +:+, to manage categorized - warnings. [Feature #16345] [Feature #16420] - - # deprecation warning - $ ruby -e '$; = ""' - -e:1: warning: `$;' is deprecated - - # suppress the deprecation warning - $ ruby -W:no-deprecated -e '$; = //' - - # works with RUBYOPT environment variable - $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' - - # experimental feature warning - $ ruby -e '0 in a' - -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! - - # suppress experimental feature warning - $ ruby -W:no-experimental -e '0 in a' - - # suppress both by using RUBYOPT - $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' - === C API updates * Many *_kw functions have been added for setting whether From e57d6194218efc73c30f3fed9dd321d2e357030b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 14:56:17 +0900 Subject: [PATCH 115/878] Scale sleeping times --- test/io/wait/test_io_wait.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 50c06976b8c0e1..2d35fbb4e0a244 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -164,4 +164,8 @@ def fill_pipe return written end while true end + + def sleep(time) + super EnvUtil.apply_timeout_scale(time) + end end if IO.method_defined?(:wait) From c47106699cf2bcf426285efcd795223c200a3120 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 14:57:55 +0900 Subject: [PATCH 116/878] NEWS: added references to warning option [ci skip] --- NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index b14cfdf7faa95d..206e38521252a0 100644 --- a/NEWS +++ b/NEWS @@ -57,6 +57,9 @@ sufficient information, see the ChangeLog file or Redmine * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7 * Note that the slides are slightly obsolete. +* The warning against pattern matching can be suppressed with + {-W:no-experimental option}[#label-Warning+option]. + ==== The spec of keyword arguments is changed towards 3.0 * Automatic conversion of keyword arguments and positional arguments is @@ -128,6 +131,8 @@ sufficient information, see the ChangeLog file or Redmine h = {}; def foo(*a) a end; foo(h) # [{}] h = {}; def foo(a) a end; foo(h) # {} +* Above warnings can be suppressed also with {-W:no-deprecated option}[#label-Warning+option]. + ==== Numbered parameters * Numbered parameters as default block parameters are introduced. @@ -152,6 +157,8 @@ sufficient information, see the ChangeLog file or Redmine end foo { puts "Hello" } #=> warning: Capturing the given block using Kernel#proc is deprecated; use `&block` instead + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + * Kernel#lambda with no block in a method called with a block raises an exception. def bar @@ -178,9 +185,11 @@ sufficient information, see the ChangeLog file or Redmine * Setting $; to a non-nil value is warned now. Use of it in String#split is warned too. + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. * Setting $, to a non-nil value is warned now. Use of it in Array#join is warned too. + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. * Quoted here-document identifiers must end within the same line. @@ -215,6 +224,8 @@ sufficient information, see the ChangeLog file or Redmine end foo { p :ok } + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + * Argument forwarding by (...) is introduced. [Feature #16253] def foo(...) From 47ad57f2450251f47b3f8e1f744d782269bbcdeb Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 24 Dec 2019 15:38:46 +0900 Subject: [PATCH 117/878] Revert "Scale sleeping times" This reverts commit e57d6194218efc73c30f3fed9dd321d2e357030b. Test fails: http://ci.rvm.jp/results/trunk-gc-asserts@ruby-sky1/2518563 http://ci.rvm.jp/results/trunk-gc_compact@silicon-docker/2518533 --- test/io/wait/test_io_wait.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 2d35fbb4e0a244..50c06976b8c0e1 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -164,8 +164,4 @@ def fill_pipe return written end while true end - - def sleep(time) - super EnvUtil.apply_timeout_scale(time) - end end if IO.method_defined?(:wait) From 81504e83e72bf125476528e5f119604d9697f682 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 15:47:59 +0900 Subject: [PATCH 118/878] Synchronize with a Queue instead of sleeping --- test/io/wait/test_io_wait.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 50c06976b8c0e1..4003f2aff1089c 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -63,16 +63,20 @@ def test_wait_buffered end def test_wait_forever - th = Thread.new { sleep 0.01; @w.syswrite "." } + q = Thread::Queue.new + th = Thread.new { q.pop; @w.syswrite "." } + q.push(true) assert_equal @r, @r.wait ensure th.join end def test_wait_eof - th = Thread.new { sleep 0.01; @w.close } + q = Thread::Queue.new + th = Thread.new { q.pop; @w.close } ret = nil assert_nothing_raised(Timeout::Error) do + q.push(true) Timeout.timeout(0.1) { ret = @r.wait } end assert_equal @r, ret @@ -94,16 +98,20 @@ def test_wait_readable_buffered end def test_wait_readable_forever - th = Thread.new { sleep 0.01; @w.syswrite "." } + q = Thread::Queue.new + th = Thread.new { q.pop; @w.syswrite "." } + q.push(true) assert_equal @r, @r.wait_readable ensure th.join end def test_wait_readable_eof - th = Thread.new { sleep 0.01; @w.close } + q = Thread::Queue.new + th = Thread.new { q.pop; @w.close } ret = nil assert_nothing_raised(Timeout::Error) do + q.push(true) Timeout.timeout(0.1) { ret = @r.wait_readable } end assert_equal @r, ret From 27b4f477d960c75f3ff5cd5e045b307cad314ec7 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 09:03:42 +0100 Subject: [PATCH 119/878] [DOC] Improve docs for Enumerator.produce, Enumerator.new --- enumerator.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/enumerator.c b/enumerator.c index e8ee9e57375238..9d0547da053158 100644 --- a/enumerator.c +++ b/enumerator.c @@ -415,7 +415,7 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar * * In the first form, iteration is defined by the given block, in * which a "yielder" object, given as block parameter, can be used to - * yield a value by calling the +yield+ method (aliased as +<<+): + * yield a value by calling the +yield+ method (aliased as <<): * * fib = Enumerator.new do |y| * a = b = 1 @@ -425,13 +425,13 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar * end * end * - * p fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55] + * fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55] * * The optional parameter can be used to specify how to calculate the size * in a lazy fashion (see Enumerator#size). It can either be a value or * a callable object. * - * In the second, deprecated, form, a generated Enumerator iterates over the + * In the deprecated second form, a generated Enumerator iterates over the * given object using the given method with the given arguments passed. * * Use of this form is discouraged. Use Object#enum_for or Object#to_enum @@ -440,7 +440,7 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar * e = Enumerator.new(ObjectSpace, :each_object) * #-> ObjectSpace.enum_for(:each_object) * - * e.select { |obj| obj.is_a?(Class) } #=> array of all classes + * e.select { |obj| obj.is_a?(Class) } # => array of all classes * */ static VALUE @@ -2959,19 +2959,17 @@ producer_size(VALUE obj, VALUE args, VALUE eobj) /* * call-seq: - * Enumerator.produce(initial = nil) { |val| } -> enumerator + * Enumerator.produce(initial = nil) { |prev| block } -> enumerator * * Creates an infinite enumerator from any block, just called over and - * over. Result of the previous iteration is passed to the next one. + * over. The result of the previous iteration is passed to the next one. * If +initial+ is provided, it is passed to the first iteration, and * becomes the first element of the enumerator; if it is not provided, - * first iteration receives +nil+, and its result becomes first + * the first iteration receives +nil+, and its result becomes the first * element of the iterator. * * Raising StopIteration from the block stops an iteration. * - * Examples of usage: - * * Enumerator.produce(1, &:succ) # => enumerator of 1, 2, 3, 4, .... * * Enumerator.produce { rand(10) } # => infinite random number sequence @@ -2980,18 +2978,18 @@ producer_size(VALUE obj, VALUE args, VALUE eobj) * enclosing_section = ancestors.find { |n| n.type == :section } * * Using ::produce together with Enumerable methods like Enumerable#detect, - * Enumerable#slice, Enumerable#take_while can provide Enumerator-based alternative + * Enumerable#slice, Enumerable#take_while can provide Enumerator-based alternatives * for +while+ and +until+ cycles: * * # Find next Tuesday - * require 'date' + * require "date" * Enumerator.produce(Date.today, &:succ).detect(&:tuesday?) * * # Simple lexer: - * require 'strscan' - * scanner = StringScanner.new('7+38/6') + * require "strscan" + * scanner = StringScanner.new("7+38/6") * PATTERN = %r{\d+|[-/+*]} - * p Enumerator.produce { scanner.scan(PATTERN) }.slice_after { scanner.eos? }.first + * Enumerator.produce { scanner.scan(PATTERN) }.slice_after { scanner.eos? }.first * # => ["7", "+", "38", "/", "6"] */ static VALUE From 44a1f51695058159ff2f191c97a082bed9665137 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 09:49:22 +0100 Subject: [PATCH 120/878] NEWS: improve sections for warning option / Warning --- NEWS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 206e38521252a0..fbe422371d358b 100644 --- a/NEWS +++ b/NEWS @@ -247,14 +247,14 @@ sufficient information, see the ChangeLog file or Redmine * Refinements take place at Object#method and Module#instance_method. [Feature #15373] -=== Command line option +=== Command line options ==== Warning option -+-W+ option has been extended with a following +:+, to manage categorized +The +-W+ option has been extended with a following +:+, to manage categorized warnings. [Feature #16345] [Feature #16420] -* To suppress the deprecation warning: +* To suppress deprecation warnings: $ ruby -e '$; = ""' -e:1: warning: `$;' is deprecated @@ -265,7 +265,7 @@ warnings. [Feature #16345] [Feature #16420] $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' -* To suppress experimental feature warning: +* To suppress experimental feature warnings: $ ruby -e '0 in a' -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! @@ -545,7 +545,7 @@ Warning:: New methods:: - * Added Warning.[] and Warning.[]= to manage emit/suppress of + * Added Warning.[] and Warning.[]= to manage emitting/suppressing some categories of warnings. [Feature #16345] [Feature #16420] $LOAD_PATH:: From b03aea62abfbdc7c8ee53c30a27127c3c394a6ba Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 10:02:22 +0100 Subject: [PATCH 121/878] NEWS: fix method references for Range#{cover?,include?} --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index fbe422371d358b..b1fbfded676672 100644 --- a/NEWS +++ b/NEWS @@ -471,8 +471,8 @@ Range:: Modified method:: - * Range#=== now uses #cover? for String arguments, too (in Ruby 2.6, it was - changed from #include? for all types except strings). [Bug #15449] + * Range#=== now uses Range#cover? for String arguments, too (in Ruby 2.6, it was + changed from Range#include? for all types except strings). [Bug #15449] RubyVM:: From 42e2a322f100c7c798fcfbcbbfe0b4cdaf3f5855 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 18:32:50 +0900 Subject: [PATCH 122/878] The delete-char-or-list shows completed list when called at end of line It doesn't behave the same as the delete-char. --- lib/reline/key_actor/emacs.rb | 2 +- lib/reline/line_editor.rb | 31 +++++++++++++++++---- test/reline/test_key_actor_emacs.rb | 43 +++++++++++++++++++++++++++-- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/lib/reline/key_actor/emacs.rb b/lib/reline/key_actor/emacs.rb index ab5c2146007447..3886d17f226779 100644 --- a/lib/reline/key_actor/emacs.rb +++ b/lib/reline/key_actor/emacs.rb @@ -9,7 +9,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base # 3 ^C :ed_ignore, # 4 ^D - :em_delete_or_list, + :em_delete, # 5 ^E :ed_move_to_end, # 6 ^F diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 0ddafb420b48c2..010ceb981ce6dd 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -595,14 +595,22 @@ def editing_mode [target, preposing, completed, postposing] end - private def complete(list) + private def complete(list, just_show_list = false) case @completion_state when CompletionState::NORMAL, CompletionState::JOURNEY @completion_state = CompletionState::COMPLETION when CompletionState::PERFECT_MATCH @dig_perfect_match_proc&.(@perfect_matched) end - is_menu = (@completion_state == CompletionState::MENU or @completion_state == CompletionState::MENU_WITH_PERFECT_MATCH) + if just_show_list + is_menu = true + elsif @completion_state == CompletionState::MENU + is_menu = true + elsif @completion_state == CompletionState::MENU_WITH_PERFECT_MATCH + is_menu = true + else + is_menu = false + end result = complete_internal_proc(list, is_menu) if @completion_state == CompletionState::MENU_WITH_PERFECT_MATCH @completion_state = CompletionState::PERFECT_MATCH @@ -621,7 +629,7 @@ def editing_mode else @completion_state = CompletionState::MENU end - if target < completed + if not just_show_list and target < completed @line = preposing + completed + completion_append_character.to_s + postposing line_to_pointer = preposing + completed + completion_append_character.to_s @cursor_max = calculate_width(@line) @@ -1567,7 +1575,7 @@ def finish end end - private def em_delete_or_list(key) + private def em_delete(key) if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1) @line = nil if @buffer_of_lines.size > 1 @@ -1592,7 +1600,20 @@ def finish @rest_height += 1 end end - alias_method :delete_char, :em_delete_or_list + alias_method :delete_char, :em_delete + + private def em_delete_or_list(key) + if @line.empty? or @byte_pointer < @line.bytesize + em_delete(key) + else # show completed list + result = call_completion_proc + if result.is_a?(Array) + completion_occurs = true + complete(result, true) + end + end + end + alias_method :delete_char_or_list, :em_delete_or_list private def em_yank(key) yanked = @kill_ring.yank diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 8854df56a216bd..97ff654506ca79 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -372,7 +372,7 @@ def test_ed_move_to_end assert_line('abcd012ABCa') end - def test_em_delete_or_list + def test_em_delete input_keys('ab') assert_byte_pointer_size('ab') assert_cursor(2) @@ -388,7 +388,7 @@ def test_em_delete_or_list assert_line('b') end - def test_em_delete_or_list_for_mbchar + def test_em_delete_for_mbchar input_keys('かき') assert_byte_pointer_size('かき') assert_cursor(4) @@ -407,7 +407,7 @@ def test_em_delete_or_list_for_mbchar assert_line('き') end - def test_em_delete_or_list_for_mbchar_by_plural_code_points + def test_em_delete_for_mbchar_by_plural_code_points input_keys("か\u3099き\u3099") assert_byte_pointer_size("か\u3099き\u3099") assert_cursor(4) @@ -1244,6 +1244,43 @@ def test_em_upper_case_with_complex_example assert_line('{}#* AAA!!!CCC ') end + def test_em_delete_or_list + @line_editor.completion_proc = proc { |word| + %w{ + foo_foo + foo_bar + foo_baz + qux + }.map { |i| + i.encode(@encoding) + } + } + input_keys('fooo') + assert_byte_pointer_size('fooo') + assert_cursor(4) + assert_cursor_max(4) + assert_line('fooo') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-b", false) + assert_byte_pointer_size('foo') + assert_cursor(3) + assert_cursor_max(4) + assert_line('fooo') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + @line_editor.input_key(Reline::Key.new(:em_delete_or_list, :em_delete_or_list, false)) + assert_byte_pointer_size('foo') + assert_cursor(3) + assert_cursor_max(3) + assert_line('foo') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + @line_editor.input_key(Reline::Key.new(:em_delete_or_list, :em_delete_or_list, false)) + assert_byte_pointer_size('foo') + assert_cursor(3) + assert_cursor_max(3) + assert_line('foo') + assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list) + end + def test_completion @line_editor.completion_proc = proc { |word| %w{ From 7758849cb5432ae974f616668f9c9bab415bb18a Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 24 Dec 2019 18:39:48 +0900 Subject: [PATCH 123/878] Remove unused variable --- lib/reline/line_editor.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 010ceb981ce6dd..721d50b746a3c1 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1608,7 +1608,6 @@ def finish else # show completed list result = call_completion_proc if result.is_a?(Array) - completion_occurs = true complete(result, true) end end From a3c5dbf29191aa8622d8be7d990c4ac2f9392427 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 14:56:17 +0900 Subject: [PATCH 124/878] Scale sleeping times to wait for the OS operations --- test/io/wait/test_io_wait.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 4003f2aff1089c..6b4722e1be0bd4 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -172,4 +172,8 @@ def fill_pipe return written end while true end + + def sleep(time) + super EnvUtil.apply_timeout_scale(time) + end end if IO.method_defined?(:wait) From 4ba9347554ab1ac79fdaf1d5b3320776a2b10615 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 24 Dec 2019 18:49:57 +0900 Subject: [PATCH 125/878] `Object#=~` warning also obeys `Warning[:deprecated]` --- object.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/object.c b/object.c index 0bb0e0f8e8fc0c..61be0d3862c1d4 100644 --- a/object.c +++ b/object.c @@ -1624,8 +1624,10 @@ rb_false(VALUE obj) static VALUE rb_obj_match(VALUE obj1, VALUE obj2) { - rb_warn("deprecated Object#=~ is called on %"PRIsVALUE - "; it always returns nil", rb_obj_class(obj1)); + if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) { + rb_warn("deprecated Object#=~ is called on %"PRIsVALUE + "; it always returns nil", rb_obj_class(obj1)); + } return Qnil; } From 66e518f7b3e0bf307f86a51e6db02c3d1ec8df84 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 13:01:24 +0100 Subject: [PATCH 126/878] [DOC] Fix typo --- doc/syntax/methods.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc index 55feecc0c2d89d..924e31611f15de 100644 --- a/doc/syntax/methods.rdoc +++ b/doc/syntax/methods.rdoc @@ -502,7 +502,7 @@ it would not be treated as keywords: If a method is called with keywords, but it is missing one mandatory positional argument, the keywords are converted to -a hash and the hash used as the mandtory positional argument: +a hash and the hash used as the mandatory positional argument: def my_method(hash, **keywords) [hash, keywords] From 54083fd41bf876b42e1a97acdc7574c8edbb87ed Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 13:01:47 +0100 Subject: [PATCH 127/878] [DOC] Fix grammar in Process module docs --- process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/process.c b/process.c index 60d1523fde392a..3ea6eb2a1bf06b 100644 --- a/process.c +++ b/process.c @@ -418,13 +418,13 @@ parent_redirect_close(int fd) * * The module contains several groups of functionality for handling OS processes: * - * * Low-level property introspection and management of current process, like + * * Low-level property introspection and management of the current process, like * Process.argv0, Process.pid; * * Low-level introspection of other processes, like Process.getpgid, Process.getpriority; - * * Management of the current process: Process.abort, Process.exit, Process.daemon etc. - * (for convenience, most of those are also available as a global functions, + * * Management of the current process: Process.abort, Process.exit, Process.daemon, etc. + * (for convenience, most of those are also available as global functions * and module functions of Kernel); - * * Creation and management of child processes: Process.fork, Process.spawn and + * * Creation and management of child processes: Process.fork, Process.spawn, and * related methods; * * Management of low-level system clock: Process.times and Process.clock_gettime, * which could be important for proper benchmarking and other elapsed From 05b0410f91360e15511903580f0401b123f3abce Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 13:17:00 +0100 Subject: [PATCH 128/878] [ruby/irb] Fix typo https://github.com/ruby/irb/commit/4bb1340687 --- lib/irb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb.rb b/lib/irb.rb index a907894fe29f9c..bcd6599af961ac 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -131,7 +131,7 @@ # # See IRB::Context#save_history= for more information. # -# The history of _resuls_ of commands evaluated is not stored by default, +# The history of _results_ of commands evaluated is not stored by default, # but can be turned on to be stored with this +.irbrc+ setting: # # IRB.conf[:EVAL_HISTORY] = From 1cd2ebed616473ed56730292879e8bc9d6dfd060 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 24 Dec 2019 21:39:37 +0900 Subject: [PATCH 129/878] Update the news entries for RubyGems and Bundler --- NEWS | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index b1fbfded676672..6970e0eaab5096 100644 --- a/NEWS +++ b/NEWS @@ -558,8 +558,8 @@ $LOAD_PATH:: Bundler:: - * Upgrade to Bundler 2.1.0. - See https://github.com/bundler/bundler/releases/tag/v2.1.0 + * Upgrade to Bundler 2.1.2. + See https://github.com/bundler/bundler/releases/tag/v2.1.2 CGI:: @@ -665,8 +665,10 @@ RSS:: RubyGems:: - * Upgrade to RubyGems 3.1.1. - See https://github.com/rubygems/rubygems/releases/tag/v3.1.0 + * Upgrade to RubyGems 3.1.2. + * https://github.com/rubygems/rubygems/releases/tag/v3.1.0 + * https://github.com/rubygems/rubygems/releases/tag/v3.1.1 + * https://github.com/rubygems/rubygems/releases/tag/v3.1.2 StringScanner:: From 8c017824c8eeffe11070ce69c914725af314d9f6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 24 Dec 2019 22:31:38 +0900 Subject: [PATCH 130/878] Added entry for json-2.3.0 --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 6970e0eaab5096..4ca115517e41b0 100644 --- a/NEWS +++ b/NEWS @@ -596,6 +596,10 @@ IRB:: * Enable auto indent and save/load history by default. +JSON:: + + * Upgrade to 2.3.0. + Net::FTP:: * Add Net::FTP#features to check available features, and Net::FTP#option to From 3679023df822d8bf3f88b9b2e4b849318d2c409e Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 16:57:30 +0100 Subject: [PATCH 131/878] [DOC] Fix typo and language --- doc/regexp.rdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc index ccf82538b7cdd9..d84cae17711788 100644 --- a/doc/regexp.rdoc +++ b/doc/regexp.rdoc @@ -68,9 +68,9 @@ a backslash literally, backslash-escape it: \\\\. /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> # /a\\\\b/.match('a\\\\b') #=> # -Patterns behave like double-quoted strings so can contain the same -backslash escapes (the meaning of \s is different a little however, -see bellow[#label-Character+Classes]). +Patterns behave like double-quoted strings and can contain the same +backslash escapes (the meaning of \s is different, however, +see below[#label-Character+Classes]). /\s\u{6771 4eac 90fd}/.match("Go to 東京都") #=> # From 9b617ffa8884f9f80a0b1bdb89169d8139ba5001 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 25 Dec 2019 01:00:40 +0900 Subject: [PATCH 132/878] * 2019-12-25 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index ce47613f6d55e7..dda138e5e6e420 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" From 5220145ea289d9eb955b373f31773fab2d4f0271 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 25 Dec 2019 01:32:37 +0900 Subject: [PATCH 133/878] add debug_counter access functions. These functions are enabled only on USE_DEBUG_COUNTER=1. --- debug_counter.c | 82 ++++++++++++++++++++++++++++++++++++++++--------- debug_counter.h | 10 ++++-- 2 files changed, 75 insertions(+), 17 deletions(-) diff --git a/debug_counter.c b/debug_counter.c index 1e395f306b0b3c..11ec57a9619701 100644 --- a/debug_counter.c +++ b/debug_counter.c @@ -8,8 +8,8 @@ **********************************************************************/ -#include "debug_counter.h" #include "internal.h" +#include "debug_counter.h" #include #include @@ -25,6 +25,52 @@ MJIT_SYMBOL_EXPORT_BEGIN size_t rb_debug_counter[numberof(debug_counter_names)]; MJIT_SYMBOL_EXPORT_END +int debug_counter_disable_show_at_exit = 0; + +// note that this operation is not atomic. +void +ruby_debug_counter_reset(void) +{ + for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) { + switch (i) { + case RB_DEBUG_COUNTER_mjit_length_unit_queue: + case RB_DEBUG_COUNTER_mjit_length_active_units: + case RB_DEBUG_COUNTER_mjit_length_compact_units: + case RB_DEBUG_COUNTER_mjit_length_stale_units: + // These counters may be decreased and should not be reset. + break; + default: + rb_debug_counter[i] = 0; + break; + } + } +} + +// note that this operation is not atomic. +size_t +ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr) +{ + int i; + if (names_ptr != NULL) { + for (i=0; i Date: Tue, 24 Dec 2019 14:02:50 -0500 Subject: [PATCH 134/878] Add NEWS entry about Module#name performance (#2779) --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 4ca115517e41b0..0588b5d818f0ae 100644 --- a/NEWS +++ b/NEWS @@ -434,6 +434,9 @@ Module:: * Module#autoload? now takes an +inherit+ optional argument, like Module#const_defined?. [Feature #15777] + * Module#name and Module#inspect no longer search through all defined + constants when the receiver is anonymous. [Feature #15765] + * Module#name now always returns a frozen String. The returned String is always the same for a given Module. This change is experimental. [Feature #16150] From f3067deb88badf8d15e49d13f082284f58b2c62b Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Tue, 24 Dec 2019 14:54:20 -0500 Subject: [PATCH 135/878] Revert "Add NEWS entry about Module#name performance (#2779)" (#2781) This reverts commit 3e9221d94a12b54c1285923b642364acdbc31c7e. --- NEWS | 3 --- 1 file changed, 3 deletions(-) diff --git a/NEWS b/NEWS index 0588b5d818f0ae..4ca115517e41b0 100644 --- a/NEWS +++ b/NEWS @@ -434,9 +434,6 @@ Module:: * Module#autoload? now takes an +inherit+ optional argument, like Module#const_defined?. [Feature #15777] - * Module#name and Module#inspect no longer search through all defined - constants when the receiver is anonymous. [Feature #15765] - * Module#name now always returns a frozen String. The returned String is always the same for a given Module. This change is experimental. [Feature #16150] From ceba5b70889666b82b80910a441cf4a92b5c7160 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 21:50:27 +0100 Subject: [PATCH 136/878] [DOC] Fix typo in Time#inspect --- time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/time.c b/time.c index 8c5422df0b0d86..d71d43e0584d26 100644 --- a/time.c +++ b/time.c @@ -4091,8 +4091,8 @@ time_to_s(VALUE time) * call-seq: * time.inspect -> string * - * Returns a detailed string representing _time_. Inlike to_s, preserves - * nanoseconds in representation for easier debugging. + * Returns a detailed string representing _time_. Unlike to_s, + * preserves nanoseconds in the representation for easier debugging. * * t = Time.now * t.inspect #=> "2012-11-10 18:16:12.261257655 +0100" From da0a0bae8b50087d140309b27eb4d4b4776c27e4 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 24 Dec 2019 22:13:49 +0100 Subject: [PATCH 137/878] NEWS: add meaning of "CoW" ("copy-on-write") --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4ca115517e41b0..06fb75dfecdbd4 100644 --- a/NEWS +++ b/NEWS @@ -388,7 +388,7 @@ GC:: * Added GC.compact method for compacting the heap. This function compacts live objects in the heap so that fewer pages may - be used, and the heap may be more CoW friendly. [Feature #15626] + be used, and the heap may be more CoW (copy-on-write) friendly. [Feature #15626] Details on the algorithm and caveats can be found here: https://bugs.ruby-lang.org/issues/15626 From 1857b4427817755bb0879ca67e1b2f3276f95d4c Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 25 Dec 2019 07:28:02 +0900 Subject: [PATCH 138/878] Merge Bundler 2.1.2 from bundler/bundler. [Misc #16449][ruby-core:96458] --- lib/bundler/rubygems_integration.rb | 2 ++ lib/bundler/version.rb | 2 +- spec/bundler/runtime/setup_spec.rb | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 88fcd4d9e0739b..18da5915a5d760 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "rubygems" + module Bundler class RubygemsIntegration if defined?(Gem::Ext::Builder::CHDIR_MONITOR) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 06d6a0f2557456..b63e39b8d20c2d 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.1.1".freeze + VERSION = "2.1.2".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb index befc5f9d090b11..39240b7404a49e 100644 --- a/spec/bundler/runtime/setup_spec.rb +++ b/spec/bundler/runtime/setup_spec.rb @@ -1344,5 +1344,11 @@ def lock_with(ruby_version = nil) expect(last_command.stdboth).not_to include "FAIL" expect(err).to include "private method `require'" end + + it "takes care of requiring rubygems" do + sys_exec("#{Gem.ruby} -I#{lib_dir} -e \"puts require('bundler/setup')\"", "RUBYOPT" => "--disable=gems") + + expect(last_command.stdboth).to eq("true") + end end end From 2b2be71cabf987effd2783747eedf573af1400cf Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Tue, 24 Dec 2019 18:23:59 -0500 Subject: [PATCH 139/878] Add did_you_mean's promotion to the NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 06fb75dfecdbd4..e77e0655dd8f38 100644 --- a/NEWS +++ b/NEWS @@ -719,6 +719,7 @@ Range:: * tracer * uri * yaml +* The did_you_mean gem has been promoted up to a default gem from a bundled gem pathname:: From 8e6d51e09a93ae2c57d56105a5fd39fb92855394 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Tue, 24 Dec 2019 18:41:26 -0500 Subject: [PATCH 140/878] Sync did_you_mean --- lib/did_you_mean/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/did_you_mean/version.rb b/lib/did_you_mean/version.rb index cdfeea8026e7a1..6d3dd3a6942e08 100644 --- a/lib/did_you_mean/version.rb +++ b/lib/did_you_mean/version.rb @@ -1,3 +1,3 @@ module DidYouMean - VERSION = "1.3.1" + VERSION = "1.4.0" end From 622e47a1dbeee52fb218b816943b69cb88e17ae6 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 09:29:46 +0900 Subject: [PATCH 141/878] ^D on non-empty line in vi mode behaves like Enter --- lib/reline/line_editor.rb | 4 +++- test/reline/test_key_actor_vi.rb | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 721d50b746a3c1..d668da7ad746e0 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1938,9 +1938,11 @@ def finish @eof = true finish else - # TODO: list + ed_newline(key) end end + alias_method :vi_end_of_transmission, :vi_list_or_eof + alias_method :vi_eof_maybe, :vi_list_or_eof private def ed_delete_next_char(key, arg: 1) byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer) diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index dc5030c0bfa303..1ea160b6b5a10c 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -812,16 +812,19 @@ def test_ed_newline_with_lf end def test_vi_list_or_eof - input_keys('a') - assert_byte_pointer_size('a') - assert_cursor(1) - assert_cursor_max(1) + input_keys("\C-d") # quit from inputing + assert_line(nil) + assert(@line_editor.finished?) + end + + def test_vi_list_or_eof_with_non_empty_line + input_keys('ab') + assert_byte_pointer_size('ab') + assert_cursor(2) + assert_cursor_max(2) refute(@line_editor.finished?) input_keys("\C-d") - assert_line('a') - refute(@line_editor.finished?) - input_keys("\C-h\C-d") - assert_line(nil) + assert_line('ab') assert(@line_editor.finished?) end From 03c504ac59a2bf78bab925379e93184d81296e96 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 25 Dec 2019 09:38:12 +0900 Subject: [PATCH 142/878] Commented-out btest on cygwin environment of GitHub Actions --- .github/workflows/cygwin.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 0821d63049fc16..515b47e141256d 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -72,7 +72,8 @@ jobs: run: | make -C build shell: cmd - - name: make btest - run: | - make -C build btest - shell: cmd + # TODO: Fix test fail on cygwin environment on GitHub Actions + # - name: make btest + # run: | + # make -C build btest + # shell: cmd From ed5b4bae6a4f991a0c5299581bd0b137a98d3723 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 09:52:25 +0900 Subject: [PATCH 143/878] The behavior of vi_end_of_transmission should be the same of vi_list_or_eof --- lib/reline/line_editor.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index d668da7ad746e0..10996e4c314ad4 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1916,18 +1916,6 @@ def finish private def vi_yank(key) end - private def vi_end_of_transmission(key) - if @line.empty? - @line = nil - if @buffer_of_lines.size > 1 - scroll_down(@highest_in_all - @first_line_started_from) - end - Reline::IOGate.move_cursor_column(0) - @eof = true - finish - end - end - private def vi_list_or_eof(key) if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1) @line = nil From 246242700867ed3fdce8288897d74bd261379018 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:08:06 +0900 Subject: [PATCH 144/878] [ruby/reline] Version 0.1.1 https://github.com/ruby/reline/commit/923f97d068 --- lib/reline/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/version.rb b/lib/reline/version.rb index 5c68b1c26c4d55..27645bcbf9251c 100644 --- a/lib/reline/version.rb +++ b/lib/reline/version.rb @@ -1,3 +1,3 @@ module Reline - VERSION = '0.1.0' + VERSION = '0.1.1' end From 999a2819a75e40aec405e088d01b12eda341025d Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:31:03 +0900 Subject: [PATCH 145/878] [ruby/readline-ext] Version 0.1.0 https://github.com/ruby/readline-ext/commit/f5abaf5be1 --- ext/readline/readline-ext.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/readline/readline-ext.gemspec b/ext/readline/readline-ext.gemspec index 4d4d4b2dd94ed7..a611a8ea9a803e 100644 --- a/ext/readline/readline-ext.gemspec +++ b/ext/readline/readline-ext.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = "readline-ext" - spec.version = "0.1.0.pre.1" + spec.version = "0.1.0" spec.authors = ["Yukihiro Matsumoto"] spec.email = ["matz@ruby-lang.org"] From 5d20865708552a522d5eb39c4d9238f96693f8f2 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:25:15 +0900 Subject: [PATCH 146/878] [ruby/readline] Add post_install_message https://github.com/ruby/readline/commit/03126372b5 --- lib/readline.gemspec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/readline.gemspec b/lib/readline.gemspec index 0f8ff961195091..1e0d6f892fc4fa 100644 --- a/lib/readline.gemspec +++ b/lib/readline.gemspec @@ -17,6 +17,16 @@ Gem::Specification.new do |spec| spec.files = Dir['BSDL', 'COPYING', 'README.md', 'lib/readline.rb'] spec.require_paths = ['lib'] + spec.post_install_message = <<~EOM + This is just loader for "readline". If Ruby has "readline-ext" gem that + is a native extension, this gem will load its first. If Ruby doesn't have + the "readline-ext" gem this gem will load "reline" that is a compatible + library with "readline-ext" gem and is implemented by pure Ruby. + + If you intend to use GNU Readline by `require 'readline'`, please install + "readline-ext" gem. + EOM + spec.add_runtime_dependency 'reline' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake' From de0f4f2fd7620e2486f5aef031dad18324437c2b Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:30:24 +0900 Subject: [PATCH 147/878] [ruby/readline] Version 0.0.1 https://github.com/ruby/readline/commit/d2363cad33 --- lib/readline.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/readline.gemspec b/lib/readline.gemspec index 1e0d6f892fc4fa..35ae593cf043ec 100644 --- a/lib/readline.gemspec +++ b/lib/readline.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = 'readline' - spec.version = '0.0.1.pre.1' + spec.version = '0.0.1' spec.authors = ['aycabta'] spec.email = ['aycabta@gmail.com'] From 57c74841c7bc2bb2ffbb8ed89597e993116e26a8 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:44:52 +0900 Subject: [PATCH 148/878] [ruby/readline] Fix any wrong in messages https://github.com/ruby/readline/commit/a2cf437c8f --- lib/readline.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/readline.gemspec b/lib/readline.gemspec index 35ae593cf043ec..480c87945a59fd 100644 --- a/lib/readline.gemspec +++ b/lib/readline.gemspec @@ -6,8 +6,8 @@ Gem::Specification.new do |spec| spec.summary = %q{It's a loader for "readline".} spec.description = <<~EOD - This is just loader for "readline". If Ruby has "readline-ext" gem that - is a native extension, this gem will load its first. If Ruby doesn't have + This is just a loader for "readline". If Ruby has "readline-ext" gem that + is a native extension, this gem will load it first. If Ruby doesn't have the "readline-ext" gem this gem will load "reline" that is a compatible library with "readline-ext" gem and is implemented by pure Ruby. EOD @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.post_install_message = <<~EOM - This is just loader for "readline". If Ruby has "readline-ext" gem that - is a native extension, this gem will load its first. If Ruby doesn't have + This is just a loader for "readline". If Ruby has "readline-ext" gem that + is a native extension, this gem will load it first. If Ruby doesn't have the "readline-ext" gem this gem will load "reline" that is a compatible library with "readline-ext" gem and is implemented by pure Ruby. From e51a34511c9e4394467cde24deee19cf8536a3e7 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:47:34 +0900 Subject: [PATCH 149/878] [ruby/readline] Use a box to make easier to see the message https://github.com/ruby/readline/commit/e49e942053 --- lib/readline.gemspec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/readline.gemspec b/lib/readline.gemspec index 480c87945a59fd..1fcec047020985 100644 --- a/lib/readline.gemspec +++ b/lib/readline.gemspec @@ -18,13 +18,15 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.post_install_message = <<~EOM - This is just a loader for "readline". If Ruby has "readline-ext" gem that - is a native extension, this gem will load it first. If Ruby doesn't have - the "readline-ext" gem this gem will load "reline" that is a compatible - library with "readline-ext" gem and is implemented by pure Ruby. - - If you intend to use GNU Readline by `require 'readline'`, please install - "readline-ext" gem. + +---------------------------------------------------------------------------+ + | This is just a loader for "readline". If Ruby has "readline-ext" gem that | + | is a native extension, this gem will load it first. If Ruby doesn't have | + | the "readline-ext" gem this gem will load "reline" that is a compatible   | + | library with "readline-ext" gem and is implemented by pure Ruby.          | + |                                                                           | + | If you intend to use GNU Readline by `require 'readline'`, please install | + | "readline-ext" gem.                                                       | + +---------------------------------------------------------------------------+ EOM spec.add_runtime_dependency 'reline' From 00710d10761ad1aa752cf2c035e3bfbde40092b6 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 10:47:53 +0900 Subject: [PATCH 150/878] [ruby/readline] Version 0.0.2 https://github.com/ruby/readline/commit/42b71f3fc0 --- lib/readline.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/readline.gemspec b/lib/readline.gemspec index 1fcec047020985..5c641a88a5d287 100644 --- a/lib/readline.gemspec +++ b/lib/readline.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = 'readline' - spec.version = '0.0.1' + spec.version = '0.0.2' spec.authors = ['aycabta'] spec.email = ['aycabta@gmail.com'] From eb3f19b9b896094ae9754de1b48fed86fb35fe39 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 25 Dec 2019 11:17:24 +0900 Subject: [PATCH 151/878] update-bundled_gems: drop branch name on github [ci skip] --- common.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index b2e5b2b6d04b4b..3706aeb4ce7035 100644 --- a/common.mk +++ b/common.mk @@ -1300,7 +1300,9 @@ update-bundled_gems: PHONY -e 's.platform=="ruby"&&s.name==$$F[0]' \ -e '}' \ -e 'gem = src.fetch_spec(gem)' \ - -e '$$_ = [gem.name, gem.version, gem.metadata["source_code_uri"]||gem.homepage].join(" ")' \ + -e 'uri = gem.metadata["source_code_uri"]||gem.homepage' \ + -e 'uri = uri.sub(%r[\Ahttps://github\.com/[^/]+/[^/]+\K/tree/.*], "")' \ + -e '$$_ = [gem.name, gem.version, uri].join(" ")' \ "$(srcdir)/gems/bundled_gems" | \ "$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" - From e0929c44ddc7490dc97cabf12c7505173316a623 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 25 Dec 2019 11:27:13 +0900 Subject: [PATCH 152/878] NEWS: add ticket references --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index e77e0655dd8f38..edfca23eb96bce 100644 --- a/NEWS +++ b/NEWS @@ -183,11 +183,11 @@ sufficient information, see the ChangeLog file or Redmine where(sales: ..100) -* Setting $; to a non-nil value is warned now. +* Setting $; to a non-nil value is warned now. [Feature #14240] Use of it in String#split is warned too. This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. -* Setting $, to a non-nil value is warned now. +* Setting $, to a non-nil value is warned now. [Feature #14240] Use of it in Array#join is warned too. This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. From b9e35d27096290f9544dca685fb4cf5bd0e09397 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 25 Dec 2019 11:31:44 +0900 Subject: [PATCH 153/878] NEWS: add a ticket reference --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index edfca23eb96bce..cfbfd9e689bf7e 100644 --- a/NEWS +++ b/NEWS @@ -209,7 +209,7 @@ sufficient information, see the ChangeLog file or Redmine is now allowed. [Feature #11297] [Feature #16123] * Modifier rescue now operates the same for multiple assignment as single - assignment: + assignment. [Bug #8279] a, b = raise rescue [1, 2] # Previously parsed as: (a, b = raise) rescue [1, 2] From 3345eab934073bdd8394ee8a46fc18954999af76 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 25 Dec 2019 11:37:27 +0900 Subject: [PATCH 154/878] NEWS: add a ticket reference --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index cfbfd9e689bf7e..18024ca3e6dd1a 100644 --- a/NEWS +++ b/NEWS @@ -763,7 +763,7 @@ Fiber:: File:: * File.realpath now uses realpath(3) on many platforms, which can - significantly improve performance. + significantly improve performance. [Feature #15797] Hash:: * Change data structure of small Hash objects. [Feature #15602] From 227c3d642631262acfbf140c566a7841c32b372f Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 25 Dec 2019 12:06:02 +0900 Subject: [PATCH 155/878] add ref to NEWS entry --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 18024ca3e6dd1a..3b02f575e74442 100644 --- a/NEWS +++ b/NEWS @@ -760,6 +760,7 @@ Fiber:: allocates many stacks in a single memory region. Stack allocation becomes O(log N) and fiber creation is amortized O(1). Around 10x performance improvement was measured in micro-benchmarks. + https://github.com/ruby/ruby/pull/2224 File:: * File.realpath now uses realpath(3) on many platforms, which can From cd6c013b075c9c27437f30efcee9d4dd9e0ee1c5 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 12:55:31 +0900 Subject: [PATCH 156/878] Add readline and readline-ext to default gems list in NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 3b02f575e74442..e1adb5115dbcbc 100644 --- a/NEWS +++ b/NEWS @@ -710,6 +710,8 @@ Range:: * net-smtp * open3 * pstore + * readline + * readline-ext * singleton * The following default gems were only promoted at ruby-core, but not yet published on rubygems.org. From 81e377023c490998a3fec245ca2fb2b3c710c2c6 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 25 Dec 2019 13:35:22 +0900 Subject: [PATCH 157/878] range.c: Range#min with a beginless one now raise an explicit exception [Bug #16450] --- range.c | 7 +++++++ test/ruby/test_range.rb | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/range.c b/range.c index fe956197c6bd53..bf14c0c7a7e75b 100644 --- a/range.c +++ b/range.c @@ -1136,6 +1136,10 @@ range_last(int argc, VALUE *argv, VALUE range) static VALUE range_min(int argc, VALUE *argv, VALUE range) { + if (NIL_P(RANGE_BEG(range))) { + rb_raise(rb_eRangeError, "cannot get the minimum of beginless range"); + } + if (rb_block_given_p()) { if (NIL_P(RANGE_END(range))) { rb_raise(rb_eRangeError, "cannot get the minimum of endless range with custom comparison method"); @@ -1185,6 +1189,9 @@ range_max(int argc, VALUE *argv, VALUE range) } if (rb_block_given_p() || (EXCL(range) && !nm) || argc) { + if (NIL_P(RANGE_BEG(range))) { + rb_raise(rb_eRangeError, "cannot get the maximum of beginless range with custom comparison method"); + } return rb_call_super(argc, argv); } else { diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 800cee92ccd501..b37dbbc4331eb1 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -81,6 +81,8 @@ def test_min assert_equal(nil, (2..1).min) assert_equal(1, (1...2).min) assert_equal(1, (1..).min) + assert_raise(RangeError) { (..1).min } + assert_raise(RangeError) { (...1).min } assert_equal(1.0, (1.0..2.0).min) assert_equal(nil, (2.0..1.0).min) @@ -93,6 +95,8 @@ def test_min assert_equal([0,1,2], (0..10).min(3)) assert_equal([0,1], (0..1).min(3)) assert_equal([0,1,2], (0..).min(3)) + assert_raise(RangeError) { (..1).min(3) } + assert_raise(RangeError) { (...1).min(3) } assert_raise(RangeError) { (0..).min {|a, b| a <=> b } } end @@ -119,6 +123,8 @@ def test_max assert_equal([9,8,7], (0...10).max(3)) assert_raise(RangeError) { (1..).max(3) } assert_raise(RangeError) { (1...).max(3) } + + assert_raise(RangeError) { (..0).min {|a, b| a <=> b } } end def test_minmax From d9bf9c572f461c282fa6e65833e98bc7d453a66f Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 25 Dec 2019 14:10:35 +0900 Subject: [PATCH 158/878] take care of USE_LAZY_LOAD=1. On USE_LAZY_LOAD=1, the iseq should be loaded. So rb_iseq_check() is needed. Furthermore, now lazy loading with builtin_function_table is not supported, so it should cancel lazy loading. --- builtin.c | 2 +- compile.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin.c b/builtin.c index 67b43c7f5cad63..6de77228d01143 100644 --- a/builtin.c +++ b/builtin.c @@ -51,7 +51,7 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin vm->builtin_function_table = NULL; // exec - rb_iseq_eval(iseq); + rb_iseq_eval(rb_iseq_check(iseq)); } #endif diff --git a/compile.c b/compile.c index 56b91bfb461199..4343443da577eb 100644 --- a/compile.c +++ b/compile.c @@ -11499,7 +11499,11 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq) #if IBF_ISEQ_DEBUG fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq); #endif - rb_ibf_load_iseq_complete(iseq); + rb_ibf_load_iseq_complete(iseq); +#else + if (GET_VM()->builtin_function_table) { + rb_ibf_load_iseq_complete(iseq); + } #endif /* !USE_LAZY_LOAD */ #if IBF_ISEQ_DEBUG From 9808e010907bb16068497d9f0f8593a7165fa42d Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 25 Dec 2019 14:37:53 +0900 Subject: [PATCH 159/878] export a function for MJIT. rb_iseq_complete() can be used by MJIT. --- compile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.c b/compile.c index 4343443da577eb..7043ba9a739f53 100644 --- a/compile.c +++ b/compile.c @@ -11452,7 +11452,7 @@ rb_ibf_load_iseq_complete(rb_iseq_t *iseq) } #if USE_LAZY_LOAD -const rb_iseq_t * +MJIT_FUNC_EXPORTED const rb_iseq_t * rb_iseq_complete(const rb_iseq_t *iseq) { rb_ibf_load_iseq_complete((rb_iseq_t *)iseq); From 56e002981fab73a94c6038cb9de82aba6ff84eb4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 25 Dec 2019 14:47:31 +0900 Subject: [PATCH 160/878] Show the error line only when same as the current --- parse.y | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index 6d9bfc9f4185ce..1281eb62584759 100644 --- a/parse.y +++ b/parse.y @@ -5631,7 +5631,18 @@ static void ruby_show_error_line(VALUE errbuf, const YYLTYPE *yylloc, int lineno static inline void parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc) { - ruby_show_error_line(p->error_buffer, yylloc, p->ruby_sourceline, p->lex.lastline); + VALUE str; + int lineno = p->ruby_sourceline; + if (!yylloc) { + return; + } + else if (yylloc->beg_pos.lineno == lineno) { + str = p->lex.lastline; + } + else { + return; + } + ruby_show_error_line(p->error_buffer, yylloc, lineno, str); } static int From 27453b04c85249372950b6b12fabbef8c0d1a80b Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Wed, 25 Dec 2019 15:21:50 +0900 Subject: [PATCH 161/878] Update the version of bigdecimal to 2.0.0 (#2784) --- ext/bigdecimal/bigdecimal.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec index 53dbe91147432b..7d767f598bbadd 100644 --- a/ext/bigdecimal/bigdecimal.gemspec +++ b/ext/bigdecimal/bigdecimal.gemspec @@ -1,6 +1,6 @@ # coding: utf-8 -bigdecimal_version = '2.0.0.dev' +bigdecimal_version = '2.0.0' Gem::Specification.new do |s| s.name = "bigdecimal" From 75dca097b873222eaf3c70b7f43e3ffb98b7f2ed Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 25 Dec 2019 14:13:15 +0900 Subject: [PATCH 162/878] [bundler/bundler] Do `require "rubygems"` only when needed This require causes circular require. ``` $ touch empty_file $ RUBYGEMS_GEMDEPS=empty_file ./local/bin/ruby -w -e '' /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: loading in progress, circular require considered harmful - /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb from :1:in `' from :1:in `require' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1417:in `' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1203:in `use_gemdeps' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/user_interaction.rb:47:in `use_ui' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1204:in `block in use_gemdeps' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require' from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in `' from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in `require_relative' from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler/rubygems_integration.rb:3:in `' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require' from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require' ``` https://github.com/bundler/bundler/commit/c7c5bcea92 --- lib/bundler/rubygems_integration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 18da5915a5d760..d97621cd92c1ec 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rubygems" +require "rubygems" unless defined?(Gem) module Bundler class RubygemsIntegration From a1018b2c5fef48b0cf52d7644578cb775339bd5b Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Wed, 25 Dec 2019 17:01:26 +0900 Subject: [PATCH 163/878] fix typo --- tool/format-release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/format-release b/tool/format-release index ec2d535ac45be4..b34da3509c05ac 100755 --- a/tool/format-release +++ b/tool/format-release @@ -109,7 +109,7 @@ eom unless ver.include?("-") # assume this is X.Y.0 release node.sub!(/^ status: preview\n/, " status: normal maintenance\n") - node.sub!(/^ date:\n/, " status: #{Time.now.year}-12-25\n") + node.sub!(/^ date:\n/, " date: #{Time.now.year}-12-25\n") end node end From 1002de58ec48afecfde83b542cb934e7c8df0cf0 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Wed, 25 Dec 2019 18:02:53 +0900 Subject: [PATCH 164/878] fix version regexp --- tool/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release.sh b/tool/release.sh index a8a94af67a2337..0988dc2a671574 100755 --- a/tool/release.sh +++ b/tool/release.sh @@ -4,7 +4,7 @@ EXTS='.tar.gz .tar.bz2 .tar.xz .zip' ver=$1 -if [[ $ver =~ ^([1-9]\.[0-9])\.([1-9]|[1-9][0-9]|0-(preview[1-9]|rc[1-9]))?$ ]]; then +if [[ $ver =~ ^([1-9]\.[0-9])\.([0-9]|[1-9][0-9]|0-(preview[1-9]|rc[1-9]))$ ]]; then : else echo $ver is not valid release version From 8a705245e55575d4d310a2e956b89a36a5931971 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 18:45:02 +0900 Subject: [PATCH 165/878] Save last breaking point to complete --- lib/reline/line_editor.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 10996e4c314ad4..75af50a908760b 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -919,6 +919,7 @@ def retrieve_completion_block(set_completion_quote_character = false) elsif not quote and slice =~ word_break_regexp rest = $' i += 1 + before = @line.byteslice(i, @byte_pointer - i) break_pointer = i else i += 1 From e1e1d9227789028891c3553586de1c22e7274fed Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 25 Dec 2019 18:46:39 +0900 Subject: [PATCH 166/878] [ruby/reline] Version 0.1.2 https://github.com/ruby/reline/commit/b41024e317 --- lib/reline/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/version.rb b/lib/reline/version.rb index 27645bcbf9251c..47b29bd9466072 100644 --- a/lib/reline/version.rb +++ b/lib/reline/version.rb @@ -1,3 +1,3 @@ module Reline - VERSION = '0.1.1' + VERSION = '0.1.2' end From 537a1cd5a97a8c5e93b64851abaab42812506f66 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 26 Dec 2019 10:55:58 +0900 Subject: [PATCH 167/878] 2.8.0 (tentative; to be 3.0.0) development has started. --- include/ruby/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/version.h b/include/ruby/version.h index 64c5c614e00721..25a961566b1798 100644 --- a/include/ruby/version.h +++ b/include/ruby/version.h @@ -31,7 +31,7 @@ /* API version */ #define RUBY_API_VERSION_MAJOR 2 -#define RUBY_API_VERSION_MINOR 7 +#define RUBY_API_VERSION_MINOR 8 #define RUBY_API_VERSION_TEENY 0 #define RUBY_API_VERSION_CODE (RUBY_API_VERSION_MAJOR*10000+RUBY_API_VERSION_MINOR*100+RUBY_API_VERSION_TEENY) From dced0e57453ed4cf8703dee61454334baa5a034e Mon Sep 17 00:00:00 2001 From: git Date: Thu, 26 Dec 2019 10:58:26 +0900 Subject: [PATCH 168/878] * 2019-12-26 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index dda138e5e6e420..468be9d6cf11d0 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" From b25e27277dc39f25cfca4db8452d254f6cc8046e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 26 Dec 2019 15:50:34 +0900 Subject: [PATCH 169/878] Transform hash keys by a hash [Feature #16274] --- hash.c | 77 +++++++++++++++++++++++++++++++++++++----- test/ruby/test_hash.rb | 10 ++++++ 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/hash.c b/hash.c index 82383e9a93fb95..1fd3a335b3b8a3 100644 --- a/hash.c +++ b/hash.c @@ -3023,6 +3023,28 @@ rb_hash_each_pair(VALUE hash) return hash; } +struct transform_keys_args{ + VALUE trans; + VALUE result; + int block_given; +}; + +static int +transform_keys_hash_i(VALUE key, VALUE value, VALUE transarg) +{ + struct transform_keys_args *p = (void *)transarg; + VALUE trans = p->trans, result = p->result; + VALUE new_key = rb_hash_lookup2(trans, key, Qundef); + if (new_key == Qundef) { + if (p->block_given) + new_key = rb_yield(key); + else + new_key = key; + } + rb_hash_aset(result, new_key, value); + return ST_CONTINUE; +} + static int transform_keys_i(VALUE key, VALUE value, VALUE result) { @@ -3049,14 +3071,28 @@ transform_keys_i(VALUE key, VALUE value, VALUE result) * If no block is given, an enumerator is returned instead. */ static VALUE -rb_hash_transform_keys(VALUE hash) +rb_hash_transform_keys(int argc, VALUE *argv, VALUE hash) { VALUE result; + struct transform_keys_args transarg = {0}; - RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); + argc = rb_check_arity(argc, 0, 1); + if (argc > 0) { + transarg.trans = to_hash(argv[0]); + transarg.block_given = rb_block_given_p(); + } + else { + RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); + } result = rb_hash_new(); if (!RHASH_EMPTY_P(hash)) { - rb_hash_foreach(hash, transform_keys_i, result); + if (transarg.trans) { + transarg.result = result; + rb_hash_foreach(hash, transform_keys_hash_i, (VALUE)&transarg); + } + else { + rb_hash_foreach(hash, transform_keys_i, result); + } } return result; @@ -3082,17 +3118,40 @@ static VALUE rb_hash_flatten(int argc, VALUE *argv, VALUE hash); * If no block is given, an enumerator is returned instead. */ static VALUE -rb_hash_transform_keys_bang(VALUE hash) +rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash) { - RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); + VALUE trans = 0; + int block_given = 0; + + argc = rb_check_arity(argc, 0, 1); + if (argc > 0) { + trans = to_hash(argv[0]); + block_given = rb_block_given_p(); + } + else { + RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); + } rb_hash_modify_check(hash); if (!RHASH_TABLE_EMPTY_P(hash)) { long i; VALUE pairs = rb_hash_flatten(0, NULL, hash); rb_hash_clear(hash); for (i = 0; i < RARRAY_LEN(pairs); i += 2) { - VALUE key = RARRAY_AREF(pairs, i), new_key = rb_yield(key), - val = RARRAY_AREF(pairs, i+1); + VALUE key = RARRAY_AREF(pairs, i), new_key, val; + + if (!trans) { + new_key = rb_yield(key); + } + else if ((new_key = rb_hash_lookup2(trans, key, Qundef)) != Qundef) { + /* use the transformed key */ + } + else if (block_given) { + new_key = rb_yield(key); + } + else { + new_key = key; + } + val = RARRAY_AREF(pairs, i+1); rb_hash_aset(hash, new_key, val); } } @@ -6285,8 +6344,8 @@ Init_Hash(void) rb_define_method(rb_cHash, "each_pair", rb_hash_each_pair, 0); rb_define_method(rb_cHash, "each", rb_hash_each_pair, 0); - rb_define_method(rb_cHash, "transform_keys", rb_hash_transform_keys, 0); - rb_define_method(rb_cHash, "transform_keys!", rb_hash_transform_keys_bang, 0); + rb_define_method(rb_cHash, "transform_keys", rb_hash_transform_keys, -1); + rb_define_method(rb_cHash, "transform_keys!", rb_hash_transform_keys_bang, -1); rb_define_method(rb_cHash, "transform_values", rb_hash_transform_values, 0); rb_define_method(rb_cHash, "transform_values!", rb_hash_transform_values_bang, 0); diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index ccc3355930ca5a..733bccd1386b45 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1638,6 +1638,9 @@ def test_transform_keys y = x.transform_keys.with_index {|k, i| "#{k}.#{i}" } assert_equal(%w(a.0 b.1 c.2), y.keys) + + assert_equal({A: 1, B: 2, c: 3}, x.transform_keys({a: :A, b: :B, d: :D})) + assert_equal({A: 1, B: 2, "c" => 3}, x.transform_keys({a: :A, b: :B, d: :D}, &:to_s)) end def test_transform_keys_bang @@ -1660,6 +1663,13 @@ def test_transform_keys_bang x = @cls[true => :a, false => :b] x.transform_keys! {|k| !k } assert_equal([false, :a, true, :b], x.flatten) + + x = @cls[a: 1, b: 2, c: 3] + x.transform_keys!({a: :A, b: :B, d: :D}) + assert_equal({A: 1, B: 2, c: 3}, x) + x = @cls[a: 1, b: 2, c: 3] + x.transform_keys!({a: :A, b: :B, d: :D}, &:to_s) + assert_equal({A: 1, B: 2, "c" => 3}, x) end def test_transform_values From ba78bf9778082795bdb4735ccd7b692b5c3769f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 25 Dec 2019 14:19:48 +0900 Subject: [PATCH 170/878] debug_counter.h must be self-contained Include what is necessary. --- debug_counter.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debug_counter.h b/debug_counter.h index 066533d1d16749..eb313fc8385929 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -341,6 +341,10 @@ RB_DEBUG_COUNTER(load_path_is_not_realpath) #ifndef RUBY_DEBUG_COUNTER_H #define RUBY_DEBUG_COUNTER_H 1 +#include "ruby/config.h" +#include /* for size_t */ +#include "ruby/ruby.h" /* for VALUE */ + #if !defined(__GNUC__) && USE_DEBUG_COUNTER #error "USE_DEBUG_COUNTER is not supported by other than __GNUC__" #endif From b739a63eb41f52d33c33f87ebc44dcf89762cc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 29 Nov 2019 15:18:34 +0900 Subject: [PATCH 171/878] split internal.h into files One day, I could not resist the way it was written. I finally started to make the code clean. This changeset is the beginning of a series of housekeeping commits. It is a simple refactoring; split internal.h into files, so that we can divide and concur in the upcoming commits. No lines of codes are either added or removed, except the obvious file headers/footers. The generated binary is identical to the one before. --- gc.c | 6 + internal.h | 2709 +------------------------------------- internal/array.h | 88 ++ internal/bignum.h | 167 +++ internal/bits.h | 328 +++++ internal/class.h | 143 ++ internal/compar.h | 54 + internal/compile.h | 22 + internal/compilers.h | 87 ++ internal/complex.h | 28 + internal/cont.h | 19 + internal/debug.h | 34 + internal/dir.h | 16 + internal/enc.h | 24 + internal/encoding.h | 28 + internal/enum.h | 18 + internal/enumerator.h | 20 + internal/error.h | 72 + internal/eval.h | 30 + internal/file.h | 55 + internal/fixnum.h | 150 +++ internal/gc.h | 79 ++ internal/hash.h | 143 ++ internal/imemo.h | 212 +++ internal/inits.h | 51 + internal/io.h | 31 + internal/load.h | 18 + internal/loadpath.h | 17 + internal/math.h | 23 + internal/missing.h | 18 + internal/mjit.h | 27 + internal/numeric.h | 213 +++ internal/object.h | 45 + internal/parse.h | 31 + internal/proc.h | 24 + internal/process.h | 95 ++ internal/random.h | 16 + internal/range.h | 18 + internal/rational.h | 47 + internal/re.h | 25 + internal/sanitizers.h | 179 +++ internal/serial.h | 30 + internal/signal.h | 22 + internal/static_assert.h | 21 + internal/stdbool.h | 20 + internal/string.h | 92 ++ internal/struct.h | 88 ++ internal/symbol.h | 29 + internal/thread.h | 44 + internal/time.h | 30 + internal/transcode.h | 19 + internal/util.h | 25 + internal/variable.h | 59 + internal/vm.h | 166 +++ internal/warnings.h | 50 + 55 files changed, 3449 insertions(+), 2656 deletions(-) create mode 100644 internal/array.h create mode 100644 internal/bignum.h create mode 100644 internal/bits.h create mode 100644 internal/class.h create mode 100644 internal/compar.h create mode 100644 internal/compile.h create mode 100644 internal/compilers.h create mode 100644 internal/complex.h create mode 100644 internal/cont.h create mode 100644 internal/debug.h create mode 100644 internal/dir.h create mode 100644 internal/enc.h create mode 100644 internal/encoding.h create mode 100644 internal/enum.h create mode 100644 internal/enumerator.h create mode 100644 internal/error.h create mode 100644 internal/eval.h create mode 100644 internal/file.h create mode 100644 internal/fixnum.h create mode 100644 internal/gc.h create mode 100644 internal/hash.h create mode 100644 internal/imemo.h create mode 100644 internal/inits.h create mode 100644 internal/io.h create mode 100644 internal/load.h create mode 100644 internal/loadpath.h create mode 100644 internal/math.h create mode 100644 internal/missing.h create mode 100644 internal/mjit.h create mode 100644 internal/numeric.h create mode 100644 internal/object.h create mode 100644 internal/parse.h create mode 100644 internal/proc.h create mode 100644 internal/process.h create mode 100644 internal/random.h create mode 100644 internal/range.h create mode 100644 internal/rational.h create mode 100644 internal/re.h create mode 100644 internal/sanitizers.h create mode 100644 internal/serial.h create mode 100644 internal/signal.h create mode 100644 internal/static_assert.h create mode 100644 internal/stdbool.h create mode 100644 internal/string.h create mode 100644 internal/struct.h create mode 100644 internal/symbol.h create mode 100644 internal/thread.h create mode 100644 internal/time.h create mode 100644 internal/transcode.h create mode 100644 internal/util.h create mode 100644 internal/variable.h create mode 100644 internal/vm.h create mode 100644 internal/warnings.h diff --git a/gc.c b/gc.c index 131ffb82460627..6def78a105210d 100644 --- a/gc.c +++ b/gc.c @@ -559,6 +559,12 @@ typedef struct gc_profile_record { #endif } gc_profile_record; +struct RMoved { + VALUE flags; + VALUE destination; + VALUE next; +}; + #if defined(_MSC_VER) || defined(__CYGWIN__) #pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */ #endif diff --git a/internal.h b/internal.h index baefb36c020894..853274ec4a315a 100644 --- a/internal.h +++ b/internal.h @@ -21,2671 +21,69 @@ extern "C" { #endif #endif -#ifdef HAVE_STDBOOL_H -# include -#else -# include "missing/stdbool.h" -#endif - -/* The most significant bit of the lower part of half-long integer. - * If sizeof(long) == 4, this is 0x8000. - * If sizeof(long) == 8, this is 0x80000000. - */ -#define HALF_LONG_MSB ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2)) +#include "internal/stdbool.h" +#include "internal/bits.h" #define LIKELY(x) RB_LIKELY(x) #define UNLIKELY(x) RB_UNLIKELY(x) -#ifndef MAYBE_UNUSED -# define MAYBE_UNUSED(x) x -#endif - -#ifndef WARN_UNUSED_RESULT -# define WARN_UNUSED_RESULT(x) x -#endif - -#ifndef __has_feature -# define __has_feature(x) 0 -#endif - -#ifndef __has_extension -# define __has_extension __has_feature -#endif - -#if 0 -#elif defined(NO_SANITIZE) && __has_feature(memory_sanitizer) -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_SANITIZE("memory", NO_SANITIZE("address", NOINLINE(x))) -#elif defined(NO_SANITIZE) -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_SANITIZE("address", NOINLINE(x)) -#elif defined(NO_SANITIZE_ADDRESS) -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_SANITIZE_ADDRESS(NOINLINE(x)) -#elif defined(NO_ADDRESS_SAFETY_ANALYSIS) -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_ADDRESS_SAFETY_ANALYSIS(NOINLINE(x)) -#else -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) x -#endif - -#if defined(NO_SANITIZE) && defined(__GNUC__) &&! defined(__clang__) -/* GCC warns about unknown sanitizer, which is annoying. */ -#undef NO_SANITIZE -#define NO_SANITIZE(x, y) \ - COMPILER_WARNING_PUSH; \ - COMPILER_WARNING_IGNORED(-Wattributes); \ - __attribute__((__no_sanitize__(x))) y; \ - COMPILER_WARNING_POP -#endif - -#ifndef NO_SANITIZE -# define NO_SANITIZE(x, y) y -#endif - -#ifdef HAVE_VALGRIND_MEMCHECK_H -# include -# ifndef VALGRIND_MAKE_MEM_DEFINED -# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) -# endif -# ifndef VALGRIND_MAKE_MEM_UNDEFINED -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) -# endif -#else -# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 -#endif +#include "internal/compilers.h" +#include "internal/sanitizers.h" #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0]))) -#ifndef MJIT_HEADER - -#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H -# include -#endif - -#if !__has_feature(address_sanitizer) -# define __asan_poison_memory_region(x, y) -# define __asan_unpoison_memory_region(x, y) -# define __asan_region_is_poisoned(x, y) 0 -#endif - -#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H -# if __has_feature(memory_sanitizer) -# include -# endif -#endif - -#if !__has_feature(memory_sanitizer) -# define __msan_allocated_memory(x, y) ((void)(x), (void)(y)) -# define __msan_poison(x, y) ((void)(x), (void)(y)) -# define __msan_unpoison(x, y) ((void)(x), (void)(y)) -# define __msan_unpoison_string(x) ((void)(x)) -#endif - -/*! - * This function asserts that a (continuous) memory region from ptr to size - * being "poisoned". Both read / write access to such memory region are - * prohibited until properly unpoisoned. The region must be previously - * allocated (do not pass a freed pointer here), but not necessarily be an - * entire object that the malloc returns. You can punch hole a part of a - * gigantic heap arena. This is handy when you do not free an allocated memory - * region to reuse later: poison when you keep it unused, and unpoison when you - * reuse. - * - * \param[in] ptr pointer to the beginning of the memory region to poison. - * \param[in] size the length of the memory region to poison. - */ -static inline void -asan_poison_memory_region(const volatile void *ptr, size_t size) -{ - __msan_poison(ptr, size); - __asan_poison_memory_region(ptr, size); -} - -/*! - * This is a variant of asan_poison_memory_region that takes a VALUE. - * - * \param[in] obj target object. - */ -static inline void -asan_poison_object(VALUE obj) -{ - MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; - asan_poison_memory_region(ptr, SIZEOF_VALUE); -} - -#if !__has_feature(address_sanitizer) -#define asan_poison_object_if(ptr, obj) ((void)(ptr), (void)(obj)) -#else -#define asan_poison_object_if(ptr, obj) do { \ - if (ptr) asan_poison_object(obj); \ - } while (0) -#endif - -/*! - * This function predicates if the given object is fully addressable or not. - * - * \param[in] obj target object. - * \retval 0 the given object is fully addressable. - * \retval otherwise pointer to first such byte who is poisoned. - */ -static inline void * -asan_poisoned_object_p(VALUE obj) -{ - MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; - return __asan_region_is_poisoned(ptr, SIZEOF_VALUE); -} - -/*! - * This function asserts that a (formally poisoned) memory region from ptr to - * size is now addressable. Write access to such memory region gets allowed. - * However read access might or might not be possible depending on situations, - * because the region can have contents of previous usages. That information - * should be passed by the malloc_p flag. If that is true, the contents of the - * region is _not_ fully defined (like the return value of malloc behaves). - * Reading from there is NG; write something first. If malloc_p is false on - * the other hand, that memory region is fully defined and can be read - * immediately. - * - * \param[in] ptr pointer to the beginning of the memory region to unpoison. - * \param[in] size the length of the memory region. - * \param[in] malloc_p if the memory region is like a malloc's return value or not. - */ -static inline void -asan_unpoison_memory_region(const volatile void *ptr, size_t size, bool malloc_p) -{ - __asan_unpoison_memory_region(ptr, size); - if (malloc_p) { - __msan_allocated_memory(ptr, size); - } - else { - __msan_unpoison(ptr, size); - } -} - -/*! - * This is a variant of asan_unpoison_memory_region that takes a VALUE. - * - * \param[in] obj target object. - * \param[in] malloc_p if the memory region is like a malloc's return value or not. - */ -static inline void -asan_unpoison_object(VALUE obj, bool newobj_p) -{ - MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; - asan_unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p); -} - -#endif - /* Prevent compiler from reordering access */ #define ACCESS_ONCE(type,x) (*((volatile type *)&(x))) -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) -# define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr) -#elif GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert) -# define STATIC_ASSERT(name, expr) RB_GNUC_EXTENSION _Static_assert(expr, #name ": " #expr) -#else -# define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)] -#endif - -#define SIGNED_INTEGER_TYPE_P(int_type) (0 > ((int_type)0)-1) -#define SIGNED_INTEGER_MAX(sint_type) \ - (sint_type) \ - ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) | \ - ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) - 1)) -#define SIGNED_INTEGER_MIN(sint_type) (-SIGNED_INTEGER_MAX(sint_type)-1) -#define UNSIGNED_INTEGER_MAX(uint_type) (~(uint_type)0) - -#if SIGNEDNESS_OF_TIME_T < 0 /* signed */ -# define TIMET_MAX SIGNED_INTEGER_MAX(time_t) -# define TIMET_MIN SIGNED_INTEGER_MIN(time_t) -#elif SIGNEDNESS_OF_TIME_T > 0 /* unsigned */ -# define TIMET_MAX UNSIGNED_INTEGER_MAX(time_t) -# define TIMET_MIN ((time_t)0) -#endif -#define TIMET_MAX_PLUS_ONE (2*(double)(TIMET_MAX/2+1)) - -#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P -#define MUL_OVERFLOW_P(a, b) \ - __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0) -#elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW -#define MUL_OVERFLOW_P(a, b) \ - RB_GNUC_EXTENSION_BLOCK(__typeof__(a) c; __builtin_mul_overflow((a), (b), &c)) -#endif - -#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \ - (a) == 0 ? 0 : \ - (a) == -1 ? (b) < -(max) : \ - (a) > 0 ? \ - ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \ - ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b))) - -#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P -/* __builtin_mul_overflow_p can take bitfield */ -/* and GCC permits bitfields for integers other than int */ -#define MUL_OVERFLOW_FIXNUM_P(a, b) RB_GNUC_EXTENSION_BLOCK( \ - struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \ - __builtin_mul_overflow_p((a), (b), c.fixnum); \ -) -#else -#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) -#endif - -#ifdef MUL_OVERFLOW_P -#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_P(a, b) -#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_P(a, b) -#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_P(a, b) -#else -#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX) -#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX) -#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX) -#endif - -#ifndef swap16 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP16 -# define swap16(x) __builtin_bswap16(x) -# endif -#endif - -#ifndef swap16 -# define swap16(x) ((uint16_t)((((x)&0xFF)<<8) | (((x)>>8)&0xFF))) -#endif - -#ifndef swap32 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP32 -# define swap32(x) __builtin_bswap32(x) -# endif -#endif - -#ifndef swap32 -# define swap32(x) ((uint32_t)((((x)&0xFF)<<24) \ - |(((x)>>24)&0xFF) \ - |(((x)&0x0000FF00)<<8) \ - |(((x)&0x00FF0000)>>8) )) -#endif - -#ifndef swap64 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP64 -# define swap64(x) __builtin_bswap64(x) -# endif -#endif - -#ifndef swap64 -# ifdef HAVE_INT64_T -# define byte_in_64bit(n) ((uint64_t)0xff << (n)) -# define swap64(x) ((uint64_t)((((x)&byte_in_64bit(0))<<56) \ - |(((x)>>56)&0xFF) \ - |(((x)&byte_in_64bit(8))<<40) \ - |(((x)&byte_in_64bit(48))>>40) \ - |(((x)&byte_in_64bit(16))<<24) \ - |(((x)&byte_in_64bit(40))>>24) \ - |(((x)&byte_in_64bit(24))<<8) \ - |(((x)&byte_in_64bit(32))>>8))) -# endif -#endif - -static inline unsigned int -nlz_int(unsigned int x) -{ -#if defined(HAVE_BUILTIN___BUILTIN_CLZ) - if (x == 0) return SIZEOF_INT * CHAR_BIT; - return (unsigned int)__builtin_clz(x); -#else - unsigned int y; -# if 64 < SIZEOF_INT * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_INT * CHAR_BIT - unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_INT * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_INT * CHAR_BIT - y = x >> 32; if (y) {n -= 32; x = y;} -# endif - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); -#endif -} - -static inline unsigned int -nlz_long(unsigned long x) -{ -#if defined(HAVE_BUILTIN___BUILTIN_CLZL) - if (x == 0) return SIZEOF_LONG * CHAR_BIT; - return (unsigned int)__builtin_clzl(x); -#else - unsigned long y; -# if 64 < SIZEOF_LONG * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_LONG * CHAR_BIT - unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_LONG * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_LONG * CHAR_BIT - y = x >> 32; if (y) {n -= 32; x = y;} -# endif - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); -#endif -} - -#ifdef HAVE_LONG_LONG -static inline unsigned int -nlz_long_long(unsigned LONG_LONG x) -{ -#if defined(HAVE_BUILTIN___BUILTIN_CLZLL) - if (x == 0) return SIZEOF_LONG_LONG * CHAR_BIT; - return (unsigned int)__builtin_clzll(x); -#else - unsigned LONG_LONG y; -# if 64 < SIZEOF_LONG_LONG * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_LONG_LONG * CHAR_BIT - unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_LONG_LONG * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_LONG_LONG * CHAR_BIT - y = x >> 32; if (y) {n -= 32; x = y;} -# endif - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); -#endif -} -#endif - -#ifdef HAVE_UINT128_T -static inline unsigned int -nlz_int128(uint128_t x) -{ - uint128_t y; - unsigned int n = 128; - y = x >> 64; if (y) {n -= 64; x = y;} - y = x >> 32; if (y) {n -= 32; x = y;} - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); -} -#endif - -static inline unsigned int -nlz_intptr(uintptr_t x) -{ -#if SIZEOF_UINTPTR_T == SIZEOF_INT - return nlz_int(x); -#elif SIZEOF_UINTPTR_T == SIZEOF_LONG - return nlz_long(x); -#elif SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG - return nlz_long_long(x); -#else - #error no known integer type corresponds uintptr_t - return /* sane compiler */ ~0; -#endif -} - -static inline unsigned int -rb_popcount32(uint32_t x) -{ -#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT - return (unsigned int)__builtin_popcount(x); -#else - x = (x & 0x55555555) + (x >> 1 & 0x55555555); - x = (x & 0x33333333) + (x >> 2 & 0x33333333); - x = (x & 0x0f0f0f0f) + (x >> 4 & 0x0f0f0f0f); - x = (x & 0x001f001f) + (x >> 8 & 0x001f001f); - return (x & 0x0000003f) + (x >>16 & 0x0000003f); -#endif -} - -static inline int -rb_popcount64(uint64_t x) -{ -#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT - return __builtin_popcountll(x); -#else - x = (x & 0x5555555555555555) + (x >> 1 & 0x5555555555555555); - x = (x & 0x3333333333333333) + (x >> 2 & 0x3333333333333333); - x = (x & 0x0707070707070707) + (x >> 4 & 0x0707070707070707); - x = (x & 0x001f001f001f001f) + (x >> 8 & 0x001f001f001f001f); - x = (x & 0x0000003f0000003f) + (x >>16 & 0x0000003f0000003f); - return (x & 0x7f) + (x >>32 & 0x7f); -#endif -} - -static inline int -rb_popcount_intptr(uintptr_t x) -{ -#if SIZEOF_VOIDP == 8 - return rb_popcount64(x); -#elif SIZEOF_VOIDP == 4 - return rb_popcount32(x); -#endif -} - -static inline int -ntz_int32(uint32_t x) -{ -#ifdef HAVE_BUILTIN___BUILTIN_CTZ - return __builtin_ctz(x); -#else - return rb_popcount32((~x) & (x-1)); -#endif -} - -static inline int -ntz_int64(uint64_t x) -{ -#ifdef HAVE_BUILTIN___BUILTIN_CTZLL - return __builtin_ctzll(x); -#else - return rb_popcount64((~x) & (x-1)); -#endif -} - -static inline int -ntz_intptr(uintptr_t x) -{ -#if SIZEOF_VOIDP == 8 - return ntz_int64(x); -#elif SIZEOF_VOIDP == 4 - return ntz_int32(x); -#endif -} - -#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG -# define DLONG LONG_LONG -# define DL2NUM(x) LL2NUM(x) -#elif defined(HAVE_INT128_T) -# define DLONG int128_t -# define DL2NUM(x) (RB_FIXABLE(x) ? LONG2FIX(x) : rb_int128t2big(x)) -VALUE rb_int128t2big(int128_t n); -#endif - -static inline long -rb_overflowed_fix_to_int(long x) -{ - return (long)((unsigned long)(x >> 1) ^ (1LU << (SIZEOF_LONG * CHAR_BIT - 1))); -} - -static inline VALUE -rb_fix_plus_fix(VALUE x, VALUE y) -{ -#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW - long lz; - /* NOTE - * (1) `LONG2FIX(FIX2LONG(x)+FIX2LONG(y))` - + = `((lx*2+1)/2 + (ly*2+1)/2)*2+1` - + = `lx*2 + ly*2 + 1` - + = `(lx*2+1) + (ly*2+1) - 1` - + = `x + y - 1` - * (2) Fixnum's LSB is always 1. - * It means you can always run `x - 1` without overflow. - * (3) Of course `z = x + (y-1)` may overflow. - * At that time true value is - * * positive: 0b0 1xxx...1, and z = 0b1xxx...1 - * * nevative: 0b1 0xxx...1, and z = 0b0xxx...1 - * To convert this true value to long, - * (a) Use arithmetic shift - * * positive: 0b11xxx... - * * negative: 0b00xxx... - * (b) invert MSB - * * positive: 0b01xxx... - * * negative: 0b10xxx... - */ - if (__builtin_add_overflow((long)x, (long)y-1, &lz)) { - return rb_int2big(rb_overflowed_fix_to_int(lz)); - } - else { - return (VALUE)lz; - } -#else - long lz = FIX2LONG(x) + FIX2LONG(y); - return LONG2NUM(lz); -#endif -} - -static inline VALUE -rb_fix_minus_fix(VALUE x, VALUE y) -{ -#ifdef HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW - long lz; - if (__builtin_sub_overflow((long)x, (long)y-1, &lz)) { - return rb_int2big(rb_overflowed_fix_to_int(lz)); - } - else { - return (VALUE)lz; - } -#else - long lz = FIX2LONG(x) - FIX2LONG(y); - return LONG2NUM(lz); -#endif -} - -/* arguments must be Fixnum */ -static inline VALUE -rb_fix_mul_fix(VALUE x, VALUE y) -{ - long lx = FIX2LONG(x); - long ly = FIX2LONG(y); -#ifdef DLONG - return DL2NUM((DLONG)lx * (DLONG)ly); -#else - if (MUL_OVERFLOW_FIXNUM_P(lx, ly)) { - return rb_big_mul(rb_int2big(lx), rb_int2big(ly)); - } - else { - return LONG2FIX(lx * ly); - } -#endif -} - -/* - * This behaves different from C99 for negative arguments. - * Note that div may overflow fixnum. - */ -static inline void -rb_fix_divmod_fix(VALUE a, VALUE b, VALUE *divp, VALUE *modp) -{ - /* assume / and % comply C99. - * ldiv(3) won't be inlined by GCC and clang. - * I expect / and % are compiled as single idiv. - */ - long x = FIX2LONG(a); - long y = FIX2LONG(b); - long div, mod; - if (x == FIXNUM_MIN && y == -1) { - if (divp) *divp = LONG2NUM(-FIXNUM_MIN); - if (modp) *modp = LONG2FIX(0); - return; - } - div = x / y; - mod = x % y; - if (y > 0 ? mod < 0 : mod > 0) { - mod += y; - div -= 1; - } - if (divp) *divp = LONG2FIX(div); - if (modp) *modp = LONG2FIX(mod); -} - -/* div() for Ruby - * This behaves different from C99 for negative arguments. - */ -static inline VALUE -rb_fix_div_fix(VALUE x, VALUE y) -{ - VALUE div; - rb_fix_divmod_fix(x, y, &div, NULL); - return div; -} - -/* mod() for Ruby - * This behaves different from C99 for negative arguments. - */ -static inline VALUE -rb_fix_mod_fix(VALUE x, VALUE y) -{ - VALUE mod; - rb_fix_divmod_fix(x, y, NULL, &mod); - return mod; -} - -#if defined(HAVE_UINT128_T) && defined(HAVE_LONG_LONG) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - sizeof(x) <= SIZEOF_LONG_LONG ? SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x)) : \ - SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) -#elif defined(HAVE_UINT128_T) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) -#elif defined(HAVE_LONG_LONG) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x))) -#else -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x))) -#endif - -#ifndef BDIGIT -# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG -# define BDIGIT unsigned int -# define SIZEOF_BDIGIT SIZEOF_INT -# define BDIGIT_DBL unsigned LONG_LONG -# define BDIGIT_DBL_SIGNED LONG_LONG -# define PRI_BDIGIT_PREFIX "" -# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX -# elif SIZEOF_INT*2 <= SIZEOF_LONG -# define BDIGIT unsigned int -# define SIZEOF_BDIGIT SIZEOF_INT -# define BDIGIT_DBL unsigned long -# define BDIGIT_DBL_SIGNED long -# define PRI_BDIGIT_PREFIX "" -# define PRI_BDIGIT_DBL_PREFIX "l" -# elif SIZEOF_SHORT*2 <= SIZEOF_LONG -# define BDIGIT unsigned short -# define SIZEOF_BDIGIT SIZEOF_SHORT -# define BDIGIT_DBL unsigned long -# define BDIGIT_DBL_SIGNED long -# define PRI_BDIGIT_PREFIX "h" -# define PRI_BDIGIT_DBL_PREFIX "l" -# else -# define BDIGIT unsigned short -# define SIZEOF_BDIGIT (SIZEOF_LONG/2) -# define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG -# define BDIGIT_DBL unsigned long -# define BDIGIT_DBL_SIGNED long -# define PRI_BDIGIT_PREFIX "h" -# define PRI_BDIGIT_DBL_PREFIX "l" -# endif -#endif -#ifndef SIZEOF_ACTUAL_BDIGIT -# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT -#endif - -#ifdef PRI_BDIGIT_PREFIX -# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d" -# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i" -# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o" -# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u" -# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x" -# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X" -#endif - -#ifdef PRI_BDIGIT_DBL_PREFIX -# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d" -# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i" -# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o" -# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u" -# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x" -# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X" -#endif - -#define BIGNUM_EMBED_LEN_NUMBITS 3 -#ifndef BIGNUM_EMBED_LEN_MAX -# if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1 -# define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) -# else -# define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1) -# endif -#endif - -struct RBignum { - struct RBasic basic; - union { - struct { - size_t len; - BDIGIT *digits; - } heap; - BDIGIT ary[BIGNUM_EMBED_LEN_MAX]; - } as; -}; -#define BIGNUM_SIGN_BIT ((VALUE)FL_USER1) -/* sign: positive:1, negative:0 */ -#define BIGNUM_SIGN(b) ((RBASIC(b)->flags & BIGNUM_SIGN_BIT) != 0) -#define BIGNUM_SET_SIGN(b,sign) \ - ((sign) ? (RBASIC(b)->flags |= BIGNUM_SIGN_BIT) \ - : (RBASIC(b)->flags &= ~BIGNUM_SIGN_BIT)) -#define BIGNUM_POSITIVE_P(b) BIGNUM_SIGN(b) -#define BIGNUM_NEGATIVE_P(b) (!BIGNUM_SIGN(b)) -#define BIGNUM_NEGATE(b) (RBASIC(b)->flags ^= BIGNUM_SIGN_BIT) - -#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2) -#define BIGNUM_EMBED_LEN_MASK \ - (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT) -#define BIGNUM_EMBED_LEN_SHIFT \ - (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */ -#define BIGNUM_LEN(b) \ - ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ - (size_t)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \ - (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \ - RBIGNUM(b)->as.heap.len) -/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */ -#define BIGNUM_DIGITS(b) \ - ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ - RBIGNUM(b)->as.ary : \ - RBIGNUM(b)->as.heap.digits) -#define BIGNUM_LENINT(b) rb_long2int(BIGNUM_LEN(b)) - -#define RBIGNUM(obj) (R_CAST(RBignum)(obj)) - -struct RRational { - struct RBasic basic; - VALUE num; - VALUE den; -}; - -#define RRATIONAL(obj) (R_CAST(RRational)(obj)) -#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->num,(n)) -#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->den,(d)) - -struct RFloat { - struct RBasic basic; - double float_value; -}; - -#define RFLOAT(obj) (R_CAST(RFloat)(obj)) - -struct RComplex { - struct RBasic basic; - VALUE real; - VALUE imag; -}; - -#define RCOMPLEX(obj) (R_CAST(RComplex)(obj)) - -/* shortcut macro for internal only */ -#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r)) -#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i)) - -enum ruby_rhash_flags { - RHASH_PASS_AS_KEYWORDS = FL_USER1, /* FL 1 */ - RHASH_PROC_DEFAULT = FL_USER2, /* FL 2 */ - RHASH_ST_TABLE_FLAG = FL_USER3, /* FL 3 */ -#define RHASH_AR_TABLE_MAX_SIZE SIZEOF_VALUE - RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7), /* FL 4..7 */ - RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4), - RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11), /* FL 8..11 */ - RHASH_AR_TABLE_BOUND_SHIFT = (FL_USHIFT+8), - - // we can not put it in "enum" because it can exceed "int" range. -#define RHASH_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 | /* FL 13..19 */ \ - FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19) - -#if USE_TRANSIENT_HEAP - RHASH_TRANSIENT_FLAG = FL_USER12, /* FL 12 */ -#endif - - RHASH_LEV_SHIFT = (FL_USHIFT + 13), - RHASH_LEV_MAX = 127, /* 7 bits */ - - RHASH_ENUM_END -}; - -#define RHASH_AR_TABLE_SIZE_RAW(h) \ - ((unsigned int)((RBASIC(h)->flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT)) - -void rb_hash_st_table_set(VALUE hash, st_table *st); - -#if 0 /* for debug */ -int rb_hash_ar_table_p(VALUE hash); -struct ar_table_struct *rb_hash_ar_table(VALUE hash); -st_table *rb_hash_st_table(VALUE hash); -#define RHASH_AR_TABLE_P(hash) rb_hash_ar_table_p(hash) -#define RHASH_AR_TABLE(h) rb_hash_ar_table(h) -#define RHASH_ST_TABLE(h) rb_hash_st_table(h) -#else -#define RHASH_AR_TABLE_P(hash) (!FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG)) -#define RHASH_AR_TABLE(hash) (RHASH(hash)->as.ar) -#define RHASH_ST_TABLE(hash) (RHASH(hash)->as.st) -#endif - -#define RHASH(obj) (R_CAST(RHash)(obj)) -#define RHASH_ST_SIZE(h) (RHASH_ST_TABLE(h)->num_entries) -#define RHASH_ST_TABLE_P(h) (!RHASH_AR_TABLE_P(h)) -#define RHASH_ST_CLEAR(h) (FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG), RHASH(h)->as.ar = NULL) - -#define RHASH_AR_TABLE_SIZE_MASK (VALUE)RHASH_AR_TABLE_SIZE_MASK -#define RHASH_AR_TABLE_SIZE_SHIFT RHASH_AR_TABLE_SIZE_SHIFT -#define RHASH_AR_TABLE_BOUND_MASK (VALUE)RHASH_AR_TABLE_BOUND_MASK -#define RHASH_AR_TABLE_BOUND_SHIFT RHASH_AR_TABLE_BOUND_SHIFT - -#if USE_TRANSIENT_HEAP -#define RHASH_TRANSIENT_P(hash) FL_TEST_RAW((hash), RHASH_TRANSIENT_FLAG) -#define RHASH_SET_TRANSIENT_FLAG(h) FL_SET_RAW(h, RHASH_TRANSIENT_FLAG) -#define RHASH_UNSET_TRANSIENT_FLAG(h) FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG) -#else -#define RHASH_TRANSIENT_P(hash) 0 -#define RHASH_SET_TRANSIENT_FLAG(h) ((void)0) -#define RHASH_UNSET_TRANSIENT_FLAG(h) ((void)0) -#endif - -#if SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 2 -typedef uint16_t ar_hint_t; -#elif SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 1 -typedef unsigned char ar_hint_t; -#else -#error unsupported -#endif - -struct RHash { - struct RBasic basic; - union { - st_table *st; - struct ar_table_struct *ar; /* possibly 0 */ - } as; - const VALUE ifnone; - union { - ar_hint_t ary[RHASH_AR_TABLE_MAX_SIZE]; - VALUE word; - } ar_hint; -}; - -#ifdef RHASH_IFNONE -# undef RHASH_IFNONE -# undef RHASH_SIZE - -# define RHASH_IFNONE(h) (RHASH(h)->ifnone) -# define RHASH_SIZE(h) (RHASH_AR_TABLE_P(h) ? RHASH_AR_TABLE_SIZE_RAW(h) : RHASH_ST_SIZE(h)) -#endif /* ifdef RHASH_IFNONE */ - -struct RMoved { - VALUE flags; - VALUE destination; - VALUE next; -}; - -/* missing/setproctitle.c */ -#ifndef HAVE_SETPROCTITLE -extern void ruby_init_setproctitle(int argc, char *argv[]); -#endif - -#define RSTRUCT_EMBED_LEN_MAX RSTRUCT_EMBED_LEN_MAX -#define RSTRUCT_EMBED_LEN_MASK RSTRUCT_EMBED_LEN_MASK -#define RSTRUCT_EMBED_LEN_SHIFT RSTRUCT_EMBED_LEN_SHIFT - -enum { - RSTRUCT_EMBED_LEN_MAX = RVALUE_EMBED_LEN_MAX, - RSTRUCT_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER1), - RSTRUCT_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+1), - RSTRUCT_TRANSIENT_FLAG = FL_USER3, - - RSTRUCT_ENUM_END -}; - -#if USE_TRANSIENT_HEAP -#define RSTRUCT_TRANSIENT_P(st) FL_TEST_RAW((obj), RSTRUCT_TRANSIENT_FLAG) -#define RSTRUCT_TRANSIENT_SET(st) FL_SET_RAW((st), RSTRUCT_TRANSIENT_FLAG) -#define RSTRUCT_TRANSIENT_UNSET(st) FL_UNSET_RAW((st), RSTRUCT_TRANSIENT_FLAG) -#else -#define RSTRUCT_TRANSIENT_P(st) 0 -#define RSTRUCT_TRANSIENT_SET(st) ((void)0) -#define RSTRUCT_TRANSIENT_UNSET(st) ((void)0) -#endif - -struct RStruct { - struct RBasic basic; - union { - struct { - long len; - const VALUE *ptr; - } heap; - const VALUE ary[RSTRUCT_EMBED_LEN_MAX]; - } as; -}; - -#undef RSTRUCT_LEN -#undef RSTRUCT_PTR -#undef RSTRUCT_SET -#undef RSTRUCT_GET -#define RSTRUCT_EMBED_LEN(st) \ - (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \ - (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) -#define RSTRUCT_LEN(st) rb_struct_len(st) -#define RSTRUCT_LENINT(st) rb_long2int(RSTRUCT_LEN(st)) -#define RSTRUCT_CONST_PTR(st) rb_struct_const_ptr(st) -#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_CONST_PTR(RB_OBJ_WB_UNPROTECT_FOR(STRUCT, st))) -#define RSTRUCT_SET(st, idx, v) RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[idx], (v)) -#define RSTRUCT_GET(st, idx) (RSTRUCT_CONST_PTR(st)[idx]) -#define RSTRUCT(obj) (R_CAST(RStruct)(obj)) - -static inline long -rb_struct_len(VALUE st) -{ - return (RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? - RSTRUCT_EMBED_LEN(st) : RSTRUCT(st)->as.heap.len; -} - -static inline const VALUE * -rb_struct_const_ptr(VALUE st) -{ - return FIX_CONST_VALUE_PTR((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? - RSTRUCT(st)->as.ary : RSTRUCT(st)->as.heap.ptr); -} - -static inline const VALUE * -rb_struct_const_heap_ptr(VALUE st) -{ - /* TODO: check embed on debug mode */ - return RSTRUCT(st)->as.heap.ptr; -} - -/* class.c */ - -struct rb_deprecated_classext_struct { - char conflict[sizeof(VALUE) * 3]; -}; - -struct rb_subclass_entry; -typedef struct rb_subclass_entry rb_subclass_entry_t; - -struct rb_subclass_entry { - VALUE klass; - rb_subclass_entry_t *next; -}; - -#if defined(HAVE_LONG_LONG) -typedef unsigned LONG_LONG rb_serial_t; -#define SERIALT2NUM ULL2NUM -#define PRI_SERIALT_PREFIX PRI_LL_PREFIX -#define SIZEOF_SERIAL_T SIZEOF_LONG_LONG -#elif defined(HAVE_UINT64_T) -typedef uint64_t rb_serial_t; -#define SERIALT2NUM SIZET2NUM -#define PRI_SERIALT_PREFIX PRI_64_PREFIX -#define SIZEOF_SERIAL_T SIZEOF_UINT64_T -#else -typedef unsigned long rb_serial_t; -#define SERIALT2NUM ULONG2NUM -#define PRI_SERIALT_PREFIX PRI_LONG_PREFIX -#define SIZEOF_SERIAL_T SIZEOF_LONG -#endif - -struct rb_classext_struct { - struct st_table *iv_index_tbl; - struct st_table *iv_tbl; -#if SIZEOF_SERIAL_T == SIZEOF_VALUE /* otherwise m_tbl is in struct RClass */ - struct rb_id_table *m_tbl; -#endif - struct rb_id_table *const_tbl; - struct rb_id_table *callable_m_tbl; - rb_subclass_entry_t *subclasses; - rb_subclass_entry_t **parent_subclasses; - /** - * In the case that this is an `ICLASS`, `module_subclasses` points to the link - * in the module's `subclasses` list that indicates that the klass has been - * included. Hopefully that makes sense. - */ - rb_subclass_entry_t **module_subclasses; -#if SIZEOF_SERIAL_T != SIZEOF_VALUE /* otherwise class_serial is in struct RClass */ - rb_serial_t class_serial; -#endif - const VALUE origin_; - const VALUE refined_class; - rb_alloc_func_t allocator; - const VALUE includer; -}; - -typedef struct rb_classext_struct rb_classext_t; - -#undef RClass -struct RClass { - struct RBasic basic; - VALUE super; - rb_classext_t *ptr; -#if SIZEOF_SERIAL_T == SIZEOF_VALUE - /* Class serial is as wide as VALUE. Place it here. */ - rb_serial_t class_serial; -#else - /* Class serial does not fit into struct RClass. Place m_tbl instead. */ - struct rb_id_table *m_tbl; -#endif -}; - -void rb_class_subclass_add(VALUE super, VALUE klass); -void rb_class_remove_from_super_subclasses(VALUE); -int rb_singleton_class_internal_p(VALUE sklass); - -#define RCLASS_EXT(c) (RCLASS(c)->ptr) -#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl) -#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl) -#if SIZEOF_SERIAL_T == SIZEOF_VALUE -# define RCLASS_M_TBL(c) (RCLASS_EXT(c)->m_tbl) -#else -# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl) -#endif -#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl) -#define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl) -#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_) -#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class) -#if SIZEOF_SERIAL_T == SIZEOF_VALUE -# define RCLASS_SERIAL(c) (RCLASS(c)->class_serial) -#else -# define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial) -#endif -#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer) - -#define RCLASS_CLONED FL_USER6 -#define RICLASS_IS_ORIGIN FL_USER5 -#define RCLASS_REFINED_BY_ANY FL_USER7 - -static inline void -RCLASS_SET_ORIGIN(VALUE klass, VALUE origin) -{ - RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin); - if (klass != origin) FL_SET(origin, RICLASS_IS_ORIGIN); -} - -static inline void -RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass) -{ - RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass); -} - -#undef RCLASS_SUPER -static inline VALUE -RCLASS_SUPER(VALUE klass) -{ - return RCLASS(klass)->super; -} - -static inline VALUE -RCLASS_SET_SUPER(VALUE klass, VALUE super) -{ - if (super) { - rb_class_remove_from_super_subclasses(klass); - rb_class_subclass_add(super, klass); - } - RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super); - return super; -} -/* IMEMO: Internal memo object */ - -#ifndef IMEMO_DEBUG -#define IMEMO_DEBUG 0 -#endif - -struct RIMemo { - VALUE flags; - VALUE v0; - VALUE v1; - VALUE v2; - VALUE v3; -}; - -enum imemo_type { - imemo_env = 0, - imemo_cref = 1, /*!< class reference */ - imemo_svar = 2, /*!< special variable */ - imemo_throw_data = 3, - imemo_ifunc = 4, /*!< iterator function */ - imemo_memo = 5, - imemo_ment = 6, - imemo_iseq = 7, - imemo_tmpbuf = 8, - imemo_ast = 9, - imemo_parser_strterm = 10 -}; -#define IMEMO_MASK 0x0f - -static inline enum imemo_type -imemo_type(VALUE imemo) -{ - return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK; -} - -static inline int -imemo_type_p(VALUE imemo, enum imemo_type imemo_type) -{ - if (LIKELY(!RB_SPECIAL_CONST_P(imemo))) { - /* fixed at compile time if imemo_type is given. */ - const VALUE mask = (IMEMO_MASK << FL_USHIFT) | RUBY_T_MASK; - const VALUE expected_type = (imemo_type << FL_USHIFT) | T_IMEMO; - /* fixed at runtime. */ - return expected_type == (RBASIC(imemo)->flags & mask); - } - else { - return 0; - } -} - -VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); - -/* FL_USER0 to FL_USER3 is for type */ -#define IMEMO_FL_USHIFT (FL_USHIFT + 4) -#define IMEMO_FL_USER0 FL_USER4 -#define IMEMO_FL_USER1 FL_USER5 -#define IMEMO_FL_USER2 FL_USER6 -#define IMEMO_FL_USER3 FL_USER7 -#define IMEMO_FL_USER4 FL_USER8 - -/* CREF (Class REFerence) is defined in method.h */ - -/*! SVAR (Special VARiable) */ -struct vm_svar { - VALUE flags; - const VALUE cref_or_me; /*!< class reference or rb_method_entry_t */ - const VALUE lastline; - const VALUE backref; - const VALUE others; -}; - - -#define THROW_DATA_CONSUMED IMEMO_FL_USER0 - -/*! THROW_DATA */ -struct vm_throw_data { - VALUE flags; - VALUE reserved; - const VALUE throw_obj; - const struct rb_control_frame_struct *catch_frame; - int throw_state; -}; - -#define THROW_DATA_P(err) RB_TYPE_P((VALUE)(err), T_IMEMO) - -/* IFUNC (Internal FUNCtion) */ - -struct vm_ifunc_argc { -#if SIZEOF_INT * 2 > SIZEOF_VALUE - signed int min: (SIZEOF_VALUE * CHAR_BIT) / 2; - signed int max: (SIZEOF_VALUE * CHAR_BIT) / 2; -#else - int min, max; -#endif -}; - -/*! IFUNC (Internal FUNCtion) */ -struct vm_ifunc { - VALUE flags; - VALUE reserved; - rb_block_call_func_t func; - const void *data; - struct vm_ifunc_argc argc; -}; - -#define IFUNC_NEW(a, b, c) ((struct vm_ifunc *)rb_imemo_new(imemo_ifunc, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) -struct vm_ifunc *rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc); -static inline struct vm_ifunc * -rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data) -{ - return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS); -} - -typedef struct rb_imemo_tmpbuf_struct { - VALUE flags; - VALUE reserved; - VALUE *ptr; /* malloc'ed buffer */ - struct rb_imemo_tmpbuf_struct *next; /* next imemo */ - size_t cnt; /* buffer size in VALUE */ -} rb_imemo_tmpbuf_t; - -#define rb_imemo_tmpbuf_auto_free_pointer() rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0) -rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt); - -#define RB_IMEMO_TMPBUF_PTR(v) \ - ((void *)(((const struct rb_imemo_tmpbuf_struct *)(v))->ptr)) - -static inline void * -rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr) -{ - return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr; -} - -static inline VALUE -rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) -{ - const void *src; - VALUE imemo; - rb_imemo_tmpbuf_t *tmpbuf; - void *dst; - size_t len; - - SafeStringValue(str); - /* create tmpbuf to keep the pointer before xmalloc */ - imemo = rb_imemo_tmpbuf_auto_free_pointer(); - tmpbuf = (rb_imemo_tmpbuf_t *)imemo; - len = RSTRING_LEN(str); - src = RSTRING_PTR(str); - dst = ruby_xmalloc(len); - memcpy(dst, src, len); - tmpbuf->ptr = dst; - return imemo; -} - -void rb_strterm_mark(VALUE obj); - -/*! MEMO - * - * @see imemo_type - * */ -struct MEMO { - VALUE flags; - VALUE reserved; - const VALUE v1; - const VALUE v2; - union { - long cnt; - long state; - const VALUE value; - void (*func)(void); - } u3; -}; - -#define MEMO_V1_SET(m, v) RB_OBJ_WRITE((m), &(m)->v1, (v)) -#define MEMO_V2_SET(m, v) RB_OBJ_WRITE((m), &(m)->v2, (v)) - -#define MEMO_CAST(m) ((struct MEMO *)m) - -#define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) - -#define roomof(x, y) (((x) + (y) - 1) / (y)) -#define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) -#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) -#define NEW_MEMO_FOR(type, value) \ - ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value)) -#define NEW_PARTIAL_MEMO_FOR(type, value, member) \ - ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), \ - rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \ - MEMO_FOR(type, value)) - -#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString) - -#ifdef RUBY_INTEGER_UNIFICATION -# define rb_cFixnum rb_cInteger -# define rb_cBignum rb_cInteger -#endif - -enum { - cmp_opt_Fixnum, - cmp_opt_String, - cmp_opt_Float, - cmp_optimizable_count -}; - -struct cmp_opt_data { - unsigned int opt_methods; - unsigned int opt_inited; -}; - -#define NEW_CMP_OPT_MEMO(type, value) \ - NEW_PARTIAL_MEMO_FOR(type, value, cmp_opt) -#define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type)) -#define CMP_OPTIMIZABLE(data, type) \ - (((data).opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \ - ((data).opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \ - (((data).opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \ - rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \ - ((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type)))) - -#define OPTIMIZED_CMP(a, b, data) \ - ((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Fixnum)) ? \ - (((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \ - (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) ? \ - rb_str_cmp(a, b) : \ - (RB_FLOAT_TYPE_P(a) && RB_FLOAT_TYPE_P(b) && CMP_OPTIMIZABLE(data, Float)) ? \ - rb_float_cmp(a, b) : \ - rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b)) - -/* ment is in method.h */ - -/* global variable */ - -struct rb_global_entry { - struct rb_global_variable *var; - ID id; -}; - -struct rb_global_entry *rb_global_entry(ID); -VALUE rb_gvar_get(struct rb_global_entry *); -VALUE rb_gvar_set(struct rb_global_entry *, VALUE); -VALUE rb_gvar_defined(struct rb_global_entry *); - -/* array.c */ - -#ifndef ARRAY_DEBUG -#define ARRAY_DEBUG (0+RUBY_DEBUG) -#endif - -#ifdef ARRAY_DEBUG -#define RARRAY_PTR_IN_USE_FLAG FL_USER14 -#define ARY_PTR_USING_P(ary) FL_TEST_RAW((ary), RARRAY_PTR_IN_USE_FLAG) -#else - -/* disable debug function */ -#undef RARRAY_PTR_USE_START_TRANSIENT -#undef RARRAY_PTR_USE_END_TRANSIENT -#define RARRAY_PTR_USE_START_TRANSIENT(a) ((VALUE *)RARRAY_CONST_PTR_TRANSIENT(a)) -#define RARRAY_PTR_USE_END_TRANSIENT(a) -#define ARY_PTR_USING_P(ary) 0 - -#endif - -#if USE_TRANSIENT_HEAP -#define RARY_TRANSIENT_SET(ary) FL_SET_RAW((ary), RARRAY_TRANSIENT_FLAG); -#define RARY_TRANSIENT_UNSET(ary) FL_UNSET_RAW((ary), RARRAY_TRANSIENT_FLAG); -#else -#undef RARRAY_TRANSIENT_P -#define RARRAY_TRANSIENT_P(a) 0 -#define RARY_TRANSIENT_SET(ary) ((void)0) -#define RARY_TRANSIENT_UNSET(ary) ((void)0) -#endif - - -VALUE rb_ary_last(int, const VALUE *, VALUE); -void rb_ary_set_len(VALUE, long); -void rb_ary_delete_same(VALUE, VALUE); -VALUE rb_ary_tmp_new_fill(long capa); -VALUE rb_ary_at(VALUE, VALUE); -VALUE rb_ary_aref1(VALUE ary, VALUE i); -size_t rb_ary_memsize(VALUE); -VALUE rb_to_array_type(VALUE obj); -VALUE rb_check_to_array(VALUE ary); -VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *); -VALUE rb_ary_behead(VALUE, long); -#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) -#define rb_ary_new_from_args(n, ...) \ - __extension__ ({ \ - const VALUE args_to_new_ary[] = {__VA_ARGS__}; \ - if (__builtin_constant_p(n)) { \ - STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \ - } \ - rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \ - }) -#endif - -static inline VALUE -rb_ary_entry_internal(VALUE ary, long offset) -{ - long len = RARRAY_LEN(ary); - const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary); - if (len == 0) return Qnil; - if (offset < 0) { - offset += len; - if (offset < 0) return Qnil; - } - else if (len <= offset) { - return Qnil; - } - return ptr[offset]; -} - -/* MRI debug support */ -void rb_obj_info_dump(VALUE obj); -void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func); -void ruby_debug_breakpoint(void); - -// show obj data structure without any side-effect -#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) - -// same as rp, but add message header -#define rp_m(msg, obj) do { \ - fprintf(stderr, "%s", (msg)); \ - rb_obj_info_dump((VALUE)obj); \ -} while (0) - -// `ruby_debug_breakpoint()` does nothing, -// but breakpoint is set in run.gdb, so `make gdb` can stop here. -#define bp() ruby_debug_breakpoint() - -/* bignum.c */ -extern const char ruby_digitmap[]; -double rb_big_fdiv_double(VALUE x, VALUE y); -VALUE rb_big_uminus(VALUE x); -VALUE rb_big_hash(VALUE); -VALUE rb_big_odd_p(VALUE); -VALUE rb_big_even_p(VALUE); -size_t rb_big_size(VALUE); -VALUE rb_integer_float_cmp(VALUE x, VALUE y); -VALUE rb_integer_float_eq(VALUE x, VALUE y); -VALUE rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception); -VALUE rb_big_comp(VALUE x); -VALUE rb_big_aref(VALUE x, VALUE y); -VALUE rb_big_abs(VALUE x); -VALUE rb_big_size_m(VALUE big); -VALUE rb_big_bit_length(VALUE big); -VALUE rb_big_remainder(VALUE x, VALUE y); -VALUE rb_big_gt(VALUE x, VALUE y); -VALUE rb_big_ge(VALUE x, VALUE y); -VALUE rb_big_lt(VALUE x, VALUE y); -VALUE rb_big_le(VALUE x, VALUE y); -VALUE rb_int_powm(int const argc, VALUE * const argv, VALUE const num); - -/* class.c */ -VALUE rb_class_boot(VALUE); -VALUE rb_class_inherited(VALUE, VALUE); -VALUE rb_make_metaclass(VALUE, VALUE); -VALUE rb_include_class_new(VALUE, VALUE); -void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE); -void rb_class_detach_subclasses(VALUE); -void rb_class_detach_module_subclasses(VALUE); -void rb_class_remove_from_module_subclasses(VALUE); -VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_special_singleton_class(VALUE); -VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach); -VALUE rb_singleton_class_get(VALUE obj); -void Init_class_hierarchy(void); - -int rb_class_has_methods(VALUE c); -void rb_undef_methods_from(VALUE klass, VALUE super); - -/* compar.c */ -VALUE rb_invcmp(VALUE, VALUE); - -/* compile.c */ -struct rb_block; -struct rb_iseq_struct; -int rb_dvar_defined(ID, const struct rb_iseq_struct *); -int rb_local_defined(ID, const struct rb_iseq_struct *); -const char * rb_insns_name(int i); -VALUE rb_insns_name_array(void); -int rb_vm_insn_addr2insn(const void *); - -/* complex.c */ -VALUE rb_dbl_complex_new_polar_pi(double abs, double ang); - -struct rb_thread_struct; -/* cont.c */ -VALUE rb_obj_is_fiber(VALUE); -void rb_fiber_reset_root_local_storage(struct rb_thread_struct *); -void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(VALUE), VALUE (*rollback_func)(VALUE)); - -/* debug.c */ -PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); - -/* dir.c */ -VALUE rb_dir_getwd_ospath(void); - -/* dmyext.c */ -void Init_enc(void); -void Init_ext(void); - -/* encoding.c */ -ID rb_id_encoding(void); -#ifdef RUBY_ENCODING_H -rb_encoding *rb_enc_get_from_index(int index); -rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); -#endif -int rb_encdb_replicate(const char *alias, const char *orig); -int rb_encdb_alias(const char *alias, const char *orig); -int rb_encdb_dummy(const char *name); -void rb_encdb_declare(const char *name); -void rb_enc_set_base(const char *name, const char *orig); -int rb_enc_set_dummy(int index); -void rb_encdb_set_unicode(int index); -PUREFUNC(int rb_data_is_encoding(VALUE obj)); - -/* enum.c */ -extern VALUE rb_cArithSeq; -VALUE rb_f_send(int argc, VALUE *argv, VALUE recv); -VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary); - -/* error.c */ -extern VALUE rb_eEAGAIN; -extern VALUE rb_eEWOULDBLOCK; -extern VALUE rb_eEINPROGRESS; -void rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args); -NORETURN(void rb_async_bug_errno(const char *,int)); -const char *rb_builtin_type_name(int t); -const char *rb_builtin_class_name(VALUE x); -PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3); -#ifdef RUBY_ENCODING_H -VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); -PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); -PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); -PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4); -#endif - -typedef enum { - RB_WARN_CATEGORY_NONE, - RB_WARN_CATEGORY_DEPRECATED, - RB_WARN_CATEGORY_EXPERIMENTAL, -} rb_warning_category_t; -rb_warning_category_t rb_warning_category_from_name(VALUE category); -bool rb_warning_category_enabled_p(rb_warning_category_t category); - -#define rb_raise_cstr(etype, mesg) \ - rb_exc_raise(rb_exc_new_str(etype, rb_str_new_cstr(mesg))) -#define rb_raise_static(etype, mesg) \ - rb_exc_raise(rb_exc_new_str(etype, rb_str_new_static(mesg, rb_strlen_lit(mesg)))) - -VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method); -#define rb_name_err_raise_str(mesg, recv, name) \ - rb_exc_raise(rb_name_err_new(mesg, recv, name)) -#define rb_name_err_raise(mesg, recv, name) \ - rb_name_err_raise_str(rb_fstring_cstr(mesg), (recv), (name)) -VALUE rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv); -VALUE rb_key_err_new(VALUE mesg, VALUE recv, VALUE name); -#define rb_key_err_raise(mesg, recv, name) \ - rb_exc_raise(rb_key_err_new(mesg, recv, name)) -PRINTF_ARGS(VALUE rb_warning_string(const char *fmt, ...), 1, 2); -NORETURN(void rb_vraise(VALUE, const char *, va_list)); - -/* eval.c */ -VALUE rb_refinement_module_get_refined_class(VALUE module); -extern ID ruby_static_id_signo, ruby_static_id_status; -void rb_class_modify_check(VALUE); -#define id_signo ruby_static_id_signo -#define id_status ruby_static_id_status -NORETURN(VALUE rb_f_raise(int argc, VALUE *argv)); - -/* eval_error.c */ -VALUE rb_get_backtrace(VALUE info); - -/* eval_jump.c */ -void rb_call_end_proc(VALUE data); -void rb_mark_end_proc(void); - -/* file.c */ -extern const char ruby_null_device[]; -VALUE rb_home_dir_of(VALUE user, VALUE result); -VALUE rb_default_home_dir(VALUE result); -VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict); -#ifdef RUBY_ENCODING_H -VALUE rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *origenc); -#endif -void rb_file_const(const char*, VALUE); -int rb_file_load_ok(const char *); -VALUE rb_file_expand_path_fast(VALUE, VALUE); -VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE); -VALUE rb_get_path_check_to_string(VALUE); -VALUE rb_get_path_check_convert(VALUE); -void Init_File(void); -int ruby_is_fd_loadable(int fd); - -#ifdef RUBY_FUNCTION_NAME_STRING -# if defined __GNUC__ && __GNUC__ >= 4 -# pragma GCC visibility push(default) -# endif -NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path)); -NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)); -# if defined __GNUC__ && __GNUC__ >= 4 -# pragma GCC visibility pop -# endif -# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path) -# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path)) -#else -# define rb_sys_fail_path(path) rb_sys_fail_str(path) -# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path)) -#endif - -/* gc.c */ -extern VALUE *ruby_initial_gc_stress_ptr; -extern int ruby_disable_gc; -void Init_heap(void); -void *ruby_mimmalloc(size_t size) RUBY_ATTR_MALLOC; -void ruby_mimfree(void *ptr); -void rb_objspace_set_event_hook(const rb_event_flag_t event); -#if USE_RGENGC -void rb_gc_writebarrier_remember(VALUE obj); -#else -#define rb_gc_writebarrier_remember(obj) 0 -#endif -void ruby_gc_set_params(void); -void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj); - -#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32) -#define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size) -#define ruby_sized_xrealloc2(ptr, new_count, element_size, old_count) ruby_xrealloc2(ptr, new_count, element_size) -#define ruby_sized_xfree(ptr, size) ruby_xfree(ptr) -#define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n) -#else -RUBY_SYMBOL_EXPORT_BEGIN -void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2)); -void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3)); -void ruby_sized_xfree(void *x, size_t size); -RUBY_SYMBOL_EXPORT_END -#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc2((void*)(var), (n), sizeof(type), (old_n))) -#endif - -/* optimized version of NEWOBJ() */ -#undef NEWOBJF_OF -#undef RB_NEWOBJ_OF -#define RB_NEWOBJ_OF(obj,type,klass,flags) \ - type *(obj) = (type*)(((flags) & FL_WB_PROTECTED) ? \ - rb_wb_protected_newobj_of(klass, (flags) & ~FL_WB_PROTECTED) : \ - rb_wb_unprotected_newobj_of(klass, flags)) -#define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags) - -#ifdef __has_attribute -#if __has_attribute(alloc_align) -__attribute__((__alloc_align__(1))) -#endif -#endif -void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_MALLOC RUBY_ATTR_ALLOC_SIZE((2)); - -size_t rb_size_mul_or_raise(size_t, size_t, VALUE); /* used in compile.c */ -size_t rb_size_mul_add_or_raise(size_t, size_t, size_t, VALUE); /* used in iseq.h */ -void *rb_xmalloc_mul_add(size_t, size_t, size_t) RUBY_ATTR_MALLOC; -void *rb_xrealloc_mul_add(const void *, size_t, size_t, size_t); -void *rb_xmalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; -void *rb_xcalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; - -/* hash.c */ -#if RHASH_CONVERT_TABLE_DEBUG -struct st_table *rb_hash_tbl_raw(VALUE hash, const char *file, int line); -#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h, __FILE__, __LINE__) -#else -struct st_table *rb_hash_tbl_raw(VALUE hash); -#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) -#endif - -VALUE rb_hash_new_with_size(st_index_t size); -VALUE rb_hash_has_key(VALUE hash, VALUE key); -VALUE rb_hash_default_value(VALUE hash, VALUE key); -VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc); -long rb_dbl_long_hash(double d); -st_table *rb_init_identtable(void); -VALUE rb_hash_compare_by_id_p(VALUE hash); -VALUE rb_to_hash_type(VALUE obj); -VALUE rb_hash_key_str(VALUE); -VALUE rb_hash_keys(VALUE hash); -VALUE rb_hash_values(VALUE hash); -VALUE rb_hash_rehash(VALUE hash); -VALUE rb_hash_resurrect(VALUE hash); -int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val); -VALUE rb_hash_set_pair(VALUE hash, VALUE pair); - -int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval); -int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval); -RUBY_SYMBOL_EXPORT_BEGIN -int rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg); -RUBY_SYMBOL_EXPORT_END -int rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg); -int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg); - -/* inits.c */ -void rb_call_inits(void); - -/* io.c */ -void ruby_set_inplace_mode(const char *); -void rb_stdio_set_default_encoding(void); -VALUE rb_io_flush_raw(VALUE, int); -#ifdef RUBY_IO_H -size_t rb_io_memsize(const rb_io_t *); -#endif -int rb_stderr_tty_p(void); -void rb_io_fptr_finalize_internal(void *ptr); -#define rb_io_fptr_finalize rb_io_fptr_finalize_internal - -/* load.c */ -VALUE rb_get_expanded_load_path(void); -int rb_require_internal(VALUE fname); -NORETURN(void rb_load_fail(VALUE, const char*)); - -/* loadpath.c */ -extern const char ruby_exec_prefix[]; -extern const char ruby_initial_load_paths[]; - -/* localeinit.c */ -int Init_enc_set_filesystem_encoding(void); - -/* math.c */ -VALUE rb_math_atan2(VALUE, VALUE); -VALUE rb_math_cos(VALUE); -VALUE rb_math_cosh(VALUE); -VALUE rb_math_exp(VALUE); -VALUE rb_math_hypot(VALUE, VALUE); -VALUE rb_math_log(int argc, const VALUE *argv); -VALUE rb_math_sin(VALUE); -VALUE rb_math_sinh(VALUE); - -/* mjit.c */ - -#if USE_MJIT -extern bool mjit_enabled; -VALUE mjit_pause(bool wait_p); -VALUE mjit_resume(void); -void mjit_finish(bool close_handle_p); -#else -#define mjit_enabled 0 -static inline VALUE mjit_pause(bool wait_p){ return Qnil; } // unreachable -static inline VALUE mjit_resume(void){ return Qnil; } // unreachable -static inline void mjit_finish(bool close_handle_p){} -#endif - -/* newline.c */ -void Init_newline(void); - -/* numeric.c */ - -#define FIXNUM_POSITIVE_P(num) ((SIGNED_VALUE)(num) > (SIGNED_VALUE)INT2FIX(0)) -#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0) -#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0)) - -#define INT_NEGATIVE_P(x) (FIXNUM_P(x) ? FIXNUM_NEGATIVE_P(x) : BIGNUM_NEGATIVE_P(x)) - -#define FLOAT_ZERO_P(x) (RFLOAT_VALUE(x) == 0.0) - -#ifndef ROUND_DEFAULT -# define ROUND_DEFAULT RUBY_NUM_ROUND_HALF_UP -#endif -enum ruby_num_rounding_mode { - RUBY_NUM_ROUND_HALF_UP, - RUBY_NUM_ROUND_HALF_EVEN, - RUBY_NUM_ROUND_HALF_DOWN, - RUBY_NUM_ROUND_DEFAULT = ROUND_DEFAULT -}; -#define ROUND_TO(mode, even, up, down) \ - ((mode) == RUBY_NUM_ROUND_HALF_EVEN ? even : \ - (mode) == RUBY_NUM_ROUND_HALF_UP ? up : down) -#define ROUND_FUNC(mode, name) \ - ROUND_TO(mode, name##_half_even, name##_half_up, name##_half_down) -#define ROUND_CALL(mode, name, args) \ - ROUND_TO(mode, name##_half_even args, \ - name##_half_up args, name##_half_down args) - -int rb_num_to_uint(VALUE val, unsigned int *ret); -VALUE ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl); -double ruby_float_step_size(double beg, double end, double unit, int excl); -int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl, int allow_endless); -double ruby_float_mod(double x, double y); -int rb_num_negative_p(VALUE); -VALUE rb_int_succ(VALUE num); -VALUE rb_int_uminus(VALUE num); -VALUE rb_float_uminus(VALUE num); -VALUE rb_int_plus(VALUE x, VALUE y); -VALUE rb_float_plus(VALUE x, VALUE y); -VALUE rb_int_minus(VALUE x, VALUE y); -VALUE rb_int_mul(VALUE x, VALUE y); -VALUE rb_float_mul(VALUE x, VALUE y); -VALUE rb_float_div(VALUE x, VALUE y); -VALUE rb_int_idiv(VALUE x, VALUE y); -VALUE rb_int_modulo(VALUE x, VALUE y); -VALUE rb_int2str(VALUE num, int base); -VALUE rb_fix_plus(VALUE x, VALUE y); -VALUE rb_fix_aref(VALUE fix, VALUE idx); -VALUE rb_int_gt(VALUE x, VALUE y); -int rb_float_cmp(VALUE x, VALUE y); -VALUE rb_float_gt(VALUE x, VALUE y); -VALUE rb_int_ge(VALUE x, VALUE y); -enum ruby_num_rounding_mode rb_num_get_rounding_option(VALUE opts); -double rb_int_fdiv_double(VALUE x, VALUE y); -VALUE rb_int_pow(VALUE x, VALUE y); -VALUE rb_float_pow(VALUE x, VALUE y); -VALUE rb_int_cmp(VALUE x, VALUE y); -VALUE rb_int_equal(VALUE x, VALUE y); -VALUE rb_int_divmod(VALUE x, VALUE y); -VALUE rb_int_and(VALUE x, VALUE y); -VALUE rb_int_lshift(VALUE x, VALUE y); -VALUE rb_int_div(VALUE x, VALUE y); -VALUE rb_int_abs(VALUE num); -VALUE rb_int_odd_p(VALUE num); -int rb_int_positive_p(VALUE num); -int rb_int_negative_p(VALUE num); -VALUE rb_num_pow(VALUE x, VALUE y); -VALUE rb_float_ceil(VALUE num, int ndigits); - -static inline VALUE -rb_num_compare_with_zero(VALUE num, ID mid) -{ - VALUE zero = INT2FIX(0); - VALUE r = rb_check_funcall(num, mid, 1, &zero); - if (r == Qundef) { - rb_cmperr(num, zero); - } - return r; -} - -static inline int -rb_num_positive_int_p(VALUE num) -{ - const ID mid = '>'; - - if (FIXNUM_P(num)) { - if (rb_method_basic_definition_p(rb_cInteger, mid)) - return FIXNUM_POSITIVE_P(num); - } - else if (RB_TYPE_P(num, T_BIGNUM)) { - if (rb_method_basic_definition_p(rb_cInteger, mid)) - return BIGNUM_POSITIVE_P(num); - } - return RTEST(rb_num_compare_with_zero(num, mid)); -} - - -static inline int -rb_num_negative_int_p(VALUE num) -{ - const ID mid = '<'; - - if (FIXNUM_P(num)) { - if (rb_method_basic_definition_p(rb_cInteger, mid)) - return FIXNUM_NEGATIVE_P(num); - } - else if (RB_TYPE_P(num, T_BIGNUM)) { - if (rb_method_basic_definition_p(rb_cInteger, mid)) - return BIGNUM_NEGATIVE_P(num); - } - return RTEST(rb_num_compare_with_zero(num, mid)); -} - - -VALUE rb_float_abs(VALUE flt); -VALUE rb_float_equal(VALUE x, VALUE y); -VALUE rb_float_eql(VALUE x, VALUE y); -VALUE rb_flo_div_flo(VALUE x, VALUE y); - -#if USE_FLONUM -#define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n))) -#define RUBY_BIT_ROTR(v, n) (((v) >> (n)) | ((v) << ((sizeof(v) * 8) - n))) -#endif - -static inline double -rb_float_flonum_value(VALUE v) -{ -#if USE_FLONUM - if (v != (VALUE)0x8000000000000002) { /* LIKELY */ - union { - double d; - VALUE v; - } t; - - VALUE b63 = (v >> 63); - /* e: xx1... -> 011... */ - /* xx0... -> 100... */ - /* ^b63 */ - t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~(VALUE)0x03), 3); - return t.d; - } -#endif - return 0.0; -} - -static inline double -rb_float_noflonum_value(VALUE v) -{ - return ((struct RFloat *)v)->float_value; -} - -static inline double -rb_float_value_inline(VALUE v) -{ - if (FLONUM_P(v)) { - return rb_float_flonum_value(v); - } - return rb_float_noflonum_value(v); -} - -static inline VALUE -rb_float_new_inline(double d) -{ -#if USE_FLONUM - union { - double d; - VALUE v; - } t; - int bits; - - t.d = d; - bits = (int)((VALUE)(t.v >> 60) & 0x7); - /* bits contains 3 bits of b62..b60. */ - /* bits - 3 = */ - /* b011 -> b000 */ - /* b100 -> b001 */ - - if (t.v != 0x3000000000000000 /* 1.72723e-77 */ && - !((bits-3) & ~0x01)) { - return (RUBY_BIT_ROTL(t.v, 3) & ~(VALUE)0x01) | 0x02; - } - else if (t.v == (VALUE)0) { - /* +0.0 */ - return 0x8000000000000002; - } - /* out of range */ -#endif - return rb_float_new_in_heap(d); -} - -#define rb_float_value(v) rb_float_value_inline(v) -#define rb_float_new(d) rb_float_new_inline(d) - -/* object.c */ -void rb_obj_copy_ivar(VALUE dest, VALUE obj); -CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2)); -CONSTFUNC(VALUE rb_obj_not(VALUE obj)); -VALUE rb_class_search_ancestor(VALUE klass, VALUE super); -NORETURN(void rb_undefined_alloc(VALUE klass)); -double rb_num_to_dbl(VALUE val); -VALUE rb_obj_dig(int argc, VALUE *argv, VALUE self, VALUE notfound); -VALUE rb_immutable_obj_clone(int, VALUE *, VALUE); -VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2); -VALUE rb_convert_type_with_id(VALUE,int,const char*,ID); -VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID); -int rb_bool_expected(VALUE, const char *); - -struct RBasicRaw { - VALUE flags; - VALUE klass; -}; - -#define RBASIC_CLEAR_CLASS(obj) memset(&(((struct RBasicRaw *)((VALUE)(obj)))->klass), 0, sizeof(VALUE)) -#define RBASIC_SET_CLASS_RAW(obj, cls) memcpy(&((struct RBasicRaw *)((VALUE)(obj)))->klass, &(cls), sizeof(VALUE)) -#define RBASIC_SET_CLASS(obj, cls) do { \ - VALUE _obj_ = (obj); \ - RB_OBJ_WRITE(_obj_, &((struct RBasicRaw *)(_obj_))->klass, cls); \ -} while (0) - -/* parse.y */ -#ifndef USE_SYMBOL_GC -#define USE_SYMBOL_GC 1 -#endif -VALUE rb_parser_set_yydebug(VALUE, VALUE); -RUBY_SYMBOL_EXPORT_BEGIN -VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int); -RUBY_SYMBOL_EXPORT_END -void *rb_parser_load_file(VALUE parser, VALUE name); -int rb_is_const_name(VALUE name); -int rb_is_class_name(VALUE name); -int rb_is_instance_name(VALUE name); -int rb_is_local_name(VALUE name); -PUREFUNC(int rb_is_const_sym(VALUE sym)); -PUREFUNC(int rb_is_attrset_sym(VALUE sym)); -ID rb_make_internal_id(void); -void rb_gc_free_dsymbol(VALUE); - -/* proc.c */ -VALUE rb_proc_location(VALUE self); -st_index_t rb_hash_proc(st_index_t hash, VALUE proc); -int rb_block_arity(void); -int rb_block_min_max_arity(int *max); -VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val); -VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc); -VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info); - -/* process.c */ -#define RB_MAX_GROUPS (65536) - -struct waitpid_state; -struct rb_execarg { - union { - struct { - VALUE shell_script; - } sh; - struct { - VALUE command_name; - VALUE command_abspath; /* full path string or nil */ - VALUE argv_str; - VALUE argv_buf; - } cmd; - } invoke; - VALUE redirect_fds; - VALUE envp_str; - VALUE envp_buf; - VALUE dup2_tmpbuf; - unsigned use_shell : 1; - unsigned pgroup_given : 1; - unsigned umask_given : 1; - unsigned unsetenv_others_given : 1; - unsigned unsetenv_others_do : 1; - unsigned close_others_given : 1; - unsigned close_others_do : 1; - unsigned chdir_given : 1; - unsigned new_pgroup_given : 1; - unsigned new_pgroup_flag : 1; - unsigned uid_given : 1; - unsigned gid_given : 1; - unsigned exception : 1; - unsigned exception_given : 1; - struct waitpid_state *waitpid_state; /* for async process management */ - rb_pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0as.ary[0]) -#define RANGE_END(r) (RSTRUCT(r)->as.ary[1]) -#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2]) - -/* rational.c */ -VALUE rb_rational_canonicalize(VALUE x); -VALUE rb_rational_uminus(VALUE self); -VALUE rb_rational_plus(VALUE self, VALUE other); -VALUE rb_rational_mul(VALUE self, VALUE other); -VALUE rb_lcm(VALUE x, VALUE y); -VALUE rb_rational_reciprocal(VALUE x); -VALUE rb_cstr_to_rat(const char *, int); -VALUE rb_rational_abs(VALUE self); -VALUE rb_rational_cmp(VALUE self, VALUE other); -VALUE rb_rational_pow(VALUE self, VALUE other); -VALUE rb_numeric_quo(VALUE x, VALUE y); -VALUE rb_float_numerator(VALUE x); -VALUE rb_float_denominator(VALUE x); - -/* re.c */ -VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline); -VALUE rb_reg_check_preprocess(VALUE); -long rb_reg_search0(VALUE, VALUE, long, int, int); -VALUE rb_reg_match_p(VALUE re, VALUE str, long pos); -bool rb_reg_start_with_p(VALUE re, VALUE str); -void rb_backref_set_string(VALUE string, long pos, long len); -void rb_match_unbusy(VALUE); -int rb_match_count(VALUE match); -int rb_match_nth_defined(int nth, VALUE match); -VALUE rb_reg_new_ary(VALUE ary, int options); - -/* signal.c */ -extern int ruby_enable_coredump; -int rb_get_next_signal(void); - -/* string.c */ -VALUE rb_fstring(VALUE); -VALUE rb_fstring_new(const char *ptr, long len); -#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str)) -#define rb_fstring_literal(str) rb_fstring_lit(str) -VALUE rb_fstring_cstr(const char *str); -#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P -# define rb_fstring_cstr(str) RB_GNUC_EXTENSION_BLOCK( \ - (__builtin_constant_p(str)) ? \ - rb_fstring_new((str), (long)strlen(str)) : \ - rb_fstring_cstr(str) \ -) -#endif -#ifdef RUBY_ENCODING_H -VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc); -#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) -#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) -#endif -int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p); -int rb_str_symname_p(VALUE); -VALUE rb_str_quote_unprintable(VALUE); -VALUE rb_id_quote_unprintable(ID); -#define QUOTE(str) rb_str_quote_unprintable(str) -#define QUOTE_ID(id) rb_id_quote_unprintable(id) -char *rb_str_fill_terminator(VALUE str, const int termlen); -void rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int termlen); -VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg); -VALUE rb_str_chomp_string(VALUE str, VALUE chomp); -#ifdef RUBY_ENCODING_H -VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc); -VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len, - rb_encoding *from, int ecflags, VALUE ecopts); -VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl); -VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc); -#endif -#define STR_NOEMBED FL_USER1 -#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ -#define STR_EMBED_P(str) (!FL_TEST_RAW((str), STR_NOEMBED)) -#define STR_SHARED_P(s) FL_ALL_RAW((s), STR_NOEMBED|ELTS_SHARED) -#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) -#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) -size_t rb_str_memsize(VALUE); -VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc); -VALUE rb_sym_to_proc(VALUE sym); -char *rb_str_to_cstr(VALUE str); -VALUE rb_str_eql(VALUE str1, VALUE str2); -VALUE rb_obj_as_string_result(VALUE str, VALUE obj); -const char *ruby_escaped_char(int c); -VALUE rb_str_opt_plus(VALUE, VALUE); - -/* expect tail call optimization */ -static inline VALUE -rb_str_eql_internal(const VALUE str1, const VALUE str2) -{ - const long len = RSTRING_LEN(str1); - const char *ptr1, *ptr2; - - if (len != RSTRING_LEN(str2)) return Qfalse; - if (!rb_str_comparable(str1, str2)) return Qfalse; - if ((ptr1 = RSTRING_PTR(str1)) == (ptr2 = RSTRING_PTR(str2))) - return Qtrue; - if (memcmp(ptr1, ptr2, len) == 0) - return Qtrue; - return Qfalse; -} - -/* symbol.c */ -#ifdef RUBY_ENCODING_H -VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc); -#endif -VALUE rb_sym_intern_ascii(const char *ptr, long len); -VALUE rb_sym_intern_ascii_cstr(const char *ptr); -#ifdef __GNUC__ -#define rb_sym_intern_ascii_cstr(ptr) __extension__ ( \ -{ \ - (__builtin_constant_p(ptr)) ? \ - rb_sym_intern_ascii((ptr), (long)strlen(ptr)) : \ - rb_sym_intern_ascii_cstr(ptr); \ -}) -#endif -VALUE rb_to_symbol_type(VALUE obj); - -/* struct.c */ -VALUE rb_struct_init_copy(VALUE copy, VALUE s); -VALUE rb_struct_lookup(VALUE s, VALUE idx); -VALUE rb_struct_s_keyword_init(VALUE klass); - -/* time.c */ -struct timeval rb_time_timeval(VALUE); - -/* thread.c */ -#define COVERAGE_INDEX_LINES 0 -#define COVERAGE_INDEX_BRANCHES 1 -#define COVERAGE_TARGET_LINES 1 -#define COVERAGE_TARGET_BRANCHES 2 -#define COVERAGE_TARGET_METHODS 4 -#define COVERAGE_TARGET_ONESHOT_LINES 8 - -VALUE rb_obj_is_mutex(VALUE obj); -VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg); -void rb_thread_execute_interrupts(VALUE th); -VALUE rb_get_coverages(void); -int rb_get_coverage_mode(void); -VALUE rb_default_coverage(int); -VALUE rb_thread_shield_new(void); -VALUE rb_thread_shield_wait(VALUE self); -VALUE rb_thread_shield_release(VALUE self); -VALUE rb_thread_shield_destroy(VALUE self); -int rb_thread_to_be_killed(VALUE thread); -void rb_mutex_allow_trap(VALUE self, int val); -VALUE rb_uninterruptible(VALUE (*b_proc)(VALUE), VALUE data); -VALUE rb_mutex_owned_p(VALUE self); - -/* transcode.c */ -extern VALUE rb_cEncodingConverter; -#ifdef RUBY_ENCODING_H -size_t rb_econv_memsize(rb_econv_t *); -#endif - -/* us_ascii.c */ -#ifdef RUBY_ENCODING_H -extern rb_encoding OnigEncodingUS_ASCII; -#endif - -/* util.c */ -char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve); -char *ruby_hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve); - -/* utf_8.c */ -#ifdef RUBY_ENCODING_H -extern rb_encoding OnigEncodingUTF_8; -#endif - -/* variable.c */ -#if USE_TRANSIENT_HEAP -#define ROBJECT_TRANSIENT_FLAG FL_USER13 -#define ROBJ_TRANSIENT_P(obj) FL_TEST_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_SET(obj) FL_SET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_UNSET(obj) FL_UNSET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#else -#define ROBJ_TRANSIENT_P(obj) 0 -#define ROBJ_TRANSIENT_SET(obj) ((void)0) -#define ROBJ_TRANSIENT_UNSET(obj) ((void)0) -#endif -void rb_gc_mark_global_tbl(void); -size_t rb_generic_ivar_memsize(VALUE); -VALUE rb_search_class_path(VALUE); -VALUE rb_attr_delete(VALUE, ID); -VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef); -void rb_autoload_str(VALUE mod, ID id, VALUE file); -VALUE rb_autoload_at_p(VALUE, ID, int); -void rb_deprecate_constant(VALUE mod, const char *name); -NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE)); -rb_gvar_getter_t *rb_gvar_getter_function_of(const struct rb_global_entry *); -rb_gvar_setter_t *rb_gvar_setter_function_of(const struct rb_global_entry *); -bool rb_gvar_is_traced(const struct rb_global_entry *); -void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_); - -/* vm_insnhelper.h */ -rb_serial_t rb_next_class_serial(void); - -/* vm.c */ -VALUE rb_obj_is_thread(VALUE obj); -void rb_vm_mark(void *ptr); -void Init_BareVM(void); -void Init_vm_objects(void); -PUREFUNC(VALUE rb_vm_top_self(void)); -void rb_vm_inc_const_missing_count(void); -const void **rb_vm_get_insns_address_table(void); -VALUE rb_source_location(int *pline); -const char *rb_source_location_cstr(int *pline); -MJIT_STATIC void rb_vm_pop_cfunc_frame(void); -int rb_vm_add_root_module(ID id, VALUE module); -void rb_vm_check_redefinition_by_prepend(VALUE klass); -int rb_vm_check_optimizable_mid(VALUE mid); -VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements); -MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE); -PUREFUNC(st_table *rb_vm_fstring_table(void)); - - -/* vm_dump.c */ -void rb_print_backtrace(void); - -/* vm_eval.c */ -void Init_vm_eval(void); -VALUE rb_adjust_argv_kw_splat(int *, const VALUE **, int *); -VALUE rb_current_realfilepath(void); -VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE); -typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); -VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, - rb_check_funcall_hook *hook, VALUE arg); -VALUE rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, - rb_check_funcall_hook *hook, VALUE arg, int kw_splat); -const char *rb_type_str(enum ruby_value_type type); -VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE); -VALUE rb_yield_1(VALUE val); -VALUE rb_yield_force_blockarg(VALUE values); -VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv, - rb_block_call_func_t bl_proc, int min_argc, int max_argc, - VALUE data2); - -/* vm_insnhelper.c */ -VALUE rb_equal_opt(VALUE obj1, VALUE obj2); -VALUE rb_eql_opt(VALUE obj1, VALUE obj2); -void Init_vm_stack_canary(void); - -/* vm_method.c */ -void Init_eval_method(void); - -enum method_missing_reason { - MISSING_NOENTRY = 0x00, - MISSING_PRIVATE = 0x01, - MISSING_PROTECTED = 0x02, - MISSING_FCALL = 0x04, - MISSING_VCALL = 0x08, - MISSING_SUPER = 0x10, - MISSING_MISSING = 0x20, - MISSING_NONE = 0x40 -}; -struct rb_callable_method_entry_struct; -struct rb_method_definition_struct; -struct rb_execution_context_struct; -struct rb_control_frame_struct; -struct rb_calling_info; -struct rb_call_data; -/* I have several reasons to chose 64 here: - * - * - A cache line must be a power-of-two size. - * - Setting this to anything less than or equal to 32 boosts nothing. - * - I have never seen an architecture that has 128 byte L1 cache line. - * - I know Intel Core and Sparc T4 at least uses 64. - * - I know jemalloc internally has this exact same `#define CACHE_LINE 64`. - * https://github.com/jemalloc/jemalloc/blob/dev/include/jemalloc/internal/jemalloc_internal_types.h - */ -#define CACHELINE 64 -struct rb_call_cache { - /* inline cache: keys */ - rb_serial_t method_state; - rb_serial_t class_serial[ - (CACHELINE - - sizeof(rb_serial_t) /* method_state */ - - sizeof(struct rb_callable_method_entry_struct *) /* me */ - - sizeof(uintptr_t) /* method_serial */ - - sizeof(enum method_missing_reason) /* aux */ - - sizeof(VALUE (*)( /* call */ - struct rb_execution_context_struct *e, - struct rb_control_frame_struct *, - struct rb_calling_info *, - const struct rb_call_data *))) - / sizeof(rb_serial_t) - ]; - - /* inline cache: values */ - const struct rb_callable_method_entry_struct *me; - uintptr_t method_serial; /* me->def->method_serial */ - - VALUE (*call)(struct rb_execution_context_struct *ec, - struct rb_control_frame_struct *cfp, - struct rb_calling_info *calling, - struct rb_call_data *cd); - - union { - unsigned int index; /* used by ivar */ - enum method_missing_reason method_missing_reason; /* used by method_missing */ - } aux; -}; -STATIC_ASSERT(cachelined, sizeof(struct rb_call_cache) <= CACHELINE); -struct rb_call_info { - /* fixed at compile time */ - ID mid; - unsigned int flag; - int orig_argc; -}; -struct rb_call_data { - struct rb_call_cache cc; - struct rb_call_info ci; -}; -RUBY_FUNC_EXPORTED -RUBY_FUNC_NONNULL(1, VALUE rb_funcallv_with_cc(struct rb_call_data*, VALUE, ID, int, const VALUE*)); -RUBY_FUNC_EXPORTED -RUBY_FUNC_NONNULL(1, bool rb_method_basic_definition_p_with_cc(struct rb_call_data *, VALUE, ID)); - -#ifdef __GNUC__ -# define rb_funcallv(recv, mid, argc, argv) \ - __extension__({ \ - static struct rb_call_data rb_funcallv_data; \ - rb_funcallv_with_cc(&rb_funcallv_data, recv, mid, argc, argv); \ - }) -# define rb_method_basic_definition_p(klass, mid) \ - __extension__({ \ - static struct rb_call_data rb_mbdp; \ - (klass == Qfalse) ? /* hidden object cannot be overridden */ true : \ - rb_method_basic_definition_p_with_cc(&rb_mbdp, klass, mid); \ - }) -#endif - -/* vm_backtrace.c */ -void Init_vm_backtrace(void); -VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval); -VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval); - -VALUE rb_make_backtrace(void); -void rb_backtrace_print_as_bugreport(void); -int rb_backtrace_p(VALUE obj); -VALUE rb_backtrace_to_str_ary(VALUE obj); -VALUE rb_backtrace_to_location_ary(VALUE obj); -void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output); - -RUBY_SYMBOL_EXPORT_BEGIN -const char *rb_objspace_data_type_name(VALUE obj); - -/* Temporary. This API will be removed (renamed). */ -VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd); - -/* array.c (export) */ -void rb_ary_detransient(VALUE a); -VALUE *rb_ary_ptr_use_start(VALUE ary); -void rb_ary_ptr_use_end(VALUE ary); - -/* bignum.c (export) */ -VALUE rb_big_mul_normal(VALUE x, VALUE y); -VALUE rb_big_mul_balance(VALUE x, VALUE y); -VALUE rb_big_mul_karatsuba(VALUE x, VALUE y); -VALUE rb_big_mul_toom3(VALUE x, VALUE y); -VALUE rb_big_sq_fast(VALUE x); -VALUE rb_big_divrem_normal(VALUE x, VALUE y); -VALUE rb_big2str_poweroftwo(VALUE x, int base); -VALUE rb_big2str_generic(VALUE x, int base); -VALUE rb_str2big_poweroftwo(VALUE arg, int base, int badcheck); -VALUE rb_str2big_normal(VALUE arg, int base, int badcheck); -VALUE rb_str2big_karatsuba(VALUE arg, int base, int badcheck); -#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) -VALUE rb_big_mul_gmp(VALUE x, VALUE y); -VALUE rb_big_divrem_gmp(VALUE x, VALUE y); -VALUE rb_big2str_gmp(VALUE x, int base); -VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck); -#endif -enum rb_int_parse_flags { - RB_INT_PARSE_SIGN = 0x01, - RB_INT_PARSE_UNDERSCORE = 0x02, - RB_INT_PARSE_PREFIX = 0x04, - RB_INT_PARSE_ALL = 0x07, - RB_INT_PARSE_DEFAULT = 0x07 -}; -VALUE rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits, int base, int flags); - -/* enumerator.c (export) */ -VALUE rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv, - rb_enumerator_size_func *size_fn, - VALUE beg, VALUE end, VALUE step, int excl); - -/* error.c (export) */ -int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data); -NORETURN(void rb_unexpected_type(VALUE,int)); -#undef Check_Type -#define Check_Type(v, t) \ - (!RB_TYPE_P((VALUE)(v), (t)) || \ - ((t) == RUBY_T_DATA && RTYPEDDATA_P(v)) ? \ - rb_unexpected_type((VALUE)(v), (t)) : (void)0) - -static inline int -rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type) -{ - return RB_TYPE_P(obj, T_DATA) && RTYPEDDATA_P(obj) && (RTYPEDDATA_TYPE(obj) == data_type); -} -#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline - -/* file.c (export) */ -#if defined HAVE_READLINK && defined RUBY_ENCODING_H -VALUE rb_readlink(VALUE path, rb_encoding *enc); -#endif -#ifdef __APPLE__ -VALUE rb_str_normalize_ospath(const char *ptr, long len); -#endif - -/* hash.c (export) */ -VALUE rb_hash_delete_entry(VALUE hash, VALUE key); -VALUE rb_ident_hash_new(void); - -/* io.c (export) */ -void rb_maygvl_fd_fix_cloexec(int fd); -int rb_gc_for_fd(int err); -void rb_write_error_str(VALUE mesg); - -/* numeric.c (export) */ -VALUE rb_int_positive_pow(long x, unsigned long y); - -/* object.c (export) */ -int rb_opts_exception_p(VALUE opts, int default_value); - -/* process.c (export) */ -int rb_exec_async_signal_safe(const struct rb_execarg *e, char *errmsg, size_t errmsg_buflen); -rb_pid_t rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds, char *errmsg, size_t errmsg_buflen); -VALUE rb_execarg_new(int argc, const VALUE *argv, int accept_shell, int allow_exc_opt); -struct rb_execarg *rb_execarg_get(VALUE execarg_obj); /* dangerous. needs GC guard. */ -int rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val); -void rb_execarg_parent_start(VALUE execarg_obj); -void rb_execarg_parent_end(VALUE execarg_obj); -int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, char* errmsg, size_t errmsg_buflen); -VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash); -void rb_execarg_setenv(VALUE execarg_obj, VALUE env); - -/* rational.c (export) */ -VALUE rb_gcd(VALUE x, VALUE y); -VALUE rb_gcd_normal(VALUE self, VALUE other); -#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) -VALUE rb_gcd_gmp(VALUE x, VALUE y); -#endif - -/* signal.c (export) */ -int rb_grantpt(int fd); - -/* string.c (export) */ -VALUE rb_str_tmp_frozen_acquire(VALUE str); -void rb_str_tmp_frozen_release(VALUE str, VALUE tmp); -#ifdef RUBY_ENCODING_H -/* internal use */ -VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc); -#endif -VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE); -VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE); - -/* thread.c (export) */ -int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */ - -/* time.c (export) */ -void ruby_reset_leap_second_info(void); - -/* util.c (export) */ -extern const signed char ruby_digit36_to_number_table[]; -extern const char ruby_hexdigits[]; -extern unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow); - -/* variable.c (export) */ -void rb_mark_generic_ivar(VALUE); -void rb_mv_generic_ivar(VALUE src, VALUE dst); -VALUE rb_const_missing(VALUE klass, VALUE name); -int rb_class_ivar_set(VALUE klass, ID vid, VALUE value); -void rb_iv_tbl_copy(VALUE dst, VALUE src); - -/* gc.c (export) */ -VALUE rb_wb_protected_newobj_of(VALUE, VALUE); -VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE); - -size_t rb_obj_memsize_of(VALUE); -void rb_gc_verify_internal_consistency(void); - -#define RB_OBJ_GC_FLAGS_MAX 6 -size_t rb_obj_gc_flags(VALUE, ID[], size_t); -void rb_gc_mark_values(long n, const VALUE *values); -void rb_gc_mark_vm_stack_values(long n, const VALUE *values); - -#if IMEMO_DEBUG -VALUE rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, const char *file, int line); -#define rb_imemo_new(type, v1, v2, v3, v0) rb_imemo_new_debug(type, v1, v2, v3, v0, __FILE__, __LINE__) -#else -VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); -#endif - -/* random.c */ -int ruby_fill_random_bytes(void *, size_t, int); - -RUBY_SYMBOL_EXPORT_END - -#define RUBY_DTRACE_CREATE_HOOK(name, arg) \ - RUBY_DTRACE_HOOK(name##_CREATE, arg) -#define RUBY_DTRACE_HOOK(name, arg) \ -do { \ - if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \ - int dtrace_line; \ - const char *dtrace_file = rb_source_location_cstr(&dtrace_line); \ - if (!dtrace_file) dtrace_file = ""; \ - RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \ - } \ -} while (0) - -#define RB_OBJ_BUILTIN_TYPE(obj) rb_obj_builtin_type(obj) -#define OBJ_BUILTIN_TYPE(obj) RB_OBJ_BUILTIN_TYPE(obj) -#ifdef __GNUC__ -#define rb_obj_builtin_type(obj) \ -__extension__({ \ - VALUE arg_obj = (obj); \ - RB_SPECIAL_CONST_P(arg_obj) ? -1 : \ - RB_BUILTIN_TYPE(arg_obj); \ - }) -#else -static inline int -rb_obj_builtin_type(VALUE obj) -{ - return RB_SPECIAL_CONST_P(obj) ? -1 : - RB_BUILTIN_TYPE(obj); -} -#endif - -/* A macro for defining a flexible array, like: VALUE ary[FLEX_ARY_LEN]; */ -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -# define FLEX_ARY_LEN /* VALUE ary[]; */ -#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) -# define FLEX_ARY_LEN 0 /* VALUE ary[0]; */ -#else -# define FLEX_ARY_LEN 1 /* VALUE ary[1]; */ -#endif - -/* - * For declaring bitfields out of non-unsigned int types: - * struct date { - * BITFIELD(enum months, month, 4); - * ... - * }; - */ -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -# define BITFIELD(type, name, size) type name : size -#else -# define BITFIELD(type, name, size) unsigned int name : size -#endif - -#if defined(_MSC_VER) -# define COMPILER_WARNING_PUSH __pragma(warning(push)) -# define COMPILER_WARNING_POP __pragma(warning(pop)) -# define COMPILER_WARNING_ERROR(flag) __pragma(warning(error: flag))) -# define COMPILER_WARNING_IGNORED(flag) __pragma(warning(suppress: flag))) - -#elif defined(__clang__) /* clang 2.6 already had this feature */ -# define COMPILER_WARNING_PUSH _Pragma("clang diagnostic push") -# define COMPILER_WARNING_POP _Pragma("clang diagnostic pop") -# define COMPILER_WARNING_SPECIFIER(kind, msg) \ - clang diagnostic kind # msg -# define COMPILER_WARNING_ERROR(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) -# define COMPILER_WARNING_IGNORED(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) - -#elif GCC_VERSION_SINCE(4, 6, 0) -/* https://gcc.gnu.org/onlinedocs/gcc-4.6.4/gcc/Diagnostic-Pragmas.html */ -# define COMPILER_WARNING_PUSH _Pragma("GCC diagnostic push") -# define COMPILER_WARNING_POP _Pragma("GCC diagnostic pop") -# define COMPILER_WARNING_SPECIFIER(kind, msg) \ - GCC diagnostic kind # msg -# define COMPILER_WARNING_ERROR(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) -# define COMPILER_WARNING_IGNORED(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) - -#else /* other compilers to follow? */ -# define COMPILER_WARNING_PUSH /* nop */ -# define COMPILER_WARNING_POP /* nop */ -# define COMPILER_WARNING_ERROR(flag) /* nop */ -# define COMPILER_WARNING_IGNORED(flag) /* nop */ -#endif - -#define COMPILER_WARNING_PRAGMA(str) COMPILER_WARNING_PRAGMA_(str) -#define COMPILER_WARNING_PRAGMA_(str) _Pragma(#str) - -#if defined(USE_UNALIGNED_MEMBER_ACCESS) && USE_UNALIGNED_MEMBER_ACCESS && \ - (defined(__clang__) || GCC_VERSION_SINCE(9, 0, 0)) -# define UNALIGNED_MEMBER_ACCESS(expr) __extension__({ \ - COMPILER_WARNING_PUSH; \ - COMPILER_WARNING_IGNORED(-Waddress-of-packed-member); \ - typeof(expr) unaligned_member_access_result = (expr); \ - COMPILER_WARNING_POP; \ - unaligned_member_access_result; \ -}) -#else -# define UNALIGNED_MEMBER_ACCESS(expr) expr -#endif -#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem) - -#undef RB_OBJ_WRITE -#define RB_OBJ_WRITE(a, slot, b) UNALIGNED_MEMBER_ACCESS(rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)) +#include "internal/serial.h" +#include "internal/static_assert.h" +#include "internal/time.h" +#include "internal/fixnum.h" +#include "internal/bignum.h" +#include "internal/rational.h" +#include "internal/numeric.h" +#include "internal/complex.h" +#include "internal/hash.h" +#include "internal/missing.h" +#include "internal/struct.h" +#include "internal/class.h" +#include "internal/imemo.h" +#include "internal/compar.h" +#include "internal/variable.h" +#include "internal/array.h" +#include "internal/debug.h" +#include "internal/compile.h" +#include "internal/cont.h" +#include "internal/dir.h" +#include "internal/encoding.h" +#include "internal/enum.h" +#include "internal/eval.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/gc.h" +#include "internal/io.h" +#include "internal/load.h" +#include "internal/loadpath.h" +#include "internal/math.h" +#include "internal/mjit.h" +#include "internal/object.h" +#include "internal/parse.h" +#include "internal/proc.h" +#include "internal/process.h" +#include "internal/range.h" +#include "internal/re.h" +#include "internal/signal.h" +#include "internal/string.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/transcode.h" +#include "internal/enc.h" +#include "internal/util.h" +#include "internal/vm.h" +#include "internal/enumerator.h" +#include "internal/random.h" +#include "internal/inits.h" +#include "internal/warnings.h" #if defined(__cplusplus) #if 0 @@ -2693,5 +91,4 @@ rb_obj_builtin_type(VALUE obj) #endif } /* extern "C" { */ #endif - #endif /* RUBY_INTERNAL_H */ diff --git a/internal/array.h b/internal/array.h new file mode 100644 index 00000000000000..77f47dc5a21826 --- /dev/null +++ b/internal/array.h @@ -0,0 +1,88 @@ +#ifndef INTERNAL_ARRAY_H /* -*- C -*- */ +#define INTERNAL_ARRAY_H +/** + * @file + * @brief Internal header for Array. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* array.c */ + +#ifndef ARRAY_DEBUG +#define ARRAY_DEBUG (0+RUBY_DEBUG) +#endif + +#ifdef ARRAY_DEBUG +#define RARRAY_PTR_IN_USE_FLAG FL_USER14 +#define ARY_PTR_USING_P(ary) FL_TEST_RAW((ary), RARRAY_PTR_IN_USE_FLAG) +#else + +/* disable debug function */ +#undef RARRAY_PTR_USE_START_TRANSIENT +#undef RARRAY_PTR_USE_END_TRANSIENT +#define RARRAY_PTR_USE_START_TRANSIENT(a) ((VALUE *)RARRAY_CONST_PTR_TRANSIENT(a)) +#define RARRAY_PTR_USE_END_TRANSIENT(a) +#define ARY_PTR_USING_P(ary) 0 + +#endif + +#if USE_TRANSIENT_HEAP +#define RARY_TRANSIENT_SET(ary) FL_SET_RAW((ary), RARRAY_TRANSIENT_FLAG); +#define RARY_TRANSIENT_UNSET(ary) FL_UNSET_RAW((ary), RARRAY_TRANSIENT_FLAG); +#else +#undef RARRAY_TRANSIENT_P +#define RARRAY_TRANSIENT_P(a) 0 +#define RARY_TRANSIENT_SET(ary) ((void)0) +#define RARY_TRANSIENT_UNSET(ary) ((void)0) +#endif + +VALUE rb_ary_last(int, const VALUE *, VALUE); +void rb_ary_set_len(VALUE, long); +void rb_ary_delete_same(VALUE, VALUE); +VALUE rb_ary_tmp_new_fill(long capa); +VALUE rb_ary_at(VALUE, VALUE); +VALUE rb_ary_aref1(VALUE ary, VALUE i); +size_t rb_ary_memsize(VALUE); +VALUE rb_to_array_type(VALUE obj); +VALUE rb_check_to_array(VALUE ary); +VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *); +VALUE rb_ary_behead(VALUE, long); +#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) +#define rb_ary_new_from_args(n, ...) \ + __extension__ ({ \ + const VALUE args_to_new_ary[] = {__VA_ARGS__}; \ + if (__builtin_constant_p(n)) { \ + STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \ + } \ + rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \ + }) +#endif + +static inline VALUE +rb_ary_entry_internal(VALUE ary, long offset) +{ + long len = RARRAY_LEN(ary); + const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary); + if (len == 0) return Qnil; + if (offset < 0) { + offset += len; + if (offset < 0) return Qnil; + } + else if (len <= offset) { + return Qnil; + } + return ptr[offset]; +} + +RUBY_SYMBOL_EXPORT_BEGIN +/* array.c (export) */ +void rb_ary_detransient(VALUE a); +VALUE *rb_ary_ptr_use_start(VALUE ary); +void rb_ary_ptr_use_end(VALUE ary); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_ARRAY_H */ diff --git a/internal/bignum.h b/internal/bignum.h new file mode 100644 index 00000000000000..ceb048f9fa6661 --- /dev/null +++ b/internal/bignum.h @@ -0,0 +1,167 @@ +#ifndef INTERNAL_BIGNUM_H /* -*- C -*- */ +#define INTERNAL_BIGNUM_H +/** + * @file + * @brief Internal header for Bignums. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#ifndef BDIGIT +# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG +# define BDIGIT unsigned int +# define SIZEOF_BDIGIT SIZEOF_INT +# define BDIGIT_DBL unsigned LONG_LONG +# define BDIGIT_DBL_SIGNED LONG_LONG +# define PRI_BDIGIT_PREFIX "" +# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX +# elif SIZEOF_INT*2 <= SIZEOF_LONG +# define BDIGIT unsigned int +# define SIZEOF_BDIGIT SIZEOF_INT +# define BDIGIT_DBL unsigned long +# define BDIGIT_DBL_SIGNED long +# define PRI_BDIGIT_PREFIX "" +# define PRI_BDIGIT_DBL_PREFIX "l" +# elif SIZEOF_SHORT*2 <= SIZEOF_LONG +# define BDIGIT unsigned short +# define SIZEOF_BDIGIT SIZEOF_SHORT +# define BDIGIT_DBL unsigned long +# define BDIGIT_DBL_SIGNED long +# define PRI_BDIGIT_PREFIX "h" +# define PRI_BDIGIT_DBL_PREFIX "l" +# else +# define BDIGIT unsigned short +# define SIZEOF_BDIGIT (SIZEOF_LONG/2) +# define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG +# define BDIGIT_DBL unsigned long +# define BDIGIT_DBL_SIGNED long +# define PRI_BDIGIT_PREFIX "h" +# define PRI_BDIGIT_DBL_PREFIX "l" +# endif +#endif +#ifndef SIZEOF_ACTUAL_BDIGIT +# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT +#endif + +#ifdef PRI_BDIGIT_PREFIX +# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d" +# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i" +# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o" +# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u" +# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x" +# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X" +#endif + +#ifdef PRI_BDIGIT_DBL_PREFIX +# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d" +# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i" +# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o" +# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u" +# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x" +# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X" +#endif + +#define BIGNUM_EMBED_LEN_NUMBITS 3 +#ifndef BIGNUM_EMBED_LEN_MAX +# if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1 +# define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) +# else +# define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1) +# endif +#endif + +struct RBignum { + struct RBasic basic; + union { + struct { + size_t len; + BDIGIT *digits; + } heap; + BDIGIT ary[BIGNUM_EMBED_LEN_MAX]; + } as; +}; +#define BIGNUM_SIGN_BIT ((VALUE)FL_USER1) +/* sign: positive:1, negative:0 */ +#define BIGNUM_SIGN(b) ((RBASIC(b)->flags & BIGNUM_SIGN_BIT) != 0) +#define BIGNUM_SET_SIGN(b,sign) \ + ((sign) ? (RBASIC(b)->flags |= BIGNUM_SIGN_BIT) \ + : (RBASIC(b)->flags &= ~BIGNUM_SIGN_BIT)) +#define BIGNUM_POSITIVE_P(b) BIGNUM_SIGN(b) +#define BIGNUM_NEGATIVE_P(b) (!BIGNUM_SIGN(b)) +#define BIGNUM_NEGATE(b) (RBASIC(b)->flags ^= BIGNUM_SIGN_BIT) + +#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2) +#define BIGNUM_EMBED_LEN_MASK \ + (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT) +#define BIGNUM_EMBED_LEN_SHIFT \ + (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */ +#define BIGNUM_LEN(b) \ + ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ + (size_t)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \ + (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \ + RBIGNUM(b)->as.heap.len) +/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */ +#define BIGNUM_DIGITS(b) \ + ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ + RBIGNUM(b)->as.ary : \ + RBIGNUM(b)->as.heap.digits) +#define BIGNUM_LENINT(b) rb_long2int(BIGNUM_LEN(b)) + +#define RBIGNUM(obj) (R_CAST(RBignum)(obj)) + +/* bignum.c */ +extern const char ruby_digitmap[]; +double rb_big_fdiv_double(VALUE x, VALUE y); +VALUE rb_big_uminus(VALUE x); +VALUE rb_big_hash(VALUE); +VALUE rb_big_odd_p(VALUE); +VALUE rb_big_even_p(VALUE); +size_t rb_big_size(VALUE); +VALUE rb_integer_float_cmp(VALUE x, VALUE y); +VALUE rb_integer_float_eq(VALUE x, VALUE y); +VALUE rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception); +VALUE rb_big_comp(VALUE x); +VALUE rb_big_aref(VALUE x, VALUE y); +VALUE rb_big_abs(VALUE x); +VALUE rb_big_size_m(VALUE big); +VALUE rb_big_bit_length(VALUE big); +VALUE rb_big_remainder(VALUE x, VALUE y); +VALUE rb_big_gt(VALUE x, VALUE y); +VALUE rb_big_ge(VALUE x, VALUE y); +VALUE rb_big_lt(VALUE x, VALUE y); +VALUE rb_big_le(VALUE x, VALUE y); +VALUE rb_int_powm(int const argc, VALUE * const argv, VALUE const num); + +RUBY_SYMBOL_EXPORT_BEGIN +/* bignum.c (export) */ +VALUE rb_big_mul_normal(VALUE x, VALUE y); +VALUE rb_big_mul_balance(VALUE x, VALUE y); +VALUE rb_big_mul_karatsuba(VALUE x, VALUE y); +VALUE rb_big_mul_toom3(VALUE x, VALUE y); +VALUE rb_big_sq_fast(VALUE x); +VALUE rb_big_divrem_normal(VALUE x, VALUE y); +VALUE rb_big2str_poweroftwo(VALUE x, int base); +VALUE rb_big2str_generic(VALUE x, int base); +VALUE rb_str2big_poweroftwo(VALUE arg, int base, int badcheck); +VALUE rb_str2big_normal(VALUE arg, int base, int badcheck); +VALUE rb_str2big_karatsuba(VALUE arg, int base, int badcheck); +#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) +VALUE rb_big_mul_gmp(VALUE x, VALUE y); +VALUE rb_big_divrem_gmp(VALUE x, VALUE y); +VALUE rb_big2str_gmp(VALUE x, int base); +VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck); +#endif +enum rb_int_parse_flags { + RB_INT_PARSE_SIGN = 0x01, + RB_INT_PARSE_UNDERSCORE = 0x02, + RB_INT_PARSE_PREFIX = 0x04, + RB_INT_PARSE_ALL = 0x07, + RB_INT_PARSE_DEFAULT = 0x07 +}; +VALUE rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits, int base, int flags); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_BIGNUM_H */ diff --git a/internal/bits.h b/internal/bits.h new file mode 100644 index 00000000000000..1551d501fbd1d4 --- /dev/null +++ b/internal/bits.h @@ -0,0 +1,328 @@ +#ifndef INTERNAL_BITS_H /* -*- C -*- */ +#define INTERNAL_BITS_H +/** + * @file + * @brief Internal header for bitwise integer algorithms. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* The most significant bit of the lower part of half-long integer. + * If sizeof(long) == 4, this is 0x8000. + * If sizeof(long) == 8, this is 0x80000000. + */ +#define HALF_LONG_MSB ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2)) + +#define SIGNED_INTEGER_TYPE_P(int_type) (0 > ((int_type)0)-1) +#define SIGNED_INTEGER_MAX(sint_type) \ + (sint_type) \ + ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) | \ + ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) - 1)) +#define SIGNED_INTEGER_MIN(sint_type) (-SIGNED_INTEGER_MAX(sint_type)-1) +#define UNSIGNED_INTEGER_MAX(uint_type) (~(uint_type)0) +#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P +#define MUL_OVERFLOW_P(a, b) \ + __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0) +#elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW +#define MUL_OVERFLOW_P(a, b) \ + RB_GNUC_EXTENSION_BLOCK(__typeof__(a) c; __builtin_mul_overflow((a), (b), &c)) +#endif + +#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \ + (a) == 0 ? 0 : \ + (a) == -1 ? (b) < -(max) : \ + (a) > 0 ? \ + ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \ + ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b))) + +#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P +/* __builtin_mul_overflow_p can take bitfield */ +/* and GCC permits bitfields for integers other than int */ +#define MUL_OVERFLOW_FIXNUM_P(a, b) RB_GNUC_EXTENSION_BLOCK( \ + struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \ + __builtin_mul_overflow_p((a), (b), c.fixnum); \ +) +#else +#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) +#endif + +#ifdef MUL_OVERFLOW_P +#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_P(a, b) +#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_P(a, b) +#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_P(a, b) +#else +#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX) +#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX) +#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX) +#endif + +#ifndef swap16 +# ifdef HAVE_BUILTIN___BUILTIN_BSWAP16 +# define swap16(x) __builtin_bswap16(x) +# endif +#endif + +#ifndef swap16 +# define swap16(x) ((uint16_t)((((x)&0xFF)<<8) | (((x)>>8)&0xFF))) +#endif + +#ifndef swap32 +# ifdef HAVE_BUILTIN___BUILTIN_BSWAP32 +# define swap32(x) __builtin_bswap32(x) +# endif +#endif + +#ifndef swap32 +# define swap32(x) ((uint32_t)((((x)&0xFF)<<24) \ + |(((x)>>24)&0xFF) \ + |(((x)&0x0000FF00)<<8) \ + |(((x)&0x00FF0000)>>8) )) +#endif + +#ifndef swap64 +# ifdef HAVE_BUILTIN___BUILTIN_BSWAP64 +# define swap64(x) __builtin_bswap64(x) +# endif +#endif + +#ifndef swap64 +# ifdef HAVE_INT64_T +# define byte_in_64bit(n) ((uint64_t)0xff << (n)) +# define swap64(x) ((uint64_t)((((x)&byte_in_64bit(0))<<56) \ + |(((x)>>56)&0xFF) \ + |(((x)&byte_in_64bit(8))<<40) \ + |(((x)&byte_in_64bit(48))>>40) \ + |(((x)&byte_in_64bit(16))<<24) \ + |(((x)&byte_in_64bit(40))>>24) \ + |(((x)&byte_in_64bit(24))<<8) \ + |(((x)&byte_in_64bit(32))>>8))) +# endif +#endif + +static inline unsigned int +nlz_int(unsigned int x) +{ +#if defined(HAVE_BUILTIN___BUILTIN_CLZ) + if (x == 0) return SIZEOF_INT * CHAR_BIT; + return (unsigned int)__builtin_clz(x); +#else + unsigned int y; +# if 64 < SIZEOF_INT * CHAR_BIT + unsigned int n = 128; +# elif 32 < SIZEOF_INT * CHAR_BIT + unsigned int n = 64; +# else + unsigned int n = 32; +# endif +# if 64 < SIZEOF_INT * CHAR_BIT + y = x >> 64; if (y) {n -= 64; x = y;} +# endif +# if 32 < SIZEOF_INT * CHAR_BIT + y = x >> 32; if (y) {n -= 32; x = y;} +# endif + y = x >> 16; if (y) {n -= 16; x = y;} + y = x >> 8; if (y) {n -= 8; x = y;} + y = x >> 4; if (y) {n -= 4; x = y;} + y = x >> 2; if (y) {n -= 2; x = y;} + y = x >> 1; if (y) {return n - 2;} + return (unsigned int)(n - x); +#endif +} + +static inline unsigned int +nlz_long(unsigned long x) +{ +#if defined(HAVE_BUILTIN___BUILTIN_CLZL) + if (x == 0) return SIZEOF_LONG * CHAR_BIT; + return (unsigned int)__builtin_clzl(x); +#else + unsigned long y; +# if 64 < SIZEOF_LONG * CHAR_BIT + unsigned int n = 128; +# elif 32 < SIZEOF_LONG * CHAR_BIT + unsigned int n = 64; +# else + unsigned int n = 32; +# endif +# if 64 < SIZEOF_LONG * CHAR_BIT + y = x >> 64; if (y) {n -= 64; x = y;} +# endif +# if 32 < SIZEOF_LONG * CHAR_BIT + y = x >> 32; if (y) {n -= 32; x = y;} +# endif + y = x >> 16; if (y) {n -= 16; x = y;} + y = x >> 8; if (y) {n -= 8; x = y;} + y = x >> 4; if (y) {n -= 4; x = y;} + y = x >> 2; if (y) {n -= 2; x = y;} + y = x >> 1; if (y) {return n - 2;} + return (unsigned int)(n - x); +#endif +} + +#ifdef HAVE_LONG_LONG +static inline unsigned int +nlz_long_long(unsigned LONG_LONG x) +{ +#if defined(HAVE_BUILTIN___BUILTIN_CLZLL) + if (x == 0) return SIZEOF_LONG_LONG * CHAR_BIT; + return (unsigned int)__builtin_clzll(x); +#else + unsigned LONG_LONG y; +# if 64 < SIZEOF_LONG_LONG * CHAR_BIT + unsigned int n = 128; +# elif 32 < SIZEOF_LONG_LONG * CHAR_BIT + unsigned int n = 64; +# else + unsigned int n = 32; +# endif +# if 64 < SIZEOF_LONG_LONG * CHAR_BIT + y = x >> 64; if (y) {n -= 64; x = y;} +# endif +# if 32 < SIZEOF_LONG_LONG * CHAR_BIT + y = x >> 32; if (y) {n -= 32; x = y;} +# endif + y = x >> 16; if (y) {n -= 16; x = y;} + y = x >> 8; if (y) {n -= 8; x = y;} + y = x >> 4; if (y) {n -= 4; x = y;} + y = x >> 2; if (y) {n -= 2; x = y;} + y = x >> 1; if (y) {return n - 2;} + return (unsigned int)(n - x); +#endif +} +#endif + +#ifdef HAVE_UINT128_T +static inline unsigned int +nlz_int128(uint128_t x) +{ + uint128_t y; + unsigned int n = 128; + y = x >> 64; if (y) {n -= 64; x = y;} + y = x >> 32; if (y) {n -= 32; x = y;} + y = x >> 16; if (y) {n -= 16; x = y;} + y = x >> 8; if (y) {n -= 8; x = y;} + y = x >> 4; if (y) {n -= 4; x = y;} + y = x >> 2; if (y) {n -= 2; x = y;} + y = x >> 1; if (y) {return n - 2;} + return (unsigned int)(n - x); +} +#endif + +static inline unsigned int +nlz_intptr(uintptr_t x) +{ +#if SIZEOF_UINTPTR_T == SIZEOF_INT + return nlz_int(x); +#elif SIZEOF_UINTPTR_T == SIZEOF_LONG + return nlz_long(x); +#elif SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG + return nlz_long_long(x); +#else + #error no known integer type corresponds uintptr_t + return /* sane compiler */ ~0; +#endif +} + +static inline unsigned int +rb_popcount32(uint32_t x) +{ +#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT + return (unsigned int)__builtin_popcount(x); +#else + x = (x & 0x55555555) + (x >> 1 & 0x55555555); + x = (x & 0x33333333) + (x >> 2 & 0x33333333); + x = (x & 0x0f0f0f0f) + (x >> 4 & 0x0f0f0f0f); + x = (x & 0x001f001f) + (x >> 8 & 0x001f001f); + return (x & 0x0000003f) + (x >>16 & 0x0000003f); +#endif +} + +static inline int +rb_popcount64(uint64_t x) +{ +#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT + return __builtin_popcountll(x); +#else + x = (x & 0x5555555555555555) + (x >> 1 & 0x5555555555555555); + x = (x & 0x3333333333333333) + (x >> 2 & 0x3333333333333333); + x = (x & 0x0707070707070707) + (x >> 4 & 0x0707070707070707); + x = (x & 0x001f001f001f001f) + (x >> 8 & 0x001f001f001f001f); + x = (x & 0x0000003f0000003f) + (x >>16 & 0x0000003f0000003f); + return (x & 0x7f) + (x >>32 & 0x7f); +#endif +} + +static inline int +rb_popcount_intptr(uintptr_t x) +{ +#if SIZEOF_VOIDP == 8 + return rb_popcount64(x); +#elif SIZEOF_VOIDP == 4 + return rb_popcount32(x); +#endif +} + +static inline int +ntz_int32(uint32_t x) +{ +#ifdef HAVE_BUILTIN___BUILTIN_CTZ + return __builtin_ctz(x); +#else + return rb_popcount32((~x) & (x-1)); +#endif +} + +static inline int +ntz_int64(uint64_t x) +{ +#ifdef HAVE_BUILTIN___BUILTIN_CTZLL + return __builtin_ctzll(x); +#else + return rb_popcount64((~x) & (x-1)); +#endif +} + +static inline int +ntz_intptr(uintptr_t x) +{ +#if SIZEOF_VOIDP == 8 + return ntz_int64(x); +#elif SIZEOF_VOIDP == 4 + return ntz_int32(x); +#endif +} + +#if defined(HAVE_UINT128_T) && defined(HAVE_LONG_LONG) +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ + sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ + sizeof(x) <= SIZEOF_LONG_LONG ? SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x)) : \ + SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) +#elif defined(HAVE_UINT128_T) +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ + sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ + SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) +#elif defined(HAVE_LONG_LONG) +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ + sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ + SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x))) +#else +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ + SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x))) +#endif + +#if USE_FLONUM +#define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n))) +#define RUBY_BIT_ROTR(v, n) (((v) >> (n)) | ((v) << ((sizeof(v) * 8) - n))) +#endif +#endif /* INTERNAL_BITS_H */ diff --git a/internal/class.h b/internal/class.h new file mode 100644 index 00000000000000..8ba64a094b942f --- /dev/null +++ b/internal/class.h @@ -0,0 +1,143 @@ +#ifndef INTERNAL_CLASS_H /* -*- C -*- */ +#define INTERNAL_CLASS_H +/** + * @file + * @brief Internal header for Class. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct rb_deprecated_classext_struct { + char conflict[sizeof(VALUE) * 3]; +}; + +struct rb_subclass_entry; +typedef struct rb_subclass_entry rb_subclass_entry_t; + +struct rb_subclass_entry { + VALUE klass; + rb_subclass_entry_t *next; +}; + +struct rb_classext_struct { + struct st_table *iv_index_tbl; + struct st_table *iv_tbl; +#if SIZEOF_SERIAL_T == SIZEOF_VALUE /* otherwise m_tbl is in struct RClass */ + struct rb_id_table *m_tbl; +#endif + struct rb_id_table *const_tbl; + struct rb_id_table *callable_m_tbl; + rb_subclass_entry_t *subclasses; + rb_subclass_entry_t **parent_subclasses; + /** + * In the case that this is an `ICLASS`, `module_subclasses` points to the link + * in the module's `subclasses` list that indicates that the klass has been + * included. Hopefully that makes sense. + */ + rb_subclass_entry_t **module_subclasses; +#if SIZEOF_SERIAL_T != SIZEOF_VALUE /* otherwise class_serial is in struct RClass */ + rb_serial_t class_serial; +#endif + const VALUE origin_; + const VALUE refined_class; + rb_alloc_func_t allocator; + const VALUE includer; +}; + +typedef struct rb_classext_struct rb_classext_t; + +#undef RClass +struct RClass { + struct RBasic basic; + VALUE super; + rb_classext_t *ptr; +#if SIZEOF_SERIAL_T == SIZEOF_VALUE + /* Class serial is as wide as VALUE. Place it here. */ + rb_serial_t class_serial; +#else + /* Class serial does not fit into struct RClass. Place m_tbl instead. */ + struct rb_id_table *m_tbl; +#endif +}; + +void rb_class_subclass_add(VALUE super, VALUE klass); +void rb_class_remove_from_super_subclasses(VALUE); +int rb_singleton_class_internal_p(VALUE sklass); +/* class.c */ +VALUE rb_class_boot(VALUE); +VALUE rb_class_inherited(VALUE, VALUE); +VALUE rb_make_metaclass(VALUE, VALUE); +VALUE rb_include_class_new(VALUE, VALUE); +void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE); +void rb_class_detach_subclasses(VALUE); +void rb_class_detach_module_subclasses(VALUE); +void rb_class_remove_from_module_subclasses(VALUE); +VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_special_singleton_class(VALUE); +VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach); +VALUE rb_singleton_class_get(VALUE obj); + +int rb_class_has_methods(VALUE c); +void rb_undef_methods_from(VALUE klass, VALUE super); + +#define RCLASS_EXT(c) (RCLASS(c)->ptr) +#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl) +#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl) +#if SIZEOF_SERIAL_T == SIZEOF_VALUE +# define RCLASS_M_TBL(c) (RCLASS_EXT(c)->m_tbl) +#else +# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl) +#endif +#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl) +#define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl) +#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_) +#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class) +#if SIZEOF_SERIAL_T == SIZEOF_VALUE +# define RCLASS_SERIAL(c) (RCLASS(c)->class_serial) +#else +# define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial) +#endif +#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer) + +#define RCLASS_CLONED FL_USER6 +#define RICLASS_IS_ORIGIN FL_USER5 +#define RCLASS_REFINED_BY_ANY FL_USER7 + +static inline void +RCLASS_SET_ORIGIN(VALUE klass, VALUE origin) +{ + RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin); + if (klass != origin) FL_SET(origin, RICLASS_IS_ORIGIN); +} + +static inline void +RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass) +{ + RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass); +} + +#undef RCLASS_SUPER +static inline VALUE +RCLASS_SUPER(VALUE klass) +{ + return RCLASS(klass)->super; +} + +static inline VALUE +RCLASS_SET_SUPER(VALUE klass, VALUE super) +{ + if (super) { + rb_class_remove_from_super_subclasses(klass); + rb_class_subclass_add(super, klass); + } + RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super); + return super; +} + +#endif /* INTERNAL_CLASS_H */ diff --git a/internal/compar.h b/internal/compar.h new file mode 100644 index 00000000000000..36c5e9c78251f9 --- /dev/null +++ b/internal/compar.h @@ -0,0 +1,54 @@ +#ifndef INTERNAL_COMPAR_H /* -*- C -*- */ +#define INTERNAL_COMPAR_H +/** + * @file + * @brief Internal header for Comparable. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString) + +#ifdef RUBY_INTEGER_UNIFICATION +# define rb_cFixnum rb_cInteger +# define rb_cBignum rb_cInteger +#endif + +enum { + cmp_opt_Fixnum, + cmp_opt_String, + cmp_opt_Float, + cmp_optimizable_count +}; + +struct cmp_opt_data { + unsigned int opt_methods; + unsigned int opt_inited; +}; + +#define NEW_CMP_OPT_MEMO(type, value) \ + NEW_PARTIAL_MEMO_FOR(type, value, cmp_opt) +#define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type)) +#define CMP_OPTIMIZABLE(data, type) \ + (((data).opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \ + ((data).opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \ + (((data).opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \ + rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \ + ((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type)))) + +#define OPTIMIZED_CMP(a, b, data) \ + ((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Fixnum)) ? \ + (((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \ + (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) ? \ + rb_str_cmp(a, b) : \ + (RB_FLOAT_TYPE_P(a) && RB_FLOAT_TYPE_P(b) && CMP_OPTIMIZABLE(data, Float)) ? \ + rb_float_cmp(a, b) : \ + rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b)) + +/* compar.c */ +VALUE rb_invcmp(VALUE, VALUE); + +#endif /* INTERNAL_COMPAR_H */ diff --git a/internal/compile.h b/internal/compile.h new file mode 100644 index 00000000000000..f6091ba07693c8 --- /dev/null +++ b/internal/compile.h @@ -0,0 +1,22 @@ +#ifndef INTERNAL_COMPILE_H /* -*- C -*- */ +#define INTERNAL_COMPILE_H +/** + * @file + * @brief Internal header for the compiler. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* compile.c */ +struct rb_block; +struct rb_iseq_struct; +int rb_dvar_defined(ID, const struct rb_iseq_struct *); +int rb_local_defined(ID, const struct rb_iseq_struct *); +const char * rb_insns_name(int i); +VALUE rb_insns_name_array(void); +int rb_vm_insn_addr2insn(const void *); + +#endif /* INTERNAL_COMPILE_H */ diff --git a/internal/compilers.h b/internal/compilers.h new file mode 100644 index 00000000000000..697bad5f4e99e6 --- /dev/null +++ b/internal/compilers.h @@ -0,0 +1,87 @@ +#ifndef INTERNAL_COMPILERS_H /* -*- C -*- */ +#define INTERNAL_COMPILERS_H +/** + * @file + * @brief Internal header absorbing C compipler differences. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#ifndef MAYBE_UNUSED +# define MAYBE_UNUSED(x) x +#endif + +#ifndef WARN_UNUSED_RESULT +# define WARN_UNUSED_RESULT(x) x +#endif + +#ifndef __has_feature +# define __has_feature(x) 0 +#endif + +#ifndef __has_extension +# define __has_extension __has_feature +#endif + +#define RB_OBJ_BUILTIN_TYPE(obj) rb_obj_builtin_type(obj) +#define OBJ_BUILTIN_TYPE(obj) RB_OBJ_BUILTIN_TYPE(obj) +#ifdef __GNUC__ +#define rb_obj_builtin_type(obj) \ +__extension__({ \ + VALUE arg_obj = (obj); \ + RB_SPECIAL_CONST_P(arg_obj) ? -1 : \ + RB_BUILTIN_TYPE(arg_obj); \ + }) +#else +static inline int +rb_obj_builtin_type(VALUE obj) +{ + return RB_SPECIAL_CONST_P(obj) ? -1 : + RB_BUILTIN_TYPE(obj); +} +#endif + +/* A macro for defining a flexible array, like: VALUE ary[FLEX_ARY_LEN]; */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +# define FLEX_ARY_LEN /* VALUE ary[]; */ +#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) +# define FLEX_ARY_LEN 0 /* VALUE ary[0]; */ +#else +# define FLEX_ARY_LEN 1 /* VALUE ary[1]; */ +#endif + +/* + * For declaring bitfields out of non-unsigned int types: + * struct date { + * BITFIELD(enum months, month, 4); + * ... + * }; + */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +# define BITFIELD(type, name, size) type name : size +#else +# define BITFIELD(type, name, size) unsigned int name : size +#endif + +#if defined(USE_UNALIGNED_MEMBER_ACCESS) && USE_UNALIGNED_MEMBER_ACCESS && \ + (defined(__clang__) || GCC_VERSION_SINCE(9, 0, 0)) +#include "warnings.h" +# define UNALIGNED_MEMBER_ACCESS(expr) __extension__({ \ + COMPILER_WARNING_PUSH; \ + COMPILER_WARNING_IGNORED(-Waddress-of-packed-member); \ + typeof(expr) unaligned_member_access_result = (expr); \ + COMPILER_WARNING_POP; \ + unaligned_member_access_result; \ +}) +#else +# define UNALIGNED_MEMBER_ACCESS(expr) expr +#endif +#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem) + +#undef RB_OBJ_WRITE +#define RB_OBJ_WRITE(a, slot, b) UNALIGNED_MEMBER_ACCESS(rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)) + +#endif /* INTERNAL_COMPILERS_H */ diff --git a/internal/complex.h b/internal/complex.h new file mode 100644 index 00000000000000..7a363fc0e51c0c --- /dev/null +++ b/internal/complex.h @@ -0,0 +1,28 @@ +#ifndef INTERNAL_COMPLEX_H /* -*- C -*- */ +#define INTERNAL_COMPLEX_H +/** + * @file + * @brief Internal header for Complex. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct RComplex { + struct RBasic basic; + VALUE real; + VALUE imag; +}; + +#define RCOMPLEX(obj) (R_CAST(RComplex)(obj)) + +/* shortcut macro for internal only */ +#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r)) +#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i)) + +/* complex.c */ +VALUE rb_dbl_complex_new_polar_pi(double abs, double ang); + +#endif /* INTERNAL_COMPLEX_H */ diff --git a/internal/cont.h b/internal/cont.h new file mode 100644 index 00000000000000..066a28238c074f --- /dev/null +++ b/internal/cont.h @@ -0,0 +1,19 @@ +#ifndef INTERNAL_CONT_H /* -*- C -*- */ +#define INTERNAL_CONT_H +/** + * @file + * @brief Internal header for Fiber. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct rb_thread_struct; +/* cont.c */ +VALUE rb_obj_is_fiber(VALUE); +void rb_fiber_reset_root_local_storage(struct rb_thread_struct *); +void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(VALUE), VALUE (*rollback_func)(VALUE)); + +#endif /* INTERNAL_CONT_H */ diff --git a/internal/debug.h b/internal/debug.h new file mode 100644 index 00000000000000..8fa75fd8c648a3 --- /dev/null +++ b/internal/debug.h @@ -0,0 +1,34 @@ +#ifndef INTERNAL_DEBUG_H /* -*- C -*- */ +#define INTERNAL_DEBUG_H +/** + * @file + * @brief Internal header for debugging. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* MRI debug support */ +void rb_obj_info_dump(VALUE obj); +void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func); +void ruby_debug_breakpoint(void); + +// show obj data structure without any side-effect +#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) + +// same as rp, but add message header +#define rp_m(msg, obj) do { \ + fprintf(stderr, "%s", (msg)); \ + rb_obj_info_dump((VALUE)obj); \ +} while (0) + +// `ruby_debug_breakpoint()` does nothing, +// but breakpoint is set in run.gdb, so `make gdb` can stop here. +#define bp() ruby_debug_breakpoint() + +/* debug.c */ +PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); + +#endif /* INTERNAL_DEBUG_H */ diff --git a/internal/dir.h b/internal/dir.h new file mode 100644 index 00000000000000..9162d41d7aa552 --- /dev/null +++ b/internal/dir.h @@ -0,0 +1,16 @@ +#ifndef INTERNAL_DIR_H /* -*- C -*- */ +#define INTERNAL_DIR_H +/** + * @file + * @brief Internal header for Dir. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* dir.c */ +VALUE rb_dir_getwd_ospath(void); + +#endif /* INTERNAL_DIR_H */ diff --git a/internal/enc.h b/internal/enc.h new file mode 100644 index 00000000000000..afd86426278b3a --- /dev/null +++ b/internal/enc.h @@ -0,0 +1,24 @@ +#ifndef INTERNAL_ENC_H /* -*- C -*- */ +#define INTERNAL_ENC_H +/** + * @file + * @brief Internal header for Encoding. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + + +/* us_ascii.c */ +#ifdef RUBY_ENCODING_H +extern rb_encoding OnigEncodingUS_ASCII; +#endif + +/* utf_8.c */ +#ifdef RUBY_ENCODING_H +extern rb_encoding OnigEncodingUTF_8; +#endif + +#endif /* INTERNAL_ENC_H */ diff --git a/internal/encoding.h b/internal/encoding.h new file mode 100644 index 00000000000000..79fbadaf50d69d --- /dev/null +++ b/internal/encoding.h @@ -0,0 +1,28 @@ +#ifndef INTERNAL_ENCODING_H /* -*- C -*- */ +#define INTERNAL_ENCODING_H +/** + * @file + * @brief Internal header for Encoding. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* encoding.c */ +ID rb_id_encoding(void); +#ifdef RUBY_ENCODING_H +rb_encoding *rb_enc_get_from_index(int index); +rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); +#endif +int rb_encdb_replicate(const char *alias, const char *orig); +int rb_encdb_alias(const char *alias, const char *orig); +int rb_encdb_dummy(const char *name); +void rb_encdb_declare(const char *name); +void rb_enc_set_base(const char *name, const char *orig); +int rb_enc_set_dummy(int index); +void rb_encdb_set_unicode(int index); +PUREFUNC(int rb_data_is_encoding(VALUE obj)); + +#endif /* INTERNAL_ENCODING_H */ diff --git a/internal/enum.h b/internal/enum.h new file mode 100644 index 00000000000000..e4e710bad09f0d --- /dev/null +++ b/internal/enum.h @@ -0,0 +1,18 @@ +#ifndef INTERNAL_ENUM_H /* -*- C -*- */ +#define INTERNAL_ENUM_H +/** + * @file + * @brief Internal header for Enumerable. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* enum.c */ +extern VALUE rb_cArithSeq; +VALUE rb_f_send(int argc, VALUE *argv, VALUE recv); +VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary); + +#endif /* INTERNAL_ENUM_H */ diff --git a/internal/enumerator.h b/internal/enumerator.h new file mode 100644 index 00000000000000..5f0f6333b605ed --- /dev/null +++ b/internal/enumerator.h @@ -0,0 +1,20 @@ +#ifndef INTERNAL_ENUMERATOR_H /* -*- C -*- */ +#define INTERNAL_ENUMERATOR_H +/** + * @file + * @brief Internal header for Enumerator. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +RUBY_SYMBOL_EXPORT_BEGIN +/* enumerator.c (export) */ +VALUE rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv, + rb_enumerator_size_func *size_fn, + VALUE beg, VALUE end, VALUE step, int excl); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_ENUMERATOR_H */ diff --git a/internal/error.h b/internal/error.h new file mode 100644 index 00000000000000..5eddc7670f0e52 --- /dev/null +++ b/internal/error.h @@ -0,0 +1,72 @@ +#ifndef INTERNAL_ERROR_H /* -*- C -*- */ +#define INTERNAL_ERROR_H +/** + * @file + * @brief Internal header for Exception. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* error.c */ +extern VALUE rb_eEAGAIN; +extern VALUE rb_eEWOULDBLOCK; +extern VALUE rb_eEINPROGRESS; +void rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args); +NORETURN(void rb_async_bug_errno(const char *,int)); +const char *rb_builtin_type_name(int t); +const char *rb_builtin_class_name(VALUE x); +PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3); +#ifdef RUBY_ENCODING_H +VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); +PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); +PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); +PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4); +#endif + +typedef enum { + RB_WARN_CATEGORY_NONE, + RB_WARN_CATEGORY_DEPRECATED, + RB_WARN_CATEGORY_EXPERIMENTAL, +} rb_warning_category_t; +rb_warning_category_t rb_warning_category_from_name(VALUE category); +bool rb_warning_category_enabled_p(rb_warning_category_t category); + +#define rb_raise_cstr(etype, mesg) \ + rb_exc_raise(rb_exc_new_str(etype, rb_str_new_cstr(mesg))) +#define rb_raise_static(etype, mesg) \ + rb_exc_raise(rb_exc_new_str(etype, rb_str_new_static(mesg, rb_strlen_lit(mesg)))) + +VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method); +#define rb_name_err_raise_str(mesg, recv, name) \ + rb_exc_raise(rb_name_err_new(mesg, recv, name)) +#define rb_name_err_raise(mesg, recv, name) \ + rb_name_err_raise_str(rb_fstring_cstr(mesg), (recv), (name)) +VALUE rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv); +VALUE rb_key_err_new(VALUE mesg, VALUE recv, VALUE name); +#define rb_key_err_raise(mesg, recv, name) \ + rb_exc_raise(rb_key_err_new(mesg, recv, name)) +PRINTF_ARGS(VALUE rb_warning_string(const char *fmt, ...), 1, 2); +NORETURN(void rb_vraise(VALUE, const char *, va_list)); + +RUBY_SYMBOL_EXPORT_BEGIN +/* error.c (export) */ +int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data); +NORETURN(void rb_unexpected_type(VALUE,int)); +#undef Check_Type +#define Check_Type(v, t) \ + (!RB_TYPE_P((VALUE)(v), (t)) || \ + ((t) == RUBY_T_DATA && RTYPEDDATA_P(v)) ? \ + rb_unexpected_type((VALUE)(v), (t)) : (void)0) + +static inline int +rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type) +{ + return RB_TYPE_P(obj, T_DATA) && RTYPEDDATA_P(obj) && (RTYPEDDATA_TYPE(obj) == data_type); +} +#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_ERROR_H */ diff --git a/internal/eval.h b/internal/eval.h new file mode 100644 index 00000000000000..5fc3b38e90087b --- /dev/null +++ b/internal/eval.h @@ -0,0 +1,30 @@ +#ifndef INTERNAL_EVAL_H /* -*- C -*- */ +#define INTERNAL_EVAL_H +/** + * @file + * @brief Internal header for the evaluator. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + * @note There also is eval_intern.h, which is evaluator's internal + * header (related to this file, but not the same role). + */ + +/* eval.c */ +VALUE rb_refinement_module_get_refined_class(VALUE module); +extern ID ruby_static_id_signo, ruby_static_id_status; +void rb_class_modify_check(VALUE); +#define id_signo ruby_static_id_signo +#define id_status ruby_static_id_status +NORETURN(VALUE rb_f_raise(int argc, VALUE *argv)); + +/* eval_error.c */ +VALUE rb_get_backtrace(VALUE info); + +/* eval_jump.c */ +void rb_call_end_proc(VALUE data); +void rb_mark_end_proc(void); + +#endif /* INTERNAL_EVAL_H */ diff --git a/internal/file.h b/internal/file.h new file mode 100644 index 00000000000000..f4a0794dc66d60 --- /dev/null +++ b/internal/file.h @@ -0,0 +1,55 @@ +#ifndef INTERNAL_FILE_H /* -*- C -*- */ +#define INTERNAL_FILE_H +/** + * @file + * @brief Internal header for File. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* file.c */ +extern const char ruby_null_device[]; +VALUE rb_home_dir_of(VALUE user, VALUE result); +VALUE rb_default_home_dir(VALUE result); +VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict); +#ifdef RUBY_ENCODING_H +VALUE rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *origenc); +#endif +void rb_file_const(const char*, VALUE); +int rb_file_load_ok(const char *); +VALUE rb_file_expand_path_fast(VALUE, VALUE); +VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE); +VALUE rb_get_path_check_to_string(VALUE); +VALUE rb_get_path_check_convert(VALUE); +int ruby_is_fd_loadable(int fd); + +#ifdef RUBY_FUNCTION_NAME_STRING +# if defined __GNUC__ && __GNUC__ >= 4 +# pragma GCC visibility push(default) +# endif +NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path)); +NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)); +# if defined __GNUC__ && __GNUC__ >= 4 +# pragma GCC visibility pop +# endif +# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path) +# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path)) +#else +# define rb_sys_fail_path(path) rb_sys_fail_str(path) +# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path)) +#endif + +RUBY_SYMBOL_EXPORT_BEGIN +/* file.c (export) */ +#if defined HAVE_READLINK && defined RUBY_ENCODING_H +VALUE rb_readlink(VALUE path, rb_encoding *enc); +#endif +#ifdef __APPLE__ +VALUE rb_str_normalize_ospath(const char *ptr, long len); +#endif +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_FILE_H */ diff --git a/internal/fixnum.h b/internal/fixnum.h new file mode 100644 index 00000000000000..08ca7bcec7331c --- /dev/null +++ b/internal/fixnum.h @@ -0,0 +1,150 @@ +#ifndef INTERNAL_FIXNUM_H /* -*- C -*- */ +#define INTERNAL_FIXNUM_H +/** + * @file + * @brief Internal header for Fixnums. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG +# define DLONG LONG_LONG +# define DL2NUM(x) LL2NUM(x) +#elif defined(HAVE_INT128_T) +# define DLONG int128_t +# define DL2NUM(x) (RB_FIXABLE(x) ? LONG2FIX(x) : rb_int128t2big(x)) +VALUE rb_int128t2big(int128_t n); +#endif + +static inline long +rb_overflowed_fix_to_int(long x) +{ + return (long)((unsigned long)(x >> 1) ^ (1LU << (SIZEOF_LONG * CHAR_BIT - 1))); +} + +static inline VALUE +rb_fix_plus_fix(VALUE x, VALUE y) +{ +#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW + long lz; + /* NOTE + * (1) `LONG2FIX(FIX2LONG(x)+FIX2LONG(y))` + + = `((lx*2+1)/2 + (ly*2+1)/2)*2+1` + + = `lx*2 + ly*2 + 1` + + = `(lx*2+1) + (ly*2+1) - 1` + + = `x + y - 1` + * (2) Fixnum's LSB is always 1. + * It means you can always run `x - 1` without overflow. + * (3) Of course `z = x + (y-1)` may overflow. + * At that time true value is + * * positive: 0b0 1xxx...1, and z = 0b1xxx...1 + * * nevative: 0b1 0xxx...1, and z = 0b0xxx...1 + * To convert this true value to long, + * (a) Use arithmetic shift + * * positive: 0b11xxx... + * * negative: 0b00xxx... + * (b) invert MSB + * * positive: 0b01xxx... + * * negative: 0b10xxx... + */ + if (__builtin_add_overflow((long)x, (long)y-1, &lz)) { + return rb_int2big(rb_overflowed_fix_to_int(lz)); + } + else { + return (VALUE)lz; + } +#else + long lz = FIX2LONG(x) + FIX2LONG(y); + return LONG2NUM(lz); +#endif +} + +static inline VALUE +rb_fix_minus_fix(VALUE x, VALUE y) +{ +#ifdef HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW + long lz; + if (__builtin_sub_overflow((long)x, (long)y-1, &lz)) { + return rb_int2big(rb_overflowed_fix_to_int(lz)); + } + else { + return (VALUE)lz; + } +#else + long lz = FIX2LONG(x) - FIX2LONG(y); + return LONG2NUM(lz); +#endif +} + +/* arguments must be Fixnum */ +static inline VALUE +rb_fix_mul_fix(VALUE x, VALUE y) +{ + long lx = FIX2LONG(x); + long ly = FIX2LONG(y); +#ifdef DLONG + return DL2NUM((DLONG)lx * (DLONG)ly); +#else + if (MUL_OVERFLOW_FIXNUM_P(lx, ly)) { + return rb_big_mul(rb_int2big(lx), rb_int2big(ly)); + } + else { + return LONG2FIX(lx * ly); + } +#endif +} + +/* + * This behaves different from C99 for negative arguments. + * Note that div may overflow fixnum. + */ +static inline void +rb_fix_divmod_fix(VALUE a, VALUE b, VALUE *divp, VALUE *modp) +{ + /* assume / and % comply C99. + * ldiv(3) won't be inlined by GCC and clang. + * I expect / and % are compiled as single idiv. + */ + long x = FIX2LONG(a); + long y = FIX2LONG(b); + long div, mod; + if (x == FIXNUM_MIN && y == -1) { + if (divp) *divp = LONG2NUM(-FIXNUM_MIN); + if (modp) *modp = LONG2FIX(0); + return; + } + div = x / y; + mod = x % y; + if (y > 0 ? mod < 0 : mod > 0) { + mod += y; + div -= 1; + } + if (divp) *divp = LONG2FIX(div); + if (modp) *modp = LONG2FIX(mod); +} + +/* div() for Ruby + * This behaves different from C99 for negative arguments. + */ +static inline VALUE +rb_fix_div_fix(VALUE x, VALUE y) +{ + VALUE div; + rb_fix_divmod_fix(x, y, &div, NULL); + return div; +} + +/* mod() for Ruby + * This behaves different from C99 for negative arguments. + */ +static inline VALUE +rb_fix_mod_fix(VALUE x, VALUE y) +{ + VALUE mod; + rb_fix_divmod_fix(x, y, NULL, &mod); + return mod; +} +#endif /* INTERNAL_FIXNUM_H */ diff --git a/internal/gc.h b/internal/gc.h new file mode 100644 index 00000000000000..cf59eaed0b4e1b --- /dev/null +++ b/internal/gc.h @@ -0,0 +1,79 @@ +#ifndef INTERNAL_GC_H /* -*- C -*- */ +#define INTERNAL_GC_H +/** + * @file + * @brief Internal header for GC. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* gc.c */ +extern VALUE *ruby_initial_gc_stress_ptr; +extern int ruby_disable_gc; +void *ruby_mimmalloc(size_t size) RUBY_ATTR_MALLOC; +void ruby_mimfree(void *ptr); +void rb_objspace_set_event_hook(const rb_event_flag_t event); +#if USE_RGENGC +void rb_gc_writebarrier_remember(VALUE obj); +#else +#define rb_gc_writebarrier_remember(obj) 0 +#endif +void ruby_gc_set_params(void); +void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj); + +#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32) +#define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size) +#define ruby_sized_xrealloc2(ptr, new_count, element_size, old_count) ruby_xrealloc2(ptr, new_count, element_size) +#define ruby_sized_xfree(ptr, size) ruby_xfree(ptr) +#define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n) +#else +RUBY_SYMBOL_EXPORT_BEGIN +void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2)); +void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3)); +void ruby_sized_xfree(void *x, size_t size); +RUBY_SYMBOL_EXPORT_END +#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc2((void*)(var), (n), sizeof(type), (old_n))) +#endif + +/* optimized version of NEWOBJ() */ +#undef NEWOBJF_OF +#undef RB_NEWOBJ_OF +#define RB_NEWOBJ_OF(obj,type,klass,flags) \ + type *(obj) = (type*)(((flags) & FL_WB_PROTECTED) ? \ + rb_wb_protected_newobj_of(klass, (flags) & ~FL_WB_PROTECTED) : \ + rb_wb_unprotected_newobj_of(klass, flags)) +#define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags) + +#ifdef __has_attribute +#if __has_attribute(alloc_align) +__attribute__((__alloc_align__(1))) +#endif +#endif +void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_MALLOC RUBY_ATTR_ALLOC_SIZE((2)); + +size_t rb_size_mul_or_raise(size_t, size_t, VALUE); /* used in compile.c */ +size_t rb_size_mul_add_or_raise(size_t, size_t, size_t, VALUE); /* used in iseq.h */ +void *rb_xmalloc_mul_add(size_t, size_t, size_t) RUBY_ATTR_MALLOC; +void *rb_xrealloc_mul_add(const void *, size_t, size_t, size_t); +void *rb_xmalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; +void *rb_xcalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; + +RUBY_SYMBOL_EXPORT_BEGIN +const char *rb_objspace_data_type_name(VALUE obj); + +/* gc.c (export) */ +VALUE rb_wb_protected_newobj_of(VALUE, VALUE); +VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE); + +size_t rb_obj_memsize_of(VALUE); +void rb_gc_verify_internal_consistency(void); + +#define RB_OBJ_GC_FLAGS_MAX 6 +size_t rb_obj_gc_flags(VALUE, ID[], size_t); +void rb_gc_mark_values(long n, const VALUE *values); +void rb_gc_mark_vm_stack_values(long n, const VALUE *values); +RUBY_SYMBOL_EXPORT_END +#endif /* INTERNAL_GC_H */ diff --git a/internal/hash.h b/internal/hash.h new file mode 100644 index 00000000000000..3f27bb8d8c57df --- /dev/null +++ b/internal/hash.h @@ -0,0 +1,143 @@ +#ifndef INTERNAL_HASH_H /* -*- C -*- */ +#define INTERNAL_HASH_H +/** + * @file + * @brief Internal header for Hash. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +enum ruby_rhash_flags { + RHASH_PASS_AS_KEYWORDS = FL_USER1, /* FL 1 */ + RHASH_PROC_DEFAULT = FL_USER2, /* FL 2 */ + RHASH_ST_TABLE_FLAG = FL_USER3, /* FL 3 */ +#define RHASH_AR_TABLE_MAX_SIZE SIZEOF_VALUE + RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7), /* FL 4..7 */ + RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4), + RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11), /* FL 8..11 */ + RHASH_AR_TABLE_BOUND_SHIFT = (FL_USHIFT+8), + + // we can not put it in "enum" because it can exceed "int" range. +#define RHASH_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 | /* FL 13..19 */ \ + FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19) + +#if USE_TRANSIENT_HEAP + RHASH_TRANSIENT_FLAG = FL_USER12, /* FL 12 */ +#endif + + RHASH_LEV_SHIFT = (FL_USHIFT + 13), + RHASH_LEV_MAX = 127, /* 7 bits */ + + RHASH_ENUM_END +}; + +#define RHASH_AR_TABLE_SIZE_RAW(h) \ + ((unsigned int)((RBASIC(h)->flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT)) + +void rb_hash_st_table_set(VALUE hash, st_table *st); + +#if 0 /* for debug */ +int rb_hash_ar_table_p(VALUE hash); +struct ar_table_struct *rb_hash_ar_table(VALUE hash); +st_table *rb_hash_st_table(VALUE hash); +#define RHASH_AR_TABLE_P(hash) rb_hash_ar_table_p(hash) +#define RHASH_AR_TABLE(h) rb_hash_ar_table(h) +#define RHASH_ST_TABLE(h) rb_hash_st_table(h) +#else +#define RHASH_AR_TABLE_P(hash) (!FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG)) +#define RHASH_AR_TABLE(hash) (RHASH(hash)->as.ar) +#define RHASH_ST_TABLE(hash) (RHASH(hash)->as.st) +#endif + +#define RHASH(obj) (R_CAST(RHash)(obj)) +#define RHASH_ST_SIZE(h) (RHASH_ST_TABLE(h)->num_entries) +#define RHASH_ST_TABLE_P(h) (!RHASH_AR_TABLE_P(h)) +#define RHASH_ST_CLEAR(h) (FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG), RHASH(h)->as.ar = NULL) + +#define RHASH_AR_TABLE_SIZE_MASK (VALUE)RHASH_AR_TABLE_SIZE_MASK +#define RHASH_AR_TABLE_SIZE_SHIFT RHASH_AR_TABLE_SIZE_SHIFT +#define RHASH_AR_TABLE_BOUND_MASK (VALUE)RHASH_AR_TABLE_BOUND_MASK +#define RHASH_AR_TABLE_BOUND_SHIFT RHASH_AR_TABLE_BOUND_SHIFT + +#if USE_TRANSIENT_HEAP +#define RHASH_TRANSIENT_P(hash) FL_TEST_RAW((hash), RHASH_TRANSIENT_FLAG) +#define RHASH_SET_TRANSIENT_FLAG(h) FL_SET_RAW(h, RHASH_TRANSIENT_FLAG) +#define RHASH_UNSET_TRANSIENT_FLAG(h) FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG) +#else +#define RHASH_TRANSIENT_P(hash) 0 +#define RHASH_SET_TRANSIENT_FLAG(h) ((void)0) +#define RHASH_UNSET_TRANSIENT_FLAG(h) ((void)0) +#endif + +#if SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 2 +typedef uint16_t ar_hint_t; +#elif SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 1 +typedef unsigned char ar_hint_t; +#else +#error unsupported +#endif + +struct RHash { + struct RBasic basic; + union { + st_table *st; + struct ar_table_struct *ar; /* possibly 0 */ + } as; + const VALUE ifnone; + union { + ar_hint_t ary[RHASH_AR_TABLE_MAX_SIZE]; + VALUE word; + } ar_hint; +}; + +#ifdef RHASH_IFNONE +# undef RHASH_IFNONE +# undef RHASH_SIZE + +# define RHASH_IFNONE(h) (RHASH(h)->ifnone) +# define RHASH_SIZE(h) (RHASH_AR_TABLE_P(h) ? RHASH_AR_TABLE_SIZE_RAW(h) : RHASH_ST_SIZE(h)) +#endif /* ifdef RHASH_IFNONE */ + +/* hash.c */ +#if RHASH_CONVERT_TABLE_DEBUG +struct st_table *rb_hash_tbl_raw(VALUE hash, const char *file, int line); +#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h, __FILE__, __LINE__) +#else +struct st_table *rb_hash_tbl_raw(VALUE hash); +#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) +#endif + +VALUE rb_hash_new_with_size(st_index_t size); +VALUE rb_hash_has_key(VALUE hash, VALUE key); +VALUE rb_hash_default_value(VALUE hash, VALUE key); +VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc); +long rb_dbl_long_hash(double d); +st_table *rb_init_identtable(void); +VALUE rb_hash_compare_by_id_p(VALUE hash); +VALUE rb_to_hash_type(VALUE obj); +VALUE rb_hash_key_str(VALUE); +VALUE rb_hash_keys(VALUE hash); +VALUE rb_hash_values(VALUE hash); +VALUE rb_hash_rehash(VALUE hash); +VALUE rb_hash_resurrect(VALUE hash); +int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val); +VALUE rb_hash_set_pair(VALUE hash, VALUE pair); + +int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval); +int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval); +RUBY_SYMBOL_EXPORT_BEGIN +int rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg); +RUBY_SYMBOL_EXPORT_END +int rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg); +int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg); + +RUBY_SYMBOL_EXPORT_BEGIN +/* hash.c (export) */ +VALUE rb_hash_delete_entry(VALUE hash, VALUE key); +VALUE rb_ident_hash_new(void); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_HASH_H */ diff --git a/internal/imemo.h b/internal/imemo.h new file mode 100644 index 00000000000000..682582a40ee7fa --- /dev/null +++ b/internal/imemo.h @@ -0,0 +1,212 @@ +#ifndef INTERNAL_IMEMO_H /* -*- C -*- */ +#define INTERNAL_IMEMO_H +/** + * @file + * @brief IMEMO: Internal memo object. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#ifndef IMEMO_DEBUG +#define IMEMO_DEBUG 0 +#endif + +struct RIMemo { + VALUE flags; + VALUE v0; + VALUE v1; + VALUE v2; + VALUE v3; +}; + +enum imemo_type { + imemo_env = 0, + imemo_cref = 1, /*!< class reference */ + imemo_svar = 2, /*!< special variable */ + imemo_throw_data = 3, + imemo_ifunc = 4, /*!< iterator function */ + imemo_memo = 5, + imemo_ment = 6, + imemo_iseq = 7, + imemo_tmpbuf = 8, + imemo_ast = 9, + imemo_parser_strterm = 10 +}; +#define IMEMO_MASK 0x0f + +static inline enum imemo_type +imemo_type(VALUE imemo) +{ + return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK; +} + +static inline int +imemo_type_p(VALUE imemo, enum imemo_type imemo_type) +{ + if (LIKELY(!RB_SPECIAL_CONST_P(imemo))) { + /* fixed at compile time if imemo_type is given. */ + const VALUE mask = (IMEMO_MASK << FL_USHIFT) | RUBY_T_MASK; + const VALUE expected_type = (imemo_type << FL_USHIFT) | T_IMEMO; + /* fixed at runtime. */ + return expected_type == (RBASIC(imemo)->flags & mask); + } + else { + return 0; + } +} + +VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); + +/* FL_USER0 to FL_USER3 is for type */ +#define IMEMO_FL_USHIFT (FL_USHIFT + 4) +#define IMEMO_FL_USER0 FL_USER4 +#define IMEMO_FL_USER1 FL_USER5 +#define IMEMO_FL_USER2 FL_USER6 +#define IMEMO_FL_USER3 FL_USER7 +#define IMEMO_FL_USER4 FL_USER8 + +/* CREF (Class REFerence) is defined in method.h */ + +/*! SVAR (Special VARiable) */ +struct vm_svar { + VALUE flags; + const VALUE cref_or_me; /*!< class reference or rb_method_entry_t */ + const VALUE lastline; + const VALUE backref; + const VALUE others; +}; + + +#define THROW_DATA_CONSUMED IMEMO_FL_USER0 + +/*! THROW_DATA */ +struct vm_throw_data { + VALUE flags; + VALUE reserved; + const VALUE throw_obj; + const struct rb_control_frame_struct *catch_frame; + int throw_state; +}; + +#define THROW_DATA_P(err) RB_TYPE_P((VALUE)(err), T_IMEMO) + +/* IFUNC (Internal FUNCtion) */ + +struct vm_ifunc_argc { +#if SIZEOF_INT * 2 > SIZEOF_VALUE + signed int min: (SIZEOF_VALUE * CHAR_BIT) / 2; + signed int max: (SIZEOF_VALUE * CHAR_BIT) / 2; +#else + int min, max; +#endif +}; + +/*! IFUNC (Internal FUNCtion) */ +struct vm_ifunc { + VALUE flags; + VALUE reserved; + rb_block_call_func_t func; + const void *data; + struct vm_ifunc_argc argc; +}; + +#define IFUNC_NEW(a, b, c) ((struct vm_ifunc *)rb_imemo_new(imemo_ifunc, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) +struct vm_ifunc *rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc); +static inline struct vm_ifunc * +rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data) +{ + return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS); +} + +typedef struct rb_imemo_tmpbuf_struct { + VALUE flags; + VALUE reserved; + VALUE *ptr; /* malloc'ed buffer */ + struct rb_imemo_tmpbuf_struct *next; /* next imemo */ + size_t cnt; /* buffer size in VALUE */ +} rb_imemo_tmpbuf_t; + +#define rb_imemo_tmpbuf_auto_free_pointer() rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0) +rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt); + +#define RB_IMEMO_TMPBUF_PTR(v) \ + ((void *)(((const struct rb_imemo_tmpbuf_struct *)(v))->ptr)) + +static inline void * +rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr) +{ + return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr; +} + +static inline VALUE +rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) +{ + const void *src; + VALUE imemo; + rb_imemo_tmpbuf_t *tmpbuf; + void *dst; + size_t len; + + SafeStringValue(str); + /* create tmpbuf to keep the pointer before xmalloc */ + imemo = rb_imemo_tmpbuf_auto_free_pointer(); + tmpbuf = (rb_imemo_tmpbuf_t *)imemo; + len = RSTRING_LEN(str); + src = RSTRING_PTR(str); + dst = ruby_xmalloc(len); + memcpy(dst, src, len); + tmpbuf->ptr = dst; + return imemo; +} + +void rb_strterm_mark(VALUE obj); + +/*! MEMO + * + * @see imemo_type + * */ +struct MEMO { + VALUE flags; + VALUE reserved; + const VALUE v1; + const VALUE v2; + union { + long cnt; + long state; + const VALUE value; + void (*func)(void); + } u3; +}; + +#define MEMO_V1_SET(m, v) RB_OBJ_WRITE((m), &(m)->v1, (v)) +#define MEMO_V2_SET(m, v) RB_OBJ_WRITE((m), &(m)->v2, (v)) + +#define MEMO_CAST(m) ((struct MEMO *)m) + +#define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) + +#define roomof(x, y) (((x) + (y) - 1) / (y)) +#define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) +#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) +#define NEW_MEMO_FOR(type, value) \ + ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value)) +#define NEW_PARTIAL_MEMO_FOR(type, value, member) \ + ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), \ + rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \ + MEMO_FOR(type, value)) + +/* ment is in method.h */ + +RUBY_SYMBOL_EXPORT_BEGIN +#if IMEMO_DEBUG +VALUE rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, const char *file, int line); +#define rb_imemo_new(type, v1, v2, v3, v0) rb_imemo_new_debug(type, v1, v2, v3, v0, __FILE__, __LINE__) +#else +VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); +#endif +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_IMEMO_H */ diff --git a/internal/inits.h b/internal/inits.h new file mode 100644 index 00000000000000..c9ef51372840a9 --- /dev/null +++ b/internal/inits.h @@ -0,0 +1,51 @@ +#ifndef INTERNAL_INITS_H /* -*- C -*- */ +#define INTERNAL_INITS_H +/** + * @file + * @brief Internal header aggregating init functions. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* class.c */ +void Init_class_hierarchy(void); + +/* dmyext.c */ +void Init_enc(void); +void Init_ext(void); + +/* file.c */ +void Init_File(void); + +/* gc.c */ +void Init_heap(void); + +/* localeinit.c */ +int Init_enc_set_filesystem_encoding(void); + +/* newline.c */ +void Init_newline(void); + +/* vm.c */ +void Init_BareVM(void); +void Init_vm_objects(void); + +/* vm_backtrace.c */ +void Init_vm_backtrace(void); + +/* vm_eval.c */ +void Init_vm_eval(void); + +/* vm_insnhelper.c */ +void Init_vm_stack_canary(void); + +/* vm_method.c */ +void Init_eval_method(void); + +/* inits.c */ +void rb_call_inits(void); + +#endif /* INTERNAL_INITS_H */ diff --git a/internal/io.h b/internal/io.h new file mode 100644 index 00000000000000..00bca80fef10ac --- /dev/null +++ b/internal/io.h @@ -0,0 +1,31 @@ +#ifndef INTERNAL_IO_H /* -*- C -*- */ +#define INTERNAL_IO_H +/** + * @file + * @brief Internal header for IO. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* io.c */ +void ruby_set_inplace_mode(const char *); +void rb_stdio_set_default_encoding(void); +VALUE rb_io_flush_raw(VALUE, int); +#ifdef RUBY_IO_H +size_t rb_io_memsize(const rb_io_t *); +#endif +int rb_stderr_tty_p(void); +void rb_io_fptr_finalize_internal(void *ptr); +#define rb_io_fptr_finalize rb_io_fptr_finalize_internal + +RUBY_SYMBOL_EXPORT_BEGIN +/* io.c (export) */ +void rb_maygvl_fd_fix_cloexec(int fd); +int rb_gc_for_fd(int err); +void rb_write_error_str(VALUE mesg); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_IO_H */ diff --git a/internal/load.h b/internal/load.h new file mode 100644 index 00000000000000..f4bf42cd28b8f8 --- /dev/null +++ b/internal/load.h @@ -0,0 +1,18 @@ +#ifndef INTERNAL_LOAD_H /* -*- C -*- */ +#define INTERNAL_LOAD_H +/** + * @file + * @brief Internal header for require. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* load.c */ +VALUE rb_get_expanded_load_path(void); +int rb_require_internal(VALUE fname); +NORETURN(void rb_load_fail(VALUE, const char*)); + +#endif /* INTERNAL_LOAD_H */ diff --git a/internal/loadpath.h b/internal/loadpath.h new file mode 100644 index 00000000000000..df8078924c5fd1 --- /dev/null +++ b/internal/loadpath.h @@ -0,0 +1,17 @@ +#ifndef INTERNAL_LOADPATH_H /* -*- C -*- */ +#define INTERNAL_LOADPATH_H +/** + * @file + * @brief Internal header for $LOAD_PATH. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* loadpath.c */ +extern const char ruby_exec_prefix[]; +extern const char ruby_initial_load_paths[]; + +#endif /* INTERNAL_LOADPATH_H */ diff --git a/internal/math.h b/internal/math.h new file mode 100644 index 00000000000000..51d398f61ed62f --- /dev/null +++ b/internal/math.h @@ -0,0 +1,23 @@ +#ifndef INTERNAL_MATH_H /* -*- C -*- */ +#define INTERNAL_MATH_H +/** + * @file + * @brief Internal header for Math. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* math.c */ +VALUE rb_math_atan2(VALUE, VALUE); +VALUE rb_math_cos(VALUE); +VALUE rb_math_cosh(VALUE); +VALUE rb_math_exp(VALUE); +VALUE rb_math_hypot(VALUE, VALUE); +VALUE rb_math_log(int argc, const VALUE *argv); +VALUE rb_math_sin(VALUE); +VALUE rb_math_sinh(VALUE); + +#endif /* INTERNAL_MATH_H */ diff --git a/internal/missing.h b/internal/missing.h new file mode 100644 index 00000000000000..c27999e3177469 --- /dev/null +++ b/internal/missing.h @@ -0,0 +1,18 @@ +#ifndef INTERNAL_MISSING_H /* -*- C -*- */ +#define INTERNAL_MISSING_H +/** + * @file + * @brief Internal header corresponding missing. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* missing/setproctitle.c */ +#ifndef HAVE_SETPROCTITLE +extern void ruby_init_setproctitle(int argc, char *argv[]); +#endif + +#endif /* INTERNAL_MISSING_H */ diff --git a/internal/mjit.h b/internal/mjit.h new file mode 100644 index 00000000000000..71d25e52ae3e8c --- /dev/null +++ b/internal/mjit.h @@ -0,0 +1,27 @@ +#ifndef INTERNAL_MJIT_H /* -*- C -*- */ +#define INTERNAL_MJIT_H +/** + * @file + * @brief Internal header for MJIT. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* mjit.c */ + +#if USE_MJIT +extern bool mjit_enabled; +VALUE mjit_pause(bool wait_p); +VALUE mjit_resume(void); +void mjit_finish(bool close_handle_p); +#else +#define mjit_enabled 0 +static inline VALUE mjit_pause(bool wait_p){ return Qnil; } // unreachable +static inline VALUE mjit_resume(void){ return Qnil; } // unreachable +static inline void mjit_finish(bool close_handle_p){} +#endif + +#endif /* INTERNAL_MJIT_H */ diff --git a/internal/numeric.h b/internal/numeric.h new file mode 100644 index 00000000000000..3e64b82dafcfee --- /dev/null +++ b/internal/numeric.h @@ -0,0 +1,213 @@ +#ifndef INTERNAL_NUMERIC_H /* -*- C -*- */ +#define INTERNAL_NUMERIC_H +/** + * @file + * @brief Internal header for Numeric. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct RFloat { + struct RBasic basic; + double float_value; +}; + +#define RFLOAT(obj) (R_CAST(RFloat)(obj)) + +/* numeric.c */ + +#define FIXNUM_POSITIVE_P(num) ((SIGNED_VALUE)(num) > (SIGNED_VALUE)INT2FIX(0)) +#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0) +#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0)) + +#define INT_NEGATIVE_P(x) (FIXNUM_P(x) ? FIXNUM_NEGATIVE_P(x) : BIGNUM_NEGATIVE_P(x)) + +#define FLOAT_ZERO_P(x) (RFLOAT_VALUE(x) == 0.0) + +#ifndef ROUND_DEFAULT +# define ROUND_DEFAULT RUBY_NUM_ROUND_HALF_UP +#endif +enum ruby_num_rounding_mode { + RUBY_NUM_ROUND_HALF_UP, + RUBY_NUM_ROUND_HALF_EVEN, + RUBY_NUM_ROUND_HALF_DOWN, + RUBY_NUM_ROUND_DEFAULT = ROUND_DEFAULT +}; +#define ROUND_TO(mode, even, up, down) \ + ((mode) == RUBY_NUM_ROUND_HALF_EVEN ? even : \ + (mode) == RUBY_NUM_ROUND_HALF_UP ? up : down) +#define ROUND_FUNC(mode, name) \ + ROUND_TO(mode, name##_half_even, name##_half_up, name##_half_down) +#define ROUND_CALL(mode, name, args) \ + ROUND_TO(mode, name##_half_even args, \ + name##_half_up args, name##_half_down args) + +int rb_num_to_uint(VALUE val, unsigned int *ret); +VALUE ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl); +double ruby_float_step_size(double beg, double end, double unit, int excl); +int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl, int allow_endless); +double ruby_float_mod(double x, double y); +int rb_num_negative_p(VALUE); +VALUE rb_int_succ(VALUE num); +VALUE rb_int_uminus(VALUE num); +VALUE rb_float_uminus(VALUE num); +VALUE rb_int_plus(VALUE x, VALUE y); +VALUE rb_float_plus(VALUE x, VALUE y); +VALUE rb_int_minus(VALUE x, VALUE y); +VALUE rb_int_mul(VALUE x, VALUE y); +VALUE rb_float_mul(VALUE x, VALUE y); +VALUE rb_float_div(VALUE x, VALUE y); +VALUE rb_int_idiv(VALUE x, VALUE y); +VALUE rb_int_modulo(VALUE x, VALUE y); +VALUE rb_int2str(VALUE num, int base); +VALUE rb_fix_plus(VALUE x, VALUE y); +VALUE rb_fix_aref(VALUE fix, VALUE idx); +VALUE rb_int_gt(VALUE x, VALUE y); +int rb_float_cmp(VALUE x, VALUE y); +VALUE rb_float_gt(VALUE x, VALUE y); +VALUE rb_int_ge(VALUE x, VALUE y); +enum ruby_num_rounding_mode rb_num_get_rounding_option(VALUE opts); +double rb_int_fdiv_double(VALUE x, VALUE y); +VALUE rb_int_pow(VALUE x, VALUE y); +VALUE rb_float_pow(VALUE x, VALUE y); +VALUE rb_int_cmp(VALUE x, VALUE y); +VALUE rb_int_equal(VALUE x, VALUE y); +VALUE rb_int_divmod(VALUE x, VALUE y); +VALUE rb_int_and(VALUE x, VALUE y); +VALUE rb_int_lshift(VALUE x, VALUE y); +VALUE rb_int_div(VALUE x, VALUE y); +VALUE rb_int_abs(VALUE num); +VALUE rb_int_odd_p(VALUE num); +int rb_int_positive_p(VALUE num); +int rb_int_negative_p(VALUE num); +VALUE rb_num_pow(VALUE x, VALUE y); +VALUE rb_float_ceil(VALUE num, int ndigits); + +RUBY_SYMBOL_EXPORT_BEGIN +/* numeric.c (export) */ +VALUE rb_int_positive_pow(long x, unsigned long y); +RUBY_SYMBOL_EXPORT_END + + +static inline VALUE +rb_num_compare_with_zero(VALUE num, ID mid) +{ + VALUE zero = INT2FIX(0); + VALUE r = rb_check_funcall(num, mid, 1, &zero); + if (r == Qundef) { + rb_cmperr(num, zero); + } + return r; +} + +static inline int +rb_num_positive_int_p(VALUE num) +{ + const ID mid = '>'; + + if (FIXNUM_P(num)) { + if (rb_method_basic_definition_p(rb_cInteger, mid)) + return FIXNUM_POSITIVE_P(num); + } + else if (RB_TYPE_P(num, T_BIGNUM)) { + if (rb_method_basic_definition_p(rb_cInteger, mid)) + return BIGNUM_POSITIVE_P(num); + } + return RTEST(rb_num_compare_with_zero(num, mid)); +} + + +static inline int +rb_num_negative_int_p(VALUE num) +{ + const ID mid = '<'; + + if (FIXNUM_P(num)) { + if (rb_method_basic_definition_p(rb_cInteger, mid)) + return FIXNUM_NEGATIVE_P(num); + } + else if (RB_TYPE_P(num, T_BIGNUM)) { + if (rb_method_basic_definition_p(rb_cInteger, mid)) + return BIGNUM_NEGATIVE_P(num); + } + return RTEST(rb_num_compare_with_zero(num, mid)); +} + + +VALUE rb_float_abs(VALUE flt); +VALUE rb_float_equal(VALUE x, VALUE y); +VALUE rb_float_eql(VALUE x, VALUE y); +VALUE rb_flo_div_flo(VALUE x, VALUE y); + +static inline double +rb_float_flonum_value(VALUE v) +{ +#if USE_FLONUM + if (v != (VALUE)0x8000000000000002) { /* LIKELY */ + union { + double d; + VALUE v; + } t; + + VALUE b63 = (v >> 63); + /* e: xx1... -> 011... */ + /* xx0... -> 100... */ + /* ^b63 */ + t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~(VALUE)0x03), 3); + return t.d; + } +#endif + return 0.0; +} + +static inline double +rb_float_noflonum_value(VALUE v) +{ + return ((struct RFloat *)v)->float_value; +} + +static inline double +rb_float_value_inline(VALUE v) +{ + if (FLONUM_P(v)) { + return rb_float_flonum_value(v); + } + return rb_float_noflonum_value(v); +} + +static inline VALUE +rb_float_new_inline(double d) +{ +#if USE_FLONUM + union { + double d; + VALUE v; + } t; + int bits; + + t.d = d; + bits = (int)((VALUE)(t.v >> 60) & 0x7); + /* bits contains 3 bits of b62..b60. */ + /* bits - 3 = */ + /* b011 -> b000 */ + /* b100 -> b001 */ + + if (t.v != 0x3000000000000000 /* 1.72723e-77 */ && + !((bits-3) & ~0x01)) { + return (RUBY_BIT_ROTL(t.v, 3) & ~(VALUE)0x01) | 0x02; + } + else if (t.v == (VALUE)0) { + /* +0.0 */ + return 0x8000000000000002; + } + /* out of range */ +#endif + return rb_float_new_in_heap(d); +} + +#define rb_float_value(v) rb_float_value_inline(v) +#define rb_float_new(d) rb_float_new_inline(d) +#endif /* INTERNAL_NUMERIC_H */ diff --git a/internal/object.h b/internal/object.h new file mode 100644 index 00000000000000..f67293769aece8 --- /dev/null +++ b/internal/object.h @@ -0,0 +1,45 @@ +#ifndef INTERNAL_OBJECT_H /* -*- C -*- */ +#define INTERNAL_OBJECT_H +/** + * @file + * @brief Internal header for Object. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + + +/* object.c */ +void rb_obj_copy_ivar(VALUE dest, VALUE obj); +CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2)); +CONSTFUNC(VALUE rb_obj_not(VALUE obj)); +VALUE rb_class_search_ancestor(VALUE klass, VALUE super); +NORETURN(void rb_undefined_alloc(VALUE klass)); +double rb_num_to_dbl(VALUE val); +VALUE rb_obj_dig(int argc, VALUE *argv, VALUE self, VALUE notfound); +VALUE rb_immutable_obj_clone(int, VALUE *, VALUE); +VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2); +VALUE rb_convert_type_with_id(VALUE,int,const char*,ID); +VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID); +int rb_bool_expected(VALUE, const char *); + +struct RBasicRaw { + VALUE flags; + VALUE klass; +}; + +#define RBASIC_CLEAR_CLASS(obj) memset(&(((struct RBasicRaw *)((VALUE)(obj)))->klass), 0, sizeof(VALUE)) +#define RBASIC_SET_CLASS_RAW(obj, cls) memcpy(&((struct RBasicRaw *)((VALUE)(obj)))->klass, &(cls), sizeof(VALUE)) +#define RBASIC_SET_CLASS(obj, cls) do { \ + VALUE _obj_ = (obj); \ + RB_OBJ_WRITE(_obj_, &((struct RBasicRaw *)(_obj_))->klass, cls); \ +} while (0) + +RUBY_SYMBOL_EXPORT_BEGIN +/* object.c (export) */ +int rb_opts_exception_p(VALUE opts, int default_value); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_OBJECT_H */ diff --git a/internal/parse.h b/internal/parse.h new file mode 100644 index 00000000000000..f70e8e75a34605 --- /dev/null +++ b/internal/parse.h @@ -0,0 +1,31 @@ +#ifndef INTERNAL_PARSE_H /* -*- C -*- */ +#define INTERNAL_PARSE_H +/** + * @file + * @brief Internal header for the parser. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* parse.y */ +#ifndef USE_SYMBOL_GC +#define USE_SYMBOL_GC 1 +#endif +VALUE rb_parser_set_yydebug(VALUE, VALUE); +RUBY_SYMBOL_EXPORT_BEGIN +VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int); +RUBY_SYMBOL_EXPORT_END +void *rb_parser_load_file(VALUE parser, VALUE name); +int rb_is_const_name(VALUE name); +int rb_is_class_name(VALUE name); +int rb_is_instance_name(VALUE name); +int rb_is_local_name(VALUE name); +PUREFUNC(int rb_is_const_sym(VALUE sym)); +PUREFUNC(int rb_is_attrset_sym(VALUE sym)); +ID rb_make_internal_id(void); +void rb_gc_free_dsymbol(VALUE); + +#endif /* INTERNAL_PARSE_H */ diff --git a/internal/proc.h b/internal/proc.h new file mode 100644 index 00000000000000..2831afc95c2643 --- /dev/null +++ b/internal/proc.h @@ -0,0 +1,24 @@ +#ifndef INTERNAL_PROC_H /* -*- C -*- */ +#define INTERNAL_PROC_H +/** + * @file + * @brief Internal header for Proc. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct rb_block; + +/* proc.c */ +VALUE rb_proc_location(VALUE self); +st_index_t rb_hash_proc(st_index_t hash, VALUE proc); +int rb_block_arity(void); +int rb_block_min_max_arity(int *max); +VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val); +VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc); +VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info); + +#endif /* INTERNAL_PROC_H */ diff --git a/internal/process.h b/internal/process.h new file mode 100644 index 00000000000000..8258f97f1b43fe --- /dev/null +++ b/internal/process.h @@ -0,0 +1,95 @@ +#ifndef INTERNAL_PROCESS_H /* -*- C -*- */ +#define INTERNAL_PROCESS_H +/** + * @file + * @brief Internal header for Process. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* process.c */ +#define RB_MAX_GROUPS (65536) + +struct waitpid_state; +struct rb_execarg { + union { + struct { + VALUE shell_script; + } sh; + struct { + VALUE command_name; + VALUE command_abspath; /* full path string or nil */ + VALUE argv_str; + VALUE argv_buf; + } cmd; + } invoke; + VALUE redirect_fds; + VALUE envp_str; + VALUE envp_buf; + VALUE dup2_tmpbuf; + unsigned use_shell : 1; + unsigned pgroup_given : 1; + unsigned umask_given : 1; + unsigned unsetenv_others_given : 1; + unsigned unsetenv_others_do : 1; + unsigned close_others_given : 1; + unsigned close_others_do : 1; + unsigned chdir_given : 1; + unsigned new_pgroup_given : 1; + unsigned new_pgroup_flag : 1; + unsigned uid_given : 1; + unsigned gid_given : 1; + unsigned exception : 1; + unsigned exception_given : 1; + struct waitpid_state *waitpid_state; /* for async process management */ + rb_pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0as.ary[0]) +#define RANGE_END(r) (RSTRUCT(r)->as.ary[1]) +#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2]) + +#endif /* INTERNAL_RANGE_H */ diff --git a/internal/rational.h b/internal/rational.h new file mode 100644 index 00000000000000..993d0569277039 --- /dev/null +++ b/internal/rational.h @@ -0,0 +1,47 @@ +#ifndef INTERNAL_RATIONAL_H /* -*- C -*- */ +#define INTERNAL_RATIONAL_H +/** + * @file + * @brief Internal header for Rational. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +struct RRational { + struct RBasic basic; + VALUE num; + VALUE den; +}; + +#define RRATIONAL(obj) (R_CAST(RRational)(obj)) +#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->num,(n)) +#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->den,(d)) + +/* rational.c */ +VALUE rb_rational_canonicalize(VALUE x); +VALUE rb_rational_uminus(VALUE self); +VALUE rb_rational_plus(VALUE self, VALUE other); +VALUE rb_rational_mul(VALUE self, VALUE other); +VALUE rb_lcm(VALUE x, VALUE y); +VALUE rb_rational_reciprocal(VALUE x); +VALUE rb_cstr_to_rat(const char *, int); +VALUE rb_rational_abs(VALUE self); +VALUE rb_rational_cmp(VALUE self, VALUE other); +VALUE rb_rational_pow(VALUE self, VALUE other); +VALUE rb_numeric_quo(VALUE x, VALUE y); +VALUE rb_float_numerator(VALUE x); +VALUE rb_float_denominator(VALUE x); + +RUBY_SYMBOL_EXPORT_BEGIN +/* rational.c (export) */ +VALUE rb_gcd(VALUE x, VALUE y); +VALUE rb_gcd_normal(VALUE self, VALUE other); +#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) +VALUE rb_gcd_gmp(VALUE x, VALUE y); +#endif +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_RATIONAL_H */ diff --git a/internal/re.h b/internal/re.h new file mode 100644 index 00000000000000..767603068407c4 --- /dev/null +++ b/internal/re.h @@ -0,0 +1,25 @@ +#ifndef INTERNAL_RE_H /* -*- C -*- */ +#define INTERNAL_RE_H +/** + * @file + * @brief Internal header for Regexp. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* re.c */ +VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline); +VALUE rb_reg_check_preprocess(VALUE); +long rb_reg_search0(VALUE, VALUE, long, int, int); +VALUE rb_reg_match_p(VALUE re, VALUE str, long pos); +bool rb_reg_start_with_p(VALUE re, VALUE str); +void rb_backref_set_string(VALUE string, long pos, long len); +void rb_match_unbusy(VALUE); +int rb_match_count(VALUE match); +int rb_match_nth_defined(int nth, VALUE match); +VALUE rb_reg_new_ary(VALUE ary, int options); + +#endif /* INTERNAL_RE_H */ diff --git a/internal/sanitizers.h b/internal/sanitizers.h new file mode 100644 index 00000000000000..4c6ad28e718f72 --- /dev/null +++ b/internal/sanitizers.h @@ -0,0 +1,179 @@ +#ifndef INTERNAL_SANITIZERS_H /* -*- C -*- */ +#define INTERNAL_SANITIZERS_H +/** + * @file + * @brief Internal header for ASAN / MSAN / etc. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + + +#if 0 +#elif defined(NO_SANITIZE) && __has_feature(memory_sanitizer) +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ + NO_SANITIZE("memory", NO_SANITIZE("address", NOINLINE(x))) +#elif defined(NO_SANITIZE) +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ + NO_SANITIZE("address", NOINLINE(x)) +#elif defined(NO_SANITIZE_ADDRESS) +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ + NO_SANITIZE_ADDRESS(NOINLINE(x)) +#elif defined(NO_ADDRESS_SAFETY_ANALYSIS) +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ + NO_ADDRESS_SAFETY_ANALYSIS(NOINLINE(x)) +#else +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) x +#endif + +#if defined(NO_SANITIZE) && defined(__GNUC__) &&! defined(__clang__) +/* GCC warns about unknown sanitizer, which is annoying. */ +#undef NO_SANITIZE +#define NO_SANITIZE(x, y) \ + COMPILER_WARNING_PUSH; \ + COMPILER_WARNING_IGNORED(-Wattributes); \ + __attribute__((__no_sanitize__(x))) y; \ + COMPILER_WARNING_POP +#endif + +#ifndef NO_SANITIZE +# define NO_SANITIZE(x, y) y +#endif + +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include +# ifndef VALGRIND_MAKE_MEM_DEFINED +# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) +# endif +# ifndef VALGRIND_MAKE_MEM_UNDEFINED +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) +# endif +#else +# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 +#endif + +#ifndef MJIT_HEADER + +#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H +# include +#endif + +#if !__has_feature(address_sanitizer) +# define __asan_poison_memory_region(x, y) +# define __asan_unpoison_memory_region(x, y) +# define __asan_region_is_poisoned(x, y) 0 +#endif + +#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H +# if __has_feature(memory_sanitizer) +# include +# endif +#endif + +#if !__has_feature(memory_sanitizer) +# define __msan_allocated_memory(x, y) ((void)(x), (void)(y)) +# define __msan_poison(x, y) ((void)(x), (void)(y)) +# define __msan_unpoison(x, y) ((void)(x), (void)(y)) +# define __msan_unpoison_string(x) ((void)(x)) +#endif + +/*! + * This function asserts that a (continuous) memory region from ptr to size + * being "poisoned". Both read / write access to such memory region are + * prohibited until properly unpoisoned. The region must be previously + * allocated (do not pass a freed pointer here), but not necessarily be an + * entire object that the malloc returns. You can punch hole a part of a + * gigantic heap arena. This is handy when you do not free an allocated memory + * region to reuse later: poison when you keep it unused, and unpoison when you + * reuse. + * + * \param[in] ptr pointer to the beginning of the memory region to poison. + * \param[in] size the length of the memory region to poison. + */ +static inline void +asan_poison_memory_region(const volatile void *ptr, size_t size) +{ + __msan_poison(ptr, size); + __asan_poison_memory_region(ptr, size); +} + +/*! + * This is a variant of asan_poison_memory_region that takes a VALUE. + * + * \param[in] obj target object. + */ +static inline void +asan_poison_object(VALUE obj) +{ + MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; + asan_poison_memory_region(ptr, SIZEOF_VALUE); +} + +#if !__has_feature(address_sanitizer) +#define asan_poison_object_if(ptr, obj) ((void)(ptr), (void)(obj)) +#else +#define asan_poison_object_if(ptr, obj) do { \ + if (ptr) asan_poison_object(obj); \ + } while (0) +#endif + +/*! + * This function predicates if the given object is fully addressable or not. + * + * \param[in] obj target object. + * \retval 0 the given object is fully addressable. + * \retval otherwise pointer to first such byte who is poisoned. + */ +static inline void * +asan_poisoned_object_p(VALUE obj) +{ + MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; + return __asan_region_is_poisoned(ptr, SIZEOF_VALUE); +} + +/*! + * This function asserts that a (formally poisoned) memory region from ptr to + * size is now addressable. Write access to such memory region gets allowed. + * However read access might or might not be possible depending on situations, + * because the region can have contents of previous usages. That information + * should be passed by the malloc_p flag. If that is true, the contents of the + * region is _not_ fully defined (like the return value of malloc behaves). + * Reading from there is NG; write something first. If malloc_p is false on + * the other hand, that memory region is fully defined and can be read + * immediately. + * + * \param[in] ptr pointer to the beginning of the memory region to unpoison. + * \param[in] size the length of the memory region. + * \param[in] malloc_p if the memory region is like a malloc's return value or not. + */ +static inline void +asan_unpoison_memory_region(const volatile void *ptr, size_t size, bool malloc_p) +{ + __asan_unpoison_memory_region(ptr, size); + if (malloc_p) { + __msan_allocated_memory(ptr, size); + } + else { + __msan_unpoison(ptr, size); + } +} + +/*! + * This is a variant of asan_unpoison_memory_region that takes a VALUE. + * + * \param[in] obj target object. + * \param[in] malloc_p if the memory region is like a malloc's return value or not. + */ +static inline void +asan_unpoison_object(VALUE obj, bool newobj_p) +{ + MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj; + asan_unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p); +} + +#endif + +#endif /* INTERNAL_SANITIZERS_H */ diff --git a/internal/serial.h b/internal/serial.h new file mode 100644 index 00000000000000..224ab47ac6266d --- /dev/null +++ b/internal/serial.h @@ -0,0 +1,30 @@ +#ifndef INTERNAL_SERIAL_H /* -*- C -*- */ +#define INTERNAL_SERIAL_H +/** + * @file + * @brief Internal header for rb_serial_t. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#if defined(HAVE_LONG_LONG) +typedef unsigned LONG_LONG rb_serial_t; +# define SERIALT2NUM ULL2NUM +# define PRI_SERIALT_PREFIX PRI_LL_PREFIX +# define SIZEOF_SERIAL_T SIZEOF_LONG_LONG +#elif defined(HAVE_UINT64_T) +typedef uint64_t rb_serial_t; +# define SERIALT2NUM SIZET2NUM +# define PRI_SERIALT_PREFIX PRI_64_PREFIX +# define SIZEOF_SERIAL_T SIZEOF_UINT64_T +#else +typedef unsigned long rb_serial_t; +# define SERIALT2NUM ULONG2NUM +# define PRI_SERIALT_PREFIX PRI_LONG_PREFIX +# define SIZEOF_SERIAL_T SIZEOF_LONG +#endif + +#endif /* INTERNAL_SERIAL_H */ diff --git a/internal/signal.h b/internal/signal.h new file mode 100644 index 00000000000000..0d501f7895eb78 --- /dev/null +++ b/internal/signal.h @@ -0,0 +1,22 @@ +#ifndef INTERNAL_SIGNAL_H /* -*- C -*- */ +#define INTERNAL_SIGNAL_H +/** + * @file + * @brief Internal header for SignalException. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* signal.c */ +extern int ruby_enable_coredump; +int rb_get_next_signal(void); + +RUBY_SYMBOL_EXPORT_BEGIN +/* signal.c (export) */ +int rb_grantpt(int fd); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_SIGNAL_H */ diff --git a/internal/static_assert.h b/internal/static_assert.h new file mode 100644 index 00000000000000..05b79b4ba319bf --- /dev/null +++ b/internal/static_assert.h @@ -0,0 +1,21 @@ +#ifndef INTERNAL_STATIC_ASSERT_H /* -*- C -*- */ +#define INTERNAL_STATIC_ASSERT_H +/** + * @file + * @brief C11 shim for _Static_assert. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) +# define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr) +#elif GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert) +# define STATIC_ASSERT(name, expr) RB_GNUC_EXTENSION _Static_assert(expr, #name ": " #expr) +#else +# define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)] +#endif + +#endif /* INTERNAL_STATIC_ASSERT_H */ diff --git a/internal/stdbool.h b/internal/stdbool.h new file mode 100644 index 00000000000000..4c103b43ce447a --- /dev/null +++ b/internal/stdbool.h @@ -0,0 +1,20 @@ +#ifndef INTERNAL_STDBOOL_H /* -*- C -*- */ +#define INTERNAL_STDBOOL_H +/** + * @file + * @brief Thin wrapper to + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ +#include "ruby/config.h" /* for HAVE_STDBOOL_H */ + +#ifdef HAVE_STDBOOL_H +# include +#else +# include "missing/stdbool.h" +#endif + +#endif /* INTERNAL_STDBOOL_H */ diff --git a/internal/string.h b/internal/string.h new file mode 100644 index 00000000000000..21354900298b6b --- /dev/null +++ b/internal/string.h @@ -0,0 +1,92 @@ +#ifndef INTERNAL_STRING_H /* -*- C -*- */ +#define INTERNAL_STRING_H +/** + * @file + * @brief Internal header for String. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + + +/* string.c */ +VALUE rb_fstring(VALUE); +VALUE rb_fstring_new(const char *ptr, long len); +#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str)) +#define rb_fstring_literal(str) rb_fstring_lit(str) +VALUE rb_fstring_cstr(const char *str); +#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P +# define rb_fstring_cstr(str) RB_GNUC_EXTENSION_BLOCK( \ + (__builtin_constant_p(str)) ? \ + rb_fstring_new((str), (long)strlen(str)) : \ + rb_fstring_cstr(str) \ +) +#endif +#ifdef RUBY_ENCODING_H +VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc); +#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) +#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) +#endif +int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p); +int rb_str_symname_p(VALUE); +VALUE rb_str_quote_unprintable(VALUE); +VALUE rb_id_quote_unprintable(ID); +#define QUOTE(str) rb_str_quote_unprintable(str) +#define QUOTE_ID(id) rb_id_quote_unprintable(id) +char *rb_str_fill_terminator(VALUE str, const int termlen); +void rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int termlen); +VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg); +VALUE rb_str_chomp_string(VALUE str, VALUE chomp); +#ifdef RUBY_ENCODING_H +VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc); +VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len, + rb_encoding *from, int ecflags, VALUE ecopts); +VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl); +VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc); +#endif +#define STR_NOEMBED FL_USER1 +#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ +#define STR_EMBED_P(str) (!FL_TEST_RAW((str), STR_NOEMBED)) +#define STR_SHARED_P(s) FL_ALL_RAW((s), STR_NOEMBED|ELTS_SHARED) +#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) +#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) +size_t rb_str_memsize(VALUE); +VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc); +VALUE rb_sym_to_proc(VALUE sym); +char *rb_str_to_cstr(VALUE str); +VALUE rb_str_eql(VALUE str1, VALUE str2); +VALUE rb_obj_as_string_result(VALUE str, VALUE obj); +const char *ruby_escaped_char(int c); +VALUE rb_str_opt_plus(VALUE, VALUE); + +/* expect tail call optimization */ +static inline VALUE +rb_str_eql_internal(const VALUE str1, const VALUE str2) +{ + const long len = RSTRING_LEN(str1); + const char *ptr1, *ptr2; + + if (len != RSTRING_LEN(str2)) return Qfalse; + if (!rb_str_comparable(str1, str2)) return Qfalse; + if ((ptr1 = RSTRING_PTR(str1)) == (ptr2 = RSTRING_PTR(str2))) + return Qtrue; + if (memcmp(ptr1, ptr2, len) == 0) + return Qtrue; + return Qfalse; +} + +RUBY_SYMBOL_EXPORT_BEGIN +/* string.c (export) */ +VALUE rb_str_tmp_frozen_acquire(VALUE str); +void rb_str_tmp_frozen_release(VALUE str, VALUE tmp); +#ifdef RUBY_ENCODING_H +/* internal use */ +VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc); +#endif +VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE); +VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_STRING_H */ diff --git a/internal/struct.h b/internal/struct.h new file mode 100644 index 00000000000000..f63b45007e2b68 --- /dev/null +++ b/internal/struct.h @@ -0,0 +1,88 @@ +#ifndef INTERNAL_STRUCT_H /* -*- C -*- */ +#define INTERNAL_STRUCT_H +/** + * @file + * @brief Internal header for Struct. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#define RSTRUCT_EMBED_LEN_MAX RSTRUCT_EMBED_LEN_MAX +#define RSTRUCT_EMBED_LEN_MASK RSTRUCT_EMBED_LEN_MASK +#define RSTRUCT_EMBED_LEN_SHIFT RSTRUCT_EMBED_LEN_SHIFT + +enum { + RSTRUCT_EMBED_LEN_MAX = RVALUE_EMBED_LEN_MAX, + RSTRUCT_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER1), + RSTRUCT_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+1), + RSTRUCT_TRANSIENT_FLAG = FL_USER3, + + RSTRUCT_ENUM_END +}; + +#if USE_TRANSIENT_HEAP +#define RSTRUCT_TRANSIENT_P(st) FL_TEST_RAW((obj), RSTRUCT_TRANSIENT_FLAG) +#define RSTRUCT_TRANSIENT_SET(st) FL_SET_RAW((st), RSTRUCT_TRANSIENT_FLAG) +#define RSTRUCT_TRANSIENT_UNSET(st) FL_UNSET_RAW((st), RSTRUCT_TRANSIENT_FLAG) +#else +#define RSTRUCT_TRANSIENT_P(st) 0 +#define RSTRUCT_TRANSIENT_SET(st) ((void)0) +#define RSTRUCT_TRANSIENT_UNSET(st) ((void)0) +#endif + +struct RStruct { + struct RBasic basic; + union { + struct { + long len; + const VALUE *ptr; + } heap; + const VALUE ary[RSTRUCT_EMBED_LEN_MAX]; + } as; +}; + +#undef RSTRUCT_LEN +#undef RSTRUCT_PTR +#undef RSTRUCT_SET +#undef RSTRUCT_GET +#define RSTRUCT_EMBED_LEN(st) \ + (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \ + (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) +#define RSTRUCT_LEN(st) rb_struct_len(st) +#define RSTRUCT_LENINT(st) rb_long2int(RSTRUCT_LEN(st)) +#define RSTRUCT_CONST_PTR(st) rb_struct_const_ptr(st) +#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_CONST_PTR(RB_OBJ_WB_UNPROTECT_FOR(STRUCT, st))) +#define RSTRUCT_SET(st, idx, v) RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[idx], (v)) +#define RSTRUCT_GET(st, idx) (RSTRUCT_CONST_PTR(st)[idx]) +#define RSTRUCT(obj) (R_CAST(RStruct)(obj)) + +/* struct.c */ +VALUE rb_struct_init_copy(VALUE copy, VALUE s); +VALUE rb_struct_lookup(VALUE s, VALUE idx); +VALUE rb_struct_s_keyword_init(VALUE klass); + +static inline long +rb_struct_len(VALUE st) +{ + return (RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? + RSTRUCT_EMBED_LEN(st) : RSTRUCT(st)->as.heap.len; +} + +static inline const VALUE * +rb_struct_const_ptr(VALUE st) +{ + return FIX_CONST_VALUE_PTR((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? + RSTRUCT(st)->as.ary : RSTRUCT(st)->as.heap.ptr); +} + +static inline const VALUE * +rb_struct_const_heap_ptr(VALUE st) +{ + /* TODO: check embed on debug mode */ + return RSTRUCT(st)->as.heap.ptr; +} + +#endif /* INTERNAL_STRUCT_H */ diff --git a/internal/symbol.h b/internal/symbol.h new file mode 100644 index 00000000000000..8423cb4dc8eeda --- /dev/null +++ b/internal/symbol.h @@ -0,0 +1,29 @@ +#ifndef INTERNAL_SYMBOL_H /* -*- C -*- */ +#define INTERNAL_SYMBOL_H +/** + * @file + * @brief Internal header for Symbol. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* symbol.c */ +#ifdef RUBY_ENCODING_H +VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc); +#endif +VALUE rb_sym_intern_ascii(const char *ptr, long len); +VALUE rb_sym_intern_ascii_cstr(const char *ptr); +#ifdef __GNUC__ +#define rb_sym_intern_ascii_cstr(ptr) __extension__ ( \ +{ \ + (__builtin_constant_p(ptr)) ? \ + rb_sym_intern_ascii((ptr), (long)strlen(ptr)) : \ + rb_sym_intern_ascii_cstr(ptr); \ +}) +#endif +VALUE rb_to_symbol_type(VALUE obj); + +#endif /* INTERNAL_SYMBOL_H */ diff --git a/internal/thread.h b/internal/thread.h new file mode 100644 index 00000000000000..568351e6cbf246 --- /dev/null +++ b/internal/thread.h @@ -0,0 +1,44 @@ +#ifndef INTERNAL_THREAD_H /* -*- C -*- */ +#define INTERNAL_THREAD_H +/** + * @file + * @brief Internal header for Thread. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* thread.c */ +#define COVERAGE_INDEX_LINES 0 +#define COVERAGE_INDEX_BRANCHES 1 +#define COVERAGE_TARGET_LINES 1 +#define COVERAGE_TARGET_BRANCHES 2 +#define COVERAGE_TARGET_METHODS 4 +#define COVERAGE_TARGET_ONESHOT_LINES 8 + +VALUE rb_obj_is_mutex(VALUE obj); +VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg); +void rb_thread_execute_interrupts(VALUE th); +VALUE rb_get_coverages(void); +int rb_get_coverage_mode(void); +VALUE rb_default_coverage(int); +VALUE rb_thread_shield_new(void); +VALUE rb_thread_shield_wait(VALUE self); +VALUE rb_thread_shield_release(VALUE self); +VALUE rb_thread_shield_destroy(VALUE self); +int rb_thread_to_be_killed(VALUE thread); +void rb_mutex_allow_trap(VALUE self, int val); +VALUE rb_uninterruptible(VALUE (*b_proc)(VALUE), VALUE data); +VALUE rb_mutex_owned_p(VALUE self); + +RUBY_SYMBOL_EXPORT_BEGIN +/* Temporary. This API will be removed (renamed). */ +VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd); + +/* thread.c (export) */ +int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */ +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_THREAD_H */ diff --git a/internal/time.h b/internal/time.h new file mode 100644 index 00000000000000..b20f24e1cfc865 --- /dev/null +++ b/internal/time.h @@ -0,0 +1,30 @@ +#ifndef INTERNAL_TIME_H /* -*- C -*- */ +#define INTERNAL_TIME_H +/** + * @file + * @brief Internal header for Time. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#if SIGNEDNESS_OF_TIME_T < 0 /* signed */ +# define TIMET_MAX SIGNED_INTEGER_MAX(time_t) +# define TIMET_MIN SIGNED_INTEGER_MIN(time_t) +#elif SIGNEDNESS_OF_TIME_T > 0 /* unsigned */ +# define TIMET_MAX UNSIGNED_INTEGER_MAX(time_t) +# define TIMET_MIN ((time_t)0) +#endif +#define TIMET_MAX_PLUS_ONE (2*(double)(TIMET_MAX/2+1)) + +/* time.c */ +struct timeval rb_time_timeval(VALUE); + +RUBY_SYMBOL_EXPORT_BEGIN +/* time.c (export) */ +void ruby_reset_leap_second_info(void); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_TIME_H */ diff --git a/internal/transcode.h b/internal/transcode.h new file mode 100644 index 00000000000000..798c9265c2a49b --- /dev/null +++ b/internal/transcode.h @@ -0,0 +1,19 @@ +#ifndef INTERNAL_TRANSCODE_H /* -*- C -*- */ +#define INTERNAL_TRANSCODE_H +/** + * @file + * @brief Internal header for Encoding::Converter. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* transcode.c */ +extern VALUE rb_cEncodingConverter; +#ifdef RUBY_ENCODING_H +size_t rb_econv_memsize(rb_econv_t *); +#endif + +#endif /* INTERNAL_TRANSCODE_H */ diff --git a/internal/util.h b/internal/util.h new file mode 100644 index 00000000000000..c1ba2a4323c35c --- /dev/null +++ b/internal/util.h @@ -0,0 +1,25 @@ +#ifndef INTERNAL_UTIL_H /* -*- C -*- */ +#define INTERNAL_UTIL_H +/** + * @file + * @brief Internal header corresponding util.c. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + * @warning DO NOT ADD RANDOM GARBAGE HERE THIS FILE IS FOR util.c + */ + +/* util.c */ +char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve); +char *ruby_hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve); + +RUBY_SYMBOL_EXPORT_BEGIN +/* util.c (export) */ +extern const signed char ruby_digit36_to_number_table[]; +extern const char ruby_hexdigits[]; +extern unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_UTIL_H */ diff --git a/internal/variable.h b/internal/variable.h new file mode 100644 index 00000000000000..1de31f6b9212e3 --- /dev/null +++ b/internal/variable.h @@ -0,0 +1,59 @@ +#ifndef INTERNAL_VARIABLE_H /* -*- C -*- */ +#define INTERNAL_VARIABLE_H +/** + * @file + * @brief Internal header for variables. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* global variable */ + +struct rb_global_entry { + struct rb_global_variable *var; + ID id; +}; + +struct rb_global_entry *rb_global_entry(ID); +VALUE rb_gvar_get(struct rb_global_entry *); +VALUE rb_gvar_set(struct rb_global_entry *, VALUE); +VALUE rb_gvar_defined(struct rb_global_entry *); + +/* variable.c */ +#if USE_TRANSIENT_HEAP +#define ROBJECT_TRANSIENT_FLAG FL_USER13 +#define ROBJ_TRANSIENT_P(obj) FL_TEST_RAW((obj), ROBJECT_TRANSIENT_FLAG) +#define ROBJ_TRANSIENT_SET(obj) FL_SET_RAW((obj), ROBJECT_TRANSIENT_FLAG) +#define ROBJ_TRANSIENT_UNSET(obj) FL_UNSET_RAW((obj), ROBJECT_TRANSIENT_FLAG) +#else +#define ROBJ_TRANSIENT_P(obj) 0 +#define ROBJ_TRANSIENT_SET(obj) ((void)0) +#define ROBJ_TRANSIENT_UNSET(obj) ((void)0) +#endif +void rb_gc_mark_global_tbl(void); +size_t rb_generic_ivar_memsize(VALUE); +VALUE rb_search_class_path(VALUE); +VALUE rb_attr_delete(VALUE, ID); +VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef); +void rb_autoload_str(VALUE mod, ID id, VALUE file); +VALUE rb_autoload_at_p(VALUE, ID, int); +void rb_deprecate_constant(VALUE mod, const char *name); +NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE)); +rb_gvar_getter_t *rb_gvar_getter_function_of(const struct rb_global_entry *); +rb_gvar_setter_t *rb_gvar_setter_function_of(const struct rb_global_entry *); +bool rb_gvar_is_traced(const struct rb_global_entry *); +void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_); + +RUBY_SYMBOL_EXPORT_BEGIN +/* variable.c (export) */ +void rb_mark_generic_ivar(VALUE); +void rb_mv_generic_ivar(VALUE src, VALUE dst); +VALUE rb_const_missing(VALUE klass, VALUE name); +int rb_class_ivar_set(VALUE klass, ID vid, VALUE value); +void rb_iv_tbl_copy(VALUE dst, VALUE src); +RUBY_SYMBOL_EXPORT_END + +#endif /* INTERNAL_VARIABLE_H */ diff --git a/internal/vm.h b/internal/vm.h new file mode 100644 index 00000000000000..e74b5c9a86bfd7 --- /dev/null +++ b/internal/vm.h @@ -0,0 +1,166 @@ +#ifndef INTERNAL_VM_H /* -*- C -*- */ +#define INTERNAL_VM_H +/** + * @file + * @brief Internal header for RubyVM. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +/* vm_insnhelper.h */ +rb_serial_t rb_next_class_serial(void); + +/* vm.c */ +VALUE rb_obj_is_thread(VALUE obj); +void rb_vm_mark(void *ptr); +PUREFUNC(VALUE rb_vm_top_self(void)); +void rb_vm_inc_const_missing_count(void); +const void **rb_vm_get_insns_address_table(void); +VALUE rb_source_location(int *pline); +const char *rb_source_location_cstr(int *pline); +MJIT_STATIC void rb_vm_pop_cfunc_frame(void); +int rb_vm_add_root_module(ID id, VALUE module); +void rb_vm_check_redefinition_by_prepend(VALUE klass); +int rb_vm_check_optimizable_mid(VALUE mid); +VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements); +MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE); +PUREFUNC(st_table *rb_vm_fstring_table(void)); + +/* vm_eval.c */ +VALUE rb_adjust_argv_kw_splat(int *, const VALUE **, int *); +VALUE rb_current_realfilepath(void); +VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE); +typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); +VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, + rb_check_funcall_hook *hook, VALUE arg); +VALUE rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, + rb_check_funcall_hook *hook, VALUE arg, int kw_splat); +const char *rb_type_str(enum ruby_value_type type); +VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE); +VALUE rb_yield_1(VALUE val); +VALUE rb_yield_force_blockarg(VALUE values); +VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv, + rb_block_call_func_t bl_proc, int min_argc, int max_argc, + VALUE data2); + +/* vm_insnhelper.c */ +VALUE rb_equal_opt(VALUE obj1, VALUE obj2); +VALUE rb_eql_opt(VALUE obj1, VALUE obj2); + +/* vm_method.c */ +enum method_missing_reason { + MISSING_NOENTRY = 0x00, + MISSING_PRIVATE = 0x01, + MISSING_PROTECTED = 0x02, + MISSING_FCALL = 0x04, + MISSING_VCALL = 0x08, + MISSING_SUPER = 0x10, + MISSING_MISSING = 0x20, + MISSING_NONE = 0x40 +}; +struct rb_callable_method_entry_struct; +struct rb_method_definition_struct; +struct rb_execution_context_struct; +struct rb_control_frame_struct; +struct rb_calling_info; +struct rb_call_data; +/* I have several reasons to chose 64 here: + * + * - A cache line must be a power-of-two size. + * - Setting this to anything less than or equal to 32 boosts nothing. + * - I have never seen an architecture that has 128 byte L1 cache line. + * - I know Intel Core and Sparc T4 at least uses 64. + * - I know jemalloc internally has this exact same `#define CACHE_LINE 64`. + * https://github.com/jemalloc/jemalloc/blob/dev/include/jemalloc/internal/jemalloc_internal_types.h + */ +#define CACHELINE 64 +struct rb_call_cache { + /* inline cache: keys */ + rb_serial_t method_state; + rb_serial_t class_serial[ + (CACHELINE + - sizeof(rb_serial_t) /* method_state */ + - sizeof(struct rb_callable_method_entry_struct *) /* me */ + - sizeof(uintptr_t) /* method_serial */ + - sizeof(enum method_missing_reason) /* aux */ + - sizeof(VALUE (*)( /* call */ + struct rb_execution_context_struct *e, + struct rb_control_frame_struct *, + struct rb_calling_info *, + const struct rb_call_data *))) + / sizeof(rb_serial_t) + ]; + + /* inline cache: values */ + const struct rb_callable_method_entry_struct *me; + uintptr_t method_serial; /* me->def->method_serial */ + + VALUE (*call)(struct rb_execution_context_struct *ec, + struct rb_control_frame_struct *cfp, + struct rb_calling_info *calling, + struct rb_call_data *cd); + + union { + unsigned int index; /* used by ivar */ + enum method_missing_reason method_missing_reason; /* used by method_missing */ + } aux; +}; +STATIC_ASSERT(cachelined, sizeof(struct rb_call_cache) <= CACHELINE); +struct rb_call_info { + /* fixed at compile time */ + ID mid; + unsigned int flag; + int orig_argc; +}; +struct rb_call_data { + struct rb_call_cache cc; + struct rb_call_info ci; +}; +RUBY_FUNC_EXPORTED +RUBY_FUNC_NONNULL(1, VALUE rb_funcallv_with_cc(struct rb_call_data*, VALUE, ID, int, const VALUE*)); +RUBY_FUNC_EXPORTED +RUBY_FUNC_NONNULL(1, bool rb_method_basic_definition_p_with_cc(struct rb_call_data *, VALUE, ID)); + +#ifdef __GNUC__ +# define rb_funcallv(recv, mid, argc, argv) \ + __extension__({ \ + static struct rb_call_data rb_funcallv_data; \ + rb_funcallv_with_cc(&rb_funcallv_data, recv, mid, argc, argv); \ + }) +# define rb_method_basic_definition_p(klass, mid) \ + __extension__({ \ + static struct rb_call_data rb_mbdp; \ + (klass == Qfalse) ? /* hidden object cannot be overridden */ true : \ + rb_method_basic_definition_p_with_cc(&rb_mbdp, klass, mid); \ + }) +#endif + +/* vm_dump.c */ +void rb_print_backtrace(void); + +/* vm_backtrace.c */ +VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval); +VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval); + +VALUE rb_make_backtrace(void); +void rb_backtrace_print_as_bugreport(void); +int rb_backtrace_p(VALUE obj); +VALUE rb_backtrace_to_str_ary(VALUE obj); +VALUE rb_backtrace_to_location_ary(VALUE obj); +void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output); + +#define RUBY_DTRACE_CREATE_HOOK(name, arg) \ + RUBY_DTRACE_HOOK(name##_CREATE, arg) +#define RUBY_DTRACE_HOOK(name, arg) \ +do { \ + if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \ + int dtrace_line; \ + const char *dtrace_file = rb_source_location_cstr(&dtrace_line); \ + if (!dtrace_file) dtrace_file = ""; \ + RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \ + } \ +} while (0) +#endif /* INTERNAL_VM_H */ diff --git a/internal/warnings.h b/internal/warnings.h new file mode 100644 index 00000000000000..957583968dbfd4 --- /dev/null +++ b/internal/warnings.h @@ -0,0 +1,50 @@ +#ifndef INTERNAL_WARNINGS_H /* -*- C -*- */ +#define INTERNAL_WARNINGS_H +/** + * @file + * @brief Internal header to suppress / mandate warnings. + * @author \@shyouhei + * @copyright This file is a part of the programming language Ruby. + * Permission is hereby granted, to either redistribute and/or + * modify this file, provided that the conditions mentioned in the + * file COPYING are met. Consult the file for details. + */ + +#if defined(_MSC_VER) +# define COMPILER_WARNING_PUSH __pragma(warning(push)) +# define COMPILER_WARNING_POP __pragma(warning(pop)) +# define COMPILER_WARNING_ERROR(flag) __pragma(warning(error: flag))) +# define COMPILER_WARNING_IGNORED(flag) __pragma(warning(suppress: flag))) + +#elif defined(__clang__) /* clang 2.6 already had this feature */ +# define COMPILER_WARNING_PUSH _Pragma("clang diagnostic push") +# define COMPILER_WARNING_POP _Pragma("clang diagnostic pop") +# define COMPILER_WARNING_SPECIFIER(kind, msg) \ + clang diagnostic kind # msg +# define COMPILER_WARNING_ERROR(flag) \ + COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) +# define COMPILER_WARNING_IGNORED(flag) \ + COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) + +#elif GCC_VERSION_SINCE(4, 6, 0) +/* https://gcc.gnu.org/onlinedocs/gcc-4.6.4/gcc/Diagnostic-Pragmas.html */ +# define COMPILER_WARNING_PUSH _Pragma("GCC diagnostic push") +# define COMPILER_WARNING_POP _Pragma("GCC diagnostic pop") +# define COMPILER_WARNING_SPECIFIER(kind, msg) \ + GCC diagnostic kind # msg +# define COMPILER_WARNING_ERROR(flag) \ + COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) +# define COMPILER_WARNING_IGNORED(flag) \ + COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) + +#else /* other compilers to follow? */ +# define COMPILER_WARNING_PUSH /* nop */ +# define COMPILER_WARNING_POP /* nop */ +# define COMPILER_WARNING_ERROR(flag) /* nop */ +# define COMPILER_WARNING_IGNORED(flag) /* nop */ +#endif + +#define COMPILER_WARNING_PRAGMA(str) COMPILER_WARNING_PRAGMA_(str) +#define COMPILER_WARNING_PRAGMA_(str) _Pragma(#str) + +#endif /* INTERNAL_WARNINGS_H */ From 1dd149d3b1e46f21b0c358fdf205e97ac009bb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 10:55:55 +0900 Subject: [PATCH 172/878] re-add io.h and encoding.h into internal.h This is tentative. For the sake of simplicity we partially revert commits e9cb552ec96, ee85a6e72b and 51edb300425. Will decouple them once again when we are ready. --- include/ruby/encoding.h | 4 ---- include/ruby/io.h | 4 ---- internal.h | 2 ++ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 93939ee7db0164..7ba79742650301 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -12,10 +12,6 @@ #ifndef RUBY_ENCODING_H #define RUBY_ENCODING_H 1 -#ifdef RUBY_INTERNAL_H -#error "Include this file before internal.h" -#endif - #if defined(__cplusplus) extern "C" { #if 0 diff --git a/include/ruby/io.h b/include/ruby/io.h index 152f4ef7637ffc..7d7b1a0f014721 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -12,10 +12,6 @@ #ifndef RUBY_IO_H #define RUBY_IO_H 1 -#ifdef RUBY_INTERNAL_H -#error "Include this file before internal.h" -#endif - #if defined(__cplusplus) extern "C" { #if 0 diff --git a/internal.h b/internal.h index 853274ec4a315a..5b7f87ae8d633a 100644 --- a/internal.h +++ b/internal.h @@ -21,6 +21,8 @@ extern "C" { #endif #endif +#include "ruby/encoding.h" +#include "ruby/io.h" #include "internal/stdbool.h" #include "internal/bits.h" From 863dbb21d8912c73e84fed47f2d3a1ac5d8275d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 14:48:42 +0900 Subject: [PATCH 173/878] assume C99 Now that we no longer support old compilers, we can safely delete several obsolete #ifdef gurads. Also because (as of writing) it is impossible to compile the program using C++ compilers, lets just entirely prohibit __cplusplus to reduce # of LOCs. Note however that we still cannot eliminate __STDC_VERSION__ checks, because MSVC does not define it, saying its C99 support is partial. See also https://social.msdn.microsoft.com/Forums/vstudio/en-US/53a4fd75-9f97-48b2-aa63-2e2e5a15efa3 --- internal.h | 15 +++------------ internal/serial.h | 22 +++++++--------------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/internal.h b/internal.h index 5b7f87ae8d633a..337aee814d8f32 100644 --- a/internal.h +++ b/internal.h @@ -12,13 +12,10 @@ #ifndef RUBY_INTERNAL_H #define RUBY_INTERNAL_H 1 -#include "ruby.h" +#include "ruby/config.h" -#if defined(__cplusplus) -extern "C" { -#if 0 -} /* satisfy cc-mode */ -#endif +#ifdef __cplusplus +# error not for C++ #endif #include "ruby/encoding.h" @@ -87,10 +84,4 @@ extern "C" { #include "internal/inits.h" #include "internal/warnings.h" -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif #endif /* RUBY_INTERNAL_H */ diff --git a/internal/serial.h b/internal/serial.h index 224ab47ac6266d..118848d0898ea9 100644 --- a/internal/serial.h +++ b/internal/serial.h @@ -10,21 +10,13 @@ * file COPYING are met. Consult the file for details. */ -#if defined(HAVE_LONG_LONG) -typedef unsigned LONG_LONG rb_serial_t; -# define SERIALT2NUM ULL2NUM -# define PRI_SERIALT_PREFIX PRI_LL_PREFIX -# define SIZEOF_SERIAL_T SIZEOF_LONG_LONG -#elif defined(HAVE_UINT64_T) -typedef uint64_t rb_serial_t; -# define SERIALT2NUM SIZET2NUM -# define PRI_SERIALT_PREFIX PRI_64_PREFIX -# define SIZEOF_SERIAL_T SIZEOF_UINT64_T -#else -typedef unsigned long rb_serial_t; -# define SERIALT2NUM ULONG2NUM -# define PRI_SERIALT_PREFIX PRI_LONG_PREFIX -# define SIZEOF_SERIAL_T SIZEOF_LONG +#ifndef HAVE_LONG_LONG +# error need C99+ #endif +typedef unsigned LONG_LONG rb_serial_t; +#define SERIALT2NUM ULL2NUM +#define PRI_SERIALT_PREFIX PRI_LL_PREFIX +#define SIZEOF_SERIAL_T SIZEOF_LONG_LONG + #endif /* INTERNAL_SERIAL_H */ From 0958e19ffb047781fe1506760c7cbd8d7fe74e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 14:58:43 +0900 Subject: [PATCH 174/878] add several __has_something macro With these macros implemented we can write codes just like we can assume the compiler being clang. MSC_VERSION_SINCE is defined to implement those macros, but turned out to be handy for other places. The -fdeclspec compiler flag is necessary for clang to properly handle __has_declspec(). --- bignum.c | 2 - configure.ac | 2 + internal/compilers.h | 99 +++++++++++++++++++++++++++++++++++++++++--- internal/gc.h | 2 - numeric.c | 22 +++++----- random.c | 2 +- ruby_atomic.h | 6 +-- vm_insnhelper.c | 4 +- 8 files changed, 112 insertions(+), 27 deletions(-) diff --git a/bignum.c b/bignum.c index 4569183e45f8de..370c63c787c56a 100644 --- a/bignum.c +++ b/bignum.c @@ -5373,11 +5373,9 @@ rb_integer_float_cmp(VALUE x, VALUE y) #if SIZEOF_LONG * CHAR_BIT >= DBL_MANT_DIG /* assume FLT_RADIX == 2 */ COMPILER_WARNING_PUSH -#ifdef __has_warning #if __has_warning("-Wimplicit-int-float-conversion") COMPILER_WARNING_IGNORED(-Wimplicit-int-float-conversion) #endif -#endif static const double LONG_MAX_as_double = LONG_MAX; COMPILER_WARNING_POP #endif diff --git a/configure.ac b/configure.ac index f1ed36bb969609..f9e8573d45191d 100644 --- a/configure.ac +++ b/configure.ac @@ -481,6 +481,8 @@ AS_IF([test x"${RPATHFLAG}" = x], [ rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'` ]) +RUBY_TRY_CFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(XCFLAGS, -fdeclspec)]) + AS_CASE([$RUBY_PATCHLEVEL], [-*], [RUBY_DEVEL=yes], [RUBY_DEVEL=no]) particular_werror_flags=$RUBY_DEVEL diff --git a/internal/compilers.h b/internal/compilers.h index 697bad5f4e99e6..5a9e566e716594 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -10,22 +10,111 @@ * file COPYING are met. Consult the file for details. */ -#ifndef MAYBE_UNUSED -# define MAYBE_UNUSED(x) x +#include "ruby/defines.h" /* for GCC_VERSION_SINCE */ + +#ifdef _MSC_VER +# define MSC_VERSION_SINCE(_) (_MSC_VER >= _) +# define MSC_VERSION_BEFORE(_) (_MSC_VER < _) +#else +# define MSC_VERSION_SINCE(_) 0 +# define MSC_VERSION_BEFORE(_) 0 #endif -#ifndef WARN_UNUSED_RESULT -# define WARN_UNUSED_RESULT(x) x +#ifndef __has_attribute +# define __has_attribute(...) __has_attribute_##__VA_ARGS__ +# /* GCC <= 4 lacks __has_attribute predefined macro, while has attributes +# * themselves. We can simulate the macro like the following: */ +# define __has_attribute_aligned GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_alloc_size GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_artificial GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_always_inline GCC_VERSION_SINCE(3, 1, 0) +# define __has_attribute_cdecl GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_cold GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_const GCC_VERSION_SINCE(2, 6, 0) +# define __has_attribute_deprecated GCC_VERSION_SINCE(3, 1, 0) +# define __has_attribute_dllexport GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_dllimport GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_error GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_format GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_hot GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_leaf GCC_VERSION_SINCE(4, 6, 0) +# define __has_attribute_malloc GCC_VERSION_SINCE(3, 0, 0) +# define __has_attribute_no_address_safety_analysis GCC_VERSION_SINCE(4, 8, 0) +# define __has_attribute_no_sanitize_address GCC_VERSION_SINCE(4, 8, 0) +# define __has_attribute_no_sanitize_undefined GCC_VERSION_SINCE(4, 9, 0) +# define __has_attribute_noinline GCC_VERSION_SINCE(3, 1, 0) +# define __has_attribute_nonnull GCC_VERSION_SINCE(3, 3, 0) +# define __has_attribute_noreturn GCC_VERSION_SINCE(2, 5, 0) +# define __has_attribute_nothrow GCC_VERSION_SINCE(3, 3, 0) +# define __has_attribute_pure GCC_VERSION_SINCE(2, 96, 0) +# define __has_attribute_returns_nonnull GCC_VERSION_SINCE(4, 9, 0) +# define __has_attribute_returns_twice GCC_VERSION_SINCE(4, 1, 0) +# define __has_attribute_stdcall GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_unused GCC_VERSION_SINCE(0, 0, 0) +# define __has_attribute_visibility GCC_VERSION_SINCE(3, 3, 0) +# define __has_attribute_visibility GCC_VERSION_SINCE(3, 3, 0) +# define __has_attribute_warn_unused_result GCC_VERSION_SINCE(3, 4, 0) +# define __has_attribute_warning GCC_VERSION_SINCE(4, 3, 0) +# define __has_attribute_weak GCC_VERSION_SINCE(0, 0, 0) +# /* Note that 0,0,0 might be inaccurate. */ +#endif + +#ifndef __has_c_attribute +# /* As of writing everything that lacks __has_c_attribute also completely +# * lacks C2x attributes as well. Might change in future? */ +# define __has_c_attribute(...) 0 +#endif + +#ifndef __has_declspec_attribute +# define __has_declspec_attribute(...) __has_declspec_attribute_##__VA_ARGS__ +# define __has_declspec_attribute_align MSC_VERSION_SINCE( 800) +# define __has_declspec_attribute_deprecated MSC_VERSION_SINCE(1300) +# define __has_declspec_attribute_dllexport MSC_VERSION_SINCE( 800) +# define __has_declspec_attribute_dllimport MSC_VERSION_SINCE( 800) +# define __has_declspec_attribute_noalias MSC_VERSION_SINCE( 800) +# define __has_declspec_attribute_noinline MSC_VERSION_SINCE(1300) +# define __has_declspec_attribute_noreturn MSC_VERSION_SINCE(1100) +# define __has_declspec_attribute_nothrow MSC_VERSION_SINCE( 800) +# define __has_declspec_attribute_restrict MSC_VERSION_SINCE( 800) +# /* Note that 800 might be inaccurate. */ +#endif + +#ifndef __has_builtin +# /* :FIXME: Historically GCC has had tons of builtins, but it implemented +# * __has_builtin only since GCC 10. This section can be made more +# * granular. */ +# /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970 */ +# define __has_builtin(...) GCC_VERSION_SINCE(0, 0, 0) #endif #ifndef __has_feature -# define __has_feature(x) 0 +# define __has_feature(...) 0 #endif #ifndef __has_extension +# /* Pre-3.0 clang had __has_feature but not __has_extension. */ # define __has_extension __has_feature #endif +#ifndef __has_warning +# /* We cannot simulate __has_warning like the ones above, because it takes +# * string liteals (we can stringize a macro arugment but there is no such +# * thing like an unquote of strrings). */ +# define __has_warning(...) 0 +#endif + +#ifndef __GNUC__ +# define __extension__ /* void */ +#endif + +#ifndef MAYBE_UNUSED +# define MAYBE_UNUSED(x) x +#endif + +#ifndef WARN_UNUSED_RESULT +# define WARN_UNUSED_RESULT(x) x +#endif + #define RB_OBJ_BUILTIN_TYPE(obj) rb_obj_builtin_type(obj) #define OBJ_BUILTIN_TYPE(obj) RB_OBJ_BUILTIN_TYPE(obj) #ifdef __GNUC__ diff --git a/internal/gc.h b/internal/gc.h index cf59eaed0b4e1b..6e3fb8996d088f 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -47,11 +47,9 @@ RUBY_SYMBOL_EXPORT_END rb_wb_unprotected_newobj_of(klass, flags)) #define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags) -#ifdef __has_attribute #if __has_attribute(alloc_align) __attribute__((__alloc_align__(1))) #endif -#endif void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_MALLOC RUBY_ATTR_ALLOC_SIZE((2)); size_t rb_size_mul_or_raise(size_t, size_t, VALUE); /* used in compile.c */ diff --git a/numeric.c b/numeric.c index fa8961652bdad7..218dabe4623f8b 100644 --- a/numeric.c +++ b/numeric.c @@ -1389,7 +1389,7 @@ rb_float_equal(VALUE x, VALUE y) } else if (RB_TYPE_P(y, T_FLOAT)) { b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(b)) return Qfalse; #endif } @@ -1397,7 +1397,7 @@ rb_float_equal(VALUE x, VALUE y) return num_equal(x, y); } a = RFLOAT_VALUE(x); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a)) return Qfalse; #endif return (a == b)?Qtrue:Qfalse; @@ -1513,14 +1513,14 @@ rb_float_gt(VALUE x, VALUE y) } else if (RB_TYPE_P(y, T_FLOAT)) { b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(b)) return Qfalse; #endif } else { return rb_num_coerce_relop(x, y, '>'); } -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a)) return Qfalse; #endif return (a > b)?Qtrue:Qfalse; @@ -1550,14 +1550,14 @@ flo_ge(VALUE x, VALUE y) } else if (RB_TYPE_P(y, T_FLOAT)) { b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(b)) return Qfalse; #endif } else { return rb_num_coerce_relop(x, y, idGE); } -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a)) return Qfalse; #endif return (a >= b)?Qtrue:Qfalse; @@ -1587,14 +1587,14 @@ flo_lt(VALUE x, VALUE y) } else if (RB_TYPE_P(y, T_FLOAT)) { b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(b)) return Qfalse; #endif } else { return rb_num_coerce_relop(x, y, '<'); } -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a)) return Qfalse; #endif return (a < b)?Qtrue:Qfalse; @@ -1624,14 +1624,14 @@ flo_le(VALUE x, VALUE y) } else if (RB_TYPE_P(y, T_FLOAT)) { b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(b)) return Qfalse; #endif } else { return rb_num_coerce_relop(x, y, idLE); } -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a)) return Qfalse; #endif return (a <= b)?Qtrue:Qfalse; @@ -1656,7 +1656,7 @@ rb_float_eql(VALUE x, VALUE y) if (RB_TYPE_P(y, T_FLOAT)) { double a = RFLOAT_VALUE(x); double b = RFLOAT_VALUE(y); -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) if (isnan(a) || isnan(b)) return Qfalse; #endif if (a == b) diff --git a/random.c b/random.c index 68b47bcf1b2e0c..d763a214cd9bba 100644 --- a/random.c +++ b/random.c @@ -137,7 +137,7 @@ int_pair_to_real_inclusive(uint32_t a, uint32_t b) const uint128_t m = ((uint128_t)1 << dig) | 1; uint128_t x = ((uint128_t)a << 32) | b; r = (double)(uint64_t)((x * m) >> 64); -#elif defined HAVE_UINT64_T && !(defined _MSC_VER && _MSC_VER <= 1200) +#elif defined HAVE_UINT64_T && !MSC_VERSION_BEFORE(1300) uint64_t x = ((uint64_t)a << dig_u) + (((uint64_t)b + (a >> dig_u)) >> dig_r64); r = (double)x; diff --git a/ruby_atomic.h b/ruby_atomic.h index 1b395cd23f3a95..4a6723a92ec97c 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -38,7 +38,7 @@ typedef unsigned int rb_atomic_t; /* Anything OK */ # define RUBY_ATOMIC_GENERIC_MACRO 1 #elif defined _WIN32 -#if defined _MSC_VER && _MSC_VER > 1200 +#if MSC_VERSION_SINCE(1300) #pragma intrinsic(_InterlockedOr) #endif typedef LONG rb_atomic_t; @@ -48,7 +48,7 @@ typedef LONG rb_atomic_t; # define ATOMIC_DEC(var) InterlockedDecrement(&(var)) #if defined __GNUC__ # define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val)) -#elif defined _MSC_VER && _MSC_VER <= 1200 +#elif MSC_VERSION_BEFORE(1300) # define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val)) static inline void rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val) @@ -66,7 +66,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val) #endif # define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val)) # define ATOMIC_CAS(var, oldval, newval) InterlockedCompareExchange(&(var), (newval), (oldval)) -# if defined _MSC_VER && _MSC_VER <= 1200 +# if MSC_VERSION_BEFORE(1300) static inline rb_atomic_t rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t newval) { diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 2ac006a60592aa..0cd4bdefe97561 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1424,11 +1424,9 @@ vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag) static VALUE vm_call_general(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd); -#ifdef __has_attribute #if __has_attribute(artificial) __attribute__((__artificial__)) #endif -#endif static inline vm_call_handler calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) { @@ -1817,7 +1815,7 @@ check_match(rb_execution_context_t *ec, VALUE pattern, VALUE target, enum vm_che } -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if MSC_VERSION_BEFORE(1300) #define CHECK_CMP_NAN(a, b) if (isnan(a) || isnan(b)) return Qfalse; #else #define CHECK_CMP_NAN(a, b) /* do nothing */ From 64ec438b5bbeb6b29dd0393df01cc6ae3f5564da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 15:50:11 +0900 Subject: [PATCH 175/878] internal/bits.h rework Improving readability by converting some macros into inline functions. Also improved support for recent x86_64 processors, which have better instructions for the purposes. --- internal/bits.h | 552 ++++++++++++++++++++++++++++--------------- internal/compilers.h | 73 +++++- 2 files changed, 439 insertions(+), 186 deletions(-) diff --git a/internal/bits.h b/internal/bits.h index 1551d501fbd1d4..2530bd89bc3bb5 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -8,7 +8,44 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. + * @see Henry S. Warren Jr., "Hacker's Delight" (2nd ed.), 2013. + * @see SEI CERT C Coding Standard INT32-C. "Ensure that operations on + * signed integers do not result in overflow" + * @see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html + * @see https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateleft + * @see https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateright + * @see https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/byteswap-uint64-byteswap-ulong-byteswap-ushort + * @see https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64 + * @see https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanreverse-bitscanreverse64 + * @see https://docs.microsoft.com/en-us/cpp/intrinsics/lzcnt16-lzcnt-lzcnt64 + * @see https://docs.microsoft.com/en-us/cpp/intrinsics/popcnt16-popcnt-popcnt64 + * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_lzcnt_u32 + * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_tzcnt_u32 */ +#include "ruby/config.h" +#include /* for CHAR_BITS */ +#include /* for uintptr_t */ + +#ifdef _MSC_VER +# include /* for _byteswap_uint64 */ +#endif + +#if defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) +# /* Rule out MJIT_HEADER, which does not interface well with */ +# include /* for _lzcnt_u64 */ +#endif + +#if defined(_MSC_VER) && defined(_WIN64) +# include /* for the following intrinsics */ +# pragma intrinsic(_BitScanForward) +# pragma intrinsic(_BitScanForward64) +# pragma intrinsic(_BitScanReverse) +# pragma intrinsic(_BitScanReverse64) +#endif + +#include "ruby/ruby.h" /* for VALUE */ +#include "internal/compilers.h" /* for __has_builtin */ +#include "internal/static_assert.h" /* for STATIC_ASSERT */ /* The most significant bit of the lower part of half-long integer. * If sizeof(long) == 4, this is 0x8000. @@ -16,19 +53,25 @@ */ #define HALF_LONG_MSB ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2)) -#define SIGNED_INTEGER_TYPE_P(int_type) (0 > ((int_type)0)-1) -#define SIGNED_INTEGER_MAX(sint_type) \ - (sint_type) \ - ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) | \ - ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) - 1)) -#define SIGNED_INTEGER_MIN(sint_type) (-SIGNED_INTEGER_MAX(sint_type)-1) -#define UNSIGNED_INTEGER_MAX(uint_type) (~(uint_type)0) -#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P -#define MUL_OVERFLOW_P(a, b) \ +#define SIGNED_INTEGER_TYPE_P(T) (0 > ((T)0)-1) + +#define SIGNED_INTEGER_MIN(T) \ + ((sizeof(T) == sizeof(int8_t)) ? ((T)INT8_MIN) : \ + ((sizeof(T) == sizeof(int16_t)) ? ((T)INT16_MIN) : \ + ((sizeof(T) == sizeof(int32_t)) ? ((T)INT32_MIN) : \ + ((sizeof(T) == sizeof(int64_t)) ? ((T)INT64_MIN) : \ + 0)))) + +#define SIGNED_INTEGER_MAX(T) ((T)(SIGNED_INTEGER_MIN(T) ^ ((T)~(T)0))) + +#define UNSIGNED_INTEGER_MAX(T) ((T)~(T)0) + +#if __has_builtin(__builtin_mul_overflow_p) +# define MUL_OVERFLOW_P(a, b) \ __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0) -#elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW -#define MUL_OVERFLOW_P(a, b) \ - RB_GNUC_EXTENSION_BLOCK(__typeof__(a) c; __builtin_mul_overflow((a), (b), &c)) +#elif __has_builtin(__builtin_mul_overflow) +# define MUL_OVERFLOW_P(a, b) \ + __extension__ ({ __typeof__(a) c; __builtin_mul_overflow((a), (b), &c); }) #endif #define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \ @@ -38,121 +81,137 @@ ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \ ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b))) -#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P +#if __has_builtin(__builtin_mul_overflow_p) /* __builtin_mul_overflow_p can take bitfield */ /* and GCC permits bitfields for integers other than int */ -#define MUL_OVERFLOW_FIXNUM_P(a, b) RB_GNUC_EXTENSION_BLOCK( \ - struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \ - __builtin_mul_overflow_p((a), (b), c.fixnum); \ -) +# define MUL_OVERFLOW_FIXNUM_P(a, b) \ + __extension__ ({ \ + struct { long fixnum : sizeof(long) * CHAR_BIT - 1; } c; \ + __builtin_mul_overflow_p((a), (b), c.fixnum); \ + }) #else -#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) +# define MUL_OVERFLOW_FIXNUM_P(a, b) \ + MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) #endif #ifdef MUL_OVERFLOW_P -#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_P(a, b) -#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_P(a, b) -#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_P(a, b) +# define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_P(a, b) +# define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_P(a, b) +# define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_P(a, b) #else -#define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX) -#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX) -#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX) +# define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX) +# define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX) +# define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX) #endif -#ifndef swap16 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP16 -# define swap16(x) __builtin_bswap16(x) -# endif +#ifdef HAVE_UINT128_T +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= sizeof(int32_t) ? 32 - nlz_int32((uint32_t)(x)) : \ + sizeof(x) <= sizeof(int64_t) ? 64 - nlz_int64((uint64_t)(x)) : \ + 128 - nlz_int128((uint128_t)(x))) +#else +# define bit_length(x) \ + (unsigned int) \ + (sizeof(x) <= sizeof(int32_t) ? 32 - nlz_int32((uint32_t)(x)) : \ + 64 - nlz_int64((uint64_t)(x))) #endif -#ifndef swap16 -# define swap16(x) ((uint16_t)((((x)&0xFF)<<8) | (((x)>>8)&0xFF))) +static inline uint16_t swap16(uint16_t); +static inline uint32_t swap32(uint32_t); +static inline uint64_t swap64(uint64_t); +static inline unsigned nlz_int(unsigned x); +static inline unsigned nlz_long(unsigned long x); +static inline unsigned nlz_long_long(unsigned long long x); +static inline unsigned nlz_intptr(uintptr_t x); +static inline unsigned nlz_int32(uint32_t x); +static inline unsigned nlz_int64(uint64_t x); +#ifdef HAVE_UINT128_T +static inline unsigned nlz_int128(uint128_t x); #endif +static inline unsigned rb_popcount32(uint32_t x); +static inline unsigned rb_popcount64(uint64_t x); +static inline unsigned rb_popcount_intptr(uintptr_t x); +static inline int ntz_int32(uint32_t x); +static inline int ntz_int64(uint64_t x); +static inline int ntz_intptr(uintptr_t x); +static inline VALUE RUBY_BIT_ROTL(VALUE, int); +static inline VALUE RUBY_BIT_ROTR(VALUE, int); -#ifndef swap32 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP32 -# define swap32(x) __builtin_bswap32(x) -# endif -#endif +static inline uint16_t +swap16(uint16_t x) +{ +#if __has_builtin(__builtin_bswap16) + return __builtin_bswap16(x); -#ifndef swap32 -# define swap32(x) ((uint32_t)((((x)&0xFF)<<24) \ - |(((x)>>24)&0xFF) \ - |(((x)&0x0000FF00)<<8) \ - |(((x)&0x00FF0000)>>8) )) -#endif +#elif defined(_MSC_VER) + return _byteswap_ushort(x); + +#else + return (x << 8) | (x >> 8); -#ifndef swap64 -# ifdef HAVE_BUILTIN___BUILTIN_BSWAP64 -# define swap64(x) __builtin_bswap64(x) -# endif #endif +} + +static inline uint32_t +swap32(uint32_t x) +{ +#if __has_builtin(__builtin_bswap32) + return __builtin_bswap32(x); + +#elif defined(_MSC_VER) + return _byteswap_ulong(x); + +#else + x = ((x & 0x0000FFFF) << 16) | ((x & 0xFFFF0000) >> 16); + x = ((x & 0x00FF00FF) << 8) | ((x & 0xFF00FF00) >> 8); + return x; -#ifndef swap64 -# ifdef HAVE_INT64_T -# define byte_in_64bit(n) ((uint64_t)0xff << (n)) -# define swap64(x) ((uint64_t)((((x)&byte_in_64bit(0))<<56) \ - |(((x)>>56)&0xFF) \ - |(((x)&byte_in_64bit(8))<<40) \ - |(((x)&byte_in_64bit(48))>>40) \ - |(((x)&byte_in_64bit(16))<<24) \ - |(((x)&byte_in_64bit(40))>>24) \ - |(((x)&byte_in_64bit(24))<<8) \ - |(((x)&byte_in_64bit(32))>>8))) -# endif #endif +} -static inline unsigned int -nlz_int(unsigned int x) +static inline uint64_t +swap64(uint64_t x) { -#if defined(HAVE_BUILTIN___BUILTIN_CLZ) - if (x == 0) return SIZEOF_INT * CHAR_BIT; - return (unsigned int)__builtin_clz(x); +#if __has_builtin(__builtin_bswap64) + return __builtin_bswap64(x); + +#elif defined(_MSC_VER) + return _byteswap_uint64(x); + #else - unsigned int y; -# if 64 < SIZEOF_INT * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_INT * CHAR_BIT - unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_INT * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_INT * CHAR_BIT - y = x >> 32; if (y) {n -= 32; x = y;} -# endif - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); + x = ((x & 0x00000000FFFFFFFFULL) << 32) | ((x & 0xFFFFFFFF00000000ULL) >> 32); + x = ((x & 0x0000FFFF0000FFFFULL) << 16) | ((x & 0xFFFF0000FFFF0000ULL) >> 16); + x = ((x & 0x00FF00FF00FF00FFULL) << 8) | ((x & 0xFF00FF00FF00FF00ULL) >> 8); + return x; + #endif } static inline unsigned int -nlz_long(unsigned long x) +nlz_int32(uint32_t x) { -#if defined(HAVE_BUILTIN___BUILTIN_CLZL) - if (x == 0) return SIZEOF_LONG * CHAR_BIT; - return (unsigned int)__builtin_clzl(x); +#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX2__) + /* Note: It seems there is no such tihng like __LZCNT__ predefined in MSVC. + * AMD CPUs have had this instruction for decades (since K10) but for + * Intel, Haswell is the oldest one. We need to use __AVX2__ for maximum + * safety. */ + return (unsigned int)__lzcnt(x); + +#elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) + return (unsigned int)_lzcnt_u32(x); + +#elif defined(_MSC_VER) && defined(_Win64) /* &&! defined(__AVX2__) */ + unsigned long r; + return _BitScanReverse(&r, x) ? (int)r : 32; + +#elif __has_builtin(__builtin_clz) + STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT == 32); + return x ? (unsigned int)__builtin_clz(x) : 32; + #else - unsigned long y; -# if 64 < SIZEOF_LONG * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_LONG * CHAR_BIT - unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_LONG * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_LONG * CHAR_BIT - y = x >> 32; if (y) {n -= 32; x = y;} -# endif + uint32_t y; + unsigned n = 32; y = x >> 16; if (y) {n -= 16; x = y;} y = x >> 8; if (y) {n -= 8; x = y;} y = x >> 4; if (y) {n -= 4; x = y;} @@ -162,167 +221,290 @@ nlz_long(unsigned long x) #endif } -#ifdef HAVE_LONG_LONG static inline unsigned int -nlz_long_long(unsigned LONG_LONG x) +nlz_int64(uint64_t x) { -#if defined(HAVE_BUILTIN___BUILTIN_CLZLL) - if (x == 0) return SIZEOF_LONG_LONG * CHAR_BIT; - return (unsigned int)__builtin_clzll(x); +#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX2__) + return (unsigned int)__lzcnt64(x); + +#elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) + return (unsigned int)_lzcnt_u64(x); + +#elif defined(_MSC_VER) && defined(_Win64) /* &&! defined(__AVX2__) */ + unsigned long r; + return _BitScanReverse64(&r, x) ? (unsigned int)r : 64; + +#elif __has_builtin(__builtin_clzl) + if (x == 0) { + return 64; + } + else if (sizeof(long) * CHAR_BIT == 64) { + return (unsigned int)__builtin_clzl((unsigned long)x); + } + else if (sizeof(long long) * CHAR_BIT == 64) { + return (unsigned int)__builtin_clzll((unsigned long long)x); + } + else { + /* :FIXME: Is there a way to make this branch a compile-time error? */ + __builtin_unreachable(); + } + #else - unsigned LONG_LONG y; -# if 64 < SIZEOF_LONG_LONG * CHAR_BIT - unsigned int n = 128; -# elif 32 < SIZEOF_LONG_LONG * CHAR_BIT + uint64_t y; unsigned int n = 64; -# else - unsigned int n = 32; -# endif -# if 64 < SIZEOF_LONG_LONG * CHAR_BIT - y = x >> 64; if (y) {n -= 64; x = y;} -# endif -# if 32 < SIZEOF_LONG_LONG * CHAR_BIT y = x >> 32; if (y) {n -= 32; x = y;} -# endif y = x >> 16; if (y) {n -= 16; x = y;} y = x >> 8; if (y) {n -= 8; x = y;} y = x >> 4; if (y) {n -= 4; x = y;} y = x >> 2; if (y) {n -= 2; x = y;} y = x >> 1; if (y) {return n - 2;} return (unsigned int)(n - x); + #endif } -#endif #ifdef HAVE_UINT128_T static inline unsigned int nlz_int128(uint128_t x) { - uint128_t y; - unsigned int n = 128; - y = x >> 64; if (y) {n -= 64; x = y;} - y = x >> 32; if (y) {n -= 32; x = y;} - y = x >> 16; if (y) {n -= 16; x = y;} - y = x >> 8; if (y) {n -= 8; x = y;} - y = x >> 4; if (y) {n -= 4; x = y;} - y = x >> 2; if (y) {n -= 2; x = y;} - y = x >> 1; if (y) {return n - 2;} - return (unsigned int)(n - x); + uint64_t y = (uint64_t)(x >> 64); + + if (x == 0) { + return 128; + } + else if (y == 0) { + return (unsigned int)nlz_int64(y) + 64; + } + else { + return (unsigned int)nlz_int64(y); + } } #endif static inline unsigned int -nlz_intptr(uintptr_t x) +nlz_int(unsigned int x) { -#if SIZEOF_UINTPTR_T == SIZEOF_INT - return nlz_int(x); -#elif SIZEOF_UINTPTR_T == SIZEOF_LONG - return nlz_long(x); -#elif SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG - return nlz_long_long(x); -#else - #error no known integer type corresponds uintptr_t - return /* sane compiler */ ~0; + if (sizeof(unsigned int) * CHAR_BIT == 32) { + return nlz_int32((uint32_t)x); + } + else if (sizeof(unsigned int) * CHAR_BIT == 64) { + return nlz_int64((uint64_t)x); + } + else { + UNREACHABLE_RETURN(~0); + } +} + +static inline unsigned int +nlz_long(unsigned long x) +{ + if (sizeof(unsigned long) * CHAR_BIT == 32) { + return nlz_int32((uint32_t)x); + } + else if (sizeof(unsigned long) * CHAR_BIT == 64) { + return nlz_int64((uint64_t)x); + } + else { + UNREACHABLE_RETURN(~0); + } +} + +static inline unsigned int +nlz_long_long(unsigned long long x) +{ + if (sizeof(unsigned long long) * CHAR_BIT == 64) { + return nlz_int64((uint64_t)x); + } +#ifdef HAVE_UINT128_T + else if (sizeof(unsigned long long) * CHAR_BIT == 128) { + return nlz_int128((uint128_t)x); + } #endif + else { + UNREACHABLE_RETURN(~0); + } +} + +static inline unsigned int +nlz_intptr(uintptr_t x) +{ + if (sizeof(uintptr_t) == sizeof(unsigned int)) { + return nlz_int((unsigned int)x); + } + if (sizeof(uintptr_t) == sizeof(unsigned long)) { + return nlz_long((unsigned long)x); + } + if (sizeof(uintptr_t) == sizeof(unsigned long long)) { + return nlz_long_long((unsigned long long)x); + } + else { + UNREACHABLE_RETURN(~0); + } } static inline unsigned int rb_popcount32(uint32_t x) { -#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT +#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX__) + /* Note: CPUs since Nehalem and Barcelona have had this instruction so SSE + * 4.2 should suffice, but it seems there is no such thing like __SSE_4_2__ + * predefined macro in MSVC. They do have __AVX__ so use it instead. */ + return (unsigned int)__popcnt(x); + +#elif __has_builtin(__builtin_popcount) + STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT >= 32); return (unsigned int)__builtin_popcount(x); + #else x = (x & 0x55555555) + (x >> 1 & 0x55555555); x = (x & 0x33333333) + (x >> 2 & 0x33333333); x = (x & 0x0f0f0f0f) + (x >> 4 & 0x0f0f0f0f); x = (x & 0x001f001f) + (x >> 8 & 0x001f001f); - return (x & 0x0000003f) + (x >>16 & 0x0000003f); + x = (x & 0x0000003f) + (x >>16 & 0x0000003f); + return (unsigned int)x; + #endif } -static inline int +static inline unsigned int rb_popcount64(uint64_t x) { -#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT - return __builtin_popcountll(x); +#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX__) + return (unsigned int)__popcnt64(x); + +#elif __has_builtin(__builtin_popcount) + if (sizeof(long) * CHAR_BIT == 64) { + return (unsigned int)__builtin_popcountl((unsigned long)x); + } + else if (sizeof(long long) * CHAR_BIT == 64) { + return (unsigned int)__builtin_popcountll((unsigned long long)x); + } + else { + /* :FIXME: Is there a way to make this branch a compile-time error? */ + __builtin_unreachable(); + } + #else x = (x & 0x5555555555555555) + (x >> 1 & 0x5555555555555555); x = (x & 0x3333333333333333) + (x >> 2 & 0x3333333333333333); x = (x & 0x0707070707070707) + (x >> 4 & 0x0707070707070707); x = (x & 0x001f001f001f001f) + (x >> 8 & 0x001f001f001f001f); x = (x & 0x0000003f0000003f) + (x >>16 & 0x0000003f0000003f); - return (x & 0x7f) + (x >>32 & 0x7f); + x = (x & 0x000000000000007f) + (x >>32 & 0x000000000000007f); + return (unsigned int)x; + #endif } -static inline int +static inline unsigned int rb_popcount_intptr(uintptr_t x) { -#if SIZEOF_VOIDP == 8 - return rb_popcount64(x); -#elif SIZEOF_VOIDP == 4 - return rb_popcount32(x); -#endif + if (sizeof(uintptr_t) * CHAR_BIT == 64) { + return rb_popcount64((uint64_t)x); + } + else if (sizeof(uintptr_t) * CHAR_BIT == 32) { + return rb_popcount32((uint32_t)x); + } + else { + UNREACHABLE_RETURN(~0); + } } static inline int ntz_int32(uint32_t x) { -#ifdef HAVE_BUILTIN___BUILTIN_CTZ - return __builtin_ctz(x); +#if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER) + return (unsigned)_tzcnt_u32(x); + +#elif defined(_MSC_VER) && defined(_WIN64) + /* :FIXME: Is there any way to issue TZCNT instead of BSF, apart from using + * assembly? Because issueing LZCNT seems possible (see nlz.h). */ + unsigned long r; + return _BitScanForward(&r, x) ? (int)r : 32; + +#elif __has_builtin(__builtin_ctz) + STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT == 32); + return x ? (unsigned)__builtin_ctz(x) : 32; + #else return rb_popcount32((~x) & (x-1)); + #endif } static inline int ntz_int64(uint64_t x) { -#ifdef HAVE_BUILTIN___BUILTIN_CTZLL - return __builtin_ctzll(x); +#if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER) + return (unsigned)_tzcnt_u64(x); + +#elif defined(_MSC_VER) && defined(_WIN64) + unsigned long r; + return _BitScanForward64(&r, x) ? (int)r : 64; + +#elif __has_builtin(__builtin_ctzl) + if (x == 0) { + return 64; + } + else if (sizeof(long) * CHAR_BIT == 64) { + return (unsigned)__builtin_ctzl((unsigned long)x); + } + else if (sizeof(long long) * CHAR_BIT == 64) { + return (unsigned)__builtin_ctzll((unsigned long long)x); + } + else { + /* :FIXME: Is there a way to make this branch a compile-time error? */ + __builtin_unreachable(); + } + #else return rb_popcount64((~x) & (x-1)); + #endif } static inline int ntz_intptr(uintptr_t x) { -#if SIZEOF_VOIDP == 8 - return ntz_int64(x); -#elif SIZEOF_VOIDP == 4 - return ntz_int32(x); -#endif + if (sizeof(uintptr_t) * CHAR_BIT == 64) { + return ntz_int64((uint64_t)x); + } + else if (sizeof(uintptr_t) * CHAR_BIT == 32) { + return ntz_int32((uint32_t)x); + } + else { + UNREACHABLE_RETURN(~0); + } } -#if defined(HAVE_UINT128_T) && defined(HAVE_LONG_LONG) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - sizeof(x) <= SIZEOF_LONG_LONG ? SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x)) : \ - SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) -#elif defined(HAVE_UINT128_T) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x))) -#elif defined(HAVE_LONG_LONG) -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \ - SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x))) +static inline VALUE +RUBY_BIT_ROTL(VALUE v, int n) +{ +#if __has_builtin(__builtin_rotateleft32) && (SIZEOF_VALUE * CHAR_BIT == 32) + return __builtin_rotateleft32(v, n); + +#elif __has_builtin(__builtin_rotateleft64) && (SIZEOF_VALUE * CHAR_BIT == 64) + return __builtin_rotateleft64(v, n); + #else -# define bit_length(x) \ - (unsigned int) \ - (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \ - SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x))) + const int m = sizeof(VALUE) * CHAR_BIT; + return (v << n) | (v >> (m - n)); #endif +} + +static inline VALUE +RUBY_BIT_ROTR(VALUE v, int n) +{ +#if __has_builtin(__builtin_rotateright32) && (SIZEOF_VALUE * CHAR_BIT == 32) + return __builtin_rotateright32(v, n); + +#elif __has_builtin(__builtin_rotateright64) && (SIZEOF_VALUE * CHAR_BIT == 64) + return __builtin_rotateright64(v, n); -#if USE_FLONUM -#define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n))) -#define RUBY_BIT_ROTR(v, n) (((v) >> (n)) | ((v) << ((sizeof(v) * 8) - n))) +#else + const int m = sizeof(VALUE) * CHAR_BIT; + return (v << (m - n)) | (v >> n); #endif +} + #endif /* INTERNAL_BITS_H */ diff --git a/internal/compilers.h b/internal/compilers.h index 5a9e566e716594..8f32030c606a41 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -84,7 +84,78 @@ # * __has_builtin only since GCC 10. This section can be made more # * granular. */ # /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970 */ -# define __has_builtin(...) GCC_VERSION_SINCE(0, 0, 0) +# define __has_builtin(...) __has_builtin_##__VA_ARGS__ +# define __has_builtin____builtin_bswap16 GCC_VERSION_SINCE(4, 8, 0) /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 */ +# define __has_builtin____builtin_bswap32 GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_bswap64 GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_clz GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_clzl GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_clzll GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_ctz GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_ctzl GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_ctzll GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_mul_overflow GCC_VERSION_SINCE(5, 0, 0) +# define __has_builtin____builtin_mul_overflow_p GCC_VERSION_SINCE(7, 0, 0) +# define __has_builtin____builtin_popcount GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_popcountl GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_popcountll GCC_VERSION_SINCE(3, 6, 0) +# /* Take config.h definition when available */ +# ifdef HAVE_BUILTIN____BUILTIN_BSWAP16 +# undef __has_builtin____builtin_bswap16 +# define __has_builtin____builtin_bswap16 HAVE_BUILTIN____BUILTIN_BSWAP16 +# endif +# ifdef HAVE_BUILTIN____BUILTIN_BSWAP32 +# undef __has_builtin____builtin_bswap32 +# define __has_builtin____builtin_bswap16 HAVE_BUILTIN____BUILTIN_BSWAP32 +# endif +# ifdef HAVE_BUILTIN____BUILTIN_BSWAP64 +# undef __has_builtin____builtin_bswap64 +# define __has_builtin____builtin_bswap64 HAVE_BUILTIN____BUILTIN_BSWAP64 +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CLZ +# undef __has_builtin____builtin_clz +# define __has_builtin____builtin_clz HAVE_BUILTIN____BUILTIN_CLZ +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CLZL +# undef __has_builtin____builtin_clzl +# define __has_builtin____builtin_clzl HAVE_BUILTIN____BUILTIN_CLZL +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CLZLL +# undef __has_builtin____builtin_clzll +# define __has_builtin____builtin_clzll HAVE_BUILTIN____BUILTIN_CLZLL +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CTZ +# undef __has_builtin____builtin_ctz +# define __has_builtin____builtin_ctz HAVE_BUILTIN____BUILTIN_CTZ +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CTZL +# undef __has_builtin____builtin_ctzl +# define __has_builtin____builtin_ctzl HAVE_BUILTIN____BUILTIN_CTZL +# endif +# ifdef HAVE_BUILTIN____BUILTIN_CTZLL +# undef __has_builtin____builtin_ctzll +# define __has_builtin____builtin_ctzll HAVE_BUILTIN____BUILTIN_CTZLL +# endif +# ifdef HAVE_BUILTIN____BUILTIN_MUL_OVERFLOW +# undef __has_builtin____builtin_mul_overflow +# define __has_builtin____builtin_mul_overflow HAVE_BUILTIN____BUILTIN_MUL_OVERFLOW +# endif +# ifdef HAVE_BUILTIN____BUILTIN_MUL_OVERFLOW_P +# undef __has_builtin____builtin_mul_overflow_p +# define __has_builtin____builtin_mul_overflow_p HAVE_BUILTIN____BUILTIN_MUL_OVERFLOW_P +# endif +# ifdef HAVE_BUILTIN____BUILTIN_POPCOUNT +# undef __has_builtin____builtin_popcount +# define __has_builtin____builtin_popcount HAVE_BUILTIN____BUILTIN_POPCOUNT +# endif +# ifdef HAVE_BUILTIN____BUILTIN_POPCOUNTL +# undef __has_builtin____builtin_popcountl +# define __has_builtin____builtin_popcountl HAVE_BUILTIN____BUILTIN_POPCOUNTL +# endif +# ifdef HAVE_BUILTIN____BUILTIN_POPCOUNTLL +# undef __has_builtin____builtin_popcountll +# define __has_builtin____builtin_popcountll HAVE_BUILTIN____BUILTIN_POPCOUNTLL +# endif #endif #ifndef __has_feature From 6581db2187a1d5b6316fd1c942dccc6b6a3b9ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 17:02:24 +0900 Subject: [PATCH 176/878] internal/warnings.h rework Not a big rewrite. Just to make those macros readable. --- internal/warnings.h | 59 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/internal/warnings.h b/internal/warnings.h index 957583968dbfd4..82b3ac59c74805 100644 --- a/internal/warnings.h +++ b/internal/warnings.h @@ -9,42 +9,41 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/compilers.h" /* for MSC_VERSION_SINCE */ -#if defined(_MSC_VER) +#if MSC_VERSION_SINCE(1200) +# /* Not sure exactly when but it seems VC++ 6.0 is a version with it.*/ # define COMPILER_WARNING_PUSH __pragma(warning(push)) # define COMPILER_WARNING_POP __pragma(warning(pop)) -# define COMPILER_WARNING_ERROR(flag) __pragma(warning(error: flag))) -# define COMPILER_WARNING_IGNORED(flag) __pragma(warning(suppress: flag))) +# define COMPILER_WARNING_ERROR(flag) __pragma(warning(error: flag)) +# define COMPILER_WARNING_IGNORED(flag) __pragma(warning(disable: flag)) -#elif defined(__clang__) /* clang 2.6 already had this feature */ -# define COMPILER_WARNING_PUSH _Pragma("clang diagnostic push") -# define COMPILER_WARNING_POP _Pragma("clang diagnostic pop") -# define COMPILER_WARNING_SPECIFIER(kind, msg) \ - clang diagnostic kind # msg -# define COMPILER_WARNING_ERROR(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) -# define COMPILER_WARNING_IGNORED(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) +#elif defined(__clang__) +# /* Not sure exactly when but it seems LLVM 2.6.0 is a version with it. */ +# define COMPILER_WARNING_PRAGMA0(x) _Pragma(# x) +# define COMPILER_WARNING_PRAGMA1(x) COMPILER_WARNING_PRAGMA0(clang diagnostic x) +# define COMPILER_WARNING_PRAGMA2(x, y) COMPILER_WARNING_PRAGMA1(x # y) +# define COMPILER_WARNING_PUSH COMPILER_WARNING_PRAGMA1(push) +# define COMPILER_WARNING_POP COMPILER_WARNING_PRAGMA1(pop) +# define COMPILER_WARNING_ERROR(flag) COMPILER_WARNING_PRAGMA2(error, flag) +# define COMPILER_WARNING_IGNORED(flag) COMPILER_WARNING_PRAGMA2(ignored, flag) #elif GCC_VERSION_SINCE(4, 6, 0) -/* https://gcc.gnu.org/onlinedocs/gcc-4.6.4/gcc/Diagnostic-Pragmas.html */ -# define COMPILER_WARNING_PUSH _Pragma("GCC diagnostic push") -# define COMPILER_WARNING_POP _Pragma("GCC diagnostic pop") -# define COMPILER_WARNING_SPECIFIER(kind, msg) \ - GCC diagnostic kind # msg -# define COMPILER_WARNING_ERROR(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag)) -# define COMPILER_WARNING_IGNORED(flag) \ - COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag)) +# /* https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html */ +# define COMPILER_WARNING_PRAGMA0(x) _Pragma(# x) +# define COMPILER_WARNING_PRAGMA1(x) COMPILER_WARNING_PRAGMA0(GCC diagnostic x) +# define COMPILER_WARNING_PRAGMA2(x, y) COMPILER_WARNING_PRAGMA1(x # y) +# define COMPILER_WARNING_PUSH COMPILER_WARNING_PRAGMA1(push) +# define COMPILER_WARNING_POP COMPILER_WARNING_PRAGMA1(pop) +# define COMPILER_WARNING_ERROR(flag) COMPILER_WARNING_PRAGMA2(error, flag) +# define COMPILER_WARNING_IGNORED(flag) COMPILER_WARNING_PRAGMA2(ignored, flag) -#else /* other compilers to follow? */ -# define COMPILER_WARNING_PUSH /* nop */ -# define COMPILER_WARNING_POP /* nop */ -# define COMPILER_WARNING_ERROR(flag) /* nop */ -# define COMPILER_WARNING_IGNORED(flag) /* nop */ -#endif - -#define COMPILER_WARNING_PRAGMA(str) COMPILER_WARNING_PRAGMA_(str) -#define COMPILER_WARNING_PRAGMA_(str) _Pragma(#str) +#else +# /* :FIXME: improve here, for instace icc seems to have something? */ +# define COMPILER_WARNING_PUSH /* void */ +# define COMPILER_WARNING_POP /* void */ +# define COMPILER_WARNING_ERROR(flag) /* void */ +# define COMPILER_WARNING_IGNORED(flag) /* void */ +#endif /* _MSC_VER */ #endif /* INTERNAL_WARNINGS_H */ From 68c0dc8d363675881d60b9fde15645d9ee14fafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 17:06:40 +0900 Subject: [PATCH 177/878] internal/static_assert.h rework ISO/IEC 9899:2011 section 7.2 states that must define static_assert. Use it when available. --- internal/static_assert.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/internal/static_assert.h b/internal/static_assert.h index 05b79b4ba319bf..6fe18d1261fde9 100644 --- a/internal/static_assert.h +++ b/internal/static_assert.h @@ -9,13 +9,20 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include /* for static_assert */ +#include "compilers.h" /* for __has_extension */ + +#if defined(static_assert) +/* Take assert.h definition */ +# define STATIC_ASSERT(name, expr) static_assert(expr, # name ": " # expr) + +#elif __has_extension(c_static_assert) || GCC_VERSION_SINCE(4, 6, 0) +# define STATIC_ASSERT(name, expr) \ + __extension__ _Static_assert(expr, # name ": " # expr) -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) -# define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr) -#elif GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert) -# define STATIC_ASSERT(name, expr) RB_GNUC_EXTENSION _Static_assert(expr, #name ": " #expr) #else -# define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)] -#endif +# define STATIC_ASSERT(name, expr) \ + typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)] +#endif /* static_assert */ #endif /* INTERNAL_STATIC_ASSERT_H */ From f6dc053faf6a8850c50638b5e06fca9e878de7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 10:48:45 +0900 Subject: [PATCH 178/878] internal/fixnum.h rework Add #include lines, move FIXNUM_POSITIVE_P etc. from numeric.h. --- internal/compilers.h | 12 +++++++++- internal/fixnum.h | 53 ++++++++++++++++++++++++++++++++++++-------- internal/numeric.h | 5 +---- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/internal/compilers.h b/internal/compilers.h index 8f32030c606a41..781dd9cfc93e50 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -85,6 +85,7 @@ # * granular. */ # /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970 */ # define __has_builtin(...) __has_builtin_##__VA_ARGS__ +# define __has_builtin____builtin_add_overflow GCC_VERSION_SINCE(5, 1, 0) # define __has_builtin____builtin_bswap16 GCC_VERSION_SINCE(4, 8, 0) /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 */ # define __has_builtin____builtin_bswap32 GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_bswap64 GCC_VERSION_SINCE(3, 6, 0) @@ -94,12 +95,17 @@ # define __has_builtin____builtin_ctz GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_ctzl GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_ctzll GCC_VERSION_SINCE(3, 6, 0) -# define __has_builtin____builtin_mul_overflow GCC_VERSION_SINCE(5, 0, 0) +# define __has_builtin____builtin_mul_overflow GCC_VERSION_SINCE(5, 1, 0) # define __has_builtin____builtin_mul_overflow_p GCC_VERSION_SINCE(7, 0, 0) # define __has_builtin____builtin_popcount GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_popcountl GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_popcountll GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_sub_overflow GCC_VERSION_SINCE(5, 1, 0) # /* Take config.h definition when available */ +# ifdef HAVE_BUILTIN____BUILTIN_ADD_OVERFLOW +# undef __has_builtin____builtin_add_overflow +# define __has_builtin____builtin_add_overflow HAVE_BUILTIN____BUILTIN_ADD_OVERFLOW +# endif # ifdef HAVE_BUILTIN____BUILTIN_BSWAP16 # undef __has_builtin____builtin_bswap16 # define __has_builtin____builtin_bswap16 HAVE_BUILTIN____BUILTIN_BSWAP16 @@ -156,6 +162,10 @@ # undef __has_builtin____builtin_popcountll # define __has_builtin____builtin_popcountll HAVE_BUILTIN____BUILTIN_POPCOUNTLL # endif +# ifdef HAVE_BUILTIN____BUILTIN_SUB_OVERFLOW +# undef __has_builtin____builtin_SUB_overflow +# define __has_builtin____builtin_sub_overflow HAVE_BUILTIN____BUILTIN_SUB_OVERFLOW +# endif #endif #ifndef __has_feature diff --git a/internal/fixnum.h b/internal/fixnum.h index 08ca7bcec7331c..a388ddb36af0d0 100644 --- a/internal/fixnum.h +++ b/internal/fixnum.h @@ -9,6 +9,12 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for HAVE_LONG_LONG */ +#include /* for CHAR_BIT */ +#include "internal/compilers.h" /* for __has_builtin */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/intern.h" /* for rb_big_mul */ +#include "ruby/ruby.h" /* for RB_FIXABLE */ #if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG # define DLONG LONG_LONG @@ -16,9 +22,20 @@ #elif defined(HAVE_INT128_T) # define DLONG int128_t # define DL2NUM(x) (RB_FIXABLE(x) ? LONG2FIX(x) : rb_int128t2big(x)) -VALUE rb_int128t2big(int128_t n); +VALUE rb_int128t2big(int128_t n); /* in bignum.c */ #endif +static inline long rb_overflowed_fix_to_int(long x); +static inline VALUE rb_fix_plus_fix(VALUE x, VALUE y); +static inline VALUE rb_fix_minus_fix(VALUE x, VALUE y); +static inline VALUE rb_fix_mul_fix(VALUE x, VALUE y); +static inline void rb_fix_divmod_fix(VALUE x, VALUE y, VALUE *divp, VALUE *modp); +static inline VALUE rb_fix_div_fix(VALUE x, VALUE y); +static inline VALUE rb_fix_mod_fix(VALUE x, VALUE y); +static inline bool FIXNUM_POSITIVE_P(VALUE num); +static inline bool FIXNUM_NEGATIVE_P(VALUE num); +static inline bool FIXNUM_ZERO_P(VALUE num); + static inline long rb_overflowed_fix_to_int(long x) { @@ -28,7 +45,10 @@ rb_overflowed_fix_to_int(long x) static inline VALUE rb_fix_plus_fix(VALUE x, VALUE y) { -#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW +#if !__has_builtin(__builtin_add_overflow) + long lz = FIX2LONG(x) + FIX2LONG(y); + return LONG2NUM(lz); +#else long lz; /* NOTE * (1) `LONG2FIX(FIX2LONG(x)+FIX2LONG(y))` @@ -56,16 +76,16 @@ rb_fix_plus_fix(VALUE x, VALUE y) else { return (VALUE)lz; } -#else - long lz = FIX2LONG(x) + FIX2LONG(y); - return LONG2NUM(lz); #endif } static inline VALUE rb_fix_minus_fix(VALUE x, VALUE y) { -#ifdef HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW +#if !__has_builtin(__builtin_sub_overflow) + long lz = FIX2LONG(x) - FIX2LONG(y); + return LONG2NUM(lz); +#else long lz; if (__builtin_sub_overflow((long)x, (long)y-1, &lz)) { return rb_int2big(rb_overflowed_fix_to_int(lz)); @@ -73,9 +93,6 @@ rb_fix_minus_fix(VALUE x, VALUE y) else { return (VALUE)lz; } -#else - long lz = FIX2LONG(x) - FIX2LONG(y); - return LONG2NUM(lz); #endif } @@ -147,4 +164,22 @@ rb_fix_mod_fix(VALUE x, VALUE y) rb_fix_divmod_fix(x, y, NULL, &mod); return mod; } + +static inline bool +FIXNUM_POSITIVE_P(VALUE num) +{ + return (SIGNED_VALUE)num > (SIGNED_VALUE)INT2FIX(0); +} + +static inline bool +FIXNUM_NEGATIVE_P(VALUE num) +{ + return (SIGNED_VALUE)num < 0; +} + +static inline bool +FIXNUM_ZERO_P(VALUE num) +{ + return num == INT2FIX(0); +} #endif /* INTERNAL_FIXNUM_H */ diff --git a/internal/numeric.h b/internal/numeric.h index 3e64b82dafcfee..c85327ea821710 100644 --- a/internal/numeric.h +++ b/internal/numeric.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/fixnum.h" /* for FIXNUM_POSITIVE_P */ struct RFloat { struct RBasic basic; @@ -19,10 +20,6 @@ struct RFloat { /* numeric.c */ -#define FIXNUM_POSITIVE_P(num) ((SIGNED_VALUE)(num) > (SIGNED_VALUE)INT2FIX(0)) -#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0) -#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0)) - #define INT_NEGATIVE_P(x) (FIXNUM_P(x) ? FIXNUM_NEGATIVE_P(x) : BIGNUM_NEGATIVE_P(x)) #define FLOAT_ZERO_P(x) (RFLOAT_VALUE(x) == 0.0) From 099778a6da8f0f2b32648f6d9b34233230ac6517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 11:30:11 +0900 Subject: [PATCH 179/878] internal/bingnum.h rework Turn macros into inline functions for better readability. Also add rb_int128t2big delcaration, which was missing. --- bignum.c | 2 +- internal/bignum.h | 141 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 107 insertions(+), 36 deletions(-) diff --git a/bignum.c b/bignum.c index 370c63c787c56a..3923da7d0b7be7 100644 --- a/bignum.c +++ b/bignum.c @@ -2996,7 +2996,7 @@ static VALUE bignew_1(VALUE klass, size_t len, int sign) { NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0)); - BIGNUM_SET_SIGN(big, sign); + BIGNUM_SET_SIGN((VALUE)big, sign); if (len <= BIGNUM_EMBED_LEN_MAX) { RBASIC(big)->flags |= BIGNUM_EMBED_FLAG; BIGNUM_SET_LEN(big, len); diff --git a/internal/bignum.h b/internal/bignum.h index ceb048f9fa6661..c35ba9eb4708d4 100644 --- a/internal/bignum.h +++ b/internal/bignum.h @@ -9,6 +9,15 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for HAVE_LIBGMP */ +#include /* for size_t */ + +#ifdef HAVE_SYS_TYPES_H +# include /* for ssize_t (note: on Windows ssize_t is */ +#endif /* `#define`d in ruby/config.h) */ + +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for struct RBasic */ #ifndef BDIGIT # if SIZEOF_INT*2 <= SIZEOF_LONG_LONG @@ -42,6 +51,7 @@ # define PRI_BDIGIT_DBL_PREFIX "l" # endif #endif + #ifndef SIZEOF_ACTUAL_BDIGIT # define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT #endif @@ -64,7 +74,14 @@ # define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X" #endif +#define RBIGNUM(obj) (R_CAST(RBignum)(obj)) +#define BIGNUM_SIGN_BIT FL_USER1 +#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2) #define BIGNUM_EMBED_LEN_NUMBITS 3 +#define BIGNUM_EMBED_LEN_MASK \ + (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT) +#define BIGNUM_EMBED_LEN_SHIFT \ + (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */ #ifndef BIGNUM_EMBED_LEN_MAX # if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1 # define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) @@ -73,6 +90,14 @@ # endif #endif +enum rb_int_parse_flags { + RB_INT_PARSE_SIGN = 0x01, + RB_INT_PARSE_UNDERSCORE = 0x02, + RB_INT_PARSE_PREFIX = 0x04, + RB_INT_PARSE_ALL = 0x07, + RB_INT_PARSE_DEFAULT = 0x07, +}; + struct RBignum { struct RBasic basic; union { @@ -83,34 +108,6 @@ struct RBignum { BDIGIT ary[BIGNUM_EMBED_LEN_MAX]; } as; }; -#define BIGNUM_SIGN_BIT ((VALUE)FL_USER1) -/* sign: positive:1, negative:0 */ -#define BIGNUM_SIGN(b) ((RBASIC(b)->flags & BIGNUM_SIGN_BIT) != 0) -#define BIGNUM_SET_SIGN(b,sign) \ - ((sign) ? (RBASIC(b)->flags |= BIGNUM_SIGN_BIT) \ - : (RBASIC(b)->flags &= ~BIGNUM_SIGN_BIT)) -#define BIGNUM_POSITIVE_P(b) BIGNUM_SIGN(b) -#define BIGNUM_NEGATIVE_P(b) (!BIGNUM_SIGN(b)) -#define BIGNUM_NEGATE(b) (RBASIC(b)->flags ^= BIGNUM_SIGN_BIT) - -#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2) -#define BIGNUM_EMBED_LEN_MASK \ - (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT) -#define BIGNUM_EMBED_LEN_SHIFT \ - (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */ -#define BIGNUM_LEN(b) \ - ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ - (size_t)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \ - (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \ - RBIGNUM(b)->as.heap.len) -/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */ -#define BIGNUM_DIGITS(b) \ - ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ - RBIGNUM(b)->as.ary : \ - RBIGNUM(b)->as.heap.digits) -#define BIGNUM_LENINT(b) rb_long2int(BIGNUM_LEN(b)) - -#define RBIGNUM(obj) (R_CAST(RBignum)(obj)) /* bignum.c */ extern const char ruby_digitmap[]; @@ -134,6 +131,14 @@ VALUE rb_big_ge(VALUE x, VALUE y); VALUE rb_big_lt(VALUE x, VALUE y); VALUE rb_big_le(VALUE x, VALUE y); VALUE rb_int_powm(int const argc, VALUE * const argv, VALUE const num); +static inline bool BIGNUM_SIGN(VALUE b); +static inline bool BIGNUM_POSITIVE_P(VALUE b); +static inline bool BIGNUM_NEGATIVE_P(VALUE b); +static inline void BIGNUM_SET_SIGN(VALUE b, bool sign); +static inline void BIGNUM_NEGATE(VALUE b); +static inline size_t BIGNUM_LEN(VALUE b); +static inline BDIGIT *BIGNUM_DIGITS(VALUE b); +static inline int BIGNUM_LENINT(VALUE b); RUBY_SYMBOL_EXPORT_BEGIN /* bignum.c (export) */ @@ -154,14 +159,80 @@ VALUE rb_big_divrem_gmp(VALUE x, VALUE y); VALUE rb_big2str_gmp(VALUE x, int base); VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck); #endif -enum rb_int_parse_flags { - RB_INT_PARSE_SIGN = 0x01, - RB_INT_PARSE_UNDERSCORE = 0x02, - RB_INT_PARSE_PREFIX = 0x04, - RB_INT_PARSE_ALL = 0x07, - RB_INT_PARSE_DEFAULT = 0x07 -}; VALUE rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits, int base, int flags); RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +#if defined(HAVE_INT128_T) +VALUE rb_int128t2big(int128_t n); +#endif +MJIT_SYMBOL_EXPORT_END + +/* sign: positive:1, negative:0 */ +static inline bool +BIGNUM_SIGN(VALUE b) +{ + return FL_TEST_RAW(b, BIGNUM_SIGN_BIT); +} + +static inline bool +BIGNUM_POSITIVE_P(VALUE b) +{ + return BIGNUM_SIGN(b); +} + +static inline bool +BIGNUM_NEGATIVE_P(VALUE b) +{ + return ! BIGNUM_POSITIVE_P(b); +} + +static inline void +BIGNUM_SET_SIGN(VALUE b, bool sign) +{ + if (sign) { + FL_SET_RAW(b, BIGNUM_SIGN_BIT); + } + else { + FL_UNSET_RAW(b, BIGNUM_SIGN_BIT); + } +} + +static inline void +BIGNUM_NEGATE(VALUE b) +{ + FL_REVERSE_RAW(b, BIGNUM_SIGN_BIT); +} + +static inline size_t +BIGNUM_LEN(VALUE b) +{ + if (! FL_TEST_RAW(b, BIGNUM_EMBED_FLAG)) { + return RBIGNUM(b)->as.heap.len; + } + else { + size_t ret = RBASIC(b)->flags; + ret &= BIGNUM_EMBED_LEN_MASK; + ret >>= BIGNUM_EMBED_LEN_SHIFT; + return ret; + } +} + +static inline int +BIGNUM_LENINT(VALUE b) +{ + return rb_long2int(BIGNUM_LEN(b)); +} + +/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */ +static inline BDIGIT * +BIGNUM_DIGITS(VALUE b) +{ + if (FL_TEST_RAW(b, BIGNUM_EMBED_FLAG)) { + return RBIGNUM(b)->as.ary; + } + else { + return RBIGNUM(b)->as.heap.digits; + } +} #endif /* INTERNAL_BIGNUM_H */ From f0c02a094988f804a339e9180a5e206fa123b902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 12:00:49 +0900 Subject: [PATCH 180/878] internal/numeric.h rework Marked MJIT_FUNC_EXPORTED functions as such. Other changes are rather cosmetic. --- internal/numeric.h | 95 +++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 34 deletions(-) diff --git a/internal/numeric.h b/internal/numeric.h index c85327ea821710..609b0c5fffa17a 100644 --- a/internal/numeric.h +++ b/internal/numeric.h @@ -9,44 +9,45 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/bignum.h" /* for BIGNUM_POSITIVE_P */ +#include "internal/bits.h" /* for RUBY_BIT_ROTL */ #include "internal/fixnum.h" /* for FIXNUM_POSITIVE_P */ +#include "internal/vm.h" /* for rb_method_basic_definition_p */ +#include "ruby/intern.h" /* for rb_cmperr */ +#include "ruby/ruby.h" /* for USE_FLONUM */ -struct RFloat { - struct RBasic basic; - double float_value; -}; - -#define RFLOAT(obj) (R_CAST(RFloat)(obj)) - -/* numeric.c */ - -#define INT_NEGATIVE_P(x) (FIXNUM_P(x) ? FIXNUM_NEGATIVE_P(x) : BIGNUM_NEGATIVE_P(x)) - -#define FLOAT_ZERO_P(x) (RFLOAT_VALUE(x) == 0.0) +#define ROUND_TO(mode, even, up, down) \ + ((mode) == RUBY_NUM_ROUND_HALF_EVEN ? even : \ + (mode) == RUBY_NUM_ROUND_HALF_UP ? up : down) +#define ROUND_FUNC(mode, name) \ + ROUND_TO(mode, name##_half_even, name##_half_up, name##_half_down) +#define ROUND_CALL(mode, name, args) \ + ROUND_TO(mode, name##_half_even args, \ + name##_half_up args, name##_half_down args) #ifndef ROUND_DEFAULT # define ROUND_DEFAULT RUBY_NUM_ROUND_HALF_UP #endif + enum ruby_num_rounding_mode { RUBY_NUM_ROUND_HALF_UP, RUBY_NUM_ROUND_HALF_EVEN, RUBY_NUM_ROUND_HALF_DOWN, - RUBY_NUM_ROUND_DEFAULT = ROUND_DEFAULT + RUBY_NUM_ROUND_DEFAULT = ROUND_DEFAULT, }; -#define ROUND_TO(mode, even, up, down) \ - ((mode) == RUBY_NUM_ROUND_HALF_EVEN ? even : \ - (mode) == RUBY_NUM_ROUND_HALF_UP ? up : down) -#define ROUND_FUNC(mode, name) \ - ROUND_TO(mode, name##_half_even, name##_half_up, name##_half_down) -#define ROUND_CALL(mode, name, args) \ - ROUND_TO(mode, name##_half_even args, \ - name##_half_up args, name##_half_down args) +struct RFloat { + struct RBasic basic; + double float_value; +}; + +#define RFLOAT(obj) (R_CAST(RFloat)(obj)) + +/* numeric.c */ int rb_num_to_uint(VALUE val, unsigned int *ret); VALUE ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl); double ruby_float_step_size(double beg, double end, double unit, int excl); int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl, int allow_endless); -double ruby_float_mod(double x, double y); int rb_num_negative_p(VALUE); VALUE rb_int_succ(VALUE num); VALUE rb_int_uminus(VALUE num); @@ -61,9 +62,7 @@ VALUE rb_int_idiv(VALUE x, VALUE y); VALUE rb_int_modulo(VALUE x, VALUE y); VALUE rb_int2str(VALUE num, int base); VALUE rb_fix_plus(VALUE x, VALUE y); -VALUE rb_fix_aref(VALUE fix, VALUE idx); VALUE rb_int_gt(VALUE x, VALUE y); -int rb_float_cmp(VALUE x, VALUE y); VALUE rb_float_gt(VALUE x, VALUE y); VALUE rb_int_ge(VALUE x, VALUE y); enum ruby_num_rounding_mode rb_num_get_rounding_option(VALUE opts); @@ -82,12 +81,49 @@ int rb_int_positive_p(VALUE num); int rb_int_negative_p(VALUE num); VALUE rb_num_pow(VALUE x, VALUE y); VALUE rb_float_ceil(VALUE num, int ndigits); +VALUE rb_float_abs(VALUE flt); +static inline VALUE rb_num_compare_with_zero(VALUE num, ID mid); +static inline int rb_num_positive_int_p(VALUE num); +static inline int rb_num_negative_int_p(VALUE num); +static inline double rb_float_flonum_value(VALUE v); +static inline double rb_float_noflonum_value(VALUE v); +static inline double rb_float_value_inline(VALUE v); +static inline VALUE rb_float_new_inline(double d); +static inline bool INT_NEGATIVE_P(VALUE num); +static inline bool FLOAT_ZERO_P(VALUE num); +#define rb_float_value rb_float_value_inline +#define rb_float_new rb_float_new_inline RUBY_SYMBOL_EXPORT_BEGIN /* numeric.c (export) */ VALUE rb_int_positive_pow(long x, unsigned long y); RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_flo_div_flo(VALUE x, VALUE y); +double ruby_float_mod(double x, double y); +VALUE rb_float_equal(VALUE x, VALUE y); +int rb_float_cmp(VALUE x, VALUE y); +VALUE rb_float_eql(VALUE x, VALUE y); +VALUE rb_fix_aref(VALUE fix, VALUE idx); +MJIT_SYMBOL_EXPORT_END + +static inline bool +INT_NEGATIVE_P(VALUE num) +{ + if (FIXNUM_P(num)) { + return FIXNUM_NEGATIVE_P(num); + } + else { + return BIGNUM_NEGATIVE_P(num); + } +} + +static inline bool +FLOAT_ZERO_P(VALUE num) +{ + return RFLOAT_VALUE(num) == 0.0; +} static inline VALUE rb_num_compare_with_zero(VALUE num, ID mid) @@ -116,7 +152,6 @@ rb_num_positive_int_p(VALUE num) return RTEST(rb_num_compare_with_zero(num, mid)); } - static inline int rb_num_negative_int_p(VALUE num) { @@ -133,12 +168,6 @@ rb_num_negative_int_p(VALUE num) return RTEST(rb_num_compare_with_zero(num, mid)); } - -VALUE rb_float_abs(VALUE flt); -VALUE rb_float_equal(VALUE x, VALUE y); -VALUE rb_float_eql(VALUE x, VALUE y); -VALUE rb_flo_div_flo(VALUE x, VALUE y); - static inline double rb_float_flonum_value(VALUE v) { @@ -163,7 +192,7 @@ rb_float_flonum_value(VALUE v) static inline double rb_float_noflonum_value(VALUE v) { - return ((struct RFloat *)v)->float_value; + return RFLOAT(v)->float_value; } static inline double @@ -205,6 +234,4 @@ rb_float_new_inline(double d) return rb_float_new_in_heap(d); } -#define rb_float_value(v) rb_float_value_inline(v) -#define rb_float_new(d) rb_float_new_inline(d) #endif /* INTERNAL_NUMERIC_H */ From e72b8592d9b4daa079d85d0ceb60f466edaec94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 12:37:15 +0900 Subject: [PATCH 181/878] internal/hash.h rework Reduce macros to make them inline functions, as well as mark MJIT_FUNC_EXPORTED functions explicitly as such. Definition of ar_hint_t is simplified. This has been the only possible definition so far. --- hash.c | 4 +- internal/hash.h | 243 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 166 insertions(+), 81 deletions(-) diff --git a/hash.c b/hash.c index 1fd3a335b3b8a3..44352c96f1266c 100644 --- a/hash.c +++ b/hash.c @@ -56,7 +56,7 @@ copy_default(struct RHash *hash, const struct RHash *hash2) { hash->basic.flags &= ~RHASH_PROC_DEFAULT; hash->basic.flags |= hash2->basic.flags & RHASH_PROC_DEFAULT; - RHASH_SET_IFNONE(hash, RHASH_IFNONE(hash2)); + RHASH_SET_IFNONE(hash, RHASH_IFNONE((VALUE)hash2)); } static VALUE @@ -1637,7 +1637,7 @@ struct update_arg { typedef int (*tbl_update_func)(st_data_t *, st_data_t *, st_data_t, int); int -rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg) +rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func, st_data_t arg) { if (RHASH_AR_TABLE_P(hash)) { int result = ar_update(hash, (st_data_t)key, func, arg); diff --git a/internal/hash.h b/internal/hash.h index 3f27bb8d8c57df..634092e4c2a058 100644 --- a/internal/hash.h +++ b/internal/hash.h @@ -9,77 +9,38 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for struct RBasic */ +#include "ruby/st.h" /* for struct st_table */ + +#define RHASH_AR_TABLE_MAX_SIZE SIZEOF_VALUE + +struct ar_table_struct; +typedef unsigned char ar_hint_t; enum ruby_rhash_flags { RHASH_PASS_AS_KEYWORDS = FL_USER1, /* FL 1 */ RHASH_PROC_DEFAULT = FL_USER2, /* FL 2 */ RHASH_ST_TABLE_FLAG = FL_USER3, /* FL 3 */ -#define RHASH_AR_TABLE_MAX_SIZE SIZEOF_VALUE RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7), /* FL 4..7 */ RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4), RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11), /* FL 8..11 */ RHASH_AR_TABLE_BOUND_SHIFT = (FL_USHIFT+8), - // we can not put it in "enum" because it can exceed "int" range. -#define RHASH_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 | /* FL 13..19 */ \ - FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19) - #if USE_TRANSIENT_HEAP RHASH_TRANSIENT_FLAG = FL_USER12, /* FL 12 */ #endif + // we can not put it in "enum" because it can exceed "int" range. +#define RHASH_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 | /* FL 13..19 */ \ + FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19) + RHASH_LEV_SHIFT = (FL_USHIFT + 13), RHASH_LEV_MAX = 127, /* 7 bits */ - - RHASH_ENUM_END }; -#define RHASH_AR_TABLE_SIZE_RAW(h) \ - ((unsigned int)((RBASIC(h)->flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT)) - -void rb_hash_st_table_set(VALUE hash, st_table *st); - -#if 0 /* for debug */ -int rb_hash_ar_table_p(VALUE hash); -struct ar_table_struct *rb_hash_ar_table(VALUE hash); -st_table *rb_hash_st_table(VALUE hash); -#define RHASH_AR_TABLE_P(hash) rb_hash_ar_table_p(hash) -#define RHASH_AR_TABLE(h) rb_hash_ar_table(h) -#define RHASH_ST_TABLE(h) rb_hash_st_table(h) -#else -#define RHASH_AR_TABLE_P(hash) (!FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG)) -#define RHASH_AR_TABLE(hash) (RHASH(hash)->as.ar) -#define RHASH_ST_TABLE(hash) (RHASH(hash)->as.st) -#endif - -#define RHASH(obj) (R_CAST(RHash)(obj)) -#define RHASH_ST_SIZE(h) (RHASH_ST_TABLE(h)->num_entries) -#define RHASH_ST_TABLE_P(h) (!RHASH_AR_TABLE_P(h)) -#define RHASH_ST_CLEAR(h) (FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG), RHASH(h)->as.ar = NULL) - -#define RHASH_AR_TABLE_SIZE_MASK (VALUE)RHASH_AR_TABLE_SIZE_MASK -#define RHASH_AR_TABLE_SIZE_SHIFT RHASH_AR_TABLE_SIZE_SHIFT -#define RHASH_AR_TABLE_BOUND_MASK (VALUE)RHASH_AR_TABLE_BOUND_MASK -#define RHASH_AR_TABLE_BOUND_SHIFT RHASH_AR_TABLE_BOUND_SHIFT - -#if USE_TRANSIENT_HEAP -#define RHASH_TRANSIENT_P(hash) FL_TEST_RAW((hash), RHASH_TRANSIENT_FLAG) -#define RHASH_SET_TRANSIENT_FLAG(h) FL_SET_RAW(h, RHASH_TRANSIENT_FLAG) -#define RHASH_UNSET_TRANSIENT_FLAG(h) FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG) -#else -#define RHASH_TRANSIENT_P(hash) 0 -#define RHASH_SET_TRANSIENT_FLAG(h) ((void)0) -#define RHASH_UNSET_TRANSIENT_FLAG(h) ((void)0) -#endif - -#if SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 2 -typedef uint16_t ar_hint_t; -#elif SIZEOF_VALUE / RHASH_AR_TABLE_MAX_SIZE == 1 -typedef unsigned char ar_hint_t; -#else -#error unsupported -#endif - struct RHash { struct RBasic basic; union { @@ -93,51 +54,175 @@ struct RHash { } ar_hint; }; -#ifdef RHASH_IFNONE -# undef RHASH_IFNONE -# undef RHASH_SIZE - -# define RHASH_IFNONE(h) (RHASH(h)->ifnone) -# define RHASH_SIZE(h) (RHASH_AR_TABLE_P(h) ? RHASH_AR_TABLE_SIZE_RAW(h) : RHASH_ST_SIZE(h)) -#endif /* ifdef RHASH_IFNONE */ +#define RHASH(obj) (R_CAST(RHash)(obj)) +#undef RHASH_IFNONE +#undef RHASH_SIZE /* hash.c */ -#if RHASH_CONVERT_TABLE_DEBUG -struct st_table *rb_hash_tbl_raw(VALUE hash, const char *file, int line); -#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h, __FILE__, __LINE__) -#else -struct st_table *rb_hash_tbl_raw(VALUE hash); -#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) -#endif - -VALUE rb_hash_new_with_size(st_index_t size); -VALUE rb_hash_has_key(VALUE hash, VALUE key); +void rb_hash_st_table_set(VALUE hash, st_table *st); VALUE rb_hash_default_value(VALUE hash, VALUE key); VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc); long rb_dbl_long_hash(double d); st_table *rb_init_identtable(void); -VALUE rb_hash_compare_by_id_p(VALUE hash); VALUE rb_to_hash_type(VALUE obj); VALUE rb_hash_key_str(VALUE); -VALUE rb_hash_keys(VALUE hash); VALUE rb_hash_values(VALUE hash); VALUE rb_hash_rehash(VALUE hash); -VALUE rb_hash_resurrect(VALUE hash); int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val); VALUE rb_hash_set_pair(VALUE hash, VALUE pair); - -int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval); int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval); -RUBY_SYMBOL_EXPORT_BEGIN -int rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg); -RUBY_SYMBOL_EXPORT_END int rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg); -int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg); +int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func, st_data_t arg); +static inline unsigned RHASH_AR_TABLE_SIZE_RAW(VALUE h); +static inline VALUE RHASH_IFNONE(VALUE h); +static inline size_t RHASH_SIZE(VALUE h); +static inline bool RHASH_AR_TABLE_P(VALUE h); +static inline bool RHASH_ST_TABLE_P(VALUE h); +static inline struct ar_table_struct *RHASH_AR_TABLE(VALUE h); +static inline st_table *RHASH_ST_TABLE(VALUE h); +static inline size_t RHASH_ST_SIZE(VALUE h); +static inline void RHASH_ST_CLEAR(VALUE h); +static inline bool RHASH_TRANSIENT_P(VALUE h); +static inline void RHASH_SET_TRANSIENT_FLAG(VALUE h); +static inline void RHASH_UNSET_TRANSIENT_FLAG(VALUE h); RUBY_SYMBOL_EXPORT_BEGIN /* hash.c (export) */ VALUE rb_hash_delete_entry(VALUE hash, VALUE key); VALUE rb_ident_hash_new(void); +int rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg); RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_hash_new_with_size(st_index_t size); +VALUE rb_hash_resurrect(VALUE hash); +int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval); +VALUE rb_hash_keys(VALUE hash); +VALUE rb_hash_has_key(VALUE hash, VALUE key); +VALUE rb_hash_compare_by_id_p(VALUE hash); + +#if RHASH_CONVERT_TABLE_DEBUG +st_table *rb_hash_tbl_raw(VALUE hash, const char *file, int line); +#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h, __FILE__, __LINE__) +#else +st_table *rb_hash_tbl_raw(VALUE hash); +#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) +#endif +MJIT_SYMBOL_EXPORT_END + +#if 0 /* for debug */ + +static inline bool +RHASH_AR_TABLE_P(VALUE h) +{ + extern int rb_hash_ar_table_p(VALUE hash); + return rb_hash_ar_table_p(h) +} + +static inline struct ar_table_struct * +RHASH_AR_TABLE(VALUE h) +{ + extern struct ar_table_struct *rb_hash_ar_table(VALUE hash); + return rb_hash_ar_table(h) +} + +static inline st_table * +RHASH_ST_TABLE(VALUE h) +{ + extern st_table *rb_hash_st_table(VALUE hash); + return rb_hash_st_table(h) +} + +#else + +static inline bool +RHASH_AR_TABLE_P(VALUE h) +{ + return ! FL_TEST_RAW(h, RHASH_ST_TABLE_FLAG); +} + +static inline struct ar_table_struct * +RHASH_AR_TABLE(VALUE h) +{ + return RHASH(h)->as.ar; +} + +static inline st_table * +RHASH_ST_TABLE(VALUE h) +{ + return RHASH(h)->as.st; +} + +#endif + +static inline VALUE +RHASH_IFNONE(VALUE h) +{ + return RHASH(h)->ifnone; +} + +static inline size_t +RHASH_SIZE(VALUE h) +{ + if (RHASH_AR_TABLE_P(h)) { + return RHASH_AR_TABLE_SIZE_RAW(h); + } + else { + return RHASH_ST_SIZE(h); + } +} + +static inline bool +RHASH_ST_TABLE_P(VALUE h) +{ + return ! RHASH_AR_TABLE_P(h); +} + +static inline size_t +RHASH_ST_SIZE(VALUE h) +{ + return RHASH_ST_TABLE(h)->num_entries; +} + +static inline void +RHASH_ST_CLEAR(VALUE h) +{ + FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG); + RHASH(h)->as.ar = NULL; +} + +static inline unsigned +RHASH_AR_TABLE_SIZE_RAW(VALUE h) +{ + unsigned ret = FL_TEST_RAW(h, RHASH_AR_TABLE_SIZE_MASK); + ret >>= RHASH_AR_TABLE_SIZE_SHIFT; + return ret; +} + +static inline bool +RHASH_TRANSIENT_P(VALUE h) +{ +#if USE_TRANSIENT_HEAP + return FL_TEST_RAW(h, RHASH_TRANSIENT_FLAG); +#else + return false; +#endif +} + +static inline void +RHASH_SET_TRANSIENT_FLAG(VALUE h) +{ +#if USE_TRANSIENT_HEAP + FL_SET_RAW(h, RHASH_TRANSIENT_FLAG); +#endif +} + +static inline void +RHASH_UNSET_TRANSIENT_FLAG(VALUE h) +{ +#if USE_TRANSIENT_HEAP + FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG); +#endif +} + #endif /* INTERNAL_HASH_H */ From 7d71d916a225c87ab15d62512f0e9cebad16832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 13:18:53 +0900 Subject: [PATCH 182/878] internal/struct.h rework Replace macros with inline functions of equivalent contents, for much improved readability. --- internal/struct.h | 114 +++++++++++++++++++++++++++++++++------------- 1 file changed, 82 insertions(+), 32 deletions(-) diff --git a/internal/struct.h b/internal/struct.h index f63b45007e2b68..b0f7f2eddde1c1 100644 --- a/internal/struct.h +++ b/internal/struct.h @@ -9,30 +9,17 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - -#define RSTRUCT_EMBED_LEN_MAX RSTRUCT_EMBED_LEN_MAX -#define RSTRUCT_EMBED_LEN_MASK RSTRUCT_EMBED_LEN_MASK -#define RSTRUCT_EMBED_LEN_SHIFT RSTRUCT_EMBED_LEN_SHIFT +#include "internal/gc.h" /* for RB_OBJ_WRITE */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for struct RBasic */ enum { RSTRUCT_EMBED_LEN_MAX = RVALUE_EMBED_LEN_MAX, RSTRUCT_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER1), RSTRUCT_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+1), RSTRUCT_TRANSIENT_FLAG = FL_USER3, - - RSTRUCT_ENUM_END }; -#if USE_TRANSIENT_HEAP -#define RSTRUCT_TRANSIENT_P(st) FL_TEST_RAW((obj), RSTRUCT_TRANSIENT_FLAG) -#define RSTRUCT_TRANSIENT_SET(st) FL_SET_RAW((st), RSTRUCT_TRANSIENT_FLAG) -#define RSTRUCT_TRANSIENT_UNSET(st) FL_UNSET_RAW((st), RSTRUCT_TRANSIENT_FLAG) -#else -#define RSTRUCT_TRANSIENT_P(st) 0 -#define RSTRUCT_TRANSIENT_SET(st) ((void)0) -#define RSTRUCT_TRANSIENT_UNSET(st) ((void)0) -#endif - struct RStruct { struct RBasic basic; union { @@ -44,38 +31,101 @@ struct RStruct { } as; }; +#define RSTRUCT(obj) (R_CAST(RStruct)(obj)) #undef RSTRUCT_LEN #undef RSTRUCT_PTR #undef RSTRUCT_SET #undef RSTRUCT_GET -#define RSTRUCT_EMBED_LEN(st) \ - (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \ - (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) -#define RSTRUCT_LEN(st) rb_struct_len(st) -#define RSTRUCT_LENINT(st) rb_long2int(RSTRUCT_LEN(st)) -#define RSTRUCT_CONST_PTR(st) rb_struct_const_ptr(st) -#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_CONST_PTR(RB_OBJ_WB_UNPROTECT_FOR(STRUCT, st))) -#define RSTRUCT_SET(st, idx, v) RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[idx], (v)) -#define RSTRUCT_GET(st, idx) (RSTRUCT_CONST_PTR(st)[idx]) -#define RSTRUCT(obj) (R_CAST(RStruct)(obj)) /* struct.c */ VALUE rb_struct_init_copy(VALUE copy, VALUE s); VALUE rb_struct_lookup(VALUE s, VALUE idx); VALUE rb_struct_s_keyword_init(VALUE klass); +static inline const VALUE *rb_struct_const_heap_ptr(VALUE st); +static inline bool RSTRUCT_TRANSIENT_P(VALUE st); +static inline void RSTRUCT_TRANSIENT_SET(VALUE st); +static inline void RSTRUCT_TRANSIENT_UNSET(VALUE st); +static inline long RSTRUCT_EMBED_LEN(VALUE st); +static inline long RSTRUCT_LEN(VALUE st); +static inline int RSTRUCT_LENINT(VALUE st); +static inline const VALUE *RSTRUCT_CONST_PTR(VALUE st); +static inline void RSTRUCT_SET(VALUE st, long k, VALUE v); +static inline VALUE RSTRUCT_GET(VALUE st, long k); + +static inline bool +RSTRUCT_TRANSIENT_P(VALUE st) +{ +#if USE_TRANSIENT_HEAP + return FL_TEST_RAW(st, RSTRUCT_TRANSIENT_FLAG); +#else + return false; +#endif +} + +static inline void +RSTRUCT_TRANSIENT_SET(VALUE st) +{ +#if USE_TRANSIENT_HEAP + FL_SET_RAW(st, RSTRUCT_TRANSIENT_FLAG); +#endif +} + +static inline void +RSTRUCT_TRANSIENT_UNSET(VALUE st) +{ +#if USE_TRANSIENT_HEAP + FL_UNSET_RAW(st, RSTRUCT_TRANSIENT_FLAG); +#endif +} static inline long -rb_struct_len(VALUE st) +RSTRUCT_EMBED_LEN(VALUE st) { - return (RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? - RSTRUCT_EMBED_LEN(st) : RSTRUCT(st)->as.heap.len; + long ret = FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK); + ret >>= RSTRUCT_EMBED_LEN_SHIFT; + return ret; +} + +static inline long +RSTRUCT_LEN(VALUE st) +{ + if (FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK)) { + return RSTRUCT_EMBED_LEN(st); + } + else { + return RSTRUCT(st)->as.heap.len; + } +} + +static inline int +RSTRUCT_LENINT(VALUE st) +{ + return rb_long2int(RSTRUCT_LEN(st)); } static inline const VALUE * -rb_struct_const_ptr(VALUE st) +RSTRUCT_CONST_PTR(VALUE st) +{ + const struct RStruct *p = RSTRUCT(st); + + if (FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK)) { + return p->as.ary; + } + else { + return p->as.heap.ptr; + } +} + +static inline void +RSTRUCT_SET(VALUE st, long k, VALUE v) +{ + RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[k], v); +} + +static inline VALUE +RSTRUCT_GET(VALUE st, long k) { - return FIX_CONST_VALUE_PTR((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? - RSTRUCT(st)->as.ary : RSTRUCT(st)->as.heap.ptr); + return RSTRUCT_CONST_PTR(st)[k]; } static inline const VALUE * From 63c9f620cf87fb5fa08cdb7b0b4cc70e787f5cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 13:49:14 +0900 Subject: [PATCH 183/878] internal/class.h rework This file has almost nothing to do. Added some #ifdef lines and rearranged file contents. Those macros are unable to translate into inline functions, because they are used as lvalues of assignments. --- internal/class.h | 80 ++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/internal/class.h b/internal/class.h index 8ba64a094b942f..254094e03820c1 100644 --- a/internal/class.h +++ b/internal/class.h @@ -9,17 +9,23 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "id_table.h" /* for struct rb_id_table */ +#include "internal/gc.h" /* for RB_OBJ_WRITE */ +#include "internal/serial.h" /* for rb_serial_t */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/intern.h" /* for rb_alloc_func_t */ +#include "ruby/ruby.h" /* for struct RBasic */ + +#undef RClass /* See also include/ruby/backward.h */ +#undef RCLASS_SUPER struct rb_deprecated_classext_struct { char conflict[sizeof(VALUE) * 3]; }; -struct rb_subclass_entry; -typedef struct rb_subclass_entry rb_subclass_entry_t; - struct rb_subclass_entry { VALUE klass; - rb_subclass_entry_t *next; + struct rb_subclass_entry *next; }; struct rb_classext_struct { @@ -30,14 +36,14 @@ struct rb_classext_struct { #endif struct rb_id_table *const_tbl; struct rb_id_table *callable_m_tbl; - rb_subclass_entry_t *subclasses; - rb_subclass_entry_t **parent_subclasses; + struct rb_subclass_entry *subclasses; + struct rb_subclass_entry **parent_subclasses; /** * In the case that this is an `ICLASS`, `module_subclasses` points to the link * in the module's `subclasses` list that indicates that the klass has been * included. Hopefully that makes sense. */ - rb_subclass_entry_t **module_subclasses; + struct rb_subclass_entry **module_subclasses; #if SIZEOF_SERIAL_T != SIZEOF_VALUE /* otherwise class_serial is in struct RClass */ rb_serial_t class_serial; #endif @@ -47,13 +53,10 @@ struct rb_classext_struct { const VALUE includer; }; -typedef struct rb_classext_struct rb_classext_t; - -#undef RClass struct RClass { struct RBasic basic; VALUE super; - rb_classext_t *ptr; + struct rb_classext_struct *ptr; #if SIZEOF_SERIAL_T == SIZEOF_VALUE /* Class serial is as wide as VALUE. Place it here. */ rb_serial_t class_serial; @@ -63,28 +66,8 @@ struct RClass { #endif }; -void rb_class_subclass_add(VALUE super, VALUE klass); -void rb_class_remove_from_super_subclasses(VALUE); -int rb_singleton_class_internal_p(VALUE sklass); -/* class.c */ -VALUE rb_class_boot(VALUE); -VALUE rb_class_inherited(VALUE, VALUE); -VALUE rb_make_metaclass(VALUE, VALUE); -VALUE rb_include_class_new(VALUE, VALUE); -void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE); -void rb_class_detach_subclasses(VALUE); -void rb_class_detach_module_subclasses(VALUE); -void rb_class_remove_from_module_subclasses(VALUE); -VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj); -VALUE rb_special_singleton_class(VALUE); -VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach); -VALUE rb_singleton_class_get(VALUE obj); - -int rb_class_has_methods(VALUE c); -void rb_undef_methods_from(VALUE klass, VALUE super); +typedef struct rb_subclass_entry rb_subclass_entry_t; +typedef struct rb_classext_struct rb_classext_t; #define RCLASS_EXT(c) (RCLASS(c)->ptr) #define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl) @@ -109,6 +92,36 @@ void rb_undef_methods_from(VALUE klass, VALUE super); #define RICLASS_IS_ORIGIN FL_USER5 #define RCLASS_REFINED_BY_ANY FL_USER7 +/* class.c */ +void rb_class_subclass_add(VALUE super, VALUE klass); +void rb_class_remove_from_super_subclasses(VALUE); +int rb_singleton_class_internal_p(VALUE sklass); +VALUE rb_class_boot(VALUE); +VALUE rb_make_metaclass(VALUE, VALUE); +VALUE rb_include_class_new(VALUE, VALUE); +void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE); +void rb_class_detach_subclasses(VALUE); +void rb_class_detach_module_subclasses(VALUE); +void rb_class_remove_from_module_subclasses(VALUE); +VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj); +VALUE rb_special_singleton_class(VALUE); +VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach); +VALUE rb_singleton_class_get(VALUE obj); +int rb_class_has_methods(VALUE c); +void rb_undef_methods_from(VALUE klass, VALUE super); +static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin); +static inline VALUE RCLASS_SUPER(VALUE klass); +static inline VALUE RCLASS_SET_SUPER(VALUE klass, VALUE super); +static inline void RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass); + +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_class_inherited(VALUE, VALUE); +VALUE rb_keyword_error_new(const char *, VALUE); +MJIT_SYMBOL_EXPORT_END + static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin) { @@ -122,7 +135,6 @@ RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass) RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass); } -#undef RCLASS_SUPER static inline VALUE RCLASS_SUPER(VALUE klass) { From 989068cf7087bf48f30c7f7c3f9acfa0bfd263ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 14:42:53 +0900 Subject: [PATCH 184/878] internal/imemo.h rework Arrange contents and eliminate macros, to make them readable. Macro IFUNC_NEW was deleted because there was only one usage. --- debug.c | 9 ++ internal.h | 2 + internal/imemo.h | 219 ++++++++++++++++++++++++++--------------------- proc.c | 3 +- 4 files changed, 135 insertions(+), 98 deletions(-) diff --git a/debug.c b/debug.c index a54be27152ab46..7c32f6dac02e71 100644 --- a/debug.c +++ b/debug.c @@ -19,6 +19,15 @@ #include "symbol.h" #include "id.h" +/* This is the only place struct RIMemo is actually used */ +struct RIMemo { + VALUE flags; + VALUE v0; + VALUE v1; + VALUE v2; + VALUE v3; +}; + /* for gdb */ const union { enum ruby_special_consts special_consts; diff --git a/internal.h b/internal.h index 337aee814d8f32..fa6f78b52f7338 100644 --- a/internal.h +++ b/internal.h @@ -30,6 +30,8 @@ #include "internal/sanitizers.h" #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0]))) +#define roomof(x, y) (((x) + (y) - 1) / (y)) +#define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) /* Prevent compiler from reordering access */ #define ACCESS_ONCE(type,x) (*((volatile type *)&(x))) diff --git a/internal/imemo.h b/internal/imemo.h index 682582a40ee7fa..d90b76366cb818 100644 --- a/internal/imemo.h +++ b/internal/imemo.h @@ -9,18 +9,26 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "internal/array.h" /* for rb_ary_tmp_new_fill */ +#include "internal/gc.h" /* for RB_OBJ_WRITE */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for rb_block_call_func_t */ #ifndef IMEMO_DEBUG -#define IMEMO_DEBUG 0 +# define IMEMO_DEBUG 0 #endif -struct RIMemo { - VALUE flags; - VALUE v0; - VALUE v1; - VALUE v2; - VALUE v3; -}; +#define IMEMO_MASK 0x0f + +/* FL_USER0 to FL_USER3 is for type */ +#define IMEMO_FL_USHIFT (FL_USHIFT + 4) +#define IMEMO_FL_USER0 FL_USER4 +#define IMEMO_FL_USER1 FL_USER5 +#define IMEMO_FL_USER2 FL_USER6 +#define IMEMO_FL_USER3 FL_USER7 +#define IMEMO_FL_USER4 FL_USER8 enum imemo_type { imemo_env = 0, @@ -35,38 +43,6 @@ enum imemo_type { imemo_ast = 9, imemo_parser_strterm = 10 }; -#define IMEMO_MASK 0x0f - -static inline enum imemo_type -imemo_type(VALUE imemo) -{ - return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK; -} - -static inline int -imemo_type_p(VALUE imemo, enum imemo_type imemo_type) -{ - if (LIKELY(!RB_SPECIAL_CONST_P(imemo))) { - /* fixed at compile time if imemo_type is given. */ - const VALUE mask = (IMEMO_MASK << FL_USHIFT) | RUBY_T_MASK; - const VALUE expected_type = (imemo_type << FL_USHIFT) | T_IMEMO; - /* fixed at runtime. */ - return expected_type == (RBASIC(imemo)->flags & mask); - } - else { - return 0; - } -} - -VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); - -/* FL_USER0 to FL_USER3 is for type */ -#define IMEMO_FL_USHIFT (FL_USHIFT + 4) -#define IMEMO_FL_USER0 FL_USER4 -#define IMEMO_FL_USER1 FL_USER5 -#define IMEMO_FL_USER2 FL_USER6 -#define IMEMO_FL_USER3 FL_USER7 -#define IMEMO_FL_USER4 FL_USER8 /* CREF (Class REFerence) is defined in method.h */ @@ -79,9 +55,6 @@ struct vm_svar { const VALUE others; }; - -#define THROW_DATA_CONSUMED IMEMO_FL_USER0 - /*! THROW_DATA */ struct vm_throw_data { VALUE flags; @@ -91,7 +64,7 @@ struct vm_throw_data { int throw_state; }; -#define THROW_DATA_P(err) RB_TYPE_P((VALUE)(err), T_IMEMO) +#define THROW_DATA_CONSUMED IMEMO_FL_USER0 /* IFUNC (Internal FUNCtion) */ @@ -113,56 +86,13 @@ struct vm_ifunc { struct vm_ifunc_argc argc; }; -#define IFUNC_NEW(a, b, c) ((struct vm_ifunc *)rb_imemo_new(imemo_ifunc, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) -struct vm_ifunc *rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc); -static inline struct vm_ifunc * -rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data) -{ - return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS); -} - -typedef struct rb_imemo_tmpbuf_struct { +struct rb_imemo_tmpbuf_struct { VALUE flags; VALUE reserved; VALUE *ptr; /* malloc'ed buffer */ struct rb_imemo_tmpbuf_struct *next; /* next imemo */ size_t cnt; /* buffer size in VALUE */ -} rb_imemo_tmpbuf_t; - -#define rb_imemo_tmpbuf_auto_free_pointer() rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0) -rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt); - -#define RB_IMEMO_TMPBUF_PTR(v) \ - ((void *)(((const struct rb_imemo_tmpbuf_struct *)(v))->ptr)) - -static inline void * -rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr) -{ - return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr; -} - -static inline VALUE -rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) -{ - const void *src; - VALUE imemo; - rb_imemo_tmpbuf_t *tmpbuf; - void *dst; - size_t len; - - SafeStringValue(str); - /* create tmpbuf to keep the pointer before xmalloc */ - imemo = rb_imemo_tmpbuf_auto_free_pointer(); - tmpbuf = (rb_imemo_tmpbuf_t *)imemo; - len = RSTRING_LEN(str); - src = RSTRING_PTR(str); - dst = ruby_xmalloc(len); - memcpy(dst, src, len); - tmpbuf->ptr = dst; - return imemo; -} - -void rb_strterm_mark(VALUE obj); +}; /*! MEMO * @@ -181,15 +111,11 @@ struct MEMO { } u3; }; -#define MEMO_V1_SET(m, v) RB_OBJ_WRITE((m), &(m)->v1, (v)) -#define MEMO_V2_SET(m, v) RB_OBJ_WRITE((m), &(m)->v2, (v)) - -#define MEMO_CAST(m) ((struct MEMO *)m) +/* ment is in method.h */ +#define THROW_DATA_P(err) imemo_throw_data_p((VALUE)err) +#define MEMO_CAST(m) (R_CAST(MEMO)(m)) #define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) - -#define roomof(x, y) (((x) + (y) - 1) / (y)) -#define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) #define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) #define NEW_MEMO_FOR(type, value) \ ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value)) @@ -198,7 +124,21 @@ struct MEMO { rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \ MEMO_FOR(type, value)) -/* ment is in method.h */ +typedef struct rb_imemo_tmpbuf_struct rb_imemo_tmpbuf_t; +VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0); +rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt); +struct vm_ifunc *rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc); +void rb_strterm_mark(VALUE obj); +static inline enum imemo_type imemo_type(VALUE imemo); +static inline int imemo_type_p(VALUE imemo, enum imemo_type imemo_type); +static inline bool imemo_throw_data_p(VALUE imemo); +static inline struct vm_ifunc *rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data); +static inline VALUE rb_imemo_tmpbuf_auto_free_pointer(void); +static inline void *RB_IMEMO_TMPBUF_PTR(VALUE v); +static inline void *rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr); +static inline VALUE rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str); +static inline void MEMO_V1_SET(struct MEMO *m, VALUE v); +static inline void MEMO_V2_SET(struct MEMO *m, VALUE v); RUBY_SYMBOL_EXPORT_BEGIN #if IMEMO_DEBUG @@ -209,4 +149,89 @@ VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0) #endif RUBY_SYMBOL_EXPORT_END +static inline enum imemo_type +imemo_type(VALUE imemo) +{ + return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK; +} + +static inline int +imemo_type_p(VALUE imemo, enum imemo_type imemo_type) +{ + if (LIKELY(!RB_SPECIAL_CONST_P(imemo))) { + /* fixed at compile time if imemo_type is given. */ + const VALUE mask = (IMEMO_MASK << FL_USHIFT) | RUBY_T_MASK; + const VALUE expected_type = (imemo_type << FL_USHIFT) | T_IMEMO; + /* fixed at runtime. */ + return expected_type == (RBASIC(imemo)->flags & mask); + } + else { + return 0; + } +} + +static inline bool +imemo_throw_data_p(VALUE imemo) +{ + return RB_TYPE_P(imemo, T_IMEMO); +} + +static inline struct vm_ifunc * +rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data) +{ + return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS); +} + +static inline VALUE +rb_imemo_tmpbuf_auto_free_pointer(void) +{ + return rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0); +} + +static inline void * +RB_IMEMO_TMPBUF_PTR(VALUE v) +{ + const struct rb_imemo_tmpbuf_struct *p = (const void *)v; + return p->ptr; +} + +static inline void * +rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr) +{ + return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr; +} + +static inline VALUE +rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) +{ + const void *src; + VALUE imemo; + rb_imemo_tmpbuf_t *tmpbuf; + void *dst; + size_t len; + + SafeStringValue(str); + /* create tmpbuf to keep the pointer before xmalloc */ + imemo = rb_imemo_tmpbuf_auto_free_pointer(); + tmpbuf = (rb_imemo_tmpbuf_t *)imemo; + len = RSTRING_LEN(str); + src = RSTRING_PTR(str); + dst = ruby_xmalloc(len); + memcpy(dst, src, len); + tmpbuf->ptr = dst; + return imemo; +} + +static inline void +MEMO_V1_SET(struct MEMO *m, VALUE v) +{ + RB_OBJ_WRITE(m, &m->v1, v); +} + +static inline void +MEMO_V2_SET(struct MEMO *m, VALUE v) +{ + RB_OBJ_WRITE(m, &m->v2, v); +} + #endif /* INTERNAL_IMEMO_H */ diff --git a/proc.c b/proc.c index 01890b11bb5790..e7178bebf51960 100644 --- a/proc.c +++ b/proc.c @@ -721,7 +721,8 @@ rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int m } arity.argc.min = min_argc; arity.argc.max = max_argc; - return IFUNC_NEW(func, data, arity.packed); + VALUE ret = rb_imemo_new(imemo_ifunc, (VALUE)func, (VALUE)data, arity.packed, 0); + return (struct vm_ifunc *)ret; } MJIT_FUNC_EXPORTED VALUE From f3a229fe2d8b1b5dcc4fc4577341256743421f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 15:11:09 +0900 Subject: [PATCH 185/878] internal/variable.h rework Eliminated macros. Also marked MJIT_FUNC_EXPORTED functions as such. Some of them are declared in constant.h so edited that file also. --- constant.h | 9 ++++--- internal/variable.h | 63 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/constant.h b/constant.h index 3f1418df17c850..610bdf1dfe5024 100644 --- a/constant.h +++ b/constant.h @@ -39,12 +39,15 @@ VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj); VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj); VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj); void rb_free_const_table(struct rb_id_table *tbl); +VALUE rb_const_source_location(VALUE, ID); + +MJIT_SYMBOL_EXPORT_BEGIN +int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag); +rb_const_entry_t *rb_const_lookup(VALUE klass, ID id); VALUE rb_public_const_get_at(VALUE klass, ID id); VALUE rb_public_const_get_from(VALUE klass, ID id); int rb_public_const_defined_from(VALUE klass, ID id); -rb_const_entry_t *rb_const_lookup(VALUE klass, ID id); -int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag); -VALUE rb_const_source_location(VALUE, ID); VALUE rb_const_source_location_at(VALUE, ID); +MJIT_SYMBOL_EXPORT_END #endif /* CONSTANT_H */ diff --git a/internal/variable.h b/internal/variable.h index 1de31f6b9212e3..1cdc06e08d776e 100644 --- a/internal/variable.h +++ b/internal/variable.h @@ -10,29 +10,24 @@ * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "constant.h" /* for rb_const_entry_t */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for VALUE */ + /* global variable */ +#define ROBJECT_TRANSIENT_FLAG FL_USER13 + +struct rb_global_variable; /* defined in variable.c */ + struct rb_global_entry { struct rb_global_variable *var; ID id; }; -struct rb_global_entry *rb_global_entry(ID); -VALUE rb_gvar_get(struct rb_global_entry *); -VALUE rb_gvar_set(struct rb_global_entry *, VALUE); -VALUE rb_gvar_defined(struct rb_global_entry *); - /* variable.c */ -#if USE_TRANSIENT_HEAP -#define ROBJECT_TRANSIENT_FLAG FL_USER13 -#define ROBJ_TRANSIENT_P(obj) FL_TEST_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_SET(obj) FL_SET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_UNSET(obj) FL_UNSET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#else -#define ROBJ_TRANSIENT_P(obj) 0 -#define ROBJ_TRANSIENT_SET(obj) ((void)0) -#define ROBJ_TRANSIENT_UNSET(obj) ((void)0) -#endif void rb_gc_mark_global_tbl(void); size_t rb_generic_ivar_memsize(VALUE); VALUE rb_search_class_path(VALUE); @@ -46,6 +41,9 @@ rb_gvar_getter_t *rb_gvar_getter_function_of(const struct rb_global_entry *); rb_gvar_setter_t *rb_gvar_setter_function_of(const struct rb_global_entry *); bool rb_gvar_is_traced(const struct rb_global_entry *); void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_); +static inline bool ROBJ_TRANSIENT_P(VALUE obj); +static inline void ROBJ_TRANSIENT_SET(VALUE obj); +static inline void ROBJ_TRANSIENT_UNSET(VALUE obj); RUBY_SYMBOL_EXPORT_BEGIN /* variable.c (export) */ @@ -56,4 +54,39 @@ int rb_class_ivar_set(VALUE klass, ID vid, VALUE value); void rb_iv_tbl_copy(VALUE dst, VALUE src); RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +struct rb_global_entry *rb_global_entry(ID); +VALUE rb_gvar_get(struct rb_global_entry *); +VALUE rb_gvar_set(struct rb_global_entry *, VALUE); +VALUE rb_gvar_defined(struct rb_global_entry *); +struct st_table *rb_ivar_generic_ivtbl(void); +void rb_const_warn_if_deprecated(const rb_const_entry_t *, VALUE, ID); +MJIT_SYMBOL_EXPORT_END + +static inline bool +ROBJ_TRANSIENT_P(VALUE obj) +{ +#if USE_TRANSIENT_HEAP + return FL_TEST_RAW(obj, ROBJECT_TRANSIENT_FLAG); +#else + return false; +#endif +} + +static inline void +ROBJ_TRANSIENT_SET(VALUE obj) +{ +#if USE_TRANSIENT_HEAP + FL_SET_RAW(obj, ROBJECT_TRANSIENT_FLAG); +#endif +} + +static inline void +ROBJ_TRANSIENT_UNSET(VALUE obj) +{ +#if USE_TRANSIENT_HEAP + FL_UNSET_RAW(obj, ROBJECT_TRANSIENT_FLAG); +#endif +} + #endif /* INTERNAL_VARIABLE_H */ From 0723db6c3972615ebce9e1ed03d4cb2a17d3fcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 15:32:02 +0900 Subject: [PATCH 186/878] internal/array.h rework Rearrange contents for better readability, reduce macros for the same reason, and mark MJIT_FUNC_EXPORTED functions as such. --- internal/array.h | 97 +++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 42 deletions(-) diff --git a/internal/array.h b/internal/array.h index 77f47dc5a21826..857edacf97d496 100644 --- a/internal/array.h +++ b/internal/array.h @@ -10,57 +10,44 @@ * file COPYING are met. Consult the file for details. */ -/* array.c */ +#include "ruby/config.h" +#include /* for size_t */ +#include "internal/static_assert.h" /* for STATIC_ASSERT */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for RARRAY_LEN */ #ifndef ARRAY_DEBUG -#define ARRAY_DEBUG (0+RUBY_DEBUG) +# define ARRAY_DEBUG (0+RUBY_DEBUG) #endif -#ifdef ARRAY_DEBUG #define RARRAY_PTR_IN_USE_FLAG FL_USER14 -#define ARY_PTR_USING_P(ary) FL_TEST_RAW((ary), RARRAY_PTR_IN_USE_FLAG) -#else - -/* disable debug function */ -#undef RARRAY_PTR_USE_START_TRANSIENT -#undef RARRAY_PTR_USE_END_TRANSIENT -#define RARRAY_PTR_USE_START_TRANSIENT(a) ((VALUE *)RARRAY_CONST_PTR_TRANSIENT(a)) -#define RARRAY_PTR_USE_END_TRANSIENT(a) -#define ARY_PTR_USING_P(ary) 0 - -#endif - -#if USE_TRANSIENT_HEAP -#define RARY_TRANSIENT_SET(ary) FL_SET_RAW((ary), RARRAY_TRANSIENT_FLAG); -#define RARY_TRANSIENT_UNSET(ary) FL_UNSET_RAW((ary), RARRAY_TRANSIENT_FLAG); -#else -#undef RARRAY_TRANSIENT_P -#define RARRAY_TRANSIENT_P(a) 0 -#define RARY_TRANSIENT_SET(ary) ((void)0) -#define RARY_TRANSIENT_UNSET(ary) ((void)0) -#endif +/* array.c */ VALUE rb_ary_last(int, const VALUE *, VALUE); void rb_ary_set_len(VALUE, long); void rb_ary_delete_same(VALUE, VALUE); VALUE rb_ary_tmp_new_fill(long capa); VALUE rb_ary_at(VALUE, VALUE); -VALUE rb_ary_aref1(VALUE ary, VALUE i); size_t rb_ary_memsize(VALUE); VALUE rb_to_array_type(VALUE obj); -VALUE rb_check_to_array(VALUE ary); +static inline VALUE rb_ary_entry_internal(VALUE ary, long offset); +static inline bool ARY_PTR_USING_P(VALUE ary); +static inline void RARY_TRANSIENT_SET(VALUE ary); +static inline void RARY_TRANSIENT_UNSET(VALUE ary); + +RUBY_SYMBOL_EXPORT_BEGIN +/* array.c (export) */ +void rb_ary_detransient(VALUE a); +VALUE *rb_ary_ptr_use_start(VALUE ary); +void rb_ary_ptr_use_end(VALUE ary); +RUBY_SYMBOL_EXPORT_END + +MJIT_SYMBOL_EXPORT_BEGIN VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *); +VALUE rb_check_to_array(VALUE ary); VALUE rb_ary_behead(VALUE, long); -#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) -#define rb_ary_new_from_args(n, ...) \ - __extension__ ({ \ - const VALUE args_to_new_ary[] = {__VA_ARGS__}; \ - if (__builtin_constant_p(n)) { \ - STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \ - } \ - rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \ - }) -#endif +VALUE rb_ary_aref1(VALUE ary, VALUE i); +MJIT_SYMBOL_EXPORT_END static inline VALUE rb_ary_entry_internal(VALUE ary, long offset) @@ -78,11 +65,37 @@ rb_ary_entry_internal(VALUE ary, long offset) return ptr[offset]; } -RUBY_SYMBOL_EXPORT_BEGIN -/* array.c (export) */ -void rb_ary_detransient(VALUE a); -VALUE *rb_ary_ptr_use_start(VALUE ary); -void rb_ary_ptr_use_end(VALUE ary); -RUBY_SYMBOL_EXPORT_END +static inline bool +ARY_PTR_USING_P(VALUE ary) +{ + return FL_TEST_RAW(ary, RARRAY_PTR_IN_USE_FLAG); +} + +static inline void +RARY_TRANSIENT_SET(VALUE ary) +{ +#if USE_TRANSIENT_HEAP + FL_SET_RAW(ary, RARRAY_TRANSIENT_FLAG); +#endif +} + +static inline void +RARY_TRANSIENT_UNSET(VALUE ary) +{ +#if USE_TRANSIENT_HEAP + FL_UNSET_RAW(ary, RARRAY_TRANSIENT_FLAG); +#endif +} + +#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) +#define rb_ary_new_from_args(n, ...) \ + __extension__ ({ \ + const VALUE args_to_new_ary[] = {__VA_ARGS__}; \ + if (__builtin_constant_p(n)) { \ + STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \ + } \ + rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \ + }) +#endif #endif /* INTERNAL_ARRAY_H */ From 23c2a27bf6a36ed31171c681af2288ce3a02912b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 16:12:39 +0900 Subject: [PATCH 187/878] internal/compile.h rework This file containes other materials than in compile.c. I could perhaps split them into files, but felt overkill. Just add comments that describe the situations. --- internal/compile.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/compile.h b/internal/compile.h index f6091ba07693c8..43ca055198f8d9 100644 --- a/internal/compile.h +++ b/internal/compile.h @@ -9,14 +9,24 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "ruby/ruby.h" /* for rb_event_flag_t */ + +struct rb_iseq_struct; /* in vm_core.h */ /* compile.c */ -struct rb_block; -struct rb_iseq_struct; int rb_dvar_defined(ID, const struct rb_iseq_struct *); int rb_local_defined(ID, const struct rb_iseq_struct *); -const char * rb_insns_name(int i); +const char *rb_insns_name(int i); VALUE rb_insns_name_array(void); + +/* iseq.c */ int rb_vm_insn_addr2insn(const void *); +MJIT_SYMBOL_EXPORT_BEGIN +/* iseq.c (export) */ +rb_event_flag_t rb_iseq_event_flags(const struct rb_iseq_struct *iseq, size_t pos); +MJIT_SYMBOL_EXPORT_END + #endif /* INTERNAL_COMPILE_H */ From ec6f6b53d88b47570c3c2b83cefee2cfd7b72ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 17:06:37 +0900 Subject: [PATCH 188/878] internal/error.h rework Reduce macros for readability. Also transplanted some part of internal/file.h into here because the delcared functions are in fact defined in error.c. --- internal/error.h | 120 ++++++++++++++++++++++++++++++++++++----------- internal/file.h | 16 ------- 2 files changed, 92 insertions(+), 44 deletions(-) diff --git a/internal/error.h b/internal/error.h index 5eddc7670f0e52..6c645b21bb4baf 100644 --- a/internal/error.h +++ b/internal/error.h @@ -9,8 +9,32 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for va_list */ +#include "internal/stdbool.h" /* for bool */ +#include "internal/string.h" /* for rb_fstring_cstr */ +#include "ruby/encoding.h" /* for rb_encoding */ +#include "ruby/intern.h" /* for rb_exc_raise */ +#include "ruby/ruby.h" /* for enum ruby_value_type */ + +#undef Check_Type /* in ruby/ruby.h */ +#define rb_raise_static(e, m) \ + rb_raise_cstr_i((e), rb_str_new_static((m), rb_strlen_lit(m))) +#ifdef RUBY_FUNCTION_NAME_STRING +# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path) +# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path)) +#else +# define rb_sys_fail_path(path) rb_sys_fail_str(path) +# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path)) +#endif /* error.c */ +typedef enum { + RB_WARN_CATEGORY_NONE, + RB_WARN_CATEGORY_DEPRECATED, + RB_WARN_CATEGORY_EXPERIMENTAL, +} rb_warning_category_t; + extern VALUE rb_eEAGAIN; extern VALUE rb_eEWOULDBLOCK; extern VALUE rb_eEINPROGRESS; @@ -19,54 +43,94 @@ NORETURN(void rb_async_bug_errno(const char *,int)); const char *rb_builtin_type_name(int t); const char *rb_builtin_class_name(VALUE x); PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3); -#ifdef RUBY_ENCODING_H VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4); -#endif - -typedef enum { - RB_WARN_CATEGORY_NONE, - RB_WARN_CATEGORY_DEPRECATED, - RB_WARN_CATEGORY_EXPERIMENTAL, -} rb_warning_category_t; rb_warning_category_t rb_warning_category_from_name(VALUE category); bool rb_warning_category_enabled_p(rb_warning_category_t category); - -#define rb_raise_cstr(etype, mesg) \ - rb_exc_raise(rb_exc_new_str(etype, rb_str_new_cstr(mesg))) -#define rb_raise_static(etype, mesg) \ - rb_exc_raise(rb_exc_new_str(etype, rb_str_new_static(mesg, rb_strlen_lit(mesg)))) - VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method); -#define rb_name_err_raise_str(mesg, recv, name) \ - rb_exc_raise(rb_name_err_new(mesg, recv, name)) -#define rb_name_err_raise(mesg, recv, name) \ - rb_name_err_raise_str(rb_fstring_cstr(mesg), (recv), (name)) VALUE rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv); VALUE rb_key_err_new(VALUE mesg, VALUE recv, VALUE name); -#define rb_key_err_raise(mesg, recv, name) \ - rb_exc_raise(rb_key_err_new(mesg, recv, name)) PRINTF_ARGS(VALUE rb_warning_string(const char *fmt, ...), 1, 2); NORETURN(void rb_vraise(VALUE, const char *, va_list)); +NORETURN(static inline void rb_raise_cstr(VALUE etype, const char *mesg)); +NORETURN(static inline void rb_raise_cstr_i(VALUE etype, VALUE mesg)); +NORETURN(static inline void rb_name_err_raise_str(VALUE mesg, VALUE recv, VALUE name)); +NORETURN(static inline void rb_name_err_raise(const char *mesg, VALUE recv, VALUE name)); +NORETURN(static inline void rb_key_err_raise(VALUE mesg, VALUE recv, VALUE name)); +static inline void Check_Type(VALUE v, enum ruby_value_type t); +static inline bool rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type); +#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline RUBY_SYMBOL_EXPORT_BEGIN /* error.c (export) */ int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data); NORETURN(void rb_unexpected_type(VALUE,int)); -#undef Check_Type -#define Check_Type(v, t) \ - (!RB_TYPE_P((VALUE)(v), (t)) || \ - ((t) == RUBY_T_DATA && RTYPEDDATA_P(v)) ? \ - rb_unexpected_type((VALUE)(v), (t)) : (void)0) +#ifdef RUBY_FUNCTION_NAME_STRING +NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path)); +NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)); +#endif +RUBY_SYMBOL_EXPORT_END -static inline int +static inline void +rb_raise_cstr_i(VALUE etype, VALUE mesg) +{ + VALUE exc = rb_exc_new_str(etype, mesg); + rb_exc_raise(exc); +} + +static inline void +rb_raise_cstr(VALUE etype, const char *mesg) +{ + VALUE str = rb_str_new_cstr(mesg); + rb_raise_cstr_i(etype, str); +} + +static inline void +rb_name_err_raise_str(VALUE mesg, VALUE recv, VALUE name) +{ + VALUE exc = rb_name_err_new(mesg, recv, name); + rb_exc_raise(exc); +} + +static inline void +rb_name_err_raise(const char *mesg, VALUE recv, VALUE name) +{ + VALUE str = rb_fstring_cstr(mesg); + rb_name_err_raise_str(str, recv, name); +} + +static inline void +rb_key_err_raise(VALUE mesg, VALUE recv, VALUE name) +{ + VALUE exc = rb_key_err_new(mesg, recv, name); + rb_exc_raise(exc); +} + +static inline void +Check_Type(VALUE v, enum ruby_value_type t) +{ + if (! RB_TYPE_P(v, (int)t)) { + goto unexpected; + } + else if (t != T_DATA) { + return; + } + else if (! RTYPEDDATA_P(v)) { + goto unexpected; + } + else { + return; + } + unexpected: + rb_unexpected_type(v, t); +} + +static inline bool rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type) { return RB_TYPE_P(obj, T_DATA) && RTYPEDDATA_P(obj) && (RTYPEDDATA_TYPE(obj) == data_type); } -#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline -RUBY_SYMBOL_EXPORT_END #endif /* INTERNAL_ERROR_H */ diff --git a/internal/file.h b/internal/file.h index f4a0794dc66d60..0bbf50f296bb4c 100644 --- a/internal/file.h +++ b/internal/file.h @@ -26,22 +26,6 @@ VALUE rb_get_path_check_to_string(VALUE); VALUE rb_get_path_check_convert(VALUE); int ruby_is_fd_loadable(int fd); -#ifdef RUBY_FUNCTION_NAME_STRING -# if defined __GNUC__ && __GNUC__ >= 4 -# pragma GCC visibility push(default) -# endif -NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path)); -NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)); -# if defined __GNUC__ && __GNUC__ >= 4 -# pragma GCC visibility pop -# endif -# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path) -# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path)) -#else -# define rb_sys_fail_path(path) rb_sys_fail_str(path) -# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path)) -#endif - RUBY_SYMBOL_EXPORT_BEGIN /* file.c (export) */ #if defined HAVE_READLINK && defined RUBY_ENCODING_H From adc49f0f9a1106fc5a81b5aba684ec1578ac7d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 17:20:07 +0900 Subject: [PATCH 189/878] internal/sanitizers.h rework Rearrange macro orders for better readability. --- internal/sanitizers.h | 76 +++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/internal/sanitizers.h b/internal/sanitizers.h index 4c6ad28e718f72..680b553bae286f 100644 --- a/internal/sanitizers.h +++ b/internal/sanitizers.h @@ -9,15 +9,33 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include "internal/compilers.h" /* for __has_feature */ +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include +#endif + +#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H +# include +#endif + +#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H +# if __has_feature(memory_sanitizer) +# include +# endif +#endif + +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for VALUE */ #if 0 -#elif defined(NO_SANITIZE) && __has_feature(memory_sanitizer) +#elif __has_feature(memory_sanitizer) && __has_feature(address_sanitizer) # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_SANITIZE("memory", NO_SANITIZE("address", NOINLINE(x))) -#elif defined(NO_SANITIZE) + __attribute__((__no_sanitize__("memory, address"), __noinline__)) x +#elif __has_feature(address_sanitizer) # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - NO_SANITIZE("address", NOINLINE(x)) + __attribute__((__no_sanitize__("memory, address"), __noinline__)) x #elif defined(NO_SANITIZE_ADDRESS) # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ NO_SANITIZE_ADDRESS(NOINLINE(x)) @@ -30,8 +48,9 @@ #if defined(NO_SANITIZE) && defined(__GNUC__) &&! defined(__clang__) /* GCC warns about unknown sanitizer, which is annoying. */ -#undef NO_SANITIZE -#define NO_SANITIZE(x, y) \ +# include "internal/warnings.h" +# undef NO_SANITIZE +# define NO_SANITIZE(x, y) \ COMPILER_WARNING_PUSH; \ COMPILER_WARNING_IGNORED(-Wattributes); \ __attribute__((__no_sanitize__(x))) y; \ @@ -42,37 +61,12 @@ # define NO_SANITIZE(x, y) y #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -# include -# ifndef VALGRIND_MAKE_MEM_DEFINED -# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) -# endif -# ifndef VALGRIND_MAKE_MEM_UNDEFINED -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) -# endif -#else -# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 -#endif - -#ifndef MJIT_HEADER - -#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H -# include -#endif - #if !__has_feature(address_sanitizer) # define __asan_poison_memory_region(x, y) # define __asan_unpoison_memory_region(x, y) # define __asan_region_is_poisoned(x, y) 0 #endif -#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H -# if __has_feature(memory_sanitizer) -# include -# endif -#endif - #if !__has_feature(memory_sanitizer) # define __msan_allocated_memory(x, y) ((void)(x), (void)(y)) # define __msan_poison(x, y) ((void)(x), (void)(y)) @@ -80,6 +74,24 @@ # define __msan_unpoison_string(x) ((void)(x)) #endif +#ifdef VALGRIND_MAKE_READABLE +# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) +#endif + +#ifdef VALGRIND_MAKE_WRITABLE +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) +#endif + +#ifndef VALGRIND_MAKE_MEM_DEFINED +# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 +#endif + +#ifndef VALGRIND_MAKE_MEM_UNDEFINED +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 +#endif + +#ifndef MJIT_HEADER + /*! * This function asserts that a (continuous) memory region from ptr to size * being "poisoned". Both read / write access to such memory region are @@ -174,6 +186,6 @@ asan_unpoison_object(VALUE obj, bool newobj_p) asan_unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p); } -#endif +#endif /* MJIT_HEADER */ #endif /* INTERNAL_SANITIZERS_H */ From c27bcd70574165d30bb3a9dc50a6b35fc419ab2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 10:26:41 +0900 Subject: [PATCH 190/878] internal/gc.h rework Improved readability by reducing the use of macros. Also moved some part of internal/compilers.h into this file, because it seems to be the right place for them. --- internal/compilers.h | 18 ------ internal/gc.h | 141 ++++++++++++++++++++++++++++++++----------- 2 files changed, 106 insertions(+), 53 deletions(-) diff --git a/internal/compilers.h b/internal/compilers.h index 781dd9cfc93e50..0f470937c56df8 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -236,22 +236,4 @@ rb_obj_builtin_type(VALUE obj) # define BITFIELD(type, name, size) unsigned int name : size #endif -#if defined(USE_UNALIGNED_MEMBER_ACCESS) && USE_UNALIGNED_MEMBER_ACCESS && \ - (defined(__clang__) || GCC_VERSION_SINCE(9, 0, 0)) -#include "warnings.h" -# define UNALIGNED_MEMBER_ACCESS(expr) __extension__({ \ - COMPILER_WARNING_PUSH; \ - COMPILER_WARNING_IGNORED(-Waddress-of-packed-member); \ - typeof(expr) unaligned_member_access_result = (expr); \ - COMPILER_WARNING_POP; \ - unaligned_member_access_result; \ -}) -#else -# define UNALIGNED_MEMBER_ACCESS(expr) expr -#endif -#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem) - -#undef RB_OBJ_WRITE -#define RB_OBJ_WRITE(a, slot, b) UNALIGNED_MEMBER_ACCESS(rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)) - #endif /* INTERNAL_COMPILERS_H */ diff --git a/internal/gc.h b/internal/gc.h index 6e3fb8996d088f..74e52187c7a41a 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -9,6 +9,48 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" + +#include /* for size_t */ + +#include "internal/compilers.h" /* for __has_attribute */ +#include "ruby/ruby.h" /* for rb_event_flag_t */ + +struct rb_execution_context_struct; /* in vm_core.h */ + +#undef NEWOBJ_OF +#undef RB_NEWOBJ_OF +#undef RB_OBJ_WRITE + +/* optimized version of NEWOBJ() */ +#define RB_NEWOBJ_OF(var, T, c, f) \ + T *(var) = (T *)(((f) & FL_WB_PROTECTED) ? \ + rb_wb_protected_newobj_of((c), (f) & ~FL_WB_PROTECTED) : \ + rb_wb_unprotected_newobj_of((c), (f))) +#define NEWOBJ_OF(var, T, c, f) RB_NEWOBJ_OF((var), T, (c), (f)) +#define RB_OBJ_GC_FLAGS_MAX 6 /* used in ext/objspace */ + +#ifndef USE_UNALIGNED_MEMBER_ACCESS +# define UNALIGNED_MEMBER_ACCESS(expr) (expr) +#elif ! USE_UNALIGNED_MEMBER_ACCESS +# define UNALIGNED_MEMBER_ACCESS(expr) (expr) +#elif ! (__has_warning("-Waddress-of-packed-member") || GCC_VERSION_SINCE(9, 0, 0)) +# define UNALIGNED_MEMBER_ACCESS(expr) (expr) +#else +# include "internal/warnings.h" +# define UNALIGNED_MEMBER_ACCESS(expr) __extension__({ \ + COMPILER_WARNING_PUSH; \ + COMPILER_WARNING_IGNORED(-Waddress-of-packed-member); \ + __typeof__(expr) unaligned_member_access_result = (expr); \ + COMPILER_WARNING_POP; \ + unaligned_member_access_result; \ +}) +#endif + +#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem) +#define RB_OBJ_WRITE(a, slot, b) \ + UNALIGNED_MEMBER_ACCESS(\ + rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)) /* gc.c */ extern VALUE *ruby_initial_gc_stress_ptr; @@ -16,62 +58,91 @@ extern int ruby_disable_gc; void *ruby_mimmalloc(size_t size) RUBY_ATTR_MALLOC; void ruby_mimfree(void *ptr); void rb_objspace_set_event_hook(const rb_event_flag_t event); -#if USE_RGENGC -void rb_gc_writebarrier_remember(VALUE obj); -#else -#define rb_gc_writebarrier_remember(obj) 0 -#endif void ruby_gc_set_params(void); void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj); - -#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32) -#define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size) -#define ruby_sized_xrealloc2(ptr, new_count, element_size, old_count) ruby_xrealloc2(ptr, new_count, element_size) -#define ruby_sized_xfree(ptr, size) ruby_xfree(ptr) -#define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n) -#else -RUBY_SYMBOL_EXPORT_BEGIN -void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2)); -void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3)); -void ruby_sized_xfree(void *x, size_t size); -RUBY_SYMBOL_EXPORT_END -#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc2((void*)(var), (n), sizeof(type), (old_n))) -#endif - -/* optimized version of NEWOBJ() */ -#undef NEWOBJF_OF -#undef RB_NEWOBJ_OF -#define RB_NEWOBJ_OF(obj,type,klass,flags) \ - type *(obj) = (type*)(((flags) & FL_WB_PROTECTED) ? \ - rb_wb_protected_newobj_of(klass, (flags) & ~FL_WB_PROTECTED) : \ - rb_wb_unprotected_newobj_of(klass, flags)) -#define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags) - #if __has_attribute(alloc_align) __attribute__((__alloc_align__(1))) #endif void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_MALLOC RUBY_ATTR_ALLOC_SIZE((2)); - size_t rb_size_mul_or_raise(size_t, size_t, VALUE); /* used in compile.c */ size_t rb_size_mul_add_or_raise(size_t, size_t, size_t, VALUE); /* used in iseq.h */ void *rb_xmalloc_mul_add(size_t, size_t, size_t) RUBY_ATTR_MALLOC; void *rb_xrealloc_mul_add(const void *, size_t, size_t, size_t); void *rb_xmalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; void *rb_xcalloc_mul_add_mul(size_t, size_t, size_t, size_t) RUBY_ATTR_MALLOC; +static inline void *ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2)); +static inline void *ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3)); +static inline void ruby_sized_xfree_inlined(void *ptr, size_t size); RUBY_SYMBOL_EXPORT_BEGIN -const char *rb_objspace_data_type_name(VALUE obj); - /* gc.c (export) */ +const char *rb_objspace_data_type_name(VALUE obj); VALUE rb_wb_protected_newobj_of(VALUE, VALUE); VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE); - size_t rb_obj_memsize_of(VALUE); void rb_gc_verify_internal_consistency(void); - -#define RB_OBJ_GC_FLAGS_MAX 6 size_t rb_obj_gc_flags(VALUE, ID[], size_t); void rb_gc_mark_values(long n, const VALUE *values); void rb_gc_mark_vm_stack_values(long n, const VALUE *values); +void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2)); +void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3)); +void ruby_sized_xfree(void *x, size_t size); RUBY_SYMBOL_EXPORT_END + +MJIT_SYMBOL_EXPORT_BEGIN +int rb_ec_stack_check(struct rb_execution_context_struct *ec); +void rb_gc_writebarrier_remember(VALUE obj); +const char *rb_obj_info(VALUE obj); +MJIT_SYMBOL_EXPORT_END + +#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32) + +static inline void * +ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size) +{ + return ruby_xrealloc(ptr, new_size); +} + +static inline void * +ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count) +{ + return ruby_xrealloc2(ptr, new_count, elemsiz); +} + +static inline void +ruby_sized_xfree_inlined(void *ptr, size_t size) +{ + ruby_xfree(ptr); +} + +# define SIZED_REALLOC_N(x, y, z, w) REALLOC_N(x, y, z) + +#else + +static inline void * +ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size) +{ + return ruby_sized_xrealloc(ptr, new_size, old_size); +} + +static inline void * +ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count) +{ + return ruby_sized_xrealloc2(ptr, new_count, elemsiz, old_count); +} + +static inline void +ruby_sized_xfree_inlined(void *ptr, size_t size) +{ + ruby_sized_xfree(ptr, size); +} + +# define SIZED_REALLOC_N(v, T, m, n) \ + ((v) = (T *)ruby_sized_xrealloc2((void *)(v), (n), sizeof(T), (m))) + +#endif /* HAVE_MALLOC_USABLE_SIZE */ + +#define ruby_sized_xrealloc ruby_sized_xrealloc_inlined +#define ruby_sized_xrealloc2 ruby_sized_xrealloc2_inlined +#define ruby_sized_xfree ruby_sized_xfree_inlined #endif /* INTERNAL_GC_H */ From d0e0c884bb4277e529adbd8d82aae0a651f7edf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 11:43:51 +0900 Subject: [PATCH 191/878] internal/object.h rework Eliminated macros. As a side effect struct RBasicRaw is no longer required because we can now define anonymous structs inside of inline functions. --- internal/object.h | 51 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/internal/object.h b/internal/object.h index f67293769aece8..959400a47a7aca 100644 --- a/internal/object.h +++ b/internal/object.h @@ -9,37 +9,52 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - +#include "ruby/ruby.h" /* for VALUE */ /* object.c */ -void rb_obj_copy_ivar(VALUE dest, VALUE obj); -CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2)); -CONSTFUNC(VALUE rb_obj_not(VALUE obj)); VALUE rb_class_search_ancestor(VALUE klass, VALUE super); NORETURN(void rb_undefined_alloc(VALUE klass)); double rb_num_to_dbl(VALUE val); VALUE rb_obj_dig(int argc, VALUE *argv, VALUE self, VALUE notfound); VALUE rb_immutable_obj_clone(int, VALUE *, VALUE); -VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2); -VALUE rb_convert_type_with_id(VALUE,int,const char*,ID); VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID); int rb_bool_expected(VALUE, const char *); - -struct RBasicRaw { - VALUE flags; - VALUE klass; -}; - -#define RBASIC_CLEAR_CLASS(obj) memset(&(((struct RBasicRaw *)((VALUE)(obj)))->klass), 0, sizeof(VALUE)) -#define RBASIC_SET_CLASS_RAW(obj, cls) memcpy(&((struct RBasicRaw *)((VALUE)(obj)))->klass, &(cls), sizeof(VALUE)) -#define RBASIC_SET_CLASS(obj, cls) do { \ - VALUE _obj_ = (obj); \ - RB_OBJ_WRITE(_obj_, &((struct RBasicRaw *)(_obj_))->klass, cls); \ -} while (0) +static inline void RBASIC_CLEAR_CLASS(VALUE obj); +static inline void RBASIC_SET_CLASS_RAW(VALUE obj, VALUE klass); +static inline void RBASIC_SET_CLASS(VALUE obj, VALUE klass); RUBY_SYMBOL_EXPORT_BEGIN /* object.c (export) */ int rb_opts_exception_p(VALUE opts, int default_value); RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2)); +CONSTFUNC(VALUE rb_obj_not(VALUE obj)); +VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2); +void rb_obj_copy_ivar(VALUE dest, VALUE obj); +VALUE rb_false(VALUE obj); +VALUE rb_convert_type_with_id(VALUE v, int t, const char* nam, ID mid); +MJIT_SYMBOL_EXPORT_END + +static inline void +RBASIC_SET_CLASS_RAW(VALUE obj, VALUE klass) +{ + struct { VALUE flags; VALUE klass; } *ptr = (void *)obj; + ptr->klass = klass; +} + +static inline void +RBASIC_CLEAR_CLASS(VALUE obj) +{ + RBASIC_SET_CLASS_RAW(obj, 0); +} + +static inline void +RBASIC_SET_CLASS(VALUE obj, VALUE klass) +{ + VALUE oldv = RBASIC_CLASS(obj); + RBASIC_SET_CLASS_RAW(obj, klass); + RB_OBJ_WRITTEN(obj, oldv, klass); +} #endif /* INTERNAL_OBJECT_H */ From c524df078044dfbf44215557e7b7a0faaa3bc3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 12:10:06 +0900 Subject: [PATCH 192/878] internal/proc.h rework Annotated MJIT_FUNC_EXPORTED functions as such. Declaration of rb_sym_to_proc is moved into this file because the function is defined in proc.c rather than string.c. --- internal/proc.h | 13 ++++++++++--- internal/string.h | 1 - 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/proc.h b/internal/proc.h index 2831afc95c2643..7f2bec88509885 100644 --- a/internal/proc.h +++ b/internal/proc.h @@ -9,16 +9,23 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - -struct rb_block; +#include "ruby/ruby.h" /* for rb_block_call_func_t */ +#include "ruby/st.h" /* for st_index_t */ +struct rb_block; /* in vm_core.h */ +struct rb_iseq_struct; /* in vm_core.h */ /* proc.c */ VALUE rb_proc_location(VALUE self); st_index_t rb_hash_proc(st_index_t hash, VALUE proc); int rb_block_arity(void); int rb_block_min_max_arity(int *max); -VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val); VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc); VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info); +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val); +VALUE rb_iseq_location(const struct rb_iseq_struct *iseq); +VALUE rb_sym_to_proc(VALUE sym); +MJIT_SYMBOL_EXPORT_END + #endif /* INTERNAL_PROC_H */ diff --git a/internal/string.h b/internal/string.h index 21354900298b6b..d020d06642bf1c 100644 --- a/internal/string.h +++ b/internal/string.h @@ -54,7 +54,6 @@ VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc); #define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) size_t rb_str_memsize(VALUE); VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc); -VALUE rb_sym_to_proc(VALUE sym); char *rb_str_to_cstr(VALUE str); VALUE rb_str_eql(VALUE str1, VALUE str2); VALUE rb_obj_as_string_result(VALUE str, VALUE obj); From 719efe72b0707ed9b0e75a2bbf00e41ecc9ab451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 12:30:06 +0900 Subject: [PATCH 193/878] internal/process.h rework Eliminated the macro to convert into an inline function. --- internal/process.h | 55 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/internal/process.h b/internal/process.h index 8258f97f1b43fe..c62b95bf80244d 100644 --- a/internal/process.h +++ b/internal/process.h @@ -9,8 +9,20 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for rb_pid_t */ +#include /* for size_t */ + +#ifdef HAVE_SYS_TYPES_H +# include /* for mode_t */ +#endif + +#ifdef _WIN32 +# include "ruby/win32.h" /* for mode_t */ +#endif + +#include "ruby/ruby.h" /* for VALUE */ +#include "internal/imemo.h" /* for RB_IMEMO_TMPBUF_PTR */ -/* process.c */ #define RB_MAX_GROUPS (65536) struct waitpid_state; @@ -60,24 +72,11 @@ struct rb_execarg { VALUE chdir_dir; }; -/* argv_str contains extra two elements. - * The beginning one is for /bin/sh used by exec_with_sh. - * The last one for terminating NULL used by execve. - * See rb_exec_fillarg() in process.c. */ -#define ARGVSTR2ARGV(argv_str) ((char **)RB_IMEMO_TMPBUF_PTR(argv_str) + 1) - -static inline size_t -ARGVSTR2ARGC(VALUE argv_str) -{ - size_t i = 0; - char *const *p = ARGVSTR2ARGV(argv_str); - while (p[i++]) - ; - return i - 1; -} - +/* process.c */ rb_pid_t rb_fork_ruby(int *status); void rb_last_status_clear(void); +static inline char **ARGVSTR2ARGV(VALUE argv_str); +static inline size_t ARGVSTR2ARGC(VALUE argv_str); RUBY_SYMBOL_EXPORT_BEGIN /* process.c (export) */ @@ -92,4 +91,26 @@ int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, cha VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash); void rb_execarg_setenv(VALUE execarg_obj, VALUE env); RUBY_SYMBOL_EXPORT_END + +/* argv_str contains extra two elements. + * The beginning one is for /bin/sh used by exec_with_sh. + * The last one for terminating NULL used by execve. + * See rb_exec_fillarg() in process.c. */ +static inline char ** +ARGVSTR2ARGV(VALUE argv_str) +{ + char **buf = RB_IMEMO_TMPBUF_PTR(argv_str); + return &buf[1]; +} + +static inline size_t +ARGVSTR2ARGC(VALUE argv_str) +{ + size_t i = 0; + char *const *p = ARGVSTR2ARGV(argv_str); + while (p[i++]) + ; + return i - 1; +} + #endif /* INTERNAL_PROCESS_H */ From 797c46917e6a2f9faacba369b09132ddd3cc61cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 13:06:15 +0900 Subject: [PATCH 194/878] internal/range.h rework Eliminate macros for better readability. --- internal/range.h | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/internal/range.h b/internal/range.h index a9101cd3f98216..86ff92379aaf15 100644 --- a/internal/range.h +++ b/internal/range.h @@ -9,10 +9,29 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/struct.h" /* for RSTRUCT */ /* range.c */ -#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0]) -#define RANGE_END(r) (RSTRUCT(r)->as.ary[1]) -#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2]) +static inline VALUE RANGE_BEG(VALUE r); +static inline VALUE RANGE_END(VALUE r); +static inline VALUE RANGE_EXCL(VALUE r); + +static inline VALUE +RANGE_BEG(VALUE r) +{ + return RSTRUCT(r)->as.ary[0]; +} + +static inline VALUE +RANGE_END(VALUE r) +{ + return RSTRUCT(r)->as.ary[1]; +} + +static inline VALUE +RANGE_EXCL(VALUE r) +{ + return RSTRUCT(r)->as.ary[2]; +} #endif /* INTERNAL_RANGE_H */ From 1a80d7bcdaa9a57f0feaf0a14ced8c9fb442d25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 14:01:56 +0900 Subject: [PATCH 195/878] internal/string.h rework Reduced the number of macros defined in the file. Also made it explicit for MJIT_FUNC_EXPORTTED functions to be so. --- internal/compilers.h | 5 ++ internal/string.h | 120 ++++++++++++++++++++++++++++--------------- 2 files changed, 85 insertions(+), 40 deletions(-) diff --git a/internal/compilers.h b/internal/compilers.h index 0f470937c56df8..2b1189a670639e 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -92,6 +92,7 @@ # define __has_builtin____builtin_clz GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_clzl GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_clzll GCC_VERSION_SINCE(3, 6, 0) +# define __has_builtin____builtin_constant_p GCC_VERSION_SINCE(2,95, 3) # define __has_builtin____builtin_ctz GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_ctzl GCC_VERSION_SINCE(3, 6, 0) # define __has_builtin____builtin_ctzll GCC_VERSION_SINCE(3, 6, 0) @@ -130,6 +131,10 @@ # undef __has_builtin____builtin_clzll # define __has_builtin____builtin_clzll HAVE_BUILTIN____BUILTIN_CLZLL # endif +# ifdef HAVE_BUILTIN____BUILTIN_CONSTANT_P +# undef __has_builtin____builtin_constant_p +# define __has_builtin____builtin_constant_p HAVE_BUILTIN____BUILTIN_CONSTANT_P +# endif # ifdef HAVE_BUILTIN____BUILTIN_CTZ # undef __has_builtin____builtin_ctz # define __has_builtin____builtin_ctz HAVE_BUILTIN____BUILTIN_CTZ diff --git a/internal/string.h b/internal/string.h index d020d06642bf1c..dae4f1bdc010ff 100644 --- a/internal/string.h +++ b/internal/string.h @@ -9,56 +9,102 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "internal/compilers.h" /* for __has_builtin */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/encoding.h" /* for rb_encoding */ +#include "ruby/ruby.h" /* for VALUE */ +#define STR_NOEMBED FL_USER1 +#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ /* string.c */ VALUE rb_fstring(VALUE); -VALUE rb_fstring_new(const char *ptr, long len); -#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str)) -#define rb_fstring_literal(str) rb_fstring_lit(str) VALUE rb_fstring_cstr(const char *str); -#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P -# define rb_fstring_cstr(str) RB_GNUC_EXTENSION_BLOCK( \ - (__builtin_constant_p(str)) ? \ - rb_fstring_new((str), (long)strlen(str)) : \ - rb_fstring_cstr(str) \ -) -#endif -#ifdef RUBY_ENCODING_H VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc); -#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) -#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) -#endif int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p); int rb_str_symname_p(VALUE); VALUE rb_str_quote_unprintable(VALUE); -VALUE rb_id_quote_unprintable(ID); -#define QUOTE(str) rb_str_quote_unprintable(str) -#define QUOTE_ID(id) rb_id_quote_unprintable(id) char *rb_str_fill_terminator(VALUE str, const int termlen); void rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int termlen); VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg); VALUE rb_str_chomp_string(VALUE str, VALUE chomp); -#ifdef RUBY_ENCODING_H VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc); VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len, rb_encoding *from, int ecflags, VALUE ecopts); VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl); VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc); -#endif -#define STR_NOEMBED FL_USER1 -#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ -#define STR_EMBED_P(str) (!FL_TEST_RAW((str), STR_NOEMBED)) -#define STR_SHARED_P(s) FL_ALL_RAW((s), STR_NOEMBED|ELTS_SHARED) -#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) -#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) size_t rb_str_memsize(VALUE); -VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc); char *rb_str_to_cstr(VALUE str); -VALUE rb_str_eql(VALUE str1, VALUE str2); -VALUE rb_obj_as_string_result(VALUE str, VALUE obj); const char *ruby_escaped_char(int c); -VALUE rb_str_opt_plus(VALUE, VALUE); +static inline bool STR_EMBED_P(VALUE str); +static inline bool STR_SHARED_P(VALUE str); +static inline VALUE QUOTE(VALUE v); +static inline VALUE QUOTE_ID(ID v); +static inline bool is_ascii_string(VALUE str); +static inline bool is_broken_string(VALUE str); +static inline VALUE rb_str_eql_internal(const VALUE str1, const VALUE str2); + +RUBY_SYMBOL_EXPORT_BEGIN +/* string.c (export) */ +VALUE rb_str_tmp_frozen_acquire(VALUE str); +void rb_str_tmp_frozen_release(VALUE str, VALUE tmp); +VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc); +VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE); +VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE); +RUBY_SYMBOL_EXPORT_END + +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_fstring_new(const char *ptr, long len); +VALUE rb_obj_as_string_result(VALUE str, VALUE obj); +VALUE rb_str_opt_plus(VALUE x, VALUE y); +VALUE rb_str_concat_literals(size_t num, const VALUE *strary); +VALUE rb_str_eql(VALUE str1, VALUE str2); +VALUE rb_id_quote_unprintable(ID); +VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc); +MJIT_SYMBOL_EXPORT_END + +#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str)) +#define rb_fstring_literal(str) rb_fstring_lit(str) +#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) +#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) + +static inline VALUE +QUOTE(VALUE v) +{ + return rb_str_quote_unprintable(v); +} + +static inline VALUE +QUOTE_ID(ID i) +{ + return rb_id_quote_unprintable(i); +} + +static inline bool +STR_EMBED_P(VALUE str) +{ + return ! FL_TEST_RAW(str, STR_NOEMBED); +} + +static inline bool +STR_SHARED_P(VALUE str) +{ + return FL_ALL_RAW(str, STR_NOEMBED | ELTS_SHARED); +} + +static inline bool +is_ascii_string(VALUE str) +{ + return rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT; +} + +static inline bool +is_broken_string(VALUE str) +{ + return rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN; +} /* expect tail call optimization */ static inline VALUE @@ -76,16 +122,10 @@ rb_str_eql_internal(const VALUE str1, const VALUE str2) return Qfalse; } -RUBY_SYMBOL_EXPORT_BEGIN -/* string.c (export) */ -VALUE rb_str_tmp_frozen_acquire(VALUE str); -void rb_str_tmp_frozen_release(VALUE str, VALUE tmp); -#ifdef RUBY_ENCODING_H -/* internal use */ -VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc); +#if __has_builtin(__builtin_constant_p) +# define rb_fstring_cstr(str) \ + (__builtin_constant_p(str) ? \ + rb_fstring_new((str), (long)strlen(str)) : \ + (rb_fstring_cstr)(str)) #endif -VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE); -VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE); -RUBY_SYMBOL_EXPORT_END - #endif /* INTERNAL_STRING_H */ From ce2c97d738d6eb374e6dedf6e082b06a61ab6ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 14:15:46 +0900 Subject: [PATCH 196/878] internal/symbol.h rework Some declatations are moved from internal/parse.h, to reflect the fact that they are defined in symbol.c. --- internal/parse.h | 8 -------- internal/symbol.h | 26 +++++++++++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/parse.h b/internal/parse.h index f70e8e75a34605..01325579513550 100644 --- a/internal/parse.h +++ b/internal/parse.h @@ -19,13 +19,5 @@ RUBY_SYMBOL_EXPORT_BEGIN VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int); RUBY_SYMBOL_EXPORT_END void *rb_parser_load_file(VALUE parser, VALUE name); -int rb_is_const_name(VALUE name); -int rb_is_class_name(VALUE name); -int rb_is_instance_name(VALUE name); -int rb_is_local_name(VALUE name); -PUREFUNC(int rb_is_const_sym(VALUE sym)); -PUREFUNC(int rb_is_attrset_sym(VALUE sym)); -ID rb_make_internal_id(void); -void rb_gc_free_dsymbol(VALUE); #endif /* INTERNAL_PARSE_H */ diff --git a/internal/symbol.h b/internal/symbol.h index 8423cb4dc8eeda..0317f665613dc0 100644 --- a/internal/symbol.h +++ b/internal/symbol.h @@ -9,21 +9,29 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/encoding.h" /* for rb_encoding */ +#include "internal/compilers.h" /* for __has_builtin */ /* symbol.c */ -#ifdef RUBY_ENCODING_H +VALUE rb_to_symbol_type(VALUE obj); VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc); -#endif VALUE rb_sym_intern_ascii(const char *ptr, long len); VALUE rb_sym_intern_ascii_cstr(const char *ptr); -#ifdef __GNUC__ -#define rb_sym_intern_ascii_cstr(ptr) __extension__ ( \ -{ \ - (__builtin_constant_p(ptr)) ? \ +int rb_is_const_name(VALUE name); +int rb_is_class_name(VALUE name); +int rb_is_instance_name(VALUE name); +int rb_is_local_name(VALUE name); +PUREFUNC(int rb_is_const_sym(VALUE sym)); +PUREFUNC(int rb_is_attrset_sym(VALUE sym)); +ID rb_make_internal_id(void); +void rb_gc_free_dsymbol(VALUE); + +#if __has_builtin(__builtin_constant_p) +#define rb_sym_intern_ascii_cstr(ptr) \ + (__builtin_constant_p(ptr) ? \ rb_sym_intern_ascii((ptr), (long)strlen(ptr)) : \ - rb_sym_intern_ascii_cstr(ptr); \ -}) + rb_sym_intern_ascii_cstr(ptr)) #endif -VALUE rb_to_symbol_type(VALUE obj); #endif /* INTERNAL_SYMBOL_H */ From e0b1be01624be75d8ac41b163233186ae2a0db2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 15:40:18 +0900 Subject: [PATCH 197/878] internal/thread.h rework Rather trivial, added missed MJIT_FUNC_EXPORTED function declaration. --- internal/thread.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/internal/thread.h b/internal/thread.h index 568351e6cbf246..886818b023902d 100644 --- a/internal/thread.h +++ b/internal/thread.h @@ -9,6 +9,10 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/intern.h" /* for rb_blocking_function_t */ + +struct rb_thread_struct; /* in vm_core.h */ /* thread.c */ #define COVERAGE_INDEX_LINES 0 @@ -41,4 +45,8 @@ VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, in int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */ RUBY_SYMBOL_EXPORT_END +MJIT_SYMBOL_EXPORT_BEGIN +int rb_threadptr_execute_interrupts(struct rb_thread_struct *th, int blocking_timing); +MJIT_SYMBOL_EXPORT_END + #endif /* INTERNAL_THREAD_H */ From 3ae09b30f8ba5ff4dd148d358f51b99ae0ae6c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 16:42:30 +0900 Subject: [PATCH 198/878] internal/vm.h rework Rearranged contents, then added MJIT_FUNC_EXPORTED function declarations. --- internal/vm.h | 171 ++++++++++++++++++++++++++++-------------------- probes_helper.h | 2 + 2 files changed, 102 insertions(+), 71 deletions(-) diff --git a/internal/vm.h b/internal/vm.h index e74b5c9a86bfd7..e9d2d09c6cdf78 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -9,48 +9,30 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/serial.h" /* for rb_serial_t */ +#include "internal/static_assert.h" /* for STATIC_ASSERT */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for ID */ +#include "ruby/st.h" /* for st_table */ -/* vm_insnhelper.h */ -rb_serial_t rb_next_class_serial(void); - -/* vm.c */ -VALUE rb_obj_is_thread(VALUE obj); -void rb_vm_mark(void *ptr); -PUREFUNC(VALUE rb_vm_top_self(void)); -void rb_vm_inc_const_missing_count(void); -const void **rb_vm_get_insns_address_table(void); -VALUE rb_source_location(int *pline); -const char *rb_source_location_cstr(int *pline); -MJIT_STATIC void rb_vm_pop_cfunc_frame(void); -int rb_vm_add_root_module(ID id, VALUE module); -void rb_vm_check_redefinition_by_prepend(VALUE klass); -int rb_vm_check_optimizable_mid(VALUE mid); -VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements); -MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE); -PUREFUNC(st_table *rb_vm_fstring_table(void)); - -/* vm_eval.c */ -VALUE rb_adjust_argv_kw_splat(int *, const VALUE **, int *); -VALUE rb_current_realfilepath(void); -VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE); -typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); -VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, - rb_check_funcall_hook *hook, VALUE arg); -VALUE rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, - rb_check_funcall_hook *hook, VALUE arg, int kw_splat); -const char *rb_type_str(enum ruby_value_type type); -VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE); -VALUE rb_yield_1(VALUE val); -VALUE rb_yield_force_blockarg(VALUE values); -VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv, - rb_block_call_func_t bl_proc, int min_argc, int max_argc, - VALUE data2); +/* I have several reasons to choose 64 here: + * + * - A cache line must be a power-of-two size. + * - Setting this to anything less than or equal to 32 boosts nothing. + * - I have never seen an architecture that has 128 byte L1 cache line. + * - I know Intel Core and Sparc T4 at least uses 64. + * - I know jemalloc internally has this exact same `#define CACHE_LINE 64`. + * https://github.com/jemalloc/jemalloc/blob/dev/include/jemalloc/internal/jemalloc_internal_types.h + */ +#define CACHELINE 64 -/* vm_insnhelper.c */ -VALUE rb_equal_opt(VALUE obj1, VALUE obj2); -VALUE rb_eql_opt(VALUE obj1, VALUE obj2); +struct rb_callable_method_entry_struct; /* in method.h */ +struct rb_method_definition_struct; /* in method.h */ +struct rb_execution_context_struct; /* in vm_core.h */ +struct rb_control_frame_struct; /* in vm_core.h */ +struct rb_calling_info; /* in vm_core.h */ +struct rb_call_data; -/* vm_method.c */ enum method_missing_reason { MISSING_NOENTRY = 0x00, MISSING_PRIVATE = 0x01, @@ -61,22 +43,7 @@ enum method_missing_reason { MISSING_MISSING = 0x20, MISSING_NONE = 0x40 }; -struct rb_callable_method_entry_struct; -struct rb_method_definition_struct; -struct rb_execution_context_struct; -struct rb_control_frame_struct; -struct rb_calling_info; -struct rb_call_data; -/* I have several reasons to chose 64 here: - * - * - A cache line must be a power-of-two size. - * - Setting this to anything less than or equal to 32 boosts nothing. - * - I have never seen an architecture that has 128 byte L1 cache line. - * - I know Intel Core and Sparc T4 at least uses 64. - * - I know jemalloc internally has this exact same `#define CACHE_LINE 64`. - * https://github.com/jemalloc/jemalloc/blob/dev/include/jemalloc/internal/jemalloc_internal_types.h - */ -#define CACHELINE 64 + struct rb_call_cache { /* inline cache: keys */ rb_serial_t method_state; @@ -109,20 +76,96 @@ struct rb_call_cache { } aux; }; STATIC_ASSERT(cachelined, sizeof(struct rb_call_cache) <= CACHELINE); + struct rb_call_info { /* fixed at compile time */ ID mid; unsigned int flag; int orig_argc; }; + struct rb_call_data { struct rb_call_cache cc; struct rb_call_info ci; }; -RUBY_FUNC_EXPORTED + +/* vm_insnhelper.h */ +rb_serial_t rb_next_class_serial(void); + +/* vm.c */ +VALUE rb_obj_is_thread(VALUE obj); +void rb_vm_mark(void *ptr); +PUREFUNC(VALUE rb_vm_top_self(void)); +void rb_vm_inc_const_missing_count(void); +const void **rb_vm_get_insns_address_table(void); +VALUE rb_source_location(int *pline); +const char *rb_source_location_cstr(int *pline); +MJIT_STATIC void rb_vm_pop_cfunc_frame(void); +int rb_vm_add_root_module(ID id, VALUE module); +void rb_vm_check_redefinition_by_prepend(VALUE klass); +int rb_vm_check_optimizable_mid(VALUE mid); +VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements); +MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE); +PUREFUNC(st_table *rb_vm_fstring_table(void)); + +MJIT_SYMBOL_EXPORT_BEGIN +VALUE vm_exec(struct rb_execution_context_struct *, int); /* used in JIT-ed code */ +MJIT_SYMBOL_EXPORT_END + +/* vm_eval.c */ +VALUE rb_current_realfilepath(void); +VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE); +typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); +VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, + rb_check_funcall_hook *hook, VALUE arg); +VALUE rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, + rb_check_funcall_hook *hook, VALUE arg, int kw_splat); +const char *rb_type_str(enum ruby_value_type type); +VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE); +VALUE rb_yield_1(VALUE val); +VALUE rb_yield_force_blockarg(VALUE values); +VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv, + rb_block_call_func_t bl_proc, int min_argc, int max_argc, + VALUE data2); + +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_vm_call0(struct rb_execution_context_struct *ec, VALUE recv, ID id, int argc, const VALUE *argv, const struct rb_callable_method_entry_struct *me, int kw_splat); +VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); +VALUE rb_vm_call_kw(struct rb_execution_context_struct *ec, VALUE recv, VALUE id, int argc, const VALUE *argv, const struct rb_callable_method_entry_struct *me, int kw_splat); +VALUE rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj, int argc, const VALUE *argv, int priv); +MJIT_SYMBOL_EXPORT_END + +/* vm_insnhelper.c */ +VALUE rb_equal_opt(VALUE obj1, VALUE obj2); +VALUE rb_eql_opt(VALUE obj1, VALUE obj2); + +MJIT_SYMBOL_EXPORT_BEGIN +void rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass); +MJIT_SYMBOL_EXPORT_END + +RUBY_SYMBOL_EXPORT_BEGIN +/* vm_method.c */ RUBY_FUNC_NONNULL(1, VALUE rb_funcallv_with_cc(struct rb_call_data*, VALUE, ID, int, const VALUE*)); -RUBY_FUNC_EXPORTED RUBY_FUNC_NONNULL(1, bool rb_method_basic_definition_p_with_cc(struct rb_call_data *, VALUE, ID)); +RUBY_SYMBOL_EXPORT_END + +/* vm_dump.c */ +void rb_print_backtrace(void); + +/* vm_backtrace.c */ +VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval); +VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval); +VALUE rb_make_backtrace(void); +void rb_backtrace_print_as_bugreport(void); +int rb_backtrace_p(VALUE obj); +VALUE rb_backtrace_to_str_ary(VALUE obj); +VALUE rb_backtrace_to_location_ary(VALUE obj); +void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output); + +MJIT_SYMBOL_EXPORT_BEGIN +VALUE rb_ec_backtrace_object(const struct rb_execution_context_struct *ec); +void rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self); +MJIT_SYMBOL_EXPORT_END #ifdef __GNUC__ # define rb_funcallv(recv, mid, argc, argv) \ @@ -138,20 +181,6 @@ RUBY_FUNC_NONNULL(1, bool rb_method_basic_definition_p_with_cc(struct rb_call_da }) #endif -/* vm_dump.c */ -void rb_print_backtrace(void); - -/* vm_backtrace.c */ -VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval); -VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval); - -VALUE rb_make_backtrace(void); -void rb_backtrace_print_as_bugreport(void); -int rb_backtrace_p(VALUE obj); -VALUE rb_backtrace_to_str_ary(VALUE obj); -VALUE rb_backtrace_to_location_ary(VALUE obj); -void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output); - #define RUBY_DTRACE_CREATE_HOOK(name, arg) \ RUBY_DTRACE_HOOK(name##_CREATE, arg) #define RUBY_DTRACE_HOOK(name, arg) \ diff --git a/probes_helper.h b/probes_helper.h index 115c78d4674e6a..d2d0ebb6e2a861 100644 --- a/probes_helper.h +++ b/probes_helper.h @@ -12,7 +12,9 @@ struct ruby_dtrace_method_hook_args { volatile VALUE name; }; +MJIT_SYMBOL_EXPORT_BEGIN NOINLINE(int rb_dtrace_setup(rb_execution_context_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *)); +MJIT_SYMBOL_EXPORT_END #define RUBY_DTRACE_METHOD_HOOK(name, ec, klazz, id) \ do { \ From bf53d6c7d19f877c821901b3288d7f80955ffbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 14:47:38 +0900 Subject: [PATCH 199/878] other minior internal header tweaks These headers need no rewrite. Just add some minor tweaks, like addition of #include lines. Mainly cosmetic. TIMET_MAX_PLUS_ONE was deleted because the macro was used from only one place (directly write expression there). --- internal/compar.h | 2 ++ internal/complex.h | 5 +++-- internal/cont.h | 4 +++- internal/debug.h | 11 ++++++++--- internal/dir.h | 1 + internal/enc.h | 6 +----- internal/encoding.h | 4 ++-- internal/enum.h | 1 + internal/enumerator.h | 2 ++ internal/eval.h | 9 ++++++--- internal/file.h | 6 +++--- internal/io.h | 4 ++-- internal/load.h | 1 + internal/math.h | 1 + internal/missing.h | 1 + internal/mjit.h | 2 ++ internal/parse.h | 11 ++++++++--- internal/random.h | 1 + internal/rational.h | 6 ++++-- internal/re.h | 4 ++++ internal/serial.h | 2 ++ internal/time.h | 6 +++++- internal/transcode.h | 6 ++++-- internal/util.h | 6 ++++++ thread.c | 2 +- 25 files changed, 74 insertions(+), 30 deletions(-) diff --git a/internal/compar.h b/internal/compar.h index 36c5e9c78251f9..6a689ed11d1e76 100644 --- a/internal/compar.h +++ b/internal/compar.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for RUBY_INTEGER_UNIFICATION */ +#include "internal/vm.h" /* for rb_method_basic_definition_p */ #define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString) diff --git a/internal/complex.h b/internal/complex.h index 7a363fc0e51c0c..0a8ecfb0d960d4 100644 --- a/internal/complex.h +++ b/internal/complex.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for struct RBasic */ struct RComplex { struct RBasic basic; @@ -19,8 +20,8 @@ struct RComplex { #define RCOMPLEX(obj) (R_CAST(RComplex)(obj)) /* shortcut macro for internal only */ -#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r)) -#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i)) +#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &RCOMPLEX(cmp)->real, (r)) +#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &RCOMPLEX(cmp)->imag, (i)) /* complex.c */ VALUE rb_dbl_complex_new_polar_pi(double abs, double ang); diff --git a/internal/cont.h b/internal/cont.h index 066a28238c074f..5aaf09514258df 100644 --- a/internal/cont.h +++ b/internal/cont.h @@ -9,8 +9,10 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ + +struct rb_thread_struct; /* in vm_core.h */ -struct rb_thread_struct; /* cont.c */ VALUE rb_obj_is_fiber(VALUE); void rb_fiber_reset_root_local_storage(struct rb_thread_struct *); diff --git a/internal/debug.h b/internal/debug.h index 8fa75fd8c648a3..276991027c8784 100644 --- a/internal/debug.h +++ b/internal/debug.h @@ -9,11 +9,19 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for fprintf */ +#include "ruby/ruby.h" /* for VALUE */ /* MRI debug support */ + +/* gc.c */ void rb_obj_info_dump(VALUE obj); void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func); + +/* debug.c */ void ruby_debug_breakpoint(void); +PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); // show obj data structure without any side-effect #define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) @@ -28,7 +36,4 @@ void ruby_debug_breakpoint(void); // but breakpoint is set in run.gdb, so `make gdb` can stop here. #define bp() ruby_debug_breakpoint() -/* debug.c */ -PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); - #endif /* INTERNAL_DEBUG_H */ diff --git a/internal/dir.h b/internal/dir.h index 9162d41d7aa552..07312f327e3a65 100644 --- a/internal/dir.h +++ b/internal/dir.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ /* dir.c */ VALUE rb_dir_getwd_ospath(void); diff --git a/internal/enc.h b/internal/enc.h index afd86426278b3a..8c28c69357074a 100644 --- a/internal/enc.h +++ b/internal/enc.h @@ -9,16 +9,12 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - +#include "ruby/encoding.h" /* for rb_encoding */ /* us_ascii.c */ -#ifdef RUBY_ENCODING_H extern rb_encoding OnigEncodingUS_ASCII; -#endif /* utf_8.c */ -#ifdef RUBY_ENCODING_H extern rb_encoding OnigEncodingUTF_8; -#endif #endif /* INTERNAL_ENC_H */ diff --git a/internal/encoding.h b/internal/encoding.h index 79fbadaf50d69d..1489065d3a754f 100644 --- a/internal/encoding.h +++ b/internal/encoding.h @@ -9,13 +9,13 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for ID */ +#include "ruby/encoding.h" /* for rb_encoding */ /* encoding.c */ ID rb_id_encoding(void); -#ifdef RUBY_ENCODING_H rb_encoding *rb_enc_get_from_index(int index); rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); -#endif int rb_encdb_replicate(const char *alias, const char *orig); int rb_encdb_alias(const char *alias, const char *orig); int rb_encdb_dummy(const char *name); diff --git a/internal/enum.h b/internal/enum.h index e4e710bad09f0d..70eec55c7f079d 100644 --- a/internal/enum.h +++ b/internal/enum.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ /* enum.c */ extern VALUE rb_cArithSeq; diff --git a/internal/enumerator.h b/internal/enumerator.h index 5f0f6333b605ed..e4575f2c49ee3b 100644 --- a/internal/enumerator.h +++ b/internal/enumerator.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/intern.h" /* for rb_enumerator_size_func */ RUBY_SYMBOL_EXPORT_BEGIN /* enumerator.c (export) */ diff --git a/internal/eval.h b/internal/eval.h index 5fc3b38e90087b..86729a8ff0dbc6 100644 --- a/internal/eval.h +++ b/internal/eval.h @@ -11,13 +11,16 @@ * @note There also is eval_intern.h, which is evaluator's internal * header (related to this file, but not the same role). */ +#include "ruby/ruby.h" /* for ID */ + +#define id_signo ruby_static_id_signo +#define id_status ruby_static_id_status /* eval.c */ +extern ID ruby_static_id_signo; +extern ID ruby_static_id_status; VALUE rb_refinement_module_get_refined_class(VALUE module); -extern ID ruby_static_id_signo, ruby_static_id_status; void rb_class_modify_check(VALUE); -#define id_signo ruby_static_id_signo -#define id_status ruby_static_id_status NORETURN(VALUE rb_f_raise(int argc, VALUE *argv)); /* eval_error.c */ diff --git a/internal/file.h b/internal/file.h index 0bbf50f296bb4c..ac65ddad3cf002 100644 --- a/internal/file.h +++ b/internal/file.h @@ -9,15 +9,15 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/encoding.h" /* for rb_encodinng */ /* file.c */ extern const char ruby_null_device[]; VALUE rb_home_dir_of(VALUE user, VALUE result); VALUE rb_default_home_dir(VALUE result); VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict); -#ifdef RUBY_ENCODING_H VALUE rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *origenc); -#endif void rb_file_const(const char*, VALUE); int rb_file_load_ok(const char *); VALUE rb_file_expand_path_fast(VALUE, VALUE); @@ -28,7 +28,7 @@ int ruby_is_fd_loadable(int fd); RUBY_SYMBOL_EXPORT_BEGIN /* file.c (export) */ -#if defined HAVE_READLINK && defined RUBY_ENCODING_H +#ifdef HAVE_READLINK VALUE rb_readlink(VALUE path, rb_encoding *enc); #endif #ifdef __APPLE__ diff --git a/internal/io.h b/internal/io.h index 00bca80fef10ac..e04dbcb67cfe60 100644 --- a/internal/io.h +++ b/internal/io.h @@ -9,14 +9,14 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/io.h" /* for rb_io_t */ /* io.c */ void ruby_set_inplace_mode(const char *); void rb_stdio_set_default_encoding(void); VALUE rb_io_flush_raw(VALUE, int); -#ifdef RUBY_IO_H size_t rb_io_memsize(const rb_io_t *); -#endif int rb_stderr_tty_p(void); void rb_io_fptr_finalize_internal(void *ptr); #define rb_io_fptr_finalize rb_io_fptr_finalize_internal diff --git a/internal/load.h b/internal/load.h index f4bf42cd28b8f8..17eb2552bfbce2 100644 --- a/internal/load.h +++ b/internal/load.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ /* load.c */ VALUE rb_get_expanded_load_path(void); diff --git a/internal/math.h b/internal/math.h index 51d398f61ed62f..ec46f47f48b293 100644 --- a/internal/math.h +++ b/internal/math.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ /* math.c */ VALUE rb_math_atan2(VALUE, VALUE); diff --git a/internal/missing.h b/internal/missing.h index c27999e3177469..bb62495ff74fe3 100644 --- a/internal/missing.h +++ b/internal/missing.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for HAVE_SETPROCTITLE */ /* missing/setproctitle.c */ #ifndef HAVE_SETPROCTITLE diff --git a/internal/mjit.h b/internal/mjit.h index 71d25e52ae3e8c..84cc611197cdb4 100644 --- a/internal/mjit.h +++ b/internal/mjit.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for VALUE */ /* mjit.c */ diff --git a/internal/parse.h b/internal/parse.h index 01325579513550..bcde0fea7ae1db 100644 --- a/internal/parse.h +++ b/internal/parse.h @@ -9,15 +9,20 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/ruby.h" /* for VALUE */ -/* parse.y */ #ifndef USE_SYMBOL_GC -#define USE_SYMBOL_GC 1 +# define USE_SYMBOL_GC 1 #endif + +struct rb_iseq_struct; /* in vm_core.h */ + +/* parse.y */ VALUE rb_parser_set_yydebug(VALUE, VALUE); +void *rb_parser_load_file(VALUE parser, VALUE name); + RUBY_SYMBOL_EXPORT_BEGIN VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int); RUBY_SYMBOL_EXPORT_END -void *rb_parser_load_file(VALUE parser, VALUE name); #endif /* INTERNAL_PARSE_H */ diff --git a/internal/random.h b/internal/random.h index 6498769c862845..87fcc48988c0ed 100644 --- a/internal/random.h +++ b/internal/random.h @@ -9,6 +9,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include /* for size_t */ /* random.c */ int ruby_fill_random_bytes(void *, size_t, int); diff --git a/internal/rational.h b/internal/rational.h index 993d0569277039..c783c5162b6dd9 100644 --- a/internal/rational.h +++ b/internal/rational.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for HAVE_LIBGMP */ +#include "ruby/ruby.h" /* for struct RBasic */ struct RRational { struct RBasic basic; @@ -17,8 +19,8 @@ struct RRational { }; #define RRATIONAL(obj) (R_CAST(RRational)(obj)) -#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->num,(n)) -#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->den,(d)) +#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &RRATIONAL(rat)->num, (n)) +#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &RRATIONAL(rat)->den, (d)) /* rational.c */ VALUE rb_rational_canonicalize(VALUE x); diff --git a/internal/re.h b/internal/re.h index 767603068407c4..9cf84393457e36 100644 --- a/internal/re.h +++ b/internal/re.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "internal/stdbool.h" /* for bool */ +#include "ruby/ruby.h" /* for VALUE */ /* re.c */ VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline); @@ -20,6 +22,8 @@ void rb_backref_set_string(VALUE string, long pos, long len); void rb_match_unbusy(VALUE); int rb_match_count(VALUE match); int rb_match_nth_defined(int nth, VALUE match); +MJIT_SYMBOL_EXPORT_BEGIN VALUE rb_reg_new_ary(VALUE ary, int options); +MJIT_SYMBOL_EXPORT_END #endif /* INTERNAL_RE_H */ diff --git a/internal/serial.h b/internal/serial.h index 118848d0898ea9..f97a8dc9f39e2b 100644 --- a/internal/serial.h +++ b/internal/serial.h @@ -9,6 +9,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for HAVE_LONG_LONG */ +#include "ruby/defines.h" /* for LONG_LONG */ #ifndef HAVE_LONG_LONG # error need C99+ diff --git a/internal/time.h b/internal/time.h index b20f24e1cfc865..ef3d64e967bdab 100644 --- a/internal/time.h +++ b/internal/time.h @@ -9,6 +9,9 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" /* for SIGNEDNESS_OF_TIME_T */ +#include "internal/bits.h" /* for SIGNED_INTEGER_MAX */ +#include "ruby/ruby.h" /* for VALUE */ #if SIGNEDNESS_OF_TIME_T < 0 /* signed */ # define TIMET_MAX SIGNED_INTEGER_MAX(time_t) @@ -17,7 +20,8 @@ # define TIMET_MAX UNSIGNED_INTEGER_MAX(time_t) # define TIMET_MIN ((time_t)0) #endif -#define TIMET_MAX_PLUS_ONE (2*(double)(TIMET_MAX/2+1)) + +struct timeval; /* <- in or */ /* time.c */ struct timeval rb_time_timeval(VALUE); diff --git a/internal/transcode.h b/internal/transcode.h index 798c9265c2a49b..8dfd1a68add002 100644 --- a/internal/transcode.h +++ b/internal/transcode.h @@ -9,11 +9,13 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include "ruby/config.h" +#include /* for size_t */ +#include "ruby/ruby.h" /* for VALUE */ +#include "ruby/encoding.h" /* for rb_econv_t */ /* transcode.c */ extern VALUE rb_cEncodingConverter; -#ifdef RUBY_ENCODING_H size_t rb_econv_memsize(rb_econv_t *); -#endif #endif /* INTERNAL_TRANSCODE_H */ diff --git a/internal/util.h b/internal/util.h index c1ba2a4323c35c..528bee070e13c4 100644 --- a/internal/util.h +++ b/internal/util.h @@ -10,6 +10,12 @@ * file COPYING are met. Consult the file for details. * @warning DO NOT ADD RANDOM GARBAGE HERE THIS FILE IS FOR util.c */ +#include "ruby/config.h" +#include /* for size_t */ + +#ifdef HAVE_SYS_TYPES_H +# include /* for ssize_t (note: on Windows ssize_t is */ +#endif /* `#define`d in ruby/config.h) */ /* util.c */ char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve); diff --git a/thread.c b/thread.c index 17bc1e75aeca2d..39114db83d11d9 100644 --- a/thread.c +++ b/thread.c @@ -1196,7 +1196,7 @@ static rb_hrtime_t * double2hrtime(rb_hrtime_t *hrt, double d) { /* assume timespec.tv_sec has same signedness as time_t */ - const double TIMESPEC_SEC_MAX_PLUS_ONE = TIMET_MAX_PLUS_ONE; + const double TIMESPEC_SEC_MAX_PLUS_ONE = 2.0 * (TIMESPEC_SEC_MAX / 2 + 1.0); if (TIMESPEC_SEC_MAX_PLUS_ONE <= d) { return NULL; From 33e9601938a79dae149caa88ff1bc06d376dd376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 3 Dec 2019 11:02:10 +0900 Subject: [PATCH 200/878] TIMESPEC_SEC_MAX might be bigger than 53 bits. The same as 41bc766763dba63ae2529f2f9070b8e26399745c. Read that commit for what is happening. --- thread.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/thread.c b/thread.c index 39114db83d11d9..da36b62f8b4164 100644 --- a/thread.c +++ b/thread.c @@ -1192,11 +1192,21 @@ thread_value(VALUE self) #define TIMESPEC_SEC_MAX TIMET_MAX #define TIMESPEC_SEC_MIN TIMET_MIN +COMPILER_WARNING_PUSH +#if __has_warning("-Wimplicit-int-float-conversion") +COMPILER_WARNING_IGNORED(-Wimplicit-int-float-conversion) +#elif defined(_MSC_VER) +/* C4305: 'initializing': truncation from '__int64' to 'const double' */ +COMPILER_WARNING_IGNORED(4305) +#endif +static const double TIMESPEC_SEC_MAX_as_doube = TIMESPEC_SEC_MAX; +COMPILER_WARNING_POP + static rb_hrtime_t * double2hrtime(rb_hrtime_t *hrt, double d) { /* assume timespec.tv_sec has same signedness as time_t */ - const double TIMESPEC_SEC_MAX_PLUS_ONE = 2.0 * (TIMESPEC_SEC_MAX / 2 + 1.0); + const double TIMESPEC_SEC_MAX_PLUS_ONE = 2.0 * (TIMESPEC_SEC_MAX_as_doube / 2.0 + 1.0); if (TIMESPEC_SEC_MAX_PLUS_ONE <= d) { return NULL; From 5e22f873ed26092522f9bfc617d729bac88b284f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 4 Dec 2019 17:16:30 +0900 Subject: [PATCH 201/878] decouple internal.h headers Saves comitters' daily life by avoid #include-ing everything from internal.h to make each file do so instead. This would significantly speed up incremental builds. We take the following inclusion order in this changeset: 1. "ruby/config.h", where _GNU_SOURCE is defined (must be the very first thing among everything). 2. RUBY_EXTCONF_H if any. 3. Standard C headers, sorted alphabetically. 4. Other system headers, maybe guarded by #ifdef 5. Everything else, sorted alphabetically. Exceptions are those win32-related headers, which tend not be self- containing (headers have inclusion order dependencies). --- array.c | 21 ++++-- ast.c | 10 ++- bignum.c | 37 +++++++--- class.c | 14 +++- compar.c | 5 +- compile.c | 38 +++++++--- complex.c | 16 +++- constant.h | 2 + cont.c | 20 +++-- coroutine/amd64/Context.h | 2 + coroutine/arm32/Context.h | 2 + coroutine/arm64/Context.h | 2 + coroutine/ppc64le/Context.h | 2 + coroutine/win32/Context.h | 2 + coroutine/win64/Context.h | 2 + coroutine/x86/Context.h | 2 + debug.c | 17 +++-- dir.c | 80 +++++++++++--------- dln.c | 2 + dln.h | 1 + enc/encdb.c | 2 +- encindex.h | 1 + encoding.c | 18 ++++- enum.c | 14 +++- enumerator.c | 14 +++- error.c | 33 ++++++--- eval.c | 26 +++++-- ext/-test-/bignum/big2str.c | 2 +- ext/-test-/bignum/bigzero.c | 2 +- ext/-test-/bignum/div.c | 2 +- ext/-test-/bignum/intpack.c | 2 +- ext/-test-/bignum/mul.c | 2 +- ext/-test-/bignum/str2big.c | 2 +- ext/-test-/integer/core_ext.c | 2 +- ext/-test-/rational/rat.c | 2 +- ext/-test-/string/capacity.c | 2 +- ext/-test-/string/cstr.c | 3 +- ext/-test-/string/normalize.c | 2 +- ext/-test-/time/leap_second.c | 3 +- ext/coverage/coverage.c | 4 +- ext/objspace/objspace.c | 12 ++- ext/objspace/objspace_dump.c | 10 ++- ext/pty/pty.c | 58 +++++++++------ ext/socket/rubysocket.h | 49 +++++++++---- file.c | 133 +++++++++++++++++++--------------- gc.c | 105 +++++++++++++++++---------- gc.h | 2 +- hash.c | 33 ++++++--- id_table.h | 2 + inits.c | 3 +- internal.h | 102 ++++++++++++-------------- internal/array.h | 2 +- internal/class.h | 9 ++- internal/compilers.h | 1 - internal/error.h | 11 ++- internal/gc.h | 8 +- internal/hash.h | 10 ++- internal/io.h | 3 + internal/parse.h | 5 -- internal/string.h | 4 + internal/struct.h | 21 +++++- internal/symbol.h | 4 + internal/variable.h | 1 - internal/vm.h | 8 ++ io.c | 61 ++++++++++------ iseq.c | 30 +++++--- iseq.h | 2 + load.c | 15 +++- marshal.c | 25 +++++-- math.c | 13 +++- method.h | 3 + mini_builtin.c | 3 +- mjit.c | 12 ++- mjit.h | 7 +- mjit_compile.c | 11 ++- node.c | 3 + numeric.c | 22 +++++- object.c | 27 +++++-- pack.c | 14 +++- parse.y | 38 +++++++--- proc.c | 9 ++- process.c | 72 +++++++++++------- random.c | 50 ++++++++----- range.c | 16 +++- rational.c | 23 ++++-- re.c | 15 +++- ruby.c | 55 +++++++++----- signal.c | 44 ++++++----- sprintf.c | 20 +++-- st.c | 3 + strftime.c | 13 +++- string.c | 47 ++++++++---- struct.c | 11 ++- symbol.c | 15 +++- symbol.h | 1 + template/prelude.c.tmpl | 5 +- thread.c | 35 ++++++--- time.c | 30 +++++--- timev.h | 1 + tool/mk_builtin_loader.rb | 9 ++- transcode.c | 12 ++- transient_heap.c | 14 +++- util.c | 13 ++-- variable.c | 27 +++++-- vm.c | 31 +++++--- vm_backtrace.c | 10 +-- vm_core.h | 62 +++++++++------- vm_dump.c | 35 +++++---- vm_insnhelper.c | 23 ++++-- vm_trace.c | 10 ++- win32/dir.h | 3 + win32/file.c | 1 + win32/win32.c | 4 + 113 files changed, 1327 insertions(+), 689 deletions(-) diff --git a/array.c b/array.c index 28bd8c866b7f51..9846320f0032ad 100644 --- a/array.c +++ b/array.c @@ -10,14 +10,25 @@ Copyright (C) 2000 Information-technology Promotion Agency, Japan **********************************************************************/ + +#include "debug_counter.h" +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compar.h" +#include "internal/enum.h" +#include "internal/gc.h" +#include "internal/hash.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/rational.h" +#include "internal/vm.h" +#include "probes.h" #include "ruby/encoding.h" -#include "ruby/util.h" #include "ruby/st.h" -#include "probes.h" -#include "id.h" -#include "debug_counter.h" +#include "ruby/util.h" #include "transient_heap.h" -#include "internal.h" #if !ARRAY_DEBUG # define NDEBUG diff --git a/ast.c b/ast.c index 1133fb8a10b287..3f7061a7b008c4 100644 --- a/ast.c +++ b/ast.c @@ -1,11 +1,15 @@ /* indent-tabs-mode: nil */ +#include "internal.h" +#include "internal/parse.h" +#include "internal/symbol.h" +#include "internal/warnings.h" +#include "iseq.h" +#include "node.h" #include "ruby.h" #include "ruby/encoding.h" #include "ruby/util.h" -#include "internal.h" -#include "node.h" #include "vm_core.h" -#include "iseq.h" + #include "builtin.h" static VALUE rb_mAST; diff --git a/bignum.c b/bignum.c index 3923da7d0b7be7..8492853104dbf9 100644 --- a/bignum.c +++ b/bignum.c @@ -9,27 +9,40 @@ **********************************************************************/ -#include "internal.h" -#include "ruby/thread.h" -#include "ruby/util.h" -#include "id.h" +#include "ruby/config.h" + +#include +#include +#include #ifdef HAVE_STRINGS_H -#include +# include #endif -#include -#include -#include + #ifdef HAVE_IEEEFP_H -#include +# include #endif -#include "ruby_assert.h" #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) -#define USE_GMP -#include +# define USE_GMP +# include #endif +#include "id.h" +#include "internal.h" +#include "internal/bignum.h" +#include "internal/complex.h" +#include "internal/gc.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/sanitizers.h" +#include "internal/util.h" +#include "internal/variable.h" +#include "internal/warnings.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#include "ruby_assert.h" + #define RB_BIGNUM_TYPE_P(x) RB_TYPE_P((x), T_BIGNUM) #ifndef RUBY_INTEGER_UNIFICATION diff --git a/class.c b/class.c index c866d1d72721af..bc64ff77952996 100644 --- a/class.c +++ b/class.c @@ -23,12 +23,20 @@ * \{ */ +#include "ruby/config.h" +#include + +#include "constant.h" +#include "id_table.h" #include "internal.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/variable.h" #include "ruby/st.h" -#include "constant.h" #include "vm_core.h" -#include "id_table.h" -#include #define id_attached id__attached__ diff --git a/compar.c b/compar.c index 94072c9fc1f0cd..15ebfcdcd28a92 100644 --- a/compar.c +++ b/compar.c @@ -9,9 +9,12 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "id.h" #include "internal.h" +#include "internal/compar.h" +#include "internal/error.h" +#include "internal/vm.h" +#include "ruby/ruby.h" VALUE rb_mComparable; diff --git a/compile.c b/compile.c index 7043ba9a739f53..200670f826a2f8 100644 --- a/compile.c +++ b/compile.c @@ -9,25 +9,39 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/re.h" -#include "ruby/util.h" -#include "internal.h" -#include "encindex.h" +#include "ruby/config.h" #include +#ifdef HAVE_DLADDR +# include +#endif + +#include "encindex.h" +#include "gc.h" +#include "id_table.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compile.h" +#include "internal/complex.h" +#include "internal/debug.h" +#include "internal/encoding.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/re.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "iseq.h" +#include "ruby/re.h" +#include "ruby/util.h" #include "vm_core.h" #include "vm_debug.h" + #include "builtin.h" -#include "iseq.h" #include "insns.inc" #include "insns_info.inc" -#include "id_table.h" -#include "gc.h" - -#ifdef HAVE_DLADDR -# include -#endif #undef RUBY_UNTYPED_DATA_WARNING #define RUBY_UNTYPED_DATA_WARNING 0 diff --git a/complex.c b/complex.c index cdd5edc50a7313..bce22be735f970 100644 --- a/complex.c +++ b/complex.c @@ -6,15 +6,25 @@ */ #include "ruby/config.h" + #if defined _MSC_VER /* Microsoft Visual C does not define M_PI and others by default */ # define _USE_MATH_DEFINES 1 #endif + +#include #include -#include "internal.h" -#include "id.h" #define NDEBUG +#include "id.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/complex.h" +#include "internal/error.h" +#include "internal/math.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/rational.h" #include "ruby_assert.h" #define ZERO INT2FIX(0) @@ -1700,8 +1710,6 @@ numeric_to_c(VALUE self) return rb_complex_new1(self); } -#include - inline static int issign(int c) { diff --git a/constant.h b/constant.h index 610bdf1dfe5024..1396651e216e41 100644 --- a/constant.h +++ b/constant.h @@ -10,6 +10,8 @@ **********************************************************************/ #ifndef CONSTANT_H #define CONSTANT_H +#include "ruby/ruby.h" +#include "id_table.h" typedef enum { CONST_DEPRECATED = 0x100, diff --git a/cont.c b/cont.c index 793bce018bc195..2365406d9e34f7 100644 --- a/cont.c +++ b/cont.c @@ -9,19 +9,25 @@ **********************************************************************/ -#include "internal.h" -#include "vm_core.h" -#include "gc.h" -#include "eval_intern.h" -#include "mjit.h" - -#include COROUTINE_H +#include "ruby/config.h" #ifndef _WIN32 #include #include #endif +#include COROUTINE_H + +#include "eval_intern.h" +#include "gc.h" +#include "internal.h" +#include "internal/cont.h" +#include "internal/mjit.h" +#include "internal/proc.h" +#include "internal/warnings.h" +#include "mjit.h" +#include "vm_core.h" + static const int DEBUG = 0; #define RB_PAGE_SIZE (pagesize) diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h index 8fe323c1a10516..441c4491c19438 100644 --- a/coroutine/amd64/Context.h +++ b/coroutine/amd64/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __attribute__((noreturn)) void diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h index e29fe1bb638966..8bba8f6376cf2f 100644 --- a/coroutine/arm32/Context.h +++ b/coroutine/arm32/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __attribute__((noreturn)) void diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h index a1ae921144886e..63170ce4cc775a 100644 --- a/coroutine/arm64/Context.h +++ b/coroutine/arm64/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __attribute__((noreturn)) void diff --git a/coroutine/ppc64le/Context.h b/coroutine/ppc64le/Context.h index adf21b4fd9a873..e36f9c3583c903 100644 --- a/coroutine/ppc64le/Context.h +++ b/coroutine/ppc64le/Context.h @@ -1,6 +1,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __attribute__((noreturn)) void diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h index 299515ed922eca..68a71a76fbaa4c 100644 --- a/coroutine/win32/Context.h +++ b/coroutine/win32/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __declspec(noreturn) void __fastcall diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h index 6bf2dc5b351a29..659e503d215348 100644 --- a/coroutine/win64/Context.h +++ b/coroutine/win64/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __declspec(noreturn) void diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h index 6d3a56eaa6cf21..123321ded63fb2 100644 --- a/coroutine/x86/Context.h +++ b/coroutine/x86/Context.h @@ -8,6 +8,8 @@ #pragma once #include +#include +#include #include #define COROUTINE __attribute__((noreturn, fastcall)) void diff --git a/debug.c b/debug.c index 7c32f6dac02e71..7bb9d0205223ad 100644 --- a/debug.c +++ b/debug.c @@ -9,15 +9,22 @@ **********************************************************************/ -#include "ruby/ruby.h" +#include "ruby/config.h" + +#include + +#include "eval_intern.h" +#include "id.h" +#include "internal/debug.h" +#include "internal/signal.h" +#include "internal/util.h" #include "ruby/encoding.h" #include "ruby/io.h" +#include "ruby/ruby.h" #include "ruby/util.h" -#include "vm_debug.h" -#include "eval_intern.h" -#include "vm_core.h" #include "symbol.h" -#include "id.h" +#include "vm_core.h" +#include "vm_debug.h" /* This is the only place struct RIMemo is actually used */ struct RIMemo { diff --git a/dir.c b/dir.c index 6a926f438cc46f..c72011a0d9980e 100644 --- a/dir.c +++ b/dir.c @@ -11,12 +11,10 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/thread.h" -#include "internal.h" -#include "id.h" -#include "encindex.h" +#include "ruby/config.h" +#include +#include #include #include @@ -36,12 +34,10 @@ # define USE_OPENDIR_AT 0 # endif #endif + #if USE_OPENDIR_AT # include #endif -#ifndef AT_FDCWD -# define AT_FDCWD -1 -#endif #undef HAVE_DIRENT_NAMLEN #if defined HAVE_DIRENT_H && !defined _WIN32 @@ -68,8 +64,6 @@ # endif #endif -#include - #ifndef HAVE_STDLIB_H char *getenv(); #endif @@ -78,28 +72,6 @@ char *getenv(); char *strchr(char*,char); #endif -#include - -#include "ruby/util.h" - -#define vm_initialized rb_cThread - -/* define system APIs */ -#ifdef _WIN32 -#undef chdir -#define chdir(p) rb_w32_uchdir(p) -#undef mkdir -#define mkdir(p, m) rb_w32_umkdir((p), (m)) -#undef rmdir -#define rmdir(p) rb_w32_urmdir(p) -#undef opendir -#define opendir(p) rb_w32_uopendir(p) -#define ruby_getcwd() rb_w32_ugetcwd(NULL, 0) -#define IS_WIN32 1 -#else -#define IS_WIN32 0 -#endif - #ifdef HAVE_SYS_ATTR_H #include #endif @@ -123,15 +95,51 @@ char *strchr(char*,char); #ifdef __APPLE__ # define NORMALIZE_UTF8PATH 1 +# include +# include +# include #else # define NORMALIZE_UTF8PATH 0 #endif -#if NORMALIZE_UTF8PATH -#include -#include -#include +#include "encindex.h" +#include "id.h" +#include "internal.h" +#include "internal/dir.h" +#include "internal/encoding.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/gc.h" +#include "internal/io.h" +#include "internal/vm.h" +#include "ruby/encoding.h" +#include "ruby/ruby.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#ifndef AT_FDCWD +# define AT_FDCWD -1 +#endif + +#define vm_initialized rb_cThread + +/* define system APIs */ +#ifdef _WIN32 +# undef chdir +# define chdir(p) rb_w32_uchdir(p) +# undef mkdir +# define mkdir(p, m) rb_w32_umkdir((p), (m)) +# undef rmdir +# define rmdir(p) rb_w32_urmdir(p) +# undef opendir +# define opendir(p) rb_w32_uopendir(p) +# define ruby_getcwd() rb_w32_ugetcwd(NULL, 0) +# define IS_WIN32 1 +#else +# define IS_WIN32 0 +#endif + +#if NORMALIZE_UTF8PATH # if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST # define need_normalization(dirp, path) need_normalization(dirp) # else diff --git a/dln.c b/dln.c index c40cbfc6acdadb..78c4c45a1fb27e 100644 --- a/dln.c +++ b/dln.c @@ -1244,6 +1244,8 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine) #endif #ifdef USE_DLN_DLOPEN +# include "internal/stdbool.h" +# include "internal/warnings.h" COMPILER_WARNING_PUSH #if defined(__clang__) || GCC_VERSION_SINCE(4, 2, 0) COMPILER_WARNING_IGNORED(-Wpedantic) diff --git a/dln.h b/dln.h index d98b2607e233ba..9570de8f15c753 100644 --- a/dln.h +++ b/dln.h @@ -11,6 +11,7 @@ #ifndef DLN_H #define DLN_H +#include "ruby/defines.h" /* for RUBY_SYMBOL_EXPORT_BEGIN */ #ifdef __cplusplus # ifndef HAVE_PROTOTYPES diff --git a/enc/encdb.c b/enc/encdb.c index a41e4edc6de400..a1936df804fbbd 100644 --- a/enc/encdb.c +++ b/enc/encdb.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "internal.h" +#include "internal/encoding.h" #define ENC_REPLICATE(name, orig) rb_encdb_replicate((name), (orig)) #define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig)) diff --git a/encindex.h b/encindex.h index 658b60a9fdae8e..baf70735ec28a3 100644 --- a/encindex.h +++ b/encindex.h @@ -11,6 +11,7 @@ #ifndef RUBY_ENCINDEX_H #define RUBY_ENCINDEX_H 1 +#include "ruby/encoding.h" /* rb_ascii8bit_encindex etc. */ #if defined(__cplusplus) extern "C" { #if 0 diff --git a/encoding.c b/encoding.c index 69015cc8fda092..c50a470d05d113 100644 --- a/encoding.c +++ b/encoding.c @@ -9,14 +9,24 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "internal.h" +#include "ruby/config.h" + +#include + #include "encindex.h" +#include "internal.h" +#include "internal/enc.h" +#include "internal/encoding.h" +#include "internal/inits.h" +#include "internal/load.h" +#include "internal/object.h" +#include "internal/string.h" +#include "internal/vm.h" #include "regenc.h" -#include +#include "ruby/encoding.h" #include "ruby/util.h" - #include "ruby_assert.h" + #ifndef ENC_DEBUG #define ENC_DEBUG 0 #endif diff --git a/enum.c b/enum.c index cc77964ff93137..867eec8f816f49 100644 --- a/enum.c +++ b/enum.c @@ -9,14 +9,20 @@ **********************************************************************/ -#include "ruby/encoding.h" +#include "id.h" #include "internal.h" +#include "internal/compar.h" +#include "internal/enum.h" +#include "internal/hash.h" +#include "internal/imemo.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/rational.h" #include "ruby/util.h" -#include "id.h" +#include "ruby_assert.h" #include "symbol.h" -#include - VALUE rb_mEnumerable; static ID id_next; diff --git a/enumerator.c b/enumerator.c index 9d0547da053158..790818064f4bc1 100644 --- a/enumerator.c +++ b/enumerator.c @@ -12,14 +12,22 @@ ************************************************/ -#include "ruby/ruby.h" -#include "internal.h" -#include "id.h" +#include "ruby/config.h" #ifdef HAVE_FLOAT_H #include #endif +#include "id.h" +#include "internal.h" +#include "internal/enumerator.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/imemo.h" +#include "internal/numeric.h" +#include "internal/range.h" +#include "ruby/ruby.h" + /* * Document-class: Enumerator * diff --git a/error.c b/error.c index 9557d8552bfbb8..f99cdb6784a9fd 100644 --- a/error.c +++ b/error.c @@ -9,27 +9,40 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/st.h" -#include "internal.h" -#include "ruby_assert.h" -#include "vm_core.h" -#include "builtin.h" +#include "ruby/config.h" -#include +#include #include +#include + #ifdef HAVE_STDLIB_H -#include +# include #endif -#include + #ifdef HAVE_UNISTD_H -#include +# include #endif #if defined __APPLE__ # include #endif +#include "internal.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/io.h" +#include "internal/load.h" +#include "internal/object.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "ruby/encoding.h" +#include "ruby/st.h" +#include "ruby_assert.h" +#include "vm_core.h" + +#include "builtin.h" + /*! * \defgroup exception Exception handlings * \{ diff --git a/eval.c b/eval.c index f2fde81e19471d..4770327a724ca4 100644 --- a/eval.c +++ b/eval.c @@ -11,18 +11,30 @@ **********************************************************************/ -#include "internal.h" +#include "ruby/config.h" + +#ifdef HAVE_SYS_PRCTL_H +#include +#endif + #include "eval_intern.h" -#include "iseq.h" #include "gc.h" -#include "ruby/vm.h" -#include "vm_core.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/hash.h" +#include "internal/inits.h" +#include "internal/io.h" +#include "internal/mjit.h" +#include "internal/object.h" +#include "internal/variable.h" +#include "iseq.h" #include "mjit.h" #include "probes.h" #include "probes_helper.h" -#ifdef HAVE_SYS_PRCTL_H -#include -#endif +#include "ruby/vm.h" +#include "vm_core.h" NORETURN(void rb_raise_jump(VALUE, VALUE)); void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec); diff --git a/ext/-test-/bignum/big2str.c b/ext/-test-/bignum/big2str.c index ec4bde2915897c..bc5a933f825180 100644 --- a/ext/-test-/bignum/big2str.c +++ b/ext/-test-/bignum/big2str.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE big(VALUE x) diff --git a/ext/-test-/bignum/bigzero.c b/ext/-test-/bignum/bigzero.c index 35117db7ae35ea..e2bfebcd3ecba9 100644 --- a/ext/-test-/bignum/bigzero.c +++ b/ext/-test-/bignum/bigzero.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE bug_big_zero(VALUE self, VALUE length) diff --git a/ext/-test-/bignum/div.c b/ext/-test-/bignum/div.c index a1db21dc30bd68..2be0d2d62ad049 100644 --- a/ext/-test-/bignum/div.c +++ b/ext/-test-/bignum/div.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE big(VALUE x) diff --git a/ext/-test-/bignum/intpack.c b/ext/-test-/bignum/intpack.c index 2d19442cf2b5f6..698362f96f5621 100644 --- a/ext/-test-/bignum/intpack.c +++ b/ext/-test-/bignum/intpack.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE rb_integer_pack_raw_m(VALUE val, VALUE buf, VALUE numwords_arg, VALUE wordsize_arg, VALUE nails, VALUE flags) diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c index b922f34437029f..1b6eb911bde80f 100644 --- a/ext/-test-/bignum/mul.c +++ b/ext/-test-/bignum/mul.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE big(VALUE x) diff --git a/ext/-test-/bignum/str2big.c b/ext/-test-/bignum/str2big.c index bc79ef03294253..7dd2da9a073907 100644 --- a/ext/-test-/bignum/str2big.c +++ b/ext/-test-/bignum/str2big.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/bignum.h" static VALUE str2big_poweroftwo(VALUE str, VALUE vbase, VALUE badcheck) diff --git a/ext/-test-/integer/core_ext.c b/ext/-test-/integer/core_ext.c index 510ba4a1e68fcf..2062fa3afa0f37 100644 --- a/ext/-test-/integer/core_ext.c +++ b/ext/-test-/integer/core_ext.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/numeric.h" static VALUE int_bignum_p(VALUE self) diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c index 772546fca8e108..01388346f7ca82 100644 --- a/ext/-test-/rational/rat.c +++ b/ext/-test-/rational/rat.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/rational.h" #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) static VALUE diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c index f5277bf4e6a284..cb8d2c2b3aea03 100644 --- a/ext/-test-/string/capacity.c +++ b/ext/-test-/string/capacity.c @@ -1,5 +1,5 @@ #include "ruby.h" -#include "internal.h" +#include "internal/string.h" static VALUE bug_str_capacity(VALUE klass, VALUE str) diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c index 71eafdb7033c80..5a464451da4508 100644 --- a/ext/-test-/string/cstr.c +++ b/ext/-test-/string/cstr.c @@ -1,5 +1,6 @@ -#include "ruby/encoding.h" #include "internal.h" +#include "internal/error.h" +#include "ruby/encoding.h" static VALUE bug_str_cstr_term(VALUE str) diff --git a/ext/-test-/string/normalize.c b/ext/-test-/string/normalize.c index 0ba17976317d4e..a069288ee87313 100644 --- a/ext/-test-/string/normalize.c +++ b/ext/-test-/string/normalize.c @@ -1,4 +1,4 @@ -#include "internal.h" +#include "internal/file.h" #ifdef __APPLE__ static VALUE diff --git a/ext/-test-/time/leap_second.c b/ext/-test-/time/leap_second.c index 7eed421b73aebc..ccf38194f04c80 100644 --- a/ext/-test-/time/leap_second.c +++ b/ext/-test-/time/leap_second.c @@ -1,6 +1,5 @@ -#include "ruby.h" +#include "internal/time.h" -void ruby_reset_leap_second_info(void); static VALUE bug_time_s_reset_leap_second_info(VALUE klass) { diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c index 8503c9d6c61ea9..34b0849fc4030b 100644 --- a/ext/coverage/coverage.c +++ b/ext/coverage/coverage.c @@ -8,9 +8,11 @@ ************************************************/ +#include "gc.h" +#include "internal/hash.h" +#include "internal/thread.h" #include "ruby.h" #include "vm_core.h" -#include "gc.h" static int current_mode; static VALUE me2counter = Qnil; diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index 311e6872066311..6d5f6c073ae3dc 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -12,12 +12,16 @@ **********************************************************************/ -#include +#include "gc.h" #include "internal.h" -#include -#include +#include "internal/class.h" +#include "internal/compilers.h" +#include "internal/hash.h" +#include "internal/imemo.h" #include "node.h" -#include "gc.h" +#include "ruby/io.h" +#include "ruby/re.h" +#include "ruby/st.h" #include "symbol.h" /* diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c index 5fa9d98e382579..d753b48a80971a 100644 --- a/ext/objspace/objspace_dump.c +++ b/ext/objspace/objspace_dump.c @@ -12,13 +12,15 @@ **********************************************************************/ -#include "ruby/io.h" -#include "internal.h" -#include "ruby/debug.h" #include "gc.h" +#include "internal.h" +#include "internal/hash.h" +#include "internal/string.h" #include "node.h" -#include "vm_core.h" #include "objspace.h" +#include "ruby/debug.h" +#include "ruby/io.h" +#include "vm_core.h" static VALUE sym_output, sym_stdout, sym_string, sym_file; static VALUE sym_full; diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 4c6ae26127eb56..485f61c3041cec 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -1,45 +1,51 @@ -#include "ruby/config.h" +#include "ruby/config.h" + #ifdef RUBY_EXTCONF_H -#include RUBY_EXTCONF_H +# include RUBY_EXTCONF_H #endif -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + #ifdef HAVE_PWD_H -#include +# include #endif + #ifdef HAVE_SYS_IOCTL_H -#include +# include #endif + #ifdef HAVE_LIBUTIL_H -#include +# include #endif + #ifdef HAVE_UTIL_H -#include +# include #endif + #ifdef HAVE_PTY_H -#include +# include #endif + #if defined(HAVE_SYS_PARAM_H) - /* for __FreeBSD_version */ + /* for __FreeBSD_version */ # include #endif + #ifdef HAVE_SYS_WAIT_H -#include +# include #else -#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f) +# define WIFSTOPPED(status) (((status) & 0xff) == 0x7f) #endif -#include - -#include "ruby/io.h" -#include "internal.h" -#include "ruby/util.h" -#include #ifdef HAVE_SYS_STROPTS_H #include #endif @@ -48,6 +54,12 @@ #include #endif +#include "internal.h" +#include "internal/process.h" +#include "internal/signal.h" +#include "ruby/io.h" +#include "ruby/util.h" + #define DEVICELEN 16 #ifndef HAVE_SETEUID diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 0ce77a5f6ef3bb..5dca68a1984279 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -1,12 +1,12 @@ #ifndef RUBY_SOCKET_H #define RUBY_SOCKET_H 1 -#include "ruby/ruby.h" -#include "ruby/io.h" -#include "ruby/thread.h" -#include "ruby/util.h" -#include "internal.h" +#include "ruby/config.h" +#include RUBY_EXTCONF_H + +#include #include + #include #include @@ -56,12 +56,11 @@ #ifdef HAVE_NETPACKET_PACKET_H # include #endif + #ifdef HAVE_NET_ETHERNET_H # include #endif -#include - #ifdef HAVE_SYS_UN_H # include #endif @@ -87,12 +86,15 @@ # endif # include #endif + #ifdef HAVE_SYS_IOCTL_H # include #endif + #ifdef HAVE_SYS_SOCKIO_H # include #endif + #ifdef HAVE_NET_IF_H # include #endif @@ -100,16 +102,40 @@ #ifdef HAVE_SYS_PARAM_H # include #endif + #ifdef HAVE_SYS_UCRED_H # include #endif + #ifdef HAVE_UCRED_H # include #endif + #ifdef HAVE_NET_IF_DL_H # include #endif +#ifdef SOCKS5 +# include +#endif + +#ifndef HAVE_GETADDRINFO +# include "addrinfo.h" +#endif + +#include "internal.h" +#include "internal/array.h" +#include "internal/error.h" +#include "internal/gc.h" +#include "internal/io.h" +#include "internal/thread.h" +#include "internal/vm.h" +#include "ruby/io.h" +#include "ruby/ruby.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#include "sockport.h" + #ifndef HAVE_TYPE_SOCKLEN_T typedef int socklen_t; #endif @@ -143,11 +169,6 @@ unsigned int if_nametoindex(const char *); */ #define pseudo_AF_FTIP pseudo_AF_RTIP -#ifndef HAVE_GETADDRINFO -# include "addrinfo.h" -#endif - -#include "sockport.h" #ifndef NI_MAXHOST # define NI_MAXHOST 1025 @@ -255,9 +276,7 @@ extern VALUE rb_eSocket; #ifdef SOCKS extern VALUE rb_cSOCKSSocket; -# ifdef SOCKS5 -# include -# else +# ifndef SOCKS5 void SOCKSinit(); int Rconnect(); # endif diff --git a/file.c b/file.c index c46377b93324c9..c267781d205e4f 100644 --- a/file.c +++ b/file.c @@ -11,14 +11,22 @@ **********************************************************************/ +#include "ruby/config.h" + #ifdef _WIN32 -#include "missing/file.h" +# include "missing/file.h" +# include "ruby.h" #endif + +#include +#include + #ifdef __CYGWIN__ -#include -#include -#include +# include +# include +# include #endif + #ifdef __APPLE__ # if !(defined(__has_feature) && defined(__has_attribute)) /* Maybe a bug in SDK of Xcode 10.2.1 */ @@ -28,21 +36,13 @@ # define API_AVAILABLE(...) # define API_DEPRECATED(...) # endif -#include +# include #endif -#include "id.h" -#include "ruby/encoding.h" -#include "ruby/io.h" -#include "ruby/util.h" -#include "ruby/thread.h" -#include "internal.h" -#include "dln.h" -#include "encindex.h" - #ifdef HAVE_UNISTD_H -#include +# include #endif + #ifdef HAVE_SYS_TIME_H # include #endif @@ -60,77 +60,73 @@ int flock(int, int); # define MAXPATHLEN 1024 #endif -#include - -#include - #ifdef HAVE_UTIME_H -#include +# include #elif defined HAVE_SYS_UTIME_H -#include +# include #endif #ifdef HAVE_PWD_H -#include +# include #endif #ifdef HAVE_SYS_SYSMACROS_H -#include +# include #endif #include #include #ifdef HAVE_SYS_MKDEV_H -#include +# include #endif #if defined(HAVE_FCNTL_H) -#include +# include #endif #if defined(HAVE_SYS_TIME_H) -#include +# include #endif #if !defined HAVE_LSTAT && !defined lstat -#define lstat stat +# define lstat stat #endif /* define system APIs */ #ifdef _WIN32 -#include "win32/file.h" -#define STAT(p, s) rb_w32_ustati128((p), (s)) -#undef lstat -#define lstat(p, s) rb_w32_ulstati128((p), (s)) -#undef access -#define access(p, m) rb_w32_uaccess((p), (m)) -#undef truncate -#define truncate(p, n) rb_w32_utruncate((p), (n)) -#undef chmod -#define chmod(p, m) rb_w32_uchmod((p), (m)) -#undef chown -#define chown(p, o, g) rb_w32_uchown((p), (o), (g)) -#undef lchown -#define lchown(p, o, g) rb_w32_ulchown((p), (o), (g)) -#undef utimensat -#define utimensat(s, p, t, f) rb_w32_uutimensat((s), (p), (t), (f)) -#undef link -#define link(f, t) rb_w32_ulink((f), (t)) -#undef unlink -#define unlink(p) rb_w32_uunlink(p) -#undef rename -#define rename(f, t) rb_w32_urename((f), (t)) -#undef symlink -#define symlink(s, l) rb_w32_usymlink((s), (l)) - -#ifdef HAVE_REALPATH +# include "win32/file.h" +# define STAT(p, s) rb_w32_ustati128((p), (s)) +# undef lstat +# define lstat(p, s) rb_w32_ulstati128((p), (s)) +# undef access +# define access(p, m) rb_w32_uaccess((p), (m)) +# undef truncate +# define truncate(p, n) rb_w32_utruncate((p), (n)) +# undef chmod +# define chmod(p, m) rb_w32_uchmod((p), (m)) +# undef chown +# define chown(p, o, g) rb_w32_uchown((p), (o), (g)) +# undef lchown +# define lchown(p, o, g) rb_w32_ulchown((p), (o), (g)) +# undef utimensat +# define utimensat(s, p, t, f) rb_w32_uutimensat((s), (p), (t), (f)) +# undef link +# define link(f, t) rb_w32_ulink((f), (t)) +# undef unlink +# define unlink(p) rb_w32_uunlink(p) +# undef rename +# define rename(f, t) rb_w32_urename((f), (t)) +# undef symlink +# define symlink(s, l) rb_w32_usymlink((s), (l)) + +# ifdef HAVE_REALPATH /* Don't use native realpath(3) on Windows, as the check for absolute paths does not work for drive letters. */ -#undef HAVE_REALPATH -#endif +# undef HAVE_REALPATH +# endif #else -#define STAT(p, s) stat((p), (s)) +# define STAT(p, s) stat((p), (s)) #endif #if defined _WIN32 || defined __APPLE__ @@ -143,7 +139,7 @@ int flock(int, int); /* utime may fail if time is out-of-range for the FS [ruby-dev:38277] */ #if defined DOSISH || defined __CYGWIN__ -# define UTIME_EINVAL +# define UTIME_EINVAL #endif /* Solaris 10 realpath(3) doesn't support File.realpath */ @@ -152,10 +148,29 @@ int flock(int, int); #endif #ifdef HAVE_REALPATH -#include -#include +# include +# include #endif +#include "dln.h" +#include "encindex.h" +#include "id.h" +#include "internal.h" +#include "internal/compilers.h" +#include "internal/dir.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/io.h" +#include "internal/load.h" +#include "internal/object.h" +#include "internal/process.h" +#include "internal/thread.h" +#include "internal/vm.h" +#include "ruby/encoding.h" +#include "ruby/io.h" +#include "ruby/thread.h" +#include "ruby/util.h" + VALUE rb_cFile; VALUE rb_mFileTest; VALUE rb_cStat; diff --git a/gc.c b/gc.c index 6def78a105210d..9747655f99f514 100644 --- a/gc.c +++ b/gc.c @@ -14,43 +14,25 @@ #define rb_data_object_alloc rb_data_object_alloc #define rb_data_typed_object_alloc rb_data_typed_object_alloc -#include "ruby/encoding.h" -#include "ruby/io.h" -#include "ruby/st.h" -#include "ruby/re.h" -#include "ruby/thread.h" -#include "ruby/util.h" -#include "ruby/debug.h" -#include "internal.h" -#include "eval_intern.h" -#include "vm_core.h" -#include "builtin.h" -#include "gc.h" -#include "constant.h" -#include "ruby_atomic.h" -#include "probes.h" -#include "id_table.h" -#include "symbol.h" -#include -#include -#include -#include -#include "ruby_assert.h" -#include "debug_counter.h" -#include "transient_heap.h" -#include "mjit.h" +#include "ruby/config.h" +#ifdef _WIN32 +# include "ruby/ruby.h" +#endif -#undef rb_data_object_wrap +#include +#include +#include #ifndef HAVE_MALLOC_USABLE_SIZE # ifdef _WIN32 -# define HAVE_MALLOC_USABLE_SIZE -# define malloc_usable_size(a) _msize(a) +# define HAVE_MALLOC_USABLE_SIZE +# define malloc_usable_size(a) _msize(a) # elif defined HAVE_MALLOC_SIZE -# define HAVE_MALLOC_USABLE_SIZE -# define malloc_usable_size(a) malloc_size(a) +# define HAVE_MALLOC_USABLE_SIZE +# define malloc_usable_size(a) malloc_size(a) # endif #endif + #ifdef HAVE_MALLOC_USABLE_SIZE # ifdef RUBY_ALTERNATIVE_MALLOC_HEADER # include RUBY_ALTERNATIVE_MALLOC_HEADER @@ -64,28 +46,73 @@ #endif #ifdef HAVE_SYS_TIME_H -#include +# include #endif #ifdef HAVE_SYS_RESOURCE_H -#include +# include #endif #if defined _WIN32 || defined __CYGWIN__ -#include +# include #elif defined(HAVE_POSIX_MEMALIGN) #elif defined(HAVE_MEMALIGN) -#include +# include #endif -#define rb_setjmp(env) RUBY_SETJMP(env) -#define rb_jmp_buf rb_jmpbuf_t +#include #if defined(_MSC_VER) && defined(_WIN64) -#include -#pragma intrinsic(_umul128) +# include +# pragma intrinsic(_umul128) #endif +#include "constant.h" +#include "debug_counter.h" +#include "eval_intern.h" +#include "gc.h" +#include "id_table.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/complex.h" +#include "internal/cont.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/gc.h" +#include "internal/hash.h" +#include "internal/imemo.h" +#include "internal/io.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/rational.h" +#include "internal/sanitizers.h" +#include "internal/struct.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "internal/warnings.h" +#include "mjit.h" +#include "probes.h" +#include "regint.h" +#include "ruby/debug.h" +#include "ruby/io.h" +#include "ruby/re.h" +#include "ruby/st.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#include "ruby_assert.h" +#include "ruby_atomic.h" +#include "symbol.h" +#include "transient_heap.h" +#include "vm_core.h" + +#include "builtin.h" + +#define rb_setjmp(env) RUBY_SETJMP(env) +#define rb_jmp_buf rb_jmpbuf_t +#undef rb_data_object_wrap + /* Expecting this struct to be eliminated by function inlinings */ struct optional { bool left; @@ -3807,8 +3834,6 @@ rb_obj_id(VALUE obj) return rb_find_object_id(obj, cached_object_id); } -#include "regint.h" - static size_t obj_memsize_of(VALUE obj, int use_all_types) { diff --git a/gc.h b/gc.h index cf794fa5141070..750d87819b1f1f 100644 --- a/gc.h +++ b/gc.h @@ -1,6 +1,6 @@ - #ifndef RUBY_GC_H #define RUBY_GC_H 1 +#include "ruby/ruby.h" #if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p))) diff --git a/hash.c b/hash.c index 44352c96f1266c..606d5d39300a24 100644 --- a/hash.c +++ b/hash.c @@ -11,17 +11,10 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/st.h" -#include "ruby/util.h" -#include "internal.h" +#include "ruby/config.h" + #include -#include "probes.h" -#include "id.h" -#include "symbol.h" -#include "debug_counter.h" -#include "transient_heap.h" -#include "ruby_assert.h" + #ifdef __APPLE__ # ifdef HAVE_CRT_EXTERNS_H # include @@ -30,6 +23,26 @@ # endif #endif +#include "debug_counter.h" +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/bignum.h" +#include "internal/class.h" +#include "internal/cont.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/symbol.h" +#include "internal/vm.h" +#include "probes.h" +#include "ruby/st.h" +#include "ruby/util.h" +#include "ruby_assert.h" +#include "symbol.h" +#include "transient_heap.h" + #ifndef HASH_DEBUG #define HASH_DEBUG 0 #endif diff --git a/id_table.h b/id_table.h index abd9eb5f382eca..8d4d9910697362 100644 --- a/id_table.h +++ b/id_table.h @@ -1,5 +1,7 @@ #ifndef RUBY_ID_TABLE_H #define RUBY_ID_TABLE_H 1 +#include "ruby/config.h" +#include #include "ruby/ruby.h" struct rb_id_table; diff --git a/inits.c b/inits.c index 79a6cf014ec855..72a2a9868b52b4 100644 --- a/inits.c +++ b/inits.c @@ -9,7 +9,8 @@ **********************************************************************/ -#include "internal.h" +#include "internal/inits.h" +#include "ruby.h" #include "builtin.h" #include "prelude.rbinc" diff --git a/internal.h b/internal.h index fa6f78b52f7338..7479c73563383b 100644 --- a/internal.h +++ b/internal.h @@ -18,17 +18,9 @@ # error not for C++ #endif -#include "ruby/encoding.h" -#include "ruby/io.h" -#include "internal/stdbool.h" -#include "internal/bits.h" - #define LIKELY(x) RB_LIKELY(x) #define UNLIKELY(x) RB_UNLIKELY(x) -#include "internal/compilers.h" -#include "internal/sanitizers.h" - #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0]))) #define roomof(x, y) (((x) + (y) - 1) / (y)) #define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) @@ -36,54 +28,50 @@ /* Prevent compiler from reordering access */ #define ACCESS_ONCE(type,x) (*((volatile type *)&(x))) -#include "internal/serial.h" -#include "internal/static_assert.h" -#include "internal/time.h" -#include "internal/fixnum.h" -#include "internal/bignum.h" -#include "internal/rational.h" -#include "internal/numeric.h" -#include "internal/complex.h" -#include "internal/hash.h" -#include "internal/missing.h" -#include "internal/struct.h" -#include "internal/class.h" -#include "internal/imemo.h" -#include "internal/compar.h" -#include "internal/variable.h" -#include "internal/array.h" -#include "internal/debug.h" -#include "internal/compile.h" -#include "internal/cont.h" -#include "internal/dir.h" -#include "internal/encoding.h" -#include "internal/enum.h" -#include "internal/eval.h" -#include "internal/error.h" -#include "internal/file.h" -#include "internal/gc.h" -#include "internal/io.h" -#include "internal/load.h" -#include "internal/loadpath.h" -#include "internal/math.h" -#include "internal/mjit.h" -#include "internal/object.h" -#include "internal/parse.h" -#include "internal/proc.h" -#include "internal/process.h" -#include "internal/range.h" -#include "internal/re.h" -#include "internal/signal.h" -#include "internal/string.h" -#include "internal/symbol.h" -#include "internal/thread.h" -#include "internal/transcode.h" -#include "internal/enc.h" -#include "internal/util.h" -#include "internal/vm.h" -#include "internal/enumerator.h" -#include "internal/random.h" -#include "internal/inits.h" -#include "internal/warnings.h" +#include "ruby/ruby.h" + +/* Folowing macros were formerlly defined in this header but moved to somewhere + * else. In order to detect them we undef here. */ + +/* internal/error.h */ +#undef Check_Type + +/* internal/class.h */ +#undef RClass +#undef RCLASS_SUPER + +/* internal/gc.h */ +#undef NEWOBJ_OF +#undef RB_NEWOBJ_OF +#undef RB_OBJ_WRITE + +/* internal/hash.h */ +#undef RHASH_IFNONE +#undef RHASH_SIZE + +/* internal/struct.h */ +#undef RSTRUCT_LEN +#undef RSTRUCT_PTR +#undef RSTRUCT_SET +#undef RSTRUCT_GET + +/* Also, we keep the following macros here. They are expected to be + * overridden in each headers. */ + +/* internal/array.h */ +#define rb_ary_new_from_args(...) rb_nonexistent_symbol(__VA_ARGS__) + +/* internal/io.h */ +#define rb_io_fptr_finalize(...) rb_nonexistent_symbol(__VA_ARGS__) + +/* internal/string.h */ +#define rb_fstring_cstr(...) rb_nonexistent_symbol(__VA_ARGS__) + +/* internal/symbol.h */ +#define rb_sym_intern_ascii_cstr(...) rb_nonexistent_symbol(__VA_ARGS__) + +/* internal/vm.h */ +#define rb_funcallv(...) rb_nonexistent_symbol(__VA_ARGS__) +#define rb_method_basic_definition_p(...) rb_nonexistent_symbol(__VA_ARGS__) #endif /* RUBY_INTERNAL_H */ diff --git a/internal/array.h b/internal/array.h index 857edacf97d496..1c5de4bb326074 100644 --- a/internal/array.h +++ b/internal/array.h @@ -9,7 +9,6 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - #include "ruby/config.h" #include /* for size_t */ #include "internal/static_assert.h" /* for STATIC_ASSERT */ @@ -87,6 +86,7 @@ RARY_TRANSIENT_UNSET(VALUE ary) #endif } +#undef rb_ary_new_from_args #if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) #define rb_ary_new_from_args(n, ...) \ __extension__ ({ \ diff --git a/internal/class.h b/internal/class.h index 254094e03820c1..72d3b9ea541f32 100644 --- a/internal/class.h +++ b/internal/class.h @@ -16,8 +16,13 @@ #include "ruby/intern.h" /* for rb_alloc_func_t */ #include "ruby/ruby.h" /* for struct RBasic */ -#undef RClass /* See also include/ruby/backward.h */ -#undef RCLASS_SUPER +#ifdef RClass +# undef RClass /* See also include/ruby/backward.h */ +#endif + +#ifdef RCLASS_SUPER +# undef RCLASS_SUPER +#endif struct rb_deprecated_classext_struct { char conflict[sizeof(VALUE) * 3]; diff --git a/internal/compilers.h b/internal/compilers.h index 2b1189a670639e..68e2d33e288905 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -9,7 +9,6 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - #include "ruby/defines.h" /* for GCC_VERSION_SINCE */ #ifdef _MSC_VER diff --git a/internal/error.h b/internal/error.h index 6c645b21bb4baf..cb2f23d26297de 100644 --- a/internal/error.h +++ b/internal/error.h @@ -17,7 +17,16 @@ #include "ruby/intern.h" /* for rb_exc_raise */ #include "ruby/ruby.h" /* for enum ruby_value_type */ -#undef Check_Type /* in ruby/ruby.h */ +#ifdef Check_Type +# undef Check_Type /* in ruby/ruby.h */ +#endif + +#ifdef rb_raise_static +# undef rb_raise_static +# undef rb_sys_fail_path +# undef rb_syserr_fail_path +#endif + #define rb_raise_static(e, m) \ rb_raise_cstr_i((e), rb_str_new_static((m), rb_strlen_lit(m))) #ifdef RUBY_FUNCTION_NAME_STRING diff --git a/internal/gc.h b/internal/gc.h index 74e52187c7a41a..36da0db53d2595 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -18,9 +18,11 @@ struct rb_execution_context_struct; /* in vm_core.h */ -#undef NEWOBJ_OF -#undef RB_NEWOBJ_OF -#undef RB_OBJ_WRITE +#ifdef NEWOBJ_OF +# undef NEWOBJ_OF +# undef RB_NEWOBJ_OF +# undef RB_OBJ_WRITE +#endif /* optimized version of NEWOBJ() */ #define RB_NEWOBJ_OF(var, T, c, f) \ diff --git a/internal/hash.h b/internal/hash.h index 634092e4c2a058..90a27fd1893b1a 100644 --- a/internal/hash.h +++ b/internal/hash.h @@ -55,8 +55,14 @@ struct RHash { }; #define RHASH(obj) (R_CAST(RHash)(obj)) -#undef RHASH_IFNONE -#undef RHASH_SIZE + +#ifdef RHASH_IFNONE +# undef RHASH_IFNONE +#endif + +#ifdef RHASH_SIZE +# undef RHASH_SIZE +#endif /* hash.c */ void rb_hash_st_table_set(VALUE hash, st_table *st); diff --git a/internal/io.h b/internal/io.h index e04dbcb67cfe60..acdb4ffab7f2f8 100644 --- a/internal/io.h +++ b/internal/io.h @@ -19,6 +19,9 @@ VALUE rb_io_flush_raw(VALUE, int); size_t rb_io_memsize(const rb_io_t *); int rb_stderr_tty_p(void); void rb_io_fptr_finalize_internal(void *ptr); +#ifdef rb_io_fptr_finalize +# undef rb_io_fptr_finalize +#endif #define rb_io_fptr_finalize rb_io_fptr_finalize_internal RUBY_SYMBOL_EXPORT_BEGIN diff --git a/internal/parse.h b/internal/parse.h index bcde0fea7ae1db..782c06a43738ab 100644 --- a/internal/parse.h +++ b/internal/parse.h @@ -10,11 +10,6 @@ * file COPYING are met. Consult the file for details. */ #include "ruby/ruby.h" /* for VALUE */ - -#ifndef USE_SYMBOL_GC -# define USE_SYMBOL_GC 1 -#endif - struct rb_iseq_struct; /* in vm_core.h */ /* parse.y */ diff --git a/internal/string.h b/internal/string.h index dae4f1bdc010ff..f585163594ea72 100644 --- a/internal/string.h +++ b/internal/string.h @@ -19,6 +19,10 @@ #define STR_NOEMBED FL_USER1 #define STR_SHARED FL_USER2 /* = ELTS_SHARED */ +#ifdef rb_fstring_cstr +# undef rb_fstring_cstr +#endif + /* string.c */ VALUE rb_fstring(VALUE); VALUE rb_fstring_cstr(const char *str); diff --git a/internal/struct.h b/internal/struct.h index b0f7f2eddde1c1..f205dbd89e23d3 100644 --- a/internal/struct.h +++ b/internal/struct.h @@ -12,6 +12,7 @@ #include "internal/gc.h" /* for RB_OBJ_WRITE */ #include "internal/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for struct RBasic */ +#include "internal/gc.h" /* for RB_OBJ_WRITE */ enum { RSTRUCT_EMBED_LEN_MAX = RVALUE_EMBED_LEN_MAX, @@ -32,10 +33,22 @@ struct RStruct { }; #define RSTRUCT(obj) (R_CAST(RStruct)(obj)) -#undef RSTRUCT_LEN -#undef RSTRUCT_PTR -#undef RSTRUCT_SET -#undef RSTRUCT_GET + +#ifdef RSTRUCT_LEN +# undef RSTRUCT_LEN +#endif + +#ifdef RSTRUCT_PTR +# undef RSTRUCT_PTR +#endif + +#ifdef RSTRUCT_SET +# undef RSTRUCT_SET +#endif + +#ifdef RSTRUCT_GET +# undef RSTRUCT_GET +#endif /* struct.c */ VALUE rb_struct_init_copy(VALUE copy, VALUE s); diff --git a/internal/symbol.h b/internal/symbol.h index 0317f665613dc0..8de6903ae21ee2 100644 --- a/internal/symbol.h +++ b/internal/symbol.h @@ -13,6 +13,10 @@ #include "ruby/encoding.h" /* for rb_encoding */ #include "internal/compilers.h" /* for __has_builtin */ +#ifdef rb_sym_intern_ascii_cstr +# undef rb_sym_intern_ascii_cstr +#endif + /* symbol.c */ VALUE rb_to_symbol_type(VALUE obj); VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc); diff --git a/internal/variable.h b/internal/variable.h index 1cdc06e08d776e..5080fc13ef668b 100644 --- a/internal/variable.h +++ b/internal/variable.h @@ -9,7 +9,6 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ - #include "ruby/config.h" #include /* for size_t */ #include "constant.h" /* for rb_const_entry_t */ diff --git a/internal/vm.h b/internal/vm.h index e9d2d09c6cdf78..1bd7a98f7ad8c6 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -15,6 +15,14 @@ #include "ruby/ruby.h" /* for ID */ #include "ruby/st.h" /* for st_table */ +#ifdef rb_funcallv +# undef rb_funcallv +#endif + +#ifdef rb_method_basic_definition_p +# undef rb_method_basic_definition_p +#endif + /* I have several reasons to choose 64 here: * * - A cache line must be a power-of-two size. diff --git a/io.c b/io.c index 42528c0fd58ad5..37109f5def0bcb 100644 --- a/io.c +++ b/io.c @@ -11,38 +11,31 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/io.h" -#include "ruby/thread.h" -#include "internal.h" -#include "dln.h" -#include "encindex.h" -#include "id.h" +#include "ruby/config.h" + +#ifdef _WIN32 +# include "ruby/ruby.h" +# include "ruby/io.h" +#endif + #include #include -#include "ruby_atomic.h" -#include "ccan/list/list.h" +#include /* non-Linux poll may not work on all FDs */ #if defined(HAVE_POLL) -# if defined(__linux__) -# define USE_POLL 1 -# endif -# if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000 -# define USE_POLL 1 -# endif +# if defined(__linux__) +# define USE_POLL 1 +# endif +# if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000 +# define USE_POLL 1 +# endif #endif #ifndef USE_POLL -# define USE_POLL 0 -#endif - -#if !USE_POLL -# include "vm_core.h" +# define USE_POLL 0 #endif -#include "builtin.h" - #undef free #define free(x) xfree(x) @@ -119,7 +112,31 @@ # include #endif +#include "dln.h" +#include "encindex.h" +#include "id.h" +#include "internal.h" +#include "internal/encoding.h" +#include "internal/error.h" +#include "internal/inits.h" +#include "internal/io.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/process.h" +#include "internal/stdbool.h" +#include "ccan/list/list.h" +#include "internal/thread.h" +#include "internal/transcode.h" +#include "ruby/io.h" +#include "ruby/thread.h" #include "ruby/util.h" +#include "ruby_atomic.h" + +#if !USE_POLL +# include "vm_core.h" +#endif + +#include "builtin.h" #ifndef O_ACCMODE #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) diff --git a/iseq.c b/iseq.c index cbf62176bd6467..2f40efc77b6842 100644 --- a/iseq.c +++ b/iseq.c @@ -9,25 +9,37 @@ **********************************************************************/ -#include "internal.h" -#include "ruby/util.h" -#include "eval_intern.h" +#define RUBY_VM_INSNS_INFO 1 +/* #define RUBY_MARK_FREE_DEBUG 1 */ + +#include "ruby/config.h" #ifdef HAVE_DLADDR # include #endif -#define RUBY_VM_INSNS_INFO 1 -/* #define RUBY_MARK_FREE_DEBUG 1 */ +#include "eval_intern.h" #include "gc.h" -#include "vm_core.h" -#include "iseq.h" #include "id_table.h" -#include "builtin.h" +#include "internal.h" +#include "internal/bits.h" +#include "internal/compile.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/hash.h" +#include "internal/parse.h" +#include "internal/sanitizers.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "iseq.h" +#include "mjit.h" +#include "ruby/util.h" +#include "vm_core.h" +#include "builtin.h" #include "insns.inc" #include "insns_info.inc" -#include "mjit.h" VALUE rb_cISeq; static VALUE iseqw_new(const rb_iseq_t *iseq); diff --git a/iseq.h b/iseq.h index 25c62a384f4ce3..8354a0490f0e4c 100644 --- a/iseq.h +++ b/iseq.h @@ -11,6 +11,8 @@ #ifndef RUBY_ISEQ_H #define RUBY_ISEQ_H 1 +#include "internal/gc.h" +#include "vm_core.h" RUBY_EXTERN const int ruby_api_version[]; #define ISEQ_MAJOR_VERSION ((unsigned int)ruby_api_version[0]) diff --git a/load.c b/load.c index fda100fb1aec27..70a04756c668bd 100644 --- a/load.c +++ b/load.c @@ -2,13 +2,20 @@ * load methods from eval.c */ -#include "ruby/encoding.h" -#include "ruby/util.h" -#include "internal.h" #include "dln.h" #include "eval_intern.h" -#include "probes.h" +#include "internal.h" +#include "internal/dir.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/load.h" +#include "internal/parse.h" +#include "internal/thread.h" +#include "internal/variable.h" #include "iseq.h" +#include "probes.h" +#include "ruby/encoding.h" +#include "ruby/util.h" static VALUE ruby_dln_librefs; diff --git a/marshal.c b/marshal.c index df8da10b27dcbf..299902712c914c 100644 --- a/marshal.c +++ b/marshal.c @@ -9,13 +9,7 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/io.h" -#include "internal.h" -#include "ruby/st.h" -#include "ruby/util.h" -#include "encindex.h" -#include "id_table.h" +#include "ruby/config.h" #include #ifdef HAVE_FLOAT_H @@ -25,6 +19,23 @@ #include #endif +#include "encindex.h" +#include "id_table.h" +#include "internal.h" +#include "internal/bignum.h" +#include "internal/class.h" +#include "internal/encoding.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/struct.h" +#include "internal/util.h" +#include "internal/vm.h" +#include "ruby/io.h" +#include "ruby/ruby.h" +#include "ruby/st.h" +#include "ruby/util.h" + #define BITSPERSHORT (2*CHAR_BIT) #define SHORTMASK ((1< #include #include -#include + +#include "internal.h" +#include "internal/bignum.h" +#include "internal/complex.h" +#include "internal/math.h" +#include "internal/object.h" +#include "internal/vm.h" #if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ !defined(signbit) diff --git a/method.h b/method.h index b26caaa92d6600..519cc9bfc1c44a 100644 --- a/method.h +++ b/method.h @@ -12,6 +12,9 @@ #define RUBY_METHOD_H 1 #include "internal.h" +#include "internal/imemo.h" +#include "internal/compilers.h" +#include "internal/static_assert.h" #ifndef END_OF_ENUMERATION # if defined(__GNUC__) &&! defined(__STRICT_ANSI__) diff --git a/mini_builtin.c b/mini_builtin.c index ad289bf8966548..86803e1656a9ef 100644 --- a/mini_builtin.c +++ b/mini_builtin.c @@ -1,6 +1,7 @@ #include "internal.h" -#include "vm_core.h" +#include "internal/array.h" #include "iseq.h" +#include "vm_core.h" #include "builtin.h" #include "miniprelude.c" diff --git a/mjit.c b/mjit.c index 33abfbe3e9cbf4..5d1a182b0b7a15 100644 --- a/mjit.c +++ b/mjit.c @@ -11,14 +11,20 @@ // To share variables privately, include mjit_worker.c instead of linking. -#include "internal.h" +#include "ruby/config.h" #if USE_MJIT -#include "mjit_worker.c" - #include "constant.h" #include "id_table.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/file.h" +#include "internal/hash.h" +#include "internal/mjit.h" +#include "internal/warnings.h" + +#include "mjit_worker.c" // Copy ISeq's states so that race condition does not happen on compilation. static void diff --git a/mjit.h b/mjit.h index 256bf65a298af3..44cb6571b72f44 100644 --- a/mjit.h +++ b/mjit.h @@ -9,11 +9,14 @@ #ifndef RUBY_MJIT_H #define RUBY_MJIT_H 1 -#include "ruby.h" -#include "debug_counter.h" +#include "ruby/config.h" #if USE_MJIT +#include "debug_counter.h" +#include "ruby.h" +#include "vm_core.h" + // Special address values of a function generated from the // corresponding iseq by MJIT: enum rb_mjit_iseq_func { diff --git a/mjit_compile.c b/mjit_compile.c index f379a896a8782c..3218c52c4ec3d4 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -10,17 +10,22 @@ // call Ruby methods (C functions that may call rb_funcall) or trigger // GC (using ZALLOC, xmalloc, xfree, etc.) in this file. -#include "internal.h" +#include "ruby/config.h" #if USE_MJIT +#include "internal.h" +#include "internal/compile.h" +#include "internal/hash.h" +#include "internal/variable.h" +#include "mjit.h" #include "vm_core.h" #include "vm_exec.h" -#include "mjit.h" +#include "vm_insnhelper.h" + #include "builtin.h" #include "insns.inc" #include "insns_info.inc" -#include "vm_insnhelper.h" // Macros to check if a position is already compiled using compile_status.stack_size_for_pos #define NOT_COMPILED_STACK_SIZE -1 diff --git a/node.c b/node.c index 3514060ecb1e28..9decd803cee915 100644 --- a/node.c +++ b/node.c @@ -9,6 +9,9 @@ **********************************************************************/ +#include "internal.h" +#include "internal/hash.h" +#include "internal/variable.h" #include "ruby/ruby.h" #include "vm_core.h" diff --git a/numeric.c b/numeric.c index 218dabe4623f8b..2471f9bd04423e 100644 --- a/numeric.c +++ b/numeric.c @@ -9,10 +9,8 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/util.h" -#include "internal.h" -#include "id.h" +#include "ruby/config.h" + #include #include #include @@ -26,6 +24,22 @@ #include #endif +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compilers.h" +#include "internal/complex.h" +#include "internal/enumerator.h" +#include "internal/gc.h" +#include "internal/hash.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/rational.h" +#include "internal/util.h" +#include "internal/variable.h" +#include "ruby/encoding.h" +#include "ruby/util.h" + /* use IEEE 64bit values if not defined */ #ifndef FLT_RADIX #define FLT_RADIX 2 diff --git a/object.c b/object.c index 61be0d3862c1d4..f7bb57c13bbb65 100644 --- a/object.c +++ b/object.c @@ -11,18 +11,31 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/st.h" -#include "ruby/util.h" -#include "internal.h" -#include -#include +#include "ruby/config.h" + #include -#include +#include #include +#include +#include + #include "constant.h" #include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/inits.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/struct.h" +#include "internal/symbol.h" +#include "internal/variable.h" #include "probes.h" +#include "ruby/encoding.h" +#include "ruby/st.h" +#include "ruby/util.h" /*! * \defgroup object Core objects and their operations diff --git a/pack.c b/pack.c index ae5a9a18e2c009..8ba492fd3b0063 100644 --- a/pack.c +++ b/pack.c @@ -9,12 +9,20 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "internal.h" -#include +#include "ruby/config.h" + #include #include #include +#include + +#include "internal.h" +#include "internal/bits.h" +#include "internal/string.h" +#include "internal/symbol.h" +#include "internal/util.h" +#include "internal/variable.h" + #include "builtin.h" /* diff --git a/parse.y b/parse.y index 1281eb62584759..5f7884b5ae9d1d 100644 --- a/parse.y +++ b/parse.y @@ -20,18 +20,37 @@ #define YYLTYPE rb_code_location_t #define YYLTYPE_IS_DECLARED 1 -#include "ruby/ruby.h" -#include "ruby/st.h" -#include "ruby/encoding.h" +#include "ruby/config.h" + +#include +#include +#include + #include "internal.h" +#include "internal/compile.h" +#include "internal/complex.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/imemo.h" +#include "internal/io.h" +#include "internal/numeric.h" +#include "internal/parse.h" +#include "internal/rational.h" +#include "internal/re.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/util.h" +#include "internal/variable.h" #include "node.h" #include "parse.h" -#include "symbol.h" -#include "regenc.h" -#include -#include -#include #include "probes.h" +#include "regenc.h" +#include "ruby/encoding.h" +#include "ruby/regex.h" +#include "ruby/ruby.h" +#include "ruby/st.h" +#include "ruby/util.h" +#include "symbol.h" #ifndef WARN_PAST_SCOPE # define WARN_PAST_SCOPE 0 @@ -5531,9 +5550,6 @@ ripper_dispatch_delayed_token(struct parser_params *p, enum yytokentype t) #define has_delayed_token(p) (!NIL_P(p->delayed.token)) #endif /* RIPPER */ -#include "ruby/regex.h" -#include "ruby/util.h" - static inline int is_identchar(const char *ptr, const char *MAYBE_UNUSED(ptr_end), rb_encoding *enc) { diff --git a/proc.c b/proc.c index e7178bebf51960..cb5ffdab9a4fe6 100644 --- a/proc.c +++ b/proc.c @@ -10,10 +10,15 @@ **********************************************************************/ #include "eval_intern.h" -#include "internal.h" #include "gc.h" -#include "vm_core.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/symbol.h" #include "iseq.h" +#include "vm_core.h" /* Proc.new with no block will raise an exception in the future * versions */ diff --git a/process.c b/process.c index 3ea6eb2a1bf06b..bb895150d8e1c9 100644 --- a/process.c +++ b/process.c @@ -12,82 +12,106 @@ **********************************************************************/ #include "ruby/config.h" -#include "ruby/io.h" -#include "internal.h" -#include "ruby/thread.h" -#include "ruby/util.h" -#include "vm_core.h" -#include "hrtime.h" -#include +#include #include #include +#include +#include +#include + #ifdef HAVE_STDLIB_H -#include +# include #endif + #ifdef HAVE_UNISTD_H -#include +# include #endif + #ifdef HAVE_FCNTL_H -#include +# include #endif + #ifdef HAVE_PROCESS_H -#include +# include #endif -#include -#include - #ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 +# define EXIT_SUCCESS 0 #endif + #ifndef EXIT_FAILURE -#define EXIT_FAILURE 1 +# define EXIT_FAILURE 1 #endif #ifdef HAVE_SYS_WAIT_H # include #endif + #ifdef HAVE_SYS_RESOURCE_H # include #endif + #ifdef HAVE_VFORK_H # include #endif + #ifdef HAVE_SYS_PARAM_H # include #endif + #ifndef MAXPATHLEN # define MAXPATHLEN 1024 #endif -#include "ruby/st.h" #include #ifdef HAVE_SYS_TIME_H -#include +# include #endif + #ifdef HAVE_SYS_TIMES_H -#include +# include #endif #ifdef HAVE_PWD_H -#include +# include #endif + #ifdef HAVE_GRP_H -#include +# include # ifdef __CYGWIN__ int initgroups(const char *, rb_gid_t); # endif #endif + #ifdef HAVE_SYS_ID_H -#include +# include #endif #ifdef __APPLE__ # include #endif +#include "dln.h" +#include "hrtime.h" +#include "internal.h" +#include "internal/bits.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/hash.h" +#include "internal/mjit.h" +#include "internal/object.h" +#include "internal/process.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "internal/warnings.h" +#include "ruby/io.h" +#include "ruby/st.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#include "vm_core.h" + /* define system APIs */ #ifdef _WIN32 #undef open @@ -317,8 +341,6 @@ close_unless_reserved(int fd) /*#define DEBUG_REDIRECT*/ #if defined(DEBUG_REDIRECT) -#include - static void ttyprintf(const char *fmt, ...) { @@ -1572,8 +1594,6 @@ after_fork_ruby(void) } #endif -#include "dln.h" - #if defined(HAVE_WORKING_FORK) /* try_with_sh and exec_with_sh should be async-signal-safe. Actually it is.*/ diff --git a/random.c b/random.c index d763a214cd9bba..29ac3883116065 100644 --- a/random.c +++ b/random.c @@ -9,41 +9,59 @@ **********************************************************************/ -#include "internal.h" +#include "ruby/config.h" +#include #include +#include +#include + #ifdef HAVE_UNISTD_H -#include +# include #endif -#include + #include #include + #ifdef HAVE_FCNTL_H -#include +# include #endif -#include -#include + #if defined(HAVE_SYS_TIME_H) -#include +# include #endif #ifdef HAVE_SYSCALL_H -#include +# include #elif defined HAVE_SYS_SYSCALL_H -#include +# include #endif #ifdef _WIN32 -#include -#include +# include +# include +# include #endif -#include "ruby_atomic.h" #ifdef __OpenBSD__ /* to define OpenBSD for version check */ -#include +# include +#endif + +#if defined HAVE_GETRANDOM +# include +#elif defined __linux__ && defined __NR_getrandom +# include #endif +#include "internal.h" +#include "internal/compilers.h" +#include "internal/error.h" +#include "internal/numeric.h" +#include "internal/random.h" +#include "internal/sanitizers.h" +#include "ruby_atomic.h" + typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1]; #include "missing/mt19937.c" @@ -320,11 +338,7 @@ fill_random_bytes_urandom(void *seed, size_t size) # define fill_random_bytes_urandom(seed, size) -1 #endif -#if defined HAVE_GETRANDOM -# include -#elif defined __linux__ && defined __NR_getrandom -# include - +#if ! defined HAVE_GETRANDOM && defined __linux__ && defined __NR_getrandom # ifndef GRND_NONBLOCK # define GRND_NONBLOCK 0x0001 /* not defined in musl libc */ # endif diff --git a/range.c b/range.c index bf14c0c7a7e75b..e182934fa35ded 100644 --- a/range.c +++ b/range.c @@ -9,14 +9,24 @@ **********************************************************************/ -#include "internal.h" -#include "id.h" +#include "ruby/config.h" + #include +#include #ifdef HAVE_FLOAT_H #include #endif -#include + +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compar.h" +#include "internal/enum.h" +#include "internal/enumerator.h" +#include "internal/error.h" +#include "internal/numeric.h" +#include "internal/range.h" VALUE rb_cRange; static ID id_beg, id_end, id_excl; diff --git a/rational.c b/rational.c index c606f3c625ed5f..8b4a39452c709a 100644 --- a/rational.c +++ b/rational.c @@ -5,23 +5,32 @@ which is written in ruby. */ -#include "internal.h" -#include "id.h" -#include +#include "ruby/config.h" + +#include #include +#include #ifdef HAVE_IEEEFP_H #include #endif -#define NDEBUG -#include "ruby_assert.h" - #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) #define USE_GMP #include #endif +#define NDEBUG +#include "id.h" +#include "internal.h" +#include "internal/complex.h" +#include "internal/error.h" +#include "internal/gc.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/rational.h" +#include "ruby_assert.h" + #define ZERO INT2FIX(0) #define ONE INT2FIX(1) #define TWO INT2FIX(2) @@ -2299,8 +2308,6 @@ float_rationalize(int argc, VALUE *argv, VALUE self) } } -#include - inline static int issign(int c) { diff --git a/re.c b/re.c index b15c3a07a84134..56b5144f9f4662 100644 --- a/re.c +++ b/re.c @@ -9,13 +9,20 @@ **********************************************************************/ +#include "ruby/config.h" + +#include + +#include "encindex.h" +#include "internal.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/imemo.h" +#include "internal/re.h" +#include "regint.h" #include "ruby/encoding.h" #include "ruby/re.h" #include "ruby/util.h" -#include "internal.h" -#include "regint.h" -#include "encindex.h" -#include VALUE rb_eRegexpError; diff --git a/ruby.c b/ruby.c index 7903f583fe0bec..2d1a437e7d7460 100644 --- a/ruby.c +++ b/ruby.c @@ -11,38 +11,57 @@ **********************************************************************/ -#ifdef __CYGWIN__ -#include -#include -#endif -#include "ruby/encoding.h" -#include "ruby/thread.h" -#include "ruby/version.h" -#include "internal.h" -#include "eval_intern.h" -#include "dln.h" +#include "ruby/config.h" + +#include #include #include -#include + +#ifdef __CYGWIN__ +# include +# include +#endif #ifdef __hpux -#include +# include #endif + #if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR) -#include +# include #endif #ifdef HAVE_UNISTD_H -#include +# include #endif + #if defined(HAVE_FCNTL_H) -#include +# include #elif defined(HAVE_SYS_FCNTL_H) -#include +# include #endif + #ifdef HAVE_SYS_PARAM_H # include #endif + +#include "dln.h" +#include "eval_intern.h" +#include "internal.h" +#include "internal/error.h" +#include "internal/file.h" +#include "internal/inits.h" +#include "internal/io.h" +#include "internal/load.h" +#include "internal/loadpath.h" +#include "internal/missing.h" +#include "internal/object.h" +#include "internal/parse.h" +#include "mjit.h" +#include "ruby/encoding.h" +#include "ruby/thread.h" +#include "ruby/util.h" +#include "ruby/version.h" + #ifndef MAXPATHLEN # define MAXPATHLEN 1024 #endif @@ -50,10 +69,6 @@ # define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) #endif -#include "ruby/util.h" - -#include "mjit.h" - void Init_ruby_description(void); #ifndef HAVE_STDLIB_H diff --git a/signal.c b/signal.c index 68d68c54bfc721..ab4eadc7eec1cc 100644 --- a/signal.c +++ b/signal.c @@ -11,36 +11,39 @@ **********************************************************************/ -#include "internal.h" -#include "vm_core.h" +#include "ruby/config.h" + +#include #include #include -#include -#include "ruby_atomic.h" -#include "eval_intern.h" + #ifdef HAVE_UNISTD_H # include #endif + #ifdef HAVE_SYS_UIO_H -#include +# include #endif + #ifdef HAVE_UCONTEXT_H -#include +# include #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -# include -# ifndef VALGRIND_MAKE_MEM_DEFINED -# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) -# endif -# ifndef VALGRIND_MAKE_MEM_UNDEFINED -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) -# endif -#else -# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 -# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 +#if HAVE_PTHREAD_H +# include #endif +#include "debug_counter.h" +#include "eval_intern.h" +#include "internal.h" +#include "internal/eval.h" +#include "internal/sanitizers.h" +#include "internal/signal.h" +#include "internal/string.h" +#include "internal/thread.h" +#include "ruby_atomic.h" +#include "vm_core.h" + #ifdef NEED_RUBY_ATOMIC_OPS rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val) @@ -395,7 +398,6 @@ interrupt_init(int argc, VALUE *argv, VALUE self) return rb_call_super(2, args); } -#include "debug_counter.h" void rb_malloc_info_show_results(void); /* gc.c */ void @@ -728,10 +730,6 @@ rb_signal_buff_size(void) return signal_buff.size; } -#if HAVE_PTHREAD_H -#include -#endif - static void rb_disable_interrupt(void) { diff --git a/sprintf.c b/sprintf.c index 23eb39a73b23b3..64cfdee1a1e09a 100644 --- a/sprintf.c +++ b/sprintf.c @@ -11,17 +11,27 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/re.h" -#include "internal.h" -#include "id.h" +#include "ruby/config.h" + #include #include #ifdef HAVE_IEEEFP_H -#include +# include #endif +#include "id.h" +#include "internal.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/sanitizers.h" +#include "internal/symbol.h" +#include "internal/util.h" +#include "ruby/encoding.h" +#include "ruby/re.h" + #define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */ static char *fmt_setup(char*,size_t,int,int,int,int); diff --git a/st.c b/st.c index 2b973ea75d2191..3d95c812d16c1b 100644 --- a/st.c +++ b/st.c @@ -105,6 +105,9 @@ #include "st.h" #else #include "internal.h" +#include "internal/bits.h" +#include "internal/hash.h" +#include "internal/sanitizers.h" #endif #include diff --git a/strftime.c b/strftime.c index dd2b21f977a9c7..911bcdaf154c7d 100644 --- a/strftime.c +++ b/strftime.c @@ -47,10 +47,7 @@ * January 1996 */ -#include "ruby/ruby.h" -#include "ruby/encoding.h" -#include "timev.h" -#include "internal.h" +#include "ruby/config.h" #ifndef GAWK #include @@ -68,6 +65,14 @@ #endif #include +#include "internal.h" +#include "internal/string.h" +#include "internal/util.h" +#include "internal/vm.h" +#include "ruby/encoding.h" +#include "ruby/ruby.h" +#include "timev.h" + /* defaults: season to taste */ #define SYSV_EXT 1 /* stuff in System V ascftime routine */ #define SUNOS_EXT 1 /* stuff in SunOS strftime routine */ diff --git a/string.c b/string.c index d6fd73115bfdcb..c9383937ae72ab 100644 --- a/string.c +++ b/string.c @@ -11,37 +11,52 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/re.h" -#include "internal.h" -#include "encindex.h" -#include "probes.h" -#include "gc.h" -#include "ruby_assert.h" -#include "id.h" -#include "debug_counter.h" -#include "ruby/util.h" - -#define BEG(no) (regs->beg[(no)]) -#define END(no) (regs->end[(no)]) +#include "ruby/config.h" +#include #include #include -#include #ifdef HAVE_UNISTD_H -#include +# include #endif #if defined HAVE_CRYPT_R # if defined HAVE_CRYPT_H -# include +# include # endif #elif !defined HAVE_CRYPT # include "missing/crypt.h" # define HAVE_CRYPT_R 1 #endif +#include "debug_counter.h" +#include "encindex.h" +#include "gc.h" +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compar.h" +#include "internal/compilers.h" +#include "internal/encoding.h" +#include "internal/error.h" +#include "internal/gc.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/re.h" +#include "internal/sanitizers.h" +#include "internal/string.h" +#include "internal/transcode.h" +#include "probes.h" +#include "ruby/encoding.h" +#include "ruby/re.h" +#include "ruby/util.h" +#include "ruby_assert.h" + +#define BEG(no) (regs->beg[(no)]) +#define END(no) (regs->end[(no)]) + #undef rb_str_new #undef rb_usascii_str_new #undef rb_utf8_str_new diff --git a/struct.c b/struct.c index d1aa7c278ff1ad..79131db2bd8056 100644 --- a/struct.c +++ b/struct.c @@ -9,10 +9,17 @@ **********************************************************************/ -#include "internal.h" -#include "vm_core.h" #include "id.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/struct.h" +#include "internal/symbol.h" #include "transient_heap.h" +#include "vm_core.h" /* only for struct[:field] access */ enum { diff --git a/symbol.c b/symbol.c index 14517df01eab96..a0aa4cc75f7808 100644 --- a/symbol.c +++ b/symbol.c @@ -9,13 +9,22 @@ **********************************************************************/ +#include "gc.h" +#include "internal.h" +#include "internal/error.h" +#include "internal/gc.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/symbol.h" +#include "internal/vm.h" +#include "probes.h" #include "ruby/encoding.h" #include "ruby/st.h" -#include "internal.h" #include "symbol.h" -#include "gc.h" -#include "probes.h" +#ifndef USE_SYMBOL_GC +# define USE_SYMBOL_GC 1 +#endif #ifndef SYMBOL_DEBUG # define SYMBOL_DEBUG 0 #endif diff --git a/symbol.h b/symbol.h index 4b5c676d55d2ea..45cf1b21c9cae6 100644 --- a/symbol.h +++ b/symbol.h @@ -13,6 +13,7 @@ #define RUBY_SYMBOL_H 1 #include "id.h" +#include "ruby/encoding.h" #define DYNAMIC_ID_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID) #define STATIC_ID2SYM(id) (((VALUE)(id)<<%=%> */ %unless @preludes.empty? -#include "ruby/ruby.h" #include "internal.h" -#include "vm_core.h" +#include "internal/warnings.h" #include "iseq.h" +#include "ruby/ruby.h" +#include "vm_core.h" % preludes = @preludes.values.sort % preludes.each {|i, prelude, lines, sub| diff --git a/thread.c b/thread.c index da36b62f8b4164..73d60b0fe3f671 100644 --- a/thread.c +++ b/thread.c @@ -64,23 +64,34 @@ /* for model 2 */ #include "ruby/config.h" -#include "ruby/io.h" + +#ifdef __linux__ +// Normally, gcc(1) translates calls to alloca() with inlined code. This is not done when either the -ansi, -std=c89, -std=c99, or the -std=c11 option is given and the header is not included. +# include +#endif + #include "eval_intern.h" -#include "timev.h" -#include "ruby/thread.h" -#include "ruby/thread_native.h" -#include "ruby/debug.h" #include "gc.h" +#include "hrtime.h" #include "internal.h" +#include "internal/class.h" +#include "internal/error.h" +#include "internal/hash.h" +#include "internal/io.h" +#include "internal/object.h" +#include "internal/proc.h" +#include "internal/signal.h" +#include "internal/thread.h" +#include "internal/time.h" +#include "internal/warnings.h" #include "iseq.h" -#include "vm_core.h" #include "mjit.h" -#include "hrtime.h" - -#ifdef __linux__ -// Normally, gcc(1) translates calls to alloca() with inlined code. This is not done when either the -ansi, -std=c89, -std=c99, or the -std=c11 option is given and the header is not included. -#include -#endif +#include "ruby/debug.h" +#include "ruby/io.h" +#include "ruby/thread.h" +#include "ruby/thread_native.h" +#include "timev.h" +#include "vm_core.h" #ifndef USE_NATIVE_THREAD_PRIORITY #define USE_NATIVE_THREAD_PRIORITY 0 diff --git a/time.c b/time.c index d71d43e0584d26..0f7b35f824f897 100644 --- a/time.c +++ b/time.c @@ -11,29 +11,37 @@ #define _DEFAULT_SOURCE #define _BSD_SOURCE -#include "ruby/encoding.h" -#include "internal.h" -#include -#include +#include "ruby/config.h" + #include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H -#include +# include #endif -#include -#include - #ifdef HAVE_STRINGS_H -#include +# include #endif #if defined(HAVE_SYS_TIME_H) -#include +# include #endif -#include "timev.h" #include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/compar.h" +#include "internal/numeric.h" +#include "internal/rational.h" +#include "internal/string.h" +#include "internal/time.h" +#include "internal/variable.h" +#include "ruby/encoding.h" +#include "timev.h" static ID id_submicro, id_nano_num, id_nano_den, id_offset, id_zone; static ID id_nanosecond, id_microsecond, id_millisecond, id_nsec, id_usec; diff --git a/timev.h b/timev.h index 6f124aa6bf5f59..af97ed95b5017f 100644 --- a/timev.h +++ b/timev.h @@ -1,5 +1,6 @@ #ifndef RUBY_TIMEV_H #define RUBY_TIMEV_H +#include "ruby/ruby.h" #if 0 struct vtm {/* dummy for TAGS */}; diff --git a/tool/mk_builtin_loader.rb b/tool/mk_builtin_loader.rb index dcd4b935326047..3d2a3430e0912b 100644 --- a/tool/mk_builtin_loader.rb +++ b/tool/mk_builtin_loader.rb @@ -127,13 +127,18 @@ def mk_builtin_header file f.puts "// auto-generated file" f.puts "// by #{__FILE__}" f.puts "// with #{file}" + f.puts '#include "internal/compilers.h" /* for MAYBE_UNUSED */' + f.puts '#include "internal/warnings.h" /* for COMPILER_WARNING_PUSH */' + f.puts '#include "ruby/ruby.h" /* for VALUE */' + f.puts '#include "builtin.h" /* for RB_BUILTIN_FUNCTION */' + f.puts 'struct rb_execution_context_struct; /* in vm_core.h */' f.puts - lineno = 6 + lineno = 11 line_file = file.gsub('\\', '/') inlines.each{|cfunc_name, (body_lineno, text, params, func_name)| if String === cfunc_name - f.puts "static VALUE #{cfunc_name}(rb_execution_context_t *ec, const VALUE self) {" + f.puts "static VALUE #{cfunc_name}(struct rb_execution_context_struct *ec, const VALUE self) {" lineno += 1 params.reverse_each.with_index{|param, i| diff --git a/transcode.c b/transcode.c index aeab90f9e6c5f1..a336f5d9ada1d4 100644 --- a/transcode.c +++ b/transcode.c @@ -9,10 +9,18 @@ **********************************************************************/ -#include "ruby/encoding.h" +#include "ruby/config.h" + +#include + #include "internal.h" +#include "internal/inits.h" +#include "internal/object.h" +#include "internal/string.h" +#include "internal/transcode.h" +#include "ruby/encoding.h" + #include "transcode_data.h" -#include #define ENABLE_ECONV_NEWLINE_OPTION 1 diff --git a/transient_heap.c b/transient_heap.c index 6e9cf6440eae47..3c1d9a3986588b 100644 --- a/transient_heap.c +++ b/transient_heap.c @@ -6,14 +6,20 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/debug.h" -#include "vm_debug.h" +#include "debug_counter.h" #include "gc.h" #include "internal.h" +#include "internal/gc.h" +#include "internal/hash.h" +#include "internal/sanitizers.h" +#include "internal/static_assert.h" +#include "internal/struct.h" +#include "internal/variable.h" +#include "ruby/debug.h" +#include "ruby/ruby.h" #include "ruby_assert.h" #include "transient_heap.h" -#include "debug_counter.h" +#include "vm_debug.h" #if USE_TRANSIENT_HEAP /* USE_TRANSIENT_HEAP */ /* diff --git a/util.c b/util.c index aa8e7ef3f2f2ff..08dbed105ed272 100644 --- a/util.c +++ b/util.c @@ -10,21 +10,24 @@ **********************************************************************/ #if defined __MINGW32__ || defined __MINGW64__ -#define MINGW_HAS_SECURE_API 1 +# define MINGW_HAS_SECURE_API 1 #endif -#include "internal.h" +#include "ruby/config.h" #include -#include #include -#include #include +#include +#include #ifdef _WIN32 -#include "missing/file.h" +# include "missing/file.h" #endif +#include "internal.h" +#include "internal/sanitizers.h" +#include "internal/util.h" #include "ruby/util.h" const char ruby_hexdigits[] = "0123456789abcdef0123456789ABCDEF"; diff --git a/variable.c b/variable.c index 42c4cb7cd4611d..46f7dea7259d0f 100644 --- a/variable.c +++ b/variable.c @@ -11,19 +11,30 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/st.h" -#include "ruby/util.h" -#include "internal.h" -#include "id_table.h" +#include "ruby/config.h" +#include #include "constant.h" +#include "debug_counter.h" #include "id.h" -#include "ccan/list/list.h" #include "id_table.h" -#include "debug_counter.h" -#include "vm_core.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/compilers.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/hash.h" +#include "internal/re.h" +#include "internal/symbol.h" +#include "internal/stdbool.h" +#include "ccan/list/list.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "ruby/encoding.h" +#include "ruby/st.h" +#include "ruby/util.h" #include "transient_heap.h" #include "variable.h" +#include "vm_core.h" static struct rb_id_table *rb_global_tbl; static ID autoload, classpath, tmp_classpath; diff --git a/vm.c b/vm.c index bb3ffae078d393..d4a1d4437e3d64 100644 --- a/vm.c +++ b/vm.c @@ -8,17 +8,33 @@ **********************************************************************/ -#include "internal.h" -#include "ruby/vm.h" -#include "ruby/st.h" - #define vm_exec rb_vm_exec +#include "eval_intern.h" #include "gc.h" +#include "internal.h" +#include "internal/compile.h" +#include "internal/cont.h" +#include "internal/debug.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/inits.h" +#include "internal/mjit.h" +#include "internal/object.h" +#include "internal/parse.h" +#include "internal/proc.h" +#include "internal/re.h" +#include "internal/symbol.h" +#include "internal/vm.h" +#include "iseq.h" +#include "mjit.h" +#include "ruby/st.h" +#include "ruby/vm.h" #include "vm_core.h" #include "vm_debug.h" -#include "iseq.h" -#include "eval_intern.h" +#include "vm_exec.h" +#include "vm_insnhelper.h" + #include "builtin.h" #ifndef MJIT_HEADER @@ -338,9 +354,6 @@ extern VALUE rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, V const rb_callable_method_entry_t *me); static VALUE vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, int kw_splat, VALUE block_handler); -#include "mjit.h" -#include "vm_insnhelper.h" -#include "vm_exec.h" #include "vm_insnhelper.c" #ifndef MJIT_HEADER diff --git a/vm_backtrace.c b/vm_backtrace.c index 2c9649a7c2295a..9bc56f731e50d1 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -9,13 +9,13 @@ **********************************************************************/ -#include "ruby/encoding.h" -#include "ruby/debug.h" -#include "internal.h" - -#include "vm_core.h" #include "eval_intern.h" +#include "internal.h" +#include "internal/vm.h" #include "iseq.h" +#include "ruby/debug.h" +#include "ruby/encoding.h" +#include "vm_core.h" static VALUE rb_cBacktrace; static VALUE rb_cBacktraceLocation; diff --git a/vm_core.h b/vm_core.h index 12c3ac37755162..8807c23b6fa397 100644 --- a/vm_core.h +++ b/vm_core.h @@ -46,6 +46,19 @@ #define VMDEBUG 3 #endif +#include "ruby/config.h" + +#include +#include + +#ifdef HAVE_STDARG_PROTOTYPES +#include +#define va_init_list(a,b) va_start((a),(b)) +#else +#include +#define va_init_list(a,b) va_start((a)) +#endif + #include "ruby_assert.h" #if VM_CHECK_MODE > 0 @@ -57,27 +70,21 @@ #define VM_UNREACHABLE(func) UNREACHABLE #endif -#define RUBY_VM_THREAD_MODEL 2 - -/* - * implementation selector of get_insn_info algorithm - * 0: linear search - * 1: binary search - * 2: succinct bitvector - */ -#ifndef VM_INSN_INFO_TABLE_IMPL -# define VM_INSN_INFO_TABLE_IMPL 2 -#endif - -#include "ruby/ruby.h" -#include "ruby/st.h" +#include -#include "node.h" -#include "vm_opts.h" #include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/serial.h" +#include "internal/stdbool.h" +#include "ccan/list/list.h" +#include "internal/vm.h" #include "method.h" +#include "node.h" +#include "ruby/ruby.h" +#include "ruby/st.h" #include "ruby_atomic.h" -#include "ccan/list/list.h" +#include "vm_opts.h" #include "ruby/thread_native.h" #if defined(_WIN32) @@ -86,8 +93,17 @@ #include "thread_pthread.h" #endif -#include -#include +#define RUBY_VM_THREAD_MODEL 2 + +/* + * implementation selector of get_insn_info algorithm + * 0: linear search + * 1: binary search + * 2: succinct bitvector + */ +#ifndef VM_INSN_INFO_TABLE_IMPL +# define VM_INSN_INFO_TABLE_IMPL 2 +#endif #if defined(NSIG_MAX) /* POSIX issue 8 */ # undef NSIG @@ -123,14 +139,6 @@ /* define to 0 to test old code path */ #define WAITPID_USE_SIGCHLD (RUBY_SIGCHLD || SIGCHLD_LOSSY) -#ifdef HAVE_STDARG_PROTOTYPES -#include -#define va_init_list(a,b) va_start((a),(b)) -#else -#include -#define va_init_list(a,b) va_start((a)) -#endif - #if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK) && defined(SA_SIGINFO) && !defined(__NetBSD__) # define USE_SIGALTSTACK void *rb_register_sigaltstack(void); diff --git a/vm_dump.c b/vm_dump.c index c778e1b4ddac3d..09051cfc3275c1 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -8,27 +8,32 @@ **********************************************************************/ - -#include "internal.h" -#include "addr2line.h" -#include "vm_core.h" -#include "iseq.h" -#include "gc.h" +#include "ruby/config.h" #ifdef HAVE_UCONTEXT_H -#include +# include #endif + #ifdef __APPLE__ -#ifdef HAVE_LIBPROC_H -#include -#endif -#include -#include -#ifdef __LP64__ -#define vm_region_recurse vm_region_recurse_64 -#endif +# ifdef HAVE_LIBPROC_H +# include +# endif +# include +# include +# ifdef __LP64__ +# define vm_region_recurse vm_region_recurse_64 +# endif #endif +#include "addr2line.h" +#include "gc.h" +#include "internal.h" +#include "internal/variable.h" +#include "internal/vm.h" +#include "iseq.h" +#include "vm_core.h" + + /* see vm_insnhelper.h for the values */ #ifndef VMDEBUG #define VMDEBUG 0 diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 0cd4bdefe97561..8cc47e15afcddc 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -8,18 +8,29 @@ **********************************************************************/ -/* finish iseq array */ -#include "insns.inc" -#ifndef MJIT_HEADER -#include "insns_info.inc" -#endif +#include "ruby/config.h" + #include + #include "constant.h" +#include "debug_counter.h" #include "internal.h" +#include "internal/class.h" +#include "internal/compar.h" +#include "internal/hash.h" +#include "internal/numeric.h" +#include "internal/proc.h" +#include "internal/random.h" +#include "internal/variable.h" #include "ruby/config.h" -#include "debug_counter.h" #include "variable.h" +/* finish iseq array */ +#include "insns.inc" +#ifndef MJIT_HEADER +#include "insns_info.inc" +#endif + extern rb_method_definition_t *rb_method_definition_create(rb_method_type_t type, ID mid); extern void rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *def, void *opts); extern int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); diff --git a/vm_trace.c b/vm_trace.c index 9a604814c6b3cc..079795bfc673bd 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -21,13 +21,15 @@ * */ +#include "eval_intern.h" #include "internal.h" +#include "internal/hash.h" +#include "internal/symbol.h" +#include "iseq.h" +#include "mjit.h" #include "ruby/debug.h" - #include "vm_core.h" -#include "mjit.h" -#include "iseq.h" -#include "eval_intern.h" + #include "builtin.h" /* (1) trace mechanisms */ diff --git a/win32/dir.h b/win32/dir.h index 29c4c1c6d5b6e1..a0759804f65c57 100644 --- a/win32/dir.h +++ b/win32/dir.h @@ -1,5 +1,8 @@ #ifndef RUBY_WIN32_DIR_H #define RUBY_WIN32_DIR_H +#include /* for uint8_t */ +#include /* for WCHAR */ +#include "ruby/encoding.h" /* for rb_encoding */ #define DT_UNKNOWN 0 #define DT_DIR (S_IFDIR>>12) diff --git a/win32/file.c b/win32/file.c index 9d213700193092..133b5fbdb0178b 100644 --- a/win32/file.c +++ b/win32/file.c @@ -5,6 +5,7 @@ #include "ruby/ruby.h" #include "ruby/encoding.h" #include "internal.h" +#include "internal/error.h" #include #include #include diff --git a/win32/win32.c b/win32/win32.c index 247ac918d4b196..0fa3855fb3633d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -55,6 +55,10 @@ #include "win32/file.h" #include "id.h" #include "internal.h" +#include "internal/enc.h" +#include "internal/object.h" +#include "internal/static_assert.h" +#include "internal/stdbool.h" #include "encindex.h" #define isdirsep(x) ((x) == '/' || (x) == '\\') From 8184adabe5018ff930fde64456029471c1ebcd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 25 Dec 2019 13:40:10 +0900 Subject: [PATCH 202/878] internal/stdbool.h rework Noticed that internal/stdbool.h and addr2line.c are the only two place where missing/stdbool.h is included. Why not delete the file so that we can merge internal/stdbool.h and missing/stdbool.h into one. --- addr2line.c | 6 +----- internal/stdbool.h | 16 +++++++++++++++- missing/stdbool.h | 20 -------------------- 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 missing/stdbool.h diff --git a/addr2line.c b/addr2line.c index 635194b96beb6f..c6704858a98fc2 100644 --- a/addr2line.c +++ b/addr2line.c @@ -25,11 +25,7 @@ #include #endif -#ifdef HAVE_STDBOOL_H -#include -#else -#include "missing/stdbool.h" -#endif +#include "internal/stdbool.h" #if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H) diff --git a/internal/stdbool.h b/internal/stdbool.h index 4c103b43ce447a..e090e575e7bd4e 100644 --- a/internal/stdbool.h +++ b/internal/stdbool.h @@ -13,8 +13,22 @@ #ifdef HAVE_STDBOOL_H # include +#endif + +/* Note that we assume the compiler isn't C++. */ +#ifdef __bool_true_false_are_defined +# undef bool +# undef true +# undef false +# undef __bool_true_false_are_defined #else -# include "missing/stdbool.h" +typedef unsigned char _Bool; #endif +/* See also http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2229.htm */ +#define bool _Bool +#define true ((_Bool)+1) +#define false ((_Bool)+0) +#define __bool_true_false_are_defined + #endif /* INTERNAL_STDBOOL_H */ diff --git a/missing/stdbool.h b/missing/stdbool.h deleted file mode 100644 index f370e01e92061a..00000000000000 --- a/missing/stdbool.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * missing/stdbool.h: Quick alternative of C99 stdbool.h - */ - -#ifndef _MISSING_STDBOOL_H_ -#define _MISSING_STDBOOL_H_ - -#ifndef __bool_true_false_are_defined -# ifndef __cplusplus -# undef bool -# undef false -# undef true -# define bool signed char -# define false 0 -# define true 1 -# define __bool_true_false_are_defined 1 -# endif -#endif - -#endif /* _MISSING_STDBOOL_H_ */ From 0c2d731ef210c9121e2a97cc5b0d7594a80389f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 20 Dec 2019 10:44:37 +0900 Subject: [PATCH 203/878] update dependencies --- common.mk | 933 +++++++++++++++++++++++++++++++++++++ enc/depend | 33 ++ ext/-test-/bignum/depend | 12 + ext/-test-/integer/depend | 9 + ext/-test-/rational/depend | 1 + ext/-test-/string/depend | 14 + ext/-test-/time/depend | 4 + ext/coverage/depend | 10 + ext/objspace/depend | 20 + ext/pty/depend | 8 + ext/ripper/depend | 28 ++ ext/socket/depend | 165 +++++++ 12 files changed, 1237 insertions(+) diff --git a/common.mk b/common.mk index 3706aeb4ce7035..ceb50f906a9a67 100644 --- a/common.mk +++ b/common.mk @@ -1566,6 +1566,7 @@ help: PHONY $(MESSAGE_END) # AUTOGENERATED DEPENDENCIES START +addr2line.$(OBJEXT): $(top_srcdir)/internal/stdbool.h addr2line.$(OBJEXT): {$(VPATH)}addr2line.c addr2line.$(OBJEXT): {$(VPATH)}addr2line.h addr2line.$(OBJEXT): {$(VPATH)}config.h @@ -1573,6 +1574,23 @@ addr2line.$(OBJEXT): {$(VPATH)}defines.h addr2line.$(OBJEXT): {$(VPATH)}missing.h array.$(OBJEXT): $(hdrdir)/ruby.h array.$(OBJEXT): $(hdrdir)/ruby/ruby.h +array.$(OBJEXT): $(top_srcdir)/internal/array.h +array.$(OBJEXT): $(top_srcdir)/internal/bignum.h +array.$(OBJEXT): $(top_srcdir)/internal/bits.h +array.$(OBJEXT): $(top_srcdir)/internal/compar.h +array.$(OBJEXT): $(top_srcdir)/internal/compilers.h +array.$(OBJEXT): $(top_srcdir)/internal/enum.h +array.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +array.$(OBJEXT): $(top_srcdir)/internal/gc.h +array.$(OBJEXT): $(top_srcdir)/internal/hash.h +array.$(OBJEXT): $(top_srcdir)/internal/numeric.h +array.$(OBJEXT): $(top_srcdir)/internal/object.h +array.$(OBJEXT): $(top_srcdir)/internal/proc.h +array.$(OBJEXT): $(top_srcdir)/internal/rational.h +array.$(OBJEXT): $(top_srcdir)/internal/serial.h +array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +array.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +array.$(OBJEXT): $(top_srcdir)/internal/vm.h array.$(OBJEXT): {$(VPATH)}array.c array.$(OBJEXT): {$(VPATH)}assert.h array.$(OBJEXT): {$(VPATH)}config.h @@ -1598,6 +1616,17 @@ ast.$(OBJEXT): $(CCAN_DIR)/list/list.h ast.$(OBJEXT): $(CCAN_DIR)/str/str.h ast.$(OBJEXT): $(hdrdir)/ruby.h ast.$(OBJEXT): $(hdrdir)/ruby/ruby.h +ast.$(OBJEXT): $(top_srcdir)/internal/array.h +ast.$(OBJEXT): $(top_srcdir)/internal/compilers.h +ast.$(OBJEXT): $(top_srcdir)/internal/gc.h +ast.$(OBJEXT): $(top_srcdir)/internal/imemo.h +ast.$(OBJEXT): $(top_srcdir)/internal/parse.h +ast.$(OBJEXT): $(top_srcdir)/internal/serial.h +ast.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +ast.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +ast.$(OBJEXT): $(top_srcdir)/internal/symbol.h +ast.$(OBJEXT): $(top_srcdir)/internal/vm.h +ast.$(OBJEXT): $(top_srcdir)/internal/warnings.h ast.$(OBJEXT): {$(VPATH)}assert.h ast.$(OBJEXT): {$(VPATH)}ast.c ast.$(OBJEXT): {$(VPATH)}ast.rbinc @@ -1625,11 +1654,29 @@ ast.$(OBJEXT): {$(VPATH)}vm_core.h ast.$(OBJEXT): {$(VPATH)}vm_opts.h bignum.$(OBJEXT): $(hdrdir)/ruby.h bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h +bignum.$(OBJEXT): $(top_srcdir)/internal/bignum.h +bignum.$(OBJEXT): $(top_srcdir)/internal/bits.h +bignum.$(OBJEXT): $(top_srcdir)/internal/compilers.h +bignum.$(OBJEXT): $(top_srcdir)/internal/complex.h +bignum.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +bignum.$(OBJEXT): $(top_srcdir)/internal/gc.h +bignum.$(OBJEXT): $(top_srcdir)/internal/numeric.h +bignum.$(OBJEXT): $(top_srcdir)/internal/object.h +bignum.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +bignum.$(OBJEXT): $(top_srcdir)/internal/serial.h +bignum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +bignum.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +bignum.$(OBJEXT): $(top_srcdir)/internal/util.h +bignum.$(OBJEXT): $(top_srcdir)/internal/variable.h +bignum.$(OBJEXT): $(top_srcdir)/internal/vm.h +bignum.$(OBJEXT): $(top_srcdir)/internal/warnings.h bignum.$(OBJEXT): {$(VPATH)}assert.h bignum.$(OBJEXT): {$(VPATH)}bignum.c bignum.$(OBJEXT): {$(VPATH)}config.h +bignum.$(OBJEXT): {$(VPATH)}constant.h bignum.$(OBJEXT): {$(VPATH)}defines.h bignum.$(OBJEXT): {$(VPATH)}id.h +bignum.$(OBJEXT): {$(VPATH)}id_table.h bignum.$(OBJEXT): {$(VPATH)}intern.h bignum.$(OBJEXT): {$(VPATH)}internal.h bignum.$(OBJEXT): {$(VPATH)}missing.h @@ -1644,6 +1691,14 @@ builtin.$(OBJEXT): $(CCAN_DIR)/list/list.h builtin.$(OBJEXT): $(CCAN_DIR)/str/str.h builtin.$(OBJEXT): $(hdrdir)/ruby.h builtin.$(OBJEXT): $(hdrdir)/ruby/ruby.h +builtin.$(OBJEXT): $(top_srcdir)/internal/array.h +builtin.$(OBJEXT): $(top_srcdir)/internal/compilers.h +builtin.$(OBJEXT): $(top_srcdir)/internal/gc.h +builtin.$(OBJEXT): $(top_srcdir)/internal/imemo.h +builtin.$(OBJEXT): $(top_srcdir)/internal/serial.h +builtin.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +builtin.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +builtin.$(OBJEXT): $(top_srcdir)/internal/vm.h builtin.$(OBJEXT): {$(VPATH)}assert.h builtin.$(OBJEXT): {$(VPATH)}builtin.c builtin.$(OBJEXT): {$(VPATH)}builtin.h @@ -1671,11 +1726,27 @@ class.$(OBJEXT): $(CCAN_DIR)/list/list.h class.$(OBJEXT): $(CCAN_DIR)/str/str.h class.$(OBJEXT): $(hdrdir)/ruby.h class.$(OBJEXT): $(hdrdir)/ruby/ruby.h +class.$(OBJEXT): $(top_srcdir)/internal/array.h +class.$(OBJEXT): $(top_srcdir)/internal/class.h +class.$(OBJEXT): $(top_srcdir)/internal/compilers.h +class.$(OBJEXT): $(top_srcdir)/internal/error.h +class.$(OBJEXT): $(top_srcdir)/internal/eval.h +class.$(OBJEXT): $(top_srcdir)/internal/gc.h +class.$(OBJEXT): $(top_srcdir)/internal/hash.h +class.$(OBJEXT): $(top_srcdir)/internal/imemo.h +class.$(OBJEXT): $(top_srcdir)/internal/object.h +class.$(OBJEXT): $(top_srcdir)/internal/serial.h +class.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +class.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +class.$(OBJEXT): $(top_srcdir)/internal/string.h +class.$(OBJEXT): $(top_srcdir)/internal/variable.h +class.$(OBJEXT): $(top_srcdir)/internal/vm.h class.$(OBJEXT): {$(VPATH)}assert.h class.$(OBJEXT): {$(VPATH)}class.c class.$(OBJEXT): {$(VPATH)}config.h class.$(OBJEXT): {$(VPATH)}constant.h class.$(OBJEXT): {$(VPATH)}defines.h +class.$(OBJEXT): {$(VPATH)}encoding.h class.$(OBJEXT): {$(VPATH)}id.h class.$(OBJEXT): {$(VPATH)}id_table.h class.$(OBJEXT): {$(VPATH)}intern.h @@ -1683,6 +1754,8 @@ class.$(OBJEXT): {$(VPATH)}internal.h class.$(OBJEXT): {$(VPATH)}method.h class.$(OBJEXT): {$(VPATH)}missing.h class.$(OBJEXT): {$(VPATH)}node.h +class.$(OBJEXT): {$(VPATH)}onigmo.h +class.$(OBJEXT): {$(VPATH)}oniguruma.h class.$(OBJEXT): {$(VPATH)}ruby_assert.h class.$(OBJEXT): {$(VPATH)}ruby_atomic.h class.$(OBJEXT): {$(VPATH)}st.h @@ -1693,14 +1766,25 @@ class.$(OBJEXT): {$(VPATH)}vm_core.h class.$(OBJEXT): {$(VPATH)}vm_opts.h compar.$(OBJEXT): $(hdrdir)/ruby.h compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h +compar.$(OBJEXT): $(top_srcdir)/internal/compar.h +compar.$(OBJEXT): $(top_srcdir)/internal/compilers.h +compar.$(OBJEXT): $(top_srcdir)/internal/error.h +compar.$(OBJEXT): $(top_srcdir)/internal/serial.h +compar.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +compar.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +compar.$(OBJEXT): $(top_srcdir)/internal/string.h +compar.$(OBJEXT): $(top_srcdir)/internal/vm.h compar.$(OBJEXT): {$(VPATH)}assert.h compar.$(OBJEXT): {$(VPATH)}compar.c compar.$(OBJEXT): {$(VPATH)}config.h compar.$(OBJEXT): {$(VPATH)}defines.h +compar.$(OBJEXT): {$(VPATH)}encoding.h compar.$(OBJEXT): {$(VPATH)}id.h compar.$(OBJEXT): {$(VPATH)}intern.h compar.$(OBJEXT): {$(VPATH)}internal.h compar.$(OBJEXT): {$(VPATH)}missing.h +compar.$(OBJEXT): {$(VPATH)}onigmo.h +compar.$(OBJEXT): {$(VPATH)}oniguruma.h compar.$(OBJEXT): {$(VPATH)}st.h compar.$(OBJEXT): {$(VPATH)}subst.h compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h @@ -1709,10 +1793,35 @@ compile.$(OBJEXT): $(CCAN_DIR)/list/list.h compile.$(OBJEXT): $(CCAN_DIR)/str/str.h compile.$(OBJEXT): $(hdrdir)/ruby.h compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h +compile.$(OBJEXT): $(top_srcdir)/internal/array.h +compile.$(OBJEXT): $(top_srcdir)/internal/bignum.h +compile.$(OBJEXT): $(top_srcdir)/internal/bits.h +compile.$(OBJEXT): $(top_srcdir)/internal/compile.h +compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h +compile.$(OBJEXT): $(top_srcdir)/internal/complex.h +compile.$(OBJEXT): $(top_srcdir)/internal/debug.h +compile.$(OBJEXT): $(top_srcdir)/internal/encoding.h +compile.$(OBJEXT): $(top_srcdir)/internal/error.h +compile.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +compile.$(OBJEXT): $(top_srcdir)/internal/gc.h +compile.$(OBJEXT): $(top_srcdir)/internal/hash.h +compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h +compile.$(OBJEXT): $(top_srcdir)/internal/numeric.h +compile.$(OBJEXT): $(top_srcdir)/internal/object.h +compile.$(OBJEXT): $(top_srcdir)/internal/re.h +compile.$(OBJEXT): $(top_srcdir)/internal/serial.h +compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +compile.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +compile.$(OBJEXT): $(top_srcdir)/internal/string.h +compile.$(OBJEXT): $(top_srcdir)/internal/symbol.h +compile.$(OBJEXT): $(top_srcdir)/internal/thread.h +compile.$(OBJEXT): $(top_srcdir)/internal/variable.h +compile.$(OBJEXT): $(top_srcdir)/internal/vm.h compile.$(OBJEXT): {$(VPATH)}assert.h compile.$(OBJEXT): {$(VPATH)}builtin.h compile.$(OBJEXT): {$(VPATH)}compile.c compile.$(OBJEXT): {$(VPATH)}config.h +compile.$(OBJEXT): {$(VPATH)}constant.h compile.$(OBJEXT): {$(VPATH)}defines.h compile.$(OBJEXT): {$(VPATH)}encindex.h compile.$(OBJEXT): {$(VPATH)}encoding.h @@ -1747,14 +1856,35 @@ compile.$(OBJEXT): {$(VPATH)}vm_debug.h compile.$(OBJEXT): {$(VPATH)}vm_opts.h complex.$(OBJEXT): $(hdrdir)/ruby.h complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h +complex.$(OBJEXT): $(top_srcdir)/internal/bignum.h +complex.$(OBJEXT): $(top_srcdir)/internal/bits.h +complex.$(OBJEXT): $(top_srcdir)/internal/class.h +complex.$(OBJEXT): $(top_srcdir)/internal/compilers.h +complex.$(OBJEXT): $(top_srcdir)/internal/complex.h +complex.$(OBJEXT): $(top_srcdir)/internal/error.h +complex.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +complex.$(OBJEXT): $(top_srcdir)/internal/gc.h +complex.$(OBJEXT): $(top_srcdir)/internal/math.h +complex.$(OBJEXT): $(top_srcdir)/internal/numeric.h +complex.$(OBJEXT): $(top_srcdir)/internal/object.h +complex.$(OBJEXT): $(top_srcdir)/internal/rational.h +complex.$(OBJEXT): $(top_srcdir)/internal/serial.h +complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +complex.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +complex.$(OBJEXT): $(top_srcdir)/internal/string.h +complex.$(OBJEXT): $(top_srcdir)/internal/vm.h complex.$(OBJEXT): {$(VPATH)}assert.h complex.$(OBJEXT): {$(VPATH)}complex.c complex.$(OBJEXT): {$(VPATH)}config.h complex.$(OBJEXT): {$(VPATH)}defines.h +complex.$(OBJEXT): {$(VPATH)}encoding.h complex.$(OBJEXT): {$(VPATH)}id.h +complex.$(OBJEXT): {$(VPATH)}id_table.h complex.$(OBJEXT): {$(VPATH)}intern.h complex.$(OBJEXT): {$(VPATH)}internal.h complex.$(OBJEXT): {$(VPATH)}missing.h +complex.$(OBJEXT): {$(VPATH)}onigmo.h +complex.$(OBJEXT): {$(VPATH)}oniguruma.h complex.$(OBJEXT): {$(VPATH)}ruby_assert.h complex.$(OBJEXT): {$(VPATH)}st.h complex.$(OBJEXT): {$(VPATH)}subst.h @@ -1764,6 +1894,18 @@ cont.$(OBJEXT): $(CCAN_DIR)/list/list.h cont.$(OBJEXT): $(CCAN_DIR)/str/str.h cont.$(OBJEXT): $(hdrdir)/ruby.h cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h +cont.$(OBJEXT): $(top_srcdir)/internal/array.h +cont.$(OBJEXT): $(top_srcdir)/internal/compilers.h +cont.$(OBJEXT): $(top_srcdir)/internal/cont.h +cont.$(OBJEXT): $(top_srcdir)/internal/gc.h +cont.$(OBJEXT): $(top_srcdir)/internal/imemo.h +cont.$(OBJEXT): $(top_srcdir)/internal/mjit.h +cont.$(OBJEXT): $(top_srcdir)/internal/proc.h +cont.$(OBJEXT): $(top_srcdir)/internal/serial.h +cont.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +cont.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +cont.$(OBJEXT): $(top_srcdir)/internal/vm.h +cont.$(OBJEXT): $(top_srcdir)/internal/warnings.h cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H) cont.$(OBJEXT): {$(VPATH)}assert.h cont.$(OBJEXT): {$(VPATH)}config.h @@ -1793,6 +1935,17 @@ debug.$(OBJEXT): $(CCAN_DIR)/list/list.h debug.$(OBJEXT): $(CCAN_DIR)/str/str.h debug.$(OBJEXT): $(hdrdir)/ruby.h debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h +debug.$(OBJEXT): $(top_srcdir)/internal/array.h +debug.$(OBJEXT): $(top_srcdir)/internal/compilers.h +debug.$(OBJEXT): $(top_srcdir)/internal/debug.h +debug.$(OBJEXT): $(top_srcdir)/internal/gc.h +debug.$(OBJEXT): $(top_srcdir)/internal/imemo.h +debug.$(OBJEXT): $(top_srcdir)/internal/serial.h +debug.$(OBJEXT): $(top_srcdir)/internal/signal.h +debug.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +debug.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +debug.$(OBJEXT): $(top_srcdir)/internal/util.h +debug.$(OBJEXT): $(top_srcdir)/internal/vm.h debug.$(OBJEXT): {$(VPATH)}assert.h debug.$(OBJEXT): {$(VPATH)}config.h debug.$(OBJEXT): {$(VPATH)}debug.c @@ -1834,6 +1987,18 @@ debug_counter.$(OBJEXT): {$(VPATH)}st.h debug_counter.$(OBJEXT): {$(VPATH)}subst.h dir.$(OBJEXT): $(hdrdir)/ruby.h dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h +dir.$(OBJEXT): $(top_srcdir)/internal/compilers.h +dir.$(OBJEXT): $(top_srcdir)/internal/dir.h +dir.$(OBJEXT): $(top_srcdir)/internal/encoding.h +dir.$(OBJEXT): $(top_srcdir)/internal/error.h +dir.$(OBJEXT): $(top_srcdir)/internal/file.h +dir.$(OBJEXT): $(top_srcdir)/internal/gc.h +dir.$(OBJEXT): $(top_srcdir)/internal/io.h +dir.$(OBJEXT): $(top_srcdir)/internal/serial.h +dir.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +dir.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +dir.$(OBJEXT): $(top_srcdir)/internal/string.h +dir.$(OBJEXT): $(top_srcdir)/internal/vm.h dir.$(OBJEXT): {$(VPATH)}assert.h dir.$(OBJEXT): {$(VPATH)}config.h dir.$(OBJEXT): {$(VPATH)}defines.h @@ -1843,6 +2008,7 @@ dir.$(OBJEXT): {$(VPATH)}encoding.h dir.$(OBJEXT): {$(VPATH)}id.h dir.$(OBJEXT): {$(VPATH)}intern.h dir.$(OBJEXT): {$(VPATH)}internal.h +dir.$(OBJEXT): {$(VPATH)}io.h dir.$(OBJEXT): {$(VPATH)}missing.h dir.$(OBJEXT): {$(VPATH)}onigmo.h dir.$(OBJEXT): {$(VPATH)}oniguruma.h @@ -1852,6 +2018,9 @@ dir.$(OBJEXT): {$(VPATH)}thread.h dir.$(OBJEXT): {$(VPATH)}util.h dln.$(OBJEXT): $(hdrdir)/ruby.h dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h +dln.$(OBJEXT): $(top_srcdir)/internal/compilers.h +dln.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +dln.$(OBJEXT): $(top_srcdir)/internal/warnings.h dln.$(OBJEXT): {$(VPATH)}assert.h dln.$(OBJEXT): {$(VPATH)}config.h dln.$(OBJEXT): {$(VPATH)}defines.h @@ -1925,6 +2094,17 @@ enc/utf_8.$(OBJEXT): {$(VPATH)}missing.h enc/utf_8.$(OBJEXT): {$(VPATH)}regenc.h encoding.$(OBJEXT): $(hdrdir)/ruby.h encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h +encoding.$(OBJEXT): $(top_srcdir)/internal/compilers.h +encoding.$(OBJEXT): $(top_srcdir)/internal/enc.h +encoding.$(OBJEXT): $(top_srcdir)/internal/encoding.h +encoding.$(OBJEXT): $(top_srcdir)/internal/inits.h +encoding.$(OBJEXT): $(top_srcdir)/internal/load.h +encoding.$(OBJEXT): $(top_srcdir)/internal/object.h +encoding.$(OBJEXT): $(top_srcdir)/internal/serial.h +encoding.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +encoding.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +encoding.$(OBJEXT): $(top_srcdir)/internal/string.h +encoding.$(OBJEXT): $(top_srcdir)/internal/vm.h encoding.$(OBJEXT): {$(VPATH)}assert.h encoding.$(OBJEXT): {$(VPATH)}config.h encoding.$(OBJEXT): {$(VPATH)}defines.h @@ -1943,6 +2123,24 @@ encoding.$(OBJEXT): {$(VPATH)}subst.h encoding.$(OBJEXT): {$(VPATH)}util.h enum.$(OBJEXT): $(hdrdir)/ruby.h enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h +enum.$(OBJEXT): $(top_srcdir)/internal/array.h +enum.$(OBJEXT): $(top_srcdir)/internal/bignum.h +enum.$(OBJEXT): $(top_srcdir)/internal/bits.h +enum.$(OBJEXT): $(top_srcdir)/internal/compar.h +enum.$(OBJEXT): $(top_srcdir)/internal/compilers.h +enum.$(OBJEXT): $(top_srcdir)/internal/enum.h +enum.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +enum.$(OBJEXT): $(top_srcdir)/internal/gc.h +enum.$(OBJEXT): $(top_srcdir)/internal/hash.h +enum.$(OBJEXT): $(top_srcdir)/internal/imemo.h +enum.$(OBJEXT): $(top_srcdir)/internal/numeric.h +enum.$(OBJEXT): $(top_srcdir)/internal/object.h +enum.$(OBJEXT): $(top_srcdir)/internal/proc.h +enum.$(OBJEXT): $(top_srcdir)/internal/rational.h +enum.$(OBJEXT): $(top_srcdir)/internal/serial.h +enum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +enum.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +enum.$(OBJEXT): $(top_srcdir)/internal/vm.h enum.$(OBJEXT): {$(VPATH)}assert.h enum.$(OBJEXT): {$(VPATH)}config.h enum.$(OBJEXT): {$(VPATH)}defines.h @@ -1954,20 +2152,42 @@ enum.$(OBJEXT): {$(VPATH)}internal.h enum.$(OBJEXT): {$(VPATH)}missing.h enum.$(OBJEXT): {$(VPATH)}onigmo.h enum.$(OBJEXT): {$(VPATH)}oniguruma.h +enum.$(OBJEXT): {$(VPATH)}ruby_assert.h enum.$(OBJEXT): {$(VPATH)}st.h enum.$(OBJEXT): {$(VPATH)}subst.h enum.$(OBJEXT): {$(VPATH)}symbol.h enum.$(OBJEXT): {$(VPATH)}util.h enumerator.$(OBJEXT): $(hdrdir)/ruby.h enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/array.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/bignum.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/bits.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/compilers.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/enumerator.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/error.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/gc.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/hash.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/imemo.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/numeric.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/range.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/serial.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/string.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/vm.h enumerator.$(OBJEXT): {$(VPATH)}assert.h enumerator.$(OBJEXT): {$(VPATH)}config.h enumerator.$(OBJEXT): {$(VPATH)}defines.h +enumerator.$(OBJEXT): {$(VPATH)}encoding.h enumerator.$(OBJEXT): {$(VPATH)}enumerator.c enumerator.$(OBJEXT): {$(VPATH)}id.h enumerator.$(OBJEXT): {$(VPATH)}intern.h enumerator.$(OBJEXT): {$(VPATH)}internal.h enumerator.$(OBJEXT): {$(VPATH)}missing.h +enumerator.$(OBJEXT): {$(VPATH)}onigmo.h +enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h enumerator.$(OBJEXT): {$(VPATH)}st.h enumerator.$(OBJEXT): {$(VPATH)}subst.h error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h @@ -1976,16 +2196,37 @@ error.$(OBJEXT): $(CCAN_DIR)/list/list.h error.$(OBJEXT): $(CCAN_DIR)/str/str.h error.$(OBJEXT): $(hdrdir)/ruby.h error.$(OBJEXT): $(hdrdir)/ruby/ruby.h +error.$(OBJEXT): $(top_srcdir)/internal/array.h +error.$(OBJEXT): $(top_srcdir)/internal/compilers.h +error.$(OBJEXT): $(top_srcdir)/internal/error.h +error.$(OBJEXT): $(top_srcdir)/internal/eval.h +error.$(OBJEXT): $(top_srcdir)/internal/gc.h +error.$(OBJEXT): $(top_srcdir)/internal/imemo.h +error.$(OBJEXT): $(top_srcdir)/internal/io.h +error.$(OBJEXT): $(top_srcdir)/internal/load.h +error.$(OBJEXT): $(top_srcdir)/internal/object.h +error.$(OBJEXT): $(top_srcdir)/internal/serial.h +error.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +error.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +error.$(OBJEXT): $(top_srcdir)/internal/string.h +error.$(OBJEXT): $(top_srcdir)/internal/symbol.h +error.$(OBJEXT): $(top_srcdir)/internal/thread.h +error.$(OBJEXT): $(top_srcdir)/internal/variable.h +error.$(OBJEXT): $(top_srcdir)/internal/vm.h +error.$(OBJEXT): $(top_srcdir)/internal/warnings.h error.$(OBJEXT): {$(VPATH)}assert.h error.$(OBJEXT): {$(VPATH)}builtin.h error.$(OBJEXT): {$(VPATH)}config.h +error.$(OBJEXT): {$(VPATH)}constant.h error.$(OBJEXT): {$(VPATH)}defines.h error.$(OBJEXT): {$(VPATH)}encoding.h error.$(OBJEXT): {$(VPATH)}error.c error.$(OBJEXT): {$(VPATH)}eval_intern.h error.$(OBJEXT): {$(VPATH)}id.h +error.$(OBJEXT): {$(VPATH)}id_table.h error.$(OBJEXT): {$(VPATH)}intern.h error.$(OBJEXT): {$(VPATH)}internal.h +error.$(OBJEXT): {$(VPATH)}io.h error.$(OBJEXT): {$(VPATH)}known_errors.inc error.$(OBJEXT): {$(VPATH)}method.h error.$(OBJEXT): {$(VPATH)}missing.h @@ -2007,23 +2248,47 @@ eval.$(OBJEXT): $(CCAN_DIR)/list/list.h eval.$(OBJEXT): $(CCAN_DIR)/str/str.h eval.$(OBJEXT): $(hdrdir)/ruby.h eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h +eval.$(OBJEXT): $(top_srcdir)/internal/array.h +eval.$(OBJEXT): $(top_srcdir)/internal/class.h +eval.$(OBJEXT): $(top_srcdir)/internal/compilers.h +eval.$(OBJEXT): $(top_srcdir)/internal/error.h +eval.$(OBJEXT): $(top_srcdir)/internal/eval.h +eval.$(OBJEXT): $(top_srcdir)/internal/gc.h +eval.$(OBJEXT): $(top_srcdir)/internal/hash.h +eval.$(OBJEXT): $(top_srcdir)/internal/imemo.h +eval.$(OBJEXT): $(top_srcdir)/internal/inits.h +eval.$(OBJEXT): $(top_srcdir)/internal/io.h +eval.$(OBJEXT): $(top_srcdir)/internal/mjit.h +eval.$(OBJEXT): $(top_srcdir)/internal/object.h +eval.$(OBJEXT): $(top_srcdir)/internal/serial.h +eval.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +eval.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +eval.$(OBJEXT): $(top_srcdir)/internal/string.h +eval.$(OBJEXT): $(top_srcdir)/internal/variable.h +eval.$(OBJEXT): $(top_srcdir)/internal/vm.h eval.$(OBJEXT): {$(VPATH)}assert.h eval.$(OBJEXT): {$(VPATH)}config.h +eval.$(OBJEXT): {$(VPATH)}constant.h eval.$(OBJEXT): {$(VPATH)}debug_counter.h eval.$(OBJEXT): {$(VPATH)}defines.h +eval.$(OBJEXT): {$(VPATH)}encoding.h eval.$(OBJEXT): {$(VPATH)}eval.c eval.$(OBJEXT): {$(VPATH)}eval_error.c eval.$(OBJEXT): {$(VPATH)}eval_intern.h eval.$(OBJEXT): {$(VPATH)}eval_jump.c eval.$(OBJEXT): {$(VPATH)}gc.h eval.$(OBJEXT): {$(VPATH)}id.h +eval.$(OBJEXT): {$(VPATH)}id_table.h eval.$(OBJEXT): {$(VPATH)}intern.h eval.$(OBJEXT): {$(VPATH)}internal.h +eval.$(OBJEXT): {$(VPATH)}io.h eval.$(OBJEXT): {$(VPATH)}iseq.h eval.$(OBJEXT): {$(VPATH)}method.h eval.$(OBJEXT): {$(VPATH)}missing.h eval.$(OBJEXT): {$(VPATH)}mjit.h eval.$(OBJEXT): {$(VPATH)}node.h +eval.$(OBJEXT): {$(VPATH)}onigmo.h +eval.$(OBJEXT): {$(VPATH)}oniguruma.h eval.$(OBJEXT): {$(VPATH)}probes.dmyh eval.$(OBJEXT): {$(VPATH)}probes.h eval.$(OBJEXT): {$(VPATH)}probes_helper.h @@ -2041,6 +2306,23 @@ explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c explicit_bzero.$(OBJEXT): {$(VPATH)}missing.h file.$(OBJEXT): $(hdrdir)/ruby.h file.$(OBJEXT): $(hdrdir)/ruby/ruby.h +file.$(OBJEXT): $(top_srcdir)/internal/array.h +file.$(OBJEXT): $(top_srcdir)/internal/compilers.h +file.$(OBJEXT): $(top_srcdir)/internal/dir.h +file.$(OBJEXT): $(top_srcdir)/internal/error.h +file.$(OBJEXT): $(top_srcdir)/internal/file.h +file.$(OBJEXT): $(top_srcdir)/internal/gc.h +file.$(OBJEXT): $(top_srcdir)/internal/imemo.h +file.$(OBJEXT): $(top_srcdir)/internal/io.h +file.$(OBJEXT): $(top_srcdir)/internal/load.h +file.$(OBJEXT): $(top_srcdir)/internal/object.h +file.$(OBJEXT): $(top_srcdir)/internal/process.h +file.$(OBJEXT): $(top_srcdir)/internal/serial.h +file.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +file.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +file.$(OBJEXT): $(top_srcdir)/internal/string.h +file.$(OBJEXT): $(top_srcdir)/internal/thread.h +file.$(OBJEXT): $(top_srcdir)/internal/vm.h file.$(OBJEXT): {$(VPATH)}assert.h file.$(OBJEXT): {$(VPATH)}config.h file.$(OBJEXT): {$(VPATH)}defines.h @@ -2065,6 +2347,35 @@ gc.$(OBJEXT): $(CCAN_DIR)/list/list.h gc.$(OBJEXT): $(CCAN_DIR)/str/str.h gc.$(OBJEXT): $(hdrdir)/ruby.h gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h +gc.$(OBJEXT): $(top_srcdir)/internal/array.h +gc.$(OBJEXT): $(top_srcdir)/internal/bignum.h +gc.$(OBJEXT): $(top_srcdir)/internal/bits.h +gc.$(OBJEXT): $(top_srcdir)/internal/class.h +gc.$(OBJEXT): $(top_srcdir)/internal/compilers.h +gc.$(OBJEXT): $(top_srcdir)/internal/complex.h +gc.$(OBJEXT): $(top_srcdir)/internal/cont.h +gc.$(OBJEXT): $(top_srcdir)/internal/error.h +gc.$(OBJEXT): $(top_srcdir)/internal/eval.h +gc.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +gc.$(OBJEXT): $(top_srcdir)/internal/gc.h +gc.$(OBJEXT): $(top_srcdir)/internal/hash.h +gc.$(OBJEXT): $(top_srcdir)/internal/imemo.h +gc.$(OBJEXT): $(top_srcdir)/internal/io.h +gc.$(OBJEXT): $(top_srcdir)/internal/numeric.h +gc.$(OBJEXT): $(top_srcdir)/internal/object.h +gc.$(OBJEXT): $(top_srcdir)/internal/proc.h +gc.$(OBJEXT): $(top_srcdir)/internal/rational.h +gc.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +gc.$(OBJEXT): $(top_srcdir)/internal/serial.h +gc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +gc.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +gc.$(OBJEXT): $(top_srcdir)/internal/string.h +gc.$(OBJEXT): $(top_srcdir)/internal/struct.h +gc.$(OBJEXT): $(top_srcdir)/internal/symbol.h +gc.$(OBJEXT): $(top_srcdir)/internal/thread.h +gc.$(OBJEXT): $(top_srcdir)/internal/variable.h +gc.$(OBJEXT): $(top_srcdir)/internal/vm.h +gc.$(OBJEXT): $(top_srcdir)/internal/warnings.h gc.$(OBJEXT): {$(VPATH)}assert.h gc.$(OBJEXT): {$(VPATH)}builtin.h gc.$(OBJEXT): {$(VPATH)}config.h @@ -2112,6 +2423,15 @@ golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h golf_prelude.$(OBJEXT): $(hdrdir)/ruby.h golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/array.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/compilers.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/gc.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/imemo.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/serial.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/vm.h +golf_prelude.$(OBJEXT): $(top_srcdir)/internal/warnings.h golf_prelude.$(OBJEXT): {$(VPATH)}assert.h golf_prelude.$(OBJEXT): {$(VPATH)}config.h golf_prelude.$(OBJEXT): {$(VPATH)}defines.h @@ -2148,6 +2468,22 @@ goruby.$(OBJEXT): {$(VPATH)}subst.h goruby.$(OBJEXT): {$(VPATH)}vm_debug.h hash.$(OBJEXT): $(hdrdir)/ruby.h hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h +hash.$(OBJEXT): $(top_srcdir)/internal/array.h +hash.$(OBJEXT): $(top_srcdir)/internal/bignum.h +hash.$(OBJEXT): $(top_srcdir)/internal/class.h +hash.$(OBJEXT): $(top_srcdir)/internal/compilers.h +hash.$(OBJEXT): $(top_srcdir)/internal/cont.h +hash.$(OBJEXT): $(top_srcdir)/internal/error.h +hash.$(OBJEXT): $(top_srcdir)/internal/gc.h +hash.$(OBJEXT): $(top_srcdir)/internal/hash.h +hash.$(OBJEXT): $(top_srcdir)/internal/object.h +hash.$(OBJEXT): $(top_srcdir)/internal/proc.h +hash.$(OBJEXT): $(top_srcdir)/internal/serial.h +hash.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +hash.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +hash.$(OBJEXT): $(top_srcdir)/internal/string.h +hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h +hash.$(OBJEXT): $(top_srcdir)/internal/vm.h hash.$(OBJEXT): {$(VPATH)}assert.h hash.$(OBJEXT): {$(VPATH)}config.h hash.$(OBJEXT): {$(VPATH)}debug_counter.h @@ -2155,6 +2491,7 @@ hash.$(OBJEXT): {$(VPATH)}defines.h hash.$(OBJEXT): {$(VPATH)}encoding.h hash.$(OBJEXT): {$(VPATH)}hash.c hash.$(OBJEXT): {$(VPATH)}id.h +hash.$(OBJEXT): {$(VPATH)}id_table.h hash.$(OBJEXT): {$(VPATH)}intern.h hash.$(OBJEXT): {$(VPATH)}internal.h hash.$(OBJEXT): {$(VPATH)}missing.h @@ -2170,6 +2507,9 @@ hash.$(OBJEXT): {$(VPATH)}transient_heap.h hash.$(OBJEXT): {$(VPATH)}util.h inits.$(OBJEXT): $(hdrdir)/ruby.h inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h +inits.$(OBJEXT): $(top_srcdir)/internal/compilers.h +inits.$(OBJEXT): $(top_srcdir)/internal/inits.h +inits.$(OBJEXT): $(top_srcdir)/internal/warnings.h inits.$(OBJEXT): {$(VPATH)}assert.h inits.$(OBJEXT): {$(VPATH)}builtin.h inits.$(OBJEXT): {$(VPATH)}config.h @@ -2187,6 +2527,28 @@ io.$(OBJEXT): $(CCAN_DIR)/list/list.h io.$(OBJEXT): $(CCAN_DIR)/str/str.h io.$(OBJEXT): $(hdrdir)/ruby.h io.$(OBJEXT): $(hdrdir)/ruby/ruby.h +io.$(OBJEXT): $(top_srcdir)/internal/array.h +io.$(OBJEXT): $(top_srcdir)/internal/bignum.h +io.$(OBJEXT): $(top_srcdir)/internal/bits.h +io.$(OBJEXT): $(top_srcdir)/internal/compilers.h +io.$(OBJEXT): $(top_srcdir)/internal/encoding.h +io.$(OBJEXT): $(top_srcdir)/internal/error.h +io.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +io.$(OBJEXT): $(top_srcdir)/internal/gc.h +io.$(OBJEXT): $(top_srcdir)/internal/imemo.h +io.$(OBJEXT): $(top_srcdir)/internal/inits.h +io.$(OBJEXT): $(top_srcdir)/internal/io.h +io.$(OBJEXT): $(top_srcdir)/internal/numeric.h +io.$(OBJEXT): $(top_srcdir)/internal/object.h +io.$(OBJEXT): $(top_srcdir)/internal/process.h +io.$(OBJEXT): $(top_srcdir)/internal/serial.h +io.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +io.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +io.$(OBJEXT): $(top_srcdir)/internal/string.h +io.$(OBJEXT): $(top_srcdir)/internal/thread.h +io.$(OBJEXT): $(top_srcdir)/internal/transcode.h +io.$(OBJEXT): $(top_srcdir)/internal/vm.h +io.$(OBJEXT): $(top_srcdir)/internal/warnings.h io.$(OBJEXT): {$(VPATH)}assert.h io.$(OBJEXT): {$(VPATH)}builtin.h io.$(OBJEXT): {$(VPATH)}config.h @@ -2221,11 +2583,32 @@ iseq.$(OBJEXT): $(CCAN_DIR)/list/list.h iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h iseq.$(OBJEXT): $(hdrdir)/ruby.h iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h +iseq.$(OBJEXT): $(top_srcdir)/internal/array.h +iseq.$(OBJEXT): $(top_srcdir)/internal/bits.h +iseq.$(OBJEXT): $(top_srcdir)/internal/compile.h +iseq.$(OBJEXT): $(top_srcdir)/internal/compilers.h +iseq.$(OBJEXT): $(top_srcdir)/internal/error.h +iseq.$(OBJEXT): $(top_srcdir)/internal/file.h +iseq.$(OBJEXT): $(top_srcdir)/internal/gc.h +iseq.$(OBJEXT): $(top_srcdir)/internal/hash.h +iseq.$(OBJEXT): $(top_srcdir)/internal/imemo.h +iseq.$(OBJEXT): $(top_srcdir)/internal/parse.h +iseq.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +iseq.$(OBJEXT): $(top_srcdir)/internal/serial.h +iseq.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +iseq.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +iseq.$(OBJEXT): $(top_srcdir)/internal/string.h +iseq.$(OBJEXT): $(top_srcdir)/internal/symbol.h +iseq.$(OBJEXT): $(top_srcdir)/internal/thread.h +iseq.$(OBJEXT): $(top_srcdir)/internal/variable.h +iseq.$(OBJEXT): $(top_srcdir)/internal/vm.h iseq.$(OBJEXT): {$(VPATH)}assert.h iseq.$(OBJEXT): {$(VPATH)}builtin.h iseq.$(OBJEXT): {$(VPATH)}config.h +iseq.$(OBJEXT): {$(VPATH)}constant.h iseq.$(OBJEXT): {$(VPATH)}debug_counter.h iseq.$(OBJEXT): {$(VPATH)}defines.h +iseq.$(OBJEXT): {$(VPATH)}encoding.h iseq.$(OBJEXT): {$(VPATH)}eval_intern.h iseq.$(OBJEXT): {$(VPATH)}gc.h iseq.$(OBJEXT): {$(VPATH)}id.h @@ -2242,6 +2625,8 @@ iseq.$(OBJEXT): {$(VPATH)}missing.h iseq.$(OBJEXT): {$(VPATH)}mjit.h iseq.$(OBJEXT): {$(VPATH)}node.h iseq.$(OBJEXT): {$(VPATH)}node_name.inc +iseq.$(OBJEXT): {$(VPATH)}onigmo.h +iseq.$(OBJEXT): {$(VPATH)}oniguruma.h iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h iseq.$(OBJEXT): {$(VPATH)}st.h @@ -2257,13 +2642,31 @@ load.$(OBJEXT): $(CCAN_DIR)/list/list.h load.$(OBJEXT): $(CCAN_DIR)/str/str.h load.$(OBJEXT): $(hdrdir)/ruby.h load.$(OBJEXT): $(hdrdir)/ruby/ruby.h +load.$(OBJEXT): $(top_srcdir)/internal/array.h +load.$(OBJEXT): $(top_srcdir)/internal/compilers.h +load.$(OBJEXT): $(top_srcdir)/internal/dir.h +load.$(OBJEXT): $(top_srcdir)/internal/error.h +load.$(OBJEXT): $(top_srcdir)/internal/file.h +load.$(OBJEXT): $(top_srcdir)/internal/gc.h +load.$(OBJEXT): $(top_srcdir)/internal/imemo.h +load.$(OBJEXT): $(top_srcdir)/internal/load.h +load.$(OBJEXT): $(top_srcdir)/internal/parse.h +load.$(OBJEXT): $(top_srcdir)/internal/serial.h +load.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +load.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +load.$(OBJEXT): $(top_srcdir)/internal/string.h +load.$(OBJEXT): $(top_srcdir)/internal/thread.h +load.$(OBJEXT): $(top_srcdir)/internal/variable.h +load.$(OBJEXT): $(top_srcdir)/internal/vm.h load.$(OBJEXT): {$(VPATH)}assert.h load.$(OBJEXT): {$(VPATH)}config.h +load.$(OBJEXT): {$(VPATH)}constant.h load.$(OBJEXT): {$(VPATH)}defines.h load.$(OBJEXT): {$(VPATH)}dln.h load.$(OBJEXT): {$(VPATH)}encoding.h load.$(OBJEXT): {$(VPATH)}eval_intern.h load.$(OBJEXT): {$(VPATH)}id.h +load.$(OBJEXT): {$(VPATH)}id_table.h load.$(OBJEXT): {$(VPATH)}intern.h load.$(OBJEXT): {$(VPATH)}internal.h load.$(OBJEXT): {$(VPATH)}iseq.h @@ -2326,6 +2729,21 @@ main.$(OBJEXT): {$(VPATH)}subst.h main.$(OBJEXT): {$(VPATH)}vm_debug.h marshal.$(OBJEXT): $(hdrdir)/ruby.h marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h +marshal.$(OBJEXT): $(top_srcdir)/internal/bignum.h +marshal.$(OBJEXT): $(top_srcdir)/internal/class.h +marshal.$(OBJEXT): $(top_srcdir)/internal/compilers.h +marshal.$(OBJEXT): $(top_srcdir)/internal/encoding.h +marshal.$(OBJEXT): $(top_srcdir)/internal/error.h +marshal.$(OBJEXT): $(top_srcdir)/internal/gc.h +marshal.$(OBJEXT): $(top_srcdir)/internal/hash.h +marshal.$(OBJEXT): $(top_srcdir)/internal/object.h +marshal.$(OBJEXT): $(top_srcdir)/internal/serial.h +marshal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +marshal.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +marshal.$(OBJEXT): $(top_srcdir)/internal/string.h +marshal.$(OBJEXT): $(top_srcdir)/internal/struct.h +marshal.$(OBJEXT): $(top_srcdir)/internal/util.h +marshal.$(OBJEXT): $(top_srcdir)/internal/vm.h marshal.$(OBJEXT): {$(VPATH)}assert.h marshal.$(OBJEXT): {$(VPATH)}config.h marshal.$(OBJEXT): {$(VPATH)}defines.h @@ -2344,6 +2762,15 @@ marshal.$(OBJEXT): {$(VPATH)}subst.h marshal.$(OBJEXT): {$(VPATH)}util.h math.$(OBJEXT): $(hdrdir)/ruby.h math.$(OBJEXT): $(hdrdir)/ruby/ruby.h +math.$(OBJEXT): $(top_srcdir)/internal/bignum.h +math.$(OBJEXT): $(top_srcdir)/internal/compilers.h +math.$(OBJEXT): $(top_srcdir)/internal/complex.h +math.$(OBJEXT): $(top_srcdir)/internal/math.h +math.$(OBJEXT): $(top_srcdir)/internal/object.h +math.$(OBJEXT): $(top_srcdir)/internal/serial.h +math.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +math.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +math.$(OBJEXT): $(top_srcdir)/internal/vm.h math.$(OBJEXT): {$(VPATH)}assert.h math.$(OBJEXT): {$(VPATH)}config.h math.$(OBJEXT): {$(VPATH)}defines.h @@ -2359,6 +2786,15 @@ miniinit.$(OBJEXT): $(CCAN_DIR)/list/list.h miniinit.$(OBJEXT): $(CCAN_DIR)/str/str.h miniinit.$(OBJEXT): $(hdrdir)/ruby.h miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/array.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/compilers.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/gc.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/imemo.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/serial.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/vm.h +miniinit.$(OBJEXT): $(top_srcdir)/internal/warnings.h miniinit.$(OBJEXT): {$(VPATH)}assert.h miniinit.$(OBJEXT): {$(VPATH)}ast.rb miniinit.$(OBJEXT): {$(VPATH)}builtin.h @@ -2398,6 +2834,19 @@ mjit.$(OBJEXT): $(CCAN_DIR)/list/list.h mjit.$(OBJEXT): $(CCAN_DIR)/str/str.h mjit.$(OBJEXT): $(hdrdir)/ruby.h mjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h +mjit.$(OBJEXT): $(top_srcdir)/internal/array.h +mjit.$(OBJEXT): $(top_srcdir)/internal/class.h +mjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h +mjit.$(OBJEXT): $(top_srcdir)/internal/file.h +mjit.$(OBJEXT): $(top_srcdir)/internal/gc.h +mjit.$(OBJEXT): $(top_srcdir)/internal/hash.h +mjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h +mjit.$(OBJEXT): $(top_srcdir)/internal/mjit.h +mjit.$(OBJEXT): $(top_srcdir)/internal/serial.h +mjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +mjit.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +mjit.$(OBJEXT): $(top_srcdir)/internal/vm.h +mjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h mjit.$(OBJEXT): {$(VPATH)}assert.h mjit.$(OBJEXT): {$(VPATH)}config.h mjit.$(OBJEXT): {$(VPATH)}constant.h @@ -2405,6 +2854,7 @@ mjit.$(OBJEXT): {$(VPATH)}debug.h mjit.$(OBJEXT): {$(VPATH)}debug_counter.h mjit.$(OBJEXT): {$(VPATH)}defines.h mjit.$(OBJEXT): {$(VPATH)}dln.h +mjit.$(OBJEXT): {$(VPATH)}encoding.h mjit.$(OBJEXT): {$(VPATH)}gc.h mjit.$(OBJEXT): {$(VPATH)}id.h mjit.$(OBJEXT): {$(VPATH)}id_table.h @@ -2417,6 +2867,8 @@ mjit.$(OBJEXT): {$(VPATH)}mjit.h mjit.$(OBJEXT): {$(VPATH)}mjit_config.h mjit.$(OBJEXT): {$(VPATH)}mjit_worker.c mjit.$(OBJEXT): {$(VPATH)}node.h +mjit.$(OBJEXT): {$(VPATH)}onigmo.h +mjit.$(OBJEXT): {$(VPATH)}oniguruma.h mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h mjit.$(OBJEXT): {$(VPATH)}st.h @@ -2433,12 +2885,25 @@ mjit_compile.$(OBJEXT): $(CCAN_DIR)/list/list.h mjit_compile.$(OBJEXT): $(CCAN_DIR)/str/str.h mjit_compile.$(OBJEXT): $(hdrdir)/ruby.h mjit_compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/array.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compile.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/gc.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/hash.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/serial.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/variable.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/vm.h mjit_compile.$(OBJEXT): {$(VPATH)}assert.h mjit_compile.$(OBJEXT): {$(VPATH)}builtin.h mjit_compile.$(OBJEXT): {$(VPATH)}config.h +mjit_compile.$(OBJEXT): {$(VPATH)}constant.h mjit_compile.$(OBJEXT): {$(VPATH)}debug_counter.h mjit_compile.$(OBJEXT): {$(VPATH)}defines.h mjit_compile.$(OBJEXT): {$(VPATH)}id.h +mjit_compile.$(OBJEXT): {$(VPATH)}id_table.h mjit_compile.$(OBJEXT): {$(VPATH)}insns.def mjit_compile.$(OBJEXT): {$(VPATH)}insns.inc mjit_compile.$(OBJEXT): {$(VPATH)}insns_info.inc @@ -2467,10 +2932,22 @@ node.$(OBJEXT): $(CCAN_DIR)/list/list.h node.$(OBJEXT): $(CCAN_DIR)/str/str.h node.$(OBJEXT): $(hdrdir)/ruby.h node.$(OBJEXT): $(hdrdir)/ruby/ruby.h +node.$(OBJEXT): $(top_srcdir)/internal/array.h +node.$(OBJEXT): $(top_srcdir)/internal/compilers.h +node.$(OBJEXT): $(top_srcdir)/internal/gc.h +node.$(OBJEXT): $(top_srcdir)/internal/hash.h +node.$(OBJEXT): $(top_srcdir)/internal/imemo.h +node.$(OBJEXT): $(top_srcdir)/internal/serial.h +node.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +node.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +node.$(OBJEXT): $(top_srcdir)/internal/variable.h +node.$(OBJEXT): $(top_srcdir)/internal/vm.h node.$(OBJEXT): {$(VPATH)}assert.h node.$(OBJEXT): {$(VPATH)}config.h +node.$(OBJEXT): {$(VPATH)}constant.h node.$(OBJEXT): {$(VPATH)}defines.h node.$(OBJEXT): {$(VPATH)}id.h +node.$(OBJEXT): {$(VPATH)}id_table.h node.$(OBJEXT): {$(VPATH)}intern.h node.$(OBJEXT): {$(VPATH)}internal.h node.$(OBJEXT): {$(VPATH)}method.h @@ -2487,11 +2964,31 @@ node.$(OBJEXT): {$(VPATH)}vm_core.h node.$(OBJEXT): {$(VPATH)}vm_opts.h numeric.$(OBJEXT): $(hdrdir)/ruby.h numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h +numeric.$(OBJEXT): $(top_srcdir)/internal/array.h +numeric.$(OBJEXT): $(top_srcdir)/internal/bignum.h +numeric.$(OBJEXT): $(top_srcdir)/internal/bits.h +numeric.$(OBJEXT): $(top_srcdir)/internal/compilers.h +numeric.$(OBJEXT): $(top_srcdir)/internal/complex.h +numeric.$(OBJEXT): $(top_srcdir)/internal/enumerator.h +numeric.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +numeric.$(OBJEXT): $(top_srcdir)/internal/gc.h +numeric.$(OBJEXT): $(top_srcdir)/internal/hash.h +numeric.$(OBJEXT): $(top_srcdir)/internal/numeric.h +numeric.$(OBJEXT): $(top_srcdir)/internal/object.h +numeric.$(OBJEXT): $(top_srcdir)/internal/rational.h +numeric.$(OBJEXT): $(top_srcdir)/internal/serial.h +numeric.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +numeric.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +numeric.$(OBJEXT): $(top_srcdir)/internal/util.h +numeric.$(OBJEXT): $(top_srcdir)/internal/variable.h +numeric.$(OBJEXT): $(top_srcdir)/internal/vm.h numeric.$(OBJEXT): {$(VPATH)}assert.h numeric.$(OBJEXT): {$(VPATH)}config.h +numeric.$(OBJEXT): {$(VPATH)}constant.h numeric.$(OBJEXT): {$(VPATH)}defines.h numeric.$(OBJEXT): {$(VPATH)}encoding.h numeric.$(OBJEXT): {$(VPATH)}id.h +numeric.$(OBJEXT): {$(VPATH)}id_table.h numeric.$(OBJEXT): {$(VPATH)}intern.h numeric.$(OBJEXT): {$(VPATH)}internal.h numeric.$(OBJEXT): {$(VPATH)}missing.h @@ -2503,12 +3000,33 @@ numeric.$(OBJEXT): {$(VPATH)}subst.h numeric.$(OBJEXT): {$(VPATH)}util.h object.$(OBJEXT): $(hdrdir)/ruby.h object.$(OBJEXT): $(hdrdir)/ruby/ruby.h +object.$(OBJEXT): $(top_srcdir)/internal/array.h +object.$(OBJEXT): $(top_srcdir)/internal/bignum.h +object.$(OBJEXT): $(top_srcdir)/internal/bits.h +object.$(OBJEXT): $(top_srcdir)/internal/class.h +object.$(OBJEXT): $(top_srcdir)/internal/compilers.h +object.$(OBJEXT): $(top_srcdir)/internal/error.h +object.$(OBJEXT): $(top_srcdir)/internal/eval.h +object.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +object.$(OBJEXT): $(top_srcdir)/internal/gc.h +object.$(OBJEXT): $(top_srcdir)/internal/inits.h +object.$(OBJEXT): $(top_srcdir)/internal/numeric.h +object.$(OBJEXT): $(top_srcdir)/internal/object.h +object.$(OBJEXT): $(top_srcdir)/internal/serial.h +object.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +object.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +object.$(OBJEXT): $(top_srcdir)/internal/string.h +object.$(OBJEXT): $(top_srcdir)/internal/struct.h +object.$(OBJEXT): $(top_srcdir)/internal/symbol.h +object.$(OBJEXT): $(top_srcdir)/internal/variable.h +object.$(OBJEXT): $(top_srcdir)/internal/vm.h object.$(OBJEXT): {$(VPATH)}assert.h object.$(OBJEXT): {$(VPATH)}config.h object.$(OBJEXT): {$(VPATH)}constant.h object.$(OBJEXT): {$(VPATH)}defines.h object.$(OBJEXT): {$(VPATH)}encoding.h object.$(OBJEXT): {$(VPATH)}id.h +object.$(OBJEXT): {$(VPATH)}id_table.h object.$(OBJEXT): {$(VPATH)}intern.h object.$(OBJEXT): {$(VPATH)}internal.h object.$(OBJEXT): {$(VPATH)}missing.h @@ -2522,11 +3040,22 @@ object.$(OBJEXT): {$(VPATH)}subst.h object.$(OBJEXT): {$(VPATH)}util.h pack.$(OBJEXT): $(hdrdir)/ruby.h pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h +pack.$(OBJEXT): $(top_srcdir)/internal/bits.h +pack.$(OBJEXT): $(top_srcdir)/internal/compilers.h +pack.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +pack.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +pack.$(OBJEXT): $(top_srcdir)/internal/string.h +pack.$(OBJEXT): $(top_srcdir)/internal/symbol.h +pack.$(OBJEXT): $(top_srcdir)/internal/util.h +pack.$(OBJEXT): $(top_srcdir)/internal/variable.h +pack.$(OBJEXT): $(top_srcdir)/internal/warnings.h pack.$(OBJEXT): {$(VPATH)}assert.h pack.$(OBJEXT): {$(VPATH)}builtin.h pack.$(OBJEXT): {$(VPATH)}config.h +pack.$(OBJEXT): {$(VPATH)}constant.h pack.$(OBJEXT): {$(VPATH)}defines.h pack.$(OBJEXT): {$(VPATH)}encoding.h +pack.$(OBJEXT): {$(VPATH)}id_table.h pack.$(OBJEXT): {$(VPATH)}intern.h pack.$(OBJEXT): {$(VPATH)}internal.h pack.$(OBJEXT): {$(VPATH)}missing.h @@ -2538,14 +3067,42 @@ pack.$(OBJEXT): {$(VPATH)}st.h pack.$(OBJEXT): {$(VPATH)}subst.h parse.$(OBJEXT): $(hdrdir)/ruby.h parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h +parse.$(OBJEXT): $(top_srcdir)/internal/array.h +parse.$(OBJEXT): $(top_srcdir)/internal/bignum.h +parse.$(OBJEXT): $(top_srcdir)/internal/bits.h +parse.$(OBJEXT): $(top_srcdir)/internal/compile.h +parse.$(OBJEXT): $(top_srcdir)/internal/compilers.h +parse.$(OBJEXT): $(top_srcdir)/internal/complex.h +parse.$(OBJEXT): $(top_srcdir)/internal/error.h +parse.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +parse.$(OBJEXT): $(top_srcdir)/internal/gc.h +parse.$(OBJEXT): $(top_srcdir)/internal/hash.h +parse.$(OBJEXT): $(top_srcdir)/internal/imemo.h +parse.$(OBJEXT): $(top_srcdir)/internal/io.h +parse.$(OBJEXT): $(top_srcdir)/internal/numeric.h +parse.$(OBJEXT): $(top_srcdir)/internal/parse.h +parse.$(OBJEXT): $(top_srcdir)/internal/rational.h +parse.$(OBJEXT): $(top_srcdir)/internal/re.h +parse.$(OBJEXT): $(top_srcdir)/internal/serial.h +parse.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +parse.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +parse.$(OBJEXT): $(top_srcdir)/internal/string.h +parse.$(OBJEXT): $(top_srcdir)/internal/symbol.h +parse.$(OBJEXT): $(top_srcdir)/internal/thread.h +parse.$(OBJEXT): $(top_srcdir)/internal/util.h +parse.$(OBJEXT): $(top_srcdir)/internal/variable.h +parse.$(OBJEXT): $(top_srcdir)/internal/vm.h parse.$(OBJEXT): {$(VPATH)}assert.h parse.$(OBJEXT): {$(VPATH)}config.h +parse.$(OBJEXT): {$(VPATH)}constant.h parse.$(OBJEXT): {$(VPATH)}defines.h parse.$(OBJEXT): {$(VPATH)}defs/keywords parse.$(OBJEXT): {$(VPATH)}encoding.h parse.$(OBJEXT): {$(VPATH)}id.h +parse.$(OBJEXT): {$(VPATH)}id_table.h parse.$(OBJEXT): {$(VPATH)}intern.h parse.$(OBJEXT): {$(VPATH)}internal.h +parse.$(OBJEXT): {$(VPATH)}io.h parse.$(OBJEXT): {$(VPATH)}lex.c parse.$(OBJEXT): {$(VPATH)}missing.h parse.$(OBJEXT): {$(VPATH)}node.h @@ -2568,18 +3125,36 @@ proc.$(OBJEXT): $(CCAN_DIR)/list/list.h proc.$(OBJEXT): $(CCAN_DIR)/str/str.h proc.$(OBJEXT): $(hdrdir)/ruby.h proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h +proc.$(OBJEXT): $(top_srcdir)/internal/array.h +proc.$(OBJEXT): $(top_srcdir)/internal/class.h +proc.$(OBJEXT): $(top_srcdir)/internal/compilers.h +proc.$(OBJEXT): $(top_srcdir)/internal/error.h +proc.$(OBJEXT): $(top_srcdir)/internal/gc.h +proc.$(OBJEXT): $(top_srcdir)/internal/imemo.h +proc.$(OBJEXT): $(top_srcdir)/internal/object.h +proc.$(OBJEXT): $(top_srcdir)/internal/proc.h +proc.$(OBJEXT): $(top_srcdir)/internal/serial.h +proc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +proc.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +proc.$(OBJEXT): $(top_srcdir)/internal/string.h +proc.$(OBJEXT): $(top_srcdir)/internal/symbol.h +proc.$(OBJEXT): $(top_srcdir)/internal/vm.h proc.$(OBJEXT): {$(VPATH)}assert.h proc.$(OBJEXT): {$(VPATH)}config.h proc.$(OBJEXT): {$(VPATH)}defines.h +proc.$(OBJEXT): {$(VPATH)}encoding.h proc.$(OBJEXT): {$(VPATH)}eval_intern.h proc.$(OBJEXT): {$(VPATH)}gc.h proc.$(OBJEXT): {$(VPATH)}id.h +proc.$(OBJEXT): {$(VPATH)}id_table.h proc.$(OBJEXT): {$(VPATH)}intern.h proc.$(OBJEXT): {$(VPATH)}internal.h proc.$(OBJEXT): {$(VPATH)}iseq.h proc.$(OBJEXT): {$(VPATH)}method.h proc.$(OBJEXT): {$(VPATH)}missing.h proc.$(OBJEXT): {$(VPATH)}node.h +proc.$(OBJEXT): {$(VPATH)}onigmo.h +proc.$(OBJEXT): {$(VPATH)}oniguruma.h proc.$(OBJEXT): {$(VPATH)}proc.c proc.$(OBJEXT): {$(VPATH)}ruby_assert.h proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h @@ -2595,13 +3170,34 @@ process.$(OBJEXT): $(CCAN_DIR)/list/list.h process.$(OBJEXT): $(CCAN_DIR)/str/str.h process.$(OBJEXT): $(hdrdir)/ruby.h process.$(OBJEXT): $(hdrdir)/ruby/ruby.h +process.$(OBJEXT): $(top_srcdir)/internal/array.h +process.$(OBJEXT): $(top_srcdir)/internal/bits.h +process.$(OBJEXT): $(top_srcdir)/internal/compilers.h +process.$(OBJEXT): $(top_srcdir)/internal/error.h +process.$(OBJEXT): $(top_srcdir)/internal/eval.h +process.$(OBJEXT): $(top_srcdir)/internal/gc.h +process.$(OBJEXT): $(top_srcdir)/internal/hash.h +process.$(OBJEXT): $(top_srcdir)/internal/imemo.h +process.$(OBJEXT): $(top_srcdir)/internal/mjit.h +process.$(OBJEXT): $(top_srcdir)/internal/object.h +process.$(OBJEXT): $(top_srcdir)/internal/process.h +process.$(OBJEXT): $(top_srcdir)/internal/serial.h +process.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +process.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +process.$(OBJEXT): $(top_srcdir)/internal/string.h +process.$(OBJEXT): $(top_srcdir)/internal/thread.h +process.$(OBJEXT): $(top_srcdir)/internal/variable.h +process.$(OBJEXT): $(top_srcdir)/internal/vm.h +process.$(OBJEXT): $(top_srcdir)/internal/warnings.h process.$(OBJEXT): {$(VPATH)}assert.h process.$(OBJEXT): {$(VPATH)}config.h +process.$(OBJEXT): {$(VPATH)}constant.h process.$(OBJEXT): {$(VPATH)}defines.h process.$(OBJEXT): {$(VPATH)}dln.h process.$(OBJEXT): {$(VPATH)}encoding.h process.$(OBJEXT): {$(VPATH)}hrtime.h process.$(OBJEXT): {$(VPATH)}id.h +process.$(OBJEXT): {$(VPATH)}id_table.h process.$(OBJEXT): {$(VPATH)}intern.h process.$(OBJEXT): {$(VPATH)}internal.h process.$(OBJEXT): {$(VPATH)}io.h @@ -2623,13 +3219,29 @@ process.$(OBJEXT): {$(VPATH)}vm_core.h process.$(OBJEXT): {$(VPATH)}vm_opts.h random.$(OBJEXT): $(hdrdir)/ruby.h random.$(OBJEXT): $(hdrdir)/ruby/ruby.h +random.$(OBJEXT): $(top_srcdir)/internal/bignum.h +random.$(OBJEXT): $(top_srcdir)/internal/bits.h +random.$(OBJEXT): $(top_srcdir)/internal/compilers.h +random.$(OBJEXT): $(top_srcdir)/internal/error.h +random.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +random.$(OBJEXT): $(top_srcdir)/internal/numeric.h +random.$(OBJEXT): $(top_srcdir)/internal/random.h +random.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +random.$(OBJEXT): $(top_srcdir)/internal/serial.h +random.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +random.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +random.$(OBJEXT): $(top_srcdir)/internal/string.h +random.$(OBJEXT): $(top_srcdir)/internal/vm.h random.$(OBJEXT): {$(VPATH)}assert.h random.$(OBJEXT): {$(VPATH)}config.h random.$(OBJEXT): {$(VPATH)}defines.h +random.$(OBJEXT): {$(VPATH)}encoding.h random.$(OBJEXT): {$(VPATH)}intern.h random.$(OBJEXT): {$(VPATH)}internal.h random.$(OBJEXT): {$(VPATH)}missing.h random.$(OBJEXT): {$(VPATH)}mt19937.c +random.$(OBJEXT): {$(VPATH)}onigmo.h +random.$(OBJEXT): {$(VPATH)}oniguruma.h random.$(OBJEXT): {$(VPATH)}random.c random.$(OBJEXT): {$(VPATH)}ruby_atomic.h random.$(OBJEXT): {$(VPATH)}siphash.c @@ -2638,31 +3250,80 @@ random.$(OBJEXT): {$(VPATH)}st.h random.$(OBJEXT): {$(VPATH)}subst.h range.$(OBJEXT): $(hdrdir)/ruby.h range.$(OBJEXT): $(hdrdir)/ruby/ruby.h +range.$(OBJEXT): $(top_srcdir)/internal/array.h +range.$(OBJEXT): $(top_srcdir)/internal/bignum.h +range.$(OBJEXT): $(top_srcdir)/internal/bits.h +range.$(OBJEXT): $(top_srcdir)/internal/compar.h +range.$(OBJEXT): $(top_srcdir)/internal/compilers.h +range.$(OBJEXT): $(top_srcdir)/internal/enum.h +range.$(OBJEXT): $(top_srcdir)/internal/enumerator.h +range.$(OBJEXT): $(top_srcdir)/internal/error.h +range.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +range.$(OBJEXT): $(top_srcdir)/internal/gc.h +range.$(OBJEXT): $(top_srcdir)/internal/numeric.h +range.$(OBJEXT): $(top_srcdir)/internal/range.h +range.$(OBJEXT): $(top_srcdir)/internal/serial.h +range.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +range.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +range.$(OBJEXT): $(top_srcdir)/internal/string.h +range.$(OBJEXT): $(top_srcdir)/internal/struct.h +range.$(OBJEXT): $(top_srcdir)/internal/vm.h range.$(OBJEXT): {$(VPATH)}assert.h range.$(OBJEXT): {$(VPATH)}config.h range.$(OBJEXT): {$(VPATH)}defines.h +range.$(OBJEXT): {$(VPATH)}encoding.h range.$(OBJEXT): {$(VPATH)}id.h range.$(OBJEXT): {$(VPATH)}intern.h range.$(OBJEXT): {$(VPATH)}internal.h range.$(OBJEXT): {$(VPATH)}missing.h +range.$(OBJEXT): {$(VPATH)}onigmo.h +range.$(OBJEXT): {$(VPATH)}oniguruma.h range.$(OBJEXT): {$(VPATH)}range.c range.$(OBJEXT): {$(VPATH)}st.h range.$(OBJEXT): {$(VPATH)}subst.h rational.$(OBJEXT): $(hdrdir)/ruby.h rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h +rational.$(OBJEXT): $(top_srcdir)/internal/bignum.h +rational.$(OBJEXT): $(top_srcdir)/internal/bits.h +rational.$(OBJEXT): $(top_srcdir)/internal/compilers.h +rational.$(OBJEXT): $(top_srcdir)/internal/complex.h +rational.$(OBJEXT): $(top_srcdir)/internal/error.h +rational.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +rational.$(OBJEXT): $(top_srcdir)/internal/gc.h +rational.$(OBJEXT): $(top_srcdir)/internal/numeric.h +rational.$(OBJEXT): $(top_srcdir)/internal/object.h +rational.$(OBJEXT): $(top_srcdir)/internal/rational.h +rational.$(OBJEXT): $(top_srcdir)/internal/serial.h +rational.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +rational.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +rational.$(OBJEXT): $(top_srcdir)/internal/string.h +rational.$(OBJEXT): $(top_srcdir)/internal/vm.h rational.$(OBJEXT): {$(VPATH)}assert.h rational.$(OBJEXT): {$(VPATH)}config.h rational.$(OBJEXT): {$(VPATH)}defines.h +rational.$(OBJEXT): {$(VPATH)}encoding.h rational.$(OBJEXT): {$(VPATH)}id.h rational.$(OBJEXT): {$(VPATH)}intern.h rational.$(OBJEXT): {$(VPATH)}internal.h rational.$(OBJEXT): {$(VPATH)}missing.h +rational.$(OBJEXT): {$(VPATH)}onigmo.h +rational.$(OBJEXT): {$(VPATH)}oniguruma.h rational.$(OBJEXT): {$(VPATH)}rational.c rational.$(OBJEXT): {$(VPATH)}ruby_assert.h rational.$(OBJEXT): {$(VPATH)}st.h rational.$(OBJEXT): {$(VPATH)}subst.h re.$(OBJEXT): $(hdrdir)/ruby.h re.$(OBJEXT): $(hdrdir)/ruby/ruby.h +re.$(OBJEXT): $(top_srcdir)/internal/array.h +re.$(OBJEXT): $(top_srcdir)/internal/compilers.h +re.$(OBJEXT): $(top_srcdir)/internal/error.h +re.$(OBJEXT): $(top_srcdir)/internal/gc.h +re.$(OBJEXT): $(top_srcdir)/internal/hash.h +re.$(OBJEXT): $(top_srcdir)/internal/imemo.h +re.$(OBJEXT): $(top_srcdir)/internal/re.h +re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +re.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +re.$(OBJEXT): $(top_srcdir)/internal/string.h re.$(OBJEXT): {$(VPATH)}assert.h re.$(OBJEXT): {$(VPATH)}config.h re.$(OBJEXT): {$(VPATH)}defines.h @@ -2765,6 +3426,24 @@ ruby.$(OBJEXT): $(CCAN_DIR)/str/str.h ruby.$(OBJEXT): $(hdrdir)/ruby.h ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h ruby.$(OBJEXT): $(hdrdir)/ruby/version.h +ruby.$(OBJEXT): $(top_srcdir)/internal/array.h +ruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h +ruby.$(OBJEXT): $(top_srcdir)/internal/error.h +ruby.$(OBJEXT): $(top_srcdir)/internal/file.h +ruby.$(OBJEXT): $(top_srcdir)/internal/gc.h +ruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h +ruby.$(OBJEXT): $(top_srcdir)/internal/inits.h +ruby.$(OBJEXT): $(top_srcdir)/internal/io.h +ruby.$(OBJEXT): $(top_srcdir)/internal/load.h +ruby.$(OBJEXT): $(top_srcdir)/internal/loadpath.h +ruby.$(OBJEXT): $(top_srcdir)/internal/missing.h +ruby.$(OBJEXT): $(top_srcdir)/internal/object.h +ruby.$(OBJEXT): $(top_srcdir)/internal/parse.h +ruby.$(OBJEXT): $(top_srcdir)/internal/serial.h +ruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +ruby.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +ruby.$(OBJEXT): $(top_srcdir)/internal/string.h +ruby.$(OBJEXT): $(top_srcdir)/internal/vm.h ruby.$(OBJEXT): {$(VPATH)}assert.h ruby.$(OBJEXT): {$(VPATH)}config.h ruby.$(OBJEXT): {$(VPATH)}debug_counter.h @@ -2775,6 +3454,7 @@ ruby.$(OBJEXT): {$(VPATH)}eval_intern.h ruby.$(OBJEXT): {$(VPATH)}id.h ruby.$(OBJEXT): {$(VPATH)}intern.h ruby.$(OBJEXT): {$(VPATH)}internal.h +ruby.$(OBJEXT): {$(VPATH)}io.h ruby.$(OBJEXT): {$(VPATH)}method.h ruby.$(OBJEXT): {$(VPATH)}missing.h ruby.$(OBJEXT): {$(VPATH)}mjit.h @@ -2798,6 +3478,14 @@ safe.$(OBJEXT): $(CCAN_DIR)/list/list.h safe.$(OBJEXT): $(CCAN_DIR)/str/str.h safe.$(OBJEXT): $(hdrdir)/ruby.h safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h +safe.$(OBJEXT): $(top_srcdir)/internal/array.h +safe.$(OBJEXT): $(top_srcdir)/internal/compilers.h +safe.$(OBJEXT): $(top_srcdir)/internal/gc.h +safe.$(OBJEXT): $(top_srcdir)/internal/imemo.h +safe.$(OBJEXT): $(top_srcdir)/internal/serial.h +safe.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +safe.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +safe.$(OBJEXT): $(top_srcdir)/internal/vm.h safe.$(OBJEXT): {$(VPATH)}assert.h safe.$(OBJEXT): {$(VPATH)}config.h safe.$(OBJEXT): {$(VPATH)}defines.h @@ -2833,10 +3521,24 @@ signal.$(OBJEXT): $(CCAN_DIR)/list/list.h signal.$(OBJEXT): $(CCAN_DIR)/str/str.h signal.$(OBJEXT): $(hdrdir)/ruby.h signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h +signal.$(OBJEXT): $(top_srcdir)/internal/array.h +signal.$(OBJEXT): $(top_srcdir)/internal/compilers.h +signal.$(OBJEXT): $(top_srcdir)/internal/eval.h +signal.$(OBJEXT): $(top_srcdir)/internal/gc.h +signal.$(OBJEXT): $(top_srcdir)/internal/imemo.h +signal.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +signal.$(OBJEXT): $(top_srcdir)/internal/serial.h +signal.$(OBJEXT): $(top_srcdir)/internal/signal.h +signal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +signal.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +signal.$(OBJEXT): $(top_srcdir)/internal/string.h +signal.$(OBJEXT): $(top_srcdir)/internal/thread.h +signal.$(OBJEXT): $(top_srcdir)/internal/vm.h signal.$(OBJEXT): {$(VPATH)}assert.h signal.$(OBJEXT): {$(VPATH)}config.h signal.$(OBJEXT): {$(VPATH)}debug_counter.h signal.$(OBJEXT): {$(VPATH)}defines.h +signal.$(OBJEXT): {$(VPATH)}encoding.h signal.$(OBJEXT): {$(VPATH)}eval_intern.h signal.$(OBJEXT): {$(VPATH)}id.h signal.$(OBJEXT): {$(VPATH)}intern.h @@ -2844,6 +3546,8 @@ signal.$(OBJEXT): {$(VPATH)}internal.h signal.$(OBJEXT): {$(VPATH)}method.h signal.$(OBJEXT): {$(VPATH)}missing.h signal.$(OBJEXT): {$(VPATH)}node.h +signal.$(OBJEXT): {$(VPATH)}onigmo.h +signal.$(OBJEXT): {$(VPATH)}oniguruma.h signal.$(OBJEXT): {$(VPATH)}ruby_assert.h signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h signal.$(OBJEXT): {$(VPATH)}signal.c @@ -2855,6 +3559,22 @@ signal.$(OBJEXT): {$(VPATH)}vm_core.h signal.$(OBJEXT): {$(VPATH)}vm_opts.h sprintf.$(OBJEXT): $(hdrdir)/ruby.h sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/bignum.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/bits.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/compilers.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/error.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/hash.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/numeric.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/object.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/serial.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/string.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/symbol.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/util.h +sprintf.$(OBJEXT): $(top_srcdir)/internal/vm.h sprintf.$(OBJEXT): {$(VPATH)}assert.h sprintf.$(OBJEXT): {$(VPATH)}config.h sprintf.$(OBJEXT): {$(VPATH)}defines.h @@ -2873,6 +3593,12 @@ sprintf.$(OBJEXT): {$(VPATH)}subst.h sprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c st.$(OBJEXT): $(hdrdir)/ruby.h st.$(OBJEXT): $(hdrdir)/ruby/ruby.h +st.$(OBJEXT): $(top_srcdir)/internal/bits.h +st.$(OBJEXT): $(top_srcdir)/internal/compilers.h +st.$(OBJEXT): $(top_srcdir)/internal/hash.h +st.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +st.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +st.$(OBJEXT): $(top_srcdir)/internal/stdbool.h st.$(OBJEXT): {$(VPATH)}assert.h st.$(OBJEXT): {$(VPATH)}config.h st.$(OBJEXT): {$(VPATH)}defines.h @@ -2884,6 +3610,13 @@ st.$(OBJEXT): {$(VPATH)}st.h st.$(OBJEXT): {$(VPATH)}subst.h strftime.$(OBJEXT): $(hdrdir)/ruby.h strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h +strftime.$(OBJEXT): $(top_srcdir)/internal/compilers.h +strftime.$(OBJEXT): $(top_srcdir)/internal/serial.h +strftime.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +strftime.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +strftime.$(OBJEXT): $(top_srcdir)/internal/string.h +strftime.$(OBJEXT): $(top_srcdir)/internal/util.h +strftime.$(OBJEXT): $(top_srcdir)/internal/vm.h strftime.$(OBJEXT): {$(VPATH)}assert.h strftime.$(OBJEXT): {$(VPATH)}config.h strftime.$(OBJEXT): {$(VPATH)}defines.h @@ -2899,6 +3632,26 @@ strftime.$(OBJEXT): {$(VPATH)}subst.h strftime.$(OBJEXT): {$(VPATH)}timev.h string.$(OBJEXT): $(hdrdir)/ruby.h string.$(OBJEXT): $(hdrdir)/ruby/ruby.h +string.$(OBJEXT): $(top_srcdir)/internal/array.h +string.$(OBJEXT): $(top_srcdir)/internal/bignum.h +string.$(OBJEXT): $(top_srcdir)/internal/bits.h +string.$(OBJEXT): $(top_srcdir)/internal/compar.h +string.$(OBJEXT): $(top_srcdir)/internal/compilers.h +string.$(OBJEXT): $(top_srcdir)/internal/encoding.h +string.$(OBJEXT): $(top_srcdir)/internal/error.h +string.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +string.$(OBJEXT): $(top_srcdir)/internal/gc.h +string.$(OBJEXT): $(top_srcdir)/internal/numeric.h +string.$(OBJEXT): $(top_srcdir)/internal/object.h +string.$(OBJEXT): $(top_srcdir)/internal/proc.h +string.$(OBJEXT): $(top_srcdir)/internal/re.h +string.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +string.$(OBJEXT): $(top_srcdir)/internal/serial.h +string.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +string.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +string.$(OBJEXT): $(top_srcdir)/internal/string.h +string.$(OBJEXT): $(top_srcdir)/internal/transcode.h +string.$(OBJEXT): $(top_srcdir)/internal/vm.h string.$(OBJEXT): {$(VPATH)}assert.h string.$(OBJEXT): {$(VPATH)}config.h string.$(OBJEXT): {$(VPATH)}crypt.h @@ -2934,15 +3687,35 @@ struct.$(OBJEXT): $(CCAN_DIR)/list/list.h struct.$(OBJEXT): $(CCAN_DIR)/str/str.h struct.$(OBJEXT): $(hdrdir)/ruby.h struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h +struct.$(OBJEXT): $(top_srcdir)/internal/array.h +struct.$(OBJEXT): $(top_srcdir)/internal/class.h +struct.$(OBJEXT): $(top_srcdir)/internal/compilers.h +struct.$(OBJEXT): $(top_srcdir)/internal/error.h +struct.$(OBJEXT): $(top_srcdir)/internal/gc.h +struct.$(OBJEXT): $(top_srcdir)/internal/hash.h +struct.$(OBJEXT): $(top_srcdir)/internal/imemo.h +struct.$(OBJEXT): $(top_srcdir)/internal/object.h +struct.$(OBJEXT): $(top_srcdir)/internal/proc.h +struct.$(OBJEXT): $(top_srcdir)/internal/serial.h +struct.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +struct.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +struct.$(OBJEXT): $(top_srcdir)/internal/string.h +struct.$(OBJEXT): $(top_srcdir)/internal/struct.h +struct.$(OBJEXT): $(top_srcdir)/internal/symbol.h +struct.$(OBJEXT): $(top_srcdir)/internal/vm.h struct.$(OBJEXT): {$(VPATH)}assert.h struct.$(OBJEXT): {$(VPATH)}config.h struct.$(OBJEXT): {$(VPATH)}defines.h +struct.$(OBJEXT): {$(VPATH)}encoding.h struct.$(OBJEXT): {$(VPATH)}id.h +struct.$(OBJEXT): {$(VPATH)}id_table.h struct.$(OBJEXT): {$(VPATH)}intern.h struct.$(OBJEXT): {$(VPATH)}internal.h struct.$(OBJEXT): {$(VPATH)}method.h struct.$(OBJEXT): {$(VPATH)}missing.h struct.$(OBJEXT): {$(VPATH)}node.h +struct.$(OBJEXT): {$(VPATH)}onigmo.h +struct.$(OBJEXT): {$(VPATH)}oniguruma.h struct.$(OBJEXT): {$(VPATH)}ruby_assert.h struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h struct.$(OBJEXT): {$(VPATH)}st.h @@ -2955,6 +3728,17 @@ struct.$(OBJEXT): {$(VPATH)}vm_core.h struct.$(OBJEXT): {$(VPATH)}vm_opts.h symbol.$(OBJEXT): $(hdrdir)/ruby.h symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h +symbol.$(OBJEXT): $(top_srcdir)/internal/compilers.h +symbol.$(OBJEXT): $(top_srcdir)/internal/error.h +symbol.$(OBJEXT): $(top_srcdir)/internal/gc.h +symbol.$(OBJEXT): $(top_srcdir)/internal/hash.h +symbol.$(OBJEXT): $(top_srcdir)/internal/object.h +symbol.$(OBJEXT): $(top_srcdir)/internal/serial.h +symbol.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +symbol.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +symbol.$(OBJEXT): $(top_srcdir)/internal/string.h +symbol.$(OBJEXT): $(top_srcdir)/internal/symbol.h +symbol.$(OBJEXT): $(top_srcdir)/internal/vm.h symbol.$(OBJEXT): {$(VPATH)}assert.h symbol.$(OBJEXT): {$(VPATH)}config.h symbol.$(OBJEXT): {$(VPATH)}defines.h @@ -2982,6 +3766,26 @@ thread.$(OBJEXT): $(CCAN_DIR)/list/list.h thread.$(OBJEXT): $(CCAN_DIR)/str/str.h thread.$(OBJEXT): $(hdrdir)/ruby.h thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h +thread.$(OBJEXT): $(top_srcdir)/internal/array.h +thread.$(OBJEXT): $(top_srcdir)/internal/bits.h +thread.$(OBJEXT): $(top_srcdir)/internal/class.h +thread.$(OBJEXT): $(top_srcdir)/internal/compilers.h +thread.$(OBJEXT): $(top_srcdir)/internal/error.h +thread.$(OBJEXT): $(top_srcdir)/internal/gc.h +thread.$(OBJEXT): $(top_srcdir)/internal/hash.h +thread.$(OBJEXT): $(top_srcdir)/internal/imemo.h +thread.$(OBJEXT): $(top_srcdir)/internal/io.h +thread.$(OBJEXT): $(top_srcdir)/internal/object.h +thread.$(OBJEXT): $(top_srcdir)/internal/proc.h +thread.$(OBJEXT): $(top_srcdir)/internal/serial.h +thread.$(OBJEXT): $(top_srcdir)/internal/signal.h +thread.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +thread.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +thread.$(OBJEXT): $(top_srcdir)/internal/string.h +thread.$(OBJEXT): $(top_srcdir)/internal/thread.h +thread.$(OBJEXT): $(top_srcdir)/internal/time.h +thread.$(OBJEXT): $(top_srcdir)/internal/vm.h +thread.$(OBJEXT): $(top_srcdir)/internal/warnings.h thread.$(OBJEXT): {$(VPATH)}assert.h thread.$(OBJEXT): {$(VPATH)}config.h thread.$(OBJEXT): {$(VPATH)}debug.h @@ -2992,6 +3796,7 @@ thread.$(OBJEXT): {$(VPATH)}eval_intern.h thread.$(OBJEXT): {$(VPATH)}gc.h thread.$(OBJEXT): {$(VPATH)}hrtime.h thread.$(OBJEXT): {$(VPATH)}id.h +thread.$(OBJEXT): {$(VPATH)}id_table.h thread.$(OBJEXT): {$(VPATH)}intern.h thread.$(OBJEXT): {$(VPATH)}internal.h thread.$(OBJEXT): {$(VPATH)}io.h @@ -3017,11 +3822,28 @@ thread.$(OBJEXT): {$(VPATH)}vm_core.h thread.$(OBJEXT): {$(VPATH)}vm_opts.h time.$(OBJEXT): $(hdrdir)/ruby.h time.$(OBJEXT): $(hdrdir)/ruby/ruby.h +time.$(OBJEXT): $(top_srcdir)/internal/array.h +time.$(OBJEXT): $(top_srcdir)/internal/bignum.h +time.$(OBJEXT): $(top_srcdir)/internal/bits.h +time.$(OBJEXT): $(top_srcdir)/internal/compar.h +time.$(OBJEXT): $(top_srcdir)/internal/compilers.h +time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +time.$(OBJEXT): $(top_srcdir)/internal/numeric.h +time.$(OBJEXT): $(top_srcdir)/internal/rational.h +time.$(OBJEXT): $(top_srcdir)/internal/serial.h +time.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +time.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +time.$(OBJEXT): $(top_srcdir)/internal/string.h +time.$(OBJEXT): $(top_srcdir)/internal/time.h +time.$(OBJEXT): $(top_srcdir)/internal/variable.h +time.$(OBJEXT): $(top_srcdir)/internal/vm.h time.$(OBJEXT): {$(VPATH)}assert.h time.$(OBJEXT): {$(VPATH)}config.h +time.$(OBJEXT): {$(VPATH)}constant.h time.$(OBJEXT): {$(VPATH)}defines.h time.$(OBJEXT): {$(VPATH)}encoding.h time.$(OBJEXT): {$(VPATH)}id.h +time.$(OBJEXT): {$(VPATH)}id_table.h time.$(OBJEXT): {$(VPATH)}intern.h time.$(OBJEXT): {$(VPATH)}internal.h time.$(OBJEXT): {$(VPATH)}missing.h @@ -3033,6 +3855,12 @@ time.$(OBJEXT): {$(VPATH)}time.c time.$(OBJEXT): {$(VPATH)}timev.h transcode.$(OBJEXT): $(hdrdir)/ruby.h transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h +transcode.$(OBJEXT): $(top_srcdir)/internal/compilers.h +transcode.$(OBJEXT): $(top_srcdir)/internal/inits.h +transcode.$(OBJEXT): $(top_srcdir)/internal/object.h +transcode.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +transcode.$(OBJEXT): $(top_srcdir)/internal/string.h +transcode.$(OBJEXT): $(top_srcdir)/internal/transcode.h transcode.$(OBJEXT): {$(VPATH)}assert.h transcode.$(OBJEXT): {$(VPATH)}config.h transcode.$(OBJEXT): {$(VPATH)}defines.h @@ -3048,12 +3876,22 @@ transcode.$(OBJEXT): {$(VPATH)}transcode.c transcode.$(OBJEXT): {$(VPATH)}transcode_data.h transient_heap.$(OBJEXT): $(hdrdir)/ruby.h transient_heap.$(OBJEXT): $(hdrdir)/ruby/ruby.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/compilers.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/gc.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/hash.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/struct.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/variable.h transient_heap.$(OBJEXT): {$(VPATH)}assert.h transient_heap.$(OBJEXT): {$(VPATH)}config.h +transient_heap.$(OBJEXT): {$(VPATH)}constant.h transient_heap.$(OBJEXT): {$(VPATH)}debug.h transient_heap.$(OBJEXT): {$(VPATH)}debug_counter.h transient_heap.$(OBJEXT): {$(VPATH)}defines.h transient_heap.$(OBJEXT): {$(VPATH)}gc.h +transient_heap.$(OBJEXT): {$(VPATH)}id_table.h transient_heap.$(OBJEXT): {$(VPATH)}intern.h transient_heap.$(OBJEXT): {$(VPATH)}internal.h transient_heap.$(OBJEXT): {$(VPATH)}missing.h @@ -3066,6 +3904,10 @@ transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.h transient_heap.$(OBJEXT): {$(VPATH)}vm_debug.h util.$(OBJEXT): $(hdrdir)/ruby.h util.$(OBJEXT): $(hdrdir)/ruby/ruby.h +util.$(OBJEXT): $(top_srcdir)/internal/compilers.h +util.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +util.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +util.$(OBJEXT): $(top_srcdir)/internal/util.h util.$(OBJEXT): {$(VPATH)}assert.h util.$(OBJEXT): {$(VPATH)}config.h util.$(OBJEXT): {$(VPATH)}defines.h @@ -3083,6 +3925,23 @@ variable.$(OBJEXT): $(CCAN_DIR)/list/list.h variable.$(OBJEXT): $(CCAN_DIR)/str/str.h variable.$(OBJEXT): $(hdrdir)/ruby.h variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h +variable.$(OBJEXT): $(top_srcdir)/internal/array.h +variable.$(OBJEXT): $(top_srcdir)/internal/class.h +variable.$(OBJEXT): $(top_srcdir)/internal/compilers.h +variable.$(OBJEXT): $(top_srcdir)/internal/error.h +variable.$(OBJEXT): $(top_srcdir)/internal/eval.h +variable.$(OBJEXT): $(top_srcdir)/internal/gc.h +variable.$(OBJEXT): $(top_srcdir)/internal/hash.h +variable.$(OBJEXT): $(top_srcdir)/internal/imemo.h +variable.$(OBJEXT): $(top_srcdir)/internal/re.h +variable.$(OBJEXT): $(top_srcdir)/internal/serial.h +variable.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +variable.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +variable.$(OBJEXT): $(top_srcdir)/internal/string.h +variable.$(OBJEXT): $(top_srcdir)/internal/symbol.h +variable.$(OBJEXT): $(top_srcdir)/internal/thread.h +variable.$(OBJEXT): $(top_srcdir)/internal/variable.h +variable.$(OBJEXT): $(top_srcdir)/internal/vm.h variable.$(OBJEXT): {$(VPATH)}assert.h variable.$(OBJEXT): {$(VPATH)}config.h variable.$(OBJEXT): {$(VPATH)}constant.h @@ -3117,6 +3976,14 @@ version.$(OBJEXT): $(CCAN_DIR)/str/str.h version.$(OBJEXT): $(hdrdir)/ruby.h version.$(OBJEXT): $(hdrdir)/ruby/ruby.h version.$(OBJEXT): $(hdrdir)/ruby/version.h +version.$(OBJEXT): $(top_srcdir)/internal/array.h +version.$(OBJEXT): $(top_srcdir)/internal/compilers.h +version.$(OBJEXT): $(top_srcdir)/internal/gc.h +version.$(OBJEXT): $(top_srcdir)/internal/imemo.h +version.$(OBJEXT): $(top_srcdir)/internal/serial.h +version.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +version.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +version.$(OBJEXT): $(top_srcdir)/internal/vm.h version.$(OBJEXT): $(top_srcdir)/revision.h version.$(OBJEXT): $(top_srcdir)/version.h version.$(OBJEXT): {$(VPATH)}assert.h @@ -3145,6 +4012,36 @@ vm.$(OBJEXT): $(CCAN_DIR)/list/list.h vm.$(OBJEXT): $(CCAN_DIR)/str/str.h vm.$(OBJEXT): $(hdrdir)/ruby.h vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h +vm.$(OBJEXT): $(top_srcdir)/internal/array.h +vm.$(OBJEXT): $(top_srcdir)/internal/bignum.h +vm.$(OBJEXT): $(top_srcdir)/internal/bits.h +vm.$(OBJEXT): $(top_srcdir)/internal/class.h +vm.$(OBJEXT): $(top_srcdir)/internal/compar.h +vm.$(OBJEXT): $(top_srcdir)/internal/compile.h +vm.$(OBJEXT): $(top_srcdir)/internal/compilers.h +vm.$(OBJEXT): $(top_srcdir)/internal/cont.h +vm.$(OBJEXT): $(top_srcdir)/internal/debug.h +vm.$(OBJEXT): $(top_srcdir)/internal/error.h +vm.$(OBJEXT): $(top_srcdir)/internal/eval.h +vm.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +vm.$(OBJEXT): $(top_srcdir)/internal/gc.h +vm.$(OBJEXT): $(top_srcdir)/internal/hash.h +vm.$(OBJEXT): $(top_srcdir)/internal/imemo.h +vm.$(OBJEXT): $(top_srcdir)/internal/inits.h +vm.$(OBJEXT): $(top_srcdir)/internal/mjit.h +vm.$(OBJEXT): $(top_srcdir)/internal/numeric.h +vm.$(OBJEXT): $(top_srcdir)/internal/object.h +vm.$(OBJEXT): $(top_srcdir)/internal/parse.h +vm.$(OBJEXT): $(top_srcdir)/internal/proc.h +vm.$(OBJEXT): $(top_srcdir)/internal/random.h +vm.$(OBJEXT): $(top_srcdir)/internal/re.h +vm.$(OBJEXT): $(top_srcdir)/internal/serial.h +vm.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +vm.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +vm.$(OBJEXT): $(top_srcdir)/internal/string.h +vm.$(OBJEXT): $(top_srcdir)/internal/symbol.h +vm.$(OBJEXT): $(top_srcdir)/internal/variable.h +vm.$(OBJEXT): $(top_srcdir)/internal/vm.h vm.$(OBJEXT): {$(VPATH)}assert.h vm.$(OBJEXT): {$(VPATH)}builtin.h vm.$(OBJEXT): {$(VPATH)}config.h @@ -3152,6 +4049,7 @@ vm.$(OBJEXT): {$(VPATH)}constant.h vm.$(OBJEXT): {$(VPATH)}debug_counter.h vm.$(OBJEXT): {$(VPATH)}defines.h vm.$(OBJEXT): {$(VPATH)}defs/opt_operand.def +vm.$(OBJEXT): {$(VPATH)}encoding.h vm.$(OBJEXT): {$(VPATH)}eval_intern.h vm.$(OBJEXT): {$(VPATH)}gc.h vm.$(OBJEXT): {$(VPATH)}id.h @@ -3166,6 +4064,8 @@ vm.$(OBJEXT): {$(VPATH)}method.h vm.$(OBJEXT): {$(VPATH)}missing.h vm.$(OBJEXT): {$(VPATH)}mjit.h vm.$(OBJEXT): {$(VPATH)}node.h +vm.$(OBJEXT): {$(VPATH)}onigmo.h +vm.$(OBJEXT): {$(VPATH)}oniguruma.h vm.$(OBJEXT): {$(VPATH)}probes.dmyh vm.$(OBJEXT): {$(VPATH)}probes.h vm.$(OBJEXT): {$(VPATH)}probes_helper.h @@ -3197,6 +4097,14 @@ vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h vm_backtrace.$(OBJEXT): $(hdrdir)/ruby.h vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/array.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/compilers.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/gc.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/imemo.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/serial.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/vm.h vm_backtrace.$(OBJEXT): {$(VPATH)}assert.h vm_backtrace.$(OBJEXT): {$(VPATH)}config.h vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h @@ -3227,12 +4135,23 @@ vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h vm_dump.$(OBJEXT): $(hdrdir)/ruby.h vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/array.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/compilers.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/gc.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/imemo.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/serial.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/variable.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/vm.h vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h vm_dump.$(OBJEXT): {$(VPATH)}assert.h vm_dump.$(OBJEXT): {$(VPATH)}config.h +vm_dump.$(OBJEXT): {$(VPATH)}constant.h vm_dump.$(OBJEXT): {$(VPATH)}defines.h vm_dump.$(OBJEXT): {$(VPATH)}gc.h vm_dump.$(OBJEXT): {$(VPATH)}id.h +vm_dump.$(OBJEXT): {$(VPATH)}id_table.h vm_dump.$(OBJEXT): {$(VPATH)}intern.h vm_dump.$(OBJEXT): {$(VPATH)}internal.h vm_dump.$(OBJEXT): {$(VPATH)}iseq.h @@ -3255,12 +4174,24 @@ vm_trace.$(OBJEXT): $(CCAN_DIR)/list/list.h vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h vm_trace.$(OBJEXT): $(hdrdir)/ruby.h vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/array.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/compilers.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/gc.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/hash.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/imemo.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/serial.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/stdbool.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/symbol.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/vm.h +vm_trace.$(OBJEXT): $(top_srcdir)/internal/warnings.h vm_trace.$(OBJEXT): {$(VPATH)}assert.h vm_trace.$(OBJEXT): {$(VPATH)}builtin.h vm_trace.$(OBJEXT): {$(VPATH)}config.h vm_trace.$(OBJEXT): {$(VPATH)}debug.h vm_trace.$(OBJEXT): {$(VPATH)}debug_counter.h vm_trace.$(OBJEXT): {$(VPATH)}defines.h +vm_trace.$(OBJEXT): {$(VPATH)}encoding.h vm_trace.$(OBJEXT): {$(VPATH)}eval_intern.h vm_trace.$(OBJEXT): {$(VPATH)}id.h vm_trace.$(OBJEXT): {$(VPATH)}intern.h @@ -3270,6 +4201,8 @@ vm_trace.$(OBJEXT): {$(VPATH)}method.h vm_trace.$(OBJEXT): {$(VPATH)}missing.h vm_trace.$(OBJEXT): {$(VPATH)}mjit.h vm_trace.$(OBJEXT): {$(VPATH)}node.h +vm_trace.$(OBJEXT): {$(VPATH)}onigmo.h +vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h vm_trace.$(OBJEXT): {$(VPATH)}st.h diff --git a/enc/depend b/enc/depend index 0fffcc273f0680..7b1c7f8d5c55c9 100644 --- a/enc/depend +++ b/enc/depend @@ -178,26 +178,41 @@ clean-srcs: <%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%> # AUTOGENERATED DEPENDENCIES START +enc/ascii.$(OBJEXT): $(hdrdir)/ruby/ruby.h enc/ascii.$(OBJEXT): $(top_srcdir)/encindex.h enc/ascii.$(OBJEXT): $(top_srcdir)/regenc.h +enc/ascii.$(OBJEXT): assert.h enc/ascii.$(OBJEXT): config.h enc/ascii.$(OBJEXT): defines.h enc/ascii.$(OBJEXT): enc/ascii.c +enc/ascii.$(OBJEXT): encoding.h +enc/ascii.$(OBJEXT): intern.h enc/ascii.$(OBJEXT): missing.h enc/ascii.$(OBJEXT): onigmo.h +enc/ascii.$(OBJEXT): oniguruma.h +enc/ascii.$(OBJEXT): st.h +enc/ascii.$(OBJEXT): subst.h enc/big5.$(OBJEXT): $(top_srcdir)/regenc.h enc/big5.$(OBJEXT): config.h enc/big5.$(OBJEXT): defines.h enc/big5.$(OBJEXT): enc/big5.c enc/big5.$(OBJEXT): missing.h enc/big5.$(OBJEXT): onigmo.h +enc/cesu_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h enc/cesu_8.$(OBJEXT): $(top_srcdir)/encindex.h enc/cesu_8.$(OBJEXT): $(top_srcdir)/regenc.h +enc/cesu_8.$(OBJEXT): assert.h +enc/cesu_8.$(OBJEXT): backward.h enc/cesu_8.$(OBJEXT): config.h enc/cesu_8.$(OBJEXT): defines.h enc/cesu_8.$(OBJEXT): enc/cesu_8.c +enc/cesu_8.$(OBJEXT): encoding.h +enc/cesu_8.$(OBJEXT): intern.h enc/cesu_8.$(OBJEXT): missing.h enc/cesu_8.$(OBJEXT): onigmo.h +enc/cesu_8.$(OBJEXT): oniguruma.h +enc/cesu_8.$(OBJEXT): st.h +enc/cesu_8.$(OBJEXT): subst.h enc/cp949.$(OBJEXT): $(top_srcdir)/regenc.h enc/cp949.$(OBJEXT): config.h enc/cp949.$(OBJEXT): defines.h @@ -213,14 +228,18 @@ enc/emacs_mule.$(OBJEXT): onigmo.h enc/encdb.$(OBJEXT): $(hdrdir)/ruby.h enc/encdb.$(OBJEXT): $(hdrdir)/ruby/ruby.h enc/encdb.$(OBJEXT): $(top_srcdir)/internal.h +enc/encdb.$(OBJEXT): $(top_srcdir)/internal/encoding.h enc/encdb.$(OBJEXT): assert.h enc/encdb.$(OBJEXT): backward.h enc/encdb.$(OBJEXT): config.h enc/encdb.$(OBJEXT): defines.h enc/encdb.$(OBJEXT): enc/encdb.c enc/encdb.$(OBJEXT): encdb.h +enc/encdb.$(OBJEXT): encoding.h enc/encdb.$(OBJEXT): intern.h enc/encdb.$(OBJEXT): missing.h +enc/encdb.$(OBJEXT): onigmo.h +enc/encdb.$(OBJEXT): oniguruma.h enc/encdb.$(OBJEXT): st.h enc/encdb.$(OBJEXT): subst.h enc/euc_jp.$(OBJEXT): $(top_srcdir)/regenc.h @@ -628,13 +647,20 @@ enc/unicode.$(OBJEXT): missing.h enc/unicode.$(OBJEXT): onigmo.h enc/unicode.$(OBJEXT): st.h enc/unicode.$(OBJEXT): subst.h +enc/us_ascii.$(OBJEXT): $(hdrdir)/ruby/ruby.h enc/us_ascii.$(OBJEXT): $(top_srcdir)/encindex.h enc/us_ascii.$(OBJEXT): $(top_srcdir)/regenc.h +enc/us_ascii.$(OBJEXT): assert.h enc/us_ascii.$(OBJEXT): config.h enc/us_ascii.$(OBJEXT): defines.h enc/us_ascii.$(OBJEXT): enc/us_ascii.c +enc/us_ascii.$(OBJEXT): encoding.h +enc/us_ascii.$(OBJEXT): intern.h enc/us_ascii.$(OBJEXT): missing.h enc/us_ascii.$(OBJEXT): onigmo.h +enc/us_ascii.$(OBJEXT): oniguruma.h +enc/us_ascii.$(OBJEXT): st.h +enc/us_ascii.$(OBJEXT): subst.h enc/utf_16be.$(OBJEXT): $(top_srcdir)/regenc.h enc/utf_16be.$(OBJEXT): config.h enc/utf_16be.$(OBJEXT): defines.h @@ -663,13 +689,20 @@ enc/utf_32le.$(OBJEXT): enc/iso_8859.h enc/utf_32le.$(OBJEXT): enc/utf_32le.c enc/utf_32le.$(OBJEXT): missing.h enc/utf_32le.$(OBJEXT): onigmo.h +enc/utf_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h enc/utf_8.$(OBJEXT): $(top_srcdir)/encindex.h enc/utf_8.$(OBJEXT): $(top_srcdir)/regenc.h +enc/utf_8.$(OBJEXT): assert.h enc/utf_8.$(OBJEXT): config.h enc/utf_8.$(OBJEXT): defines.h enc/utf_8.$(OBJEXT): enc/utf_8.c +enc/utf_8.$(OBJEXT): encoding.h +enc/utf_8.$(OBJEXT): intern.h enc/utf_8.$(OBJEXT): missing.h enc/utf_8.$(OBJEXT): onigmo.h +enc/utf_8.$(OBJEXT): oniguruma.h +enc/utf_8.$(OBJEXT): st.h +enc/utf_8.$(OBJEXT): subst.h enc/windows_1250.$(OBJEXT): $(top_srcdir)/regenc.h enc/windows_1250.$(OBJEXT): config.h enc/windows_1250.$(OBJEXT): defines.h diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend index 38c9f6114e7c32..b7e3120d98423f 100644 --- a/ext/-test-/bignum/depend +++ b/ext/-test-/bignum/depend @@ -11,6 +11,8 @@ big2str.o: $(hdrdir)/ruby/ruby.h big2str.o: $(hdrdir)/ruby/st.h big2str.o: $(hdrdir)/ruby/subst.h big2str.o: $(top_srcdir)/internal.h +big2str.o: $(top_srcdir)/internal/bignum.h +big2str.o: $(top_srcdir)/internal/stdbool.h big2str.o: big2str.c bigzero.o: $(RUBY_EXTCONF_H) bigzero.o: $(arch_hdrdir)/ruby/config.h @@ -24,6 +26,8 @@ bigzero.o: $(hdrdir)/ruby/ruby.h bigzero.o: $(hdrdir)/ruby/st.h bigzero.o: $(hdrdir)/ruby/subst.h bigzero.o: $(top_srcdir)/internal.h +bigzero.o: $(top_srcdir)/internal/bignum.h +bigzero.o: $(top_srcdir)/internal/stdbool.h bigzero.o: bigzero.c div.o: $(RUBY_EXTCONF_H) div.o: $(arch_hdrdir)/ruby/config.h @@ -37,6 +41,8 @@ div.o: $(hdrdir)/ruby/ruby.h div.o: $(hdrdir)/ruby/st.h div.o: $(hdrdir)/ruby/subst.h div.o: $(top_srcdir)/internal.h +div.o: $(top_srcdir)/internal/bignum.h +div.o: $(top_srcdir)/internal/stdbool.h div.o: div.c init.o: $(RUBY_EXTCONF_H) init.o: $(arch_hdrdir)/ruby/config.h @@ -62,6 +68,8 @@ intpack.o: $(hdrdir)/ruby/ruby.h intpack.o: $(hdrdir)/ruby/st.h intpack.o: $(hdrdir)/ruby/subst.h intpack.o: $(top_srcdir)/internal.h +intpack.o: $(top_srcdir)/internal/bignum.h +intpack.o: $(top_srcdir)/internal/stdbool.h intpack.o: intpack.c mul.o: $(RUBY_EXTCONF_H) mul.o: $(arch_hdrdir)/ruby/config.h @@ -75,6 +83,8 @@ mul.o: $(hdrdir)/ruby/ruby.h mul.o: $(hdrdir)/ruby/st.h mul.o: $(hdrdir)/ruby/subst.h mul.o: $(top_srcdir)/internal.h +mul.o: $(top_srcdir)/internal/bignum.h +mul.o: $(top_srcdir)/internal/stdbool.h mul.o: mul.c str2big.o: $(RUBY_EXTCONF_H) str2big.o: $(arch_hdrdir)/ruby/config.h @@ -88,5 +98,7 @@ str2big.o: $(hdrdir)/ruby/ruby.h str2big.o: $(hdrdir)/ruby/st.h str2big.o: $(hdrdir)/ruby/subst.h str2big.o: $(top_srcdir)/internal.h +str2big.o: $(top_srcdir)/internal/bignum.h +str2big.o: $(top_srcdir)/internal/stdbool.h str2big.o: str2big.c # AUTOGENERATED DEPENDENCIES END diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend index 5c9d5813895408..4ebbae0c3ab2fb 100644 --- a/ext/-test-/integer/depend +++ b/ext/-test-/integer/depend @@ -11,6 +11,15 @@ core_ext.o: $(hdrdir)/ruby/ruby.h core_ext.o: $(hdrdir)/ruby/st.h core_ext.o: $(hdrdir)/ruby/subst.h core_ext.o: $(top_srcdir)/internal.h +core_ext.o: $(top_srcdir)/internal/bignum.h +core_ext.o: $(top_srcdir)/internal/bits.h +core_ext.o: $(top_srcdir)/internal/compilers.h +core_ext.o: $(top_srcdir)/internal/fixnum.h +core_ext.o: $(top_srcdir)/internal/numeric.h +core_ext.o: $(top_srcdir)/internal/serial.h +core_ext.o: $(top_srcdir)/internal/static_assert.h +core_ext.o: $(top_srcdir)/internal/stdbool.h +core_ext.o: $(top_srcdir)/internal/vm.h core_ext.o: core_ext.c init.o: $(RUBY_EXTCONF_H) init.o: $(arch_hdrdir)/ruby/config.h diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend index 39e65933f364d2..d5bf1b554e5243 100644 --- a/ext/-test-/rational/depend +++ b/ext/-test-/rational/depend @@ -15,5 +15,6 @@ rat.o: $(hdrdir)/ruby/ruby.h rat.o: $(hdrdir)/ruby/st.h rat.o: $(hdrdir)/ruby/subst.h rat.o: $(top_srcdir)/internal.h +rat.o: $(top_srcdir)/internal/rational.h rat.o: rat.c # AUTOGENERATED DEPENDENCIES END diff --git a/ext/-test-/string/depend b/ext/-test-/string/depend index f6888b5da7e269..689d345b266cae 100644 --- a/ext/-test-/string/depend +++ b/ext/-test-/string/depend @@ -5,12 +5,18 @@ capacity.o: $(hdrdir)/ruby.h capacity.o: $(hdrdir)/ruby/assert.h capacity.o: $(hdrdir)/ruby/backward.h capacity.o: $(hdrdir)/ruby/defines.h +capacity.o: $(hdrdir)/ruby/encoding.h capacity.o: $(hdrdir)/ruby/intern.h capacity.o: $(hdrdir)/ruby/missing.h +capacity.o: $(hdrdir)/ruby/onigmo.h +capacity.o: $(hdrdir)/ruby/oniguruma.h capacity.o: $(hdrdir)/ruby/ruby.h capacity.o: $(hdrdir)/ruby/st.h capacity.o: $(hdrdir)/ruby/subst.h capacity.o: $(top_srcdir)/internal.h +capacity.o: $(top_srcdir)/internal/compilers.h +capacity.o: $(top_srcdir)/internal/stdbool.h +capacity.o: $(top_srcdir)/internal/string.h capacity.o: capacity.c coderange.o: $(RUBY_EXTCONF_H) coderange.o: $(arch_hdrdir)/ruby/config.h @@ -41,6 +47,10 @@ cstr.o: $(hdrdir)/ruby/ruby.h cstr.o: $(hdrdir)/ruby/st.h cstr.o: $(hdrdir)/ruby/subst.h cstr.o: $(top_srcdir)/internal.h +cstr.o: $(top_srcdir)/internal/compilers.h +cstr.o: $(top_srcdir)/internal/error.h +cstr.o: $(top_srcdir)/internal/stdbool.h +cstr.o: $(top_srcdir)/internal/string.h cstr.o: cstr.c ellipsize.o: $(RUBY_EXTCONF_H) ellipsize.o: $(arch_hdrdir)/ruby/config.h @@ -152,12 +162,16 @@ normalize.o: $(hdrdir)/ruby.h normalize.o: $(hdrdir)/ruby/assert.h normalize.o: $(hdrdir)/ruby/backward.h normalize.o: $(hdrdir)/ruby/defines.h +normalize.o: $(hdrdir)/ruby/encoding.h normalize.o: $(hdrdir)/ruby/intern.h normalize.o: $(hdrdir)/ruby/missing.h +normalize.o: $(hdrdir)/ruby/onigmo.h +normalize.o: $(hdrdir)/ruby/oniguruma.h normalize.o: $(hdrdir)/ruby/ruby.h normalize.o: $(hdrdir)/ruby/st.h normalize.o: $(hdrdir)/ruby/subst.h normalize.o: $(top_srcdir)/internal.h +normalize.o: $(top_srcdir)/internal/file.h normalize.o: normalize.c qsort.o: $(RUBY_EXTCONF_H) qsort.o: $(arch_hdrdir)/ruby/config.h diff --git a/ext/-test-/time/depend b/ext/-test-/time/depend index 2f4b8d1f134a3b..13221d70cd961b 100644 --- a/ext/-test-/time/depend +++ b/ext/-test-/time/depend @@ -22,6 +22,10 @@ leap_second.o: $(hdrdir)/ruby/missing.h leap_second.o: $(hdrdir)/ruby/ruby.h leap_second.o: $(hdrdir)/ruby/st.h leap_second.o: $(hdrdir)/ruby/subst.h +leap_second.o: $(top_srcdir)/internal/bits.h +leap_second.o: $(top_srcdir)/internal/compilers.h +leap_second.o: $(top_srcdir)/internal/static_assert.h +leap_second.o: $(top_srcdir)/internal/time.h leap_second.o: leap_second.c new.o: $(RUBY_EXTCONF_H) new.o: $(arch_hdrdir)/ruby/config.h diff --git a/ext/coverage/depend b/ext/coverage/depend index 20b76be04c35d1..23a45a3379f456 100644 --- a/ext/coverage/depend +++ b/ext/coverage/depend @@ -17,6 +17,16 @@ coverage.o: $(top_srcdir)/ccan/list/list.h coverage.o: $(top_srcdir)/ccan/str/str.h coverage.o: $(top_srcdir)/gc.h coverage.o: $(top_srcdir)/internal.h +coverage.o: $(top_srcdir)/internal/array.h +coverage.o: $(top_srcdir)/internal/compilers.h +coverage.o: $(top_srcdir)/internal/gc.h +coverage.o: $(top_srcdir)/internal/hash.h +coverage.o: $(top_srcdir)/internal/imemo.h +coverage.o: $(top_srcdir)/internal/serial.h +coverage.o: $(top_srcdir)/internal/static_assert.h +coverage.o: $(top_srcdir)/internal/stdbool.h +coverage.o: $(top_srcdir)/internal/thread.h +coverage.o: $(top_srcdir)/internal/vm.h coverage.o: $(top_srcdir)/method.h coverage.o: $(top_srcdir)/node.h coverage.o: $(top_srcdir)/ruby_assert.h diff --git a/ext/objspace/depend b/ext/objspace/depend index 18be4fe8a89c59..3107b5bc11966c 100644 --- a/ext/objspace/depend +++ b/ext/objspace/depend @@ -32,7 +32,17 @@ objspace.o: $(hdrdir)/ruby/ruby.h objspace.o: $(hdrdir)/ruby/st.h objspace.o: $(hdrdir)/ruby/subst.h objspace.o: $(top_srcdir)/gc.h +objspace.o: $(top_srcdir)/id_table.h objspace.o: $(top_srcdir)/internal.h +objspace.o: $(top_srcdir)/internal/array.h +objspace.o: $(top_srcdir)/internal/class.h +objspace.o: $(top_srcdir)/internal/compilers.h +objspace.o: $(top_srcdir)/internal/gc.h +objspace.o: $(top_srcdir)/internal/hash.h +objspace.o: $(top_srcdir)/internal/imemo.h +objspace.o: $(top_srcdir)/internal/serial.h +objspace.o: $(top_srcdir)/internal/static_assert.h +objspace.o: $(top_srcdir)/internal/stdbool.h objspace.o: $(top_srcdir)/node.h objspace.o: $(top_srcdir)/symbol.h objspace.o: objspace.c @@ -60,6 +70,16 @@ objspace_dump.o: $(top_srcdir)/ccan/list/list.h objspace_dump.o: $(top_srcdir)/ccan/str/str.h objspace_dump.o: $(top_srcdir)/gc.h objspace_dump.o: $(top_srcdir)/internal.h +objspace_dump.o: $(top_srcdir)/internal/array.h +objspace_dump.o: $(top_srcdir)/internal/compilers.h +objspace_dump.o: $(top_srcdir)/internal/gc.h +objspace_dump.o: $(top_srcdir)/internal/hash.h +objspace_dump.o: $(top_srcdir)/internal/imemo.h +objspace_dump.o: $(top_srcdir)/internal/serial.h +objspace_dump.o: $(top_srcdir)/internal/static_assert.h +objspace_dump.o: $(top_srcdir)/internal/stdbool.h +objspace_dump.o: $(top_srcdir)/internal/string.h +objspace_dump.o: $(top_srcdir)/internal/vm.h objspace_dump.o: $(top_srcdir)/method.h objspace_dump.o: $(top_srcdir)/node.h objspace_dump.o: $(top_srcdir)/ruby_assert.h diff --git a/ext/pty/depend b/ext/pty/depend index 1e89dc824c3f4a..21e564da1aa3dd 100644 --- a/ext/pty/depend +++ b/ext/pty/depend @@ -16,5 +16,13 @@ pty.o: $(hdrdir)/ruby/st.h pty.o: $(hdrdir)/ruby/subst.h pty.o: $(hdrdir)/ruby/util.h pty.o: $(top_srcdir)/internal.h +pty.o: $(top_srcdir)/internal/array.h +pty.o: $(top_srcdir)/internal/compilers.h +pty.o: $(top_srcdir)/internal/gc.h +pty.o: $(top_srcdir)/internal/imemo.h +pty.o: $(top_srcdir)/internal/process.h +pty.o: $(top_srcdir)/internal/signal.h +pty.o: $(top_srcdir)/internal/static_assert.h +pty.o: $(top_srcdir)/internal/stdbool.h pty.o: pty.c # AUTOGENERATED DEPENDENCIES END diff --git a/ext/ripper/depend b/ext/ripper/depend index 69759ec7163a28..d53d753e9e4537 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -56,6 +56,7 @@ ripper.o: $(hdrdir)/ruby/backward.h ripper.o: $(hdrdir)/ruby/defines.h ripper.o: $(hdrdir)/ruby/encoding.h ripper.o: $(hdrdir)/ruby/intern.h +ripper.o: $(hdrdir)/ruby/io.h ripper.o: $(hdrdir)/ruby/missing.h ripper.o: $(hdrdir)/ruby/onigmo.h ripper.o: $(hdrdir)/ruby/oniguruma.h @@ -64,7 +65,34 @@ ripper.o: $(hdrdir)/ruby/ruby.h ripper.o: $(hdrdir)/ruby/st.h ripper.o: $(hdrdir)/ruby/subst.h ripper.o: $(hdrdir)/ruby/util.h +ripper.o: $(top_srcdir)/constant.h +ripper.o: $(top_srcdir)/id_table.h ripper.o: $(top_srcdir)/internal.h +ripper.o: $(top_srcdir)/internal/array.h +ripper.o: $(top_srcdir)/internal/bignum.h +ripper.o: $(top_srcdir)/internal/bits.h +ripper.o: $(top_srcdir)/internal/compile.h +ripper.o: $(top_srcdir)/internal/compilers.h +ripper.o: $(top_srcdir)/internal/complex.h +ripper.o: $(top_srcdir)/internal/error.h +ripper.o: $(top_srcdir)/internal/fixnum.h +ripper.o: $(top_srcdir)/internal/gc.h +ripper.o: $(top_srcdir)/internal/hash.h +ripper.o: $(top_srcdir)/internal/imemo.h +ripper.o: $(top_srcdir)/internal/io.h +ripper.o: $(top_srcdir)/internal/numeric.h +ripper.o: $(top_srcdir)/internal/parse.h +ripper.o: $(top_srcdir)/internal/rational.h +ripper.o: $(top_srcdir)/internal/re.h +ripper.o: $(top_srcdir)/internal/serial.h +ripper.o: $(top_srcdir)/internal/static_assert.h +ripper.o: $(top_srcdir)/internal/stdbool.h +ripper.o: $(top_srcdir)/internal/string.h +ripper.o: $(top_srcdir)/internal/symbol.h +ripper.o: $(top_srcdir)/internal/thread.h +ripper.o: $(top_srcdir)/internal/util.h +ripper.o: $(top_srcdir)/internal/variable.h +ripper.o: $(top_srcdir)/internal/vm.h ripper.o: $(top_srcdir)/node.h ripper.o: $(top_srcdir)/regenc.h ripper.o: $(top_srcdir)/symbol.h diff --git a/ext/socket/depend b/ext/socket/depend index e958b3dc5d9519..32fba89ca6ebaa 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -28,6 +28,17 @@ ancdata.o: $(hdrdir)/ruby/subst.h ancdata.o: $(hdrdir)/ruby/thread.h ancdata.o: $(hdrdir)/ruby/util.h ancdata.o: $(top_srcdir)/internal.h +ancdata.o: $(top_srcdir)/internal/array.h +ancdata.o: $(top_srcdir)/internal/compilers.h +ancdata.o: $(top_srcdir)/internal/error.h +ancdata.o: $(top_srcdir)/internal/gc.h +ancdata.o: $(top_srcdir)/internal/io.h +ancdata.o: $(top_srcdir)/internal/serial.h +ancdata.o: $(top_srcdir)/internal/static_assert.h +ancdata.o: $(top_srcdir)/internal/stdbool.h +ancdata.o: $(top_srcdir)/internal/string.h +ancdata.o: $(top_srcdir)/internal/thread.h +ancdata.o: $(top_srcdir)/internal/vm.h ancdata.o: ancdata.c ancdata.o: constdefs.h ancdata.o: rubysocket.h @@ -50,6 +61,17 @@ basicsocket.o: $(hdrdir)/ruby/subst.h basicsocket.o: $(hdrdir)/ruby/thread.h basicsocket.o: $(hdrdir)/ruby/util.h basicsocket.o: $(top_srcdir)/internal.h +basicsocket.o: $(top_srcdir)/internal/array.h +basicsocket.o: $(top_srcdir)/internal/compilers.h +basicsocket.o: $(top_srcdir)/internal/error.h +basicsocket.o: $(top_srcdir)/internal/gc.h +basicsocket.o: $(top_srcdir)/internal/io.h +basicsocket.o: $(top_srcdir)/internal/serial.h +basicsocket.o: $(top_srcdir)/internal/static_assert.h +basicsocket.o: $(top_srcdir)/internal/stdbool.h +basicsocket.o: $(top_srcdir)/internal/string.h +basicsocket.o: $(top_srcdir)/internal/thread.h +basicsocket.o: $(top_srcdir)/internal/vm.h basicsocket.o: basicsocket.c basicsocket.o: constdefs.h basicsocket.o: rubysocket.h @@ -72,6 +94,17 @@ constants.o: $(hdrdir)/ruby/subst.h constants.o: $(hdrdir)/ruby/thread.h constants.o: $(hdrdir)/ruby/util.h constants.o: $(top_srcdir)/internal.h +constants.o: $(top_srcdir)/internal/array.h +constants.o: $(top_srcdir)/internal/compilers.h +constants.o: $(top_srcdir)/internal/error.h +constants.o: $(top_srcdir)/internal/gc.h +constants.o: $(top_srcdir)/internal/io.h +constants.o: $(top_srcdir)/internal/serial.h +constants.o: $(top_srcdir)/internal/static_assert.h +constants.o: $(top_srcdir)/internal/stdbool.h +constants.o: $(top_srcdir)/internal/string.h +constants.o: $(top_srcdir)/internal/thread.h +constants.o: $(top_srcdir)/internal/vm.h constants.o: constants.c constants.o: constdefs.c constants.o: constdefs.h @@ -95,6 +128,17 @@ ifaddr.o: $(hdrdir)/ruby/subst.h ifaddr.o: $(hdrdir)/ruby/thread.h ifaddr.o: $(hdrdir)/ruby/util.h ifaddr.o: $(top_srcdir)/internal.h +ifaddr.o: $(top_srcdir)/internal/array.h +ifaddr.o: $(top_srcdir)/internal/compilers.h +ifaddr.o: $(top_srcdir)/internal/error.h +ifaddr.o: $(top_srcdir)/internal/gc.h +ifaddr.o: $(top_srcdir)/internal/io.h +ifaddr.o: $(top_srcdir)/internal/serial.h +ifaddr.o: $(top_srcdir)/internal/static_assert.h +ifaddr.o: $(top_srcdir)/internal/stdbool.h +ifaddr.o: $(top_srcdir)/internal/string.h +ifaddr.o: $(top_srcdir)/internal/thread.h +ifaddr.o: $(top_srcdir)/internal/vm.h ifaddr.o: constdefs.h ifaddr.o: ifaddr.c ifaddr.o: rubysocket.h @@ -117,6 +161,17 @@ init.o: $(hdrdir)/ruby/subst.h init.o: $(hdrdir)/ruby/thread.h init.o: $(hdrdir)/ruby/util.h init.o: $(top_srcdir)/internal.h +init.o: $(top_srcdir)/internal/array.h +init.o: $(top_srcdir)/internal/compilers.h +init.o: $(top_srcdir)/internal/error.h +init.o: $(top_srcdir)/internal/gc.h +init.o: $(top_srcdir)/internal/io.h +init.o: $(top_srcdir)/internal/serial.h +init.o: $(top_srcdir)/internal/static_assert.h +init.o: $(top_srcdir)/internal/stdbool.h +init.o: $(top_srcdir)/internal/string.h +init.o: $(top_srcdir)/internal/thread.h +init.o: $(top_srcdir)/internal/vm.h init.o: constdefs.h init.o: init.c init.o: rubysocket.h @@ -139,6 +194,17 @@ ipsocket.o: $(hdrdir)/ruby/subst.h ipsocket.o: $(hdrdir)/ruby/thread.h ipsocket.o: $(hdrdir)/ruby/util.h ipsocket.o: $(top_srcdir)/internal.h +ipsocket.o: $(top_srcdir)/internal/array.h +ipsocket.o: $(top_srcdir)/internal/compilers.h +ipsocket.o: $(top_srcdir)/internal/error.h +ipsocket.o: $(top_srcdir)/internal/gc.h +ipsocket.o: $(top_srcdir)/internal/io.h +ipsocket.o: $(top_srcdir)/internal/serial.h +ipsocket.o: $(top_srcdir)/internal/static_assert.h +ipsocket.o: $(top_srcdir)/internal/stdbool.h +ipsocket.o: $(top_srcdir)/internal/string.h +ipsocket.o: $(top_srcdir)/internal/thread.h +ipsocket.o: $(top_srcdir)/internal/vm.h ipsocket.o: constdefs.h ipsocket.o: ipsocket.c ipsocket.o: rubysocket.h @@ -161,6 +227,17 @@ option.o: $(hdrdir)/ruby/subst.h option.o: $(hdrdir)/ruby/thread.h option.o: $(hdrdir)/ruby/util.h option.o: $(top_srcdir)/internal.h +option.o: $(top_srcdir)/internal/array.h +option.o: $(top_srcdir)/internal/compilers.h +option.o: $(top_srcdir)/internal/error.h +option.o: $(top_srcdir)/internal/gc.h +option.o: $(top_srcdir)/internal/io.h +option.o: $(top_srcdir)/internal/serial.h +option.o: $(top_srcdir)/internal/static_assert.h +option.o: $(top_srcdir)/internal/stdbool.h +option.o: $(top_srcdir)/internal/string.h +option.o: $(top_srcdir)/internal/thread.h +option.o: $(top_srcdir)/internal/vm.h option.o: constdefs.h option.o: option.c option.o: rubysocket.h @@ -183,6 +260,17 @@ raddrinfo.o: $(hdrdir)/ruby/subst.h raddrinfo.o: $(hdrdir)/ruby/thread.h raddrinfo.o: $(hdrdir)/ruby/util.h raddrinfo.o: $(top_srcdir)/internal.h +raddrinfo.o: $(top_srcdir)/internal/array.h +raddrinfo.o: $(top_srcdir)/internal/compilers.h +raddrinfo.o: $(top_srcdir)/internal/error.h +raddrinfo.o: $(top_srcdir)/internal/gc.h +raddrinfo.o: $(top_srcdir)/internal/io.h +raddrinfo.o: $(top_srcdir)/internal/serial.h +raddrinfo.o: $(top_srcdir)/internal/static_assert.h +raddrinfo.o: $(top_srcdir)/internal/stdbool.h +raddrinfo.o: $(top_srcdir)/internal/string.h +raddrinfo.o: $(top_srcdir)/internal/thread.h +raddrinfo.o: $(top_srcdir)/internal/vm.h raddrinfo.o: constdefs.h raddrinfo.o: raddrinfo.c raddrinfo.o: rubysocket.h @@ -205,6 +293,17 @@ socket.o: $(hdrdir)/ruby/subst.h socket.o: $(hdrdir)/ruby/thread.h socket.o: $(hdrdir)/ruby/util.h socket.o: $(top_srcdir)/internal.h +socket.o: $(top_srcdir)/internal/array.h +socket.o: $(top_srcdir)/internal/compilers.h +socket.o: $(top_srcdir)/internal/error.h +socket.o: $(top_srcdir)/internal/gc.h +socket.o: $(top_srcdir)/internal/io.h +socket.o: $(top_srcdir)/internal/serial.h +socket.o: $(top_srcdir)/internal/static_assert.h +socket.o: $(top_srcdir)/internal/stdbool.h +socket.o: $(top_srcdir)/internal/string.h +socket.o: $(top_srcdir)/internal/thread.h +socket.o: $(top_srcdir)/internal/vm.h socket.o: constdefs.h socket.o: rubysocket.h socket.o: socket.c @@ -227,6 +326,17 @@ sockssocket.o: $(hdrdir)/ruby/subst.h sockssocket.o: $(hdrdir)/ruby/thread.h sockssocket.o: $(hdrdir)/ruby/util.h sockssocket.o: $(top_srcdir)/internal.h +sockssocket.o: $(top_srcdir)/internal/array.h +sockssocket.o: $(top_srcdir)/internal/compilers.h +sockssocket.o: $(top_srcdir)/internal/error.h +sockssocket.o: $(top_srcdir)/internal/gc.h +sockssocket.o: $(top_srcdir)/internal/io.h +sockssocket.o: $(top_srcdir)/internal/serial.h +sockssocket.o: $(top_srcdir)/internal/static_assert.h +sockssocket.o: $(top_srcdir)/internal/stdbool.h +sockssocket.o: $(top_srcdir)/internal/string.h +sockssocket.o: $(top_srcdir)/internal/thread.h +sockssocket.o: $(top_srcdir)/internal/vm.h sockssocket.o: constdefs.h sockssocket.o: rubysocket.h sockssocket.o: sockport.h @@ -249,6 +359,17 @@ tcpserver.o: $(hdrdir)/ruby/subst.h tcpserver.o: $(hdrdir)/ruby/thread.h tcpserver.o: $(hdrdir)/ruby/util.h tcpserver.o: $(top_srcdir)/internal.h +tcpserver.o: $(top_srcdir)/internal/array.h +tcpserver.o: $(top_srcdir)/internal/compilers.h +tcpserver.o: $(top_srcdir)/internal/error.h +tcpserver.o: $(top_srcdir)/internal/gc.h +tcpserver.o: $(top_srcdir)/internal/io.h +tcpserver.o: $(top_srcdir)/internal/serial.h +tcpserver.o: $(top_srcdir)/internal/static_assert.h +tcpserver.o: $(top_srcdir)/internal/stdbool.h +tcpserver.o: $(top_srcdir)/internal/string.h +tcpserver.o: $(top_srcdir)/internal/thread.h +tcpserver.o: $(top_srcdir)/internal/vm.h tcpserver.o: constdefs.h tcpserver.o: rubysocket.h tcpserver.o: sockport.h @@ -271,6 +392,17 @@ tcpsocket.o: $(hdrdir)/ruby/subst.h tcpsocket.o: $(hdrdir)/ruby/thread.h tcpsocket.o: $(hdrdir)/ruby/util.h tcpsocket.o: $(top_srcdir)/internal.h +tcpsocket.o: $(top_srcdir)/internal/array.h +tcpsocket.o: $(top_srcdir)/internal/compilers.h +tcpsocket.o: $(top_srcdir)/internal/error.h +tcpsocket.o: $(top_srcdir)/internal/gc.h +tcpsocket.o: $(top_srcdir)/internal/io.h +tcpsocket.o: $(top_srcdir)/internal/serial.h +tcpsocket.o: $(top_srcdir)/internal/static_assert.h +tcpsocket.o: $(top_srcdir)/internal/stdbool.h +tcpsocket.o: $(top_srcdir)/internal/string.h +tcpsocket.o: $(top_srcdir)/internal/thread.h +tcpsocket.o: $(top_srcdir)/internal/vm.h tcpsocket.o: constdefs.h tcpsocket.o: rubysocket.h tcpsocket.o: sockport.h @@ -293,6 +425,17 @@ udpsocket.o: $(hdrdir)/ruby/subst.h udpsocket.o: $(hdrdir)/ruby/thread.h udpsocket.o: $(hdrdir)/ruby/util.h udpsocket.o: $(top_srcdir)/internal.h +udpsocket.o: $(top_srcdir)/internal/array.h +udpsocket.o: $(top_srcdir)/internal/compilers.h +udpsocket.o: $(top_srcdir)/internal/error.h +udpsocket.o: $(top_srcdir)/internal/gc.h +udpsocket.o: $(top_srcdir)/internal/io.h +udpsocket.o: $(top_srcdir)/internal/serial.h +udpsocket.o: $(top_srcdir)/internal/static_assert.h +udpsocket.o: $(top_srcdir)/internal/stdbool.h +udpsocket.o: $(top_srcdir)/internal/string.h +udpsocket.o: $(top_srcdir)/internal/thread.h +udpsocket.o: $(top_srcdir)/internal/vm.h udpsocket.o: constdefs.h udpsocket.o: rubysocket.h udpsocket.o: sockport.h @@ -315,6 +458,17 @@ unixserver.o: $(hdrdir)/ruby/subst.h unixserver.o: $(hdrdir)/ruby/thread.h unixserver.o: $(hdrdir)/ruby/util.h unixserver.o: $(top_srcdir)/internal.h +unixserver.o: $(top_srcdir)/internal/array.h +unixserver.o: $(top_srcdir)/internal/compilers.h +unixserver.o: $(top_srcdir)/internal/error.h +unixserver.o: $(top_srcdir)/internal/gc.h +unixserver.o: $(top_srcdir)/internal/io.h +unixserver.o: $(top_srcdir)/internal/serial.h +unixserver.o: $(top_srcdir)/internal/static_assert.h +unixserver.o: $(top_srcdir)/internal/stdbool.h +unixserver.o: $(top_srcdir)/internal/string.h +unixserver.o: $(top_srcdir)/internal/thread.h +unixserver.o: $(top_srcdir)/internal/vm.h unixserver.o: constdefs.h unixserver.o: rubysocket.h unixserver.o: sockport.h @@ -337,6 +491,17 @@ unixsocket.o: $(hdrdir)/ruby/subst.h unixsocket.o: $(hdrdir)/ruby/thread.h unixsocket.o: $(hdrdir)/ruby/util.h unixsocket.o: $(top_srcdir)/internal.h +unixsocket.o: $(top_srcdir)/internal/array.h +unixsocket.o: $(top_srcdir)/internal/compilers.h +unixsocket.o: $(top_srcdir)/internal/error.h +unixsocket.o: $(top_srcdir)/internal/gc.h +unixsocket.o: $(top_srcdir)/internal/io.h +unixsocket.o: $(top_srcdir)/internal/serial.h +unixsocket.o: $(top_srcdir)/internal/static_assert.h +unixsocket.o: $(top_srcdir)/internal/stdbool.h +unixsocket.o: $(top_srcdir)/internal/string.h +unixsocket.o: $(top_srcdir)/internal/thread.h +unixsocket.o: $(top_srcdir)/internal/vm.h unixsocket.o: constdefs.h unixsocket.o: rubysocket.h unixsocket.o: sockport.h From 7bf44e9222dfe270ecfefad2b0cb6235732d50a9 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 26 Dec 2019 21:20:50 +0900 Subject: [PATCH 204/878] `#include "internal/debug"` seems to be needed in assert mode http://ci.rvm.jp/results/trunk-theap-asserts@silicon-docker/2525210 --- hash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hash.c b/hash.c index 606d5d39300a24..04c821ac794835 100644 --- a/hash.c +++ b/hash.c @@ -49,6 +49,7 @@ #if HASH_DEBUG #include "gc.h" +#include "internal/debug.h" #endif #define HAS_EXTRA_STATES(hash, klass) ( \ From baf37a5f9c34b660fdb0eb3f899df1303365c723 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 27 Dec 2019 00:46:50 +0900 Subject: [PATCH 205/878] Get rid of LIST_HEAD conflict with a system header on macOS --- vm_dump.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vm_dump.c b/vm_dump.c index 09051cfc3275c1..4bc41f21318d22 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -23,6 +23,9 @@ # ifdef __LP64__ # define vm_region_recurse vm_region_recurse_64 # endif +/* that is defined in sys/queue.h, and conflicts with + * ccan/list/list.h */ +# undef LIST_HEAD #endif #include "addr2line.h" From 30dbd9e4c7e29e4489a8729bfcd2e21e004f7ad9 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 27 Dec 2019 00:47:21 +0900 Subject: [PATCH 206/878] * 2019-12-27 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 468be9d6cf11d0..0a465526bdd42d 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" From 018769e291c223d82a7bc4d6a5a1bad247584c53 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 27 Dec 2019 09:20:58 +0900 Subject: [PATCH 207/878] Try to fix error on Solaris --- internal/gc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/gc.h b/internal/gc.h index 36da0db53d2595..36b534ed1fdfdf 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -140,7 +140,7 @@ ruby_sized_xfree_inlined(void *ptr, size_t size) } # define SIZED_REALLOC_N(v, T, m, n) \ - ((v) = (T *)ruby_sized_xrealloc2((void *)(v), (n), sizeof(T), (m))) + ((v) = (T *)ruby_sized_xrealloc2((void *)(v), (m), sizeof(T), (n))) #endif /* HAVE_MALLOC_USABLE_SIZE */ From 8c5430e2745b7dad698cfcc6e0d3ba6c71bfc39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 27 Dec 2019 10:17:06 +0900 Subject: [PATCH 208/878] reroute macro conflicts on OpenBSD OpenBSD's has its own swap32() etc. We have to avoid name conflicts. See also https://rubyci.org/logs/rubyci.s3.amazonaws.com/openbsd-current/ruby-master/log/20191226T210011Z.log.html.gz#miniruby --- internal/bits.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/internal/bits.h b/internal/bits.h index 2530bd89bc3bb5..7c1be2aa17a9f3 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -117,9 +117,21 @@ 64 - nlz_int64((uint64_t)(x))) #endif -static inline uint16_t swap16(uint16_t); -static inline uint32_t swap32(uint32_t); -static inline uint64_t swap64(uint64_t); +#ifndef swap16 +# define swap16 ruby_swap16 +#endif + +#ifndef swap32 +# define swap32 ruby_swap32 +#endif + +#ifndef swap64 +# define swap64 ruby_swap64 +#endif + +static inline uint16_t ruby_swap16(uint16_t); +static inline uint32_t ruby_swap32(uint32_t); +static inline uint64_t ruby_swap64(uint64_t); static inline unsigned nlz_int(unsigned x); static inline unsigned nlz_long(unsigned long x); static inline unsigned nlz_long_long(unsigned long long x); @@ -139,7 +151,7 @@ static inline VALUE RUBY_BIT_ROTL(VALUE, int); static inline VALUE RUBY_BIT_ROTR(VALUE, int); static inline uint16_t -swap16(uint16_t x) +ruby_swap16(uint16_t x) { #if __has_builtin(__builtin_bswap16) return __builtin_bswap16(x); @@ -154,7 +166,7 @@ swap16(uint16_t x) } static inline uint32_t -swap32(uint32_t x) +ruby_swap32(uint32_t x) { #if __has_builtin(__builtin_bswap32) return __builtin_bswap32(x); @@ -171,7 +183,7 @@ swap32(uint32_t x) } static inline uint64_t -swap64(uint64_t x) +ruby_swap64(uint64_t x) { #if __has_builtin(__builtin_bswap64) return __builtin_bswap64(x); From 729b7ce27058ed4b41d5facbb6b912b8e7c6a960 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 27 Dec 2019 13:06:31 +0900 Subject: [PATCH 209/878] Add check_warning_flags to leakchecker --- tool/lib/leakchecker.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tool/lib/leakchecker.rb b/tool/lib/leakchecker.rb index 57e28665d617f1..7d7f4835c0013d 100644 --- a/tool/lib/leakchecker.rb +++ b/tool/lib/leakchecker.rb @@ -7,6 +7,7 @@ def initialize @env_info = find_env @encoding_info = find_encodings @old_verbose = $VERBOSE + @old_warning_flags = find_warning_flags end def check(test_name) @@ -17,6 +18,7 @@ def check(test_name) check_env(test_name), check_encodings(test_name), check_verbose(test_name), + check_warning_flags(test_name), ] GC.start if leaks.any? end @@ -230,6 +232,26 @@ def check_encodings(test_name) return leaked end + WARNING_CATEGORIES = %i[deprecated experimental].freeze + + def find_warning_flags + WARNING_CATEGORIES.to_h do |category| + [category, Warning[category]] + end + end + + def check_warning_flags(test_name) + new_warning_flags = find_warning_flags + leaked = false + WARNING_CATEGORIES.each do |category| + if new_warning_flags[category] != @old_warning_flags[category] + leaked = true + puts "Warning[#{category.inspect}] changed: #{test_name} : #{@old_warning_flags[category]} to #{new_warning_flags[category]}" + end + end + return leaked + end + def puts(*a) output = MiniTest::Unit.output if defined?(output.set_encoding) From 778634f778a029476fb85463462848c0341f8e6b Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 27 Dec 2019 16:02:07 +0900 Subject: [PATCH 210/878] Drop an invalid char as UTF-8 --- lib/reline/line_editor.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 75af50a908760b..3f6d7817dbc926 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1091,6 +1091,11 @@ def finish private def ed_insert(key) if key.instance_of?(String) + begin + key.encode(Encoding::UTF_8) + rescue Encoding::UndefinedConversionError + return + end width = Reline::Unicode.get_mbchar_width(key) if @cursor == @cursor_max @line += key @@ -1101,6 +1106,11 @@ def finish @cursor += width @cursor_max += width else + begin + key.chr.encode(Encoding::UTF_8) + rescue Encoding::UndefinedConversionError + return + end if @cursor == @cursor_max @line += key.chr else From 4db898284db1f02829abf412ae4f584220a2bcba Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 27 Dec 2019 16:07:30 +0900 Subject: [PATCH 211/878] Add test_completion_with_indent_and_completer_quote_characters This is for 8a705245e55575d4d310a2e956b89a36a5931971. --- test/reline/test_key_actor_emacs.rb | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 97ff654506ca79..120f51453e2403 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -1325,6 +1325,37 @@ def test_completion assert_line('foo_ba') end + def test_completion_with_indent_and_completer_quote_characters + @line_editor.completion_proc = proc { |word| + %w{ + "".foo_foo + "".foo_bar + "".foo_baz + "".qux + }.map { |i| + i.encode(@encoding) + } + } + input_keys(' "".foo_') + assert_byte_pointer_size(' "".foo_') + assert_cursor(9) + assert_cursor_max(9) + assert_line(' "".foo_') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' "".foo_') + assert_cursor(9) + assert_cursor_max(9) + assert_line(' "".foo_') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' "".foo_') + assert_cursor(9) + assert_cursor_max(9) + assert_line(' "".foo_') + assert_equal(%w{"".foo_foo "".foo_bar "".foo_baz}, @line_editor.instance_variable_get(:@menu_info).list) + end + def test_completion_with_perfect_match @line_editor.completion_proc = proc { |word| %w{ From bf77fc23e7533ef76bbe6fd261e1d75b4418dd73 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 27 Dec 2019 17:51:24 +0900 Subject: [PATCH 212/878] Use the more popular word [ci skip] [Bug #16437] --- object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/object.c b/object.c index f7bb57c13bbb65..fc2b45230d2430 100644 --- a/object.c +++ b/object.c @@ -1630,8 +1630,8 @@ rb_false(VALUE obj) * * This method is deprecated. * - * This is not only unuseful but also troublesome because it - * may hide a type error. + * This is not only useless but also troublesome because it may hide a + * type error. */ static VALUE From 26a9f80c823a9f536a235d80d600aa9e03ed7a2f Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 27 Dec 2019 16:46:05 +0100 Subject: [PATCH 213/878] Update to ruby/mspec@1034afc --- spec/mspec/tool/sync/sync-rubyspec.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index 48047e013f7fe9..74881c1a774b5f 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -12,7 +12,6 @@ }, mri: { git: "https://github.com/ruby/ruby.git", - master: "trunk", }, } @@ -48,10 +47,6 @@ def git_url @data[:git] end - def default_branch - @data[:master] || "master" - end - def repo_name File.basename(git_url, ".git") end @@ -99,7 +94,7 @@ def update_repo(impl) Dir.chdir(impl.repo_name) do puts Dir.pwd - sh "git", "checkout", impl.default_branch + sh "git", "checkout", "master" sh "git", "pull" end end From a2fac1d72c225192018f8f3f3dfcfcc46f66c08a Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 27 Dec 2019 16:46:08 +0100 Subject: [PATCH 214/878] Update to ruby/spec@d419e74 --- spec/ruby/.rubocop.yml | 6 +- spec/ruby/.rubocop_todo.yml | 58 +- .../builtin_constants_spec.rb | 6 + spec/ruby/core/exception/errno_spec.rb | 4 - spec/ruby/core/exception/exit_value_spec.rb | 7 +- spec/ruby/core/exception/frozen_error_spec.rb | 8 - .../core/exception/incomplete_input_spec.rb | 4 +- spec/ruby/core/exception/io_error_spec.rb | 6 - spec/ruby/core/exception/name_error_spec.rb | 18 +- .../core/exception/no_method_error_spec.rb | 14 + spec/ruby/core/exception/range_error_spec.rb | 7 - spec/ruby/core/exception/reason_spec.rb | 7 +- spec/ruby/core/exception/result_spec.rb | 6 - spec/ruby/core/exception/signm_spec.rb | 6 +- spec/ruby/core/exception/signo_spec.rb | 6 +- spec/ruby/core/exception/status_spec.rb | 6 +- spec/ruby/core/exception/success_spec.rb | 12 +- .../core/exception/system_call_error_spec.rb | 13 + .../core/exception/system_stack_error_spec.rb | 7 - .../exception/uncaught_throw_error_spec.rb | 6 - spec/ruby/core/gc/start_spec.rb | 4 + spec/ruby/core/kernel/printf_spec.rb | 5 +- spec/ruby/core/kernel/shared/sprintf.rb | 852 +++++++++--------- .../core/kernel/shared/sprintf_encoding.rb | 18 +- spec/ruby/core/proc/compose_spec.rb | 32 + spec/ruby/core/string/inspect_spec.rb | 4 + spec/ruby/core/string/modulo_spec.rb | 14 + spec/ruby/core/string/percent_spec.rb | 13 - spec/ruby/core/symbol/to_proc_spec.rb | 5 + spec/ruby/core/thread/shared/to_s.rb | 6 +- spec/ruby/language/END_spec.rb | 15 + .../library/bigdecimal/BigDecimal_spec.rb | 6 + spec/ruby/library/bigdecimal/to_s_spec.rb | 1 + .../library/conditionvariable/wait_spec.rb | 44 + spec/ruby/optional/capi/encoding_spec.rb | 10 + spec/ruby/optional/capi/ext/encoding_spec.c | 9 + spec/ruby/optional/capi/ext/gc_spec.c | 6 + spec/ruby/optional/capi/ext/hash_spec.c | 10 + spec/ruby/optional/capi/ext/io_spec.c | 14 + spec/ruby/optional/capi/ext/symbol_spec.c | 5 + spec/ruby/optional/capi/gc_spec.rb | 6 + spec/ruby/optional/capi/hash_spec.rb | 9 + spec/ruby/optional/capi/io_spec.rb | 10 + spec/ruby/optional/capi/symbol_spec.rb | 13 + 44 files changed, 788 insertions(+), 530 deletions(-) delete mode 100644 spec/ruby/core/exception/range_error_spec.rb delete mode 100644 spec/ruby/core/exception/system_stack_error_spec.rb delete mode 100644 spec/ruby/core/string/percent_spec.rb create mode 100644 spec/ruby/language/END_spec.rb diff --git a/spec/ruby/.rubocop.yml b/spec/ruby/.rubocop.yml index 77e4e78e775509..5dc6b96473ae18 100644 --- a/spec/ruby/.rubocop.yml +++ b/spec/ruby/.rubocop.yml @@ -10,7 +10,7 @@ AllCops: Layout/TrailingWhitespace: Enabled: true -Layout/TrailingBlankLines: +Layout/TrailingEmptyLines: Enabled: true Exclude: - library/coverage/fixtures/some_class.rb @@ -34,10 +34,10 @@ Lint/InterpolationCheck: Lint/LiteralAsCondition: Enabled: false -Lint/UnneededRequireStatement: +Lint/RedundantRequireStatement: Enabled: false -Lint/UnneededSplatExpansion: +Lint/RedundantSplatExpansion: Enabled: false Lint/UnifiedInteger: diff --git a/spec/ruby/.rubocop_todo.yml b/spec/ruby/.rubocop_todo.yml index aac54f62aecdae..36e41aec87168c 100644 --- a/spec/ruby/.rubocop_todo.yml +++ b/spec/ruby/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2018-04-03 22:23:59 +0900 using RuboCop version 0.54.0. +# on 2019-12-12 22:16:26 +0900 using RuboCop version 0.77.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -20,22 +20,24 @@ Lint/DuplicateMethods: - 'core/unboundmethod/fixtures/classes.rb' - 'fixtures/class.rb' -# Offense count: 5 +# Offense count: 8 Lint/EnsureReturn: Exclude: - 'language/fixtures/ensure.rb' - 'language/fixtures/return.rb' - 'language/return_spec.rb' +# Offense count: 10 +Lint/FlipFlop: + Exclude: + - 'language/if_spec.rb' + - 'language/precedence_spec.rb' + # Offense count: 10 Lint/FloatOutOfRange: Exclude: - 'core/string/modulo_spec.rb' -# Offense count: 29 -Lint/HandleExceptions: - Enabled: false - # Offense count: 2 Lint/ImplicitStringConcatenation: Exclude: @@ -58,13 +60,19 @@ Lint/InheritException: - 'core/exception/fixtures/common.rb' - 'core/module/fixtures/autoload_ex1.rb' -# Offense count: 5 +# Offense count: 72 # Cop supports --auto-correct. Lint/LiteralInInterpolation: Exclude: - 'core/module/refine_spec.rb' + - 'core/regexp/shared/new.rb' + - 'core/string/shared/to_sym.rb' + - 'language/alias_spec.rb' - 'language/defined_spec.rb' - 'language/fixtures/squiggly_heredoc.rb' + - 'language/symbol_spec.rb' + - 'language/undef_spec.rb' + - 'library/net/ftp/connect_spec.rb' # Offense count: 16 Lint/Loop: @@ -74,11 +82,11 @@ Lint/Loop: # Offense count: 8 # Cop supports --auto-correct. -Lint/MultipleCompare: +Lint/MultipleComparison: Exclude: - 'language/precedence_spec.rb' -# Offense count: 12 +# Offense count: 9 Lint/ParenthesesAsGroupedExpression: Exclude: - 'core/string/fixtures/freeze_magic_comment.rb' @@ -86,13 +94,19 @@ Lint/ParenthesesAsGroupedExpression: - 'language/fixtures/send.rb' - 'language/method_spec.rb' +# Offense count: 2 +# Cop supports --auto-correct. +Lint/RedundantStringCoercion: + Exclude: + - 'core/io/print_spec.rb' + # Offense count: 1 # Cop supports --auto-correct. Lint/RedundantWithIndex: Exclude: - 'core/enumerator/with_index_spec.rb' -# Offense count: 26 +# Offense count: 22 Lint/RescueException: Exclude: - 'command_line/fixtures/debug_info.rb' @@ -102,27 +116,24 @@ Lint/RescueException: - 'core/kernel/fixtures/autoload_frozen.rb' - 'core/module/autoload_spec.rb' - 'core/mutex/sleep_spec.rb' - - 'core/process/euid_spec.rb' - - 'core/process/setsid_spec.rb' - - 'core/process/uid_spec.rb' - 'core/thread/abort_on_exception_spec.rb' - 'core/thread/shared/exit.rb' - 'language/rescue_spec.rb' - 'library/erb/filename_spec.rb' -# Offense count: 2 +# Offense count: 4 # Configuration parameters: IgnoreImplicitReferences. Lint/ShadowedArgument: Exclude: - 'language/fixtures/super.rb' -# Offense count: 2 -# Cop supports --auto-correct. -Lint/StringConversionInInterpolation: - Exclude: - - 'core/io/print_spec.rb' +# Offense count: 39 +# Configuration parameters: AllowComments. +Lint/SuppressedException: + Enabled: false # Offense count: 9 +# Configuration parameters: AllowKeywordBlockArguments. Lint/UnderscorePrefixedVariableName: Exclude: - 'core/io/pipe_spec.rb' @@ -137,13 +148,4 @@ Lint/UselessAccessModifier: - 'core/module/fixtures/classes.rb' - 'core/module/module_function_spec.rb' - 'core/module/private_class_method_spec.rb' - - 'core/module/private_spec.rb' - - 'core/module/protected_spec.rb' - - 'core/module/public_spec.rb' - 'language/fixtures/send.rb' - -# Offense count: 6186 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 588 diff --git a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb index a5141c3008c99b..21102bee9f508a 100644 --- a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb +++ b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb @@ -34,6 +34,12 @@ it "is a String" do RUBY_PLATFORM.should be_kind_of(String) end + + platform_is :darwin do + it 'ends with the build time kernel major version on darwin' do + RUBY_PLATFORM.should =~ /-darwin\d+$/ + end + end end describe "RUBY_RELEASE_DATE" do diff --git a/spec/ruby/core/exception/errno_spec.rb b/spec/ruby/core/exception/errno_spec.rb index 9e0bf0086a4c89..e76b29349e33c3 100644 --- a/spec/ruby/core/exception/errno_spec.rb +++ b/spec/ruby/core/exception/errno_spec.rb @@ -1,10 +1,6 @@ require_relative '../../spec_helper' require_relative 'fixtures/common' -describe "SystemCallError#errno" do - it "needs to be reviewed for spec completeness" -end - describe "Errno::EINVAL.new" do it "can be called with no arguments" do exc = Errno::EINVAL.new diff --git a/spec/ruby/core/exception/exit_value_spec.rb b/spec/ruby/core/exception/exit_value_spec.rb index 43de56af8b4ca9..8bb3cf898db7bc 100644 --- a/spec/ruby/core/exception/exit_value_spec.rb +++ b/spec/ruby/core/exception/exit_value_spec.rb @@ -1,5 +1,10 @@ require_relative '../../spec_helper' describe "LocalJumpError#exit_value" do - it "needs to be reviewed for spec completeness" + def get_me_a_return + Proc.new { return 42 } + end + -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| + e.exit_value.should == 42 + } end diff --git a/spec/ruby/core/exception/frozen_error_spec.rb b/spec/ruby/core/exception/frozen_error_spec.rb index 1b5ea711482567..f27b33295cc8b5 100644 --- a/spec/ruby/core/exception/frozen_error_spec.rb +++ b/spec/ruby/core/exception/frozen_error_spec.rb @@ -1,13 +1,5 @@ require_relative '../../spec_helper' -describe "FrozenError" do - ruby_version_is "2.5" do - it "is a subclass of RuntimeError" do - RuntimeError.should be_ancestor_of(FrozenError) - end - end -end - describe "FrozenError.new" do ruby_version_is "2.7" do it "should take optional receiver argument" do diff --git a/spec/ruby/core/exception/incomplete_input_spec.rb b/spec/ruby/core/exception/incomplete_input_spec.rb index b033b33f56f15f..930a3f01d5223a 100644 --- a/spec/ruby/core/exception/incomplete_input_spec.rb +++ b/spec/ruby/core/exception/incomplete_input_spec.rb @@ -1,5 +1,7 @@ require_relative '../../spec_helper' describe "Encoding::InvalidByteSequenceError#incomplete_input?" do - it "needs to be reviewed for spec completeness" + -> {"abc\xa4def".encode("ISO-8859-1", "EUC-JP") }.should raise_error(Encoding::InvalidByteSequenceError) { |e| + e.incomplete_input?.should == false + } end diff --git a/spec/ruby/core/exception/io_error_spec.rb b/spec/ruby/core/exception/io_error_spec.rb index 8dc10cc6ce42fa..ab8a72518ff2c0 100644 --- a/spec/ruby/core/exception/io_error_spec.rb +++ b/spec/ruby/core/exception/io_error_spec.rb @@ -1,11 +1,5 @@ require_relative '../../spec_helper' -describe "IOError" do - it "is a superclass of EOFError" do - IOError.should be_ancestor_of(EOFError) - end -end - describe "IO::EAGAINWaitReadable" do it "combines Errno::EAGAIN and IO::WaitReadable" do IO::EAGAINWaitReadable.superclass.should == Errno::EAGAIN diff --git a/spec/ruby/core/exception/name_error_spec.rb b/spec/ruby/core/exception/name_error_spec.rb index d0a810029bfc1e..e901a80c428e82 100644 --- a/spec/ruby/core/exception/name_error_spec.rb +++ b/spec/ruby/core/exception/name_error_spec.rb @@ -1,11 +1,5 @@ require_relative '../../spec_helper' -describe "NameError" do - it "is a superclass of NoMethodError" do - NameError.should be_ancestor_of(NoMethodError) - end -end - describe "NameError.new" do it "should take optional name argument" do NameError.new("msg","name").name.should == "name" @@ -22,3 +16,15 @@ end end end + +describe "NameError#dup" do + it "copies the name and receiver" do + begin + foo + rescue NameError => ne + name_error_dup = ne.dup + name_error_dup.name.should == :foo + name_error_dup.receiver.should == self + end + end +end diff --git a/spec/ruby/core/exception/no_method_error_spec.rb b/spec/ruby/core/exception/no_method_error_spec.rb index 28c3549562d17f..93224c0740fb38 100644 --- a/spec/ruby/core/exception/no_method_error_spec.rb +++ b/spec/ruby/core/exception/no_method_error_spec.rb @@ -104,3 +104,17 @@ def inspect end end end + +describe "NoMethodError#dup" do + it "copies the name, arguments and receiver" do + begin + receiver = Object.new + receiver.foo(:one, :two) + rescue NoMethodError => nme + no_method_error_dup = nme.dup + no_method_error_dup.name.should == :foo + no_method_error_dup.receiver.should == receiver + no_method_error_dup.args.should == [:one, :two] + end + end +end diff --git a/spec/ruby/core/exception/range_error_spec.rb b/spec/ruby/core/exception/range_error_spec.rb deleted file mode 100644 index 7cfbd0f1ec52a9..00000000000000 --- a/spec/ruby/core/exception/range_error_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -require_relative '../../spec_helper' - -describe "RangeError" do - it "is a superclass of FloatDomainError" do - RangeError.should be_ancestor_of(FloatDomainError) - end -end diff --git a/spec/ruby/core/exception/reason_spec.rb b/spec/ruby/core/exception/reason_spec.rb index 6f18aaae139b3e..b28cbde8d93b7f 100644 --- a/spec/ruby/core/exception/reason_spec.rb +++ b/spec/ruby/core/exception/reason_spec.rb @@ -1,5 +1,10 @@ require_relative '../../spec_helper' describe "LocalJumpError#reason" do - it "needs to be reviewed for spec completeness" + def get_me_a_return + Proc.new { return 42 } + end + -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| + e.reason.should == :return + } end diff --git a/spec/ruby/core/exception/result_spec.rb b/spec/ruby/core/exception/result_spec.rb index 5ba26ebab13432..2f126732954d2a 100644 --- a/spec/ruby/core/exception/result_spec.rb +++ b/spec/ruby/core/exception/result_spec.rb @@ -1,11 +1,5 @@ require_relative '../../spec_helper' -describe "StopIteration" do - it "is a subclass of IndexError" do - StopIteration.superclass.should equal(IndexError) - end -end - describe "StopIteration#result" do before :each do obj = Object.new diff --git a/spec/ruby/core/exception/signm_spec.rb b/spec/ruby/core/exception/signm_spec.rb index 8e3adcddae8140..4adff3b5eea1f1 100644 --- a/spec/ruby/core/exception/signm_spec.rb +++ b/spec/ruby/core/exception/signm_spec.rb @@ -1,5 +1,9 @@ require_relative '../../spec_helper' describe "SignalException#signm" do - it "needs to be reviewed for spec completeness" + it "returns the signal name" do + -> { Process.kill(:TERM, Process.pid) }.should raise_error(SignalException) { |e| + e.signm.should == 'SIGTERM' + } + end end diff --git a/spec/ruby/core/exception/signo_spec.rb b/spec/ruby/core/exception/signo_spec.rb index 2d04cd780568ed..62fc321516c6c5 100644 --- a/spec/ruby/core/exception/signo_spec.rb +++ b/spec/ruby/core/exception/signo_spec.rb @@ -1,5 +1,9 @@ require_relative '../../spec_helper' describe "SignalException#signo" do - it "needs to be reviewed for spec completeness" + it "returns the signal number" do + -> { Process.kill(:TERM, Process.pid) }.should raise_error(SignalException) { |e| + e.signo.should == Signal.list['TERM'] + } + end end diff --git a/spec/ruby/core/exception/status_spec.rb b/spec/ruby/core/exception/status_spec.rb index 1609bff3a5010a..8ace00fe100a0c 100644 --- a/spec/ruby/core/exception/status_spec.rb +++ b/spec/ruby/core/exception/status_spec.rb @@ -1,5 +1,9 @@ require_relative '../../spec_helper' describe "SystemExit#status" do - it "needs to be reviewed for spec completeness" + it "returns the exit status" do + -> { exit 42 }.should raise_error(SystemExit) { |e| + e.status.should == 42 + } + end end diff --git a/spec/ruby/core/exception/success_spec.rb b/spec/ruby/core/exception/success_spec.rb index 82e3df92c6a2aa..70af9c74eb56e5 100644 --- a/spec/ruby/core/exception/success_spec.rb +++ b/spec/ruby/core/exception/success_spec.rb @@ -1,5 +1,15 @@ require_relative '../../spec_helper' describe "SystemExit#success?" do - it "needs to be reviewed for spec completeness" + it "returns true if the process exited successfully" do + -> { exit 0 }.should raise_error(SystemExit) { |e| + e.success?.should == true + } + end + + it "returns false if the process exited unsuccessfully" do + -> { exit(-1) }.should raise_error(SystemExit) { |e| + e.success?.should == false + } + end end diff --git a/spec/ruby/core/exception/system_call_error_spec.rb b/spec/ruby/core/exception/system_call_error_spec.rb index c510ae440fa9f6..f27977a547edee 100644 --- a/spec/ruby/core/exception/system_call_error_spec.rb +++ b/spec/ruby/core/exception/system_call_error_spec.rb @@ -128,3 +128,16 @@ def initialize SystemCallError.new("XXX").message.should =~ /XXX/ end end + +describe "SystemCallError#dup" do + it "copies the errno" do + dup_sce = SystemCallError.new("message", 42).dup + dup_sce.errno.should == 42 + end +end + +describe "SystemCallError#backtrace" do + it "is nil if not raised" do + SystemCallError.new("message", 42).backtrace.should == nil + end +end diff --git a/spec/ruby/core/exception/system_stack_error_spec.rb b/spec/ruby/core/exception/system_stack_error_spec.rb deleted file mode 100644 index 0343d2da59a8c8..00000000000000 --- a/spec/ruby/core/exception/system_stack_error_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -require_relative '../../spec_helper' - -describe "SystemStackError" do - it "is a subclass of Exception" do - SystemStackError.superclass.should == Exception - end -end diff --git a/spec/ruby/core/exception/uncaught_throw_error_spec.rb b/spec/ruby/core/exception/uncaught_throw_error_spec.rb index 57f391d755fca9..9267df6670da30 100644 --- a/spec/ruby/core/exception/uncaught_throw_error_spec.rb +++ b/spec/ruby/core/exception/uncaught_throw_error_spec.rb @@ -1,11 +1,5 @@ require_relative '../../spec_helper' -describe "UncaughtThrowError" do - it "is a subclass of ArgumentError" do - ArgumentError.should be_ancestor_of(UncaughtThrowError) - end -end - describe "UncaughtThrowError#tag" do it "returns the object thrown" do begin diff --git a/spec/ruby/core/gc/start_spec.rb b/spec/ruby/core/gc/start_spec.rb index fb6820db1494c3..c9410589690526 100644 --- a/spec/ruby/core/gc/start_spec.rb +++ b/spec/ruby/core/gc/start_spec.rb @@ -5,4 +5,8 @@ GC.start.should == nil GC.start.should == nil end + + it "accepts keyword arguments" do + GC.start(full_mark: true, immediate_sweep: true).should == nil + end end diff --git a/spec/ruby/core/kernel/printf_spec.rb b/spec/ruby/core/kernel/printf_spec.rb index 5d68c0a13cb3f5..4592c08aaf7f1d 100644 --- a/spec/ruby/core/kernel/printf_spec.rb +++ b/spec/ruby/core/kernel/printf_spec.rb @@ -10,7 +10,6 @@ end describe "Kernel.printf" do - before :each do @stdout = $stdout @name = tmp("kernel_puts.txt") @@ -38,7 +37,7 @@ context "io is specified" do it_behaves_like :kernel_sprintf, -> format, *args { io = StringIO.new - printf(io, format, *args) + Kernel.printf(io, format, *args) io.string } end @@ -49,7 +48,7 @@ begin $stdout = io = StringIO.new - printf(format, *args) + Kernel.printf(format, *args) io.string ensure $stdout = stdout diff --git a/spec/ruby/core/kernel/shared/sprintf.rb b/spec/ruby/core/kernel/shared/sprintf.rb index 989968428405cc..8defbfd6658f00 100644 --- a/spec/ruby/core/kernel/shared/sprintf.rb +++ b/spec/ruby/core/kernel/shared/sprintf.rb @@ -1,10 +1,4 @@ -require_relative '../../../shared/hash/key_error' - describe :kernel_sprintf, shared: true do - def format(*args) - @method.call(*args) - end - describe "integer formats" do it "converts argument into Integer with to_int" do obj = Object.new @@ -12,7 +6,7 @@ def obj.to_i; 10; end def obj.to_int; 10; end obj.should_receive(:to_int).and_return(10) - format("%b", obj).should == "1010" + @method.call("%b", obj).should == "1010" end it "converts argument into Integer with to_i if to_int isn't available" do @@ -20,35 +14,35 @@ def obj.to_int; 10; end def obj.to_i; 10; end obj.should_receive(:to_i).and_return(10) - format("%b", obj).should == "1010" + @method.call("%b", obj).should == "1010" end it "converts String argument with Kernel#Integer" do - format("%d", "0b1010").should == "10" - format("%d", "112").should == "112" - format("%d", "0127").should == "87" - format("%d", "0xc4").should == "196" + @method.call("%d", "0b1010").should == "10" + @method.call("%d", "112").should == "112" + @method.call("%d", "0127").should == "87" + @method.call("%d", "0xc4").should == "196" end it "raises TypeError exception if cannot convert to Integer" do -> { - format("%b", Object.new) + @method.call("%b", Object.new) }.should raise_error(TypeError) end ["b", "B"].each do |f| describe f do it "converts argument as a binary number" do - format("%#{f}", 10).should == "1010" + @method.call("%#{f}", 10).should == "1010" end it "displays negative number as a two's complement prefixed with '..1'" do - format("%#{f}", -10).should == "..1" + "0110" + @method.call("%#{f}", -10).should == "..1" + "0110" end it "collapse negative number representation if it equals 1" do - format("%#{f}", -1).should_not == "..11" - format("%#{f}", -1).should == "..1" + @method.call("%#{f}", -1).should_not == "..11" + @method.call("%#{f}", -1).should == "..1" end end end @@ -56,58 +50,58 @@ def obj.to_i; 10; end ["d", "i", "u"].each do |f| describe f do it "converts argument as a decimal number" do - format("%#{f}", 112).should == "112" - format("%#{f}", -112).should == "-112" + @method.call("%#{f}", 112).should == "112" + @method.call("%#{f}", -112).should == "-112" end it "works well with large numbers" do - format("%#{f}", 1234567890987654321).should == "1234567890987654321" + @method.call("%#{f}", 1234567890987654321).should == "1234567890987654321" end end end describe "o" do it "converts argument as an octal number" do - format("%o", 87).should == "127" + @method.call("%o", 87).should == "127" end it "displays negative number as a two's complement prefixed with '..7'" do - format("%o", -87).should == "..7" + "651" + @method.call("%o", -87).should == "..7" + "651" end it "collapse negative number representation if it equals 7" do - format("%o", -1).should_not == "..77" - format("%o", -1).should == "..7" + @method.call("%o", -1).should_not == "..77" + @method.call("%o", -1).should == "..7" end end describe "x" do it "converts argument as a hexadecimal number" do - format("%x", 196).should == "c4" + @method.call("%x", 196).should == "c4" end it "displays negative number as a two's complement prefixed with '..f'" do - format("%x", -196).should == "..f" + "3c" + @method.call("%x", -196).should == "..f" + "3c" end it "collapse negative number representation if it equals f" do - format("%x", -1).should_not == "..ff" - format("%x", -1).should == "..f" + @method.call("%x", -1).should_not == "..ff" + @method.call("%x", -1).should == "..f" end end describe "X" do it "converts argument as a hexadecimal number with uppercase letters" do - format("%X", 196).should == "C4" + @method.call("%X", 196).should == "C4" end it "displays negative number as a two's complement prefixed with '..f'" do - format("%X", -196).should == "..F" + "3C" + @method.call("%X", -196).should == "..F" + "3C" end it "collapse negative number representation if it equals F" do - format("%X", -1).should_not == "..FF" - format("%X", -1).should == "..F" + @method.call("%X", -1).should_not == "..FF" + @method.call("%X", -1).should == "..F" end end end @@ -116,70 +110,70 @@ def obj.to_i; 10; end it "converts argument into Float" do obj = mock("float") obj.should_receive(:to_f).and_return(9.6) - format("%f", obj).should == "9.600000" + @method.call("%f", obj).should == "9.600000" end it "raises TypeError exception if cannot convert to Float" do -> { - format("%f", Object.new) + @method.call("%f", Object.new) }.should raise_error(TypeError) end {"e" => "e", "E" => "E"}.each_pair do |f, exp| describe f do it "converts argument into exponential notation [-]d.dddddde[+-]dd" do - format("%#{f}", 109.52).should == "1.095200#{exp}+02" - format("%#{f}", -109.52).should == "-1.095200#{exp}+02" - format("%#{f}", 0.10952).should == "1.095200#{exp}-01" - format("%#{f}", -0.10952).should == "-1.095200#{exp}-01" + @method.call("%#{f}", 109.52).should == "1.095200#{exp}+02" + @method.call("%#{f}", -109.52).should == "-1.095200#{exp}+02" + @method.call("%#{f}", 0.10952).should == "1.095200#{exp}-01" + @method.call("%#{f}", -0.10952).should == "-1.095200#{exp}-01" end it "cuts excessive digits and keeps only 6 ones" do - format("%#{f}", 1.123456789).should == "1.123457#{exp}+00" + @method.call("%#{f}", 1.123456789).should == "1.123457#{exp}+00" end it "rounds the last significant digit to the closest one" do - format("%#{f}", 1.555555555).should == "1.555556#{exp}+00" - format("%#{f}", -1.555555555).should == "-1.555556#{exp}+00" - format("%#{f}", 1.444444444).should == "1.444444#{exp}+00" + @method.call("%#{f}", 1.555555555).should == "1.555556#{exp}+00" + @method.call("%#{f}", -1.555555555).should == "-1.555556#{exp}+00" + @method.call("%#{f}", 1.444444444).should == "1.444444#{exp}+00" end it "displays Float::INFINITY as Inf" do - format("%#{f}", Float::INFINITY).should == "Inf" - format("%#{f}", -Float::INFINITY).should == "-Inf" + @method.call("%#{f}", Float::INFINITY).should == "Inf" + @method.call("%#{f}", -Float::INFINITY).should == "-Inf" end it "displays Float::NAN as NaN" do - format("%#{f}", Float::NAN).should == "NaN" - format("%#{f}", -Float::NAN).should == "NaN" + @method.call("%#{f}", Float::NAN).should == "NaN" + @method.call("%#{f}", -Float::NAN).should == "NaN" end end end describe "f" do it "converts floating point argument as [-]ddd.dddddd" do - format("%f", 10.952).should == "10.952000" - format("%f", -10.952).should == "-10.952000" + @method.call("%f", 10.952).should == "10.952000" + @method.call("%f", -10.952).should == "-10.952000" end it "cuts excessive digits and keeps only 6 ones" do - format("%f", 1.123456789).should == "1.123457" + @method.call("%f", 1.123456789).should == "1.123457" end it "rounds the last significant digit to the closest one" do - format("%f", 1.555555555).should == "1.555556" - format("%f", -1.555555555).should == "-1.555556" - format("%f", 1.444444444).should == "1.444444" + @method.call("%f", 1.555555555).should == "1.555556" + @method.call("%f", -1.555555555).should == "-1.555556" + @method.call("%f", 1.444444444).should == "1.444444" end it "displays Float::INFINITY as Inf" do - format("%f", Float::INFINITY).should == "Inf" - format("%f", -Float::INFINITY).should == "-Inf" + @method.call("%f", Float::INFINITY).should == "Inf" + @method.call("%f", -Float::INFINITY).should == "-Inf" end it "displays Float::NAN as NaN" do - format("%f", Float::NAN).should == "NaN" - format("%f", -Float::NAN).should == "NaN" + @method.call("%f", Float::NAN).should == "NaN" + @method.call("%f", -Float::NAN).should == "NaN" end end @@ -187,100 +181,100 @@ def obj.to_i; 10; end describe f do context "the exponent is less than -4" do it "converts a floating point number using exponential form" do - format("%#{f}", 0.0000123456).should == "1.23456#{exp}-05" - format("%#{f}", -0.0000123456).should == "-1.23456#{exp}-05" + @method.call("%#{f}", 0.0000123456).should == "1.23456#{exp}-05" + @method.call("%#{f}", -0.0000123456).should == "-1.23456#{exp}-05" - format("%#{f}", 0.000000000123456).should == "1.23456#{exp}-10" - format("%#{f}", -0.000000000123456).should == "-1.23456#{exp}-10" + @method.call("%#{f}", 0.000000000123456).should == "1.23456#{exp}-10" + @method.call("%#{f}", -0.000000000123456).should == "-1.23456#{exp}-10" end end context "the exponent is greater than or equal to the precision (6 by default)" do it "converts a floating point number using exponential form" do - format("%#{f}", 1234567).should == "1.23457#{exp}+06" - format("%#{f}", 1234567890123).should == "1.23457#{exp}+12" - format("%#{f}", -1234567).should == "-1.23457#{exp}+06" + @method.call("%#{f}", 1234567).should == "1.23457#{exp}+06" + @method.call("%#{f}", 1234567890123).should == "1.23457#{exp}+12" + @method.call("%#{f}", -1234567).should == "-1.23457#{exp}+06" end end context "otherwise" do it "converts a floating point number in dd.dddd form" do - format("%#{f}", 0.0001).should == "0.0001" - format("%#{f}", -0.0001).should == "-0.0001" - format("%#{f}", 123456).should == "123456" - format("%#{f}", -123456).should == "-123456" + @method.call("%#{f}", 0.0001).should == "0.0001" + @method.call("%#{f}", -0.0001).should == "-0.0001" + @method.call("%#{f}", 123456).should == "123456" + @method.call("%#{f}", -123456).should == "-123456" end it "cuts excessive digits in fractional part and keeps only 4 ones" do - format("%#{f}", 12.12341111).should == "12.1234" - format("%#{f}", -12.12341111).should == "-12.1234" + @method.call("%#{f}", 12.12341111).should == "12.1234" + @method.call("%#{f}", -12.12341111).should == "-12.1234" end it "rounds the last significant digit to the closest one in fractional part" do - format("%#{f}", 1.555555555).should == "1.55556" - format("%#{f}", -1.555555555).should == "-1.55556" - format("%#{f}", 1.444444444).should == "1.44444" + @method.call("%#{f}", 1.555555555).should == "1.55556" + @method.call("%#{f}", -1.555555555).should == "-1.55556" + @method.call("%#{f}", 1.444444444).should == "1.44444" end it "cuts fraction part to have only 6 digits at all" do - format("%#{f}", 1.1234567).should == "1.12346" - format("%#{f}", 12.1234567).should == "12.1235" - format("%#{f}", 123.1234567).should == "123.123" - format("%#{f}", 1234.1234567).should == "1234.12" - format("%#{f}", 12345.1234567).should == "12345.1" - format("%#{f}", 123456.1234567).should == "123456" + @method.call("%#{f}", 1.1234567).should == "1.12346" + @method.call("%#{f}", 12.1234567).should == "12.1235" + @method.call("%#{f}", 123.1234567).should == "123.123" + @method.call("%#{f}", 1234.1234567).should == "1234.12" + @method.call("%#{f}", 12345.1234567).should == "12345.1" + @method.call("%#{f}", 123456.1234567).should == "123456" end end it "displays Float::INFINITY as Inf" do - format("%#{f}", Float::INFINITY).should == "Inf" - format("%#{f}", -Float::INFINITY).should == "-Inf" + @method.call("%#{f}", Float::INFINITY).should == "Inf" + @method.call("%#{f}", -Float::INFINITY).should == "-Inf" end it "displays Float::NAN as NaN" do - format("%#{f}", Float::NAN).should == "NaN" - format("%#{f}", -Float::NAN).should == "NaN" + @method.call("%#{f}", Float::NAN).should == "NaN" + @method.call("%#{f}", -Float::NAN).should == "NaN" end end end describe "a" do it "converts floating point argument as [-]0xh.hhhhp[+-]dd" do - format("%a", 196).should == "0x1.88p+7" - format("%a", -196).should == "-0x1.88p+7" - format("%a", 196.1).should == "0x1.8833333333333p+7" - format("%a", 0.01).should == "0x1.47ae147ae147bp-7" - format("%a", -0.01).should == "-0x1.47ae147ae147bp-7" + @method.call("%a", 196).should == "0x1.88p+7" + @method.call("%a", -196).should == "-0x1.88p+7" + @method.call("%a", 196.1).should == "0x1.8833333333333p+7" + @method.call("%a", 0.01).should == "0x1.47ae147ae147bp-7" + @method.call("%a", -0.01).should == "-0x1.47ae147ae147bp-7" end it "displays Float::INFINITY as Inf" do - format("%a", Float::INFINITY).should == "Inf" - format("%a", -Float::INFINITY).should == "-Inf" + @method.call("%a", Float::INFINITY).should == "Inf" + @method.call("%a", -Float::INFINITY).should == "-Inf" end it "displays Float::NAN as NaN" do - format("%a", Float::NAN).should == "NaN" - format("%a", -Float::NAN).should == "NaN" + @method.call("%a", Float::NAN).should == "NaN" + @method.call("%a", -Float::NAN).should == "NaN" end end describe "A" do it "converts floating point argument as [-]0xh.hhhhp[+-]dd and use uppercase X and P" do - format("%A", 196).should == "0X1.88P+7" - format("%A", -196).should == "-0X1.88P+7" - format("%A", 196.1).should == "0X1.8833333333333P+7" - format("%A", 0.01).should == "0X1.47AE147AE147BP-7" - format("%A", -0.01).should == "-0X1.47AE147AE147BP-7" + @method.call("%A", 196).should == "0X1.88P+7" + @method.call("%A", -196).should == "-0X1.88P+7" + @method.call("%A", 196.1).should == "0X1.8833333333333P+7" + @method.call("%A", 0.01).should == "0X1.47AE147AE147BP-7" + @method.call("%A", -0.01).should == "-0X1.47AE147AE147BP-7" end it "displays Float::INFINITY as Inf" do - format("%A", Float::INFINITY).should == "Inf" - format("%A", -Float::INFINITY).should == "-Inf" + @method.call("%A", Float::INFINITY).should == "Inf" + @method.call("%A", -Float::INFINITY).should == "-Inf" end it "displays Float::NAN as NaN" do - format("%A", Float::NAN).should == "NaN" - format("%A", -Float::NAN).should == "NaN" + @method.call("%A", Float::NAN).should == "NaN" + @method.call("%A", -Float::NAN).should == "NaN" end end end @@ -288,28 +282,28 @@ def obj.to_i; 10; end describe "other formats" do describe "c" do it "displays character if argument is a numeric code of character" do - format("%c", 97).should == "a" + @method.call("%c", 97).should == "a" end it "displays character if argument is a single character string" do - format("%c", "a").should == "a" + @method.call("%c", "a").should == "a" end it "raises ArgumentError if argument is a string of several characters" do -> { - format("%c", "abc") + @method.call("%c", "abc") }.should raise_error(ArgumentError) end it "raises ArgumentError if argument is an empty string" do -> { - format("%c", "") + @method.call("%c", "") }.should raise_error(ArgumentError) end it "supports Unicode characters" do - format("%c", 1286).should == "Ԇ" - format("%c", "ش").should == "ش" + @method.call("%c", 1286).should == "Ԇ" + @method.call("%c", "ش").should == "ش" end end @@ -317,19 +311,19 @@ def obj.to_i; 10; end it "displays argument.inspect value" do obj = mock("object") obj.should_receive(:inspect).and_return("") - format("%p", obj).should == "" + @method.call("%p", obj).should == "" end end describe "s" do it "substitute argument passes as a string" do - format("%s", "abc").should == "abc" + @method.call("%s", "abc").should == "abc" end it "converts argument to string with to_s" do obj = mock("string") obj.should_receive(:to_s).and_return("abc") - format("%s", obj).should == "abc" + @method.call("%s", obj).should == "abc" end it "does not try to convert with to_str" do @@ -339,7 +333,7 @@ def obj.to_str end -> { - format("%s", obj) + @method.call("%s", obj) }.should raise_error(NoMethodError) end end @@ -347,21 +341,21 @@ def obj.to_str describe "%" do ruby_version_is ""..."2.5" do it "alone displays the percent sign" do - format("%").should == "%" + @method.call("%").should == "%" end end ruby_version_is "2.5" do it "alone raises an ArgumentError" do -> { - format("%") + @method.call("%") }.should raise_error(ArgumentError) end end it "is escaped by %" do - format("%%").should == "%" - format("%%d", 10).should == "%d" + @method.call("%%").should == "%" + @method.call("%%d", 10).should == "%d" end end end @@ -370,110 +364,110 @@ def obj.to_str describe "space" do context "applies to numeric formats bBdiouxXeEfgGaA" do it "leaves a space at the start of non-negative numbers" do - format("% b", 10).should == " 1010" - format("% B", 10).should == " 1010" - format("% d", 112).should == " 112" - format("% i", 112).should == " 112" - format("% o", 87).should == " 127" - format("% u", 112).should == " 112" - format("% x", 196).should == " c4" - format("% X", 196).should == " C4" - - format("% e", 109.52).should == " 1.095200e+02" - format("% E", 109.52).should == " 1.095200E+02" - format("% f", 10.952).should == " 10.952000" - format("% g", 12.1234).should == " 12.1234" - format("% G", 12.1234).should == " 12.1234" - format("% a", 196).should == " 0x1.88p+7" - format("% A", 196).should == " 0X1.88P+7" + @method.call("% b", 10).should == " 1010" + @method.call("% B", 10).should == " 1010" + @method.call("% d", 112).should == " 112" + @method.call("% i", 112).should == " 112" + @method.call("% o", 87).should == " 127" + @method.call("% u", 112).should == " 112" + @method.call("% x", 196).should == " c4" + @method.call("% X", 196).should == " C4" + + @method.call("% e", 109.52).should == " 1.095200e+02" + @method.call("% E", 109.52).should == " 1.095200E+02" + @method.call("% f", 10.952).should == " 10.952000" + @method.call("% g", 12.1234).should == " 12.1234" + @method.call("% G", 12.1234).should == " 12.1234" + @method.call("% a", 196).should == " 0x1.88p+7" + @method.call("% A", 196).should == " 0X1.88P+7" end it "does not leave a space at the start of negative numbers" do - format("% b", -10).should == "-1010" - format("% B", -10).should == "-1010" - format("% d", -112).should == "-112" - format("% i", -112).should == "-112" - format("% o", -87).should == "-127" - format("% u", -112).should == "-112" - format("% x", -196).should == "-c4" - format("% X", -196).should == "-C4" - - format("% e", -109.52).should == "-1.095200e+02" - format("% E", -109.52).should == "-1.095200E+02" - format("% f", -10.952).should == "-10.952000" - format("% g", -12.1234).should == "-12.1234" - format("% G", -12.1234).should == "-12.1234" - format("% a", -196).should == "-0x1.88p+7" - format("% A", -196).should == "-0X1.88P+7" + @method.call("% b", -10).should == "-1010" + @method.call("% B", -10).should == "-1010" + @method.call("% d", -112).should == "-112" + @method.call("% i", -112).should == "-112" + @method.call("% o", -87).should == "-127" + @method.call("% u", -112).should == "-112" + @method.call("% x", -196).should == "-c4" + @method.call("% X", -196).should == "-C4" + + @method.call("% e", -109.52).should == "-1.095200e+02" + @method.call("% E", -109.52).should == "-1.095200E+02" + @method.call("% f", -10.952).should == "-10.952000" + @method.call("% g", -12.1234).should == "-12.1234" + @method.call("% G", -12.1234).should == "-12.1234" + @method.call("% a", -196).should == "-0x1.88p+7" + @method.call("% A", -196).should == "-0X1.88P+7" end it "prevents converting negative argument to two's complement form" do - format("% b", -10).should == "-1010" - format("% B", -10).should == "-1010" - format("% o", -87).should == "-127" - format("% x", -196).should == "-c4" - format("% X", -196).should == "-C4" + @method.call("% b", -10).should == "-1010" + @method.call("% B", -10).should == "-1010" + @method.call("% o", -87).should == "-127" + @method.call("% x", -196).should == "-c4" + @method.call("% X", -196).should == "-C4" end it "treats several white spaces as one" do - format("% b", 10).should == " 1010" - format("% B", 10).should == " 1010" - format("% d", 112).should == " 112" - format("% i", 112).should == " 112" - format("% o", 87).should == " 127" - format("% u", 112).should == " 112" - format("% x", 196).should == " c4" - format("% X", 196).should == " C4" + @method.call("% b", 10).should == " 1010" + @method.call("% B", 10).should == " 1010" + @method.call("% d", 112).should == " 112" + @method.call("% i", 112).should == " 112" + @method.call("% o", 87).should == " 127" + @method.call("% u", 112).should == " 112" + @method.call("% x", 196).should == " c4" + @method.call("% X", 196).should == " C4" - format("% e", 109.52).should == " 1.095200e+02" - format("% E", 109.52).should == " 1.095200E+02" - format("% f", 10.952).should == " 10.952000" - format("% g", 12.1234).should == " 12.1234" - format("% G", 12.1234).should == " 12.1234" - format("% a", 196).should == " 0x1.88p+7" - format("% A", 196).should == " 0X1.88P+7" + @method.call("% e", 109.52).should == " 1.095200e+02" + @method.call("% E", 109.52).should == " 1.095200E+02" + @method.call("% f", 10.952).should == " 10.952000" + @method.call("% g", 12.1234).should == " 12.1234" + @method.call("% G", 12.1234).should == " 12.1234" + @method.call("% a", 196).should == " 0x1.88p+7" + @method.call("% A", 196).should == " 0X1.88P+7" end end end describe "(digit)$" do it "specifies the absolute argument number for this field" do - format("%2$b", 0, 10).should == "1010" - format("%2$B", 0, 10).should == "1010" - format("%2$d", 0, 112).should == "112" - format("%2$i", 0, 112).should == "112" - format("%2$o", 0, 87).should == "127" - format("%2$u", 0, 112).should == "112" - format("%2$x", 0, 196).should == "c4" - format("%2$X", 0, 196).should == "C4" - - format("%2$e", 0, 109.52).should == "1.095200e+02" - format("%2$E", 0, 109.52).should == "1.095200E+02" - format("%2$f", 0, 10.952).should == "10.952000" - format("%2$g", 0, 12.1234).should == "12.1234" - format("%2$G", 0, 12.1234).should == "12.1234" - format("%2$a", 0, 196).should == "0x1.88p+7" - format("%2$A", 0, 196).should == "0X1.88P+7" - - format("%2$c", 1, 97).should == "a" - format("%2$p", "a", []).should == "[]" - format("%2$s", "-", "abc").should == "abc" + @method.call("%2$b", 0, 10).should == "1010" + @method.call("%2$B", 0, 10).should == "1010" + @method.call("%2$d", 0, 112).should == "112" + @method.call("%2$i", 0, 112).should == "112" + @method.call("%2$o", 0, 87).should == "127" + @method.call("%2$u", 0, 112).should == "112" + @method.call("%2$x", 0, 196).should == "c4" + @method.call("%2$X", 0, 196).should == "C4" + + @method.call("%2$e", 0, 109.52).should == "1.095200e+02" + @method.call("%2$E", 0, 109.52).should == "1.095200E+02" + @method.call("%2$f", 0, 10.952).should == "10.952000" + @method.call("%2$g", 0, 12.1234).should == "12.1234" + @method.call("%2$G", 0, 12.1234).should == "12.1234" + @method.call("%2$a", 0, 196).should == "0x1.88p+7" + @method.call("%2$A", 0, 196).should == "0X1.88P+7" + + @method.call("%2$c", 1, 97).should == "a" + @method.call("%2$p", "a", []).should == "[]" + @method.call("%2$s", "-", "abc").should == "abc" end it "raises exception if argument number is bigger than actual arguments list" do -> { - format("%4$d", 1, 2, 3) + @method.call("%4$d", 1, 2, 3) }.should raise_error(ArgumentError) end it "ignores '-' sign" do - format("%2$d", 1, 2, 3).should == "2" - format("%-2$d", 1, 2, 3).should == "2" + @method.call("%2$d", 1, 2, 3).should == "2" + @method.call("%-2$d", 1, 2, 3).should == "2" end it "raises ArgumentError exception when absolute and relative argument numbers are mixed" do -> { - format("%1$d %d", 1, 2) + @method.call("%1$d %d", 1, 2) }.should raise_error(ArgumentError) end end @@ -481,62 +475,62 @@ def obj.to_str describe "#" do context "applies to format o" do it "increases the precision until the first digit will be `0' if it is not formatted as complements" do - format("%#o", 87).should == "0127" + @method.call("%#o", 87).should == "0127" end it "does nothing for negative argument" do - format("%#o", -87).should == "..7651" + @method.call("%#o", -87).should == "..7651" end end context "applies to formats bBxX" do it "prefixes the result with 0x, 0X, 0b and 0B respectively for non-zero argument" do - format("%#b", 10).should == "0b1010" - format("%#b", -10).should == "0b..10110" - format("%#B", 10).should == "0B1010" - format("%#B", -10).should == "0B..10110" + @method.call("%#b", 10).should == "0b1010" + @method.call("%#b", -10).should == "0b..10110" + @method.call("%#B", 10).should == "0B1010" + @method.call("%#B", -10).should == "0B..10110" - format("%#x", 196).should == "0xc4" - format("%#x", -196).should == "0x..f3c" - format("%#X", 196).should == "0XC4" - format("%#X", -196).should == "0X..F3C" + @method.call("%#x", 196).should == "0xc4" + @method.call("%#x", -196).should == "0x..f3c" + @method.call("%#X", 196).should == "0XC4" + @method.call("%#X", -196).should == "0X..F3C" end it "does nothing for zero argument" do - format("%#b", 0).should == "0" - format("%#B", 0).should == "0" + @method.call("%#b", 0).should == "0" + @method.call("%#B", 0).should == "0" - format("%#o", 0).should == "0" + @method.call("%#o", 0).should == "0" - format("%#x", 0).should == "0" - format("%#X", 0).should == "0" + @method.call("%#x", 0).should == "0" + @method.call("%#X", 0).should == "0" end end context "applies to formats aAeEfgG" do it "forces a decimal point to be added, even if no digits follow" do - format("%#.0a", 16.25).should == "0x1.p+4" - format("%#.0A", 16.25).should == "0X1.P+4" + @method.call("%#.0a", 16.25).should == "0x1.p+4" + @method.call("%#.0A", 16.25).should == "0X1.P+4" - format("%#.0e", 100).should == "1.e+02" - format("%#.0E", 100).should == "1.E+02" + @method.call("%#.0e", 100).should == "1.e+02" + @method.call("%#.0E", 100).should == "1.E+02" - format("%#.0f", 123.4).should == "123." + @method.call("%#.0f", 123.4).should == "123." - format("%#g", 123456).should == "123456." - format("%#G", 123456).should == "123456." + @method.call("%#g", 123456).should == "123456." + @method.call("%#G", 123456).should == "123456." end it "changes format from dd.dddd to exponential form for gG" do - format("%#.0g", 123.4).should_not == "123." - format("%#.0g", 123.4).should == "1.e+02" + @method.call("%#.0g", 123.4).should_not == "123." + @method.call("%#.0g", 123.4).should == "1.e+02" end end context "applies to gG" do it "does not remove trailing zeros" do - format("%#g", 123.4).should == "123.400" - format("%#g", 123.4).should == "123.400" + @method.call("%#g", 123.4).should == "123.400" + @method.call("%#g", 123.4).should == "123.400" end end end @@ -544,186 +538,186 @@ def obj.to_str describe "+" do context "applies to numeric formats bBdiouxXaAeEfgG" do it "adds a leading plus sign to non-negative numbers" do - format("%+b", 10).should == "+1010" - format("%+B", 10).should == "+1010" - format("%+d", 112).should == "+112" - format("%+i", 112).should == "+112" - format("%+o", 87).should == "+127" - format("%+u", 112).should == "+112" - format("%+x", 196).should == "+c4" - format("%+X", 196).should == "+C4" - - format("%+e", 109.52).should == "+1.095200e+02" - format("%+E", 109.52).should == "+1.095200E+02" - format("%+f", 10.952).should == "+10.952000" - format("%+g", 12.1234).should == "+12.1234" - format("%+G", 12.1234).should == "+12.1234" - format("%+a", 196).should == "+0x1.88p+7" - format("%+A", 196).should == "+0X1.88P+7" + @method.call("%+b", 10).should == "+1010" + @method.call("%+B", 10).should == "+1010" + @method.call("%+d", 112).should == "+112" + @method.call("%+i", 112).should == "+112" + @method.call("%+o", 87).should == "+127" + @method.call("%+u", 112).should == "+112" + @method.call("%+x", 196).should == "+c4" + @method.call("%+X", 196).should == "+C4" + + @method.call("%+e", 109.52).should == "+1.095200e+02" + @method.call("%+E", 109.52).should == "+1.095200E+02" + @method.call("%+f", 10.952).should == "+10.952000" + @method.call("%+g", 12.1234).should == "+12.1234" + @method.call("%+G", 12.1234).should == "+12.1234" + @method.call("%+a", 196).should == "+0x1.88p+7" + @method.call("%+A", 196).should == "+0X1.88P+7" end it "does not use two's complement form for negative numbers for formats bBoxX" do - format("%+b", -10).should == "-1010" - format("%+B", -10).should == "-1010" - format("%+o", -87).should == "-127" - format("%+x", -196).should == "-c4" - format("%+X", -196).should == "-C4" + @method.call("%+b", -10).should == "-1010" + @method.call("%+B", -10).should == "-1010" + @method.call("%+o", -87).should == "-127" + @method.call("%+x", -196).should == "-c4" + @method.call("%+X", -196).should == "-C4" end end end describe "-" do it "left-justifies the result of conversion if width is specified" do - format("%-10b", 10).should == "1010 " - format("%-10B", 10).should == "1010 " - format("%-10d", 112).should == "112 " - format("%-10i", 112).should == "112 " - format("%-10o", 87).should == "127 " - format("%-10u", 112).should == "112 " - format("%-10x", 196).should == "c4 " - format("%-10X", 196).should == "C4 " + @method.call("%-10b", 10).should == "1010 " + @method.call("%-10B", 10).should == "1010 " + @method.call("%-10d", 112).should == "112 " + @method.call("%-10i", 112).should == "112 " + @method.call("%-10o", 87).should == "127 " + @method.call("%-10u", 112).should == "112 " + @method.call("%-10x", 196).should == "c4 " + @method.call("%-10X", 196).should == "C4 " - format("%-20e", 109.52).should == "1.095200e+02 " - format("%-20E", 109.52).should == "1.095200E+02 " - format("%-20f", 10.952).should == "10.952000 " - format("%-20g", 12.1234).should == "12.1234 " - format("%-20G", 12.1234).should == "12.1234 " - format("%-20a", 196).should == "0x1.88p+7 " - format("%-20A", 196).should == "0X1.88P+7 " + @method.call("%-20e", 109.52).should == "1.095200e+02 " + @method.call("%-20E", 109.52).should == "1.095200E+02 " + @method.call("%-20f", 10.952).should == "10.952000 " + @method.call("%-20g", 12.1234).should == "12.1234 " + @method.call("%-20G", 12.1234).should == "12.1234 " + @method.call("%-20a", 196).should == "0x1.88p+7 " + @method.call("%-20A", 196).should == "0X1.88P+7 " - format("%-10c", 97).should == "a " - format("%-10p", []).should == "[] " - format("%-10s", "abc").should == "abc " + @method.call("%-10c", 97).should == "a " + @method.call("%-10p", []).should == "[] " + @method.call("%-10s", "abc").should == "abc " end end describe "0 (zero)" do context "applies to numeric formats bBdiouxXaAeEfgG and width is specified" do it "pads with zeros, not spaces" do - format("%010b", 10).should == "0000001010" - format("%010B", 10).should == "0000001010" - format("%010d", 112).should == "0000000112" - format("%010i", 112).should == "0000000112" - format("%010o", 87).should == "0000000127" - format("%010u", 112).should == "0000000112" - format("%010x", 196).should == "00000000c4" - format("%010X", 196).should == "00000000C4" - - format("%020e", 109.52).should == "000000001.095200e+02" - format("%020E", 109.52).should == "000000001.095200E+02" - format("%020f", 10.952).should == "0000000000010.952000" - format("%020g", 12.1234).should == "000000000000012.1234" - format("%020G", 12.1234).should == "000000000000012.1234" - format("%020a", 196).should == "0x000000000001.88p+7" - format("%020A", 196).should == "0X000000000001.88P+7" + @method.call("%010b", 10).should == "0000001010" + @method.call("%010B", 10).should == "0000001010" + @method.call("%010d", 112).should == "0000000112" + @method.call("%010i", 112).should == "0000000112" + @method.call("%010o", 87).should == "0000000127" + @method.call("%010u", 112).should == "0000000112" + @method.call("%010x", 196).should == "00000000c4" + @method.call("%010X", 196).should == "00000000C4" + + @method.call("%020e", 109.52).should == "000000001.095200e+02" + @method.call("%020E", 109.52).should == "000000001.095200E+02" + @method.call("%020f", 10.952).should == "0000000000010.952000" + @method.call("%020g", 12.1234).should == "000000000000012.1234" + @method.call("%020G", 12.1234).should == "000000000000012.1234" + @method.call("%020a", 196).should == "0x000000000001.88p+7" + @method.call("%020A", 196).should == "0X000000000001.88P+7" end it "uses radix-1 when displays negative argument as a two's complement" do - format("%010b", -10).should == "..11110110" - format("%010B", -10).should == "..11110110" - format("%010o", -87).should == "..77777651" - format("%010x", -196).should == "..ffffff3c" - format("%010X", -196).should == "..FFFFFF3C" + @method.call("%010b", -10).should == "..11110110" + @method.call("%010B", -10).should == "..11110110" + @method.call("%010o", -87).should == "..77777651" + @method.call("%010x", -196).should == "..ffffff3c" + @method.call("%010X", -196).should == "..FFFFFF3C" end end end describe "*" do it "uses the previous argument as the field width" do - format("%*b", 10, 10).should == " 1010" - format("%*B", 10, 10).should == " 1010" - format("%*d", 10, 112).should == " 112" - format("%*i", 10, 112).should == " 112" - format("%*o", 10, 87).should == " 127" - format("%*u", 10, 112).should == " 112" - format("%*x", 10, 196).should == " c4" - format("%*X", 10, 196).should == " C4" - - format("%*e", 20, 109.52).should == " 1.095200e+02" - format("%*E", 20, 109.52).should == " 1.095200E+02" - format("%*f", 20, 10.952).should == " 10.952000" - format("%*g", 20, 12.1234).should == " 12.1234" - format("%*G", 20, 12.1234).should == " 12.1234" - format("%*a", 20, 196).should == " 0x1.88p+7" - format("%*A", 20, 196).should == " 0X1.88P+7" - - format("%*c", 10, 97).should == " a" - format("%*p", 10, []).should == " []" - format("%*s", 10, "abc").should == " abc" + @method.call("%*b", 10, 10).should == " 1010" + @method.call("%*B", 10, 10).should == " 1010" + @method.call("%*d", 10, 112).should == " 112" + @method.call("%*i", 10, 112).should == " 112" + @method.call("%*o", 10, 87).should == " 127" + @method.call("%*u", 10, 112).should == " 112" + @method.call("%*x", 10, 196).should == " c4" + @method.call("%*X", 10, 196).should == " C4" + + @method.call("%*e", 20, 109.52).should == " 1.095200e+02" + @method.call("%*E", 20, 109.52).should == " 1.095200E+02" + @method.call("%*f", 20, 10.952).should == " 10.952000" + @method.call("%*g", 20, 12.1234).should == " 12.1234" + @method.call("%*G", 20, 12.1234).should == " 12.1234" + @method.call("%*a", 20, 196).should == " 0x1.88p+7" + @method.call("%*A", 20, 196).should == " 0X1.88P+7" + + @method.call("%*c", 10, 97).should == " a" + @method.call("%*p", 10, []).should == " []" + @method.call("%*s", 10, "abc").should == " abc" end it "left-justifies the result if width is negative" do - format("%*b", -10, 10).should == "1010 " - format("%*B", -10, 10).should == "1010 " - format("%*d", -10, 112).should == "112 " - format("%*i", -10, 112).should == "112 " - format("%*o", -10, 87).should == "127 " - format("%*u", -10, 112).should == "112 " - format("%*x", -10, 196).should == "c4 " - format("%*X", -10, 196).should == "C4 " - - format("%*e", -20, 109.52).should == "1.095200e+02 " - format("%*E", -20, 109.52).should == "1.095200E+02 " - format("%*f", -20, 10.952).should == "10.952000 " - format("%*g", -20, 12.1234).should == "12.1234 " - format("%*G", -20, 12.1234).should == "12.1234 " - format("%*a", -20, 196).should == "0x1.88p+7 " - format("%*A", -20, 196).should == "0X1.88P+7 " - - format("%*c", -10, 97).should == "a " - format("%*p", -10, []).should == "[] " - format("%*s", -10, "abc").should == "abc " + @method.call("%*b", -10, 10).should == "1010 " + @method.call("%*B", -10, 10).should == "1010 " + @method.call("%*d", -10, 112).should == "112 " + @method.call("%*i", -10, 112).should == "112 " + @method.call("%*o", -10, 87).should == "127 " + @method.call("%*u", -10, 112).should == "112 " + @method.call("%*x", -10, 196).should == "c4 " + @method.call("%*X", -10, 196).should == "C4 " + + @method.call("%*e", -20, 109.52).should == "1.095200e+02 " + @method.call("%*E", -20, 109.52).should == "1.095200E+02 " + @method.call("%*f", -20, 10.952).should == "10.952000 " + @method.call("%*g", -20, 12.1234).should == "12.1234 " + @method.call("%*G", -20, 12.1234).should == "12.1234 " + @method.call("%*a", -20, 196).should == "0x1.88p+7 " + @method.call("%*A", -20, 196).should == "0X1.88P+7 " + + @method.call("%*c", -10, 97).should == "a " + @method.call("%*p", -10, []).should == "[] " + @method.call("%*s", -10, "abc").should == "abc " end it "uses the specified argument as the width if * is followed by a number and $" do - format("%1$*2$b", 10, 10).should == " 1010" - format("%1$*2$B", 10, 10).should == " 1010" - format("%1$*2$d", 112, 10).should == " 112" - format("%1$*2$i", 112, 10).should == " 112" - format("%1$*2$o", 87, 10).should == " 127" - format("%1$*2$u", 112, 10).should == " 112" - format("%1$*2$x", 196, 10).should == " c4" - format("%1$*2$X", 196, 10).should == " C4" - - format("%1$*2$e", 109.52, 20).should == " 1.095200e+02" - format("%1$*2$E", 109.52, 20).should == " 1.095200E+02" - format("%1$*2$f", 10.952, 20).should == " 10.952000" - format("%1$*2$g", 12.1234, 20).should == " 12.1234" - format("%1$*2$G", 12.1234, 20).should == " 12.1234" - format("%1$*2$a", 196, 20).should == " 0x1.88p+7" - format("%1$*2$A", 196, 20).should == " 0X1.88P+7" - - format("%1$*2$c", 97, 10).should == " a" - format("%1$*2$p", [], 10).should == " []" - format("%1$*2$s", "abc", 10).should == " abc" + @method.call("%1$*2$b", 10, 10).should == " 1010" + @method.call("%1$*2$B", 10, 10).should == " 1010" + @method.call("%1$*2$d", 112, 10).should == " 112" + @method.call("%1$*2$i", 112, 10).should == " 112" + @method.call("%1$*2$o", 87, 10).should == " 127" + @method.call("%1$*2$u", 112, 10).should == " 112" + @method.call("%1$*2$x", 196, 10).should == " c4" + @method.call("%1$*2$X", 196, 10).should == " C4" + + @method.call("%1$*2$e", 109.52, 20).should == " 1.095200e+02" + @method.call("%1$*2$E", 109.52, 20).should == " 1.095200E+02" + @method.call("%1$*2$f", 10.952, 20).should == " 10.952000" + @method.call("%1$*2$g", 12.1234, 20).should == " 12.1234" + @method.call("%1$*2$G", 12.1234, 20).should == " 12.1234" + @method.call("%1$*2$a", 196, 20).should == " 0x1.88p+7" + @method.call("%1$*2$A", 196, 20).should == " 0X1.88P+7" + + @method.call("%1$*2$c", 97, 10).should == " a" + @method.call("%1$*2$p", [], 10).should == " []" + @method.call("%1$*2$s", "abc", 10).should == " abc" end it "left-justifies the result if specified with $ argument is negative" do - format("%1$*2$b", 10, -10).should == "1010 " - format("%1$*2$B", 10, -10).should == "1010 " - format("%1$*2$d", 112, -10).should == "112 " - format("%1$*2$i", 112, -10).should == "112 " - format("%1$*2$o", 87, -10).should == "127 " - format("%1$*2$u", 112, -10).should == "112 " - format("%1$*2$x", 196, -10).should == "c4 " - format("%1$*2$X", 196, -10).should == "C4 " - - format("%1$*2$e", 109.52, -20).should == "1.095200e+02 " - format("%1$*2$E", 109.52, -20).should == "1.095200E+02 " - format("%1$*2$f", 10.952, -20).should == "10.952000 " - format("%1$*2$g", 12.1234, -20).should == "12.1234 " - format("%1$*2$G", 12.1234, -20).should == "12.1234 " - format("%1$*2$a", 196, -20).should == "0x1.88p+7 " - format("%1$*2$A", 196, -20).should == "0X1.88P+7 " - - format("%1$*2$c", 97, -10).should == "a " - format("%1$*2$p", [], -10).should == "[] " - format("%1$*2$s", "abc", -10).should == "abc " + @method.call("%1$*2$b", 10, -10).should == "1010 " + @method.call("%1$*2$B", 10, -10).should == "1010 " + @method.call("%1$*2$d", 112, -10).should == "112 " + @method.call("%1$*2$i", 112, -10).should == "112 " + @method.call("%1$*2$o", 87, -10).should == "127 " + @method.call("%1$*2$u", 112, -10).should == "112 " + @method.call("%1$*2$x", 196, -10).should == "c4 " + @method.call("%1$*2$X", 196, -10).should == "C4 " + + @method.call("%1$*2$e", 109.52, -20).should == "1.095200e+02 " + @method.call("%1$*2$E", 109.52, -20).should == "1.095200E+02 " + @method.call("%1$*2$f", 10.952, -20).should == "10.952000 " + @method.call("%1$*2$g", 12.1234, -20).should == "12.1234 " + @method.call("%1$*2$G", 12.1234, -20).should == "12.1234 " + @method.call("%1$*2$a", 196, -20).should == "0x1.88p+7 " + @method.call("%1$*2$A", 196, -20).should == "0X1.88P+7 " + + @method.call("%1$*2$c", 97, -10).should == "a " + @method.call("%1$*2$p", [], -10).should == "[] " + @method.call("%1$*2$s", "abc", -10).should == "abc " end it "raises ArgumentError when is mixed with width" do -> { - format("%*10d", 10, 112) + @method.call("%*10d", 10, 112) }.should raise_error(ArgumentError) end end @@ -731,74 +725,74 @@ def obj.to_str describe "width" do it "specifies the minimum number of characters that will be written to the result" do - format("%10b", 10).should == " 1010" - format("%10B", 10).should == " 1010" - format("%10d", 112).should == " 112" - format("%10i", 112).should == " 112" - format("%10o", 87).should == " 127" - format("%10u", 112).should == " 112" - format("%10x", 196).should == " c4" - format("%10X", 196).should == " C4" - - format("%20e", 109.52).should == " 1.095200e+02" - format("%20E", 109.52).should == " 1.095200E+02" - format("%20f", 10.952).should == " 10.952000" - format("%20g", 12.1234).should == " 12.1234" - format("%20G", 12.1234).should == " 12.1234" - format("%20a", 196).should == " 0x1.88p+7" - format("%20A", 196).should == " 0X1.88P+7" - - format("%10c", 97).should == " a" - format("%10p", []).should == " []" - format("%10s", "abc").should == " abc" + @method.call("%10b", 10).should == " 1010" + @method.call("%10B", 10).should == " 1010" + @method.call("%10d", 112).should == " 112" + @method.call("%10i", 112).should == " 112" + @method.call("%10o", 87).should == " 127" + @method.call("%10u", 112).should == " 112" + @method.call("%10x", 196).should == " c4" + @method.call("%10X", 196).should == " C4" + + @method.call("%20e", 109.52).should == " 1.095200e+02" + @method.call("%20E", 109.52).should == " 1.095200E+02" + @method.call("%20f", 10.952).should == " 10.952000" + @method.call("%20g", 12.1234).should == " 12.1234" + @method.call("%20G", 12.1234).should == " 12.1234" + @method.call("%20a", 196).should == " 0x1.88p+7" + @method.call("%20A", 196).should == " 0X1.88P+7" + + @method.call("%10c", 97).should == " a" + @method.call("%10p", []).should == " []" + @method.call("%10s", "abc").should == " abc" end it "is ignored if argument's actual length is greater" do - format("%5d", 1234567890).should == "1234567890" + @method.call("%5d", 1234567890).should == "1234567890" end end describe "precision" do context "integer types" do it "controls the number of decimal places displayed" do - format("%.6b", 10).should == "001010" - format("%.6B", 10).should == "001010" - format("%.5d", 112).should == "00112" - format("%.5i", 112).should == "00112" - format("%.5o", 87).should == "00127" - format("%.5u", 112).should == "00112" + @method.call("%.6b", 10).should == "001010" + @method.call("%.6B", 10).should == "001010" + @method.call("%.5d", 112).should == "00112" + @method.call("%.5i", 112).should == "00112" + @method.call("%.5o", 87).should == "00127" + @method.call("%.5u", 112).should == "00112" - format("%.5x", 196).should == "000c4" - format("%.5X", 196).should == "000C4" + @method.call("%.5x", 196).should == "000c4" + @method.call("%.5X", 196).should == "000C4" end end context "float types" do it "controls the number of decimal places displayed in fraction part" do - format("%.10e", 109.52).should == "1.0952000000e+02" - format("%.10E", 109.52).should == "1.0952000000E+02" - format("%.10f", 10.952).should == "10.9520000000" - format("%.10a", 196).should == "0x1.8800000000p+7" - format("%.10A", 196).should == "0X1.8800000000P+7" + @method.call("%.10e", 109.52).should == "1.0952000000e+02" + @method.call("%.10E", 109.52).should == "1.0952000000E+02" + @method.call("%.10f", 10.952).should == "10.9520000000" + @method.call("%.10a", 196).should == "0x1.8800000000p+7" + @method.call("%.10A", 196).should == "0X1.8800000000P+7" end it "does not affect G format" do - format("%.10g", 12.1234).should == "12.1234" - format("%.10g", 123456789).should == "123456789" + @method.call("%.10g", 12.1234).should == "12.1234" + @method.call("%.10g", 123456789).should == "123456789" end end context "string formats" do it "determines the maximum number of characters to be copied from the string" do - format("%.1p", [1]).should == "[" - format("%.2p", [1]).should == "[1" - format("%.10p", [1]).should == "[1]" - format("%.0p", [1]).should == "" + @method.call("%.1p", [1]).should == "[" + @method.call("%.2p", [1]).should == "[1" + @method.call("%.10p", [1]).should == "[1]" + @method.call("%.0p", [1]).should == "" - format("%.1s", "abc").should == "a" - format("%.2s", "abc").should == "ab" - format("%.10s", "abc").should == "abc" - format("%.0s", "abc").should == "" + @method.call("%.1s", "abc").should == "a" + @method.call("%.2s", "abc").should == "ab" + @method.call("%.10s", "abc").should == "abc" + @method.call("%.0s", "abc").should == "" end end end @@ -806,49 +800,49 @@ def obj.to_str describe "reference by name" do describe "%s style" do it "uses value passed in a hash argument" do - format("%d", foo: 123).should == "123" + @method.call("%d", foo: 123).should == "123" end it "supports flags, width, precision and type" do - format("%+20.10f", foo: 10.952).should == " +10.9520000000" + @method.call("%+20.10f", foo: 10.952).should == " +10.9520000000" end it "allows to place name in any position" do - format("%+15.5f", foo: 10.952).should == " +10.95200" - format("%+15.5f", foo: 10.952).should == " +10.95200" - format("%+15.5f", foo: 10.952).should == " +10.95200" - format("%+15.5f", foo: 10.952).should == " +10.95200" + @method.call("%+15.5f", foo: 10.952).should == " +10.95200" + @method.call("%+15.5f", foo: 10.952).should == " +10.95200" + @method.call("%+15.5f", foo: 10.952).should == " +10.95200" + @method.call("%+15.5f", foo: 10.952).should == " +10.95200" end it "cannot be mixed with unnamed style" do -> { - format("%d %d", 1, foo: "123") + @method.call("%d %d", 1, foo: "123") }.should raise_error(ArgumentError) end end describe "%{name} style" do it "uses value passed in a hash argument" do - format("%{foo}", foo: 123).should == "123" + @method.call("%{foo}", foo: 123).should == "123" end it "does not support type style" do - format("%{foo}d", foo: 123).should == "123d" + @method.call("%{foo}d", foo: 123).should == "123d" end it "supports flags, width and precision" do - format("%-20.5{foo}", foo: "123456789").should == "12345 " + @method.call("%-20.5{foo}", foo: "123456789").should == "12345 " end it "cannot be mixed with unnamed style" do -> { - format("%d %{foo}", 1, foo: "123") + @method.call("%d %{foo}", 1, foo: "123") }.should raise_error(ArgumentError) end it "raises KeyError when there is no matching key" do -> { - format("%{foo}", {}) + @method.call("%{foo}", {}) }.should raise_error(KeyError) end @@ -860,18 +854,38 @@ def obj.to_str; end obj.should_receive(:to_s).and_return("42") obj.should_not_receive(:to_str) - format("%{foo}", foo: obj).should == "42" + @method.call("%{foo}", foo: obj).should == "42" end end end describe "faulty key" do - before :all do - @base_method = @method + before :each do + @object = { foooo: 1 } + end + + it "raises a KeyError" do + -> { + @method.call("%s", @object) + }.should raise_error(KeyError) end - it_behaves_like :key_error, -> obj, key { - @base_method.call("%<#{key}>s", obj) - }, { foooo: 1 } + ruby_version_is "2.5" do + it "sets the Hash as the receiver of KeyError" do + -> { + @method.call("%s", @object) + }.should raise_error(KeyError) { |err| + err.receiver.should equal(@object) + } + end + + it "sets the unmatched key as the key of KeyError" do + -> { + @method.call("%s", @object) + }.should raise_error(KeyError) { |err| + err.key.to_s.should == 'foo' + } + end + end end end diff --git a/spec/ruby/core/kernel/shared/sprintf_encoding.rb b/spec/ruby/core/kernel/shared/sprintf_encoding.rb index c3d62bf3bb3e20..5ca66b9083bea3 100644 --- a/spec/ruby/core/kernel/shared/sprintf_encoding.rb +++ b/spec/ruby/core/kernel/shared/sprintf_encoding.rb @@ -1,11 +1,19 @@ describe :kernel_sprintf_encoding, shared: true do - def format(*args) - @method.call(*args) + it "can produce a string with valid encoding" do + string = @method.call("good day %{valid}", valid: "e") + string.encoding.should == Encoding::UTF_8 + string.valid_encoding?.should be_true + end + + it "can produce a string with invalid encoding" do + string = @method.call("good day %{invalid}", invalid: "\x80") + string.encoding.should == Encoding::UTF_8 + string.valid_encoding?.should be_false end it "returns a String in the same encoding as the format String if compatible" do string = "%s".force_encoding(Encoding::KOI8_U) - result = format(string, "dogs") + result = @method.call(string, "dogs") result.encoding.should equal(Encoding::KOI8_U) end @@ -13,7 +21,7 @@ def format(*args) string = "foo %s".force_encoding(Encoding::US_ASCII) argument = "b\303\274r".force_encoding(Encoding::UTF_8) - result = format(string, argument) + result = @method.call(string, argument) result.encoding.should equal(Encoding::UTF_8) end @@ -22,7 +30,7 @@ def format(*args) argument = "Ђ".encode('windows-1251') -> { - format(string, argument) + @method.call(string, argument) }.should raise_error(Encoding::CompatibilityError) end end diff --git a/spec/ruby/core/proc/compose_spec.rb b/spec/ruby/core/proc/compose_spec.rb index 35e949a779b051..cc7d70a182ddde 100644 --- a/spec/ruby/core/proc/compose_spec.rb +++ b/spec/ruby/core/proc/compose_spec.rb @@ -38,6 +38,22 @@ def double.call(n); n * 2; end (f << g).lambda?.should == false end + it "is a Proc when other is lambda" do + f = proc { |x| x * x } + g = -> x { x + x } + + (f << g).is_a?(Proc).should == true + (f << g).lambda?.should == false + end + + it "is a lambda when self is lambda" do + f = -> x { x * x } + g = proc { |x| x + x } + + (f << g).is_a?(Proc).should == true + (f << g).lambda?.should == true + end + it "may accept multiple arguments" do inc = proc { |n| n + 1 } mul = proc { |n, m| n * m } @@ -91,6 +107,22 @@ def double.call(n); n * 2; end (f >> g).lambda?.should == false end + it "is a Proc when other is lambda" do + f = proc { |x| x * x } + g = -> x { x + x } + + (f >> g).is_a?(Proc).should == true + (f >> g).lambda?.should == false + end + + it "is a lambda when self is lambda" do + f = -> x { x * x } + g = proc { |x| x + x } + + (f >> g).is_a?(Proc).should == true + (f >> g).lambda?.should == true + end + it "may accept multiple arguments" do inc = proc { |n| n + 1 } mul = proc { |n, m| n * m } diff --git a/spec/ruby/core/string/inspect_spec.rb b/spec/ruby/core/string/inspect_spec.rb index 8ddbae132a23e5..e63d89ead5e647 100644 --- a/spec/ruby/core/string/inspect_spec.rb +++ b/spec/ruby/core/string/inspect_spec.rb @@ -319,6 +319,10 @@ 0.chr.inspect.should == '"\\x00"' end + it "uses \\x notation for broken UTF-8 sequences" do + "\xF0\x9F".inspect.should == '"\\xF0\\x9F"' + end + describe "when default external is UTF-8" do before :each do @extenc, Encoding.default_external = Encoding.default_external, Encoding::UTF_8 diff --git a/spec/ruby/core/string/modulo_spec.rb b/spec/ruby/core/string/modulo_spec.rb index a16112bf44d76f..35ee0b16f552da 100644 --- a/spec/ruby/core/string/modulo_spec.rb +++ b/spec/ruby/core/string/modulo_spec.rb @@ -1,7 +1,21 @@ require_relative '../../spec_helper' +require_relative '../kernel/shared/sprintf' +require_relative '../kernel/shared/sprintf_encoding' require_relative 'fixtures/classes' require_relative '../../shared/hash/key_error' +describe "String#%" do + it_behaves_like :kernel_sprintf, -> format, *args { + format % args + } + + it_behaves_like :kernel_sprintf_encoding, -> format, *args { + format % args + } +end + +# TODO: these specs are mostly redundant with kernel/shared/sprintf.rb specs. +# These specs should be moved there and deduplicated. describe "String#%" do context "when key is missing from passed-in hash" do it_behaves_like :key_error, -> obj, key { "%{#{key}}" % obj }, { a: 5 } diff --git a/spec/ruby/core/string/percent_spec.rb b/spec/ruby/core/string/percent_spec.rb deleted file mode 100644 index e3460522b194b8..00000000000000 --- a/spec/ruby/core/string/percent_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require_relative '../../spec_helper' -require_relative '../kernel/shared/sprintf' -require_relative '../kernel/shared/sprintf_encoding' - -describe "String#%" do - it_behaves_like :kernel_sprintf, -> format, *args { - format % args - } - - it_behaves_like :kernel_sprintf_encoding, -> format, *args { - format % args - } -end diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb index 60e33d7cb833e7..a58187de2ef7f8 100644 --- a/spec/ruby/core/symbol/to_proc_spec.rb +++ b/spec/ruby/core/symbol/to_proc_spec.rb @@ -38,4 +38,9 @@ def to_proc end klass.new.to_proc.should == :value end + + it "produces a proc with source location nil" do + pr = :to_s.to_proc + pr.source_location.should == nil + end end diff --git a/spec/ruby/core/thread/shared/to_s.rb b/spec/ruby/core/thread/shared/to_s.rb index e47426cf3facfa..45c04af6276ea1 100644 --- a/spec/ruby/core/thread/shared/to_s.rb +++ b/spec/ruby/core/thread/shared/to_s.rb @@ -4,11 +4,13 @@ sep = ruby_version_is("2.7") ? " " : "@" it "returns a description including file and line number" do - Thread.new { "hello" }.send(@method).should =~ /^#$/ + thread, line = Thread.new { "hello" }, __LINE__ + thread.join + thread.send(@method).should =~ /^#$/ end it "has a binary encoding" do - Thread.new { "hello" }.send(@method).encoding.should == Encoding::BINARY + ThreadSpecs.status_of_current_thread.send(@method).encoding.should == Encoding::BINARY end it "can check it's own status" do diff --git a/spec/ruby/language/END_spec.rb b/spec/ruby/language/END_spec.rb new file mode 100644 index 00000000000000..762a8db0c0192e --- /dev/null +++ b/spec/ruby/language/END_spec.rb @@ -0,0 +1,15 @@ +require_relative '../spec_helper' + +describe "The END keyword" do + it "runs only once for multiple calls" do + ruby_exe("10.times { END { puts 'foo' }; } ").should == "foo\n" + end + + it "runs last in a given code unit" do + ruby_exe("END { puts 'bar' }; puts'foo'; ").should == "foo\nbar\n" + end + + it "runs multiple ends in LIFO order" do + ruby_exe("END { puts 'foo' }; END { puts 'bar' }").should == "bar\nfoo\n" + end +end diff --git a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb index 179bde1aed450c..0c07e46f590713 100644 --- a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb +++ b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb @@ -46,6 +46,12 @@ BigDecimal(" \t\n \r-Infinity \n").infinite?.should == -1 end + it "coerces the value argument with #to_str" do + initial = mock("value") + initial.should_receive(:to_str).and_return("123") + BigDecimal(initial).should == BigDecimal("123") + end + ruby_version_is ""..."2.6" do it "ignores trailing garbage" do BigDecimal("123E45ruby").should == BigDecimal("123E45") diff --git a/spec/ruby/library/bigdecimal/to_s_spec.rb b/spec/ruby/library/bigdecimal/to_s_spec.rb index b6154c680dcb77..7f741ca8b620a4 100644 --- a/spec/ruby/library/bigdecimal/to_s_spec.rb +++ b/spec/ruby/library/bigdecimal/to_s_spec.rb @@ -41,6 +41,7 @@ str1 = '-123.45678 90123 45678 9' BigDecimal("-123.45678901234567890").to_s('5F').should == str1 + BigDecimal('1000010').to_s('5F').should == "10000 10.0" # trailing zeroes removed BigDecimal("1.00000000000").to_s('1F').should == "1.0" # 0 is treated as no spaces diff --git a/spec/ruby/library/conditionvariable/wait_spec.rb b/spec/ruby/library/conditionvariable/wait_spec.rb index f57ab4c7789544..59d708d7e68187 100644 --- a/spec/ruby/library/conditionvariable/wait_spec.rb +++ b/spec/ruby/library/conditionvariable/wait_spec.rb @@ -32,6 +32,50 @@ th.join end + it "can be interrupted by Thread#run" do + m = Mutex.new + cv = ConditionVariable.new + in_synchronize = false + + th = Thread.new do + m.synchronize do + in_synchronize = true + cv.wait(m) + end + :success + end + + # wait for m to acquire the mutex + Thread.pass until in_synchronize + # wait until th is sleeping (ie waiting) + Thread.pass while th.status and th.status != "sleep" + + th.run + th.value.should == :success + end + + it "can be interrupted by Thread#wakeup" do + m = Mutex.new + cv = ConditionVariable.new + in_synchronize = false + + th = Thread.new do + m.synchronize do + in_synchronize = true + cv.wait(m) + end + :success + end + + # wait for m to acquire the mutex + Thread.pass until in_synchronize + # wait until th is sleeping (ie waiting) + Thread.pass while th.status and th.status != "sleep" + + th.wakeup + th.value.should == :success + end + it "reacquires the lock even if the thread is killed" do m = Mutex.new cv = ConditionVariable.new diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb index 003edc9669d1c3..857e421ddb4854 100644 --- a/spec/ruby/optional/capi/encoding_spec.rb +++ b/spec/ruby/optional/capi/encoding_spec.rb @@ -479,4 +479,14 @@ length.should == 4 end end + + describe "rb_enc_str_asciionly_p" do + it "returns true for an ASCII string" do + @s.rb_enc_str_asciionly_p("hello").should be_true + end + + it "returns false for a non-ASCII string" do + @s.rb_enc_str_asciionly_p("hüllo").should be_false + end + end end diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c index 3cde8842256c1e..52ed4fdb2eb5b1 100644 --- a/spec/ruby/optional/capi/ext/encoding_spec.c +++ b/spec/ruby/optional/capi/ext/encoding_spec.c @@ -196,6 +196,14 @@ static VALUE encoding_spec_rb_enc_codepoint_len(VALUE self, VALUE str) { return rb_ary_new3(2, LONG2NUM(codepoint), LONG2NUM(len)); } +static VALUE encoding_spec_rb_enc_str_asciionly_p(VALUE self, VALUE str) { + if (rb_enc_str_asciionly_p(str)) { + return Qtrue; + } else { + return Qfalse; + } +} + void Init_encoding_spec(void) { VALUE cls = rb_define_class("CApiEncodingSpecs", rb_cObject); rb_define_method(cls, "ENC_CODERANGE_ASCIIONLY", @@ -242,6 +250,7 @@ void Init_encoding_spec(void) { rb_define_method(cls, "rb_to_encoding_index", encoding_spec_rb_to_encoding_index, 1); rb_define_method(cls, "rb_enc_nth", encoding_spec_rb_enc_nth, 2); rb_define_method(cls, "rb_enc_codepoint_len", encoding_spec_rb_enc_codepoint_len, 1); + rb_define_method(cls, "rb_enc_str_asciionly_p", encoding_spec_rb_enc_str_asciionly_p, 1); } #ifdef __cplusplus diff --git a/spec/ruby/optional/capi/ext/gc_spec.c b/spec/ruby/optional/capi/ext/gc_spec.c index 57b1f11faabcaa..983b021df9fb00 100644 --- a/spec/ruby/optional/capi/ext/gc_spec.c +++ b/spec/ruby/optional/capi/ext/gc_spec.c @@ -34,6 +34,11 @@ static VALUE gc_spec_rb_gc_adjust_memory_usage(VALUE self, VALUE diff) { return Qnil; } +static VALUE gc_spec_rb_gc_register_mark_object(VALUE self, VALUE obj) { + rb_gc_register_mark_object(obj); + return Qnil; +} + void Init_gc_spec(void) { VALUE cls = rb_define_class("CApiGCSpecs", rb_cObject); registered_tagged_value = INT2NUM(10); @@ -48,6 +53,7 @@ void Init_gc_spec(void) { rb_define_method(cls, "rb_gc_disable", gc_spec_rb_gc_disable, 0); rb_define_method(cls, "rb_gc", gc_spec_rb_gc, 0); rb_define_method(cls, "rb_gc_adjust_memory_usage", gc_spec_rb_gc_adjust_memory_usage, 1); + rb_define_method(cls, "rb_gc_register_mark_object", gc_spec_rb_gc_register_mark_object, 1); } #ifdef __cplusplus diff --git a/spec/ruby/optional/capi/ext/hash_spec.c b/spec/ruby/optional/capi/ext/hash_spec.c index c8735cec2c429b..36a07d74f6c942 100644 --- a/spec/ruby/optional/capi/ext/hash_spec.c +++ b/spec/ruby/optional/capi/ext/hash_spec.c @@ -113,6 +113,15 @@ VALUE hash_spec_rb_hash_set_ifnone(VALUE self, VALUE hash, VALUE def) { return rb_hash_set_ifnone(hash, def); } +VALUE hash_spec_compute_a_hash_code(VALUE self, VALUE seed) { + int int_seed = FIX2INT(seed); + st_index_t h = rb_hash_start(int_seed); + h = rb_hash_uint32(h, 540u); + h = rb_hash_uint32(h, 340u); + h = rb_hash_end(h); + return ULONG2NUM(h); +} + void Init_hash_spec(void) { VALUE cls = rb_define_class("CApiHashSpecs", rb_cObject); rb_define_method(cls, "rb_hash", hash_spec_rb_hash, 1); @@ -136,6 +145,7 @@ void Init_hash_spec(void) { rb_define_method(cls, "rb_hash_new", hash_spec_rb_hash_new, 0); rb_define_method(cls, "rb_hash_size", hash_spec_rb_hash_size, 1); rb_define_method(cls, "rb_hash_set_ifnone", hash_spec_rb_hash_set_ifnone, 2); + rb_define_method(cls, "compute_a_hash_code", hash_spec_compute_a_hash_code, 1); } #ifdef __cplusplus diff --git a/spec/ruby/optional/capi/ext/io_spec.c b/spec/ruby/optional/capi/ext/io_spec.c index b656de081a0eed..45f57810dbe117 100644 --- a/spec/ruby/optional/capi/ext/io_spec.c +++ b/spec/ruby/optional/capi/ext/io_spec.c @@ -201,6 +201,19 @@ VALUE io_spec_rb_io_close(VALUE self, VALUE io) { return rb_io_close(io); } +VALUE io_spec_rb_io_set_nonblock(VALUE self, VALUE io) { + rb_io_t* fp; + int flags; + GetOpenFile(io, fp); + rb_io_set_nonblock(fp); +#ifdef F_GETFL + flags = fcntl(fp->fd, F_GETFL, 0); + return flags & O_NONBLOCK ? Qtrue : Qfalse; +#else + return Qfalse; +#endif +} + /* * this is needed to ensure rb_io_wait_*able functions behave * predictably because errno may be set to unexpected values @@ -225,6 +238,7 @@ void Init_io_spec(void) { rb_define_method(cls, "rb_io_check_readable", io_spec_rb_io_check_readable, 1); rb_define_method(cls, "rb_io_check_writable", io_spec_rb_io_check_writable, 1); rb_define_method(cls, "rb_io_check_closed", io_spec_rb_io_check_closed, 1); + rb_define_method(cls, "rb_io_set_nonblock", io_spec_rb_io_set_nonblock, 1); rb_define_method(cls, "rb_io_taint_check", io_spec_rb_io_taint_check, 1); rb_define_method(cls, "rb_io_wait_readable", io_spec_rb_io_wait_readable, 2); rb_define_method(cls, "rb_io_wait_writable", io_spec_rb_io_wait_writable, 1); diff --git a/spec/ruby/optional/capi/ext/symbol_spec.c b/spec/ruby/optional/capi/ext/symbol_spec.c index 28da69ea3c3a9f..27732ae58f0b64 100644 --- a/spec/ruby/optional/capi/ext/symbol_spec.c +++ b/spec/ruby/optional/capi/ext/symbol_spec.c @@ -51,6 +51,10 @@ VALUE symbol_spec_rb_intern_str(VALUE self, VALUE str) { return ID2SYM(rb_intern_str(str)); } +VALUE symbol_spec_rb_check_symbol_cstr(VALUE self, VALUE str) { + return rb_check_symbol_cstr(RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str)); +} + VALUE symbol_spec_rb_is_class_id(VALUE self, VALUE sym) { return rb_is_class_id(SYM2ID(sym)) ? Qtrue : Qfalse; } @@ -79,6 +83,7 @@ void Init_symbol_spec(void) { rb_define_method(cls, "rb_id2name", symbol_spec_rb_id2name, 1); rb_define_method(cls, "rb_id2str", symbol_spec_rb_id2str, 1); rb_define_method(cls, "rb_intern_str", symbol_spec_rb_intern_str, 1); + rb_define_method(cls, "rb_check_symbol_cstr", symbol_spec_rb_check_symbol_cstr, 1); rb_define_method(cls, "rb_is_class_id", symbol_spec_rb_is_class_id, 1); rb_define_method(cls, "rb_is_const_id", symbol_spec_rb_is_const_id, 1); rb_define_method(cls, "rb_is_instance_id", symbol_spec_rb_is_instance_id, 1); diff --git a/spec/ruby/optional/capi/gc_spec.rb b/spec/ruby/optional/capi/gc_spec.rb index 46c03156e4873f..528dd291ba4424 100644 --- a/spec/ruby/optional/capi/gc_spec.rb +++ b/spec/ruby/optional/capi/gc_spec.rb @@ -58,4 +58,10 @@ }.should_not raise_error end end + + describe "rb_gc_register_mark_object" do + it "can be called with an object" do + @f.rb_gc_register_mark_object(Object.new).should be_nil + end + end end diff --git a/spec/ruby/optional/capi/hash_spec.rb b/spec/ruby/optional/capi/hash_spec.rb index 2923faf7de535e..90d9c534563c69 100644 --- a/spec/ruby/optional/capi/hash_spec.rb +++ b/spec/ruby/optional/capi/hash_spec.rb @@ -254,4 +254,13 @@ def h.to_hash; 42; end -> { @s.rb_Hash(h) }.should raise_error(TypeError) end end + + describe "hash code functions" do + it "computes a deterministic number" do + hash_code = @s.compute_a_hash_code(53) + hash_code.should be_an_instance_of(Integer) + hash_code.should == @s.compute_a_hash_code(53) + @s.compute_a_hash_code(90) == @s.compute_a_hash_code(90) + end + end end diff --git a/spec/ruby/optional/capi/io_spec.rb b/spec/ruby/optional/capi/io_spec.rb index 4d61fc87557bee..c3c1189a43efbf 100644 --- a/spec/ruby/optional/capi/io_spec.rb +++ b/spec/ruby/optional/capi/io_spec.rb @@ -151,6 +151,16 @@ end end + describe "rb_io_set_nonblock" do + platform_is_not :windows do + it "returns true when nonblock flag is set" do + require 'io/nonblock' + @o.rb_io_set_nonblock(@io) + @io.nonblock?.should be_true + end + end + end + # NOTE: unlike the name might suggest in MRI this function checks if an # object is frozen, *not* if it's tainted. describe "rb_io_taint_check" do diff --git a/spec/ruby/optional/capi/symbol_spec.rb b/spec/ruby/optional/capi/symbol_spec.rb index ddc748c8d8caa1..7f345f879f0a72 100644 --- a/spec/ruby/optional/capi/symbol_spec.rb +++ b/spec/ruby/optional/capi/symbol_spec.rb @@ -71,6 +71,19 @@ end end + describe "rb_check_symbol_cstr" do + it "returns a Symbol if a Symbol already exists for the given C string" do + sym = :test_symbol + @s.rb_check_symbol_cstr('test_symbol').should == sym + end + + it "returns nil if the Symbol does not exist yet and does not create it" do + str = "symbol_does_not_exist_#{Object.new.object_id}_#{rand}" + @s.rb_check_symbol_cstr(str).should == nil # does not create the Symbol + @s.rb_check_symbol_cstr(str).should == nil + end + end + describe "rb_is_const_id" do it "returns true given a const-like symbol" do @s.rb_is_const_id(:Foo).should == true From fe3d9d2832cd34cfbc618472bf2e3f0c1979a0a4 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 28 Dec 2019 00:47:26 +0900 Subject: [PATCH 215/878] * 2019-12-28 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 0a465526bdd42d..4b79c39b2f1c9c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" From 74fdc1e60fb8ba03f5cdb09866c75bbe5dbce936 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 27 Dec 2019 17:36:04 +0100 Subject: [PATCH 216/878] Update to ruby/mspec@673fcab --- spec/mspec/lib/mspec/expectations/should.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spec/mspec/lib/mspec/expectations/should.rb b/spec/mspec/lib/mspec/expectations/should.rb index 231ad15c2124f0..ca0617484cfec7 100644 --- a/spec/mspec/lib/mspec/expectations/should.rb +++ b/spec/mspec/lib/mspec/expectations/should.rb @@ -3,7 +3,10 @@ class Object def should(matcher = NO_MATCHER_GIVEN) MSpec.expectation - MSpec.actions :expectation, MSpec.current.state + state = MSpec.current.state + raise "should outside example" unless state + MSpec.actions :expectation, state + if NO_MATCHER_GIVEN.equal?(matcher) SpecPositiveOperatorMatcher.new(self) else @@ -16,7 +19,10 @@ def should(matcher = NO_MATCHER_GIVEN) def should_not(matcher = NO_MATCHER_GIVEN) MSpec.expectation - MSpec.actions :expectation, MSpec.current.state + state = MSpec.current.state + raise "should_not outside example" unless state + MSpec.actions :expectation, state + if NO_MATCHER_GIVEN.equal?(matcher) SpecNegativeOperatorMatcher.new(self) else From c74d30e7950f18fd9fadcfa404790e8fb0e891fd Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 27 Dec 2019 17:36:07 +0100 Subject: [PATCH 217/878] Update to ruby/spec@7241f39 --- .../invalid_byte_sequence_error/incomplete_input_spec.rb | 1 - spec/ruby/core/exception/exit_value_spec.rb | 9 ++++++--- spec/ruby/core/exception/incomplete_input_spec.rb | 7 ------- spec/ruby/core/exception/reason_spec.rb | 9 ++++++--- spec/ruby/core/process/wait_spec.rb | 3 +-- 5 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 spec/ruby/core/exception/incomplete_input_spec.rb diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb index e3ef3e45570c03..94201a9b153470 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb @@ -2,7 +2,6 @@ require_relative '../../../spec_helper' describe "Encoding::InvalidByteSequenceError#incomplete_input?" do - it "returns nil by default" do Encoding::InvalidByteSequenceError.new.incomplete_input?.should be_nil end diff --git a/spec/ruby/core/exception/exit_value_spec.rb b/spec/ruby/core/exception/exit_value_spec.rb index 8bb3cf898db7bc..99987dd1bcb5c0 100644 --- a/spec/ruby/core/exception/exit_value_spec.rb +++ b/spec/ruby/core/exception/exit_value_spec.rb @@ -4,7 +4,10 @@ def get_me_a_return Proc.new { return 42 } end - -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| - e.exit_value.should == 42 - } + + it "returns the value given to return" do + -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| + e.exit_value.should == 42 + } + end end diff --git a/spec/ruby/core/exception/incomplete_input_spec.rb b/spec/ruby/core/exception/incomplete_input_spec.rb deleted file mode 100644 index 930a3f01d5223a..00000000000000 --- a/spec/ruby/core/exception/incomplete_input_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::InvalidByteSequenceError#incomplete_input?" do - -> {"abc\xa4def".encode("ISO-8859-1", "EUC-JP") }.should raise_error(Encoding::InvalidByteSequenceError) { |e| - e.incomplete_input?.should == false - } -end diff --git a/spec/ruby/core/exception/reason_spec.rb b/spec/ruby/core/exception/reason_spec.rb index b28cbde8d93b7f..210bbc9725e675 100644 --- a/spec/ruby/core/exception/reason_spec.rb +++ b/spec/ruby/core/exception/reason_spec.rb @@ -4,7 +4,10 @@ def get_me_a_return Proc.new { return 42 } end - -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| - e.reason.should == :return - } + + it "returns 'return' for a return" do + -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e| + e.reason.should == :return + } + end end diff --git a/spec/ruby/core/process/wait_spec.rb b/spec/ruby/core/process/wait_spec.rb index f393a99e0fd474..44c95d630479d5 100644 --- a/spec/ruby/core/process/wait_spec.rb +++ b/spec/ruby/core/process/wait_spec.rb @@ -7,9 +7,8 @@ before :all do begin leaked = Process.waitall - puts "leaked before wait specs: #{leaked}" unless leaked.empty? # Ruby-space should not see PIDs used by mjit - leaked.should be_empty + raise "subprocesses leaked before wait specs: #{leaked}" unless leaked.empty? rescue NotImplementedError end end From f05416c91f4656db652ad9e63c5aa049dd5c0936 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 27 Dec 2019 15:01:01 -0800 Subject: [PATCH 218/878] Fix coroutine copy implementation on OpenBSD OpenBSD is the only platform that uses this support by default, and it did not work because while OpenBSD supports alloca, it does not include alloca.h. This should be backported to Ruby 2.7. From George Koehler --- coroutine/copy/Context.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coroutine/copy/Context.h b/coroutine/copy/Context.h index 1319f55d1641e5..5e5d9e037a88c8 100644 --- a/coroutine/copy/Context.h +++ b/coroutine/copy/Context.h @@ -12,7 +12,11 @@ #include #include #include + +/* OpenBSD supports alloca, but does not include alloca.h */ +#ifndef __OpenBSD__ #include +#endif #define COROUTINE __attribute__((noreturn)) void From f96216df8dfd2d1e206150572912289f4dda7386 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Sat, 28 Dec 2019 12:41:47 +1300 Subject: [PATCH 219/878] Remove "All Rights Reserved." from Copyright statement. --- coroutine/amd64/Context.S | 2 +- coroutine/amd64/Context.h | 2 +- coroutine/arm32/Context.S | 2 +- coroutine/arm32/Context.h | 2 +- coroutine/arm64/Context.S | 2 +- coroutine/arm64/Context.h | 2 +- coroutine/copy/Context.c | 2 +- coroutine/copy/Context.h | 2 +- coroutine/ucontext/Context.c | 2 +- coroutine/win32/Context.asm | 2 +- coroutine/win64/Context.S | 2 +- coroutine/win64/Context.asm | 2 +- coroutine/x86/Context.S | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S index ac986b2aa5641e..051db1c5e84c63 100644 --- a/coroutine/amd64/Context.S +++ b/coroutine/amd64/Context.S @@ -2,7 +2,7 @@ ## This file is part of the "Coroutine" project and released under the MIT License. ## ## Created by Samuel Williams on 10/5/2018. -## Copyright, 2018, by Samuel Williams. All rights reserved. +## Copyright, 2018, by Samuel Williams. ## #define TOKEN_PASTE(x,y) x##y diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h index 441c4491c19438..581525b67e8f1d 100644 --- a/coroutine/amd64/Context.h +++ b/coroutine/amd64/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 10/5/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once diff --git a/coroutine/arm32/Context.S b/coroutine/arm32/Context.S index 4308e1d1d2edd3..195364fb655f9b 100644 --- a/coroutine/arm32/Context.S +++ b/coroutine/arm32/Context.S @@ -2,7 +2,7 @@ ## This file is part of the "Coroutine" project and released under the MIT License. ## ## Created by Samuel Williams on 10/5/2018. -## Copyright, 2018, by Samuel Williams. All rights reserved. +## Copyright, 2018, by Samuel Williams. ## .text diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h index 8bba8f6376cf2f..e69f4b2eebc8f2 100644 --- a/coroutine/arm32/Context.h +++ b/coroutine/arm32/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 10/5/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S index f6e5f0a6bc83e5..7d282626ab23b3 100644 --- a/coroutine/arm64/Context.S +++ b/coroutine/arm64/Context.S @@ -2,7 +2,7 @@ ## This file is part of the "Coroutine" project and released under the MIT License. ## ## Created by Samuel Williams on 10/5/2018. -## Copyright, 2018, by Samuel Williams. All rights reserved. +## Copyright, 2018, by Samuel Williams. ## .text diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h index 63170ce4cc775a..34be995a4f7577 100644 --- a/coroutine/arm64/Context.h +++ b/coroutine/arm64/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 10/5/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once diff --git a/coroutine/copy/Context.c b/coroutine/copy/Context.c index a1b8a7120037fe..c1b4144e98576f 100644 --- a/coroutine/copy/Context.c +++ b/coroutine/copy/Context.c @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 24/6/2019. - * Copyright, 2019, by Samuel Williams. All rights reserved. + * Copyright, 2019, by Samuel Williams. */ #include "Context.h" diff --git a/coroutine/copy/Context.h b/coroutine/copy/Context.h index 5e5d9e037a88c8..6038f00cf6928f 100644 --- a/coroutine/copy/Context.h +++ b/coroutine/copy/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 27/6/2019. - * Copyright, 2019, by Samuel Williams. All rights reserved. + * Copyright, 2019, by Samuel Williams. */ #pragma once diff --git a/coroutine/ucontext/Context.c b/coroutine/ucontext/Context.c index eec4ef3956072c..2dc3f478e86247 100644 --- a/coroutine/ucontext/Context.c +++ b/coroutine/ucontext/Context.c @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 24/6/2019. - * Copyright, 2019, by Samuel Williams. All rights reserved. + * Copyright, 2019, by Samuel Williams. */ /* According to Solaris' ucontext.h, makecontext, etc. are removed in SUSv4. diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm index 2647ea4bc43cf5..f8f431239beaaa 100644 --- a/coroutine/win32/Context.asm +++ b/coroutine/win32/Context.asm @@ -2,7 +2,7 @@ ;; This file is part of the "Coroutine" project and released under the MIT License. ;; ;; Created by Samuel Williams on 10/5/2018. -;; Copyright, 2018, by Samuel Williams. All rights reserved. +;; Copyright, 2018, by Samuel Williams. ;; .386 diff --git a/coroutine/win64/Context.S b/coroutine/win64/Context.S index 4b16e0ce8c0316..e0ee38e006089a 100644 --- a/coroutine/win64/Context.S +++ b/coroutine/win64/Context.S @@ -2,7 +2,7 @@ ## This file is part of the "Coroutine" project and released under the MIT License. ## ## Created by Samuel Williams on 4/11/2018. -## Copyright, 2018, by Samuel Williams. All rights reserved. +## Copyright, 2018, by Samuel Williams. ## .text diff --git a/coroutine/win64/Context.asm b/coroutine/win64/Context.asm index 59673ffa3eb324..8c4dea1c93f225 100644 --- a/coroutine/win64/Context.asm +++ b/coroutine/win64/Context.asm @@ -2,7 +2,7 @@ ;; This file is part of the "Coroutine" project and released under the MIT License. ;; ;; Created by Samuel Williams on 10/5/2018. -;; Copyright, 2018, by Samuel Williams. All rights reserved. +;; Copyright, 2018, by Samuel Williams. ;; .code diff --git a/coroutine/x86/Context.S b/coroutine/x86/Context.S index 001b699a30f771..6983f21c3bf422 100644 --- a/coroutine/x86/Context.S +++ b/coroutine/x86/Context.S @@ -2,7 +2,7 @@ ## This file is part of the "Coroutine" project and released under the MIT License. ## ## Created by Samuel Williams on 3/11/2018. -## Copyright, 2018, by Samuel Williams. All rights reserved. +## Copyright, 2018, by Samuel Williams. ## #define TOKEN_PASTE(x,y) x##y From bf04fe086bca47184c6ab13603e064b3c0e88d8e Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Sat, 28 Dec 2019 12:45:37 +1300 Subject: [PATCH 220/878] Remove "All Rights Reserved." from Copyright statement. --- coroutine/ucontext/Context.h | 2 +- coroutine/win32/Context.h | 2 +- coroutine/win64/Context.h | 2 +- coroutine/x86/Context.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coroutine/ucontext/Context.h b/coroutine/ucontext/Context.h index 6cf16c86040d25..2b2a5937935140 100644 --- a/coroutine/ucontext/Context.h +++ b/coroutine/ucontext/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 24/6/2019. - * Copyright, 2019, by Samuel Williams. All rights reserved. + * Copyright, 2019, by Samuel Williams. */ #pragma once diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h index 68a71a76fbaa4c..e20342a98d5771 100644 --- a/coroutine/win32/Context.h +++ b/coroutine/win32/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 10/5/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h index 659e503d215348..e28e6a6ff0a4e6 100644 --- a/coroutine/win64/Context.h +++ b/coroutine/win64/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 10/5/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h index 123321ded63fb2..dfdde24f5d65b2 100644 --- a/coroutine/x86/Context.h +++ b/coroutine/x86/Context.h @@ -2,7 +2,7 @@ * This file is part of the "Coroutine" project and released under the MIT License. * * Created by Samuel Williams on 3/11/2018. - * Copyright, 2018, by Samuel Williams. All rights reserved. + * Copyright, 2018, by Samuel Williams. */ #pragma once From a994b0aee73a78de1137f195fb252b3660199f0b Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sat, 28 Dec 2019 00:44:09 -0800 Subject: [PATCH 221/878] Add VM insns counter like debug_counter (#2789) --- vm_exec.c | 30 ++++++++++++++++++++++++++++++ vm_exec.h | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/vm_exec.c b/vm_exec.c index 0adaa7b7216449..2c7e22228aaac7 100644 --- a/vm_exec.c +++ b/vm_exec.c @@ -15,6 +15,36 @@ static void vm_analysis_insn(int insn); #endif +#if USE_INSNS_COUNTER +static size_t rb_insns_counter[VM_INSTRUCTION_SIZE]; + +static void +vm_insns_counter_count_insn(int insn) +{ + rb_insns_counter[insn]++; +} + +__attribute__((destructor)) +static void +vm_insns_counter_show_results_at_exit(void) +{ + int insn_end = (ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS) + ? VM_INSTRUCTION_SIZE : VM_INSTRUCTION_SIZE / 2; + + size_t total = 0; + for (int insn = 0; insn < insn_end; insn++) + total += rb_insns_counter[insn]; + + for (int insn = 0; insn < insn_end; insn++) { + fprintf(stderr, "[RUBY_INSNS_COUNTER]\t%-32s%'12"PRIuSIZE" (%4.1f%%)\n", + insn_name(insn), rb_insns_counter[insn], + 100.0 * rb_insns_counter[insn] / total); + } +} +#else +static void vm_insns_counter_count_insn(int insn) {} +#endif + #if VMDEBUG > 0 #define DECL_SC_REG(type, r, reg) register type reg_##r diff --git a/vm_exec.h b/vm_exec.h index 9c8b42371df45e..86a70fe8ad22f9 100644 --- a/vm_exec.h +++ b/vm_exec.h @@ -41,6 +41,10 @@ typedef rb_iseq_t *ISEQ; #define throwdebug if(0)printf /* #define throwdebug printf */ +#ifndef USE_INSNS_COUNTER +#define USE_INSNS_COUNTER 0 +#endif + /************************************************/ #if defined(DISPATCH_XXX) error ! @@ -75,7 +79,8 @@ error ! (reg_pc - reg_cfp->iseq->body->iseq_encoded), \ (reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded), \ RSTRING_PTR(rb_iseq_path(reg_cfp->iseq)), \ - rb_iseq_line_no(reg_cfp->iseq, reg_pc - reg_cfp->iseq->body->iseq_encoded)); + rb_iseq_line_no(reg_cfp->iseq, reg_pc - reg_cfp->iseq->body->iseq_encoded)); \ + if (USE_INSNS_COUNTER) vm_insns_counter_count_insn(BIN(insn)); #define INSN_DISPATCH_SIG(insn) From 4fb6643f31cdee33184043ce17c42001274c4392 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sat, 28 Dec 2019 01:10:47 -0800 Subject: [PATCH 222/878] Do not notify Travis on_success We don't find it useful anymore, because notifications from many other CIs are mixed. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71945e349ecd94..fbcfe18d3d0c10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -543,7 +543,7 @@ notifications: rooms: - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:#alerts on_pull_requests: false - on_success: change + on_success: never on_failure: always email: From bb5b8ace8d7e517ac3686497a819a2a52d32b342 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sat, 28 Dec 2019 21:09:52 +0900 Subject: [PATCH 223/878] Fix typo --- thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thread.c b/thread.c index 73d60b0fe3f671..16f3e1ffed41e8 100644 --- a/thread.c +++ b/thread.c @@ -1210,14 +1210,14 @@ COMPILER_WARNING_IGNORED(-Wimplicit-int-float-conversion) /* C4305: 'initializing': truncation from '__int64' to 'const double' */ COMPILER_WARNING_IGNORED(4305) #endif -static const double TIMESPEC_SEC_MAX_as_doube = TIMESPEC_SEC_MAX; +static const double TIMESPEC_SEC_MAX_as_double = TIMESPEC_SEC_MAX; COMPILER_WARNING_POP static rb_hrtime_t * double2hrtime(rb_hrtime_t *hrt, double d) { /* assume timespec.tv_sec has same signedness as time_t */ - const double TIMESPEC_SEC_MAX_PLUS_ONE = 2.0 * (TIMESPEC_SEC_MAX_as_doube / 2.0 + 1.0); + const double TIMESPEC_SEC_MAX_PLUS_ONE = 2.0 * (TIMESPEC_SEC_MAX_as_double / 2.0 + 1.0); if (TIMESPEC_SEC_MAX_PLUS_ONE <= d) { return NULL; From a04c53596735f563a09d628530a2adae7ba26c7a Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sat, 28 Dec 2019 00:25:11 -0800 Subject: [PATCH 224/878] Use __func__ as rb_cv_function_name_string on OpenBSD The use of RUBY_WERROR_FLAG causes this test to fail on OpenBSD platforms that use the binutils linker (ld.bfd) instead of the llvm linker (ld.lld), due to warnings added to the binutils linker in OpenBSD. Removing the RUBY_WERROR_FLAG would probably also fix it, but that would affect other platforms. This should also be backported to Ruby 2.7. Analysis and similar fix recommended by George Koehler. --- configure.ac | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index f9e8573d45191d..e8d9aa6d5e40b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1525,15 +1525,18 @@ AC_SUBST(MATHN, $mathn) AC_CACHE_CHECK(for function name string predefined identifier, rb_cv_function_name_string, - [rb_cv_function_name_string=no - RUBY_WERROR_FLAG([ - for func in __func__ __FUNCTION__; do - AC_TRY_LINK([@%:@include ], - [puts($func);], - [rb_cv_function_name_string=$func - break]) - done - ])] + [AS_CASE(["$target_os"],[openbsd*],[ + rb_cv_function_name_string=__func__ + ],[ + rb_cv_function_name_string=no + RUBY_WERROR_FLAG([ + for func in __func__ __FUNCTION__; do + AC_TRY_LINK([@%:@include ], + [puts($func);], + [rb_cv_function_name_string=$func + break]) + done + ])])] ) AS_IF([test "$rb_cv_function_name_string" != no], [ AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string]) From 290711e1ce450147fe94eb8cdddaa6158b73d380 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 29 Dec 2019 07:13:25 +0900 Subject: [PATCH 225/878] * 2019-12-29 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 4b79c39b2f1c9c..84c9edee82e4a5 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 29 #include "ruby/version.h" From 8ce5d46e662f53a56cf21c47981bb99bcb5b73e6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 29 Dec 2019 08:19:43 +0900 Subject: [PATCH 226/878] Fixed an unavailable sanitizer feature --- internal/sanitizers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/sanitizers.h b/internal/sanitizers.h index 680b553bae286f..e64a04bbe49df1 100644 --- a/internal/sanitizers.h +++ b/internal/sanitizers.h @@ -35,7 +35,7 @@ __attribute__((__no_sanitize__("memory, address"), __noinline__)) x #elif __has_feature(address_sanitizer) # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ - __attribute__((__no_sanitize__("memory, address"), __noinline__)) x + __attribute__((__no_sanitize__("address"), __noinline__)) x #elif defined(NO_SANITIZE_ADDRESS) # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \ NO_SANITIZE_ADDRESS(NOINLINE(x)) From d7bef803ac3546119b30e1d78af0097a9df9c907 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 29 Dec 2019 10:07:17 +0900 Subject: [PATCH 227/878] Separate builtin initialization calls --- ast.c | 2 -- error.c | 6 ------ gc.c | 1 - inits.c | 20 +++++++++++++------- io.c | 6 ------ pack.c | 2 -- tool/mk_builtin_loader.rb | 2 +- vm_trace.c | 2 -- 8 files changed, 14 insertions(+), 27 deletions(-) diff --git a/ast.c b/ast.c index 3f7061a7b008c4..18a97239ff8b72 100644 --- a/ast.c +++ b/ast.c @@ -690,6 +690,4 @@ Init_ast(void) rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree"); rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject); rb_undef_alloc_func(rb_cNode); - - load_ast(); } diff --git a/error.c b/error.c index f99cdb6784a9fd..fd6c8fed194c9c 100644 --- a/error.c +++ b/error.c @@ -3077,12 +3077,6 @@ Init_syserr(void) #include "warning.rbinc" -void -Init_warning(void) -{ - load_warning(); -} - /*! * \} */ diff --git a/gc.c b/gc.c index 9747655f99f514..ccece5b3d1fb26 100644 --- a/gc.c +++ b/gc.c @@ -11868,7 +11868,6 @@ Init_GC(void) VALUE gc_constants; rb_mGC = rb_define_module("GC"); - load_gc(); gc_constants = rb_hash_new(); rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_SIZE")), SIZET2NUM(sizeof(RVALUE))); diff --git a/inits.c b/inits.c index 72a2a9868b52b4..b313d1dd108963 100644 --- a/inits.c +++ b/inits.c @@ -12,6 +12,7 @@ #include "internal/inits.h" #include "ruby.h" #include "builtin.h" +static void Init_builtin_prelude(void); #include "prelude.rbinc" #define CALL(n) {void Init_##n(void); Init_##n();} @@ -45,6 +46,7 @@ rb_call_inits(void) CALL(Hash); CALL(Struct); CALL(Regexp); + CALL(pack); CALL(transcode); CALL(marshal); CALL(Range); @@ -57,6 +59,7 @@ rb_call_inits(void) CALL(Proc); CALL(Binding); CALL(Math); + CALL(GC); CALL(Enumerator); CALL(VM); CALL(ISeq); @@ -66,18 +69,21 @@ rb_call_inits(void) CALL(Rational); CALL(Complex); CALL(version); + CALL(vm_trace); CALL(vm_stack_canary); + CALL(ast); CALL(gc_stress); // enable builtin loading CALL(builtin); - CALL(GC); - CALL(IO_nonblock); - CALL(ast); - CALL(vm_trace); - CALL(pack); - CALL(warning); - load_prelude(); +#define BUILTIN(n) CALL(builtin_##n) + BUILTIN(gc); + BUILTIN(io); + BUILTIN(ast); + BUILTIN(trace_point); + BUILTIN(pack); + BUILTIN(warning); + Init_builtin_prelude(); } #undef CALL diff --git a/io.c b/io.c index 37109f5def0bcb..a6a7dd3f82c399 100644 --- a/io.c +++ b/io.c @@ -13522,9 +13522,3 @@ Init_IO(void) } #include "io.rbinc" - -void -Init_IO_nonblock(void) -{ - load_io(); -} diff --git a/pack.c b/pack.c index 8ba492fd3b0063..3c63d64ab5df2a 100644 --- a/pack.c +++ b/pack.c @@ -1767,7 +1767,5 @@ utf8_to_uv(const char *p, long *lenp) void Init_pack(void) { - load_pack(); - id_associated = rb_make_internal_id(); } diff --git a/tool/mk_builtin_loader.rb b/tool/mk_builtin_loader.rb index 3d2a3430e0912b..837f56d6962fa2 100644 --- a/tool/mk_builtin_loader.rb +++ b/tool/mk_builtin_loader.rb @@ -166,7 +166,7 @@ def mk_builtin_header file end } - f.puts "static void load_#{base}(void)" + f.puts "void Init_builtin_#{base}(void)" f.puts "{" table = "#{base}_table" diff --git a/vm_trace.c b/vm_trace.c index 079795bfc673bd..e72c61873990e6 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -1526,8 +1526,6 @@ Init_vm_trace(void) rb_cTracePoint = rb_define_class("TracePoint", rb_cObject); rb_undef_alloc_func(rb_cTracePoint); - - load_trace_point(); } typedef struct rb_postponed_job_struct { From a0d1fd16d156d289d5ea46327a98517a9b31f860 Mon Sep 17 00:00:00 2001 From: Seiei Miyagi Date: Wed, 25 Dec 2019 21:55:49 +0900 Subject: [PATCH 228/878] Fix documentation of Dir#each_child --- dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.c b/dir.c index c72011a0d9980e..56dfe614d5abd3 100644 --- a/dir.c +++ b/dir.c @@ -3031,7 +3031,7 @@ dir_s_each_child(int argc, VALUE *argv, VALUE io) /* * call-seq: - * dir.each_child {| filename | block } -> nil + * dir.each_child {| filename | block } -> dir * dir.each_child -> an_enumerator * * Calls the block once for each entry except for "." and ".." in From e5c441a4a2885da61df9894ac17b69cb3c5811f2 Mon Sep 17 00:00:00 2001 From: Ary Borenszweig Date: Fri, 29 Nov 2019 17:59:47 -0300 Subject: [PATCH 229/878] Optimize Array#rotate!(n) for n = 1 and n = -1 For the most common cases of `rotate!` one place to the right or to the left, instead of doing some reversals of the array we just keep a single value in a temporary value, use memmove and then put the temporary value where it should be. --- array.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/array.c b/array.c index 9846320f0032ad..16321e186d838e 100644 --- a/array.c +++ b/array.c @@ -2618,10 +2618,20 @@ rotate_count(long cnt, long len) static void ary_rotate_ptr(VALUE *ptr, long len, long cnt) { - --len; - if (cnt < len) ary_reverse(ptr + cnt, ptr + len); - if (--cnt > 0) ary_reverse(ptr, ptr + cnt); - if (len > 0) ary_reverse(ptr, ptr + len); + if (cnt == 1) { + VALUE tmp = *ptr; + memmove(ptr, ptr + 1, sizeof(VALUE)*(len - 1)); + *(ptr + len - 1) = tmp; + } else if (cnt == len - 1) { + VALUE tmp = *(ptr + len - 1); + memmove(ptr + 1, ptr, sizeof(VALUE)*(len - 1)); + *ptr = tmp; + } else { + --len; + if (cnt < len) ary_reverse(ptr + cnt, ptr + len); + if (--cnt > 0) ary_reverse(ptr, ptr + cnt); + if (len > 0) ary_reverse(ptr, ptr + len); + } } VALUE @@ -2631,7 +2641,7 @@ rb_ary_rotate(VALUE ary, long cnt) if (cnt != 0) { long len = RARRAY_LEN(ary); - if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) { + if (len > 1 && (cnt = rotate_count(cnt, len)) > 0) { RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt)); return ary; } From 31e2f035121a4c07d6ea3b5eab69bc97749a022b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 29 Dec 2019 16:12:19 +0900 Subject: [PATCH 230/878] [ruby/io-console] Enable only interrupt bits on `intr: true` https://github.com/ruby/io-console/commit/baaf929041 --- ext/io/console/console.c | 2 +- test/io/console/test_io_console.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index ac5b6a611c7d3e..3a6bb25db251ea 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -188,7 +188,7 @@ set_rawmode(conmode *t, void *arg) #endif #ifdef ISIG if (r->intr) { - t->c_iflag |= BRKINT|IXON; + t->c_iflag |= BRKINT; t->c_lflag |= ISIG; } #endif diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index d71e42603f532b..77c6dac5a63d7e 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -364,6 +364,11 @@ def test_intr assert_ctrl("#{cc.ord}", cc, r, w) assert_ctrl("#{cc.ord}", cc, r, w) end + if cc = ctrl["stop"] + assert_ctrl("#{cc.ord}", cc, r, w) + assert_ctrl("#{cc.ord}", cc, r, w) + assert_ctrl("#{cc.ord}", cc, r, w) + end end end From 2ef8d5beeebf759c5dd0754bb99cbcfbad3f368e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 29 Dec 2019 21:09:15 +0800 Subject: [PATCH 231/878] ext/openssl/ossl_ssl.c: nodoc for private methods [Misc #11712][ruby-core:71565] --- ext/openssl/ossl_ssl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index de0556f543b4fb..80a42383f70e27 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1911,6 +1911,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) } /* + * :nodoc: * call-seq: * ssl.sysread_nonblock(length) => string * ssl.sysread_nonblock(length, buffer) => buffer @@ -2003,6 +2004,7 @@ ossl_ssl_write(VALUE self, VALUE str) } /* + * :nodoc: * call-seq: * ssl.syswrite_nonblock(string) => Integer * @@ -2020,6 +2022,7 @@ ossl_ssl_write_nonblock(int argc, VALUE *argv, VALUE self) } /* + * :nodoc: * call-seq: * ssl.stop => nil * From e882187612512b13b9b3e009515211e8544079e5 Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Sun, 29 Dec 2019 19:59:07 -0500 Subject: [PATCH 232/878] syntax.rdoc: remove "experimental" from refinements (#2796) --- doc/syntax.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc index 2463c12a63c51b..cdcb18dae17fe5 100644 --- a/doc/syntax.rdoc +++ b/doc/syntax.rdoc @@ -27,7 +27,7 @@ Precedence[rdoc-ref:syntax/precedence.rdoc] :: Precedence of ruby operators Refinements[rdoc-ref:syntax/refinements.rdoc] :: - Use and behavior of the experimental refinements feature + Use and behavior of the refinements feature Miscellaneous[rdoc-ref:syntax/miscellaneous.rdoc] :: +alias+, +undef+, +BEGIN+, +END+ From aed5afdaa0874a372d1f90fbb28fabd0c8993f7b Mon Sep 17 00:00:00 2001 From: git Date: Mon, 30 Dec 2019 09:59:25 +0900 Subject: [PATCH 233/878] * 2019-12-30 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 84c9edee82e4a5..2c9631a346102f 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" From 3e2418e2a64cadeb59e02d13b424b62b8d867ad5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 30 Dec 2019 17:38:28 +0900 Subject: [PATCH 234/878] [ruby/io-console] bump up to 0.5.4 --- ext/io/console/io-console.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index fac9bff9b77018..0920fc3e6ad32f 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -1,5 +1,5 @@ # -*- ruby -*- -_VERSION = "0.5.3" +_VERSION = "0.5.4" date = %w$Date:: $[1] Gem::Specification.new do |s| From 99c7b0b7ea789643bef60085ab59e4b62011ef8b Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Mon, 30 Dec 2019 17:47:58 -0500 Subject: [PATCH 235/878] Decide lambdaness of (f << g) using g (#2729) * Deciding lambdaness of (f << g) using g * Use version guards for spec changes --- proc.c | 10 ++++++++-- spec/ruby/core/method/compose_spec.rb | 3 ++- test/ruby/test_proc.rb | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/proc.c b/proc.c index cb5ffdab9a4fe6..7094a021f3cf6b 100644 --- a/proc.c +++ b/proc.c @@ -3386,8 +3386,14 @@ rb_proc_compose_to_left(VALUE self, VALUE g) procs[1] = g; args = rb_ary_tmp_new_from_values(0, 2, procs); - GetProcPtr(self, procp); - is_lambda = procp->is_lambda; + if (rb_obj_is_proc(g)) { + GetProcPtr(g, procp); + is_lambda = procp->is_lambda; + } + else { + VM_ASSERT(rb_obj_is_method(g) || rb_obj_respond_to(g, idCall, TRUE)); + is_lambda = 1; + } proc = rb_proc_new(compose, args); GetProcPtr(proc, procp); diff --git a/spec/ruby/core/method/compose_spec.rb b/spec/ruby/core/method/compose_spec.rb index aa0aded7754803..2cf5b21670fa25 100644 --- a/spec/ruby/core/method/compose_spec.rb +++ b/spec/ruby/core/method/compose_spec.rb @@ -39,7 +39,8 @@ def double.call(n); n * 2; end double = proc { |x| x + x } (pow_2 << double).is_a?(Proc).should == true - (pow_2 << double).lambda?.should == true + ruby_version_is(''...'2.8') { (pow_2 << double).lambda?.should == true } + ruby_version_is('2.8') { (pow_2 << double).lambda?.should == false } end it "may accept multiple arguments" do diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index c6572ec1bae56f..1f84b2eb845615 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1413,9 +1413,13 @@ def test_compose_with_block def test_compose_with_lambda f = lambda {|x| x * 2} g = lambda {|x| x} + not_lambda = proc {|x| x} assert_predicate((f << g), :lambda?) assert_predicate((g >> f), :lambda?) + assert_predicate((not_lambda << f), :lambda?) + assert_not_predicate((f << not_lambda), :lambda?) + assert_not_predicate((not_lambda >> f), :lambda?) end def test_compose_with_method @@ -1427,6 +1431,7 @@ def g(x) x + 1 end assert_equal(6, (f << g).call(2)) assert_equal(5, (f >> g).call(2)) + assert_predicate((f << g), :lambda?) end def test_compose_with_callable @@ -1438,6 +1443,7 @@ def call(x) x + 1 end assert_equal(6, (f << g).call(2)) assert_equal(5, (f >> g).call(2)) + assert_predicate((f << g), :lambda?) end def test_compose_with_noncallable From f1ea5d22dc94aae4150e9021a9bf47ebfe04f8a9 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 31 Dec 2019 07:48:19 +0900 Subject: [PATCH 236/878] * 2019-12-31 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 2c9631a346102f..40b1847c673d82 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" From 3264a00958f56e1ba75a95c93e59fc9cccf323e8 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Mon, 30 Dec 2019 18:13:55 -0500 Subject: [PATCH 237/878] Fix Proc#<< spec [Bug #16406] --- spec/ruby/core/proc/compose_spec.rb | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/spec/ruby/core/proc/compose_spec.rb b/spec/ruby/core/proc/compose_spec.rb index cc7d70a182ddde..ef9c125ae9df43 100644 --- a/spec/ruby/core/proc/compose_spec.rb +++ b/spec/ruby/core/proc/compose_spec.rb @@ -38,20 +38,34 @@ def double.call(n); n * 2; end (f << g).lambda?.should == false end - it "is a Proc when other is lambda" do - f = proc { |x| x * x } - g = -> x { x + x } - - (f << g).is_a?(Proc).should == true - (f << g).lambda?.should == false + ruby_version_is(''...'2.8') do + it "is a Proc when other is lambda" do + f = proc { |x| x * x } + g = -> x { x + x } + + (f << g).is_a?(Proc).should == true + (f << g).lambda?.should == false + end + + it "is a lambda when self is lambda" do + f = -> x { x * x } + g = proc { |x| x + x } + + (f << g).is_a?(Proc).should == true + (f << g).lambda?.should == true + end end - it "is a lambda when self is lambda" do - f = -> x { x * x } - g = proc { |x| x + x } + ruby_version_is('2.8') do + it "is a lambda when parameter is lambda" do + f = -> x { x * x } + g = proc { |x| x + x } + lambda_proc = -> x { x } - (f << g).is_a?(Proc).should == true - (f << g).lambda?.should == true + (f << g).is_a?(Proc).should == true + (f << g).lambda?.should == false + (f << lambda_proc).lambda?.should == true + end end it "may accept multiple arguments" do From 179e402d8a17b7c909aa48b6327d60ca4a53bb3b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 11:12:11 +0900 Subject: [PATCH 238/878] Updated dependencies on internal/warnings.h Needed for `UNALIGNED_MEMBER_ACCESS` using `COMPILER_WARNING_`* macros. --- common.mk | 93 +++++++++++++++++++++++++++++++++++++++++++++ ext/coverage/depend | 1 + ext/objspace/depend | 2 + ext/pty/depend | 1 + ext/ripper/depend | 1 + ext/socket/depend | 15 ++++++++ 6 files changed, 113 insertions(+) diff --git a/common.mk b/common.mk index ceb50f906a9a67..2ab2855b6f7373 100644 --- a/common.mk +++ b/common.mk @@ -1591,6 +1591,7 @@ array.$(OBJEXT): $(top_srcdir)/internal/serial.h array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h array.$(OBJEXT): $(top_srcdir)/internal/stdbool.h array.$(OBJEXT): $(top_srcdir)/internal/vm.h +array.$(OBJEXT): $(top_srcdir)/internal/warnings.h array.$(OBJEXT): {$(VPATH)}array.c array.$(OBJEXT): {$(VPATH)}assert.h array.$(OBJEXT): {$(VPATH)}config.h @@ -1699,6 +1700,7 @@ builtin.$(OBJEXT): $(top_srcdir)/internal/serial.h builtin.$(OBJEXT): $(top_srcdir)/internal/static_assert.h builtin.$(OBJEXT): $(top_srcdir)/internal/stdbool.h builtin.$(OBJEXT): $(top_srcdir)/internal/vm.h +builtin.$(OBJEXT): $(top_srcdir)/internal/warnings.h builtin.$(OBJEXT): {$(VPATH)}assert.h builtin.$(OBJEXT): {$(VPATH)}builtin.c builtin.$(OBJEXT): {$(VPATH)}builtin.h @@ -1741,6 +1743,7 @@ class.$(OBJEXT): $(top_srcdir)/internal/stdbool.h class.$(OBJEXT): $(top_srcdir)/internal/string.h class.$(OBJEXT): $(top_srcdir)/internal/variable.h class.$(OBJEXT): $(top_srcdir)/internal/vm.h +class.$(OBJEXT): $(top_srcdir)/internal/warnings.h class.$(OBJEXT): {$(VPATH)}assert.h class.$(OBJEXT): {$(VPATH)}class.c class.$(OBJEXT): {$(VPATH)}config.h @@ -1817,6 +1820,7 @@ compile.$(OBJEXT): $(top_srcdir)/internal/symbol.h compile.$(OBJEXT): $(top_srcdir)/internal/thread.h compile.$(OBJEXT): $(top_srcdir)/internal/variable.h compile.$(OBJEXT): $(top_srcdir)/internal/vm.h +compile.$(OBJEXT): $(top_srcdir)/internal/warnings.h compile.$(OBJEXT): {$(VPATH)}assert.h compile.$(OBJEXT): {$(VPATH)}builtin.h compile.$(OBJEXT): {$(VPATH)}compile.c @@ -1873,6 +1877,7 @@ complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h complex.$(OBJEXT): $(top_srcdir)/internal/stdbool.h complex.$(OBJEXT): $(top_srcdir)/internal/string.h complex.$(OBJEXT): $(top_srcdir)/internal/vm.h +complex.$(OBJEXT): $(top_srcdir)/internal/warnings.h complex.$(OBJEXT): {$(VPATH)}assert.h complex.$(OBJEXT): {$(VPATH)}complex.c complex.$(OBJEXT): {$(VPATH)}config.h @@ -1946,6 +1951,7 @@ debug.$(OBJEXT): $(top_srcdir)/internal/static_assert.h debug.$(OBJEXT): $(top_srcdir)/internal/stdbool.h debug.$(OBJEXT): $(top_srcdir)/internal/util.h debug.$(OBJEXT): $(top_srcdir)/internal/vm.h +debug.$(OBJEXT): $(top_srcdir)/internal/warnings.h debug.$(OBJEXT): {$(VPATH)}assert.h debug.$(OBJEXT): {$(VPATH)}config.h debug.$(OBJEXT): {$(VPATH)}debug.c @@ -1999,6 +2005,7 @@ dir.$(OBJEXT): $(top_srcdir)/internal/static_assert.h dir.$(OBJEXT): $(top_srcdir)/internal/stdbool.h dir.$(OBJEXT): $(top_srcdir)/internal/string.h dir.$(OBJEXT): $(top_srcdir)/internal/vm.h +dir.$(OBJEXT): $(top_srcdir)/internal/warnings.h dir.$(OBJEXT): {$(VPATH)}assert.h dir.$(OBJEXT): {$(VPATH)}config.h dir.$(OBJEXT): {$(VPATH)}defines.h @@ -2141,6 +2148,7 @@ enum.$(OBJEXT): $(top_srcdir)/internal/serial.h enum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h enum.$(OBJEXT): $(top_srcdir)/internal/stdbool.h enum.$(OBJEXT): $(top_srcdir)/internal/vm.h +enum.$(OBJEXT): $(top_srcdir)/internal/warnings.h enum.$(OBJEXT): {$(VPATH)}assert.h enum.$(OBJEXT): {$(VPATH)}config.h enum.$(OBJEXT): {$(VPATH)}defines.h @@ -2177,6 +2185,7 @@ enumerator.$(OBJEXT): $(top_srcdir)/internal/stdbool.h enumerator.$(OBJEXT): $(top_srcdir)/internal/string.h enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h enumerator.$(OBJEXT): $(top_srcdir)/internal/vm.h +enumerator.$(OBJEXT): $(top_srcdir)/internal/warnings.h enumerator.$(OBJEXT): {$(VPATH)}assert.h enumerator.$(OBJEXT): {$(VPATH)}config.h enumerator.$(OBJEXT): {$(VPATH)}defines.h @@ -2266,6 +2275,7 @@ eval.$(OBJEXT): $(top_srcdir)/internal/stdbool.h eval.$(OBJEXT): $(top_srcdir)/internal/string.h eval.$(OBJEXT): $(top_srcdir)/internal/variable.h eval.$(OBJEXT): $(top_srcdir)/internal/vm.h +eval.$(OBJEXT): $(top_srcdir)/internal/warnings.h eval.$(OBJEXT): {$(VPATH)}assert.h eval.$(OBJEXT): {$(VPATH)}config.h eval.$(OBJEXT): {$(VPATH)}constant.h @@ -2323,6 +2333,7 @@ file.$(OBJEXT): $(top_srcdir)/internal/stdbool.h file.$(OBJEXT): $(top_srcdir)/internal/string.h file.$(OBJEXT): $(top_srcdir)/internal/thread.h file.$(OBJEXT): $(top_srcdir)/internal/vm.h +file.$(OBJEXT): $(top_srcdir)/internal/warnings.h file.$(OBJEXT): {$(VPATH)}assert.h file.$(OBJEXT): {$(VPATH)}config.h file.$(OBJEXT): {$(VPATH)}defines.h @@ -2484,6 +2495,7 @@ hash.$(OBJEXT): $(top_srcdir)/internal/stdbool.h hash.$(OBJEXT): $(top_srcdir)/internal/string.h hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h hash.$(OBJEXT): $(top_srcdir)/internal/vm.h +hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h hash.$(OBJEXT): {$(VPATH)}assert.h hash.$(OBJEXT): {$(VPATH)}config.h hash.$(OBJEXT): {$(VPATH)}debug_counter.h @@ -2602,6 +2614,7 @@ iseq.$(OBJEXT): $(top_srcdir)/internal/symbol.h iseq.$(OBJEXT): $(top_srcdir)/internal/thread.h iseq.$(OBJEXT): $(top_srcdir)/internal/variable.h iseq.$(OBJEXT): $(top_srcdir)/internal/vm.h +iseq.$(OBJEXT): $(top_srcdir)/internal/warnings.h iseq.$(OBJEXT): {$(VPATH)}assert.h iseq.$(OBJEXT): {$(VPATH)}builtin.h iseq.$(OBJEXT): {$(VPATH)}config.h @@ -2658,6 +2671,7 @@ load.$(OBJEXT): $(top_srcdir)/internal/string.h load.$(OBJEXT): $(top_srcdir)/internal/thread.h load.$(OBJEXT): $(top_srcdir)/internal/variable.h load.$(OBJEXT): $(top_srcdir)/internal/vm.h +load.$(OBJEXT): $(top_srcdir)/internal/warnings.h load.$(OBJEXT): {$(VPATH)}assert.h load.$(OBJEXT): {$(VPATH)}config.h load.$(OBJEXT): {$(VPATH)}constant.h @@ -2744,6 +2758,7 @@ marshal.$(OBJEXT): $(top_srcdir)/internal/string.h marshal.$(OBJEXT): $(top_srcdir)/internal/struct.h marshal.$(OBJEXT): $(top_srcdir)/internal/util.h marshal.$(OBJEXT): $(top_srcdir)/internal/vm.h +marshal.$(OBJEXT): $(top_srcdir)/internal/warnings.h marshal.$(OBJEXT): {$(VPATH)}assert.h marshal.$(OBJEXT): {$(VPATH)}config.h marshal.$(OBJEXT): {$(VPATH)}defines.h @@ -2828,6 +2843,37 @@ miniinit.$(OBJEXT): {$(VPATH)}trace_point.rb miniinit.$(OBJEXT): {$(VPATH)}vm_core.h miniinit.$(OBJEXT): {$(VPATH)}vm_opts.h miniinit.$(OBJEXT): {$(VPATH)}warning.rb +miniprelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +miniprelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +miniprelude.$(OBJEXT): $(CCAN_DIR)/list/list.h +miniprelude.$(OBJEXT): $(CCAN_DIR)/str/str.h +miniprelude.$(OBJEXT): $(hdrdir)/ruby.h +miniprelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h +miniprelude.$(OBJEXT): {$(VPATH)}assert.h +miniprelude.$(OBJEXT): {$(VPATH)}ast.rb +miniprelude.$(OBJEXT): {$(VPATH)}config.h +miniprelude.$(OBJEXT): {$(VPATH)}defines.h +miniprelude.$(OBJEXT): {$(VPATH)}gc.rb +miniprelude.$(OBJEXT): {$(VPATH)}id.h +miniprelude.$(OBJEXT): {$(VPATH)}intern.h +miniprelude.$(OBJEXT): {$(VPATH)}internal.h +miniprelude.$(OBJEXT): {$(VPATH)}io.rb +miniprelude.$(OBJEXT): {$(VPATH)}iseq.h +miniprelude.$(OBJEXT): {$(VPATH)}method.h +miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c +miniprelude.$(OBJEXT): {$(VPATH)}missing.h +miniprelude.$(OBJEXT): {$(VPATH)}node.h +miniprelude.$(OBJEXT): {$(VPATH)}pack.rb +miniprelude.$(OBJEXT): {$(VPATH)}prelude.rb +miniprelude.$(OBJEXT): {$(VPATH)}ruby_assert.h +miniprelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h +miniprelude.$(OBJEXT): {$(VPATH)}st.h +miniprelude.$(OBJEXT): {$(VPATH)}subst.h +miniprelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h +miniprelude.$(OBJEXT): {$(VPATH)}thread_native.h +miniprelude.$(OBJEXT): {$(VPATH)}trace_point.rb +miniprelude.$(OBJEXT): {$(VPATH)}vm_core.h +miniprelude.$(OBJEXT): {$(VPATH)}vm_opts.h mjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h mjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h mjit.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -2896,6 +2942,7 @@ mjit_compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h mjit_compile.$(OBJEXT): $(top_srcdir)/internal/stdbool.h mjit_compile.$(OBJEXT): $(top_srcdir)/internal/variable.h mjit_compile.$(OBJEXT): $(top_srcdir)/internal/vm.h +mjit_compile.$(OBJEXT): $(top_srcdir)/internal/warnings.h mjit_compile.$(OBJEXT): {$(VPATH)}assert.h mjit_compile.$(OBJEXT): {$(VPATH)}builtin.h mjit_compile.$(OBJEXT): {$(VPATH)}config.h @@ -2942,6 +2989,7 @@ node.$(OBJEXT): $(top_srcdir)/internal/static_assert.h node.$(OBJEXT): $(top_srcdir)/internal/stdbool.h node.$(OBJEXT): $(top_srcdir)/internal/variable.h node.$(OBJEXT): $(top_srcdir)/internal/vm.h +node.$(OBJEXT): $(top_srcdir)/internal/warnings.h node.$(OBJEXT): {$(VPATH)}assert.h node.$(OBJEXT): {$(VPATH)}config.h node.$(OBJEXT): {$(VPATH)}constant.h @@ -2982,6 +3030,7 @@ numeric.$(OBJEXT): $(top_srcdir)/internal/stdbool.h numeric.$(OBJEXT): $(top_srcdir)/internal/util.h numeric.$(OBJEXT): $(top_srcdir)/internal/variable.h numeric.$(OBJEXT): $(top_srcdir)/internal/vm.h +numeric.$(OBJEXT): $(top_srcdir)/internal/warnings.h numeric.$(OBJEXT): {$(VPATH)}assert.h numeric.$(OBJEXT): {$(VPATH)}config.h numeric.$(OBJEXT): {$(VPATH)}constant.h @@ -3020,6 +3069,7 @@ object.$(OBJEXT): $(top_srcdir)/internal/struct.h object.$(OBJEXT): $(top_srcdir)/internal/symbol.h object.$(OBJEXT): $(top_srcdir)/internal/variable.h object.$(OBJEXT): $(top_srcdir)/internal/vm.h +object.$(OBJEXT): $(top_srcdir)/internal/warnings.h object.$(OBJEXT): {$(VPATH)}assert.h object.$(OBJEXT): {$(VPATH)}config.h object.$(OBJEXT): {$(VPATH)}constant.h @@ -3092,6 +3142,7 @@ parse.$(OBJEXT): $(top_srcdir)/internal/thread.h parse.$(OBJEXT): $(top_srcdir)/internal/util.h parse.$(OBJEXT): $(top_srcdir)/internal/variable.h parse.$(OBJEXT): $(top_srcdir)/internal/vm.h +parse.$(OBJEXT): $(top_srcdir)/internal/warnings.h parse.$(OBJEXT): {$(VPATH)}assert.h parse.$(OBJEXT): {$(VPATH)}config.h parse.$(OBJEXT): {$(VPATH)}constant.h @@ -3119,6 +3170,32 @@ parse.$(OBJEXT): {$(VPATH)}st.h parse.$(OBJEXT): {$(VPATH)}subst.h parse.$(OBJEXT): {$(VPATH)}symbol.h parse.$(OBJEXT): {$(VPATH)}util.h +prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h +prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h +prelude.$(OBJEXT): $(hdrdir)/ruby.h +prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h +prelude.$(OBJEXT): {$(VPATH)}assert.h +prelude.$(OBJEXT): {$(VPATH)}config.h +prelude.$(OBJEXT): {$(VPATH)}defines.h +prelude.$(OBJEXT): {$(VPATH)}gem_prelude.rb +prelude.$(OBJEXT): {$(VPATH)}id.h +prelude.$(OBJEXT): {$(VPATH)}intern.h +prelude.$(OBJEXT): {$(VPATH)}internal.h +prelude.$(OBJEXT): {$(VPATH)}iseq.h +prelude.$(OBJEXT): {$(VPATH)}method.h +prelude.$(OBJEXT): {$(VPATH)}missing.h +prelude.$(OBJEXT): {$(VPATH)}node.h +prelude.$(OBJEXT): {$(VPATH)}prelude.c +prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h +prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h +prelude.$(OBJEXT): {$(VPATH)}st.h +prelude.$(OBJEXT): {$(VPATH)}subst.h +prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h +prelude.$(OBJEXT): {$(VPATH)}thread_native.h +prelude.$(OBJEXT): {$(VPATH)}vm_core.h +prelude.$(OBJEXT): {$(VPATH)}vm_opts.h proc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h proc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h proc.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -3139,6 +3216,7 @@ proc.$(OBJEXT): $(top_srcdir)/internal/stdbool.h proc.$(OBJEXT): $(top_srcdir)/internal/string.h proc.$(OBJEXT): $(top_srcdir)/internal/symbol.h proc.$(OBJEXT): $(top_srcdir)/internal/vm.h +proc.$(OBJEXT): $(top_srcdir)/internal/warnings.h proc.$(OBJEXT): {$(VPATH)}assert.h proc.$(OBJEXT): {$(VPATH)}config.h proc.$(OBJEXT): {$(VPATH)}defines.h @@ -3268,6 +3346,7 @@ range.$(OBJEXT): $(top_srcdir)/internal/stdbool.h range.$(OBJEXT): $(top_srcdir)/internal/string.h range.$(OBJEXT): $(top_srcdir)/internal/struct.h range.$(OBJEXT): $(top_srcdir)/internal/vm.h +range.$(OBJEXT): $(top_srcdir)/internal/warnings.h range.$(OBJEXT): {$(VPATH)}assert.h range.$(OBJEXT): {$(VPATH)}config.h range.$(OBJEXT): {$(VPATH)}defines.h @@ -3298,6 +3377,7 @@ rational.$(OBJEXT): $(top_srcdir)/internal/static_assert.h rational.$(OBJEXT): $(top_srcdir)/internal/stdbool.h rational.$(OBJEXT): $(top_srcdir)/internal/string.h rational.$(OBJEXT): $(top_srcdir)/internal/vm.h +rational.$(OBJEXT): $(top_srcdir)/internal/warnings.h rational.$(OBJEXT): {$(VPATH)}assert.h rational.$(OBJEXT): {$(VPATH)}config.h rational.$(OBJEXT): {$(VPATH)}defines.h @@ -3324,6 +3404,7 @@ re.$(OBJEXT): $(top_srcdir)/internal/re.h re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h re.$(OBJEXT): $(top_srcdir)/internal/stdbool.h re.$(OBJEXT): $(top_srcdir)/internal/string.h +re.$(OBJEXT): $(top_srcdir)/internal/warnings.h re.$(OBJEXT): {$(VPATH)}assert.h re.$(OBJEXT): {$(VPATH)}config.h re.$(OBJEXT): {$(VPATH)}defines.h @@ -3444,6 +3525,7 @@ ruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h ruby.$(OBJEXT): $(top_srcdir)/internal/stdbool.h ruby.$(OBJEXT): $(top_srcdir)/internal/string.h ruby.$(OBJEXT): $(top_srcdir)/internal/vm.h +ruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h ruby.$(OBJEXT): {$(VPATH)}assert.h ruby.$(OBJEXT): {$(VPATH)}config.h ruby.$(OBJEXT): {$(VPATH)}debug_counter.h @@ -3486,6 +3568,7 @@ safe.$(OBJEXT): $(top_srcdir)/internal/serial.h safe.$(OBJEXT): $(top_srcdir)/internal/static_assert.h safe.$(OBJEXT): $(top_srcdir)/internal/stdbool.h safe.$(OBJEXT): $(top_srcdir)/internal/vm.h +safe.$(OBJEXT): $(top_srcdir)/internal/warnings.h safe.$(OBJEXT): {$(VPATH)}assert.h safe.$(OBJEXT): {$(VPATH)}config.h safe.$(OBJEXT): {$(VPATH)}defines.h @@ -3534,6 +3617,7 @@ signal.$(OBJEXT): $(top_srcdir)/internal/stdbool.h signal.$(OBJEXT): $(top_srcdir)/internal/string.h signal.$(OBJEXT): $(top_srcdir)/internal/thread.h signal.$(OBJEXT): $(top_srcdir)/internal/vm.h +signal.$(OBJEXT): $(top_srcdir)/internal/warnings.h signal.$(OBJEXT): {$(VPATH)}assert.h signal.$(OBJEXT): {$(VPATH)}config.h signal.$(OBJEXT): {$(VPATH)}debug_counter.h @@ -3652,6 +3736,7 @@ string.$(OBJEXT): $(top_srcdir)/internal/stdbool.h string.$(OBJEXT): $(top_srcdir)/internal/string.h string.$(OBJEXT): $(top_srcdir)/internal/transcode.h string.$(OBJEXT): $(top_srcdir)/internal/vm.h +string.$(OBJEXT): $(top_srcdir)/internal/warnings.h string.$(OBJEXT): {$(VPATH)}assert.h string.$(OBJEXT): {$(VPATH)}config.h string.$(OBJEXT): {$(VPATH)}crypt.h @@ -3703,6 +3788,7 @@ struct.$(OBJEXT): $(top_srcdir)/internal/string.h struct.$(OBJEXT): $(top_srcdir)/internal/struct.h struct.$(OBJEXT): $(top_srcdir)/internal/symbol.h struct.$(OBJEXT): $(top_srcdir)/internal/vm.h +struct.$(OBJEXT): $(top_srcdir)/internal/warnings.h struct.$(OBJEXT): {$(VPATH)}assert.h struct.$(OBJEXT): {$(VPATH)}config.h struct.$(OBJEXT): {$(VPATH)}defines.h @@ -3739,6 +3825,7 @@ symbol.$(OBJEXT): $(top_srcdir)/internal/stdbool.h symbol.$(OBJEXT): $(top_srcdir)/internal/string.h symbol.$(OBJEXT): $(top_srcdir)/internal/symbol.h symbol.$(OBJEXT): $(top_srcdir)/internal/vm.h +symbol.$(OBJEXT): $(top_srcdir)/internal/warnings.h symbol.$(OBJEXT): {$(VPATH)}assert.h symbol.$(OBJEXT): {$(VPATH)}config.h symbol.$(OBJEXT): {$(VPATH)}defines.h @@ -3884,6 +3971,7 @@ transient_heap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h transient_heap.$(OBJEXT): $(top_srcdir)/internal/stdbool.h transient_heap.$(OBJEXT): $(top_srcdir)/internal/struct.h transient_heap.$(OBJEXT): $(top_srcdir)/internal/variable.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/warnings.h transient_heap.$(OBJEXT): {$(VPATH)}assert.h transient_heap.$(OBJEXT): {$(VPATH)}config.h transient_heap.$(OBJEXT): {$(VPATH)}constant.h @@ -3942,6 +4030,7 @@ variable.$(OBJEXT): $(top_srcdir)/internal/symbol.h variable.$(OBJEXT): $(top_srcdir)/internal/thread.h variable.$(OBJEXT): $(top_srcdir)/internal/variable.h variable.$(OBJEXT): $(top_srcdir)/internal/vm.h +variable.$(OBJEXT): $(top_srcdir)/internal/warnings.h variable.$(OBJEXT): {$(VPATH)}assert.h variable.$(OBJEXT): {$(VPATH)}config.h variable.$(OBJEXT): {$(VPATH)}constant.h @@ -3984,6 +4073,7 @@ version.$(OBJEXT): $(top_srcdir)/internal/serial.h version.$(OBJEXT): $(top_srcdir)/internal/static_assert.h version.$(OBJEXT): $(top_srcdir)/internal/stdbool.h version.$(OBJEXT): $(top_srcdir)/internal/vm.h +version.$(OBJEXT): $(top_srcdir)/internal/warnings.h version.$(OBJEXT): $(top_srcdir)/revision.h version.$(OBJEXT): $(top_srcdir)/version.h version.$(OBJEXT): {$(VPATH)}assert.h @@ -4042,6 +4132,7 @@ vm.$(OBJEXT): $(top_srcdir)/internal/string.h vm.$(OBJEXT): $(top_srcdir)/internal/symbol.h vm.$(OBJEXT): $(top_srcdir)/internal/variable.h vm.$(OBJEXT): $(top_srcdir)/internal/vm.h +vm.$(OBJEXT): $(top_srcdir)/internal/warnings.h vm.$(OBJEXT): {$(VPATH)}assert.h vm.$(OBJEXT): {$(VPATH)}builtin.h vm.$(OBJEXT): {$(VPATH)}config.h @@ -4105,6 +4196,7 @@ vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/serial.h vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/stdbool.h vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/vm.h +vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/warnings.h vm_backtrace.$(OBJEXT): {$(VPATH)}assert.h vm_backtrace.$(OBJEXT): {$(VPATH)}config.h vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h @@ -4144,6 +4236,7 @@ vm_dump.$(OBJEXT): $(top_srcdir)/internal/static_assert.h vm_dump.$(OBJEXT): $(top_srcdir)/internal/stdbool.h vm_dump.$(OBJEXT): $(top_srcdir)/internal/variable.h vm_dump.$(OBJEXT): $(top_srcdir)/internal/vm.h +vm_dump.$(OBJEXT): $(top_srcdir)/internal/warnings.h vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h vm_dump.$(OBJEXT): {$(VPATH)}assert.h vm_dump.$(OBJEXT): {$(VPATH)}config.h diff --git a/ext/coverage/depend b/ext/coverage/depend index 23a45a3379f456..18f3a863352ba8 100644 --- a/ext/coverage/depend +++ b/ext/coverage/depend @@ -27,6 +27,7 @@ coverage.o: $(top_srcdir)/internal/static_assert.h coverage.o: $(top_srcdir)/internal/stdbool.h coverage.o: $(top_srcdir)/internal/thread.h coverage.o: $(top_srcdir)/internal/vm.h +coverage.o: $(top_srcdir)/internal/warnings.h coverage.o: $(top_srcdir)/method.h coverage.o: $(top_srcdir)/node.h coverage.o: $(top_srcdir)/ruby_assert.h diff --git a/ext/objspace/depend b/ext/objspace/depend index 3107b5bc11966c..3c5ee9b9b150ee 100644 --- a/ext/objspace/depend +++ b/ext/objspace/depend @@ -43,6 +43,7 @@ objspace.o: $(top_srcdir)/internal/imemo.h objspace.o: $(top_srcdir)/internal/serial.h objspace.o: $(top_srcdir)/internal/static_assert.h objspace.o: $(top_srcdir)/internal/stdbool.h +objspace.o: $(top_srcdir)/internal/warnings.h objspace.o: $(top_srcdir)/node.h objspace.o: $(top_srcdir)/symbol.h objspace.o: objspace.c @@ -80,6 +81,7 @@ objspace_dump.o: $(top_srcdir)/internal/static_assert.h objspace_dump.o: $(top_srcdir)/internal/stdbool.h objspace_dump.o: $(top_srcdir)/internal/string.h objspace_dump.o: $(top_srcdir)/internal/vm.h +objspace_dump.o: $(top_srcdir)/internal/warnings.h objspace_dump.o: $(top_srcdir)/method.h objspace_dump.o: $(top_srcdir)/node.h objspace_dump.o: $(top_srcdir)/ruby_assert.h diff --git a/ext/pty/depend b/ext/pty/depend index 21e564da1aa3dd..09c364102d63d4 100644 --- a/ext/pty/depend +++ b/ext/pty/depend @@ -24,5 +24,6 @@ pty.o: $(top_srcdir)/internal/process.h pty.o: $(top_srcdir)/internal/signal.h pty.o: $(top_srcdir)/internal/static_assert.h pty.o: $(top_srcdir)/internal/stdbool.h +pty.o: $(top_srcdir)/internal/warnings.h pty.o: pty.c # AUTOGENERATED DEPENDENCIES END diff --git a/ext/ripper/depend b/ext/ripper/depend index d53d753e9e4537..851af739494df5 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -93,6 +93,7 @@ ripper.o: $(top_srcdir)/internal/thread.h ripper.o: $(top_srcdir)/internal/util.h ripper.o: $(top_srcdir)/internal/variable.h ripper.o: $(top_srcdir)/internal/vm.h +ripper.o: $(top_srcdir)/internal/warnings.h ripper.o: $(top_srcdir)/node.h ripper.o: $(top_srcdir)/regenc.h ripper.o: $(top_srcdir)/symbol.h diff --git a/ext/socket/depend b/ext/socket/depend index 32fba89ca6ebaa..669311cc74ca2a 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -39,6 +39,7 @@ ancdata.o: $(top_srcdir)/internal/stdbool.h ancdata.o: $(top_srcdir)/internal/string.h ancdata.o: $(top_srcdir)/internal/thread.h ancdata.o: $(top_srcdir)/internal/vm.h +ancdata.o: $(top_srcdir)/internal/warnings.h ancdata.o: ancdata.c ancdata.o: constdefs.h ancdata.o: rubysocket.h @@ -72,6 +73,7 @@ basicsocket.o: $(top_srcdir)/internal/stdbool.h basicsocket.o: $(top_srcdir)/internal/string.h basicsocket.o: $(top_srcdir)/internal/thread.h basicsocket.o: $(top_srcdir)/internal/vm.h +basicsocket.o: $(top_srcdir)/internal/warnings.h basicsocket.o: basicsocket.c basicsocket.o: constdefs.h basicsocket.o: rubysocket.h @@ -105,6 +107,7 @@ constants.o: $(top_srcdir)/internal/stdbool.h constants.o: $(top_srcdir)/internal/string.h constants.o: $(top_srcdir)/internal/thread.h constants.o: $(top_srcdir)/internal/vm.h +constants.o: $(top_srcdir)/internal/warnings.h constants.o: constants.c constants.o: constdefs.c constants.o: constdefs.h @@ -139,6 +142,7 @@ ifaddr.o: $(top_srcdir)/internal/stdbool.h ifaddr.o: $(top_srcdir)/internal/string.h ifaddr.o: $(top_srcdir)/internal/thread.h ifaddr.o: $(top_srcdir)/internal/vm.h +ifaddr.o: $(top_srcdir)/internal/warnings.h ifaddr.o: constdefs.h ifaddr.o: ifaddr.c ifaddr.o: rubysocket.h @@ -172,6 +176,7 @@ init.o: $(top_srcdir)/internal/stdbool.h init.o: $(top_srcdir)/internal/string.h init.o: $(top_srcdir)/internal/thread.h init.o: $(top_srcdir)/internal/vm.h +init.o: $(top_srcdir)/internal/warnings.h init.o: constdefs.h init.o: init.c init.o: rubysocket.h @@ -205,6 +210,7 @@ ipsocket.o: $(top_srcdir)/internal/stdbool.h ipsocket.o: $(top_srcdir)/internal/string.h ipsocket.o: $(top_srcdir)/internal/thread.h ipsocket.o: $(top_srcdir)/internal/vm.h +ipsocket.o: $(top_srcdir)/internal/warnings.h ipsocket.o: constdefs.h ipsocket.o: ipsocket.c ipsocket.o: rubysocket.h @@ -238,6 +244,7 @@ option.o: $(top_srcdir)/internal/stdbool.h option.o: $(top_srcdir)/internal/string.h option.o: $(top_srcdir)/internal/thread.h option.o: $(top_srcdir)/internal/vm.h +option.o: $(top_srcdir)/internal/warnings.h option.o: constdefs.h option.o: option.c option.o: rubysocket.h @@ -271,6 +278,7 @@ raddrinfo.o: $(top_srcdir)/internal/stdbool.h raddrinfo.o: $(top_srcdir)/internal/string.h raddrinfo.o: $(top_srcdir)/internal/thread.h raddrinfo.o: $(top_srcdir)/internal/vm.h +raddrinfo.o: $(top_srcdir)/internal/warnings.h raddrinfo.o: constdefs.h raddrinfo.o: raddrinfo.c raddrinfo.o: rubysocket.h @@ -304,6 +312,7 @@ socket.o: $(top_srcdir)/internal/stdbool.h socket.o: $(top_srcdir)/internal/string.h socket.o: $(top_srcdir)/internal/thread.h socket.o: $(top_srcdir)/internal/vm.h +socket.o: $(top_srcdir)/internal/warnings.h socket.o: constdefs.h socket.o: rubysocket.h socket.o: socket.c @@ -337,6 +346,7 @@ sockssocket.o: $(top_srcdir)/internal/stdbool.h sockssocket.o: $(top_srcdir)/internal/string.h sockssocket.o: $(top_srcdir)/internal/thread.h sockssocket.o: $(top_srcdir)/internal/vm.h +sockssocket.o: $(top_srcdir)/internal/warnings.h sockssocket.o: constdefs.h sockssocket.o: rubysocket.h sockssocket.o: sockport.h @@ -370,6 +380,7 @@ tcpserver.o: $(top_srcdir)/internal/stdbool.h tcpserver.o: $(top_srcdir)/internal/string.h tcpserver.o: $(top_srcdir)/internal/thread.h tcpserver.o: $(top_srcdir)/internal/vm.h +tcpserver.o: $(top_srcdir)/internal/warnings.h tcpserver.o: constdefs.h tcpserver.o: rubysocket.h tcpserver.o: sockport.h @@ -403,6 +414,7 @@ tcpsocket.o: $(top_srcdir)/internal/stdbool.h tcpsocket.o: $(top_srcdir)/internal/string.h tcpsocket.o: $(top_srcdir)/internal/thread.h tcpsocket.o: $(top_srcdir)/internal/vm.h +tcpsocket.o: $(top_srcdir)/internal/warnings.h tcpsocket.o: constdefs.h tcpsocket.o: rubysocket.h tcpsocket.o: sockport.h @@ -436,6 +448,7 @@ udpsocket.o: $(top_srcdir)/internal/stdbool.h udpsocket.o: $(top_srcdir)/internal/string.h udpsocket.o: $(top_srcdir)/internal/thread.h udpsocket.o: $(top_srcdir)/internal/vm.h +udpsocket.o: $(top_srcdir)/internal/warnings.h udpsocket.o: constdefs.h udpsocket.o: rubysocket.h udpsocket.o: sockport.h @@ -469,6 +482,7 @@ unixserver.o: $(top_srcdir)/internal/stdbool.h unixserver.o: $(top_srcdir)/internal/string.h unixserver.o: $(top_srcdir)/internal/thread.h unixserver.o: $(top_srcdir)/internal/vm.h +unixserver.o: $(top_srcdir)/internal/warnings.h unixserver.o: constdefs.h unixserver.o: rubysocket.h unixserver.o: sockport.h @@ -502,6 +516,7 @@ unixsocket.o: $(top_srcdir)/internal/stdbool.h unixsocket.o: $(top_srcdir)/internal/string.h unixsocket.o: $(top_srcdir)/internal/thread.h unixsocket.o: $(top_srcdir)/internal/vm.h +unixsocket.o: $(top_srcdir)/internal/warnings.h unixsocket.o: constdefs.h unixsocket.o: rubysocket.h unixsocket.o: sockport.h From 79c420267672dbfde257d77eb9d94c996920f368 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:09:24 -0800 Subject: [PATCH 239/878] Revert "Remove TEST_BUNDLED_GEMS_ALLOW_FAILURES" This reverts commit 75e8dd58f69c190c9698d0133942032903fb2f07. We seem to randomly hit another issue these days: https://github.com/ruby/ruby/runs/368756135 https://github.com/ruby/ruby/runs/368756191 --- .github/workflows/macos.yml | 2 ++ .github/workflows/ubuntu.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 724081d9dc113f..c3af98ad180e7d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -63,6 +63,8 @@ jobs: run: make -C build $JOBS -s ${{ matrix.test_task }} env: RUBY_TESTOPTS: "-q --tty=no" + # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest" - name: Leaked Globals run: make -C build -s leaked-globals - uses: k0kubun/action-slack@v2.0.0 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 885f078f073a2e..0b3dea7e689523 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -97,6 +97,8 @@ jobs: run: make -C build $JOBS -s ${{ matrix.test_task }} env: RUBY_TESTOPTS: "-q --tty=no" + # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest" - name: Leaked Globals run: make -C build -s leaked-globals - uses: k0kubun/action-slack@v2.0.0 From eb2b4258214337f165eb994e2c5b9c2a3f6ae0a8 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Tue, 31 Dec 2019 01:19:31 -0600 Subject: [PATCH 240/878] MinGW on Actions (#2791) * MinGW - skip spec in spec/ruby/optional/capi/thread_spec.rb C-API Thread function rb_thread_call_without_gvl -- runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO stops/freezes spec tests See https://bugs.ruby-lang.org/issues/16265 * MinGW - skip test test/resolv/test_dns.rb Test times out in CI (both AppVeyor & Actions), cannot repo locally * MinGW - skip test test/ruby/test_thread_queue.rb * Add Actions mingw.yml --- .github/workflows/mingw.yml | 133 +++++++++++++++++++++++++ spec/ruby/optional/capi/thread_spec.rb | 28 +++--- test/resolv/test_dns.rb | 17 +++- test/ruby/test_thread_queue.rb | 4 + 4 files changed, 165 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/mingw.yml diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml new file mode 100644 index 00000000000000..e7546077cef190 --- /dev/null +++ b/.github/workflows/mingw.yml @@ -0,0 +1,133 @@ +name: Windows +on: + push: + branches: + - '*' + pull_request: + branches: + - '*' + +# Notes: +# Action ENV TEMP and TMP are short 8.3 paths, but the long path differs. +# Code uses TMPDIR, which is Ruby's 'first' check +# +# Console encoding causes issues, see test-all & test-spec steps +# +jobs: + mingw: + runs-on: windows-2019 + env: + MSYSTEM: MINGW64 + MSYSTEM_PREFIX: /mingw64 + MSYS2_ARCH: x86_64 + CHOST: "x86_64-w64-mingw32" + CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong" + CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" + CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048" + LDFLAGS: "-pipe -fstack-protector-strong" + UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." + strategy: + fail-fast: false + if: "!contains(github.event.head_commit.message, '[ci skip]')" + steps: + - name: git config + run: | + git config --system core.autocrlf false + git config --system core.eol lf + - name: Checkout repo + uses: actions/checkout@v2 + with: + path: src + - run: ./src/tool/actions-commit-info.sh + shell: bash + id: commit_info + - name: Set up Ruby & MSYS2 + uses: MSP-Greg/actions-ruby@master + with: + ruby-version: 2.6.x + base: update + mingw: gdbm gmp libffi libyaml openssl ragel readline + msys2: automake1.16 bison + - name: where check + run: | + # show where + Write-Host + $where = 'gcc.exe', 'ragel.exe', 'make.exe', 'bison.exe', 'libcrypto-1_1-x64.dll', 'libssl-1_1-x64.dll' + foreach ($e in $where) { + $rslt = where.exe $e 2>&1 | Out-String + if ($rslt.contains($e)) { Write-Host $rslt } + else { Write-Host "`nCan't find $e" } + } + - name: misc setup, autoreconf + run: | + mkdir build + mkdir install + mkdir temp + cd src + sh -c "autoreconf -fi" + + - name: configure + run: | + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + cd build + $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST" + Write-Host $config_args + sh -c "../src/configure --disable-install-doc --prefix=/install $config_args" + # Write-Host "-------------------------------------- config.log" + # Get-Content ./config.log | foreach {Write-Output $_} + + - name: download unicode, gems, etc + run: | + $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + cd build + make -j $jobs update-unicode + make -j $jobs update-gems + + - name: make compile + timeout-minutes: 20 + run: | + $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + make -C build -j $jobs V=1 + + - name: make install + run: | + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + make -C build DESTDIR=.. install-nodoc + + - name: test + timeout-minutes: 5 + run: | + $env:TMPDIR = "$pwd/temp" + make -C build test + + - name: test-spec + if: success() || failure() + timeout-minutes: 10 + run: | + $env:TMPDIR = "$pwd/temp" + $env:PATH = "$pwd/install/bin;$env:PATH" + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + ruby -v + cd src/spec/ruby + ruby ../mspec/bin/mspec -j + + - name: test-all + if: success() || failure() + timeout-minutes: 25 + run: | + $env:TMPDIR = "$pwd/temp" + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + $jobs = [int]$env:NUMBER_OF_PROCESSORS + make -C build test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../src/test/excludes -n !/memory_leak/ -j $jobs" diff --git a/spec/ruby/optional/capi/thread_spec.rb b/spec/ruby/optional/capi/thread_spec.rb index 17fe373fda019e..df454d1ea8468d 100644 --- a/spec/ruby/optional/capi/thread_spec.rb +++ b/spec/ruby/optional/capi/thread_spec.rb @@ -121,23 +121,25 @@ def call_capi_rb_thread_wakeup thr.value.should be_true end - it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do - thr = Thread.new do - @t.rb_thread_call_without_gvl_with_ubf_io - end + guard -> { platform_is :mingw and ruby_version_is ""..."2.7" } do + it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do + thr = Thread.new do + @t.rb_thread_call_without_gvl_with_ubf_io + end - # Wait until it's blocking... - Thread.pass while thr.status and thr.status != "sleep" + # Wait until it's blocking... + Thread.pass while thr.status and thr.status != "sleep" - # The thread status is set to sleep by rb_thread_call_without_gvl(), - # but the thread might not be in the blocking read(2) yet, so wait a bit. - sleep 0.1 + # The thread status is set to sleep by rb_thread_call_without_gvl(), + # but the thread might not be in the blocking read(2) yet, so wait a bit. + sleep 0.1 - # Wake it up, causing the unblock function to be run. - thr.wakeup + # Wake it up, causing the unblock function to be run. + thr.wakeup - # Make sure it stopped and we got a proper value - thr.value.should be_true + # Make sure it stopped and we got a proper value + thr.value.should be_true + end end end end diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index d69bec8256accd..70d50677507916 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -162,10 +162,19 @@ def test_no_server # A race condition here. # Another program may use the port. # But no way to prevent it. - Timeout.timeout(5) do - Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns| - assert_equal([], dns.getresources("test-no-server.example.org", Resolv::DNS::Resource::IN::A)) - } + begin + Timeout.timeout(5) do + Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns| + assert_equal([], dns.getresources("test-no-server.example.org", Resolv::DNS::Resource::IN::A)) + } + end + rescue Timeout::Error + if RUBY_PLATFORM.match?(/mingw/) + # cannot repo locally + skip 'Timeout Error on MinGW CI' + else + raise Timeout::Error + end end end diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb index e46f0b2e8e0acf..41e6865ed4fdcc 100644 --- a/test/ruby/test_thread_queue.rb +++ b/test/ruby/test_thread_queue.rb @@ -560,6 +560,10 @@ def test_queue_with_trap if ENV['APPVEYOR'] == 'True' && RUBY_PLATFORM.match?(/mswin/) skip 'This test fails too often on AppVeyor vs140' end + if RUBY_PLATFORM.match?(/mingw/) + skip 'This test fails too often on MinGW' + end + assert_in_out_err([], <<-INPUT, %w(INT INT exit), []) q = Queue.new trap(:INT){ From b00418732c89ce42c1c4cef57d08344659fbdd2b Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:20:17 -0800 Subject: [PATCH 241/878] Drop MinGW build from AppVeyor in favor of #2791 --- appveyor.yml | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bf10c97222b799..623d6288792c9c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,10 +10,6 @@ environment: ruby_version: "24-%Platform%" zlib_version: "1.2.11" matrix: - # to reduce time for finishing all jobs, run the slowest msys2 build first. - - build: msys2 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - GEMS_FOR_TEST: "timezone tzinfo" - build: vs vs: 120 ssl: OpenSSL @@ -78,52 +74,6 @@ for: # separately execute tests without -j which may crash worker with -j. - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb" - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows -- - matrix: - only: - - build: msys2 - install: - - ver - - chcp - - set /a JOBS=%NUMBER_OF_PROCESSORS% - - set MSYS_NO_PATHCONV=1 - - SET MSYSTEM=%Platform:x86=32% - - SET MSYSTEM=%MSYSTEM:x=MINGW% - - SET MSYS2_ARCH=%Platform:x86=i686% - - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64% - - set MSYSTEM_PREFIX=/mingw64 - - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32 - - SET ruby_path=C:\Ruby%ruby_version:-x86=% - - cd .. - - mkdir build - - mkdir install - - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH% - - ruby --version - build_script: - - pacman -Syd --noconfirm --noprogressbar --needed mingw-w64-x86_64-binutils mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-gcc - # when fixed in MSYS2 / Mingw-w64, remove above and use normal code below - #- pacman -Sy --noconfirm --noprogressbar --needed mingw-w64-x86_64-toolchain - - pacman -S --noconfirm --noprogressbar --needed mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-libyaml mingw-w64-x86_64-openssl mingw-w64-x86_64-ragel mingw-w64-x86_64-readline mingw-w64-x86_64-zlib - - cd %APPVEYOR_BUILD_FOLDER% - - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe - - set CXXFLAGS=%CFLAGS% - - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 - - set LDFLAGS=-pipe - - sh -c "autoreconf -fi" - - cd ..\build - - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST% - - mingw32-make %mflags% touch-unicode-files - - mingw32-make -j%JOBS% %UPDATE_UNICODE% up incs - - mingw32-make -j%JOBS% V=1 - - mingw32-make DESTDIR=../install install-nodoc - - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST% - - ..\install\bin\ruby.exe -v -ropenssl -e "puts 'Build ' + OpenSSL::OPENSSL_VERSION, 'Runtime ' + OpenSSL::OPENSSL_LIBRARY_VERSION" - test_script: - - mingw32-make test - - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri" - # separately execute tests without -j which may crash worker with -j. - - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb" - - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows notifications: # Using "Webhook" with templated body to skip notification on Pull Request - provider: Webhook From fe158e4c6536432fec4b3f236910c5fcd9689c29 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:23:25 -0800 Subject: [PATCH 242/878] Do not doubly build on trunk --- .github/workflows/mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index e7546077cef190..9a1d50a616ddc8 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -2,7 +2,7 @@ name: Windows on: push: branches: - - '*' + - master pull_request: branches: - '*' From f98650e9f8602bfcf8fbb9fe63c2e1bc08ded81f Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:30:34 -0800 Subject: [PATCH 243/878] Make all Actions job names consistent like "{platform} / make ({make target}, ...)" --- .github/workflows/mingw.yml | 6 ++++-- .github/workflows/mjit.yml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 9a1d50a616ddc8..9c7fee8f7e6255 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -1,4 +1,4 @@ -name: Windows +name: MinGW on: push: branches: @@ -14,7 +14,7 @@ on: # Console encoding causes issues, see test-all & test-spec steps # jobs: - mingw: + make: runs-on: windows-2019 env: MSYSTEM: MINGW64 @@ -27,6 +27,8 @@ jobs: LDFLAGS: "-pipe -fstack-protector-strong" UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." strategy: + matrix: + test_task: [ "check" ] # not used, but to make job names consistent fail-fast: false if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index d23c136619b2a4..d6ebcaf75f0c86 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -7,9 +7,10 @@ on: branches: - '*' jobs: - test: + make: strategy: matrix: + test_task: [ "check" ] # not used, but to make job names consistent jit_opts: [ "--jit", "--jit-wait" ] fail-fast: false runs-on: ubuntu-latest From 8136fec6e4d3acb19d5f40f539fd8b98d2d9b84b Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:42:20 -0800 Subject: [PATCH 244/878] There's no such target --- .github/workflows/mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 9c7fee8f7e6255..3e9db003a61c8d 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -88,7 +88,7 @@ jobs: make -j $jobs update-unicode make -j $jobs update-gems - - name: make compile + - name: make all timeout-minutes: 20 run: | $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 From 38c35dd22d0d792309873fb5232758646c1f8569 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 30 Dec 2019 23:46:17 -0800 Subject: [PATCH 245/878] Make Slack notifications consistent --- .github/workflows/mingw.yml | 17 ++++++++++++++++- .github/workflows/mjit.yml | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 3e9db003a61c8d..89ece0d013e5a5 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -28,7 +28,7 @@ jobs: UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." strategy: matrix: - test_task: [ "check" ] # not used, but to make job names consistent + test_task: [ "check" ] # to make job names consistent fail-fast: false if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: @@ -133,3 +133,18 @@ jobs: [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") $jobs = [int]$env:NUMBER_OF_PROCESSORS make -C build test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../src/test/excludes -n !/memory_leak/ -j $jobs" + + - uses: k0kubun/action-slack@v2.0.0 + with: + payload: | + { + "attachments": [{ + "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} " + + "() " + + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "color": "danger" + }] + } + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + if: failure() && github.event_name == 'push' diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index d6ebcaf75f0c86..cdb41701ded6b4 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -10,7 +10,7 @@ jobs: make: strategy: matrix: - test_task: [ "check" ] # not used, but to make job names consistent + test_task: [ "check" ] # to make job names consistent jit_opts: [ "--jit", "--jit-wait" ] fail-fast: false runs-on: ubuntu-latest @@ -69,7 +69,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.jit_opts }} " + + "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", "color": "danger" From 56a74659cc084b8a8e45cf076026be0a6d8660b0 Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Tue, 31 Dec 2019 17:27:24 +0900 Subject: [PATCH 246/878] Copy-editing NEWS file on "is now warned" messages (#2783) The phrase "[doing X] is now warned" is not grammatically correct in English as it is lacking an object. We can make these sentences read better by switching to "[doing X] will now display a warning" instead. --- NEWS | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index e1adb5115dbcbc..4ff6cf09dcfcad 100644 --- a/NEWS +++ b/NEWS @@ -149,8 +149,8 @@ sufficient information, see the ChangeLog file or Redmine ==== proc/lambda without block is deprecated -* Proc.new and Kernel#proc with no block in a method called with a block is - warned now. +* Proc.new and Kernel#proc with no block in a method called with a block will + now display a warning. def foo proc @@ -183,12 +183,12 @@ sufficient information, see the ChangeLog file or Redmine where(sales: ..100) -* Setting $; to a non-nil value is warned now. [Feature #14240] - Use of it in String#split is warned too. +* Setting $; to a non-nil value will now display a warning. [Feature #14240] + This includes the usage in String#split. This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. -* Setting $, to a non-nil value is warned now. [Feature #14240] - Use of it in Array#join is warned too. +* Setting $, to a non-nil value will now display a warning. [Feature #14240] + This include the usage in Array#join. This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. * Quoted here-document identifiers must end within the same line. @@ -215,7 +215,8 @@ sufficient information, see the ChangeLog file or Redmine # Previously parsed as: (a, b = raise) rescue [1, 2] # Now parsed as: a, b = (raise rescue [1, 2]) -* +yield+ in singleton class syntax is warned and will be deprecated later. [Feature #15575]. +* +yield+ in singleton class syntax will now display a warning. This behavior + will soon be deprecated. [Feature #15575]. def foo class << Object.new @@ -237,12 +238,13 @@ sufficient information, see the ChangeLog file or Redmine Note that the parentheses are mandatory. bar ... is parsed as an endless range. -* Access and setting of $SAFE is now always warned. $SAFE - will become a normal global variable in Ruby 3.0. [Feature #16131] +* Access and setting of $SAFE will now always display a warning. + $SAFE will become a normal global variable in Ruby 3.0. + [Feature #16131] * Object#{taint,untaint,trust,untrust} and related functions in the C-API - no longer have an effect (all objects are always considered untainted), and are now - warned in verbose mode. This warning will be disabled even in non-verbose mode in + no longer have an effect (all objects are always considered untainted), and will now + display a warning in verbose mode. This warning will be disabled even in non-verbose mode in Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131] * Refinements take place at Object#method and Module#instance_method. [Feature #15373] From d912393e09da82d096cbd18a138a106637ef10b7 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Tue, 31 Dec 2019 02:29:58 -0600 Subject: [PATCH 247/878] text/readline/test_readline.rb - fix skip on Reline (#2743) TestRelineAsReadline#test_input_metachar passes on MinGW --- test/readline/test_readline.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index be9ac24d25da22..b77e3a0ead34bc 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -433,7 +433,8 @@ def test_modify_text_in_pre_input_hook def test_input_metachar skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) - skip("Won't pass on mingw w/readline 7.0.005 [ruby-core:45682]") if mingw? + # test will pass on Windows reline, but not readline + skip "Won't pass on mingw readline.so using 8.0.001" if mingw? and defined?(TestReadline) and kind_of?(TestReadline) skip 'Needs GNU Readline 6 or later' if windows? and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' bug6601 = '[ruby-core:45682]' Readline::HISTORY << "hello" From 26ee0af4b34afc5f622ebcc66dcc17424ef2372e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 17:12:01 +0900 Subject: [PATCH 248/878] Test the bundled version minitest instead of master Minitest has the released tags now. --- tool/fetch-bundled_gems.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb index ba16d726fdb265..c2a1c0b70053a3 100755 --- a/tool/fetch-bundled_gems.rb +++ b/tool/fetch-bundled_gems.rb @@ -10,8 +10,6 @@ n, v, u = $F case n -when "minitest" - v = "master" when "test-unit" else v = "v" + v From 3096baec0e4c24e325885f7dcd4956e8c0421f73 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Tue, 31 Dec 2019 18:16:21 +0900 Subject: [PATCH 249/878] Copy NEWS to doc/NEWS-2.7.0 --- doc/NEWS-2.7.0 | 828 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 828 insertions(+) create mode 100644 doc/NEWS-2.7.0 diff --git a/doc/NEWS-2.7.0 b/doc/NEWS-2.7.0 new file mode 100644 index 00000000000000..4ff6cf09dcfcad --- /dev/null +++ b/doc/NEWS-2.7.0 @@ -0,0 +1,828 @@ +# -*- rdoc -*- + += NEWS for Ruby 2.7.0 + +This document is a list of user visible feature changes made between +releases except for bug fixes. + +Note that each entry is kept so brief that no reason behind or reference +information is supplied with. For a full list of changes with all +sufficient information, see the ChangeLog file or Redmine +(e.g. https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER). + +== Changes since the 2.6.0 release + +=== Language changes + +==== Pattern matching + +* Pattern matching is introduced as an experimental feature. [Feature #14912] + + case [0, [1, 2, 3]] + in [a, [b, *c]] + p a #=> 0 + p b #=> 1 + p c #=> [2, 3] + end + + case {a: 0, b: 1} + in {a: 0, x: 1} + :unreachable + in {a: 0, b: var} + p var #=> 1 + end + + case -1 + in 0 then :unreachable + in 1 then :unreachable + end #=> NoMatchingPatternError + + json = < "Bob" + p age #=> 2 + + JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]} + #=> NoMatchingPatternError + +* See the following slides for more details: + * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7 + * Note that the slides are slightly obsolete. + +* The warning against pattern matching can be suppressed with + {-W:no-experimental option}[#label-Warning+option]. + +==== The spec of keyword arguments is changed towards 3.0 + +* Automatic conversion of keyword arguments and positional arguments is + deprecated, and conversion will be removed in Ruby 3. [Feature #14183] + + * When a method call passes a Hash at the last argument, and when it + passes no keywords, and when the called method accepts keywords, + a warning is emitted. To continue treating the hash as keywords, + add a double splat operator to avoid the warning and ensure + correct behavior in Ruby 3. + + def foo(key: 42); end; foo({key: 42}) # warned + def foo(**kw); end; foo({key: 42}) # warned + def foo(key: 42); end; foo(**{key: 42}) # OK + def foo(**kw); end; foo(**{key: 42}) # OK + + * When a method call passes keywords to a method that accepts keywords, + but it does not pass enough required positional arguments, the + keywords are treated as a final required positional argument, and a + warning is emitted. Pass the argument as a hash instead of keywords + to avoid the warning and ensure correct behavior in Ruby 3. + + def foo(h, **kw); end; foo(key: 42) # warned + def foo(h, key: 42); end; foo(key: 42) # warned + def foo(h, **kw); end; foo({key: 42}) # OK + def foo(h, key: 42); end; foo({key: 42}) # OK + + * When a method accepts specific keywords but not a keyword splat, and + a hash or keywords splat is passed to the method that includes both + Symbol and non-Symbol keys, the hash will continue to be split, and + a warning will be emitted. You will need to update the calling code + to pass separate hashes to ensure correct behavior in Ruby 3. + + def foo(h={}, key: 42); end; foo("key" => 43, key: 42) # warned + def foo(h={}, key: 42); end; foo({"key" => 43, key: 42}) # warned + def foo(h={}, key: 42); end; foo({"key" => 43}, key: 42) # OK + + * If a method does not accept keywords, and is called with keywords, + the keywords are still treated as a positional hash, with no warning. + This behavior will continue to work in Ruby 3. + + def foo(opt={}); end; foo( key: 42 ) # OK + +* Non-symbols are allowed as keyword argument keys if the method accepts + arbitrary keywords. [Feature #14183] + + * Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0, + but are now allowed again. [Bug #15658] + + def foo(**kw); p kw; end; foo("str" => 1) #=> {"str"=>1} + +* **nil is allowed in method definitions to explicitly mark + that the method accepts no keywords. Calling such a method with keywords + will result in an ArgumentError. [Feature #14183] + + def foo(h, **nil); end; foo(key: 1) # ArgumentError + def foo(h, **nil); end; foo(**{key: 1}) # ArgumentError + def foo(h, **nil); end; foo("str" => 1) # ArgumentError + def foo(h, **nil); end; foo({key: 1}) # OK + def foo(h, **nil); end; foo({"str" => 1}) # OK + +* Passing an empty keyword splat to a method that does not accept keywords + no longer passes an empty hash, unless the empty hash is necessary for + a required parameter, in which case a warning will be emitted. Remove + the double splat to continue passing a positional hash. [Feature #14183] + + h = {}; def foo(*a) a end; foo(**h) # [] + h = {}; def foo(a) a end; foo(**h) # {} and warning + h = {}; def foo(*a) a end; foo(h) # [{}] + h = {}; def foo(a) a end; foo(h) # {} + +* Above warnings can be suppressed also with {-W:no-deprecated option}[#label-Warning+option]. + +==== Numbered parameters + +* Numbered parameters as default block parameters are introduced. + [Feature #4475] + + [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] + [[1, 2], [3, 4]].map { _1 + _2 } #=> [3, 7] + + You can still define a local variable named +_1+ and so on, + and that is honored when present, but renders a warning. + + _1 = 0 #=> warning: `_1' is reserved for numbered parameter; consider another name + [1].each { p _1 } # prints 0 instead of 1 + +==== proc/lambda without block is deprecated + +* Proc.new and Kernel#proc with no block in a method called with a block will + now display a warning. + + def foo + proc + end + foo { puts "Hello" } #=> warning: Capturing the given block using Kernel#proc is deprecated; use `&block` instead + + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + +* Kernel#lambda with no block in a method called with a block raises an exception. + + def bar + lambda + end + bar { puts "Hello" } #=> tried to create Proc object without a block (ArgumentError) + +==== Other miscellaneous changes + +* A beginless range is experimentally introduced. It might be useful + in +case+, new call-sequence of the Comparable#clamp, + constants and DSLs. [Feature #14799] + + ary[..3] # identical to ary[0..3] + + case RUBY_VERSION + when ..."2.4" then puts "EOL" + # ... + end + + age.clamp(..100) + + where(sales: ..100) + +* Setting $; to a non-nil value will now display a warning. [Feature #14240] + This includes the usage in String#split. + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + +* Setting $, to a non-nil value will now display a warning. [Feature #14240] + This include the usage in Array#join. + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + +* Quoted here-document identifiers must end within the same line. + + <<"EOS + " # This had been warned since 2.4; Now it raises a SyntaxError + EOS + +* The flip-flop syntax deprecation is reverted. [Feature #5400] + +* Comment lines can be placed between fluent dot now. + + foo + # .bar + .baz # => foo.baz + +* Calling a private method with a literal +self+ as the receiver + is now allowed. [Feature #11297] [Feature #16123] + +* Modifier rescue now operates the same for multiple assignment as single + assignment. [Bug #8279] + + a, b = raise rescue [1, 2] + # Previously parsed as: (a, b = raise) rescue [1, 2] + # Now parsed as: a, b = (raise rescue [1, 2]) + +* +yield+ in singleton class syntax will now display a warning. This behavior + will soon be deprecated. [Feature #15575]. + + def foo + class << Object.new + yield #=> warning: `yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575] + end + end + foo { p :ok } + + This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. + +* Argument forwarding by (...) is introduced. [Feature #16253] + + def foo(...) + bar(...) + end + + All arguments to +foo+ are forwarded to +bar+, including keyword and + block arguments. + Note that the parentheses are mandatory. bar ... is parsed + as an endless range. + +* Access and setting of $SAFE will now always display a warning. + $SAFE will become a normal global variable in Ruby 3.0. + [Feature #16131] + +* Object#{taint,untaint,trust,untrust} and related functions in the C-API + no longer have an effect (all objects are always considered untainted), and will now + display a warning in verbose mode. This warning will be disabled even in non-verbose mode in + Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131] + +* Refinements take place at Object#method and Module#instance_method. [Feature #15373] + +=== Command line options + +==== Warning option + +The +-W+ option has been extended with a following +:+, to manage categorized +warnings. [Feature #16345] [Feature #16420] + +* To suppress deprecation warnings: + + $ ruby -e '$; = ""' + -e:1: warning: `$;' is deprecated + + $ ruby -W:no-deprecated -e '$; = //' + +* It works with the +RUBYOPT+ environment variable: + + $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' + +* To suppress experimental feature warnings: + + $ ruby -e '0 in a' + -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! + + $ ruby -W:no-experimental -e '0 in a' + +* To suppress both by using +RUBYOPT+, set space separated values: + + $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' + +See also Warning in {Core classes updates}[#label-Core+classes+updates+-28outstanding+ones+only-29]. + +=== Core classes updates (outstanding ones only) + +Array:: + + New methods:: + + * Added Array#intersection. [Feature #16155] + + * Added Array#minmax, with a faster implementation than Enumerable#minmax. [Bug #15929] + +Comparable:: + + Modified method:: + + * Comparable#clamp now accepts a Range argument. [Feature #14784] + + -1.clamp(0..2) #=> 0 + 1.clamp(0..2) #=> 1 + 3.clamp(0..2) #=> 2 + # With beginless and endless ranges: + -1.clamp(0..) #=> 0 + 3.clamp(..2) #=> 2 + + +Complex:: + + New method:: + + * Added Complex#<=>. + So 0 <=> 0i will not raise NoMethodError. [Bug #15857] + +Dir:: + + Modified methods:: + + * Dir.glob and Dir.[] no longer allow NUL-separated glob pattern. + Use Array instead. [Feature #14643] + +Encoding:: + + New encoding:: + + * Added new encoding CESU-8. [Feature #15931] + +Enumerable:: + + New methods:: + + * Added Enumerable#filter_map. [Feature #15323] + + [1, 2, 3].filter_map {|x| x.odd? ? x.to_s : nil } #=> ["1", "3"] + + * Added Enumerable#tally. [Feature #11076] + + ["A", "B", "C", "B", "A"].tally #=> {"A"=>2, "B"=>2, "C"=>1} + +Enumerator:: + + New methods:: + + * Added Enumerator.produce to generate an Enumerator from any custom + data transformation. [Feature #14781] + + require "date" + dates = Enumerator.produce(Date.today, &:succ) #=> infinite sequence of dates + dates.detect(&:tuesday?) #=> next Tuesday + + * Added Enumerator::Lazy#eager that generates a non-lazy enumerator + from a lazy enumerator. [Feature #15901] + + a = %w(foo bar baz) + e = a.lazy.map {|x| x.upcase }.map {|x| x + "!" }.eager + p e.class #=> Enumerator + p e.map {|x| x + "?" } #=> ["FOO!?", "BAR!?", "BAZ!?"] + + * Added Enumerator::Yielder#to_proc so that a Yielder object + can be directly passed to another method as a block + argument. [Feature #15618] + +Fiber:: + + New method:: + + * Added Fiber#raise that behaves like Fiber#resume but raises an + exception on the resumed fiber. [Feature #10344] + +File:: + + Modified method:: + + * File.extname now returns a dot string for names ending with a dot on + non-Windows platforms. [Bug #15267] + + File.extname("foo.") #=> "." + +FrozenError:: + + New method:: + + * Added FrozenError#receiver to return the frozen object on which + modification was attempted. To set this object when raising + FrozenError in Ruby code, FrozenError.new accepts a +:receiver+ + option. [Feature #15751] + +GC:: + + New method:: + + * Added GC.compact method for compacting the heap. + This function compacts live objects in the heap so that fewer pages may + be used, and the heap may be more CoW (copy-on-write) friendly. [Feature #15626] + + Details on the algorithm and caveats can be found here: + https://bugs.ruby-lang.org/issues/15626 + +IO:: + + New method:: + + * Added IO#set_encoding_by_bom to check the BOM and set the external + encoding. [Bug #15210] + +Integer:: + + Modified method:: + + * Integer#[] now supports range operations. [Feature #8842] + + 0b01001101[2, 4] #=> 0b0011 + 0b01001100[2..5] #=> 0b0011 + 0b01001100[2...6] #=> 0b0011 + # ^^^^ + +Method:: + + Modified method:: + + * Method#inspect shows more information. [Feature #14145] + +Module:: + + New methods:: + + * Added Module#const_source_location to retrieve the location where a + constant is defined. [Feature #10771] + + * Added Module#ruby2_keywords for marking a method as passing keyword + arguments through a regular argument splat, useful when delegating + all arguments to another method in a way that can be backwards + compatible with older Ruby versions. [Bug #16154] + + Modified methods:: + + * Module#autoload? now takes an +inherit+ optional argument, like + Module#const_defined?. [Feature #15777] + + * Module#name now always returns a frozen String. The returned String is + always the same for a given Module. This change is + experimental. [Feature #16150] + +NilClass / TrueClass / FalseClass:: + + Modified methods:: + + * NilClass#to_s, TrueClass#to_s, and FalseClass#to_s now always return a + frozen String. The returned String is always the same for each of these + values. This change is experimental. [Feature #16150] + +ObjectSpace::WeakMap:: + + Modified method:: + + * ObjectSpace::WeakMap#[]= now accepts special objects as either key or + values. [Feature #16035] + +Proc:: + + New method:: + + * Added Proc#ruby2_keywords for marking the proc as passing keyword + arguments through a regular argument splat, useful when delegating + all arguments to another method or proc in a way that can be backwards + compatible with older Ruby versions. [Feature #16404] + +Range:: + + New method:: + + * Added Range#minmax, with a faster implementation than Enumerable#minmax. + It returns a maximum that now corresponds to Range#max. [Bug #15807] + + Modified method:: + + * Range#=== now uses Range#cover? for String arguments, too (in Ruby 2.6, it was + changed from Range#include? for all types except strings). [Bug #15449] + + +RubyVM:: + + Removed method:: + + * +RubyVM.resolve_feature_path+ moved to + $LOAD_PATH.resolve_feature_path. [Feature #15903] [Feature #15230] + +String:: + + Unicode:: + + * Update Unicode version and Emoji version from 11.0.0 to + 12.0.0. [Feature #15321] + + * Update Unicode version to 12.1.0, adding support for + U+32FF SQUARE ERA NAME REIWA. [Feature #15195] + + * Update Unicode Emoji version to 12.1. [Feature #16272] + +Symbol:: + + New methods:: + + * Added Symbol#start_with? and Symbol#end_with? methods. [Feature #16348] + +Time:: + + New methods:: + + * Added Time#ceil method. [Feature #15772] + + * Added Time#floor method. [Feature #15653] + + Modified method:: + + * Time#inspect is separated from Time#to_s and it shows + the time's sub second. [Feature #15958] + +UnboundMethod:: + + New method:: + + * Added UnboundMethod#bind_call method. [Feature #15955] + + umethod.bind_call(obj, ...) is semantically equivalent + to umethod.bind(obj).call(...). This idiom is used in + some libraries to call a method that is overridden. The added + method does the same without allocation of an intermediate Method + object. + + class Foo + def add_1(x) + x + 1 + end + end + class Bar < Foo + def add_1(x) # override + x + 2 + end + end + + obj = Bar.new + p obj.add_1(1) #=> 3 + p Foo.instance_method(:add_1).bind(obj).call(1) #=> 2 + p Foo.instance_method(:add_1).bind_call(obj, 1) #=> 2 + +Warning:: + + New methods:: + + * Added Warning.[] and Warning.[]= to manage emitting/suppressing + some categories of warnings. [Feature #16345] [Feature #16420] + +$LOAD_PATH:: + + New method:: + + * Added $LOAD_PATH.resolve_feature_path. [Feature #15903] [Feature #15230] + +=== Stdlib updates (outstanding ones only) + +Bundler:: + + * Upgrade to Bundler 2.1.2. + See https://github.com/bundler/bundler/releases/tag/v2.1.2 + +CGI:: + + * CGI.escapeHTML becomes 2~5x faster when there is at least one escaped character. + See https://github.com/ruby/ruby/pull/2226 + +CSV:: + + * Upgrade to 3.1.2. + See https://github.com/ruby/csv/blob/master/NEWS.md. + +Date:: + + * Date.jisx0301, Date#jisx0301, and Date.parse support the new Japanese + era. [Feature #15742] + +Delegator:: + + * Object#DelegateClass accepts a block and module_evals it in the context + of the returned class, similar to Class.new and Struct.new. + +ERB:: + + * Prohibit marshaling ERB instance. + +IRB:: + + * Introduce syntax highlighting inspired by the Pry gem to Binding#irb + source lines, REPL input, and inspect output of some core-class objects. + + * Introduce multiline editing mode provided by Reline. + + * Show documentation when completion. + + * Enable auto indent and save/load history by default. + +JSON:: + + * Upgrade to 2.3.0. + +Net::FTP:: + + * Add Net::FTP#features to check available features, and Net::FTP#option to + enable/disable each of them. [Feature #15964] + +Net::HTTP:: + + * Add +ipaddr+ optional parameter to Net::HTTP#start to replace the address for + the TCP/IP connection. [Feature #5180] + +Net::IMAP:: + + * Add Server Name Indication (SNI) support. [Feature #15594] + +open-uri:: + + * Warn open-uri's "open" method at Kernel. + Use URI.open instead. [Misc #15893] + + * The default charset of "text/*" media type is UTF-8 instead of + ISO-8859-1. [Bug #15933] + +OptionParser:: + + * Now show "Did you mean?" for unknown options. [Feature #16256] + + test.rb: + + require "optparse" + OptionParser.new do |opts| + opts.on("-f", "--foo", "foo") {|v| } + opts.on("-b", "--bar", "bar") {|v| } + opts.on("-c", "--baz", "baz") {|v| } + end.parse! + + example: + + $ ruby test.rb --baa + Traceback (most recent call last): + test.rb:7:in `
': invalid option: --baa (OptionParser::InvalidOption) + Did you mean? baz + bar + +Pathname:: + + * Pathname.glob now delegates 3 arguments to Dir.glob + to accept +base+ keyword. [Feature #14405] + +Racc:: + + * Merge 1.4.15 from upstream repository and added cli of racc. + +Reline:: + + * New stdlib that is compatible with the readline stdlib but is + implemented in pure Ruby. It also provides a multiline editing mode. + +REXML:: + + * Upgrade to 3.2.3. + See https://github.com/ruby/rexml/blob/master/NEWS.md. + +RSS:: + + * Upgrade to RSS 0.2.8. + See https://github.com/ruby/rss/blob/master/NEWS.md. + +RubyGems:: + + * Upgrade to RubyGems 3.1.2. + * https://github.com/rubygems/rubygems/releases/tag/v3.1.0 + * https://github.com/rubygems/rubygems/releases/tag/v3.1.1 + * https://github.com/rubygems/rubygems/releases/tag/v3.1.2 + +StringScanner:: + + * Upgrade to 1.0.3. + See https://github.com/ruby/strscan/blob/master/NEWS.md. + +=== Compatibility issues (excluding feature bug fixes) + +* The following libraries are no longer bundled gems. + Install corresponding gems to use these features. + * CMath (cmath gem) + * Scanf (scanf gem) + * Shell (shell gem) + * Synchronizer (sync gem) + * ThreadsWait (thwait gem) + * E2MM (e2mmap gem) + +Proc:: + * The Proc#to_s format was changed. [Feature #16101] + +Range:: + * Range#minmax used to iterate on the range to determine the maximum. + It now uses the same algorithm as Range#max. In rare cases (e.g. + ranges of Floats or Strings), this may yield different results. [Bug #15807] + +=== Stdlib compatibility issues (excluding feature bug fixes) + +* Promote stdlib to default gems + * The following default gems were published on rubygems.org + * benchmark + * cgi + * delegate + * getoptlong + * net-pop + * net-smtp + * open3 + * pstore + * readline + * readline-ext + * singleton + * The following default gems were only promoted at ruby-core, + but not yet published on rubygems.org. + * monitor + * observer + * timeout + * tracer + * uri + * yaml +* The did_you_mean gem has been promoted up to a default gem from a bundled gem + +pathname:: + + * Kernel#Pathname when called with a Pathname argument now returns + the argument instead of creating a new Pathname. This is more + similar to other Kernel methods, but can break code that modifies + the return value and expects the argument not to be modified. + +profile.rb, Profiler__:: + + * Removed from standard library. It was unmaintained since Ruby 2.0.0. + +=== C API updates + +* Many *_kw functions have been added for setting whether + the final argument being passed should be treated as keywords. You + may need to switch to these functions to avoid keyword argument + separation warnings, and to ensure correct behavior in Ruby 3. + +* The : character in rb_scan_args format string is now + treated as keyword arguments. Passing a positional hash instead of + keyword arguments will emit a deprecation warning. + +* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+. + See https://github.com/ruby/ruby/pull/2404 + +=== Implementation improvements + +Fiber:: + + * Allow selecting different coroutine implementations by using + +--with-coroutine=+, e.g. + + $ ./configure --with-coroutine=ucontext + $ ./configure --with-coroutine=copy + + * Replace previous stack cache with fiber pool cache. The fiber pool + allocates many stacks in a single memory region. Stack allocation + becomes O(log N) and fiber creation is amortized O(1). Around 10x + performance improvement was measured in micro-benchmarks. + https://github.com/ruby/ruby/pull/2224 + +File:: + * File.realpath now uses realpath(3) on many platforms, which can + significantly improve performance. [Feature #15797] + +Hash:: + * Change data structure of small Hash objects. [Feature #15602] + +Monitor:: + * Monitor class is written in C-extension. [Feature #16255] + +Thread:: + + * VM stack memory allocation is now combined with native thread stack, + improving thread allocation performance and reducing allocation related + failures. Around 10x performance improvement was measured in micro-benchmarks. + +JIT:: + + * JIT-ed code is recompiled to less-optimized code when an optimization assumption is invalidated. + + * Method inlining is performed when a method is considered as pure. + This optimization is still experimental and many methods are NOT considered as pure yet. + + * The default value of +--jit-max-cache+ is changed from 1,000 to 100. + + * The default value of +--jit-min-calls+ is changed from 5 to 10,000. + +RubyVM:: + + * Per-call-site method cache, which has been there since around 1.9, was + improved: cache hit rate raised from 89% to 94%. + See https://github.com/ruby/ruby/pull/2583 + +RubyVM::InstructionSequence:: + + * RubyVM::InstructionSequence#to_binary method generates compiled binary. + The binary size is reduced. [Feature #16163] + +=== Miscellaneous changes + +* Support for IA64 architecture has been removed. Hardware for testing was + difficult to find, native fiber code is difficult to implement, and it added + non-trivial complexity to the interpreter. [Feature #15894] + +* Require compilers to support C99. [Misc #15347] + + * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/C99 + +* Ruby's upstream repository is changed from Subversion to Git. + + * https://git.ruby-lang.org/ruby.git + + * RUBY_REVISION class is changed from Integer to String. + + * RUBY_DESCRIPTION includes Git revision instead of Subversion's one. + +* Support built-in methods in Ruby with the _\_builtin_ syntax. [Feature #16254] + + Some methods are defined in *.rb (such as trace_point.rb). + For example, it is easy to define a method which accepts keyword arguments. From db58b4a48d7a632550d67a5c8bc4ecc37819d6c9 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Tue, 31 Dec 2019 18:18:21 +0900 Subject: [PATCH 250/878] Update NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) --- NEWS | 801 +---------------------------------------------------------- 1 file changed, 2 insertions(+), 799 deletions(-) diff --git a/NEWS b/NEWS index 4ff6cf09dcfcad..15f5f14eb800eb 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ # -*- rdoc -*- -= NEWS for Ruby 2.7.0 += NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) This document is a list of user visible feature changes made between releases except for bug fixes. @@ -10,819 +10,22 @@ information is supplied with. For a full list of changes with all sufficient information, see the ChangeLog file or Redmine (e.g. https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER). -== Changes since the 2.6.0 release +== Changes since the 2.7.0 release === Language changes -==== Pattern matching - -* Pattern matching is introduced as an experimental feature. [Feature #14912] - - case [0, [1, 2, 3]] - in [a, [b, *c]] - p a #=> 0 - p b #=> 1 - p c #=> [2, 3] - end - - case {a: 0, b: 1} - in {a: 0, x: 1} - :unreachable - in {a: 0, b: var} - p var #=> 1 - end - - case -1 - in 0 then :unreachable - in 1 then :unreachable - end #=> NoMatchingPatternError - - json = < "Bob" - p age #=> 2 - - JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]} - #=> NoMatchingPatternError - -* See the following slides for more details: - * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7 - * Note that the slides are slightly obsolete. - -* The warning against pattern matching can be suppressed with - {-W:no-experimental option}[#label-Warning+option]. - -==== The spec of keyword arguments is changed towards 3.0 - -* Automatic conversion of keyword arguments and positional arguments is - deprecated, and conversion will be removed in Ruby 3. [Feature #14183] - - * When a method call passes a Hash at the last argument, and when it - passes no keywords, and when the called method accepts keywords, - a warning is emitted. To continue treating the hash as keywords, - add a double splat operator to avoid the warning and ensure - correct behavior in Ruby 3. - - def foo(key: 42); end; foo({key: 42}) # warned - def foo(**kw); end; foo({key: 42}) # warned - def foo(key: 42); end; foo(**{key: 42}) # OK - def foo(**kw); end; foo(**{key: 42}) # OK - - * When a method call passes keywords to a method that accepts keywords, - but it does not pass enough required positional arguments, the - keywords are treated as a final required positional argument, and a - warning is emitted. Pass the argument as a hash instead of keywords - to avoid the warning and ensure correct behavior in Ruby 3. - - def foo(h, **kw); end; foo(key: 42) # warned - def foo(h, key: 42); end; foo(key: 42) # warned - def foo(h, **kw); end; foo({key: 42}) # OK - def foo(h, key: 42); end; foo({key: 42}) # OK - - * When a method accepts specific keywords but not a keyword splat, and - a hash or keywords splat is passed to the method that includes both - Symbol and non-Symbol keys, the hash will continue to be split, and - a warning will be emitted. You will need to update the calling code - to pass separate hashes to ensure correct behavior in Ruby 3. - - def foo(h={}, key: 42); end; foo("key" => 43, key: 42) # warned - def foo(h={}, key: 42); end; foo({"key" => 43, key: 42}) # warned - def foo(h={}, key: 42); end; foo({"key" => 43}, key: 42) # OK - - * If a method does not accept keywords, and is called with keywords, - the keywords are still treated as a positional hash, with no warning. - This behavior will continue to work in Ruby 3. - - def foo(opt={}); end; foo( key: 42 ) # OK - -* Non-symbols are allowed as keyword argument keys if the method accepts - arbitrary keywords. [Feature #14183] - - * Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0, - but are now allowed again. [Bug #15658] - - def foo(**kw); p kw; end; foo("str" => 1) #=> {"str"=>1} - -* **nil is allowed in method definitions to explicitly mark - that the method accepts no keywords. Calling such a method with keywords - will result in an ArgumentError. [Feature #14183] - - def foo(h, **nil); end; foo(key: 1) # ArgumentError - def foo(h, **nil); end; foo(**{key: 1}) # ArgumentError - def foo(h, **nil); end; foo("str" => 1) # ArgumentError - def foo(h, **nil); end; foo({key: 1}) # OK - def foo(h, **nil); end; foo({"str" => 1}) # OK - -* Passing an empty keyword splat to a method that does not accept keywords - no longer passes an empty hash, unless the empty hash is necessary for - a required parameter, in which case a warning will be emitted. Remove - the double splat to continue passing a positional hash. [Feature #14183] - - h = {}; def foo(*a) a end; foo(**h) # [] - h = {}; def foo(a) a end; foo(**h) # {} and warning - h = {}; def foo(*a) a end; foo(h) # [{}] - h = {}; def foo(a) a end; foo(h) # {} - -* Above warnings can be suppressed also with {-W:no-deprecated option}[#label-Warning+option]. - -==== Numbered parameters - -* Numbered parameters as default block parameters are introduced. - [Feature #4475] - - [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] - [[1, 2], [3, 4]].map { _1 + _2 } #=> [3, 7] - - You can still define a local variable named +_1+ and so on, - and that is honored when present, but renders a warning. - - _1 = 0 #=> warning: `_1' is reserved for numbered parameter; consider another name - [1].each { p _1 } # prints 0 instead of 1 - -==== proc/lambda without block is deprecated - -* Proc.new and Kernel#proc with no block in a method called with a block will - now display a warning. - - def foo - proc - end - foo { puts "Hello" } #=> warning: Capturing the given block using Kernel#proc is deprecated; use `&block` instead - - This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. - -* Kernel#lambda with no block in a method called with a block raises an exception. - - def bar - lambda - end - bar { puts "Hello" } #=> tried to create Proc object without a block (ArgumentError) - -==== Other miscellaneous changes - -* A beginless range is experimentally introduced. It might be useful - in +case+, new call-sequence of the Comparable#clamp, - constants and DSLs. [Feature #14799] - - ary[..3] # identical to ary[0..3] - - case RUBY_VERSION - when ..."2.4" then puts "EOL" - # ... - end - - age.clamp(..100) - - where(sales: ..100) - -* Setting $; to a non-nil value will now display a warning. [Feature #14240] - This includes the usage in String#split. - This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. - -* Setting $, to a non-nil value will now display a warning. [Feature #14240] - This include the usage in Array#join. - This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. - -* Quoted here-document identifiers must end within the same line. - - <<"EOS - " # This had been warned since 2.4; Now it raises a SyntaxError - EOS - -* The flip-flop syntax deprecation is reverted. [Feature #5400] - -* Comment lines can be placed between fluent dot now. - - foo - # .bar - .baz # => foo.baz - -* Calling a private method with a literal +self+ as the receiver - is now allowed. [Feature #11297] [Feature #16123] - -* Modifier rescue now operates the same for multiple assignment as single - assignment. [Bug #8279] - - a, b = raise rescue [1, 2] - # Previously parsed as: (a, b = raise) rescue [1, 2] - # Now parsed as: a, b = (raise rescue [1, 2]) - -* +yield+ in singleton class syntax will now display a warning. This behavior - will soon be deprecated. [Feature #15575]. - - def foo - class << Object.new - yield #=> warning: `yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575] - end - end - foo { p :ok } - - This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. - -* Argument forwarding by (...) is introduced. [Feature #16253] - - def foo(...) - bar(...) - end - - All arguments to +foo+ are forwarded to +bar+, including keyword and - block arguments. - Note that the parentheses are mandatory. bar ... is parsed - as an endless range. - -* Access and setting of $SAFE will now always display a warning. - $SAFE will become a normal global variable in Ruby 3.0. - [Feature #16131] - -* Object#{taint,untaint,trust,untrust} and related functions in the C-API - no longer have an effect (all objects are always considered untainted), and will now - display a warning in verbose mode. This warning will be disabled even in non-verbose mode in - Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131] - -* Refinements take place at Object#method and Module#instance_method. [Feature #15373] - === Command line options -==== Warning option - -The +-W+ option has been extended with a following +:+, to manage categorized -warnings. [Feature #16345] [Feature #16420] - -* To suppress deprecation warnings: - - $ ruby -e '$; = ""' - -e:1: warning: `$;' is deprecated - - $ ruby -W:no-deprecated -e '$; = //' - -* It works with the +RUBYOPT+ environment variable: - - $ RUBYOPT=-W:no-deprecated ruby -e '$; = //' - -* To suppress experimental feature warnings: - - $ ruby -e '0 in a' - -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! - - $ ruby -W:no-experimental -e '0 in a' - -* To suppress both by using +RUBYOPT+, set space separated values: - - $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a' - -See also Warning in {Core classes updates}[#label-Core+classes+updates+-28outstanding+ones+only-29]. - === Core classes updates (outstanding ones only) -Array:: - - New methods:: - - * Added Array#intersection. [Feature #16155] - - * Added Array#minmax, with a faster implementation than Enumerable#minmax. [Bug #15929] - -Comparable:: - - Modified method:: - - * Comparable#clamp now accepts a Range argument. [Feature #14784] - - -1.clamp(0..2) #=> 0 - 1.clamp(0..2) #=> 1 - 3.clamp(0..2) #=> 2 - # With beginless and endless ranges: - -1.clamp(0..) #=> 0 - 3.clamp(..2) #=> 2 - - -Complex:: - - New method:: - - * Added Complex#<=>. - So 0 <=> 0i will not raise NoMethodError. [Bug #15857] - -Dir:: - - Modified methods:: - - * Dir.glob and Dir.[] no longer allow NUL-separated glob pattern. - Use Array instead. [Feature #14643] - -Encoding:: - - New encoding:: - - * Added new encoding CESU-8. [Feature #15931] - -Enumerable:: - - New methods:: - - * Added Enumerable#filter_map. [Feature #15323] - - [1, 2, 3].filter_map {|x| x.odd? ? x.to_s : nil } #=> ["1", "3"] - - * Added Enumerable#tally. [Feature #11076] - - ["A", "B", "C", "B", "A"].tally #=> {"A"=>2, "B"=>2, "C"=>1} - -Enumerator:: - - New methods:: - - * Added Enumerator.produce to generate an Enumerator from any custom - data transformation. [Feature #14781] - - require "date" - dates = Enumerator.produce(Date.today, &:succ) #=> infinite sequence of dates - dates.detect(&:tuesday?) #=> next Tuesday - - * Added Enumerator::Lazy#eager that generates a non-lazy enumerator - from a lazy enumerator. [Feature #15901] - - a = %w(foo bar baz) - e = a.lazy.map {|x| x.upcase }.map {|x| x + "!" }.eager - p e.class #=> Enumerator - p e.map {|x| x + "?" } #=> ["FOO!?", "BAR!?", "BAZ!?"] - - * Added Enumerator::Yielder#to_proc so that a Yielder object - can be directly passed to another method as a block - argument. [Feature #15618] - -Fiber:: - - New method:: - - * Added Fiber#raise that behaves like Fiber#resume but raises an - exception on the resumed fiber. [Feature #10344] - -File:: - - Modified method:: - - * File.extname now returns a dot string for names ending with a dot on - non-Windows platforms. [Bug #15267] - - File.extname("foo.") #=> "." - -FrozenError:: - - New method:: - - * Added FrozenError#receiver to return the frozen object on which - modification was attempted. To set this object when raising - FrozenError in Ruby code, FrozenError.new accepts a +:receiver+ - option. [Feature #15751] - -GC:: - - New method:: - - * Added GC.compact method for compacting the heap. - This function compacts live objects in the heap so that fewer pages may - be used, and the heap may be more CoW (copy-on-write) friendly. [Feature #15626] - - Details on the algorithm and caveats can be found here: - https://bugs.ruby-lang.org/issues/15626 - -IO:: - - New method:: - - * Added IO#set_encoding_by_bom to check the BOM and set the external - encoding. [Bug #15210] - -Integer:: - - Modified method:: - - * Integer#[] now supports range operations. [Feature #8842] - - 0b01001101[2, 4] #=> 0b0011 - 0b01001100[2..5] #=> 0b0011 - 0b01001100[2...6] #=> 0b0011 - # ^^^^ - -Method:: - - Modified method:: - - * Method#inspect shows more information. [Feature #14145] - -Module:: - - New methods:: - - * Added Module#const_source_location to retrieve the location where a - constant is defined. [Feature #10771] - - * Added Module#ruby2_keywords for marking a method as passing keyword - arguments through a regular argument splat, useful when delegating - all arguments to another method in a way that can be backwards - compatible with older Ruby versions. [Bug #16154] - - Modified methods:: - - * Module#autoload? now takes an +inherit+ optional argument, like - Module#const_defined?. [Feature #15777] - - * Module#name now always returns a frozen String. The returned String is - always the same for a given Module. This change is - experimental. [Feature #16150] - -NilClass / TrueClass / FalseClass:: - - Modified methods:: - - * NilClass#to_s, TrueClass#to_s, and FalseClass#to_s now always return a - frozen String. The returned String is always the same for each of these - values. This change is experimental. [Feature #16150] - -ObjectSpace::WeakMap:: - - Modified method:: - - * ObjectSpace::WeakMap#[]= now accepts special objects as either key or - values. [Feature #16035] - -Proc:: - - New method:: - - * Added Proc#ruby2_keywords for marking the proc as passing keyword - arguments through a regular argument splat, useful when delegating - all arguments to another method or proc in a way that can be backwards - compatible with older Ruby versions. [Feature #16404] - -Range:: - - New method:: - - * Added Range#minmax, with a faster implementation than Enumerable#minmax. - It returns a maximum that now corresponds to Range#max. [Bug #15807] - - Modified method:: - - * Range#=== now uses Range#cover? for String arguments, too (in Ruby 2.6, it was - changed from Range#include? for all types except strings). [Bug #15449] - - -RubyVM:: - - Removed method:: - - * +RubyVM.resolve_feature_path+ moved to - $LOAD_PATH.resolve_feature_path. [Feature #15903] [Feature #15230] - -String:: - - Unicode:: - - * Update Unicode version and Emoji version from 11.0.0 to - 12.0.0. [Feature #15321] - - * Update Unicode version to 12.1.0, adding support for - U+32FF SQUARE ERA NAME REIWA. [Feature #15195] - - * Update Unicode Emoji version to 12.1. [Feature #16272] - -Symbol:: - - New methods:: - - * Added Symbol#start_with? and Symbol#end_with? methods. [Feature #16348] - -Time:: - - New methods:: - - * Added Time#ceil method. [Feature #15772] - - * Added Time#floor method. [Feature #15653] - - Modified method:: - - * Time#inspect is separated from Time#to_s and it shows - the time's sub second. [Feature #15958] - -UnboundMethod:: - - New method:: - - * Added UnboundMethod#bind_call method. [Feature #15955] - - umethod.bind_call(obj, ...) is semantically equivalent - to umethod.bind(obj).call(...). This idiom is used in - some libraries to call a method that is overridden. The added - method does the same without allocation of an intermediate Method - object. - - class Foo - def add_1(x) - x + 1 - end - end - class Bar < Foo - def add_1(x) # override - x + 2 - end - end - - obj = Bar.new - p obj.add_1(1) #=> 3 - p Foo.instance_method(:add_1).bind(obj).call(1) #=> 2 - p Foo.instance_method(:add_1).bind_call(obj, 1) #=> 2 - -Warning:: - - New methods:: - - * Added Warning.[] and Warning.[]= to manage emitting/suppressing - some categories of warnings. [Feature #16345] [Feature #16420] - -$LOAD_PATH:: - - New method:: - - * Added $LOAD_PATH.resolve_feature_path. [Feature #15903] [Feature #15230] - === Stdlib updates (outstanding ones only) -Bundler:: - - * Upgrade to Bundler 2.1.2. - See https://github.com/bundler/bundler/releases/tag/v2.1.2 - -CGI:: - - * CGI.escapeHTML becomes 2~5x faster when there is at least one escaped character. - See https://github.com/ruby/ruby/pull/2226 - -CSV:: - - * Upgrade to 3.1.2. - See https://github.com/ruby/csv/blob/master/NEWS.md. - -Date:: - - * Date.jisx0301, Date#jisx0301, and Date.parse support the new Japanese - era. [Feature #15742] - -Delegator:: - - * Object#DelegateClass accepts a block and module_evals it in the context - of the returned class, similar to Class.new and Struct.new. - -ERB:: - - * Prohibit marshaling ERB instance. - -IRB:: - - * Introduce syntax highlighting inspired by the Pry gem to Binding#irb - source lines, REPL input, and inspect output of some core-class objects. - - * Introduce multiline editing mode provided by Reline. - - * Show documentation when completion. - - * Enable auto indent and save/load history by default. - -JSON:: - - * Upgrade to 2.3.0. - -Net::FTP:: - - * Add Net::FTP#features to check available features, and Net::FTP#option to - enable/disable each of them. [Feature #15964] - -Net::HTTP:: - - * Add +ipaddr+ optional parameter to Net::HTTP#start to replace the address for - the TCP/IP connection. [Feature #5180] - -Net::IMAP:: - - * Add Server Name Indication (SNI) support. [Feature #15594] - -open-uri:: - - * Warn open-uri's "open" method at Kernel. - Use URI.open instead. [Misc #15893] - - * The default charset of "text/*" media type is UTF-8 instead of - ISO-8859-1. [Bug #15933] - -OptionParser:: - - * Now show "Did you mean?" for unknown options. [Feature #16256] - - test.rb: - - require "optparse" - OptionParser.new do |opts| - opts.on("-f", "--foo", "foo") {|v| } - opts.on("-b", "--bar", "bar") {|v| } - opts.on("-c", "--baz", "baz") {|v| } - end.parse! - - example: - - $ ruby test.rb --baa - Traceback (most recent call last): - test.rb:7:in `
': invalid option: --baa (OptionParser::InvalidOption) - Did you mean? baz - bar - -Pathname:: - - * Pathname.glob now delegates 3 arguments to Dir.glob - to accept +base+ keyword. [Feature #14405] - -Racc:: - - * Merge 1.4.15 from upstream repository and added cli of racc. - -Reline:: - - * New stdlib that is compatible with the readline stdlib but is - implemented in pure Ruby. It also provides a multiline editing mode. - -REXML:: - - * Upgrade to 3.2.3. - See https://github.com/ruby/rexml/blob/master/NEWS.md. - -RSS:: - - * Upgrade to RSS 0.2.8. - See https://github.com/ruby/rss/blob/master/NEWS.md. - -RubyGems:: - - * Upgrade to RubyGems 3.1.2. - * https://github.com/rubygems/rubygems/releases/tag/v3.1.0 - * https://github.com/rubygems/rubygems/releases/tag/v3.1.1 - * https://github.com/rubygems/rubygems/releases/tag/v3.1.2 - -StringScanner:: - - * Upgrade to 1.0.3. - See https://github.com/ruby/strscan/blob/master/NEWS.md. - === Compatibility issues (excluding feature bug fixes) -* The following libraries are no longer bundled gems. - Install corresponding gems to use these features. - * CMath (cmath gem) - * Scanf (scanf gem) - * Shell (shell gem) - * Synchronizer (sync gem) - * ThreadsWait (thwait gem) - * E2MM (e2mmap gem) - -Proc:: - * The Proc#to_s format was changed. [Feature #16101] - -Range:: - * Range#minmax used to iterate on the range to determine the maximum. - It now uses the same algorithm as Range#max. In rare cases (e.g. - ranges of Floats or Strings), this may yield different results. [Bug #15807] - === Stdlib compatibility issues (excluding feature bug fixes) -* Promote stdlib to default gems - * The following default gems were published on rubygems.org - * benchmark - * cgi - * delegate - * getoptlong - * net-pop - * net-smtp - * open3 - * pstore - * readline - * readline-ext - * singleton - * The following default gems were only promoted at ruby-core, - but not yet published on rubygems.org. - * monitor - * observer - * timeout - * tracer - * uri - * yaml -* The did_you_mean gem has been promoted up to a default gem from a bundled gem - -pathname:: - - * Kernel#Pathname when called with a Pathname argument now returns - the argument instead of creating a new Pathname. This is more - similar to other Kernel methods, but can break code that modifies - the return value and expects the argument not to be modified. - -profile.rb, Profiler__:: - - * Removed from standard library. It was unmaintained since Ruby 2.0.0. - === C API updates -* Many *_kw functions have been added for setting whether - the final argument being passed should be treated as keywords. You - may need to switch to these functions to avoid keyword argument - separation warnings, and to ensure correct behavior in Ruby 3. - -* The : character in rb_scan_args format string is now - treated as keyword arguments. Passing a positional hash instead of - keyword arguments will emit a deprecation warning. - -* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+. - See https://github.com/ruby/ruby/pull/2404 - === Implementation improvements -Fiber:: - - * Allow selecting different coroutine implementations by using - +--with-coroutine=+, e.g. - - $ ./configure --with-coroutine=ucontext - $ ./configure --with-coroutine=copy - - * Replace previous stack cache with fiber pool cache. The fiber pool - allocates many stacks in a single memory region. Stack allocation - becomes O(log N) and fiber creation is amortized O(1). Around 10x - performance improvement was measured in micro-benchmarks. - https://github.com/ruby/ruby/pull/2224 - -File:: - * File.realpath now uses realpath(3) on many platforms, which can - significantly improve performance. [Feature #15797] - -Hash:: - * Change data structure of small Hash objects. [Feature #15602] - -Monitor:: - * Monitor class is written in C-extension. [Feature #16255] - -Thread:: - - * VM stack memory allocation is now combined with native thread stack, - improving thread allocation performance and reducing allocation related - failures. Around 10x performance improvement was measured in micro-benchmarks. - -JIT:: - - * JIT-ed code is recompiled to less-optimized code when an optimization assumption is invalidated. - - * Method inlining is performed when a method is considered as pure. - This optimization is still experimental and many methods are NOT considered as pure yet. - - * The default value of +--jit-max-cache+ is changed from 1,000 to 100. - - * The default value of +--jit-min-calls+ is changed from 5 to 10,000. - -RubyVM:: - - * Per-call-site method cache, which has been there since around 1.9, was - improved: cache hit rate raised from 89% to 94%. - See https://github.com/ruby/ruby/pull/2583 - -RubyVM::InstructionSequence:: - - * RubyVM::InstructionSequence#to_binary method generates compiled binary. - The binary size is reduced. [Feature #16163] - === Miscellaneous changes - -* Support for IA64 architecture has been removed. Hardware for testing was - difficult to find, native fiber code is difficult to implement, and it added - non-trivial complexity to the interpreter. [Feature #15894] - -* Require compilers to support C99. [Misc #15347] - - * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/C99 - -* Ruby's upstream repository is changed from Subversion to Git. - - * https://git.ruby-lang.org/ruby.git - - * RUBY_REVISION class is changed from Integer to String. - - * RUBY_DESCRIPTION includes Git revision instead of Subversion's one. - -* Support built-in methods in Ruby with the _\_builtin_ syntax. [Feature #16254] - - Some methods are defined in *.rb (such as trace_point.rb). - For example, it is easy to define a method which accepts keyword arguments. From 918fe2ed7c6ec12beea3b925501a6782ecccd23d Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Mon, 30 Dec 2019 14:07:35 +0000 Subject: [PATCH 251/878] Fix Object#inspect documentation Starting from ruby 2.7.0, there's no longer a connection between the hexadecimal number that #inspect shows and the object's ID. --- object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/object.c b/object.c index fc2b45230d2430..b5514322d21c92 100644 --- a/object.c +++ b/object.c @@ -748,7 +748,7 @@ inspect_obj(VALUE obj, VALUE str, int recur) * * Returns a string containing a human-readable representation of obj. * The default #inspect shows the object's class name, an encoding of - * the object id, and a list of the instance variables and their + * its memory address, and a list of the instance variables and their * values (by calling #inspect on each of them). User defined classes * should override this method to provide a better representation of * obj. When overriding this method, it should return a string From 2e1fd4e2d70172fd91c9722aaa3b114ec6cf2ea1 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 01:49:08 -0800 Subject: [PATCH 252/878] Official actions/checkout is useless It died again https://github.com/ruby/ruby/runs/368837347 --- .github/workflows/mingw.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 89ece0d013e5a5..56f8c6bc460c2b 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -36,10 +36,21 @@ jobs: run: | git config --system core.autocrlf false git config --system core.eol lf - - name: Checkout repo - uses: actions/checkout@v2 - with: - path: src + # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. + - name: Checkout ruby/ruby + run: | + git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git -C src reset --hard "$GITHUB_SHA" + if: github.event_name == 'push' + - name: Checkout a pull request + run: | + git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src + git -C src reset --hard "$GITHUB_REV" + env: + GITHUB_REV: ${{ github.event.pull_request.head.sha }} + GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }} + GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }} + if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh shell: bash id: commit_info From 8caeef7c1d70757b6196b8444991cb1ea61943ee Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 18:04:08 +0900 Subject: [PATCH 253/878] Fix the exception to be raised `NoMethodError` has been raised instead of `FrozenError`. --- test/ruby/test_exception.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 79ac11ab26fb20..8445f85ceb801a 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -837,9 +837,9 @@ def pretty_inspect; "`obj'"; end def test_frozen_error_receiver obj = Object.new.freeze - (obj.foo = 1) rescue (e = $!) + e = assert_raise(FrozenError) {def obj.foo; end} assert_same(obj, e.receiver) - obj.singleton_class.const_set(:A, 2) rescue (e = $!) + e = assert_raise(FrozenError) {obj.singleton_class.const_set(:A, 2)} assert_same(obj.singleton_class, e.receiver) end From ee4ead8098703959353cb81647e4d23bc62fa51b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 14:28:57 +0900 Subject: [PATCH 254/878] Split test_frozen_error.rb --- test/ruby/test_exception.rb | 50 ----------------------------- test/ruby/test_frozen_error.rb | 57 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 50 deletions(-) create mode 100644 test/ruby/test_frozen_error.rb diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 8445f85ceb801a..8a60fafa5ea8e8 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -835,56 +835,6 @@ def pretty_inspect; "`obj'"; end alias inspect pretty_inspect end - def test_frozen_error_receiver - obj = Object.new.freeze - e = assert_raise(FrozenError) {def obj.foo; end} - assert_same(obj, e.receiver) - e = assert_raise(FrozenError) {obj.singleton_class.const_set(:A, 2)} - assert_same(obj.singleton_class, e.receiver) - end - - def test_frozen_error_initialize - obj = Object.new - exc = FrozenError.new("bar", receiver: obj) - assert_equal("bar", exc.message) - assert_same(obj, exc.receiver) - - exc = FrozenError.new("bar") - assert_equal("bar", exc.message) - assert_raise_with_message(ArgumentError, "no receiver is available") { - exc.receiver - } - - exc = FrozenError.new - assert_equal("FrozenError", exc.message) - assert_raise_with_message(ArgumentError, "no receiver is available") { - exc.receiver - } - end - - def test_frozen_error_message - obj = Object.new.freeze - e = assert_raise_with_message(FrozenError, /can't modify frozen #{obj.class}/) { - obj.instance_variable_set(:@test, true) - } - assert_include(e.message, obj.inspect) - - klass = Class.new do - def init - @x = true - end - def inspect - init - super - end - end - obj = klass.new.freeze - e = assert_raise_with_message(FrozenError, /can't modify frozen #{obj.class}/) { - obj.init - } - assert_include(e.message, klass.inspect) - end - def test_name_error_new_default error = NameError.new assert_equal("NameError", error.message) diff --git a/test/ruby/test_frozen_error.rb b/test/ruby/test_frozen_error.rb new file mode 100644 index 00000000000000..ace1e4c7754ddd --- /dev/null +++ b/test/ruby/test_frozen_error.rb @@ -0,0 +1,57 @@ +require 'test/unit' + +class TestFrozenError < Test::Unit::TestCase + def test_new_default + exc = FrozenError.new + assert_equal("FrozenError", exc.message) + assert_raise_with_message(ArgumentError, "no receiver is available") { + exc.receiver + } + end + + def test_new_message + exc = FrozenError.new("bar") + assert_equal("bar", exc.message) + assert_raise_with_message(ArgumentError, "no receiver is available") { + exc.receiver + } + end + + def test_new_receiver + obj = Object.new + exc = FrozenError.new("bar", receiver: obj) + assert_equal("bar", exc.message) + assert_same(obj, exc.receiver) + end + + def test_message + obj = Object.new.freeze + e = assert_raise_with_message(FrozenError, /can't modify frozen #{obj.class}/) { + obj.instance_variable_set(:@test, true) + } + assert_include(e.message, obj.inspect) + + klass = Class.new do + def init + @x = true + end + def inspect + init + super + end + end + obj = klass.new.freeze + e = assert_raise_with_message(FrozenError, /can't modify frozen #{obj.class}/) { + obj.init + } + assert_include(e.message, klass.inspect) + end + + def test_receiver + obj = Object.new.freeze + e = assert_raise(FrozenError) {def obj.foo; end} + assert_same(obj, e.receiver) + e = assert_raise(FrozenError) {obj.singleton_class.const_set(:A, 2)} + assert_same(obj.singleton_class, e.receiver) + end +end From a580a3757b162b8d1b2b19d91f5c246c7fc5dca8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 14:33:03 +0900 Subject: [PATCH 255/878] Split test_name_error.rb --- test/ruby/test_exception.rb | 127 ---------------------------------- test/ruby/test_name_error.rb | 130 +++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 127 deletions(-) create mode 100644 test/ruby/test_name_error.rb diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 8a60fafa5ea8e8..44867d2ce3e1f3 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -828,47 +828,6 @@ def test_anonymous_message assert_in_out_err([], "raise Class.new(RuntimeError), 'foo'", [], /foo\n/) end - PrettyObject = - Class.new(BasicObject) do - alias object_id __id__ - def pretty_inspect; "`obj'"; end - alias inspect pretty_inspect - end - - def test_name_error_new_default - error = NameError.new - assert_equal("NameError", error.message) - end - - def test_name_error_new_message - error = NameError.new("Message") - assert_equal("Message", error.message) - end - - def test_name_error_new_name - error = NameError.new("Message") - assert_nil(error.name) - - error = NameError.new("Message", :foo) - assert_equal(:foo, error.name) - end - - def test_name_error_new_receiver - receiver = Object.new - - error = NameError.new - assert_raise(ArgumentError) {error.receiver} - assert_equal("NameError", error.message) - - error = NameError.new(receiver: receiver) - assert_equal(["NameError", receiver], - [error.message, error.receiver]) - - error = NameError.new("Message", :foo, receiver: receiver) - assert_equal(["Message", receiver, :foo], - [error.message, error.receiver, error.name]) - end - def test_nomethod_error_new_default error = NoMethodError.new assert_equal("NoMethodError", error.message) @@ -945,92 +904,6 @@ def test_nomethod_error_new_receiver [error.name, error.args, error.private_call?, error.receiver]) end - def test_name_error_info_const - obj = PrettyObject.new - - e = assert_raise(NameError) { - obj.instance_eval("Object") - } - assert_equal(:Object, e.name) - - e = assert_raise(NameError) { - BasicObject::X - } - assert_same(BasicObject, e.receiver) - assert_equal(:X, e.name) - end - - def test_name_error_info_method - obj = PrettyObject.new - - e = assert_raise(NameError) { - obj.instance_eval {foo} - } - assert_equal(:foo, e.name) - assert_same(obj, e.receiver) - - e = assert_raise(NoMethodError) { - obj.foo(1, 2) - } - assert_equal(:foo, e.name) - assert_equal([1, 2], e.args) - assert_same(obj, e.receiver) - assert_not_predicate(e, :private_call?) - - e = assert_raise(NoMethodError) { - obj.instance_eval {foo(1, 2)} - } - assert_equal(:foo, e.name) - assert_equal([1, 2], e.args) - assert_same(obj, e.receiver) - assert_predicate(e, :private_call?) - end - - def test_name_error_info_local_variables - obj = PrettyObject.new - def obj.test(a, b=nil, *c, &d) - e = a - 1.times {|f| g = foo; g} - e - end - - e = assert_raise(NameError) { - obj.test(3) - } - assert_equal(:foo, e.name) - assert_same(obj, e.receiver) - assert_equal(%i[a b c d e f g], e.local_variables.sort) - end - - def test_name_error_info_method_missing - obj = PrettyObject.new - def obj.method_missing(*) - super - end - - e = assert_raise(NoMethodError) { - obj.foo(1, 2) - } - assert_equal(:foo, e.name) - assert_equal([1, 2], e.args) - assert_same(obj, e.receiver) - assert_not_predicate(e, :private_call?) - - e = assert_raise(NoMethodError) { - obj.instance_eval {foo(1, 2)} - } - assert_equal(:foo, e.name) - assert_equal([1, 2], e.args) - assert_same(obj, e.receiver) - assert_predicate(e, :private_call?) - end - - def test_name_error_info_parent_iseq_mark - assert_separately(['-', File.join(__dir__, 'bug-11928.rb')], <<-'end;') - -> {require ARGV[0]}.call - end; - end - def test_output_string_encoding # "\x82\xa0" in cp932 is "\u3042" (Japanese hiragana 'a') # change $stderr to force calling rb_io_write() instead of fwrite() diff --git a/test/ruby/test_name_error.rb b/test/ruby/test_name_error.rb new file mode 100644 index 00000000000000..102a4a67e83947 --- /dev/null +++ b/test/ruby/test_name_error.rb @@ -0,0 +1,130 @@ +require 'test/unit' + +class TestNameError < Test::Unit::TestCase + def test_new_default + error = NameError.new + assert_equal("NameError", error.message) + end + + def test_new_message + error = NameError.new("Message") + assert_equal("Message", error.message) + end + + def test_new_name + error = NameError.new("Message") + assert_nil(error.name) + + error = NameError.new("Message", :foo) + assert_equal(:foo, error.name) + end + + def test_new_receiver + receiver = Object.new + + error = NameError.new + assert_raise(ArgumentError) {error.receiver} + assert_equal("NameError", error.message) + + error = NameError.new(receiver: receiver) + assert_equal(["NameError", receiver], + [error.message, error.receiver]) + + error = NameError.new("Message", :foo, receiver: receiver) + assert_equal(["Message", receiver, :foo], + [error.message, error.receiver, error.name]) + end + + PrettyObject = + Class.new(BasicObject) do + alias object_id __id__ + def pretty_inspect; "`obj'"; end + alias inspect pretty_inspect + end + + def test_info_const + obj = PrettyObject.new + + e = assert_raise(NameError) { + obj.instance_eval("Object") + } + assert_equal(:Object, e.name) + + e = assert_raise(NameError) { + BasicObject::X + } + assert_same(BasicObject, e.receiver) + assert_equal(:X, e.name) + end + + def test_info_method + obj = PrettyObject.new + + e = assert_raise(NameError) { + obj.instance_eval {foo} + } + assert_equal(:foo, e.name) + assert_same(obj, e.receiver) + + e = assert_raise(NoMethodError) { + obj.foo(1, 2) + } + assert_equal(:foo, e.name) + assert_equal([1, 2], e.args) + assert_same(obj, e.receiver) + assert_not_predicate(e, :private_call?) + + e = assert_raise(NoMethodError) { + obj.instance_eval {foo(1, 2)} + } + assert_equal(:foo, e.name) + assert_equal([1, 2], e.args) + assert_same(obj, e.receiver) + assert_predicate(e, :private_call?) + end + + def test_info_local_variables + obj = PrettyObject.new + def obj.test(a, b=nil, *c, &d) + e = a + 1.times {|f| g = foo; g} + e + end + + e = assert_raise(NameError) { + obj.test(3) + } + assert_equal(:foo, e.name) + assert_same(obj, e.receiver) + assert_equal(%i[a b c d e f g], e.local_variables.sort) + end + + def test_info_method_missing + obj = PrettyObject.new + def obj.method_missing(*) + super + end + + e = assert_raise(NoMethodError) { + obj.foo(1, 2) + } + assert_equal(:foo, e.name) + assert_equal([1, 2], e.args) + assert_same(obj, e.receiver) + assert_not_predicate(e, :private_call?) + + e = assert_raise(NoMethodError) { + obj.instance_eval {foo(1, 2)} + } + assert_equal(:foo, e.name) + assert_equal([1, 2], e.args) + assert_same(obj, e.receiver) + assert_predicate(e, :private_call?) + end + + def test_info_parent_iseq_mark + assert_separately(['-', File.join(__dir__, 'bug-11928.rb')], <<-'end;') + -> {require ARGV[0]}.call + end; + end +end From 0cf75e38506a412a7b4acd39a93e32aff1e8016c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Dec 2019 14:36:54 +0900 Subject: [PATCH 256/878] Split test_nomethod_error.rb --- test/ruby/test_exception.rb | 86 ------------------------------ test/ruby/test_nomethod_error.rb | 89 ++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 86 deletions(-) create mode 100644 test/ruby/test_nomethod_error.rb diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 44867d2ce3e1f3..c0ab23a18eb20d 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -438,16 +438,6 @@ def test_exit_success_p assert_not_send([e, :success?], "abort means failure") end - def test_nomethoderror - bug3237 = '[ruby-core:29948]' - str = "\u2600" - id = :"\u2604" - msg = "undefined method `#{id}' for \"#{str}\":String" - assert_raise_with_message(NoMethodError, msg, bug3237) do - str.__send__(id) - end - end - def test_errno assert_equal(Encoding.find("locale"), Errno::EINVAL.new.message.encoding) end @@ -828,82 +818,6 @@ def test_anonymous_message assert_in_out_err([], "raise Class.new(RuntimeError), 'foo'", [], /foo\n/) end - def test_nomethod_error_new_default - error = NoMethodError.new - assert_equal("NoMethodError", error.message) - end - - def test_nomethod_error_new_message - error = NoMethodError.new("Message") - assert_equal("Message", error.message) - end - - def test_nomethod_error_new_name - error = NoMethodError.new("Message") - assert_nil(error.name) - - error = NoMethodError.new("Message", :foo) - assert_equal(:foo, error.name) - end - - def test_nomethod_error_new_name_args - error = NoMethodError.new("Message", :foo) - assert_nil(error.args) - - error = NoMethodError.new("Message", :foo, [1, 2]) - assert_equal([:foo, [1, 2]], [error.name, error.args]) - end - - def test_nomethod_error_new_name_args_priv - error = NoMethodError.new("Message", :foo, [1, 2]) - assert_not_predicate(error, :private_call?) - - error = NoMethodError.new("Message", :foo, [1, 2], true) - assert_equal([:foo, [1, 2], true], - [error.name, error.args, error.private_call?]) - end - - def test_nomethod_error_new_receiver - receiver = Object.new - - error = NoMethodError.new - assert_raise(ArgumentError) {error.receiver} - - error = NoMethodError.new(receiver: receiver) - assert_equal(receiver, error.receiver) - - error = NoMethodError.new("Message") - assert_raise(ArgumentError) {error.receiver} - - error = NoMethodError.new("Message", receiver: receiver) - assert_equal(["Message", receiver], - [error.message, error.receiver]) - - error = NoMethodError.new("Message", :foo) - assert_raise(ArgumentError) {error.receiver} - - msg = defined?(DidYouMean.formatter) ? - "Message\nDid you mean? for" : "Message" - - error = NoMethodError.new("Message", :foo, receiver: receiver) - assert_equal([msg, :foo, receiver], - [error.message, error.name, error.receiver]) - - error = NoMethodError.new("Message", :foo, [1, 2]) - assert_raise(ArgumentError) {error.receiver} - - error = NoMethodError.new("Message", :foo, [1, 2], receiver: receiver) - assert_equal([msg, :foo, [1, 2], receiver], - [error.message, error.name, error.args, error.receiver]) - - error = NoMethodError.new("Message", :foo, [1, 2], true) - assert_raise(ArgumentError) {error.receiver} - - error = NoMethodError.new("Message", :foo, [1, 2], true, receiver: receiver) - assert_equal([:foo, [1, 2], true, receiver], - [error.name, error.args, error.private_call?, error.receiver]) - end - def test_output_string_encoding # "\x82\xa0" in cp932 is "\u3042" (Japanese hiragana 'a') # change $stderr to force calling rb_io_write() instead of fwrite() diff --git a/test/ruby/test_nomethod_error.rb b/test/ruby/test_nomethod_error.rb new file mode 100644 index 00000000000000..ed3b826d654c8b --- /dev/null +++ b/test/ruby/test_nomethod_error.rb @@ -0,0 +1,89 @@ +require 'test/unit' + +class TestNoMethodError < Test::Unit::TestCase + def test_new_default + error = NoMethodError.new + assert_equal("NoMethodError", error.message) + end + + def test_new_message + error = NoMethodError.new("Message") + assert_equal("Message", error.message) + end + + def test_new_name + error = NoMethodError.new("Message") + assert_nil(error.name) + + error = NoMethodError.new("Message", :foo) + assert_equal(:foo, error.name) + end + + def test_new_name_args + error = NoMethodError.new("Message", :foo) + assert_nil(error.args) + + error = NoMethodError.new("Message", :foo, [1, 2]) + assert_equal([:foo, [1, 2]], [error.name, error.args]) + end + + def test_new_name_args_priv + error = NoMethodError.new("Message", :foo, [1, 2]) + assert_not_predicate(error, :private_call?) + + error = NoMethodError.new("Message", :foo, [1, 2], true) + assert_equal([:foo, [1, 2], true], + [error.name, error.args, error.private_call?]) + end + + def test_new_receiver + receiver = Object.new + + error = NoMethodError.new + assert_raise(ArgumentError) {error.receiver} + + error = NoMethodError.new(receiver: receiver) + assert_equal(receiver, error.receiver) + + error = NoMethodError.new("Message") + assert_raise(ArgumentError) {error.receiver} + + error = NoMethodError.new("Message", receiver: receiver) + assert_equal(["Message", receiver], + [error.message, error.receiver]) + + error = NoMethodError.new("Message", :foo) + assert_raise(ArgumentError) {error.receiver} + + msg = defined?(DidYouMean.formatter) ? + "Message\nDid you mean? for" : "Message" + + error = NoMethodError.new("Message", :foo, receiver: receiver) + assert_equal([msg, :foo, receiver], + [error.message, error.name, error.receiver]) + + error = NoMethodError.new("Message", :foo, [1, 2]) + assert_raise(ArgumentError) {error.receiver} + + error = NoMethodError.new("Message", :foo, [1, 2], receiver: receiver) + assert_equal([msg, :foo, [1, 2], receiver], + [error.message, error.name, error.args, error.receiver]) + + error = NoMethodError.new("Message", :foo, [1, 2], true) + assert_raise(ArgumentError) {error.receiver} + + error = NoMethodError.new("Message", :foo, [1, 2], true, receiver: receiver) + assert_equal([:foo, [1, 2], true, receiver], + [error.name, error.args, error.private_call?, error.receiver]) + end + + def test_message_encoding + bug3237 = '[ruby-core:29948]' + str = "\u2600" + id = :"\u2604" + msg = "undefined method `#{id}' for \"#{str}\":String" + assert_raise_with_message(NoMethodError, msg, bug3237) do + str.__send__(id) + end + end +end From 4ce28b58cbf3f3b5ab0bcd3fa4479d4f6d427158 Mon Sep 17 00:00:00 2001 From: Oleg Zubchenko Date: Sat, 3 Nov 2018 15:27:10 +0300 Subject: [PATCH 257/878] speed up set intersect --- lib/set.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/set.rb b/lib/set.rb index 5a96c818322d1f..e7d1be4f9fc4e4 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -464,7 +464,15 @@ def -(enum) # Set['a', 'b', 'z'] & ['a', 'b', 'c'] #=> # def &(enum) n = self.class.new - do_with_enum(enum) { |o| n.add(o) if include?(o) } + if enum.is_a?(Set) + if enum.size > size + each { |o| n.add(o) if enum.include?(o) } + else + enum.each { |o| n.add(o) if include?(o) } + end + else + do_with_enum(enum) { |o| n.add(o) if include?(o) } + end n end alias intersection & From e082f41611755b0fde967fccf3174c90ecb8469e Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Tue, 31 Dec 2019 22:48:23 +0900 Subject: [PATCH 258/878] Introduce BIGNUM_EMBED_P to check BIGNUM_EMBED_FLAG (#2802) * bignum.h: Add BIGNUM_EMBED_P * bignum.c: Use macros for handling BIGNUM_EMBED_FLAG --- bignum.c | 12 ++++++------ gc.c | 2 +- internal/bignum.h | 12 ++++++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bignum.c b/bignum.c index 8492853104dbf9..57b16e80e10c91 100644 --- a/bignum.c +++ b/bignum.c @@ -2957,7 +2957,7 @@ rb_cmpint(VALUE val, VALUE a, VALUE b) } #define BIGNUM_SET_LEN(b,l) \ - ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \ + (BIGNUM_EMBED_P(b) ? \ (void)(RBASIC(b)->flags = \ (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \ ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \ @@ -2967,19 +2967,19 @@ static void rb_big_realloc(VALUE big, size_t len) { BDIGIT *ds; - if (RBASIC(big)->flags & BIGNUM_EMBED_FLAG) { + if (BIGNUM_EMBED_P(big)) { if (BIGNUM_EMBED_LEN_MAX < len) { ds = ALLOC_N(BDIGIT, len); MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX); RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big); RBIGNUM(big)->as.heap.digits = ds; - RBASIC(big)->flags &= ~BIGNUM_EMBED_FLAG; + FL_UNSET_RAW(big, BIGNUM_EMBED_FLAG); } } else { if (len <= BIGNUM_EMBED_LEN_MAX) { ds = RBIGNUM(big)->as.heap.digits; - RBASIC(big)->flags |= BIGNUM_EMBED_FLAG; + FL_SET_RAW(big, BIGNUM_EMBED_FLAG); BIGNUM_SET_LEN(big, len); (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary)); if (ds) { @@ -3011,8 +3011,8 @@ bignew_1(VALUE klass, size_t len, int sign) NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0)); BIGNUM_SET_SIGN((VALUE)big, sign); if (len <= BIGNUM_EMBED_LEN_MAX) { - RBASIC(big)->flags |= BIGNUM_EMBED_FLAG; - BIGNUM_SET_LEN(big, len); + FL_SET_RAW(big, BIGNUM_EMBED_FLAG); + BIGNUM_SET_LEN((VALUE)big, len); (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary)); } else { diff --git a/gc.c b/gc.c index ccece5b3d1fb26..a126de9a426245 100644 --- a/gc.c +++ b/gc.c @@ -2815,7 +2815,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) break; case T_BIGNUM: - if (!(RBASIC(obj)->flags & BIGNUM_EMBED_FLAG) && BIGNUM_DIGITS(obj)) { + if (!BIGNUM_EMBED_P(obj) && BIGNUM_DIGITS(obj)) { xfree(BIGNUM_DIGITS(obj)); RB_DEBUG_COUNTER_INC(obj_bignum_ptr); } diff --git a/internal/bignum.h b/internal/bignum.h index c35ba9eb4708d4..508386452ce41e 100644 --- a/internal/bignum.h +++ b/internal/bignum.h @@ -139,6 +139,7 @@ static inline void BIGNUM_NEGATE(VALUE b); static inline size_t BIGNUM_LEN(VALUE b); static inline BDIGIT *BIGNUM_DIGITS(VALUE b); static inline int BIGNUM_LENINT(VALUE b); +static inline bool BIGNUM_EMBED_P(VALUE b); RUBY_SYMBOL_EXPORT_BEGIN /* bignum.c (export) */ @@ -207,7 +208,7 @@ BIGNUM_NEGATE(VALUE b) static inline size_t BIGNUM_LEN(VALUE b) { - if (! FL_TEST_RAW(b, BIGNUM_EMBED_FLAG)) { + if (! BIGNUM_EMBED_P(b)) { return RBIGNUM(b)->as.heap.len; } else { @@ -228,11 +229,18 @@ BIGNUM_LENINT(VALUE b) static inline BDIGIT * BIGNUM_DIGITS(VALUE b) { - if (FL_TEST_RAW(b, BIGNUM_EMBED_FLAG)) { + if (BIGNUM_EMBED_P(b)) { return RBIGNUM(b)->as.ary; } else { return RBIGNUM(b)->as.heap.digits; } } + +static inline bool +BIGNUM_EMBED_P(VALUE b) +{ + return FL_TEST_RAW(b, BIGNUM_EMBED_FLAG); +} + #endif /* INTERNAL_BIGNUM_H */ From 337ba56aff37d34896c0dd091f1bcfb4a556126b Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 29 Dec 2019 09:01:00 +0900 Subject: [PATCH 259/878] [ruby/reline] Degenerate the terminal size to [$LINES, $COLUMNS] if it is unknown This is a workaround for https://github.com/ruby/irb/issues/50 https://github.com/ruby/reline/commit/5725677d1a --- lib/reline/ansi.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 8d83da854ccd49..27157f0db9f47e 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -50,7 +50,11 @@ def self.retrieve_keybuffer end def self.get_screen_size - @@input.winsize + s = @@input.winsize + return s if s[0] > 0 && s[1] > 0 + s = [ENV["LINES"].to_i, ENV["COLUMNS"].to_i] + return s if s[0] > 0 && s[1] > 0 + [24, 80] rescue Errno::ENOTTY [24, 80] end From a118bb805f022a915a4b075ddd9dd49c04e68591 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 27 Dec 2019 13:17:02 -0500 Subject: [PATCH 260/878] [ruby/irb] Add tests for RubyLex The set_auto_indent method calculates the correct number of spaces for indenting a line. We think there might be a few bugs in this method so we are testing the current functionality to make sure nothing breaks when we address those bugs. Example test failure: ``` 1) Failure: TestIRB::TestRubyLex#test_auto_indent [/Users/Ben/Projects/irb/test/irb/test_ruby_lex.rb:75]: Calculated the wrong number of spaces for: def each_top_level_statement initialize_input catch(:TERM_INPUT) do loop do begin prompt unless l = lex throw :TERM_INPUT if @line == '' else . <10> expected but was <12>. ``` https://github.com/ruby/irb/commit/752d5597ab --- test/irb/test_ruby_lex.rb | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 test/irb/test_ruby_lex.rb diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb new file mode 100644 index 00000000000000..c7c51dab7861ff --- /dev/null +++ b/test/irb/test_ruby_lex.rb @@ -0,0 +1,79 @@ +require 'test/unit' + +module TestIRB + class TestRubyLex < Test::Unit::TestCase + Row = Struct.new(:content, :current_line_spaces, :new_line_spaces) + + class MockIO + def initialize(params, &assertion) + @params = params + @assertion = assertion + end + + def auto_indent(&block) + result = block.call(*@params) + @assertion.call(result) + end + end + + def assert_indenting(lines, correct_space_count, add_new_line) + lines = lines + [""] if add_new_line + last_line_index = lines.length - 1 + byte_pointer = lines.last.length + + ruby_lex = RubyLex.new() + io = MockIO.new([lines, last_line_index, byte_pointer, add_new_line]) do |auto_indent| + error_message = "Calculated the wrong number of spaces for:\n #{lines.join("\n")}" + assert_equal(correct_space_count, auto_indent, error_message) + end + ruby_lex.set_input(io) + context = OpenStruct.new(auto_indent_mode: true) + ruby_lex.set_auto_indent(context) + end + + def test_auto_indent + input_with_correct_indents = [ + Row.new(%q(def each_top_level_statement), nil, 2), + Row.new(%q( initialize_input), nil, 2), + Row.new(%q( catch(:TERM_INPUT) do), nil, 4), + Row.new(%q( loop do), nil, 6), + Row.new(%q( begin), nil, 8), + Row.new(%q( prompt), nil, 8), + Row.new(%q( unless l = lex), nil, 10), + Row.new(%q( throw :TERM_INPUT if @line == ''), nil, 10), + Row.new(%q( else), 8, 10), + Row.new(%q( @line_no += l.count("\n")), nil, 10), + Row.new(%q( next if l == "\n"), nil, 10), + Row.new(%q( @line.concat l), nil, 10), + Row.new(%q( if @code_block_open or @ltype or @continue or @indent > 0), nil, 12), + Row.new(%q( next), nil, 12), + Row.new(%q( end), 10, 10), + Row.new(%q( end), 8, 8), + Row.new(%q( if @line != "\n"), nil, 10), + Row.new(%q( @line.force_encoding(@io.encoding)), nil, 10), + Row.new(%q( yield @line, @exp_line_no), nil, 10), + Row.new(%q( end), 8, 8), + Row.new(%q( break if @io.eof?), nil, 8), + Row.new(%q( @line = ''), nil, 8), + Row.new(%q( @exp_line_no = @line_no), nil, 8), + Row.new(%q( ), nil, 8), + Row.new(%q( @indent = 0), nil, 8), + Row.new(%q( rescue TerminateLineInput), 6, 8), + Row.new(%q( initialize_input), nil, 8), + Row.new(%q( prompt), nil, 8), + Row.new(%q( end), 6, 6), + Row.new(%q( end), 4, 4), + Row.new(%q( end), 2, 2), + Row.new(%q(end), 0, 0), + ] + + lines = [] + input_with_correct_indents.each do |row| + lines << row.content + + assert_indenting(lines, row.current_line_spaces, false) + assert_indenting(lines, row.new_line_spaces, true) + end + end + end +end From 9deb9427154587549661bd8f51cbf382c1658111 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 31 Dec 2019 23:31:51 +0900 Subject: [PATCH 261/878] Add "require 'openstruct'" what is forgotten --- test/irb/test_ruby_lex.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb index c7c51dab7861ff..3490db4431e7b3 100644 --- a/test/irb/test_ruby_lex.rb +++ b/test/irb/test_ruby_lex.rb @@ -1,4 +1,5 @@ require 'test/unit' +require 'openstruct' module TestIRB class TestRubyLex < Test::Unit::TestCase From 1a1862236da60e21e51c66543e89bf577b6ed14a Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 1 Jan 2020 00:02:01 +0900 Subject: [PATCH 262/878] Update GitHub Actions Badges - Generated by [npx github-actions-badge](https://github.com/azu/github-actions-badge) - Add MJIT --- README.ja.md | 11 ++++++----- README.md | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.ja.md b/README.ja.md index 4e1e6b9d87a33f..8d5a3691a76f86 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,10 +1,11 @@ [![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) [![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) -![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg) -![](https://github.com/ruby/ruby/workflows/macOS/badge.svg) -![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg) -![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg) -![](https://github.com/ruby/ruby/workflows/Windows/badge.svg) +[![Actions Status](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Cygwin") +[![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS") +[![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") +[![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") +[![Actions Status](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu") +[![Actions Status](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows") # Rubyとは diff --git a/README.md b/README.md index 1e935095c6d183..34e85c36ec0b1f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ [![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) [![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) -![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg) -![](https://github.com/ruby/ruby/workflows/macOS/badge.svg) -![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg) -![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg) -![](https://github.com/ruby/ruby/workflows/Windows/badge.svg) +[![Actions Status](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Cygwin") +[![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS") +[![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") +[![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") +[![Actions Status](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu") +[![Actions Status](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows") # What's Ruby From 287bfb69d25c3bedde38abd801c6b9b9a984aa12 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 1 Jan 2020 00:02:24 +0900 Subject: [PATCH 263/878] * 2020-01-01 [ci skip] --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.h b/version.h index 40b1847c673d82..9b2c53a1c2b7a1 100644 --- a/version.h +++ b/version.h @@ -4,9 +4,9 @@ #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_YEAR 2020 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" From 66e6055c11be92a1227f2748b3343d408571c70a Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 1 Jan 2020 01:37:38 +0900 Subject: [PATCH 264/878] [ruby/irb] Fix lib name of OpenStruct https://github.com/ruby/irb/commit/1f3a84ab6b --- test/irb/test_ruby_lex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb index 3490db4431e7b3..51ae5e4b47dba7 100644 --- a/test/irb/test_ruby_lex.rb +++ b/test/irb/test_ruby_lex.rb @@ -1,5 +1,5 @@ require 'test/unit' -require 'openstruct' +require 'ostruct' module TestIRB class TestRubyLex < Test::Unit::TestCase From 049292e3021524bad531a82f5d9a51a22fb88640 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 1 Jan 2020 02:04:41 +0900 Subject: [PATCH 265/878] Add load path and require for ruby/ruby --- test/irb/test_ruby_lex.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb index 51ae5e4b47dba7..f3a9b30e954012 100644 --- a/test/irb/test_ruby_lex.rb +++ b/test/irb/test_ruby_lex.rb @@ -1,3 +1,5 @@ +$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) +require 'irb/ruby-lex' require 'test/unit' require 'ostruct' From 139f0d90d98441ac54c6385acaf6d39eb61de63e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 09:34:29 -0800 Subject: [PATCH 266/878] Use actions/checkout for PR (#2804) --- .github/workflows/mingw.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 56f8c6bc460c2b..f36af4bb29525c 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -42,14 +42,11 @@ jobs: git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' + # It's hard to propagate `env` to this workflow's shell environment to checkout PR. Using unstable actions/checkout as a workaround. - name: Checkout a pull request - run: | - git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src - git -C src reset --hard "$GITHUB_REV" - env: - GITHUB_REV: ${{ github.event.pull_request.head.sha }} - GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }} - GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }} + uses: actions/checkout@v2 + with: + path: src if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh shell: bash From 860753eabbf364a32f5f95af0809b4682b9f9fb2 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Tue, 31 Dec 2019 11:35:43 -0600 Subject: [PATCH 267/878] Actions MinGW - fix test-all (#2803) --- .github/workflows/mingw.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index f36af4bb29525c..63b38b5b7d77bc 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -36,7 +36,7 @@ jobs: run: | git config --system core.autocrlf false git config --system core.eol lf - # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. + # Not using official actions/checkout@v2 because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby/ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src @@ -140,7 +140,7 @@ jobs: [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") $jobs = [int]$env:NUMBER_OF_PROCESSORS - make -C build test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../src/test/excludes -n !/memory_leak/ -j $jobs" + make -C build test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" - uses: k0kubun/action-slack@v2.0.0 with: From 52c228604b06692f0afe578f8333eaf078eda8f3 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 09:37:03 -0800 Subject: [PATCH 268/878] Fix an outdated comment We're actually using it for PR :p --- .github/workflows/mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 63b38b5b7d77bc..00fb5fdf7beaeb 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -36,7 +36,7 @@ jobs: run: | git config --system core.autocrlf false git config --system core.eol lf - # Not using official actions/checkout@v2 because it's unstable and sometimes doesn't work for a fork. + # Not using official actions/checkout@v2 because it's unstable. - name: Checkout ruby/ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src From 74cb4148856230a10daee1d043a8700f6d798bdf Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 10:24:00 -0800 Subject: [PATCH 269/878] Run tests in the consistent order `make check` runs test -> test-all -> test-spec, and other CIs follow that too. --- .github/workflows/mingw.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 00fb5fdf7beaeb..ae3ce05967ecac 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -116,31 +116,31 @@ jobs: $env:TMPDIR = "$pwd/temp" make -C build test - - name: test-spec + - name: test-all if: success() || failure() - timeout-minutes: 10 + timeout-minutes: 25 run: | $env:TMPDIR = "$pwd/temp" - $env:PATH = "$pwd/install/bin;$env:PATH" # Actions uses UTF8, causes test failures, similar to normal OS setup $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - ruby -v - cd src/spec/ruby - ruby ../mspec/bin/mspec -j + $jobs = [int]$env:NUMBER_OF_PROCESSORS + make -C build test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" - - name: test-all + - name: test-spec if: success() || failure() - timeout-minutes: 25 + timeout-minutes: 10 run: | $env:TMPDIR = "$pwd/temp" + $env:PATH = "$pwd/install/bin;$env:PATH" # Actions uses UTF8, causes test failures, similar to normal OS setup $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - $jobs = [int]$env:NUMBER_OF_PROCESSORS - make -C build test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" + ruby -v + cd src/spec/ruby + ruby ../mspec/bin/mspec -j - uses: k0kubun/action-slack@v2.0.0 with: From e1c363f847451a4dcf7db7c07dd00e02d9d71ad3 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 31 Dec 2019 02:22:00 +0900 Subject: [PATCH 270/878] [bundler/bundler] Add ruby2_keywords https://github.com/bundler/bundler/commit/29d932d72d --- spec/bundler/support/artifice/endpoint.rb | 2 +- spec/bundler/support/artifice/endpoint_500.rb | 2 +- spec/bundler/support/artifice/windows.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/bundler/support/artifice/endpoint.rb b/spec/bundler/support/artifice/endpoint.rb index 7bca681e700027..7f4cafc2396388 100644 --- a/spec/bundler/support/artifice/endpoint.rb +++ b/spec/bundler/support/artifice/endpoint.rb @@ -4,7 +4,7 @@ require Spec::Path.lib_dir.join("bundler/deprecate") include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/bundler/support/artifice/endpoint_500.rb b/spec/bundler/support/artifice/endpoint_500.rb index f98e7e3bc25f3c..7c1c4365bb7688 100644 --- a/spec/bundler/support/artifice/endpoint_500.rb +++ b/spec/bundler/support/artifice/endpoint_500.rb @@ -3,7 +3,7 @@ require_relative "../path" include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/bundler/support/artifice/windows.rb b/spec/bundler/support/artifice/windows.rb index 21170c81d9c3b5..c31c6fff79379c 100644 --- a/spec/bundler/support/artifice/windows.rb +++ b/spec/bundler/support/artifice/windows.rb @@ -3,7 +3,7 @@ require_relative "../path" include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" From a6864f6d2f39bcd1ff04516591cc18d4027ab186 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 1 Jan 2020 07:42:42 +0900 Subject: [PATCH 271/878] Removed the old executables of racc [ruby-core:93516][Feature #15982] https://github.com/ruby/racc/pull/123 --- bin/racc2y | 27 ---- bin/y2racc | 27 ---- libexec/racc2y | 195 ---------------------------- libexec/y2racc | 339 ------------------------------------------------- 4 files changed, 588 deletions(-) delete mode 100755 bin/racc2y delete mode 100755 bin/y2racc delete mode 100755 libexec/racc2y delete mode 100755 libexec/y2racc diff --git a/bin/racc2y b/bin/racc2y deleted file mode 100755 index a1e4352632a321..00000000000000 --- a/bin/racc2y +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env ruby -# -# This file was generated by RubyGems. -# -# The application 'racc' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require 'rubygems' - -version = ">= 0.a" - -if ARGV.first - str = ARGV.first - str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding - if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then - version = $1 - ARGV.shift - end -end - -if Gem.respond_to?(:activate_bin_path) -load Gem.activate_bin_path('racc', 'racc2y', version) -else -gem "racc", version -load Gem.bin_path("racc", "racc2y", version) -end diff --git a/bin/y2racc b/bin/y2racc deleted file mode 100755 index 023615f369e140..00000000000000 --- a/bin/y2racc +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env ruby -# -# This file was generated by RubyGems. -# -# The application 'racc' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require 'rubygems' - -version = ">= 0.a" - -if ARGV.first - str = ARGV.first - str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding - if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then - version = $1 - ARGV.shift - end -end - -if Gem.respond_to?(:activate_bin_path) -load Gem.activate_bin_path('racc', 'y2racc', version) -else -gem "racc", version -load Gem.bin_path("racc", "y2racc", version) -end diff --git a/libexec/racc2y b/libexec/racc2y deleted file mode 100755 index f88d73ed2c8295..00000000000000 --- a/libexec/racc2y +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/local/bin/ruby -# -# $Id$ -# -# Copyright (c) 1999-2006 Minero Aoki -# -# This program is feee software. -# You can distribute/modify this program under the terms of -# the GNU LGPL, Lesser General Public License version 2.1. -# For details of the LGPL, see the file "COPYING". -# - -require 'racc/grammarfileparser' -require 'racc/info' -require 'optparse' - -def main - @with_action = true - with_header = false - with_inner = false - with_footer = false - output = nil - parser = OptionParser.new - parser.banner = "Usage: #{File.basename($0)} [-AHIF] [-oFILENAME] GRAMMARFILE" - parser.on('-o', '--output=FILENAME', 'output file name [.yacc]') {|name| - output = name - } - parser.on('-A', '--without-action', 'Does not include actions.') { - @with_action = false - } - parser.on('-H', '--with-header', 'Includes header part.') { - with_header = true - } - parser.on('-I', '--with-inner', 'Includes inner part.') { - with_inner = true - } - parser.on('-F', '--with-footer', 'Includes footer part.') { - with_footer = true - } - parser.on('--version', 'Prints version and quit.') { - puts "racc2y version #{Racc::Version}" - exit 0 - } - parser.on('--copyright', 'Prints copyright and quit.') { - puts Racc::Copyright - exit 0 - } - parser.on('--help', 'Prints this message and quit.') { - puts parser.help - exit 1 - } - begin - parser.parse! - rescue OptionParser::ParseError => err - $stderr.puts err.message - $stderr.puts parser.help - exit 1 - end - if ARGV.empty? - $stderr.puts "no input file" - exit 1 - end - unless ARGV.size == 1 - $stderr.puts "too many inputs" - exit 1 - end - input = ARGV[0] - - begin - result = Racc::GrammarFileParser.parse_file(input) - result.grammar.init - File.open(output || "#{input}.yacc", 'w') {|f| - f.puts "/* generated from #{input} */" - if with_header - f.puts - f.puts '%{' - print_user_codes f, result.params.header - f.puts '%}' - end - f.puts - print_terminals f, result.grammar - f.puts - print_precedence_table f, precedence_table(result.grammar) - f.puts - f.puts '%%' - print_grammar f, result.grammar - f.puts '%%' - if with_inner - f.puts '/*---- inner ----*/' - print_user_codes f, result.params.inner - end - if with_footer - f.puts '/*---- footer ----*/' - print_user_codes f, result.params.footer - end - } - rescue SystemCallError => err - $stderr.puts err.message - exit 1 - end -end - -def print_terminals(f, grammar) - init_indent = '%token'.size - f.print '%token' - columns = init_indent - grammar.symboltable.each_terminal do |t| - next unless t.terminal? - next if t.dummy? - next if t == grammar.symboltable.anchor - next if t == grammar.symboltable.error - unless t.value.kind_of?(String) - if columns > 60 - f.puts - f.print ' ' * init_indent - columns = init_indent - end - columns += f.write(" #{yacc_symbol(t)}") - end - end - f.puts -end - -def precedence_table(grammar) - table = [] - grammar.symboltable.select {|sym| sym.precedence }.each do |sym| - (table[sym.prec] ||= [sym.assoc]).push sym - end - table.compact -end - -def print_precedence_table(f, table) - return if table.empty? - f.puts '/* precedance table */' - table.each do |syms| - assoc = syms.shift - f.printf '%%%-8s ', assoc.to_s.downcase - f.puts syms.map {|s| yacc_symbol(s) }.join(' ') - end - f.puts -end - -def print_grammar(f, grammar) - prev_target = nil - indent = 10 - embactions = [] - grammar.each do |rule| - if rule.target.dummy? - embactions.push rule.action unless rule.action.empty? - next - end - if rule.target == prev_target - f.print ' ' * indent, '|' - else - prev_target = rule.target - f.printf "\n%-10s:", yacc_symbol(prev_target) - end - rule.symbols.each do |s| - if s.dummy? # target of dummy rule for embedded action - f.puts - print_action f, embactions.shift, indent - f.print ' ' * (indent + 1) - else - f.print ' ', yacc_symbol(s) - end - end - if rule.specified_prec - f.print ' %prec ', yacc_symbol(rule.specified_prec) - end - f.puts - unless rule.action.empty? - print_action f, rule.action, indent - end - end -end - -def print_action(f, action, indent) - return unless @with_action - f.print ' ' * (indent + 4), "{\n" - f.print ' ' * (indent + 6), action.source.text.strip, "\n" - f.print ' ' * (indent + 4) , "}\n" -end - -def print_user_codes(f, srcs) - return if srcs.empty? - srcs.each do |src| - f.puts src.text - end -end - -def yacc_symbol(s) - s.to_s.gsub('"', "'") -end - -main diff --git a/libexec/y2racc b/libexec/y2racc deleted file mode 100755 index 7933f94153dc8a..00000000000000 --- a/libexec/y2racc +++ /dev/null @@ -1,339 +0,0 @@ -#!/usr/local/bin/ruby -# -# $Id$ -# -# Copyright (c) 1999-2006 Minero Aoki -# -# This program is free software. -# You can distribute/modify this program under the terms of -# the GNU LGPL, Lesser General Public License version 2.1. -# For details of the GNU LGPL, see the file "COPYING". -# - -require 'racc/info' -require 'strscan' -require 'forwardable' -require 'optparse' - -def main - @with_action = true - @with_header = false - @with_usercode = false - cname = 'MyParser' - input = nil - output = nil - parser = OptionParser.new - parser.banner = "Usage: #{File.basename($0)} [-Ahu] [-c ] [-o ] " - parser.on('-o', '--output=FILENAME', 'output file name [.racc]') {|name| - output = name - } - parser.on('-c', '--classname=NAME', "Name of the parser class. [#{cname}]") {|name| - cname = name - } - parser.on('-A', '--without-action', 'Does not include actions.') { - @with_action = false - } - parser.on('-h', '--with-header', 'Includes header (%{...%}).') { - @with_header = true - } - parser.on('-u', '--with-user-code', 'Includes user code.') { - @with_usercode = true - } - parser.on('--version', 'Prints version and quit.') { - puts "y2racc version #{Racc::Version}" - exit 0 - } - parser.on('--copyright', 'Prints copyright and quit.') { - puts Racc::Copyright - exit 0 - } - parser.on('--help', 'Prints this message and quit.') { - puts parser.help - exit 1 - } - begin - parser.parse! - rescue OptionParser::ParseError => err - $stderr.puts err.message - $stderr.puts parser.help - exit 1 - end - if ARGV.empty? - $stderr.puts 'no input' - exit 1 - end - if ARGV.size > 1 - $stderr.puts 'too many input' - exit 1 - end - input = ARGV[0] - - begin - result = YaccFileParser.parse_file(input) - File.open(output || "#{input}.racc", 'w') {|f| - convert cname, result, f - } - rescue SystemCallError => err - $stderr.puts err.message - exit 1 - end -end - -def convert(classname, result, f) - init_indent = 'token'.size - f.puts %<# Converted from "#{result.filename}" by y2racc version #{Racc::Version}> - f.puts - f.puts "class #{classname}" - unless result.terminals.empty? - f.puts - f.print 'token' - columns = init_indent - result.terminals.each do |t| - if columns > 60 - f.puts - f.print ' ' * init_indent - columns = init_indent - end - columns += f.write(" #{t}") - end - f.puts - end - unless result.precedence_table.empty? - f.puts - f.puts 'preclow' - result.precedence_table.each do |assoc, toks| - f.printf " %-8s %s\n", assoc, toks.join(' ') unless toks.empty? - end - f.puts 'prechigh' - end - if result.start - f.puts - f.puts "start #{@start}" - end - - f.puts - f.puts 'rule' - texts = @with_action ? result.grammar : result.grammar_without_actions - texts.each do |text| - f.print text - end - - if @with_header and result.header - f.puts - f.puts '---- header' - f.puts result.header - end - if @with_usercode and result.usercode - f.puts - f.puts '---- footer' - f.puts result.usercode - end -end - -class ParseError < StandardError; end - -class StringScanner_withlineno - def initialize(src) - @s = StringScanner.new(src) - @lineno = 1 - end - - extend Forwardable - def_delegator "@s", :eos? - def_delegator "@s", :rest - - attr_reader :lineno - - def scan(re) - advance_lineno(@s.scan(re)) - end - - def scan_until(re) - advance_lineno(@s.scan_until(re)) - end - - def skip(re) - str = advance_lineno(@s.scan(re)) - str ? str.size : nil - end - - def getch - advance_lineno(@s.getch) - end - - private - - def advance_lineno(str) - @lineno += str.count("\n") if str - str - end -end - -class YaccFileParser - - Result = Struct.new(:terminals, :precedence_table, :start, - :header, :grammar, :usercode, :filename) - class Result # reopen - def initialize - super - self.terminals = [] - self.precedence_table = [] - self.start = nil - self.grammar = [] - self.header = nil - self.usercode = nil - self.filename = nil - end - - def grammar_without_actions - grammar().map {|text| text[0,1] == '{' ? '{}' : text } - end - end - - def YaccFileParser.parse_file(filename) - new().parse(File.read(filename), filename) - end - - def parse(src, filename = '-') - @result = Result.new - @filename = filename - @result.filename = filename - s = StringScanner_withlineno.new(src) - parse_header s - parse_grammar s - @result - end - - private - - COMMENT = %r - CHAR = /'((?:[^'\\]+|\\.)*)'/ - STRING = /"((?:[^"\\]+|\\.)*)"/ - - def parse_header(s) - skip_until_percent s - until s.eos? - case - when t = s.scan(/left/) - @result.precedence_table.push ['left', scan_symbols(s)] - when t = s.scan(/right/) - @result.precedence_table.push ['right', scan_symbols(s)] - when t = s.scan(/nonassoc/) - @result.precedence_table.push ['nonassoc', scan_symbols(s)] - when t = s.scan(/token/) - list = scan_symbols(s) - list.shift if /\A<(.*)>\z/ =~ list[0] - @result.terminals.concat list - when t = s.scan(/start/) - @result.start = scan_symbols(s)[0] - when s.skip(%r<(?: - type | union | expect | thong | binary | - semantic_parser | pure_parser | no_lines | - raw | token_table - )\b>x) - skip_until_percent s - when s.skip(/\{/) # header (%{...%}) - str = s.scan_until(/\%\}/) - str.chop! - str.chop! - @result.header = str - skip_until_percent s - when s.skip(/\%/) # grammar (%%...) - return - else - raise ParseError, "#{@filename}:#{s.lineno}: scan error" - end - end - end - - def skip_until_percent(s) - until s.eos? - s.skip /[^\%\/]+/ - next if s.skip(COMMENT) - return if s.getch == '%' - end - end - - def scan_symbols(s) - list = [] - until s.eos? - s.skip /\s+/ - if s.skip(COMMENT) - ; - elsif t = s.scan(CHAR) - list.push t - elsif t = s.scan(STRING) - list.push t - elsif s.skip(/\%/) - break - elsif t = s.scan(/\S+/) - list.push t - else - raise ParseError, "#{@filename}:#{@lineno}: scan error" - end - end - list - end - - def parse_grammar(s) - buf = [] - until s.eos? - if t = s.scan(/[^%'"{\/]+/) - buf.push t - break if s.eos? - end - if s.skip(/\{/) - buf.push scan_action(s) - elsif t = s.scan(/'(?:[^'\\]+|\\.)*'/) then buf.push t - elsif t = s.scan(/"(?:[^"\\]+|\\.)*"/) then buf.push t - elsif t = s.scan(COMMENT) then buf.push t - elsif s.skip(/%prec\b/) then buf.push '=' - elsif s.skip(/%%/) - @result.usercode = s.rest - break - else - buf.push s.getch - end - end - @result.grammar = buf - end - - def scan_action(s) - buf = '{' - nest = 1 - until s.eos? - if t = s.scan(%r<[^/{}'"]+>) - buf << t - break if s.eos? - elsif t = s.scan(COMMENT) - buf << t - elsif t = s.scan(CHAR) - buf << t - elsif t = s.scan(STRING) - buf << t - else - c = s.getch - buf << c - case c - when '{' - nest += 1 - when '}' - nest -= 1 - return buf if nest == 0 - end - end - end - $stderr.puts "warning: unterminated action in #{@filename}" - buf - end - -end - -unless Object.method_defined?(:funcall) - class Object - alias funcall __send__ - end -end - - -main From 69731b248f12f52c3897584db914cdf04a8ce5ac Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 1 Jan 2020 07:53:27 +0900 Subject: [PATCH 272/878] Fixup a6864f6d2f39bcd1ff04516591cc18d4027ab186 --- lib/racc/racc.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/racc/racc.gemspec b/lib/racc/racc.gemspec index 6beb16c5b4666c..6ed031bfe12a04 100644 --- a/lib/racc/racc.gemspec +++ b/lib/racc/racc.gemspec @@ -16,11 +16,11 @@ DESC s.email = [nil, "aaron@tenderlovemaking.com"] s.homepage = "http://i.loveruby.net/en/projects/racc/" s.licenses = ["MIT"] - s.executables = ["racc", "racc2y", "y2racc"] + s.executables = ["racc"] s.files = [ "COPYING", "ChangeLog", "DEPENDS", "Manifest.txt", "README.ja.rdoc", "README.rdoc", "Rakefile", "TODO", "bin/racc", - "bin/racc2y", "bin/y2racc", "ext/racc/MANIFEST", + "ext/racc/MANIFEST", "ext/racc/com/headius/racc/Cparse.java", "ext/racc/cparse.c", "ext/racc/depend", "ext/racc/extconf.rb", "fastcache/extconf.rb", "fastcache/fastcache.c", "lib/racc.rb", "lib/racc/compat.rb", From 47c84c74d4d8c84fd8e58527069548c7b0c2ad3d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 15:27:40 -0800 Subject: [PATCH 273/878] Make test run condition consistent with other jobs When `make all` fails, we should not run tests and output of such run is confusing. --- .github/workflows/mingw.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index ae3ce05967ecac..f4bbc3c5f4792e 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -117,7 +117,6 @@ jobs: make -C build test - name: test-all - if: success() || failure() timeout-minutes: 25 run: | $env:TMPDIR = "$pwd/temp" @@ -129,7 +128,6 @@ jobs: make -C build test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" - name: test-spec - if: success() || failure() timeout-minutes: 10 run: | $env:TMPDIR = "$pwd/temp" From ab9f56b61575617fa2c565543b7ce2afffd1c528 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 15:58:06 -0800 Subject: [PATCH 274/878] Do not notify AppVeyor on_build_status_changed Similar to 4fb6643f31cdee33184043ce17c42001274c4392. This is motivated by the lack of the same feature in GitHub Actions. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 623d6288792c9c..b441712028be94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -94,4 +94,4 @@ notifications: {{/isPullRequest}} on_build_success: false on_build_failure: true - on_build_status_changed: true + on_build_status_changed: false From eca964c24e94ceb9146bcf4c010d9abfc632637a Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 21:26:39 -0800 Subject: [PATCH 275/878] More consistent failure notifications The format is the same as Travis / AppVeyor now. --- .github/workflows/cygwin.yml | 14 ++++++++++++++ .github/workflows/macos.yml | 4 ++-- .github/workflows/mingw.yml | 4 ++-- .github/workflows/mjit.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 515b47e141256d..413f14d186a02d 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -77,3 +77,17 @@ jobs: # run: | # make -C build btest # shell: cmd + - uses: k0kubun/action-slack@v2.0.0 + with: + payload: | + { + "attachments": [{ + "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + + "() " + + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", + "color": "danger" + }] + } + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + if: failure() && github.event_name == 'push' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c3af98ad180e7d..87d7a802d71b5f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -72,9 +72,9 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" }] } diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index f4bbc3c5f4792e..82837915741eba 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -145,9 +145,9 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" }] } diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index cdb41701ded6b4..7d6cc10b69bad6 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -69,9 +69,9 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }} " + "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" }] } diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0b3dea7e689523..901bf02be6d6d9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -106,9 +106,9 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ matrix.os }} / ${{ matrix.test_task }} " + + "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" }] } diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 09e588784cee6d..ebbac19d99169a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -79,9 +79,9 @@ jobs: payload: | { "attachments": [{ - "text": "${{ job.status }}: ${{ matrix.os }} / ${{ matrix.test_task }} " + + "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}", + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" }] } From 8c9450e7b875db846b19cc631af0d7fee66db5c6 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 22:03:07 -0800 Subject: [PATCH 276/878] Remove code to prevent double build on trunk trunk branch was deleted. --- .github/workflows/cygwin.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- appveyor.yml | 3 --- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 413f14d186a02d..c7ea92bb40be12 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -2,7 +2,7 @@ name: Cygwin on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 87d7a802d71b5f..39d0391b7f001b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,7 +2,7 @@ name: macOS on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 82837915741eba..9615c0007d1f26 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -2,7 +2,7 @@ name: MinGW on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 7d6cc10b69bad6..105639ef3978fc 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -2,7 +2,7 @@ name: MJIT on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 901bf02be6d6d9..7669038f701d31 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -2,7 +2,7 @@ name: Ubuntu on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ebbac19d99169a..cf4a4f6e12e465 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,7 @@ name: Windows on: push: branches: - - master + - '*' pull_request: branches: - '*' diff --git a/appveyor.yml b/appveyor.yml index b441712028be94..17efe005a0ba27 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,9 +3,6 @@ version: '{build}' shallow_clone: true platform: - x64 -branches: - except: - - trunk # mirrored from trunk. avoid doubly building on it environment: ruby_version: "24-%Platform%" zlib_version: "1.2.11" From afd3f64f8cc4ff4fc956727d7e2da70597352008 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 31 Dec 2019 22:06:18 -0800 Subject: [PATCH 277/878] Redmine /projects/ruby-trunk is now redirected to /projects/ruby-master --- .gdbinit | 2 +- doc/ChangeLog-2.0.0 | 6 +++--- doc/ChangeLog-2.1.0 | 4 ++-- doc/NEWS-2.7.0 | 2 +- doc/contributing.rdoc | 8 ++++---- doc/extension.rdoc | 2 +- doc/syntax/refinements.rdoc | 2 +- lib/webrick/webrick.gemspec | 2 +- tool/redmine-backporter.rb | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gdbinit b/.gdbinit index 0d44622691b4ee..f73c036299c146 100644 --- a/.gdbinit +++ b/.gdbinit @@ -1274,7 +1274,7 @@ document rb_count_objects Counts all objects grouped by type. end -# Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB +# Details: https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB define trace_machine_instructions set logging on set height 0 diff --git a/doc/ChangeLog-2.0.0 b/doc/ChangeLog-2.0.0 index a1a79b8dca7655..b51d74220370ec 100644 --- a/doc/ChangeLog-2.0.0 +++ b/doc/ChangeLog-2.0.0 @@ -9758,7 +9758,7 @@ Thu Aug 23 16:20:04 2012 Koichi Sasada are b10. If flonum is activated, then USE_FLONUM macro is 1. I'll write detailed in this technique on - https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/Flonum_tech + https://bugs.ruby-lang.org/projects/ruby-master/wiki/Flonum_tech * benchmark/bmx_temp.rb: add an benchmark for simple Float calculation. @@ -13008,7 +13008,7 @@ Thu Jun 7 15:53:03 2012 Koichi Sasada * .gdbinit: add function `trace_machine_instructions' to trace in native machine assemble. - See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB + See https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB for more details. Wed Jun 6 21:31:21 2012 Tanaka Akira @@ -14711,7 +14711,7 @@ Fri Apr 27 01:45:05 2012 NARUSE, Yui (22) main thread waits at gvl_yield:112 (native_cond_wait) As described above, the main thread can't escape from rb_threadptr_execute_interrupts_common. - See extended memo: http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/R35480_ExtendedMemo + See extended memo: http://bugs.ruby-lang.org/projects/ruby-master/wiki/R35480_ExtendedMemo Fri Apr 27 07:15:07 2012 Tanaka Akira diff --git a/doc/ChangeLog-2.1.0 b/doc/ChangeLog-2.1.0 index 76edfd3ce730f0..5b670b31c97c8c 100644 --- a/doc/ChangeLog-2.1.0 +++ b/doc/ChangeLog-2.1.0 @@ -3596,7 +3596,7 @@ Tue Oct 22 19:19:05 2013 Koichi Sasada maintains all pages. For example, pages are allocated from the heap_pages. - See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design + See https://bugs.ruby-lang.org/projects/ruby-master/wiki/GC_design and https://bugs.ruby-lang.org/attachments/4015/data-heap_structure_with_multiple_heaps.png for more details. @@ -8612,7 +8612,7 @@ Wed Jul 17 14:31:13 2013 Koichi Sasada (4) heap::sorted is an array of "slots", sorted by an address of slot::body. - See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design + See https://bugs.ruby-lang.org/projects/ruby-master/wiki/GC_design for more details (figure). * gc.c: Avoid "heaps" terminology. It is ambiguous. diff --git a/doc/NEWS-2.7.0 b/doc/NEWS-2.7.0 index 4ff6cf09dcfcad..28f6c652de0969 100644 --- a/doc/NEWS-2.7.0 +++ b/doc/NEWS-2.7.0 @@ -812,7 +812,7 @@ RubyVM::InstructionSequence:: * Require compilers to support C99. [Misc #15347] - * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/C99 + * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-master/wiki/C99 * Ruby's upstream repository is changed from Subversion to Git. diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc index 68dda66e461204..007faaec0bebf7 100644 --- a/doc/contributing.rdoc +++ b/doc/contributing.rdoc @@ -27,10 +27,10 @@ on your ticket. stable release. See {Downloading Ruby}[https://www.ruby-lang.org/en/downloads/]. * Look to see if anyone already reported your issue, try - {searching on redmine}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues] + {searching on redmine}[https://bugs.ruby-lang.org/projects/ruby-master/issues] for your problem. * If you can't find a ticket addressing your issue, - {create a new one}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues/new]. + {create a new one}[https://bugs.ruby-lang.org/projects/ruby-master/issues/new]. * Choose the target version, usually current. Bugs will be first fixed in the current release and then {backported}[rdoc-label:label-Backport+Requests]. * Fill in the Ruby version you're using when experiencing this issue @@ -116,7 +116,7 @@ these? Quite a bit, actually: When a bug report goes for a while without any feedback, it goes to the bug graveyard which is unfortunate. If you check the {issues -list}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues] you will find lots +list}[https://bugs.ruby-lang.org/projects/ruby-master/issues] you will find lots of delinquent bugs that require attention. You can help by verifying the existing tickets, try to reproduce the reported @@ -156,7 +156,7 @@ If there's a new feature that you want to see added to Ruby, you will need to write a convincing proposal and patch to implement the feature. For new features in CRuby, use the {'Feature' -tracker}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues?set_filter=1&tracker_id=2] +tracker}[https://bugs.ruby-lang.org/projects/ruby-master/issues?set_filter=1&tracker_id=2] on ruby-master. For non-CRuby dependent features, features that would apply to alternate Ruby implementations such as JRuby and Rubinius, use the {CommonRuby tracker}[https://bugs.ruby-lang.org/projects/common-ruby]. diff --git a/doc/extension.rdoc b/doc/extension.rdoc index 79eb96d518005a..dfa4cb22ca0dfa 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -2049,7 +2049,7 @@ Before inserting write barriers, you need to know about RGenGC algorithm available in include/ruby/ruby.h. An example is available in iseq.c. For a complete guide for RGenGC and write barriers, please refer to -. +. == Appendix E. RB_GC_GUARD to protect from premature GC diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc index fc554bb4764c7c..44a63a2baeded4 100644 --- a/doc/syntax/refinements.rdoc +++ b/doc/syntax/refinements.rdoc @@ -278,6 +278,6 @@ Refinements in descendants have higher precedence than those of ancestors. == Further Reading -See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the +See https://bugs.ruby-lang.org/projects/ruby-master/wiki/RefinementsSpec for the current specification for implementing refinements. The specification also contains more details. diff --git a/lib/webrick/webrick.gemspec b/lib/webrick/webrick.gemspec index 549050253923f3..97e93b5aceadcf 100644 --- a/lib/webrick/webrick.gemspec +++ b/lib/webrick/webrick.gemspec @@ -66,7 +66,7 @@ Gem::Specification.new do |s| if s.respond_to?(:metadata=) s.metadata = { - "bug_tracker_uri" => "https://bugs.ruby-lang.org/projects/ruby-trunk/issues", + "bug_tracker_uri" => "https://bugs.ruby-lang.org/projects/ruby-master/issues", "homepage_uri" => "https://www.ruby-lang.org", "source_code_uri" => "https://git.ruby-lang.org/ruby.git/" } diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb index 9281219faa0e77..757fe180bcb056 100755 --- a/tool/redmine-backporter.rb +++ b/tool/redmine-backporter.rb @@ -271,7 +271,7 @@ def backport_command_string # check if the Git revision is included in trunk begin - uri = URI("#{REDMINE_BASE}/projects/ruby-trunk/repository/git/revisions/#{c}") + uri = URI("#{REDMINE_BASE}/projects/ruby-master/repository/git/revisions/#{c}") uri.read($openuri_options) true rescue @@ -301,7 +301,7 @@ class CommandSyntaxError < RuntimeError; end commands = { "ls" => proc{|args| raise CommandSyntaxError unless /\A(\d+)?\z/ =~ args - uri = URI(REDMINE_BASE+'/projects/ruby-trunk/issues.json?'+URI.encode_www_form(@query.dup.merge('page' => ($1 ? $1.to_i : 1)))) + uri = URI(REDMINE_BASE+'/projects/ruby-master/issues.json?'+URI.encode_www_form(@query.dup.merge('page' => ($1 ? $1.to_i : 1)))) # puts uri res = JSON(uri.read($openuri_options)) @issues = issues = res["issues"] @@ -379,10 +379,10 @@ class CommandSyntaxError < RuntimeError; end case args when /\Ar?(\d+)\z/ # SVN rev = $1 - uri = URI("#{REDMINE_BASE}/projects/ruby-trunk/repository/trunk/revisions/#{rev}/issues.json") + uri = URI("#{REDMINE_BASE}/projects/ruby-master/repository/trunk/revisions/#{rev}/issues.json") when /\A\h{7,40}\z/ # Git rev = args - uri = URI("#{REDMINE_BASE}/projects/ruby-trunk/repository/git/revisions/#{rev}/issues.json") + uri = URI("#{REDMINE_BASE}/projects/ruby-master/repository/git/revisions/#{rev}/issues.json") else raise CommandSyntaxError end From 076f24c2278c9718c4e2b23bfb946b960fafa468 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Wed, 1 Jan 2020 22:55:12 +0900 Subject: [PATCH 278/878] bignum.c: extract bdigits_to_mpz and bdigits_from_mpz (#2805) --- bignum.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/bignum.c b/bignum.c index 57b16e80e10c91..78c5681508e28a 100644 --- a/bignum.c +++ b/bignum.c @@ -2290,10 +2290,23 @@ rb_big_mul_toom3(VALUE x, VALUE y) } #ifdef USE_GMP +static inline void +bdigits_to_mpz(mpz_t mp, const BDIGIT *digits, size_t len) +{ + const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; + mpz_import(mp, len, -1, sizeof(BDIGIT), 0, nails, digits); +} + +static inline void +bdigits_from_mpz(mpz_t mp, BDIGIT *digits, size_t *len) +{ + const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; + mpz_export(digits, len, -1, sizeof(BDIGIT), 0, nails, mp); +} + static void bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn) { - const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; mpz_t x, y, z; size_t count; @@ -2302,15 +2315,15 @@ bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT mpz_init(x); mpz_init(y); mpz_init(z); - mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds); + bdigits_to_mpz(x, xds, xn); if (xds == yds && xn == yn) { mpz_mul(z, x, x); } else { - mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds); + bdigits_to_mpz(y, yds, yn); mpz_mul(z, x, y); } - mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z); + bdigits_from_mpz(z, zds, &count); BDIGITS_ZERO(zds+count, zn-count); mpz_clear(x); mpz_clear(y); @@ -2761,7 +2774,6 @@ rb_big_divrem_normal(VALUE x, VALUE y) static void bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn) { - const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; mpz_t x, y, q, r; size_t count; @@ -2775,8 +2787,8 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd if (qds) mpz_init(q); if (rds) mpz_init(r); - mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds); - mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds); + bdigits_to_mpz(x, xds, xn); + bdigits_to_mpz(y, yds, yn); if (!rds) { mpz_fdiv_q(q, x, y); @@ -2792,13 +2804,13 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd mpz_clear(y); if (qds) { - mpz_export(qds, &count, -1, sizeof(BDIGIT), 0, nails, q); + bdigits_from_mpz(q, qds, &count); BDIGITS_ZERO(qds+count, qn-count); mpz_clear(q); } if (rds) { - mpz_export(rds, &count, -1, sizeof(BDIGIT), 0, nails, r); + bdigits_from_mpz(r, rds, &count); BDIGITS_ZERO(rds+count, rn-count); mpz_clear(r); } @@ -3969,7 +3981,6 @@ str2big_gmp( size_t num_bdigits, int base) { - const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; char *buf, *p; const char *q; VALUE tmps; @@ -3992,7 +4003,7 @@ str2big_gmp( zn = num_bdigits; z = bignew(zn, sign); zds = BDIGITS(z); - mpz_export(BDIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz); + bdigits_from_mpz(mz, BDIGITS(z), &count); BDIGITS_ZERO(zds+count, zn-count); mpz_clear(mz); @@ -5023,7 +5034,6 @@ rb_big2str_generic(VALUE x, int base) static VALUE big2str_gmp(VALUE x, int base) { - const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; mpz_t mx; size_t size; VALUE str; @@ -5031,7 +5041,7 @@ big2str_gmp(VALUE x, int base) size_t xn = BIGNUM_LEN(x); mpz_init(mx); - mpz_import(mx, xn, -1, sizeof(BDIGIT), 0, nails, xds); + bdigits_to_mpz(mx, xds, xn); size = mpz_sizeinbase(mx, base); @@ -6962,18 +6972,17 @@ rb_big_isqrt(VALUE n) static void bary_powm_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, const BDIGIT *mds, size_t mn) { - const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; mpz_t z, x, y, m; size_t count; mpz_init(x); mpz_init(y); mpz_init(m); mpz_init(z); - mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds); - mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds); - mpz_import(m, mn, -1, sizeof(BDIGIT), 0, nails, mds); + bdigits_to_mpz(x, xds, xn); + bdigits_to_mpz(y, yds, yn); + bdigits_to_mpz(m, mds, mn); mpz_powm(z, x, y, m); - mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z); + bdigits_from_mpz(z, zds, &count); BDIGITS_ZERO(zds+count, zn-count); mpz_clear(x); mpz_clear(y); From 34bc15c86b764e8fdd11d9af8ad3dc401f24b5c4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 2 Jan 2020 10:06:16 +0900 Subject: [PATCH 279/878] Check Module#ruby2_keywords arity It is considered a mistake, because calling this method with no arguments has no effect. --- test/ruby/test_keyword.rb | 6 ++++++ vm_method.c | 1 + 2 files changed, 7 insertions(+) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index bbf3953c17cfb6..c3a3a450f1be06 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -2724,6 +2724,12 @@ def o.foo(*args) end def test_ruby2_keywords + assert_raise(ArgumentError) do + Class.new do + ruby2_keywords + end + end + c = Class.new do ruby2_keywords def foo(meth, *args) send(meth, *args) diff --git a/vm_method.c b/vm_method.c index 45044687895044..877198cee1c91e 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1811,6 +1811,7 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module) int i; VALUE origin_class = RCLASS_ORIGIN(module); + rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); rb_check_frozen(module); for (i = 0; i < argc; i++) { From 71ae2acee1459d467e5d5a56745cc9da7c32a264 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 2 Jan 2020 10:55:58 +0900 Subject: [PATCH 280/878] * 2020-01-02 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 9b2c53a1c2b7a1..ad3bb93938a06c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" From 749915e9407f3d623ab817f60a8ac85085e44695 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Thu, 2 Jan 2020 12:12:05 +0900 Subject: [PATCH 281/878] Fix a typo [ci skip] --- warning.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warning.rb b/warning.rb index 224650d4ef098a..9be277acef1b86 100644 --- a/warning.rb +++ b/warning.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -# fronzen-string-literal: true +# frozen-string-literal: true module Kernel module_function From bba491612283e5e2b3a05f578350f84ce02274bc Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Jan 2020 00:02:28 +0900 Subject: [PATCH 282/878] Fix example of node.type [ci skip] ``` % docker run -it --rm rubylang/all-ruby env ALL_RUBY_SINCE=ruby-2.6 ./all-ruby -e 'root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2") p [root, root.type] call = root.children[2] p [call, call.type] ' ruby-2.6.0 [#, :SCOPE] [#, :LASGN] ... ruby-2.7.0 [#, :SCOPE] [#, :LASGN] ``` --- ast.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ast.rb b/ast.rb index 1fedf7664957b7..d7e9df86787f28 100644 --- a/ast.rb +++ b/ast.rb @@ -84,7 +84,7 @@ class Node # root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2") # root.type # => :SCOPE # call = root.children[2] - # call.type # => :OPCALL + # call.type # => :LASGN def type __builtin_ast_node_type end From db22b368623746ecc21288f23afc435545e5afa4 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 3 Jan 2020 00:03:31 +0900 Subject: [PATCH 283/878] * 2020-01-03 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index ad3bb93938a06c..1f1c64b6a98639 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" From b884eb59eb22172b5d8af9f33ece093c8f917176 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Jan 2020 01:26:32 +0900 Subject: [PATCH 284/878] Fix variable name and add more example [ci skip] --- ast.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ast.rb b/ast.rb index d7e9df86787f28..c507c50af83cb3 100644 --- a/ast.rb +++ b/ast.rb @@ -83,8 +83,10 @@ class Node # # root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2") # root.type # => :SCOPE - # call = root.children[2] - # call.type # => :LASGN + # lasgn = root.children[2] + # lasgn.type # => :LASGN + # call = lasgn.children[1] + # call.type # => :OPCALL def type __builtin_ast_node_type end From 27fae1d4adfef26d30d43f2d0d6653e99aaaba3d Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Fri, 3 Jan 2020 02:00:58 +0900 Subject: [PATCH 285/878] disable ccache if $CC is in /usr/lib/ccache/$CC. MJIT with ccache has a problem on docker environment, so we need to use original CC (/usr/bin/gcc, for example). Ubuntu system provides /usr/lib/ccache/gcc and so on to use gcc with ccache. It is easy to setup ccache by adding /usr/lib/ccache to $PATH. However we need to use /usr/bin/gcc (and so on) for MJIT_CC. We can specify MJIT_CC option at configure, but specifying them is troublesome. This patch choose original $CC (/usr/bin/gcc, for example) if $CC is /usr/lib/ccache/$CC. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index e8d9aa6d5e40b5..98bc48854f8135 100644 --- a/configure.ac +++ b/configure.ac @@ -274,6 +274,11 @@ AC_SUBST(CSRCFLAG) : ${MJIT_CC=$CC} AS_IF([test "x$cross_compiling" = xno], [ AC_PATH_PROG([MJIT_CC], ${MJIT_CC}) + + # if $CC is in /usr/lib/ccache/$CC, search original $CC (disable ccache) + AS_IF([echo $MJIT_CC | grep ^/usr/lib/ccache > /dev/null], [ + PATH=`echo $PATH | sed "s/\/usr\/lib\/ccache://"` MJIT_CC=`which $CC`]) + AS_CASE([$target_os], [*mingw*], [command -v cygpath > /dev/null && MJIT_CC=`cygpath -ma $MJIT_CC`]) shift 2 From 6f5ee1f092414e4d60a403d82a57cf023b38c0b9 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Fri, 3 Jan 2020 04:39:34 +0900 Subject: [PATCH 286/878] modify MJIT_CC only on RUBY_DEBUG=ci Modify MJIT_CC (27fae1d4ad) only on CI environment. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 98bc48854f8135..55b2d93eae59fa 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,8 @@ AS_IF([test "x$cross_compiling" = xno], [ AC_PATH_PROG([MJIT_CC], ${MJIT_CC}) # if $CC is in /usr/lib/ccache/$CC, search original $CC (disable ccache) - AS_IF([echo $MJIT_CC | grep ^/usr/lib/ccache > /dev/null], [ + AS_IF([echo $RUBY_DEBUG | grep ci > /dev/null && + echo $MJIT_CC | grep ^/usr/lib/ccache > /dev/null], [ PATH=`echo $PATH | sed "s/\/usr\/lib\/ccache://"` MJIT_CC=`which $CC`]) AS_CASE([$target_os], From 9f460e017b341fc8378f00315b0776e300107ccd Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Fri, 3 Jan 2020 04:46:51 +0900 Subject: [PATCH 287/878] move internal/debug.h definitions to internal.h Debug utilities should be accessible from any internal code. --- common.mk | 3 --- compile.c | 1 - debug.c | 1 - hash.c | 1 - internal.h | 24 ++++++++++++++++++++++++ internal/debug.h | 39 --------------------------------------- vm.c | 1 - 7 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 internal/debug.h diff --git a/common.mk b/common.mk index 2ab2855b6f7373..0d69e1b2989073 100644 --- a/common.mk +++ b/common.mk @@ -1802,7 +1802,6 @@ compile.$(OBJEXT): $(top_srcdir)/internal/bits.h compile.$(OBJEXT): $(top_srcdir)/internal/compile.h compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h compile.$(OBJEXT): $(top_srcdir)/internal/complex.h -compile.$(OBJEXT): $(top_srcdir)/internal/debug.h compile.$(OBJEXT): $(top_srcdir)/internal/encoding.h compile.$(OBJEXT): $(top_srcdir)/internal/error.h compile.$(OBJEXT): $(top_srcdir)/internal/fixnum.h @@ -1942,7 +1941,6 @@ debug.$(OBJEXT): $(hdrdir)/ruby.h debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h debug.$(OBJEXT): $(top_srcdir)/internal/array.h debug.$(OBJEXT): $(top_srcdir)/internal/compilers.h -debug.$(OBJEXT): $(top_srcdir)/internal/debug.h debug.$(OBJEXT): $(top_srcdir)/internal/gc.h debug.$(OBJEXT): $(top_srcdir)/internal/imemo.h debug.$(OBJEXT): $(top_srcdir)/internal/serial.h @@ -4110,7 +4108,6 @@ vm.$(OBJEXT): $(top_srcdir)/internal/compar.h vm.$(OBJEXT): $(top_srcdir)/internal/compile.h vm.$(OBJEXT): $(top_srcdir)/internal/compilers.h vm.$(OBJEXT): $(top_srcdir)/internal/cont.h -vm.$(OBJEXT): $(top_srcdir)/internal/debug.h vm.$(OBJEXT): $(top_srcdir)/internal/error.h vm.$(OBJEXT): $(top_srcdir)/internal/eval.h vm.$(OBJEXT): $(top_srcdir)/internal/fixnum.h diff --git a/compile.c b/compile.c index 200670f826a2f8..0eb94da3e0d47a 100644 --- a/compile.c +++ b/compile.c @@ -23,7 +23,6 @@ #include "internal/array.h" #include "internal/compile.h" #include "internal/complex.h" -#include "internal/debug.h" #include "internal/encoding.h" #include "internal/error.h" #include "internal/hash.h" diff --git a/debug.c b/debug.c index 7bb9d0205223ad..b15a08999ab307 100644 --- a/debug.c +++ b/debug.c @@ -15,7 +15,6 @@ #include "eval_intern.h" #include "id.h" -#include "internal/debug.h" #include "internal/signal.h" #include "internal/util.h" #include "ruby/encoding.h" diff --git a/hash.c b/hash.c index 04c821ac794835..606d5d39300a24 100644 --- a/hash.c +++ b/hash.c @@ -49,7 +49,6 @@ #if HASH_DEBUG #include "gc.h" -#include "internal/debug.h" #endif #define HAS_EXTRA_STATES(hash, klass) ( \ diff --git a/internal.h b/internal.h index 7479c73563383b..4d95fe704e1562 100644 --- a/internal.h +++ b/internal.h @@ -74,4 +74,28 @@ #define rb_funcallv(...) rb_nonexistent_symbol(__VA_ARGS__) #define rb_method_basic_definition_p(...) rb_nonexistent_symbol(__VA_ARGS__) + +/* MRI debug support */ + +/* gc.c */ +void rb_obj_info_dump(VALUE obj); +void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func); + +/* debug.c */ +void ruby_debug_breakpoint(void); +PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); + +// show obj data structure without any side-effect +#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) + +// same as rp, but add message header +#define rp_m(msg, obj) do { \ + fprintf(stderr, "%s", (msg)); \ + rb_obj_info_dump((VALUE)obj); \ +} while (0) + +// `ruby_debug_breakpoint()` does nothing, +// but breakpoint is set in run.gdb, so `make gdb` can stop here. +#define bp() ruby_debug_breakpoint() + #endif /* RUBY_INTERNAL_H */ diff --git a/internal/debug.h b/internal/debug.h deleted file mode 100644 index 276991027c8784..00000000000000 --- a/internal/debug.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef INTERNAL_DEBUG_H /* -*- C -*- */ -#define INTERNAL_DEBUG_H -/** - * @file - * @brief Internal header for debugging. - * @author \@shyouhei - * @copyright This file is a part of the programming language Ruby. - * Permission is hereby granted, to either redistribute and/or - * modify this file, provided that the conditions mentioned in the - * file COPYING are met. Consult the file for details. - */ -#include "ruby/config.h" -#include /* for fprintf */ -#include "ruby/ruby.h" /* for VALUE */ - -/* MRI debug support */ - -/* gc.c */ -void rb_obj_info_dump(VALUE obj); -void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func); - -/* debug.c */ -void ruby_debug_breakpoint(void); -PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); - -// show obj data structure without any side-effect -#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) - -// same as rp, but add message header -#define rp_m(msg, obj) do { \ - fprintf(stderr, "%s", (msg)); \ - rb_obj_info_dump((VALUE)obj); \ -} while (0) - -// `ruby_debug_breakpoint()` does nothing, -// but breakpoint is set in run.gdb, so `make gdb` can stop here. -#define bp() ruby_debug_breakpoint() - -#endif /* INTERNAL_DEBUG_H */ diff --git a/vm.c b/vm.c index d4a1d4437e3d64..e432cb13aa54a2 100644 --- a/vm.c +++ b/vm.c @@ -15,7 +15,6 @@ #include "internal.h" #include "internal/compile.h" #include "internal/cont.h" -#include "internal/debug.h" #include "internal/error.h" #include "internal/eval.h" #include "internal/inits.h" From 8ba261c7546e3cd12ff6870bb41dd0a0bee32ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lourens=20Naud=C3=A9?= Date: Thu, 2 Jan 2020 22:26:20 +0000 Subject: [PATCH 288/878] Bump benchmark-driver to v0.15.7 (#2811) --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 0d69e1b2989073..40e34fe36d5031 100644 --- a/common.mk +++ b/common.mk @@ -47,7 +47,7 @@ GEM_PATH = GEM_VENDOR = BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver -BENCHMARK_DRIVER_GIT_REF = v0.15.6 +BENCHMARK_DRIVER_GIT_REF = v0.15.7 SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git SIMPLECOV_GIT_REF = v0.17.0 SIMPLECOV_HTML_GIT_URL = https://github.com/colszowka/simplecov-html.git From beae6cbf0fd8b6619e5212552de98022d4c4d4d4 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 4 Oct 2019 12:51:57 -0700 Subject: [PATCH 289/878] Fully separate positional arguments and keyword arguments This removes the warnings added in 2.7, and changes the behavior so that a final positional hash is not treated as keywords or vice-versa. To handle the arg_setup_block splat case correctly with keyword arguments, we need to check if we are taking a keyword hash. That case didn't have a test, but it affects real-world code, so add a test for it. This removes rb_empty_keyword_given_p() and related code, as that is not needed in Ruby 3. The empty keyword case is the same as the no keyword case in Ruby 3. This changes rb_scan_args to implement keyword argument separation for C functions when the : character is used. For backwards compatibility, it returns a duped hash. This is a bad idea for performance, but not duping the hash breaks at least Enumerator::ArithmeticSequence#inspect. Instead of having RB_PASS_CALLED_KEYWORDS be a number, simplify the code by just making it be rb_keyword_given_p(). --- class.c | 70 +----- cont.c | 12 +- enumerator.c | 14 +- eval.c | 8 - ext/-test-/scan_args/scan_args.c | 10 - include/ruby/ruby.h | 78 +------ internal/vm.h | 1 - object.c | 4 +- proc.c | 5 - test/ruby/test_proc.rb | 10 + thread.c | 10 +- vm.c | 7 - vm_args.c | 383 +++---------------------------- vm_core.h | 12 +- vm_eval.c | 106 ++------- vm_insnhelper.c | 45 +--- 16 files changed, 96 insertions(+), 679 deletions(-) diff --git a/class.c b/class.c index bc64ff77952996..e42ee0821c8b8a 100644 --- a/class.c +++ b/class.c @@ -1970,7 +1970,6 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st const char *p = fmt; VALUE *tmp_buffer = arg->tmp_buffer; int keyword_given = 0; - int empty_keyword_given = 0; int last_hash_keyword = 0; memset(arg, 0, sizeof(*arg)); @@ -1979,16 +1978,11 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st switch (kw_flag) { case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS: - if (!(keyword_given = rb_keyword_given_p())) { - empty_keyword_given = rb_empty_keyword_given_p(); - } + keyword_given = rb_keyword_given_p(); break; case RB_SCAN_ARGS_KEYWORDS: keyword_given = 1; break; - case RB_SCAN_ARGS_EMPTY_KEYWORDS: - empty_keyword_given = 1; - break; case RB_SCAN_ARGS_LAST_HASH_KEYWORDS: last_hash_keyword = 1; break; @@ -2023,67 +2017,13 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st } arg->n_mand = arg->n_lead + arg->n_trail; - /* capture an option hash - phase 1: pop */ - /* Ignore final positional hash if empty keywords given */ - if (argc > 0 && !(arg->f_hash && empty_keyword_given)) { + if (arg->f_hash && argc > 0) { VALUE last = argv[argc - 1]; - if (arg->f_hash && arg->n_mand < argc) { - if (keyword_given) { - if (!RB_TYPE_P(last, T_HASH)) { - rb_warn("Keyword flag set when calling rb_scan_args, but last entry is not a hash"); - } - else { - arg->hash = last; - } - } - else if (NIL_P(last)) { - /* For backwards compatibility, nil is taken as an empty - option hash only if it is not ambiguous; i.e. '*' is - not specified and arguments are given more than sufficient. - This will be removed in Ruby 3. */ - if (!arg->f_var && arg->n_mand + arg->n_opt < argc) { - rb_warn("The last argument is nil, treating as empty keywords"); - argc--; - } - } - else { - arg->hash = rb_check_hash_type(last); - } - - /* Ruby 3: Remove if branch, as it will not attempt to split hashes */ - if (!NIL_P(arg->hash)) { - VALUE opts = rb_extract_keywords(&arg->hash); - - if (!(arg->last_hash = arg->hash)) { - if (!keyword_given && !last_hash_keyword) { - /* Warn if treating positional as keyword, as in Ruby 3, - this will be an error */ - rb_warn("Using the last argument as keyword parameters is deprecated"); - } - argc--; - } - else { - /* Warn if splitting either positional hash to keywords or keywords - to positional hash, as in Ruby 3, no splitting will be done */ - rb_warn("The last argument is split into positional and keyword parameters"); - arg->last_idx = argc - 1; - } - arg->hash = opts ? opts : Qnil; - } + if (keyword_given || (last_hash_keyword && RB_TYPE_P(last, T_HASH))) { + arg->hash = rb_hash_dup(last); + argc--; } - else if (arg->f_hash && keyword_given && arg->n_mand == argc) { - /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */ - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - } - } - if (arg->f_hash && arg->n_mand == argc+1 && empty_keyword_given) { - VALUE *ptr = rb_alloc_tmp_buffer2(tmp_buffer, argc+1, sizeof(VALUE)); - memcpy(ptr, argv, sizeof(VALUE)*argc); - ptr[argc] = rb_hash_new(); - argc++; - *(&argv) = ptr; - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); } arg->argc = argc; diff --git a/cont.c b/cont.c index 2365406d9e34f7..d4a2bf93538032 100644 --- a/cont.c +++ b/cont.c @@ -1790,8 +1790,6 @@ rb_fiber_new(rb_block_call_func_t func, VALUE obj) static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt); -#define PASS_KW_SPLAT (rb_empty_keyword_given_p() ? RB_PASS_EMPTY_KEYWORDS : rb_keyword_given_p()) - void rb_fiber_start(void) { @@ -1809,7 +1807,6 @@ rb_fiber_start(void) rb_context_t *cont = &VAR_FROM_MEMORY(fiber)->cont; int argc; const VALUE *argv, args = cont->value; - int kw_splat = cont->kw_splat; GetProcPtr(fiber->first_proc, proc); argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args; cont->value = Qnil; @@ -1818,8 +1815,7 @@ rb_fiber_start(void) th->ec->root_svar = Qfalse; EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil); - rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - cont->value = rb_vm_invoke_proc(th->ec, proc, argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE); + cont->value = rb_vm_invoke_proc(th->ec, proc, argc, argv, cont->kw_splat, VM_BLOCK_HANDLER_NONE); } EC_POP_TAG(); @@ -2163,7 +2159,7 @@ rb_fiber_alive_p(VALUE fiber_value) static VALUE rb_fiber_m_resume(int argc, VALUE *argv, VALUE fiber) { - return rb_fiber_resume_kw(fiber, argc, argv, PASS_KW_SPLAT); + return rb_fiber_resume_kw(fiber, argc, argv, rb_keyword_given_p()); } /* @@ -2249,7 +2245,7 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fiber_value) { rb_fiber_t *fiber = fiber_ptr(fiber_value); fiber->transferred = 1; - return fiber_switch(fiber, argc, argv, 0, PASS_KW_SPLAT); + return fiber_switch(fiber, argc, argv, 0, rb_keyword_given_p()); } /* @@ -2265,7 +2261,7 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fiber_value) static VALUE rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass) { - return rb_fiber_yield_kw(argc, argv, PASS_KW_SPLAT); + return rb_fiber_yield_kw(argc, argv, rb_keyword_given_p()); } /* diff --git a/enumerator.c b/enumerator.c index 790818064f4bc1..fa30a59819f8c5 100644 --- a/enumerator.c +++ b/enumerator.c @@ -384,8 +384,6 @@ enumerator_allocate(VALUE klass) return enum_obj; } -#define PASS_KW_SPLAT (rb_empty_keyword_given_p() ? RB_PASS_EMPTY_KEYWORDS : rb_keyword_given_p()) - static VALUE enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, VALUE size, int kw_splat) { @@ -480,7 +478,7 @@ enumerator_initialize(int argc, VALUE *argv, VALUE obj) meth = *argv++; --argc; } - kw_splat = PASS_KW_SPLAT; + kw_splat = rb_keyword_given_p(); } return enumerator_init(obj, recv, meth, argc, argv, 0, size, kw_splat); @@ -535,10 +533,10 @@ rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, const VALUE *argv, r /* Similar effect as calling obj.to_enum, i.e. dispatching to either Kernel#to_enum vs Lazy#to_enum */ if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy))) - return lazy_to_enum_i(obj, meth, argc, argv, size_fn, PASS_KW_SPLAT); + return lazy_to_enum_i(obj, meth, argc, argv, size_fn, rb_keyword_given_p()); else return enumerator_init(enumerator_allocate(rb_cEnumerator), - obj, meth, argc, argv, size_fn, Qnil, PASS_KW_SPLAT); + obj, meth, argc, argv, size_fn, Qnil, rb_keyword_given_p()); } VALUE @@ -1892,7 +1890,7 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo, static VALUE enumerable_lazy(VALUE obj) { - VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, lazyenum_size, PASS_KW_SPLAT); + VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, lazyenum_size, rb_keyword_given_p()); /* Qfalse indicates that the Enumerator::Lazy has no method name */ rb_ivar_set(result, id_method, Qfalse); return result; @@ -1940,7 +1938,7 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self) if (RTEST((super_meth = rb_hash_aref(lazy_use_super_method, meth)))) { meth = super_meth; } - lazy = lazy_to_enum_i(self, meth, argc, argv, 0, PASS_KW_SPLAT); + lazy = lazy_to_enum_i(self, meth, argc, argv, 0, rb_keyword_given_p()); if (rb_block_given_p()) { enumerator_ptr(lazy)->size = rb_block_proc(); } @@ -3318,7 +3316,7 @@ rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv, VALUE beg, VALUE end, VALUE step, int excl) { VALUE aseq = enumerator_init(enumerator_allocate(rb_cArithSeq), - obj, meth, argc, argv, size_fn, Qnil, PASS_KW_SPLAT); + obj, meth, argc, argv, size_fn, Qnil, rb_keyword_given_p()); rb_ivar_set(aseq, id_begin, beg); rb_ivar_set(aseq, id_end, end); rb_ivar_set(aseq, id_step, step); diff --git a/eval.c b/eval.c index 4770327a724ca4..429ecbe0d9336c 100644 --- a/eval.c +++ b/eval.c @@ -924,14 +924,6 @@ rb_keyword_given_p(void) return rb_vm_cframe_keyword_p(GET_EC()->cfp); } -/* -- Remove In 3.0 -- */ -int rb_vm_cframe_empty_keyword_p(const rb_control_frame_t *cfp); -int -rb_empty_keyword_given_p(void) -{ - return rb_vm_cframe_empty_keyword_p(GET_EC()->cfp); -} - VALUE rb_eThreadError; /*! Declares that the current method needs a block. diff --git a/ext/-test-/scan_args/scan_args.c b/ext/-test-/scan_args/scan_args.c index 9c374da66fe05c..8696aad3c77885 100644 --- a/ext/-test-/scan_args/scan_args.c +++ b/ext/-test-/scan_args/scan_args.c @@ -259,15 +259,6 @@ scan_args_k_lead_opt_hash(int argc, VALUE *argv, VALUE self) return rb_ary_new_from_values(numberof(args), args); } -static VALUE -scan_args_e_lead_opt_hash(int argc, VALUE *argv, VALUE self) -{ - VALUE args[4]; - int n = rb_scan_args_kw(RB_SCAN_ARGS_EMPTY_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3); - args[0] = INT2NUM(n); - return rb_ary_new_from_values(numberof(args), args); -} - static VALUE scan_args_n_lead_opt_hash(int argc, VALUE *argv, VALUE self) { @@ -310,6 +301,5 @@ Init_scan_args(void) rb_define_singleton_method(module, "opt_var_trail_hash", scan_args_opt_var_trail_hash, -1); rb_define_singleton_method(module, "lead_opt_var_trail_hash", scan_args_lead_opt_var_trail_hash, -1); rb_define_singleton_method(module, "k_lead_opt_hash", scan_args_k_lead_opt_hash, -1); - rb_define_singleton_method(module, "e_lead_opt_hash", scan_args_e_lead_opt_hash, -1); rb_define_singleton_method(module, "n_lead_opt_hash", scan_args_n_lead_opt_hash, -1); } diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 9b7c9842f8fd30..d81c72e95b2072 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1901,7 +1901,6 @@ VALUE rb_funcall_with_block_kw(VALUE, ID, int, const VALUE*, VALUE, int); int rb_scan_args(int, const VALUE*, const char*, ...); #define RB_SCAN_ARGS_PASS_CALLED_KEYWORDS 0 #define RB_SCAN_ARGS_KEYWORDS 1 -#define RB_SCAN_ARGS_EMPTY_KEYWORDS 2 /* Will be removed in 3.0 */ #define RB_SCAN_ARGS_LAST_HASH_KEYWORDS 3 int rb_scan_args_kw(int, int, const VALUE*, const char*, ...); VALUE rb_call_super(int, const VALUE*); @@ -1976,8 +1975,7 @@ VALUE rb_yield_splat_kw(VALUE, int); VALUE rb_yield_block(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)); /* rb_block_call_func */ #define RB_NO_KEYWORDS 0 #define RB_PASS_KEYWORDS 1 -#define RB_PASS_EMPTY_KEYWORDS 2 /* Will be removed in 3.0 */ -#define RB_PASS_CALLED_KEYWORDS 3 +#define RB_PASS_CALLED_KEYWORDS rb_keyword_given_p() int rb_keyword_given_p(void); int rb_block_given_p(void); void rb_need_block(void); @@ -2331,9 +2329,6 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base); PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4); int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -/* -- Remove In 3.0, Only public for rb_scan_args optimized version -- */ -int rb_empty_keyword_given_p(void); - #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && defined(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__) # define rb_scan_args(argc,argvp,fmt,...) \ __builtin_choose_expr(__builtin_constant_p(fmt), \ @@ -2525,78 +2520,13 @@ rb_scan_args_set(int argc, const VALUE *argv, int i, argi = 0, vari = 0, last_idx = -1; VALUE *var, hash = Qnil, last_hash = 0; const int n_mand = n_lead + n_trail; - int keyword_given = rb_keyword_given_p(); - int empty_keyword_given = 0; VALUE tmp_buffer = 0; - if (!keyword_given) { - empty_keyword_given = rb_empty_keyword_given_p(); + if (f_hash && argc > 0 && rb_keyword_given_p()) { + hash = rb_hash_dup(argv[argc - 1]); + argc--; } - /* capture an option hash - phase 1: pop */ - /* Ignore final positional hash if empty keywords given */ - if (argc > 0 && !(f_hash && empty_keyword_given)) { - VALUE last = argv[argc - 1]; - - if (f_hash && n_mand < argc) { - if (keyword_given) { - if (!RB_TYPE_P(last, T_HASH)) { - rb_warn("Keyword flag set when calling rb_scan_args, but last entry is not a hash"); - } - else { - hash = last; - } - } - else if (NIL_P(last)) { - /* For backwards compatibility, nil is taken as an empty - option hash only if it is not ambiguous; i.e. '*' is - not specified and arguments are given more than sufficient. - This will be removed in Ruby 3. */ - if (!f_var && n_mand + n_opt < argc) { - rb_warn("The last argument is nil, treating as empty keywords"); - argc--; - } - } - else { - hash = rb_check_hash_type(last); - } - - /* Ruby 3: Remove if branch, as it will not attempt to split hashes */ - if (!NIL_P(hash)) { - VALUE opts = rb_extract_keywords(&hash); - - if (!(last_hash = hash)) { - if (!keyword_given) { - /* Warn if treating positional as keyword, as in Ruby 3, - this will be an error */ - rb_warn("Using the last argument as keyword parameters is deprecated"); - } - argc--; - } - else { - /* Warn if splitting either positional hash to keywords or keywords - to positional hash, as in Ruby 3, no splitting will be done */ - rb_warn("The last argument is split into positional and keyword parameters"); - last_idx = argc - 1; - } - hash = opts ? opts : Qnil; - } - } - else if (f_hash && keyword_given && n_mand == argc) { - /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */ - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - } - } - if (f_hash && n_mand > 0 && n_mand == argc+1 && empty_keyword_given) { - VALUE *ptr = (VALUE *)rb_alloc_tmp_buffer2(&tmp_buffer, argc+1, sizeof(VALUE)); - memcpy(ptr, argv, sizeof(VALUE)*argc); - ptr[argc] = rb_hash_new(); - argc++; - *(&argv) = ptr; - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - } - - if (argc < n_mand) { goto argc_error; } diff --git a/internal/vm.h b/internal/vm.h index 1bd7a98f7ad8c6..c5986a1c2494d1 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -138,7 +138,6 @@ VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv, MJIT_SYMBOL_EXPORT_BEGIN VALUE rb_vm_call0(struct rb_execution_context_struct *ec, VALUE recv, ID id, int argc, const VALUE *argv, const struct rb_callable_method_entry_struct *me, int kw_splat); -VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); VALUE rb_vm_call_kw(struct rb_execution_context_struct *ec, VALUE recv, VALUE id, int argc, const VALUE *argv, const struct rb_callable_method_entry_struct *me, int kw_splat); VALUE rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj, int argc, const VALUE *argv, int priv); MJIT_SYMBOL_EXPORT_END diff --git a/object.c b/object.c index b5514322d21c92..f02b45af1c4ae4 100644 --- a/object.c +++ b/object.c @@ -4086,9 +4086,7 @@ rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound) } return rb_check_funcall_with_hook_kw(obj, id_dig, argc, argv, no_dig_method, obj, - rb_empty_keyword_given_p() ? - RB_PASS_EMPTY_KEYWORDS : - RB_NO_KEYWORDS); + RB_NO_KEYWORDS); } return obj; } diff --git a/proc.c b/proc.c index 7094a021f3cf6b..5434e8daa7cbc0 100644 --- a/proc.c +++ b/proc.c @@ -955,14 +955,11 @@ rb_proc_call_kw(VALUE self, VALUE args, int kw_splat) { VALUE vret; rb_proc_t *proc; - VALUE v; int argc = check_argc(RARRAY_LEN(args)); const VALUE *argv = RARRAY_CONST_PTR(args); GetProcPtr(self, proc); - v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); vret = rb_vm_invoke_proc(GET_EC(), proc, argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE); - rb_free_tmp_buffer(&v); RB_GC_GUARD(self); RB_GC_GUARD(args); return vret; @@ -994,10 +991,8 @@ rb_proc_call_with_block_kw(VALUE self, int argc, const VALUE *argv, VALUE passed rb_execution_context_t *ec = GET_EC(); VALUE vret; rb_proc_t *proc; - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); GetProcPtr(self, proc); vret = rb_vm_invoke_proc(ec, proc, argc, argv, kw_splat, proc_to_block_handler(passed_procval)); - rb_free_tmp_buffer(&v); RB_GC_GUARD(self); return vret; } diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 1f84b2eb845615..fce1bd4a870b26 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1087,6 +1087,16 @@ def test_proc_args_pos_unleashed assert_equal([1,2,[3],4,5], r, "[ruby-core:19485]") end + def test_proc_single_arg_with_keywords_accepted_and_yielded + def self.a + yield [], **{a: 1} + end + res = a do |arg, **opts| + [arg, opts] + end + assert_equal([[], {a: 1}], res) + end + def test_parameters assert_equal([], proc {}.parameters) assert_equal([], proc {||}.parameters) diff --git a/thread.c b/thread.c index 16f3e1ffed41e8..4faf04c1ce9ff5 100644 --- a/thread.c +++ b/thread.c @@ -681,7 +681,6 @@ thread_do_start(rb_thread_t *th) if (th->invoke_type == thread_invoke_type_proc) { VALUE args = th->invoke_arg.proc.args; int args_len = (int)RARRAY_LEN(args); - int kw_splat = th->invoke_arg.proc.kw_splat; const VALUE *args_ptr; VALUE procval = th->invoke_arg.proc.proc; rb_proc_t *proc; @@ -704,10 +703,11 @@ thread_do_start(rb_thread_t *th) args_ptr = RARRAY_CONST_PTR(args); } - rb_adjust_argv_kw_splat(&args_len, &args_ptr, &kw_splat); + vm_check_ints_blocking(th->ec); th->value = rb_vm_invoke_proc(th->ec, proc, args_len, args_ptr, - kw_splat, VM_BLOCK_HANDLER_NONE); + th->invoke_arg.proc.kw_splat, + VM_BLOCK_HANDLER_NONE); EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_END, th->self, 0, 0, 0, Qundef); } @@ -856,9 +856,7 @@ thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(void *)) th->invoke_type = thread_invoke_type_proc; th->invoke_arg.proc.proc = rb_block_proc(); th->invoke_arg.proc.args = args; - th->invoke_arg.proc.kw_splat = rb_empty_keyword_given_p() ? - RB_PASS_EMPTY_KEYWORDS : - rb_keyword_given_p(); + th->invoke_arg.proc.kw_splat = rb_keyword_given_p(); } th->priority = current_th->priority; diff --git a/vm.c b/vm.c index e432cb13aa54a2..5dd78a5e83b77e 100644 --- a/vm.c +++ b/vm.c @@ -119,13 +119,6 @@ rb_vm_cframe_keyword_p(const rb_control_frame_t *cfp) return VM_FRAME_CFRAME_KW_P(cfp); } -/* -- Remove In 3.0 -- */ -int -rb_vm_cframe_empty_keyword_p(const rb_control_frame_t *cfp) -{ - return VM_FRAME_CFRAME_EMPTY_KW_P(cfp); -} - VALUE rb_vm_frame_block_handler(const rb_control_frame_t *cfp) { diff --git a/vm_args.c b/vm_args.c index 7bf61cefe73a1e..3558d6487f73bf 100644 --- a/vm_args.c +++ b/vm_args.c @@ -187,124 +187,6 @@ args_rest_array(struct args_info *args) return ary; } -#define KW_HASH_HAS_NO_KEYS 0 -#define KW_HASH_HAS_SYMBOL_KEY 1 -#define KW_HASH_HAS_OTHER_KEY 2 -#define KW_HASH_HAS_BOTH_KEYS 3 - -static int -keyword_hash_symbol_other_iter(st_data_t key, st_data_t val, st_data_t arg) -{ - *(int*)arg |= SYMBOL_P((VALUE)key) ? KW_HASH_HAS_SYMBOL_KEY : KW_HASH_HAS_OTHER_KEY; - - if ((*(int*)arg & KW_HASH_HAS_BOTH_KEYS) == KW_HASH_HAS_BOTH_KEYS) { - return ST_STOP; - } - - return ST_CONTINUE; -} - -static int -keyword_hash_symbol_other(VALUE hash) -{ - int symbol_other = KW_HASH_HAS_NO_KEYS; - rb_hash_stlike_foreach(hash, keyword_hash_symbol_other_iter, (st_data_t)(&symbol_other)); - return symbol_other; -} - -static int -keyword_hash_split_iter(st_data_t key, st_data_t val, st_data_t arg) -{ - if (SYMBOL_P((VALUE)key)) { - rb_hash_aset((VALUE)arg, (VALUE)key, (VALUE)val); - return ST_DELETE; - } - - return ST_CONTINUE; -} - -static void -keyword_hash_split(VALUE *kw_hash_ptr, VALUE *rest_hash_ptr) -{ - *kw_hash_ptr = rb_hash_new(); - rb_hash_stlike_foreach(*rest_hash_ptr, keyword_hash_split_iter, (st_data_t)(*kw_hash_ptr)); -} - -static int -keyword_hash_p(VALUE *kw_hash_ptr, VALUE *rest_hash_ptr, int check_only_symbol) -{ - *rest_hash_ptr = rb_check_hash_type(*kw_hash_ptr); - - if (!NIL_P(*rest_hash_ptr)) { - if (check_only_symbol) { - switch (keyword_hash_symbol_other(*rest_hash_ptr)) { - case KW_HASH_HAS_NO_KEYS: - case KW_HASH_HAS_SYMBOL_KEY: - break; - case KW_HASH_HAS_OTHER_KEY: - *kw_hash_ptr = Qnil; - return FALSE; - case KW_HASH_HAS_BOTH_KEYS: - *rest_hash_ptr = rb_hash_dup(*rest_hash_ptr); - keyword_hash_split(kw_hash_ptr, rest_hash_ptr); - return TRUE; - } - } - *kw_hash_ptr = *rest_hash_ptr; - *rest_hash_ptr = Qfalse; - return TRUE; - } - else { - *kw_hash_ptr = Qnil; - return FALSE; - } -} - -static VALUE -args_pop_keyword_hash(struct args_info *args, VALUE *kw_hash_ptr, int check_only_symbol) -{ - VALUE rest_hash; - - if (args->rest == Qfalse) { - from_argv: - VM_ASSERT(args->argc > 0); - *kw_hash_ptr = args->argv[args->argc-1]; - - if (keyword_hash_p(kw_hash_ptr, &rest_hash, check_only_symbol)) { - if (rest_hash) { - args->argv[args->argc-1] = rest_hash; - } - else { - args->argc--; - return TRUE; - } - } - } - else { - long len = RARRAY_LEN(args->rest); - - if (len > 0) { - *kw_hash_ptr = RARRAY_AREF(args->rest, len - 1); - - if (keyword_hash_p(kw_hash_ptr, &rest_hash, check_only_symbol)) { - if (rest_hash) { - RARRAY_ASET(args->rest, len - 1, rest_hash); - } - else { - arg_rest_dup(args); - rb_ary_pop(args->rest); - return TRUE; - } - } - } - else { - goto from_argv; - } - } - - return FALSE; -} - static int args_kw_argv_to_hash(struct args_info *args) { @@ -572,149 +454,10 @@ fill_keys_values(st_data_t key, st_data_t val, st_data_t ptr) static inline int ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq) { - if (!(iseq->body->param.flags.has_kw) && - !(iseq->body->param.flags.has_kwrest)) { - keyword_hash = rb_check_hash_type(keyword_hash); - - if (!NIL_P(keyword_hash) && RHASH_EMPTY_P(keyword_hash)) { - return 1; - } - } - - return 0; -} - -VALUE rb_iseq_location(const rb_iseq_t *iseq); - -/* -- Remove In 3.0 -- */ - -/* This is a map from caller PC to a set of callee methods. - * When a warning about keyword argument change is printed, - * it keeps the pair of callee and caller. - */ -static st_table *caller_to_callees = 0; - -static VALUE -rb_warn_check(const rb_execution_context_t * const ec, const rb_iseq_t *const iseq) -{ - if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) return 1; - - if (!iseq) return 0; - - const st_data_t callee = (st_data_t)(iseq->body->iseq_unique_id * 2); - - const rb_control_frame_t * const cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); - - if (!cfp) return 0; - - const st_data_t caller = (st_data_t)cfp->pc; - - if (!caller_to_callees) { - caller_to_callees = st_init_numtable(); - } - - st_data_t val; - if (st_lookup(caller_to_callees, caller, &val)) { - st_table *callees; - - if (val & 1) { - val &= ~(st_data_t)1; - if (val == callee) return 1; /* already warned */ - - callees = st_init_numtable(); - st_insert(callees, val, 1); - } - else { - callees = (st_table *) val; - if (st_is_member(callees, callee)) return 1; /* already warned */ - } - st_insert(callees, callee, 1); - st_insert(caller_to_callees, caller, (st_data_t) callees); - } - else { - st_insert(caller_to_callees, caller, callee | 1); - } - - return 0; /* not warned yet for the pair of caller and callee */ -} - -static inline void -rb_warn_keyword_to_last_hash(rb_execution_context_t * const ec, struct rb_calling_info *calling, const struct rb_call_info *ci, const rb_iseq_t * const iseq) -{ - if (rb_warn_check(ec, iseq)) return; - - VALUE name, loc; - if (calling->recv == Qundef) { - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - return; - } - name = rb_id2str(ci->mid); - loc = rb_iseq_location(iseq); - if (NIL_P(loc)) { - rb_warn("Passing the keyword argument for `%"PRIsVALUE"' as the last hash parameter is deprecated", - name); - } - else { - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - if (name) { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method `%"PRIsVALUE"' is defined here", name); - } - else { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method is defined here"); - } - } -} - -static inline void -rb_warn_split_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_calling_info *calling, const struct rb_call_info *ci, const rb_iseq_t * const iseq) -{ - if (rb_warn_check(ec, iseq)) return; - - VALUE name, loc; - name = rb_id2str(ci->mid); - loc = rb_iseq_location(iseq); - if (NIL_P(loc)) { - rb_warn("Splitting the last argument for `%"PRIsVALUE"' into positional and keyword parameters is deprecated", - name); - } - else { - rb_warn("Splitting the last argument into positional and keyword parameters is deprecated"); - if (calling->recv != Qundef) { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method `%"PRIsVALUE"' is defined here", name); - } - else { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method is defined here"); - } - } -} - -static inline void -rb_warn_last_hash_to_keyword(rb_execution_context_t * const ec, struct rb_calling_info *calling, const struct rb_call_info *ci, const rb_iseq_t * const iseq) -{ - if (rb_warn_check(ec, iseq)) return; - - VALUE name, loc; - name = rb_id2str(ci->mid); - loc = rb_iseq_location(iseq); - if (NIL_P(loc)) { - rb_warn("Using the last argument for `%"PRIsVALUE"' as keyword parameters is deprecated; maybe ** should be added to the call", - name); - } - else { - rb_warn("Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call"); - if (calling->recv != Qundef) { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method `%"PRIsVALUE"' is defined here", name); - } - else { - rb_compile_warn(RSTRING_PTR(RARRAY_AREF(loc, 0)), FIX2INT(RARRAY_AREF(loc, 1)), - "The called method is defined here"); - } - } + return !(iseq->body->param.flags.has_kw) && + !(iseq->body->param.flags.has_kwrest) && + RB_TYPE_P(keyword_hash, T_HASH) && + RHASH_EMPTY_P(keyword_hash); } static int @@ -727,7 +470,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co const int max_argc = (iseq->body->param.flags.has_rest == FALSE) ? min_argc + iseq->body->param.opt_num : UNLIMITED_ARGUMENTS; int opt_pc = 0; int given_argc; - int kw_splat = FALSE; unsigned int kw_flag = ci->flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT); struct args_info args_body, *args; VALUE keyword_hash = Qnil; @@ -813,46 +555,47 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co if (kw_flag & VM_CALL_KW_SPLAT) { if (len > 0 && ignore_keyword_hash_p(rest_last, iseq)) { - if (given_argc != min_argc) { - if (remove_empty_keyword_hash) { - arg_rest_dup(args); - rb_ary_pop(args->rest); - given_argc--; - kw_flag &= ~VM_CALL_KW_SPLAT; - } - else { - flag_keyword_hash = rest_last; - } + if (remove_empty_keyword_hash) { + arg_rest_dup(args); + rb_ary_pop(args->rest); + given_argc--; + kw_flag &= ~VM_CALL_KW_SPLAT; } else { - rb_warn_keyword_to_last_hash(ec, calling, ci, iseq); + flag_keyword_hash = rest_last; } } else if (!remove_empty_keyword_hash && rest_last) { flag_keyword_hash = rest_last; } + else if (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) { + arg_rest_dup(args); + rb_ary_pop(args->rest); + given_argc--; + keyword_hash = rest_last; + } } } else { if (kw_flag & VM_CALL_KW_SPLAT) { VALUE last_arg = args->argv[args->argc-1]; if (ignore_keyword_hash_p(last_arg, iseq)) { - if (given_argc != min_argc) { - if (remove_empty_keyword_hash) { - args->argc--; - given_argc--; - kw_flag &= ~VM_CALL_KW_SPLAT; - } - else { - flag_keyword_hash = last_arg; - } + if (remove_empty_keyword_hash) { + args->argc--; + given_argc--; + kw_flag &= ~VM_CALL_KW_SPLAT; } else { - rb_warn_keyword_to_last_hash(ec, calling, ci, iseq); + flag_keyword_hash = last_arg; } } else if (!remove_empty_keyword_hash) { - flag_keyword_hash = args->argv[args->argc-1]; + flag_keyword_hash = last_arg; + } + else if (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) { + args->argc--; + given_argc--; + keyword_hash = last_arg; } } args->rest = Qfalse; @@ -870,7 +613,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co case arg_setup_method: break; /* do nothing special */ case arg_setup_block: - if (given_argc == 1 && + if (given_argc == (keyword_hash == Qnil ? 1 : 2) && (min_argc > 0 || iseq->body->param.opt_num > 1 || iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) && !iseq->body->param.flags.ambiguous_param0 && @@ -882,60 +625,13 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co /* argc check */ if (given_argc < min_argc) { - if (given_argc == min_argc - 1 && args->kw_argv) { - args_stored_kw_argv_to_hash(args); - given_argc = args_argc(args); - } - else { - if (arg_setup_type == arg_setup_block) { - CHECK_VM_STACK_OVERFLOW(ec->cfp, min_argc); - given_argc = min_argc; - args_extend(args, min_argc); - } - else { - argument_arity_error(ec, iseq, given_argc, min_argc, max_argc); - } - } - } - - if (kw_flag & VM_CALL_KW_SPLAT) { - kw_splat = !iseq->body->param.flags.has_rest; - } - if ((iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest || - (kw_splat && given_argc > max_argc)) && - args->kw_argv == NULL) { - if (given_argc > min_argc) { - if (kw_flag) { - int check_only_symbol = (kw_flag & VM_CALL_KW_SPLAT) && - iseq->body->param.flags.has_kw && - !iseq->body->param.flags.has_kwrest; - - if (args_pop_keyword_hash(args, &keyword_hash, check_only_symbol)) { - given_argc--; - } - else if (check_only_symbol) { - if (keyword_hash != Qnil) { - rb_warn_split_last_hash_to_keyword(ec, calling, ci, iseq); - } - else { - rb_warn_keyword_to_last_hash(ec, calling, ci, iseq); - } - } - } - else if (args_pop_keyword_hash(args, &keyword_hash, 1)) { - /* Warn the following: - * def foo(k:1) p [k]; end - * foo({k:42}) #=> 42 - */ - rb_warn_last_hash_to_keyword(ec, calling, ci, iseq); - given_argc--; - } - else if (keyword_hash != Qnil) { - rb_warn_split_last_hash_to_keyword(ec, calling, ci, iseq); - } + if (arg_setup_type == arg_setup_block) { + CHECK_VM_STACK_OVERFLOW(ec->cfp, min_argc); + given_argc = min_argc; + args_extend(args, min_argc); } - else if (given_argc == min_argc && kw_flag) { - rb_warn_keyword_to_last_hash(ec, calling, ci, iseq); + else { + argument_arity_error(ec, iseq, given_argc, min_argc, max_argc); } } @@ -1160,8 +856,6 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) const VALUE symbol = RARRAY_AREF(callback_arg, 0); const VALUE refinements = RARRAY_AREF(callback_arg, 1); int kw_splat = RB_PASS_CALLED_KEYWORDS; - VALUE v; - VALUE ret; VALUE klass; if (argc-- < 1) { @@ -1182,15 +876,10 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) if (!NIL_P(blockarg)) { vm_passed_block_handler_set(ec, blockarg); } - v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); if (!me) { - ret = method_missing(obj, mid, argc, argv, MISSING_NOENTRY, kw_splat); - } - else { - ret = rb_vm_call0(ec, obj, mid, argc, argv, me, kw_splat); + return method_missing(obj, mid, argc, argv, MISSING_NOENTRY, kw_splat); } - rb_free_tmp_buffer(&v); - return ret; + return rb_vm_call0(ec, obj, mid, argc, argv, me, kw_splat); } static VALUE diff --git a/vm_core.h b/vm_core.h index 8807c23b6fa397..70575fa66b8088 100644 --- a/vm_core.h +++ b/vm_core.h @@ -1159,11 +1159,11 @@ typedef rb_control_frame_t * enum { /* Frame/Environment flag bits: - * MMMM MMMM MMMM MMMM ____ FFFF FFFF EEEX (LSB) + * MMMM MMMM MMMM MMMM ____ _FFF FFFF EEEX (LSB) * * X : tag for GC marking (It seems as Fixnum) * EEE : 3 bits Env flags - * FF..: 8 bits Frame flags + * FF..: 7 bits Frame flags * MM..: 15 bits frame magic (to check frame corruption) */ @@ -1188,7 +1188,6 @@ enum { VM_FRAME_FLAG_LAMBDA = 0x0100, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM = 0x0200, VM_FRAME_FLAG_CFRAME_KW = 0x0400, - VM_FRAME_FLAG_CFRAME_EMPTY_KW = 0x0800, /* -- Remove In 3.0 -- */ /* env flag */ VM_ENV_FLAG_LOCAL = 0x0002, @@ -1249,13 +1248,6 @@ VM_FRAME_CFRAME_KW_P(const rb_control_frame_t *cfp) return VM_ENV_FLAGS(cfp->ep, VM_FRAME_FLAG_CFRAME_KW) != 0; } -/* -- Remove In 3.0 -- */ -static inline int -VM_FRAME_CFRAME_EMPTY_KW_P(const rb_control_frame_t *cfp) -{ - return VM_ENV_FLAGS(cfp->ep, VM_FRAME_FLAG_CFRAME_EMPTY_KW) != 0; -} - static inline int VM_FRAME_FINISHED_P(const rb_control_frame_t *cfp) { diff --git a/vm_eval.c b/vm_eval.c index 24d8dcfdf6901c..cbed304e258626 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -69,7 +69,6 @@ vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *ca if (calling->kw_splat) { if (argc > 0 && RB_TYPE_P(argv[argc-1], T_HASH) && RHASH_EMPTY_P(argv[argc-1])) { - frame_flags |= VM_FRAME_FLAG_CFRAME_EMPTY_KW; argc--; } else { @@ -144,12 +143,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc calling->argc > 0 && RB_TYPE_P(argv[calling->argc-1], T_HASH) && RHASH_EMPTY_P(argv[calling->argc-1])) { - if (calling->argc == 1) { - rb_warn("Passing the keyword argument as the last hash parameter is deprecated"); - } - else { - calling->argc--; - } + calling->argc--; } rb_check_arity(calling->argc, 1, 1); @@ -232,42 +226,10 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc return ret; } -/* Caller should keep the reference to the return value until argv becomes useless. */ -MJIT_FUNC_EXPORTED VALUE -rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat) -{ - if (*kw_splat == RB_PASS_CALLED_KEYWORDS || *kw_splat == RB_PASS_EMPTY_KEYWORDS) { - if (*kw_splat == RB_PASS_EMPTY_KEYWORDS || rb_empty_keyword_given_p()) { - int n = *argc; - VALUE v; - VALUE *ptr = rb_alloc_tmp_buffer2(&v, n+1, sizeof(VALUE)); - if (n) memcpy(ptr, *argv, sizeof(VALUE)*n); - ptr[n] = rb_hash_new(); - *argc = ++n; - *argv = ptr; - *kw_splat = 1; - return v; - } - else { - *kw_splat = rb_keyword_given_p(); - } - } - - if (*kw_splat && (*argc == 0 || !RB_TYPE_P((*argv)[(*argc)-1], T_HASH))) { - rb_warn("Keyword flag passed calling internal method, but last entry is not a hash, unsetting keyword flag"); - *kw_splat = 0; - } - - return 0; -} - MJIT_FUNC_EXPORTED VALUE rb_vm_call_kw(rb_execution_context_t *ec, VALUE recv, VALUE id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me, int kw_splat) { - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = rb_vm_call0(ec, recv, id, argc, argv, me, kw_splat); - rb_free_tmp_buffer(&v); - return ret; + return rb_vm_call0(ec, recv, id, argc, argv, me, kw_splat); } static inline VALUE @@ -961,10 +923,7 @@ rb_funcallv(VALUE recv, ID mid, int argc, const VALUE *argv) VALUE rb_funcallv_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_splat) { - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = rb_call(recv, mid, argc, argv, kw_splat ? CALL_FCALL_KW : CALL_FCALL); - rb_free_tmp_buffer(&v); - return ret; + return rb_call(recv, mid, argc, argv, kw_splat ? CALL_FCALL_KW : CALL_FCALL); } /*! @@ -985,10 +944,7 @@ rb_funcallv_public(VALUE recv, ID mid, int argc, const VALUE *argv) VALUE rb_funcallv_public_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_splat) { - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); - rb_free_tmp_buffer(&v); - return ret; + return rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); } /*! @@ -1038,12 +994,8 @@ rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv) VALUE rb_funcall_passing_block_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_splat) { - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret; PASS_PASSED_BLOCK_HANDLER(); - ret = rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); - rb_free_tmp_buffer(&v); - return ret; + return rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); } VALUE @@ -1063,10 +1015,7 @@ rb_funcall_with_block_kw(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE vm_passed_block_handler_set(GET_EC(), passed_procval); } - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); - rb_free_tmp_buffer(&v); - return ret; + return rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); } static VALUE * @@ -1140,10 +1089,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope) static VALUE send_internal_kw(int argc, const VALUE *argv, VALUE recv, call_type scope) { - VALUE v=0, ret; - int kw_splat = RB_PASS_CALLED_KEYWORDS; - v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - if (kw_splat) { + if (rb_keyword_given_p()) { switch (scope) { case CALL_PUBLIC: scope = CALL_PUBLIC_KW; @@ -1155,9 +1101,7 @@ send_internal_kw(int argc, const VALUE *argv, VALUE recv, call_type scope) break; } } - ret = send_internal(argc, argv, recv, scope); - rb_free_tmp_buffer(&v); - return ret; + return send_internal(argc, argv, recv, scope); } /* @@ -1215,10 +1159,7 @@ rb_f_public_send(int argc, VALUE *argv, VALUE recv) static inline VALUE rb_yield_0_kw(int argc, const VALUE * argv, int kw_splat) { - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = vm_yield(GET_EC(), argc, argv, kw_splat); - rb_free_tmp_buffer(&v); - return ret; + return vm_yield(GET_EC(), argc, argv, kw_splat); } static inline VALUE @@ -1314,13 +1255,9 @@ rb_yield_force_blockarg(VALUE values) VALUE rb_yield_block(RB_BLOCK_CALL_FUNC_ARGLIST(val, arg)) { - int kw_splat = RB_PASS_CALLED_KEYWORDS; - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); - VALUE ret = vm_yield_with_block(GET_EC(), argc, argv, - NIL_P(blockarg) ? VM_BLOCK_HANDLER_NONE : blockarg, - kw_splat); - rb_free_tmp_buffer(&v); - return ret; + return vm_yield_with_block(GET_EC(), argc, argv, + NIL_P(blockarg) ? VM_BLOCK_HANDLER_NONE : blockarg, + rb_keyword_given_p()); } static VALUE @@ -1486,15 +1423,12 @@ rb_block_call_kw(VALUE obj, ID mid, int argc, const VALUE * argv, { struct iter_method_arg arg; - VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); arg.obj = obj; arg.mid = mid; arg.argc = argc; arg.argv = argv; arg.kw_splat = kw_splat; - VALUE ret = rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2); - rb_free_tmp_buffer(&v); - return ret; + return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2); } VALUE @@ -1839,9 +1773,6 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv, int kw_splat) const VALUE *ep = NULL; rb_cref_t *cref; int is_lambda = FALSE; - VALUE v = 0, ret; - - v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat); if (block_handler != VM_BLOCK_HANDLER_NONE) { again: @@ -1861,10 +1792,9 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv, int kw_splat) block_handler = vm_proc_to_block_handler(VM_BH_TO_PROC(block_handler)); goto again; case block_handler_type_symbol: - ret = rb_sym_proc_call(SYM2ID(VM_BH_TO_SYMBOL(block_handler)), - argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE); - rb_free_tmp_buffer(&v); - return ret; + return rb_sym_proc_call(SYM2ID(VM_BH_TO_SYMBOL(block_handler)), + argc, argv, kw_splat, + VM_BLOCK_HANDLER_NONE); } new_captured.self = self; @@ -1874,9 +1804,7 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv, int kw_splat) } cref = vm_cref_push(ec, under, ep, TRUE); - ret = vm_yield_with_cref(ec, argc, argv, kw_splat, cref, is_lambda); - rb_free_tmp_buffer(&v); - return ret; + return vm_yield_with_cref(ec, argc, argv, kw_splat, cref, is_lambda); } VALUE diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 8cc47e15afcddc..d69340b071c283 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2486,9 +2486,8 @@ vm_method_cfunc_entry(const rb_callable_method_entry_t *me) return UNALIGNED_MEMBER_PTR(me->def, body.cfunc); } -/* -- Remove empty_kw_splat In 3.0 -- */ static VALUE -vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd, int empty_kw_splat) +vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { const struct rb_call_info *ci = &cd->ci; const struct rb_call_cache *cc = &cd->cc; @@ -2506,9 +2505,6 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp if (UNLIKELY(calling->kw_splat)) { frame_type |= VM_FRAME_FLAG_CFRAME_KW; } - else if (UNLIKELY(empty_kw_splat)) { - frame_type |= VM_FRAME_FLAG_CFRAME_EMPTY_KW; - } RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, me->owner, me->def->original_id); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, recv, me->def->original_id, ci->mid, me->owner, Qundef); @@ -2536,16 +2532,11 @@ static VALUE vm_call_cfunc(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { const struct rb_call_info *ci = &cd->ci; - int empty_kw_splat; RB_DEBUG_COUNTER_INC(ccf_cfunc); CALLER_SETUP_ARG(reg_cfp, calling, ci); - empty_kw_splat = calling->kw_splat; CALLER_REMOVE_EMPTY_KW_SPLAT(reg_cfp, calling, ci); - if (empty_kw_splat && calling->kw_splat) { - empty_kw_splat = 0; - } - return vm_call_cfunc_with_frame(ec, reg_cfp, calling, cd, empty_kw_splat); + return vm_call_cfunc_with_frame(ec, reg_cfp, calling, cd); } static VALUE @@ -2935,12 +2926,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st case VM_METHOD_TYPE_ATTRSET: CALLER_SETUP_ARG(cfp, calling, ci); - if (calling->argc == 1 && calling->kw_splat && RHASH_EMPTY_P(cfp->sp[-1])) { - rb_warn_keyword_to_last_hash(ec, calling, ci, NULL); - } - else { - CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); - } + CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); rb_check_arity(calling->argc, 1, 1); cc->aux.index = 0; @@ -3211,13 +3197,8 @@ vm_yield_with_cfunc(rb_execution_context_t *ec, blockarg = rb_vm_bh_to_procval(ec, block_handler); frame_flag = VM_FRAME_MAGIC_IFUNC | VM_FRAME_FLAG_CFRAME | (me ? VM_FRAME_FLAG_BMETHOD : 0); - switch (kw_splat) { - case 1: - frame_flag |= VM_FRAME_FLAG_CFRAME_KW; - break; - case 2: - frame_flag |= VM_FRAME_FLAG_CFRAME_EMPTY_KW; - break; + if (kw_splat) { + frame_flag |= VM_FRAME_FLAG_CFRAME_KW; } vm_push_frame(ec, (const rb_iseq_t *)captured->code.ifunc, @@ -3274,12 +3255,7 @@ vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *ca VALUE arg0; CALLER_SETUP_ARG(cfp, calling, ci); - if (calling->kw_splat && calling->argc == iseq->body->param.lead_num + iseq->body->param.post_num && RHASH_EMPTY_P(cfp->sp[-1])) { - rb_warn_keyword_to_last_hash(ec, calling, ci, iseq); - } - else { - CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); - } + CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); if (arg_setup_type == arg_setup_block && calling->argc == 1 && @@ -3377,17 +3353,10 @@ vm_invoke_ifunc_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, { VALUE val; int argc; - int kw_splat = calling->kw_splat; CALLER_SETUP_ARG(ec->cfp, calling, ci); CALLER_REMOVE_EMPTY_KW_SPLAT(ec->cfp, calling, ci); - if (kw_splat && !calling->kw_splat) { - kw_splat = 2; - } - else { - kw_splat = calling->kw_splat; - } argc = calling->argc; - val = vm_yield_with_cfunc(ec, captured, captured->self, argc, STACK_ADDR_FROM_TOP(argc), kw_splat, calling->block_handler, NULL); + val = vm_yield_with_cfunc(ec, captured, captured->self, argc, STACK_ADDR_FROM_TOP(argc), calling->kw_splat, calling->block_handler, NULL); POPN(argc); /* TODO: should put before C/yield? */ return val; } From ff96565686c05919bcae3ea77831879e95f67457 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 4 Oct 2019 15:41:13 -0700 Subject: [PATCH 290/878] Update tests for full keyword argument separation --- test/-ext-/funcall/test_passing_block.rb | 23 +- test/-ext-/test_scan_args.rb | 121 +- test/ruby/test_exception.rb | 3 +- test/ruby/test_io.rb | 23 +- test/ruby/test_keyword.rb | 1920 ++++++---------------- test/ruby/test_marshal.rb | 7 +- test/ruby/test_numeric.rb | 9 +- test/ruby/test_proc.rb | 112 +- test/ruby/test_struct.rb | 2 +- test/ruby/test_syntax.rb | 16 +- test/rubygems/test_require.rb | 10 +- test/test_delegate.rb | 4 +- 12 files changed, 556 insertions(+), 1694 deletions(-) diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb index d1164871b09c27..71c9d905be6c4e 100644 --- a/test/-ext-/funcall/test_passing_block.rb +++ b/test/-ext-/funcall/test_passing_block.rb @@ -24,14 +24,10 @@ def test_with_funcall_passing_block def test_with_funcall_passing_block_kw block = ->(*a, **kw) { [a, kw] } assert_equal([[1], {}], Relay.with_funcall_passing_block_kw(0, 1, &block)) + assert_equal([[{a: 1}], {}], Relay.with_funcall_passing_block_kw(0, a: 1, &block)) assert_equal([[], {a: 1}], Relay.with_funcall_passing_block_kw(1, a: 1, &block)) assert_equal([[1], {a: 1}], Relay.with_funcall_passing_block_kw(1, 1, a: 1, &block)) - assert_equal([[{}], {}], Relay.with_funcall_passing_block_kw(2, {}, **{}, &block)) assert_equal([[], {a: 1}], Relay.with_funcall_passing_block_kw(3, a: 1, &block)) - assert_equal([[{a: 1}], {}], Relay.with_funcall_passing_block_kw(3, {a: 1}, **{}, &block)) - assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method is defined here/m) do - assert_equal({}, Relay.with_funcall_passing_block_kw(3, **{}, &->(a){a})) - end end def test_with_funcallv_public_kw @@ -47,29 +43,18 @@ def o.baz(arg) arg end assert_equal([[1], {}], Relay.with_funcallv_public_kw(o, :foo, 0, 1)) + assert_equal([[{a: 1}], {}], Relay.with_funcallv_public_kw(o, :foo, 0, a: 1)) assert_equal([[], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 1, a: 1)) assert_equal([[1], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 1, 1, a: 1)) - assert_equal([[{}], {}], Relay.with_funcallv_public_kw(o, :foo, 2, {}, **{})) assert_equal([[], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 3, a: 1)) - assert_equal([[{a: 1}], {}], Relay.with_funcallv_public_kw(o, :foo, 3, {a: 1}, **{})) - assert_raise(NoMethodError) { Relay.with_funcallv_public_kw(o, :bar, 3, {a: 1}, **{}) } - assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method `baz'/m) do - assert_equal({}, Relay.with_funcallv_public_kw(o, :baz, 3, **{})) - end end def test_with_yield_splat_kw block = ->(*a, **kw) { [a, kw] } assert_equal([[1], {}], Relay.with_yield_splat_kw(0, [1], &block)) + assert_equal([[{a: 1}], {}], Relay.with_yield_splat_kw(0, [{a: 1}], &block)) assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(1, [{a: 1}], &block)) assert_equal([[1], {a: 1}], Relay.with_yield_splat_kw(1, [1, {a: 1}], &block)) - assert_equal([[{}], {}], Relay.with_yield_splat_kw(2, [{}], **{}, &block)) - assert_warn(/warning: Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(3, [{a: 1}], &block)) - end - assert_equal([[{a: 1}], {}], Relay.with_yield_splat_kw(3, [{a: 1}], **{}, &block)) - assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal({}, Relay.with_yield_splat_kw(3, [], **{}, &->(a){a})) - end + assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(3, [{a: 1}], &block)) end end diff --git a/test/-ext-/test_scan_args.rb b/test/-ext-/test_scan_args.rb index dda016d6aff68e..92d696d69e4390 100644 --- a/test/-ext-/test_scan_args.rb +++ b/test/-ext-/test_scan_args.rb @@ -93,14 +93,10 @@ def test_lead_hash assert_equal([1, "a", nil], Bug::ScanArgs.lead_hash("a")) assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash("a", "b")} assert_equal([1, "a", {b: 1}], Bug::ScanArgs.lead_hash("a", b: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {b: 1}, nil], Bug::ScanArgs.lead_hash(b: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(b: 1)} assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.lead_hash({"a"=>0, b: 1}, **{})) assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(1, {"a"=>0, b: 1}, **{})} - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {}, nil], Bug::ScanArgs.lead_hash(**{})) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(**{})} end def test_opt_hash @@ -109,9 +105,7 @@ def test_opt_hash assert_equal([0, nil, {b: 1}], Bug::ScanArgs.opt_hash(b: 1)) assert_equal([1, "a", {b: 1}], Bug::ScanArgs.opt_hash("a", b: 1)) assert_raise(ArgumentError) {Bug::ScanArgs.opt_hash("a", "b")} - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([1, {"a"=>0}, {b: 1}], Bug::ScanArgs.opt_hash("a"=>0, b: 1)) - end + assert_equal([0, nil, {"a"=>0, b: 1}], Bug::ScanArgs.opt_hash("a"=>0, b: 1)) assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.opt_hash({"a"=>0, b: 1}, **{})) end @@ -120,13 +114,9 @@ def test_lead_opt_hash assert_equal([2, "a", "b", nil], Bug::ScanArgs.lead_opt_hash("a", "b")) assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b", c: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.lead_opt_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash(c: 1)} assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b", "c")} - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b"=>0, c: 1)) - end + assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b"=>0, c: 1)) end def test_var_hash @@ -134,9 +124,7 @@ def test_var_hash assert_equal([1, ["a"], nil], Bug::ScanArgs.var_hash("a")) assert_equal([1, ["a"], {b: 1}], Bug::ScanArgs.var_hash("a", b: 1)) assert_equal([0, [], {b: 1}], Bug::ScanArgs.var_hash(b: 1)) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([1, [{"a"=>0}], {b: 1}], Bug::ScanArgs.var_hash("a"=>0, b: 1)) - end + assert_equal([0, [], {"a"=>0, b: 1}], Bug::ScanArgs.var_hash("a"=>0, b: 1)) end def test_lead_var_hash @@ -145,13 +133,9 @@ def test_lead_var_hash assert_equal([2, "a", ["b"], nil], Bug::ScanArgs.lead_var_hash("a", "b")) assert_equal([2, "a", ["b"], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b", c: 1)) assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.lead_var_hash("a", c: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {c: 1}, [], nil], Bug::ScanArgs.lead_var_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_hash(c: 1)} assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.lead_var_hash("a", "b", "c")) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", [{"b"=>0}], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b"=>0, c: 1)) - end + assert_equal([1, "a", [], {"b"=>0, c: 1}], Bug::ScanArgs.lead_var_hash("a", "b"=>0, c: 1)) end def test_opt_var_hash @@ -162,9 +146,7 @@ def test_opt_var_hash assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.opt_var_hash("a", c: 1)) assert_equal([0, nil, [], {c: 1}], Bug::ScanArgs.opt_var_hash(c: 1)) assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.opt_var_hash("a", "b", "c")) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", [{"b"=>0}], {c: 1}], Bug::ScanArgs.opt_var_hash("a", "b"=>0, c: 1)) - end + assert_equal([1, "a", [], {"b"=>0, c: 1}], Bug::ScanArgs.opt_var_hash("a", "b"=>0, c: 1)) end def test_lead_opt_var_hash @@ -173,14 +155,10 @@ def test_lead_opt_var_hash assert_equal([2, "a", "b", [], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b")) assert_equal([2, "a", "b", [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", c: 1)) assert_equal([1, "a", nil, [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", c: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {c: 1}, nil, [], nil], Bug::ScanArgs.lead_opt_var_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_hash(c: 1)} assert_equal([3, "a", "b", ["c"], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c")) assert_equal([3, "a", "b", ["c"], {d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c", d: 1)) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([3, "a", "b", [{"c"=>0}], {d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"=>0, d: 1)) - end + assert_equal([2, "a", "b", [], {"c"=>0, d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"=>0, d: 1)) end def test_opt_trail_hash @@ -189,13 +167,9 @@ def test_opt_trail_hash assert_equal([2, "a", "b", nil], Bug::ScanArgs.opt_trail_hash("a", "b")) assert_equal([1, nil, "a", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b", c: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, nil, {c: 1}, nil], Bug::ScanArgs.opt_trail_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash(c: 1)} assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash("a", "b", "c")} - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b"=>0, c: 1)) - end + assert_equal([1, nil, "a", {"b"=>0, c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b"=>0, c: 1)) end def test_lead_opt_trail_hash @@ -203,16 +177,12 @@ def test_lead_opt_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a")} assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash(c: 1)} assert_equal([2, "a", nil, "b", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b")) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([2, "a", nil, {c: 1}, nil], Bug::ScanArgs.lead_opt_trail_hash("a", c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", c: 1)} assert_equal([2, "a", nil, "b", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", c: 1)) assert_equal([3, "a", "b", "c", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c")) assert_equal([3, "a", "b", "c", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", c: 1)) assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", "d")} - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([3, "a", "b", {"c"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"=>0, c: 1)) - end + assert_equal([2, "a", nil, "b", {"c"=>0, c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"=>0, c: 1)) end def test_var_trail_hash @@ -221,62 +191,46 @@ def test_var_trail_hash assert_equal([2, ["a"], "b", nil], Bug::ScanArgs.var_trail_hash("a", "b")) assert_equal([1, [], "a", {c: 1}], Bug::ScanArgs.var_trail_hash("a", c: 1)) assert_equal([2, ["a"], "b", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", c: 1)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, [], {c: 1}, nil], Bug::ScanArgs.var_trail_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.var_trail_hash(c: 1)} assert_equal([3, ["a", "b"], "c", nil], Bug::ScanArgs.var_trail_hash("a", "b", "c")) assert_equal([3, ["a", "b"], "c", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c", c: 1)) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([3, ["a", "b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c"=>0, c: 1)) - end + assert_equal([2, ["a"], "b", {"c"=>0, c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c"=>0, c: 1)) end def test_lead_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash()} assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a")} assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash(c: 1)} - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([2, "a", [], {c: 1}, nil], Bug::ScanArgs.lead_var_trail_hash("a", c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a", c: 1)} assert_equal([2, "a", [], "b", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b")) assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1)) assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c")) assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c", c: 1)) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([3, "a", ["b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1, "c"=>0)) - end + assert_equal([2, "a", [], "b", {"c"=>0, c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1, "c"=>0)) end def test_opt_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash()} assert_equal([1, nil, [], "a", nil], Bug::ScanArgs.opt_var_trail_hash("a")) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, nil, [], {c: 1}, nil], Bug::ScanArgs.opt_var_trail_hash(c: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash(c: 1)} assert_equal([1, nil, [], "a", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", c: 1)) assert_equal([2, "a", [], "b", nil], Bug::ScanArgs.opt_var_trail_hash("a", "b")) assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", c: 1)) assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c")) assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c", c: 1)) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([3, "a", ["b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"=>0, c: 1)) - end + assert_equal([2, "a", [], "b", {"c"=>0, c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"=>0, c: 1)) end def test_lead_opt_var_trail_hash assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash()} assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a")} - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([2, "a", nil, [], {b: 1}, nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", b: 1)) - end + assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a", b: 1)} assert_equal([2, "a", nil, [], "b", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b")) assert_equal([2, "a", nil, [], "b", {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", c: 1)) assert_equal([3, "a", "b", [], "c", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c")) assert_equal([3, "a", "b", [], "c", {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", c: 1)) assert_equal([4, "a", "b", ["c"], "d", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d")) - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([4, "a", "b", ["c"], {"d"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"=>0, c: 1)) - end + assert_equal([3, "a", "b", [], "c", {"d"=>0, c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"=>0, c: 1)) end def test_k_lead_opt_hash @@ -285,25 +239,8 @@ def test_k_lead_opt_hash assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", {c: 1})) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", {c: 1})) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.k_lead_opt_hash(c: 1)) - end - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b"=>0, c: 1)) - end - end - - def test_e_lead_opt_hash - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([1, {}, nil, nil], Bug::ScanArgs.e_lead_opt_hash) - end - assert_equal([1, "a", nil, nil], Bug::ScanArgs.e_lead_opt_hash("a")) - assert_equal([2, "a", "b", nil], Bug::ScanArgs.e_lead_opt_hash("a", "b")) - assert_equal([2, "a", {c: 1}, nil], Bug::ScanArgs.e_lead_opt_hash("a", c: 1)) - assert_raise(ArgumentError) {Bug::ScanArgs.e_lead_opt_hash("a", "b", c: 1)} - assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.e_lead_opt_hash(c: 1)) - assert_raise(ArgumentError) {Bug::ScanArgs.e_lead_opt_hash("a", "b", "c")} - assert_equal([2, "a", {"b"=>0, c: 1}, nil], Bug::ScanArgs.e_lead_opt_hash("a", "b"=>0, c: 1)) + assert_raise(ArgumentError) {Bug::ScanArgs.k_lead_opt_hash(c: 1)} + assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b"=>0, c: 1)) end def test_n_lead_opt_hash @@ -314,11 +251,9 @@ def test_n_lead_opt_hash assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", {c: 1})) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b", c: 1)) assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b", {c: 1})) - assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.n_lead_opt_hash(c: 1)) - assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.n_lead_opt_hash({c: 1})) + assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash(c: 1)} + assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash({c: 1})} assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash("a", "b", "c")} - assert_warn(/The last argument is split into positional and keyword parameters/) do - assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b"=>0, c: 1)) - end + assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b"=>0, c: 1)) end end diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index c0ab23a18eb20d..086f250a3b1b62 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -945,8 +945,7 @@ def (obj = Object.new).w(n) warn("test warning", uplevel: n) end assert_raise(ArgumentError) {warn("test warning", uplevel: -1)} assert_in_out_err(["-e", "warn 'ok', uplevel: 1"], '', [], /warning:/) warning = capture_warning_warn {warn("test warning", {uplevel: 0})} - assert_equal("#{__FILE__}:#{__LINE__-1}: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call\n", warning[0]) - assert_match(/warning: The called method (?:`.*' )?is defined here|warning: test warning/, warning[1]) + assert_match(/test warning.*{:uplevel=>0}/m, warning[0]) warning = capture_warning_warn {warn("test warning", **{uplevel: 0})} assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) warning = capture_warning_warn {warn("test warning", {uplevel: 0}, **{})} diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index c66446d2e8399e..6bdc7bb27f270d 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2284,26 +2284,14 @@ def test_open_redirect_keyword def o.to_open(**kw); kw; end assert_equal({:a=>1}, open(o, a: 1)) - w = /Using the last argument as keyword parameters is deprecated.*The called method `(to_)?open'/m - redefined = nil - w.singleton_class.define_method(:===) do |s| - match = super(s) - redefined = !$1 - match - end - - assert_warn(w) do - assert_equal({:a=>1}, open(o, {a: 1})) - end + assert_raise(ArgumentError) { open(o, {a: 1}) } class << o remove_method(:to_open) end def o.to_open(kw); kw; end assert_equal({:a=>1}, open(o, a: 1)) - unless redefined - assert_equal({:a=>1}, open(o, {a: 1})) - end + assert_equal({:a=>1}, open(o, {a: 1})) end def test_open_pipe @@ -3138,11 +3126,8 @@ def test_s_write assert_equal("\00f", File.read(path)) assert_equal(1, File.write(path, "f", 0, encoding: "UTF-8")) assert_equal("ff", File.read(path)) - assert_raise(TypeError) { - assert_warn(/The last argument is split into positional and keyword parameters/) do - File.write(path, "foo", Object.new => Object.new) - end - } + File.write(path, "foo", Object.new => Object.new) + assert_equal("foo", File.read(path)) end end diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index c3a3a450f1be06..c49496d6a94f70 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -24,9 +24,7 @@ def f2(x, str: "foo", num: 424242) def test_f2 assert_equal([:xyz, "foo", 424242], f2(:xyz)) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `f2'/m) do - assert_equal([{"bar"=>42}, "foo", 424242], f2("bar"=>42)) - end + assert_raise(ArgumentError) { f2("bar"=>42) } end @@ -224,12 +222,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(kw, c.m(kw, **kw)) assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) @@ -248,39 +242,21 @@ def c.m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**{}) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**kw) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } assert_equal([h, kw], c.m(h)) assert_equal([h2, kw], c.m(h2)) assert_equal([h3, kw], c.m(h3)) @@ -296,13 +272,9 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.m(**h2)) assert_equal([1, h3], c.m(**h3)) assert_equal([1, h3], c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal([1, h], c.m(h)) - end + assert_equal([h, kw], c.m(h)) assert_equal([h2, kw], c.m(h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_equal([h2, h], c.m(h3)) - end + assert_equal([h3, kw], c.m(h3)) end def test_implicit_super_kwsplat @@ -313,19 +285,9 @@ def test_implicit_super_kwsplat sc = Class.new c = sc.new - redef = -> do - if defined?(c.m) - class << c - remove_method(:m) - end - end - eval <<-END - def c.m(*args, **kw) - super(*args, **kw) - end - END + def c.m(*args, **kw) + super(*args, **kw) end - redef[] sc.class_eval do def m(*args) args @@ -357,13 +319,8 @@ def m(args) args end end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**{})) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -383,13 +340,9 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } sc.class_eval do remove_method(:m) @@ -397,34 +350,13 @@ def m(arg, **args) [arg, args] end end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**{}) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**kw) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(**h)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } sc.class_eval do remove_method(:m) @@ -449,19 +381,9 @@ def test_explicit_super_kwsplat sc = Class.new c = sc.new - redef = -> do - if defined?(c.m) - class << c - remove_method(:m) - end - end - eval <<-END - def c.m(*args, **kw) - super(*args, **kw) - end - END + def c.m(*args, **kw) + super(*args, **kw) end - redef[] sc.class_eval do def m(*args) args @@ -493,13 +415,8 @@ def m(args) args end end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**{})) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -519,13 +436,9 @@ def m(**args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } sc.class_eval do remove_method(:m) @@ -533,34 +446,13 @@ def m(arg, **args) [arg, args] end end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**{}) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.m(**kw) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(**h)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } sc.class_eval do remove_method(:m) @@ -592,12 +484,8 @@ def test_lambda_kwsplat_call assert_raise(ArgumentError) { f[**h3] } f = ->(a) { a } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, f[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, f[**kw]) - end + assert_raise(ArgumentError) { f[**{}] } + assert_raise(ArgumentError) { f[**kw] } assert_equal(h, f[**h]) assert_equal(h, f[a: 1]) assert_equal(h2, f[**h2]) @@ -612,36 +500,18 @@ def test_lambda_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `\[\]'/m) do - assert_equal(h, f[h]) - end + assert_raise(ArgumentError) { f[h] } assert_raise(ArgumentError) { f[h2] } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `\[\]'/m) do - assert_raise(ArgumentError) { f[h3] } - end + assert_raise(ArgumentError) { f[h3] } f = ->(a, **x) { [a,x] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([{}, {}], f[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([{}, {}], f[**kw]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([h, {}], f[**h]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([h, {}], f[a: 1]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([h2, {}], f[**h2]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([h3, {}], f[**h3]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `\[\]'/m) do - assert_equal([h3, {}], f[a: 1, **h2]) - end + assert_raise(ArgumentError) { f[**{}] } + assert_raise(ArgumentError) { f[**kw] } + assert_raise(ArgumentError) { f[**h] } + assert_raise(ArgumentError) { f[a: 1] } + assert_raise(ArgumentError) { f[**h2] } + assert_raise(ArgumentError) { f[**h3] } + assert_raise(ArgumentError) { f[a: 1, **h2] } f = ->(a=1, **x) { [a, x] } assert_equal([1, kw], f[**{}]) @@ -670,12 +540,8 @@ def test_lambda_method_kwsplat_call f = ->(a) { a } f = f.method(:call) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, f[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, f[**kw]) - end + assert_raise(ArgumentError) { f[**{}] } + assert_raise(ArgumentError) { f[**kw] } assert_equal(h, f[**h]) assert_equal(h, f[a: 1]) assert_equal(h2, f[**h2]) @@ -691,37 +557,19 @@ def test_lambda_method_kwsplat_call assert_equal(h2, f[**h2]) assert_equal(h3, f[**h3]) assert_equal(h3, f[a: 1, **h2]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(h, f[h]) - end + assert_raise(ArgumentError) { f[h] } assert_raise(ArgumentError) { f[h2] } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_raise(ArgumentError) { f[h3] } - end + assert_raise(ArgumentError) { f[h3] } f = ->(a, **x) { [a,x] } f = f.method(:call) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], f[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], f[**kw]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], f[**h]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], f[a: 1]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, {}], f[**h2]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], f[**h3]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], f[a: 1, **h2]) - end + assert_raise(ArgumentError) { f[**{}] } + assert_raise(ArgumentError) { f[**kw] } + assert_raise(ArgumentError) { f[**h] } + assert_raise(ArgumentError) { f[a: 1] } + assert_raise(ArgumentError) { f[**h2] } + assert_raise(ArgumentError) { f[**h3] } + assert_raise(ArgumentError) { f[a: 1, **h2] } f = ->(a=1, **x) { [a, x] } f = f.method(:call) @@ -751,12 +599,8 @@ def test_Thread_new_kwsplat assert_raise(ArgumentError) { t.new(**h3, &f).value } f = ->(a) { a } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, t.new(**{}, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, t.new(**kw, &f).value) - end + assert_raise(ArgumentError) { t.new(**{}, &f).value } + assert_raise(ArgumentError) { t.new(**kw, &f).value } assert_equal(h, t.new(**h, &f).value) assert_equal(h, t.new(a: 1, &f).value) assert_equal(h2, t.new(**h2, &f).value) @@ -771,36 +615,18 @@ def test_Thread_new_kwsplat assert_equal(h2, t.new(**h2, &f).value) assert_equal(h3, t.new(**h3, &f).value) assert_equal(h3, t.new(a: 1, **h2, &f).value) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(h, t.new(h, &f).value) - end + assert_raise(ArgumentError) { t.new(h, &f).value } assert_raise(ArgumentError) { t.new(h2, &f).value } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_raise(ArgumentError) { t.new(h3, &f).value } - end + assert_raise(ArgumentError) { t.new(h3, &f).value } f = ->(a, **x) { [a,x] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], t.new(**{}, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], t.new(**kw, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], t.new(**h, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], t.new(a: 1, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, {}], t.new(**h2, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], t.new(**h3, &f).value) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], t.new(a: 1, **h2, &f).value) - end + assert_raise(ArgumentError) { t.new(**{}, &f).value } + assert_raise(ArgumentError) { t.new(**kw, &f).value } + assert_raise(ArgumentError) { t.new(**h, &f).value } + assert_raise(ArgumentError) { t.new(a: 1, &f).value } + assert_raise(ArgumentError) { t.new(**h2, &f).value } + assert_raise(ArgumentError) { t.new(**h3, &f).value } + assert_raise(ArgumentError) { t.new(a: 1, **h2, &f).value } f = ->(a=1, **x) { [a, x] } assert_equal([1, kw], t.new(**{}, &f).value) @@ -830,12 +656,8 @@ def test_Fiber_resume_kwsplat assert_raise(ArgumentError) { t.new(&f).resume(**h3) } f = ->(a) { a } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, t.new(&f).resume(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, t.new(&f).resume(**kw)) - end + assert_raise(ArgumentError) { t.new(&f).resume(**{}) } + assert_raise(ArgumentError) { t.new(&f).resume(**kw) } assert_equal(h, t.new(&f).resume(**h)) assert_equal(h, t.new(&f).resume(a: 1)) assert_equal(h2, t.new(&f).resume(**h2)) @@ -850,36 +672,18 @@ def test_Fiber_resume_kwsplat assert_equal(h2, t.new(&f).resume(**h2)) assert_equal(h3, t.new(&f).resume(**h3)) assert_equal(h3, t.new(&f).resume(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(h, t.new(&f).resume(h)) - end + assert_raise(ArgumentError) { t.new(&f).resume(h) } assert_raise(ArgumentError) { t.new(&f).resume(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_raise(ArgumentError) { t.new(&f).resume(h3) } - end + assert_raise(ArgumentError) { t.new(&f).resume(h3) } f = ->(a, **x) { [a,x] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], t.new(&f).resume(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], t.new(&f).resume(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], t.new(&f).resume(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], t.new(&f).resume(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, {}], t.new(&f).resume(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], t.new(&f).resume(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], t.new(&f).resume(a: 1, **h2)) - end + assert_raise(ArgumentError) { t.new(&f).resume(**{}) } + assert_raise(ArgumentError) { t.new(&f).resume(**kw) } + assert_raise(ArgumentError) { t.new(&f).resume(**h) } + assert_raise(ArgumentError) { t.new(&f).resume(a: 1) } + assert_raise(ArgumentError) { t.new(&f).resume(**h2) } + assert_raise(ArgumentError) { t.new(&f).resume(**h3) } + assert_raise(ArgumentError) { t.new(&f).resume(a: 1, **h2) } f = ->(a=1, **x) { [a, x] } assert_equal([1, kw], t.new(&f).resume(**{})) @@ -907,12 +711,8 @@ def test_Enumerator_Generator_each_kwsplat assert_raise(ArgumentError) { g.new(&f).each(**h3) } f = ->(_, a) { a } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, g.new(&f).each(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, g.new(&f).each(**kw)) - end + assert_raise(ArgumentError) { g.new(&f).each(**{}) } + assert_raise(ArgumentError) { g.new(&f).each(**kw) } assert_equal(h, g.new(&f).each(**h)) assert_equal(h, g.new(&f).each(a: 1)) assert_equal(h2, g.new(&f).each(**h2)) @@ -927,36 +727,18 @@ def test_Enumerator_Generator_each_kwsplat assert_equal(h2, g.new(&f).each(**h2)) assert_equal(h3, g.new(&f).each(**h3)) assert_equal(h3, g.new(&f).each(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(h, g.new(&f).each(h)) - end + assert_raise(ArgumentError) { g.new(&f).each(h) } assert_raise(ArgumentError) { g.new(&f).each(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_raise(ArgumentError) { g.new(&f).each(h3) } - end + assert_raise(ArgumentError) { g.new(&f).each(h3) } f = ->(_, a, **x) { [a,x] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], g.new(&f).each(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], g.new(&f).each(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], g.new(&f).each(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], g.new(&f).each(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, {}], g.new(&f).each(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], g.new(&f).each(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], g.new(&f).each(a: 1, **h2)) - end + assert_raise(ArgumentError) { g.new(&f).each(**{}) } + assert_raise(ArgumentError) { g.new(&f).each(**kw) } + assert_raise(ArgumentError) { g.new(&f).each(**h) } + assert_raise(ArgumentError) { g.new(&f).each(a: 1) } + assert_raise(ArgumentError) { g.new(&f).each(**h2) } + assert_raise(ArgumentError) { g.new(&f).each(**h3) } + assert_raise(ArgumentError) { g.new(&f).each(a: 1, **h2) } f = ->(_, a=1, **x) { [a, x] } assert_equal([1, kw], g.new(&f).each(**{})) @@ -984,12 +766,8 @@ def test_Enumerator_Yielder_yield_kwsplat assert_raise(ArgumentError) { g.new{|y| y.yield(**h3)}.each(&f) } f = ->(a) { a } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, g.new{|y| y.yield(**{})}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, g.new{|y| y.yield(**kw)}.each(&f)) - end + assert_raise(ArgumentError) { g.new{|y| y.yield(**{})}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(**kw)}.each(&f) } assert_equal(h, g.new{|y| y.yield(**h)}.each(&f)) assert_equal(h, g.new{|y| y.yield(a: 1)}.each(&f)) assert_equal(h2, g.new{|y| y.yield(**h2)}.each(&f)) @@ -1004,36 +782,18 @@ def test_Enumerator_Yielder_yield_kwsplat assert_equal(h2, g.new{|y| y.yield(**h2)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(**h3)}.each(&f)) assert_equal(h3, g.new{|y| y.yield(a: 1, **h2)}.each(&f)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(h, g.new{|y| y.yield(h)}.each(&f)) - end + assert_raise(ArgumentError) { g.new{|y| y.yield(h)}.each(&f) } assert_raise(ArgumentError) { g.new{|y| y.yield(h2)}.each(&f) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_raise(ArgumentError) { g.new{|y| y.yield(h3)}.each(&f) } - end + assert_raise(ArgumentError) { g.new{|y| y.yield(h3)}.each(&f) } f = ->(a, **x) { [a,x] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], g.new{|y| y.yield(**{})}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([{}, {}], g.new{|y| y.yield(**kw)}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], g.new{|y| y.yield(**h)}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, {}], g.new{|y| y.yield(a: 1)}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, {}], g.new{|y| y.yield(**h2)}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], g.new{|y| y.yield(**h3)}.each(&f)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, {}], g.new{|y| y.yield(a: 1, **h2)}.each(&f)) - end + assert_raise(ArgumentError) { g.new{|y| y.yield(**{})}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(**kw)}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(**h)}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(a: 1)}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(**h2)}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(**h3)}.each(&f) } + assert_raise(ArgumentError) { g.new{|y| y.yield(a: 1, **h2)}.each(&f) } f = ->(a=1, **x) { [a, x] } assert_equal([1, kw], g.new{|y| y.yield(**{})}.each(&f)) @@ -1087,12 +847,8 @@ def initialize(args) @args = args end end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal(kw, c[**{}].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal(kw, c[**kw].args) - end + assert_raise(ArgumentError) { c[**{}] } + assert_raise(ArgumentError) { c[**kw] } assert_equal(h, c[**h].args) assert_equal(h, c[a: 1].args) assert_equal(h2, c[**h2].args) @@ -1111,40 +867,22 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do - assert_equal(h, c[h].args) - end + assert_raise(ArgumentError) { c[h].args } assert_raise(ArgumentError) { c[h2].args } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `initialize'/m) do - assert_raise(ArgumentError) { c[h3].args } - end + assert_raise(ArgumentError) { c[h3].args } c = Class.new(sc) do def initialize(arg, **args) @args = [arg, args] end end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([kw, kw], c[**{}].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([kw, kw], c[**kw].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h, kw], c[**h].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h, kw], c[a: 1].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h2, kw], c[**h2].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h3, kw], c[**h3].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h3, kw], c[a: 1, **h2].args) - end + assert_raise(ArgumentError) { c[**{}].args } + assert_raise(ArgumentError) { c[**kw].args } + assert_raise(ArgumentError) { c[**h].args } + assert_raise(ArgumentError) { c[a: 1].args } + assert_raise(ArgumentError) { c[**h2].args } + assert_raise(ArgumentError) { c[**h3].args } + assert_raise(ArgumentError) { c[a: 1, **h2].args } c = Class.new(sc) do def initialize(arg=1, **args) @@ -1199,12 +937,8 @@ def initialize(args) @args = args end end.method(:new) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal(kw, c[**{}].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal(kw, c[**kw].args) - end + assert_raise(ArgumentError) { c[**{}] } + assert_raise(ArgumentError) { c[**kw] } assert_equal(h, c[**h].args) assert_equal(h, c[a: 1].args) assert_equal(h2, c[**h2].args) @@ -1223,40 +957,22 @@ def initialize(**args) assert_equal(h2, c[**h2].args) assert_equal(h3, c[**h3].args) assert_equal(h3, c[a: 1, **h2].args) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do - assert_equal(h, c[h].args) - end + assert_raise(ArgumentError) { c[h].args } assert_raise(ArgumentError) { c[h2].args } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `initialize'/m) do - assert_raise(ArgumentError) { c[h3].args } - end + assert_raise(ArgumentError) { c[h3].args } c = Class.new(sc) do def initialize(arg, **args) @args = [arg, args] end end.method(:new) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([kw, kw], c[**{}].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([kw, kw], c[**kw].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h, kw], c[**h].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h, kw], c[a: 1].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h2, kw], c[**h2].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h3, kw], c[**h3].args) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `initialize'/m) do - assert_equal([h3, kw], c[a: 1, **h2].args) - end + assert_raise(ArgumentError) { c[**{}].args } + assert_raise(ArgumentError) { c[**kw].args } + assert_raise(ArgumentError) { c[**h].args } + assert_raise(ArgumentError) { c[a: 1].args } + assert_raise(ArgumentError) { c[**h2].args } + assert_raise(ArgumentError) { c[**h3].args } + assert_raise(ArgumentError) { c[a: 1, **h2].args } c = Class.new(sc) do def initialize(arg=1, **args) @@ -1304,12 +1020,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.method(:m)[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.method(:m)[**kw]) - end + assert_raise(ArgumentError) { c.method(:m)[**{}] } + assert_raise(ArgumentError) { c.method(:m)[**kw] } assert_equal(h, c.method(:m)[**h]) assert_equal(h, c.method(:m)[a: 1]) assert_equal(h2, c.method(:m)[**h2]) @@ -1327,39 +1039,21 @@ def c.m(**args) assert_equal(h2, c.method(:m)[**h2]) assert_equal(h3, c.method(:m)[**h3]) assert_equal(h3, c.method(:m)[a: 1, **h2]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.method(:m)[h]) - end + assert_raise(ArgumentError) { c.method(:m)[h] } assert_raise(ArgumentError) { c.method(:m)[h2] } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.method(:m)[h3] } - end + assert_raise(ArgumentError) { c.method(:m)[h3] } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], c.method(:m)[**{}]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], c.method(:m)[**kw]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.method(:m)[**h]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.method(:m)[a: 1]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.method(:m)[**h2]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.method(:m)[**h3]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.method(:m)[a: 1, **h2]) - end + assert_raise(ArgumentError) { c.method(:m)[**{}] } + assert_raise(ArgumentError) { c.method(:m)[**kw] } + assert_raise(ArgumentError) { c.method(:m)[**h] } + assert_raise(ArgumentError) { c.method(:m)[a: 1] } + assert_raise(ArgumentError) { c.method(:m)[**h2] } + assert_raise(ArgumentError) { c.method(:m)[**h3] } + assert_raise(ArgumentError) { c.method(:m)[a: 1, **h2] } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -1407,12 +1101,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, sc.instance_method(:m).bind_call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, sc.instance_method(:m).bind_call(c, **kw)) - end + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **{}) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **kw) } assert_equal(h, sc.instance_method(:m).bind_call(c, **h)) assert_equal(h, sc.instance_method(:m).bind_call(c, a: 1)) assert_equal(h2, sc.instance_method(:m).bind_call(c, **h2)) @@ -1430,39 +1120,21 @@ def c.m(**args) assert_equal(h2, sc.instance_method(:m).bind_call(c, **h2)) assert_equal(h3, sc.instance_method(:m).bind_call(c, **h3)) assert_equal(h3, sc.instance_method(:m).bind_call(c, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, sc.instance_method(:m).bind_call(c, h)) - end + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h) } assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h3) } - end + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, h3) } sc.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], sc.instance_method(:m).bind_call(c, **kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], sc.instance_method(:m).bind_call(c, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], sc.instance_method(:m).bind_call(c, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], sc.instance_method(:m).bind_call(c, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], sc.instance_method(:m).bind_call(c, a: 1, **h2)) - end + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **{}) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **kw) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **h) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, a: 1) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **h2) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, **h3) } + assert_raise(ArgumentError) { sc.instance_method(:m).bind_call(c, a: 1, **h2) } sc.remove_method(:m) def c.m(arg=1, **args) @@ -1509,12 +1181,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.send(:m, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.send(:m, **kw)) - end + assert_raise(ArgumentError) { c.send(:m, **{}) } + assert_raise(ArgumentError) { c.send(:m, **kw) } assert_equal(h, c.send(:m, **h)) assert_equal(h, c.send(:m, a: 1)) assert_equal(h2, c.send(:m, **h2)) @@ -1532,39 +1200,21 @@ def c.m(**args) assert_equal(h2, c.send(:m, **h2)) assert_equal(h3, c.send(:m, **h3)) assert_equal(h3, c.send(:m, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.send(:m, h)) - end + assert_raise(ArgumentError) { c.send(:m, h) } assert_raise(ArgumentError) { c.send(:m, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.send(:m, h3) } - end + assert_raise(ArgumentError) { c.send(:m, h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.send(:m, **{}) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.send(:m, **kw) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.send(:m, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.send(:m, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.send(:m, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.send(:m, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.send(:m, a: 1, **h2)) - end + assert_raise(ArgumentError) { c.send(:m, **{}) } + assert_raise(ArgumentError) { c.send(:m, **kw) } + assert_raise(ArgumentError) { c.send(:m, **h) } + assert_raise(ArgumentError) { c.send(:m, a: 1) } + assert_raise(ArgumentError) { c.send(:m, **h2) } + assert_raise(ArgumentError) { c.send(:m, **h3) } + assert_raise(ArgumentError) { c.send(:m, a: 1, **h2) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -1611,12 +1261,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.public_send(:m, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.public_send(:m, **kw)) - end + assert_raise(ArgumentError) { c.public_send(:m, **{}) } + assert_raise(ArgumentError) { c.public_send(:m, **kw) } assert_equal(h, c.public_send(:m, **h)) assert_equal(h, c.public_send(:m, a: 1)) assert_equal(h2, c.public_send(:m, **h2)) @@ -1634,39 +1280,21 @@ def c.m(**args) assert_equal(h2, c.public_send(:m, **h2)) assert_equal(h3, c.public_send(:m, **h3)) assert_equal(h3, c.public_send(:m, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.public_send(:m, h)) - end + assert_raise(ArgumentError) { c.public_send(:m, h) } assert_raise(ArgumentError) { c.public_send(:m, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.public_send(:m, h3) } - end + assert_raise(ArgumentError) { c.public_send(:m, h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.public_send(:m, **{}) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - c.public_send(:m, **kw) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.public_send(:m, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.public_send(:m, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.public_send(:m, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.public_send(:m, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.public_send(:m, a: 1, **h2)) - end + assert_raise(ArgumentError) { c.public_send(:m, **{}) } + assert_raise(ArgumentError) { c.public_send(:m, **kw) } + assert_raise(ArgumentError) { c.public_send(:m, **h) } + assert_raise(ArgumentError) { c.public_send(:m, a: 1) } + assert_raise(ArgumentError) { c.public_send(:m, **h2) } + assert_raise(ArgumentError) { c.public_send(:m, **h3) } + assert_raise(ArgumentError) { c.public_send(:m, a: 1, **h2) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -1716,12 +1344,8 @@ def c.m(args) args end m = c.method(:send) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, m.call(:m, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, m.call(:m, **kw)) - end + assert_raise(ArgumentError) { m.call(:m, **{}) } + assert_raise(ArgumentError) { m.call(:m, **kw) } assert_equal(h, m.call(:m, **h)) assert_equal(h, m.call(:m, a: 1)) assert_equal(h2, m.call(:m, **h2)) @@ -1740,40 +1364,22 @@ def c.m(**args) assert_equal(h2, m.call(:m, **h2)) assert_equal(h3, m.call(:m, **h3)) assert_equal(h3, m.call(:m, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, m.call(:m, h)) - end + assert_raise(ArgumentError) { m.call(:m, h) } assert_raise(ArgumentError) { m.call(:m, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { m.call(:m, h3) } - end + assert_raise(ArgumentError) { m.call(:m, h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end m = c.method(:send) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - m.call(:m, **{}) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - m.call(:m, **kw) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], m.call(:m, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], m.call(:m, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], m.call(:m, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], m.call(:m, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], m.call(:m, a: 1, **h2)) - end + assert_raise(ArgumentError) { m.call(:m, **{}) } + assert_raise(ArgumentError) { m.call(:m, **kw) } + assert_raise(ArgumentError) { m.call(:m, **h) } + assert_raise(ArgumentError) { m.call(:m, a: 1) } + assert_raise(ArgumentError) { m.call(:m, **h2) } + assert_raise(ArgumentError) { m.call(:m, **h3) } + assert_raise(ArgumentError) { m.call(:m, a: 1, **h2) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -1821,12 +1427,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, :m.to_proc.call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, :m.to_proc.call(c, **kw)) - end + assert_raise(ArgumentError) { :m.to_proc.call(c, **{}) } + assert_raise(ArgumentError) { :m.to_proc.call(c, **kw) } assert_equal(h, :m.to_proc.call(c, **h)) assert_equal(h, :m.to_proc.call(c, a: 1)) assert_equal(h2, :m.to_proc.call(c, **h2)) @@ -1844,39 +1446,21 @@ def c.m(**args) assert_equal(h2, :m.to_proc.call(c, **h2)) assert_equal(h3, :m.to_proc.call(c, **h3)) assert_equal(h3, :m.to_proc.call(c, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, :m.to_proc.call(c, h)) - end + assert_raise(ArgumentError) { :m.to_proc.call(c, h) } assert_raise(ArgumentError) { :m.to_proc.call(c, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { :m.to_proc.call(c, h3) } - end + assert_raise(ArgumentError) { :m.to_proc.call(c, h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], :m.to_proc.call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], :m.to_proc.call(c, **kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], :m.to_proc.call(c, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], :m.to_proc.call(c, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], :m.to_proc.call(c, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], :m.to_proc.call(c, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], :m.to_proc.call(c, a: 1, **h2)) - end + assert_raise(ArgumentError) { :m.to_proc.call(c, **{}) } + assert_raise(ArgumentError) { :m.to_proc.call(c, **kw) } + assert_raise(ArgumentError) { :m.to_proc.call(c, **h) } + assert_raise(ArgumentError) { :m.to_proc.call(c, a: 1) } + assert_raise(ArgumentError) { :m.to_proc.call(c, **h2) } + assert_raise(ArgumentError) { :m.to_proc.call(c, **h3) } + assert_raise(ArgumentError) { :m.to_proc.call(c, a: 1, **h2) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -1924,12 +1508,8 @@ def c.m; end def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, m.call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, m.call(c, **kw)) - end + assert_raise(ArgumentError) { m.call(c, **{}) } + assert_raise(ArgumentError) { m.call(c, **kw) } assert_equal(h, m.call(c, **h)) assert_equal(h, m.call(c, a: 1)) assert_equal(h2, m.call(c, **h2)) @@ -1947,39 +1527,21 @@ def c.m(**args) assert_equal(h2, m.call(c, **h2)) assert_equal(h3, m.call(c, **h3)) assert_equal(h3, m.call(c, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, m.call(c, h)) - end + assert_raise(ArgumentError) { m.call(c, h) } assert_raise(ArgumentError) { m.call(c, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { m.call(c, h3) } - end + assert_raise(ArgumentError) { m.call(c, h3) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], m.call(c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], m.call(c, **kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], m.call(c, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], m.call(c, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], m.call(c, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], m.call(c, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], m.call(c, a: 1, **h2)) - end + assert_raise(ArgumentError) { m.call(c, **{}) } + assert_raise(ArgumentError) { m.call(c, **kw) } + assert_raise(ArgumentError) { m.call(c, **h) } + assert_raise(ArgumentError) { m.call(c, a: 1) } + assert_raise(ArgumentError) { m.call(c, **h2) } + assert_raise(ArgumentError) { m.call(c, **h3) } + assert_raise(ArgumentError) { m.call(c, a: 1, **h2) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -2026,12 +1588,8 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -2049,39 +1607,21 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg=1, **args) @@ -2128,22 +1668,12 @@ def c.method_missing(_); end assert_raise(ArgumentError) { c.m(**h3) } assert_raise(ArgumentError) { c.m(a: 1, **h2) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, args) - args - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**{})) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**kw)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, args) + args end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -2161,50 +1691,21 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `m'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, arg, **args) - [arg, args] - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**{})) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**kw)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(**h)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, arg, **args) + [arg, args] end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg=1, **args) @@ -2252,12 +1753,8 @@ def c.method_missing(_); end def c.method_missing(_, args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -2275,39 +1772,21 @@ def c.method_missing(_, **args) assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.m(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.m(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, kw], c.m(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg=1, **args) @@ -2344,12 +1823,8 @@ class << c class << c define_method(:m) {|arg| arg } end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, c.m(**kw)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } assert_equal(h, c.m(**h)) assert_equal(h, c.m(a: 1)) assert_equal(h2, c.m(**h2)) @@ -2379,39 +1854,21 @@ class << c assert_equal(h2, c.m(**h2)) assert_equal(h3, c.m(**h3)) assert_equal(h3, c.m(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal(h, c.m(h)) - end + assert_raise(ArgumentError) { c.m(h) } assert_raise(ArgumentError) { c.m(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do - assert_raise(ArgumentError) { c.m(h3) } - end + assert_raise(ArgumentError) { c.m(h3) } c = Object.new class << c define_method(:m) {|arg, **opt| [arg, opt] } end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([kw, kw], c.m(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([kw, kw], c.m(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], c.m(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], c.m(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h2, kw], c.m(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], c.m(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], c.m(a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(**{}) } + assert_raise(ArgumentError) { c.m(**kw) } + assert_raise(ArgumentError) { c.m(**h) } + assert_raise(ArgumentError) { c.m(a: 1) } + assert_raise(ArgumentError) { c.m(**h2) } + assert_raise(ArgumentError) { c.m(**h3) } + assert_raise(ArgumentError) { c.m(a: 1, **h2) } c = Object.new class << c @@ -2429,23 +1886,15 @@ class << c class << c define_method(:m) {|*args, **opt| [args, opt] } end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[], h], c.m(h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[h], h], c.m(h, h)) - end + assert_equal([[h], kw], c.m(h)) + assert_equal([[h, h], kw], c.m(h, h)) c = Object.new class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([h2, 1], c.m(h3)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([h2, 1], c.m(**h3)) - end + assert_equal([h3, nil], c.m(h3)) + assert_raise(ArgumentError) { c.m(**h3) } end def test_define_method_method_kwsplat @@ -2472,12 +1921,8 @@ class << c define_method(:m) {|arg| arg } end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, m.call(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, m.call(**kw)) - end + assert_raise(ArgumentError) { m.call(**{}) } + assert_raise(ArgumentError) { m.call(**kw) } assert_equal(h, m.call(**h)) assert_equal(h, m.call(a: 1)) assert_equal(h2, m.call(**h2)) @@ -2509,40 +1954,22 @@ class << c assert_equal(h2, m.call(**h2)) assert_equal(h3, m.call(**h3)) assert_equal(h3, m.call(a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal(h, m.call(h)) - end + assert_raise(ArgumentError) { m.call(h) } assert_raise(ArgumentError) { m.call(h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do - assert_raise(ArgumentError) { m.call(h3) } - end + assert_raise(ArgumentError) { m.call(h3) } c = Object.new class << c define_method(:m) {|arg, **opt| [arg, opt] } end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([kw, kw], m.call(**{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([kw, kw], m.call(**kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], m.call(**h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], m.call(a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h2, kw], m.call(**h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], m.call(**h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], m.call(a: 1, **h2)) - end + assert_raise(ArgumentError) { m.call(**{}) } + assert_raise(ArgumentError) { m.call(**kw) } + assert_raise(ArgumentError) { m.call(**h) } + assert_raise(ArgumentError) { m.call(a: 1) } + assert_raise(ArgumentError) { m.call(**h2) } + assert_raise(ArgumentError) { m.call(**h3) } + assert_raise(ArgumentError) { m.call(a: 1, **h2) } c = Object.new class << c @@ -2562,24 +1989,16 @@ class << c define_method(:m) {|*args, **opt| [args, opt] } end m = c.method(:m) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[], h], m.call(h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[h], h], m.call(h, h)) - end + assert_equal([[h], kw], m.call(h)) + assert_equal([[h, h], kw], m.call(h, h)) c = Object.new class << c define_method(:m) {|arg=nil, a: nil| [arg, a] } end m = c.method(:m) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([h2, 1], m.call(h3)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([h2, 1], m.call(**h3)) - end + assert_equal([h3, nil], m.call(h3)) + assert_raise(ArgumentError) { m.call(**h3) } end def test_attr_reader_kwsplat @@ -2631,12 +2050,8 @@ def test_attr_writer_kwsplat class << c attr_writer :m end - assert_warn(/Passing the keyword argument for `m=' as the last hash parameter is deprecated/) do - c.send(:m=, **{}) - end - assert_warn(/Passing the keyword argument for `m=' as the last hash parameter is deprecated/) do - c.send(:m=, **kw) - end + assert_raise(ArgumentError) { c.send(:m=, **{}) } + assert_raise(ArgumentError) { c.send(:m=, **kw) } assert_equal(h, c.send(:m=, **h)) assert_equal(h, c.send(:m=, a: 1)) assert_equal(h2, c.send(:m=, **h2)) @@ -2663,12 +2078,8 @@ class << c attr_writer :m end m = c.method(:m=) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - m.call(**{}) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - m.call(**kw) - end + assert_raise(ArgumentError) { m.call(**{}) } + assert_raise(ArgumentError) { m.call(**kw) } assert_equal(h, m.call(**h)) assert_equal(h, m.call(a: 1)) assert_equal(h2, m.call(**h2)) @@ -2691,13 +2102,9 @@ def test_proc_ruby2_keywords assert_equal([[1], h1], foo.call(1, :a=>1, &->(*args, **kw){[args, kw]})) assert_equal([1, h1], foo.call(1, :a=>1, &->(*args){args})) - assert_warn(/Using the last argument as keyword parameters is deprecated/) do - assert_equal([[1], h1], foo.call(1, {:a=>1}, &->(*args, **kw){[args, kw]})) - end + assert_equal([[1, h1], {}], foo.call(1, {:a=>1}, &->(*args, **kw){[args, kw]})) assert_equal([1, h1], foo.call(1, {:a=>1}, &->(*args){args})) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h1, {}], foo.call(:a=>1, &->(arg, **kw){[arg, kw]})) - end + assert_raise(ArgumentError) { foo.call(:a=>1, &->(arg, **kw){[arg, kw]}) } assert_equal(h1, foo.call(:a=>1, &->(arg){arg})) [->(){}, ->(arg){}, ->(*args, **kw){}, ->(*args, k: 1){}, ->(*args, k: ){}].each do |pr| @@ -2913,21 +2320,13 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_foo_bar(h1, **{})) assert_equal([h1], o.foo_foo_baz(h1, **{})) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.foo(:bar, 1, h1)) - end + assert_equal([[1, h1], {}], o.foo(:bar, 1, h1)) assert_equal([1, h1], o.foo(:baz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.bfoo(:bar, 1, h1)) - end + assert_equal([[1, h1], {}], o.bfoo(:bar, 1, h1)) assert_equal([1, h1], o.bfoo(:baz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.store_foo(:bar, 1, h1)) - end + assert_equal([[1, h1], {}], o.store_foo(:bar, 1, h1)) assert_equal([1, h1], o.store_foo(:baz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.foo_bar(1, h1)) - end + assert_equal([[1, h1], {}], o.foo_bar(1, h1)) assert_equal([1, h1], o.foo_baz(1, h1)) assert_equal([[1, h1, 1], {}], o.foo_mod(:bar, 1, :a=>1)) @@ -2977,43 +2376,29 @@ def method_missing(*args) assert_equal([[h1], {}], o.foo_dbar(h1, **{})) assert_equal([h1], o.foo_dbaz(h1, **{})) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[1], h1], o.foo(:dbar, 1, h1)) - end + assert_equal([[1, h1], {}], o.foo(:dbar, 1, h1)) assert_equal([1, h1], o.foo(:dbaz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[1], h1], o.bfoo(:dbar, 1, h1)) - end + assert_equal([[1, h1], {}], o.bfoo(:dbar, 1, h1)) assert_equal([1, h1], o.bfoo(:dbaz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[1], h1], o.store_foo(:dbar, 1, h1)) - end + assert_equal([[1, h1], {}], o.store_foo(:dbar, 1, h1)) assert_equal([1, h1], o.store_foo(:dbaz, 1, h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal([[1], h1], o.foo_dbar(1, h1)) - end + assert_equal([[1, h1], {}], o.foo_dbar(1, h1)) assert_equal([1, h1], o.foo_dbaz(1, h1)) assert_equal([[1], h1], o.block(1, :a=>1)) assert_equal([[1], h1], o.block(1, **h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal([[1], h1], o.block(1, h1)) - end + assert_equal([[1, h1], {}], o.block(1, h1)) assert_equal([[h1], {}], o.block(h1, **{})) assert_equal([[1], h1], o.cfunc(1, :a=>1)) assert_equal([[1], h1], o.cfunc(1, **h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do - assert_equal([[1], h1], o.cfunc(1, h1)) - end + assert_equal([[1, h1], {}], o.cfunc(1, h1)) assert_equal([[h1], {}], o.cfunc(h1, **{})) o = mmkw.new assert_equal([[:b, 1], h1], o.b(1, :a=>1)) assert_equal([[:b, 1], h1], o.b(1, **h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([[:b, 1], h1], o.b(1, h1)) - end + assert_equal([[:b, 1, h1], {}], o.b(1, h1)) assert_equal([[:b, h1], {}], o.b(h1, **{})) o = mmnokw.new @@ -3025,9 +2410,7 @@ def method_missing(*args) o = implicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.bar(1, h1)) - end + assert_equal([[1, h1], {}], o.bar(1, h1)) assert_equal([[h1], {}], o.bar(h1, **{})) assert_equal([1, h1], o.baz(1, :a=>1)) @@ -3038,9 +2421,7 @@ def method_missing(*args) o = explicit_super.new assert_equal([[1], h1], o.bar(1, :a=>1)) assert_equal([[1], h1], o.bar(1, **h1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.bar(1, h1)) - end + assert_equal([[1, h1], {}], o.bar(1, h1)) assert_equal([[h1], {}], o.bar(h1, **{})) assert_equal([1, h1], o.baz(1, :a=>1)) @@ -3048,19 +2429,8 @@ def method_missing(*args) assert_equal([1, h1], o.baz(1, h1)) assert_equal([h1], o.baz(h1, **{})) - c.class_eval do - remove_method(:bar) - def bar(*args, **kw) - [args, kw] - end - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `bar'/m) do - assert_equal([[1], h1], o.foo(:pass_bar, 1, :a=>1)) - end - - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `initialize'/m) do - assert_equal([[1], h1], o.foo(:pass_cfunc, 1, :a=>1)) - end + assert_equal([[1, h1], {}], o.foo(:pass_bar, 1, :a=>1)) + assert_equal([[1, h1], {}], o.foo(:pass_cfunc, 1, :a=>1)) assert_warn(/Skipping set of ruby2_keywords flag for bar \(method accepts keywords or method does not accept argument splat\)/) do assert_nil(c.send(:ruby2_keywords, :bar)) @@ -3148,25 +2518,14 @@ def c.dig(**args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal(h, [c].dig(0, **h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal(h, [c].dig(0, a: 1)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_raise(ArgumentError) { [c].dig(0, **h3) } - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal(h, [c].dig(0, h)) - end + assert_raise(ArgumentError) { [c].dig(0, **h) } + assert_raise(ArgumentError) { [c].dig(0, a: 1) } + assert_raise(ArgumentError) { [c].dig(0, **h2) } + assert_raise(ArgumentError) { [c].dig(0, **h3) } + assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } + assert_raise(ArgumentError) { [c].dig(0, h) } assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_raise(ArgumentError) { [c].dig(0, h3) } - end + assert_raise(ArgumentError) { [c].dig(0, h3) } c.singleton_class.remove_method(:dig) def c.dig(arg, **args) @@ -3186,26 +2545,14 @@ def c.dig(arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([1, h], [c].dig(0, **h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([1, h], [c].dig(0, a: 1)) - end + assert_equal([h, kw], [c].dig(0, **h)) + assert_equal([h, kw], [c].dig(0, a: 1)) assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([h2, h], [c].dig(0, **h3)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([h2, h], [c].dig(0, a: 1, **h2)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([1, h], [c].dig(0, h)) - end + assert_equal([h3, kw], [c].dig(0, **h3)) + assert_equal([h3, kw], [c].dig(0, a: 1, **h2)) + assert_equal([h, {}], [c].dig(0, h)) assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `dig'/m) do - assert_equal([h2, h], [c].dig(0, h3)) - end + assert_equal([h3, kw], [c].dig(0, h3)) assert_equal([h, kw], [c].dig(0, h, **{})) assert_equal([h2, kw], [c].dig(0, h2, **{})) assert_equal([h3, kw], [c].dig(0, h3, **{})) @@ -3258,25 +2605,14 @@ def c.method_missing(_, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal(h, [c].dig(0, **h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal(h, [c].dig(0, a: 1)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_raise(ArgumentError) { [c].dig(0, **h3) } - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal(h, [c].dig(0, h)) - end + assert_raise(ArgumentError) { [c].dig(0, **h) } + assert_raise(ArgumentError) { [c].dig(0, a: 1) } + assert_raise(ArgumentError) { [c].dig(0, **h2) } + assert_raise(ArgumentError) { [c].dig(0, **h3) } + assert_raise(ArgumentError) { [c].dig(0, a: 1, **h2) } + assert_raise(ArgumentError) { [c].dig(0, h) } assert_raise(ArgumentError) { [c].dig(0, h2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_raise(ArgumentError) { [c].dig(0, h3) } - end + assert_raise(ArgumentError) { [c].dig(0, h3) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg, **args) @@ -3296,26 +2632,14 @@ def c.method_missing(_, arg=1, **args) end assert_equal(c, [c].dig(0, **{})) assert_equal(c, [c].dig(0, **kw)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([1, h], [c].dig(0, **h)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([1, h], [c].dig(0, a: 1)) - end + assert_equal([h, kw], [c].dig(0, **h)) + assert_equal([h, kw], [c].dig(0, a: 1)) assert_equal([h2, kw], [c].dig(0, **h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, h], [c].dig(0, **h3)) - end - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, h], [c].dig(0, a: 1, **h2)) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([1, h], [c].dig(0, h)) - end + assert_equal([h3, kw], [c].dig(0, **h3)) + assert_equal([h3, kw], [c].dig(0, a: 1, **h2)) + assert_equal([h, kw], [c].dig(0, h)) assert_equal([h2, kw], [c].dig(0, h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, h], [c].dig(0, h3)) - end + assert_equal([h3, kw], [c].dig(0, h3)) assert_equal([h, kw], [c].dig(0, h, **{})) assert_equal([h2, kw], [c].dig(0, h2, **{})) assert_equal([h3, kw], [c].dig(0, h3, **{})) @@ -3348,12 +2672,8 @@ def test_enumerator_size_kwsplat assert_raise(ArgumentError) { c.to_enum(:each, a: 1, **h2, &m).size } m = ->(args){ args } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, c.to_enum(:each, **{}, &m).size) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal(kw, c.to_enum(:each, **kw, &m).size) - end + assert_raise(ArgumentError) { c.to_enum(:each, **{}, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, **kw, &m).size } assert_equal(kw, c.to_enum(:each, kw, **kw, &m).size) assert_equal(h, c.to_enum(:each, **h, &m).size) assert_equal(h, c.to_enum(:each, a: 1, &m).size) @@ -3369,36 +2689,18 @@ def test_enumerator_size_kwsplat assert_equal(h2, c.to_enum(:each, **h2, &m).size) assert_equal(h3, c.to_enum(:each, **h3, &m).size) assert_equal(h3, c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal(h, c.to_enum(:each, h, &m).size) - end + assert_raise(ArgumentError) { c.to_enum(:each, h, &m).size } assert_raise(ArgumentError) { c.to_enum(:each, h2, &m).size } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do - assert_raise(ArgumentError) { c.to_enum(:each, h3, &m).size } - end + assert_raise(ArgumentError) { c.to_enum(:each, h3, &m).size } m = ->(arg, **args){ [arg, args] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - c.to_enum(:each, **{}, &m).size - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - c.to_enum(:each, **kw, &m).size - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], c.to_enum(:each, **h, &m).size) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h, kw], c.to_enum(:each, a: 1, &m).size) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h2, kw], c.to_enum(:each, **h2, &m).size) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], c.to_enum(:each, **h3, &m).size) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/m) do - assert_equal([h3, kw], c.to_enum(:each, a: 1, **h2, &m).size) - end + assert_raise(ArgumentError) { c.to_enum(:each, **{}, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, **kw, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, **h, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, a: 1, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, **h2, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, **h3, &m).size } + assert_raise(ArgumentError) { c.to_enum(:each, a: 1, **h2, &m).size } assert_equal([h, kw], c.to_enum(:each, h, &m).size) assert_equal([h2, kw], c.to_enum(:each, h2, &m).size) assert_equal([h3, kw], c.to_enum(:each, h3, &m).size) @@ -3411,13 +2713,9 @@ def test_enumerator_size_kwsplat assert_equal([1, h2], c.to_enum(:each, **h2, &m).size) assert_equal([1, h3], c.to_enum(:each, **h3, &m).size) assert_equal([1, h3], c.to_enum(:each, a: 1, **h2, &m).size) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal([1, h], c.to_enum(:each, h, &m).size) - end + assert_equal([h, kw], c.to_enum(:each, h, &m).size) assert_equal([h2, kw], c.to_enum(:each, h2, &m).size) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do - assert_equal([h2, h], c.to_enum(:each, h3, &m).size) - end + assert_equal([h3, kw], c.to_enum(:each, h3, &m).size) end def test_instance_exec_kwsplat @@ -3446,12 +2744,8 @@ def test_instance_exec_kwsplat assert_raise(ArgumentError) { c.instance_exec(a: 1, **h2, &m) } m = ->(args) { args } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**{}, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**kw, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } assert_equal(kw, c.instance_exec(kw, **kw, &m)) assert_equal(h, c.instance_exec(**h, &m)) assert_equal(h, c.instance_exec(a: 1, &m)) @@ -3467,36 +2761,18 @@ def test_instance_exec_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/) do - assert_equal(h, c.instance_exec(h, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(h, &m) } assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_raise(ArgumentError) { c.instance_exec(h3, &m) } - end + assert_raise(ArgumentError) { c.instance_exec(h3, &m) } m = ->(arg, **args) { [arg, args] } - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**{}, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**kw, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(**h, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(a: 1, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, kw], c.instance_exec(**h2, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(**h3, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h2, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h3, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, **h2, &m) } assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) assert_equal([h3, kw], c.instance_exec(h3, &m)) @@ -3509,13 +2785,9 @@ def test_instance_exec_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal([1, h], c.instance_exec(h, &m)) - end + assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/m) do - assert_equal([h2, h], c.instance_exec(h3, &m)) - end + assert_equal([h3, kw], c.instance_exec(h3, &m)) end def test_instance_exec_method_kwsplat @@ -3554,12 +2826,8 @@ def c.m(args) args end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**{}, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**kw, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } assert_equal(kw, c.instance_exec(kw, **kw, &m)) assert_equal(h, c.instance_exec(**h, &m)) assert_equal(h, c.instance_exec(a: 1, &m)) @@ -3579,40 +2847,22 @@ def c.m(**args) assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/) do - assert_equal(h, c.instance_exec(h, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(h, &m) } assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_raise(ArgumentError) { c.instance_exec(h3, &m) } - end + assert_raise(ArgumentError) { c.instance_exec(h3, &m) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**{}, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**kw, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(**h, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(a: 1, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, kw], c.instance_exec(**h2, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(**h3, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h2, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h3, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, **h2, &m) } assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) assert_equal([h3, kw], c.instance_exec(h3, &m)) @@ -3629,13 +2879,9 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal([1, h], c.instance_exec(h, &m)) - end + assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_equal([h2, h], c.instance_exec(h3, &m)) - end + assert_equal([h3, kw], c.instance_exec(h3, &m)) end def test_instance_exec_define_method_kwsplat @@ -3674,12 +2920,8 @@ def test_instance_exec_define_method_kwsplat args end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**{}, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(**kw, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } assert_equal(kw, c.instance_exec(kw, **kw, &m)) assert_equal(h, c.instance_exec(**h, &m)) assert_equal(h, c.instance_exec(a: 1, &m)) @@ -3699,40 +2941,22 @@ def test_instance_exec_define_method_kwsplat assert_equal(h2, c.instance_exec(**h2, &m)) assert_equal(h3, c.instance_exec(**h3, &m)) assert_equal(h3, c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/) do - assert_equal(h, c.instance_exec(h, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(h, &m) } assert_raise(ArgumentError) { c.instance_exec(h2, &m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_raise(ArgumentError) { c.instance_exec(h3, &m) } - end + assert_raise(ArgumentError) { c.instance_exec(h3, &m) } c.singleton_class.remove_method(:m) c.define_singleton_method(:m) do |arg, **args| [arg, args] end m = c.method(:m) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**{}, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(**kw, &m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(**h, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(a: 1, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, kw], c.instance_exec(**h2, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(**h3, &m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(a: 1, **h2, &m)) - end + assert_raise(ArgumentError) { c.instance_exec(**{}, &m) } + assert_raise(ArgumentError) { c.instance_exec(**kw, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h2, &m) } + assert_raise(ArgumentError) { c.instance_exec(**h3, &m) } + assert_raise(ArgumentError) { c.instance_exec(a: 1, **h2, &m) } assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) assert_equal([h3, kw], c.instance_exec(h3, &m)) @@ -3749,13 +2973,9 @@ def test_instance_exec_define_method_kwsplat assert_equal([1, h2], c.instance_exec(**h2, &m)) assert_equal([1, h3], c.instance_exec(**h3, &m)) assert_equal([1, h3], c.instance_exec(a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal([1, h], c.instance_exec(h, &m)) - end + assert_equal([h, kw], c.instance_exec(h, &m)) assert_equal([h2, kw], c.instance_exec(h2, &m)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_equal([h2, h], c.instance_exec(h3, &m)) - end + assert_equal([h3, kw], c.instance_exec(h3, &m)) end def test_instance_exec_sym_proc_kwsplat @@ -3791,12 +3011,8 @@ def c.m def c.m(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(c, **{}, &:m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal(kw, c.instance_exec(c, **kw, &:m)) - end + assert_raise(ArgumentError) { c.instance_exec(c, **{}, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, **kw, &:m) } assert_equal(kw, c.instance_exec(c, kw, **kw, &:m)) assert_equal(h, c.instance_exec(c, **h, &:m)) assert_equal(h, c.instance_exec(c, a: 1, &:m)) @@ -3815,39 +3031,21 @@ def c.m(**args) assert_equal(h2, c.instance_exec(c, **h2, &:m)) assert_equal(h3, c.instance_exec(c, **h3, &:m)) assert_equal(h3, c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/) do - assert_equal(h, c.instance_exec(c, h, &:m)) - end + assert_raise(ArgumentError) { c.instance_exec(c, h, &:m) } assert_raise(ArgumentError) { c.instance_exec(c, h2, &:m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_raise(ArgumentError) { c.instance_exec(c, h3, &:m) } - end + assert_raise(ArgumentError) { c.instance_exec(c, h3, &:m) } c.singleton_class.remove_method(:m) def c.m(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(c, **{}, &:m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - c.instance_exec(c, **kw, &:m) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(c, **h, &:m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h, kw], c.instance_exec(c, a: 1, &:m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h2, kw], c.instance_exec(c, **h2, &:m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(c, **h3, &:m)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do - assert_equal([h3, kw], c.instance_exec(c, a: 1, **h2, &:m)) - end + assert_raise(ArgumentError) { c.instance_exec(c, **{}, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, **kw, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, **h, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, a: 1, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, **h2, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, **h3, &:m) } + assert_raise(ArgumentError) { c.instance_exec(c, a: 1, **h2, &:m) } assert_equal([h, kw], c.instance_exec(c, h, &:m)) assert_equal([h2, kw], c.instance_exec(c, h2, &:m)) assert_equal([h3, kw], c.instance_exec(c, h3, &:m)) @@ -3863,13 +3061,9 @@ def c.m(arg=1, **args) assert_equal([1, h2], c.instance_exec(c, **h2, &:m)) assert_equal([1, h3], c.instance_exec(c, **h3, &:m)) assert_equal([1, h3], c.instance_exec(c, a: 1, **h2, &:m)) - assert_warn(/Using the last argument as keyword parameters is deprecated/m) do - assert_equal([1, h], c.instance_exec(c, h, &:m)) - end + assert_equal([h, kw], c.instance_exec(c, h, &:m)) assert_equal([h2, kw], c.instance_exec(c, h2, &:m)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated/) do - assert_equal([h2, h], c.instance_exec(c, h3, &:m)) - end + assert_equal([h3, kw], c.instance_exec(c, h3, &:m)) end def test_rb_yield_block_kwsplat @@ -3908,12 +3102,8 @@ def c.c; end def c.c(args) args end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal(kw, c.m(:c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal(kw, c.m(:c, **kw)) - end + assert_raise(ArgumentError) { c.m(:c, **{}) } + assert_raise(ArgumentError) { c.m(:c, **kw) } assert_equal(kw, c.m(:c, kw, **kw)) assert_equal(h, c.m(:c, **h)) assert_equal(h, c.m(:c, a: 1)) @@ -3933,39 +3123,21 @@ def c.c(**args) assert_equal([h2, h2], c.m(:c, **h2, &m)) assert_equal([h3, h3], c.m(:c, **h3, &m)) assert_equal([h3, h3], c.m(:c, a: 1, **h2, &m)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `c'/m) do - assert_equal([h, h], c.m(:c, h, &m)) - end + assert_raise(ArgumentError) { c.m(:c, h, &m) } assert_raise(ArgumentError) { c.m(:c, h2, &m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `c'/m) do - assert_raise(ArgumentError) { c.m(:c, h3, &m) } - end + assert_raise(ArgumentError) { c.m(:c, h3, &m) } c.singleton_class.remove_method(:c) def c.c(arg, **args) [arg, args] end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([kw, kw], c.m(:c, **{})) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([kw, kw], c.m(:c, **kw)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([h, kw], c.m(:c, **h)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([h, kw], c.m(:c, a: 1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([h2, kw], c.m(:c, **h2)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([h3, kw], c.m(:c, **h3)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `c'/m) do - assert_equal([h3, kw], c.m(:c, a: 1, **h2)) - end + assert_raise(ArgumentError) { c.m(:c, **{}, &m) } + assert_raise(ArgumentError) { c.m(:c, **kw, &m) } + assert_raise(ArgumentError) { c.m(:c, **h, &m) } + assert_raise(ArgumentError) { c.m(:c, a: 1, &m) } + assert_raise(ArgumentError) { c.m(:c, **h2, &m) } + assert_raise(ArgumentError) { c.m(:c, **h3, &m) } + assert_raise(ArgumentError) { c.m(:c, a: 1, **h2, &m) } assert_equal([h, kw], c.m(:c, h)) assert_equal([h2, kw], c.m(:c, h2)) assert_equal([h3, kw], c.m(:c, h3)) @@ -3981,13 +3153,9 @@ def c.c(arg=1, **args) assert_equal([1, h2], c.m(:c, **h2)) assert_equal([1, h3], c.m(:c, **h3)) assert_equal([1, h3], c.m(:c, a: 1, **h2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `c'/m) do - assert_equal([1, h], c.m(:c, h)) - end + assert_equal([h, kw], c.m(:c, h)) assert_equal([h2, kw], c.m(:c, h2)) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `c'/m) do - assert_equal([h2, h], c.m(:c, h3)) - end + assert_equal([h3, kw], c.m(:c, h3)) end def p1 @@ -4115,25 +3283,16 @@ def rest_keyrest(*args, **opt) def test_rest_keyrest bug7665 = '[ruby-core:51278]' bug8463 = '[ruby-core:55203] [Bug #8463]' - expect = [*%w[foo bar], {zzz: 42}] - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `rest_keyrest'/m) do - assert_equal(expect, rest_keyrest(*expect), bug7665) - end + a = [*%w[foo bar], {zzz: 42}] + expect = a + [{}] + assert_equal(expect, rest_keyrest(*a), bug7665) pr = proc {|*args, **opt| next *args, opt} - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(expect, pr.call(*expect), bug7665) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(expect, pr.call(expect), bug8463) - end + assert_equal(expect, pr.call(*a), bug7665) + assert_equal(expect, pr.call(a), bug8463) pr = proc {|a, *b, **opt| next a, *b, opt} - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(expect, pr.call(expect), bug8463) - end + assert_equal(expect, pr.call(a), bug8463) pr = proc {|a, **opt| next a, opt} - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(expect.values_at(0, -1), pr.call(expect), bug8463) - end + assert_equal(expect.values_at(0, -1), pr.call(expect), bug8463) end def req_plus_keyword(x, **h) @@ -4148,16 +3307,10 @@ def splat_plus_keyword(*a, **h) [a, h] end - def test_keyword_split - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do - assert_equal([{:a=>1}, {}], req_plus_keyword(:a=>1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do - assert_equal([{"a"=>1}, {}], req_plus_keyword("a"=>1)) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `req_plus_keyword'/m) do - assert_equal([{"a"=>1, :a=>1}, {}], req_plus_keyword("a"=>1, :a=>1)) - end + def test_keyword_no_split + assert_raise(ArgumentError) { req_plus_keyword(:a=>1) } + assert_raise(ArgumentError) { req_plus_keyword("a"=>1) } + assert_raise(ArgumentError) { req_plus_keyword("a"=>1, :a=>1) } assert_equal([{:a=>1}, {}], req_plus_keyword({:a=>1})) assert_equal([{"a"=>1}, {}], req_plus_keyword({"a"=>1})) assert_equal([{"a"=>1, :a=>1}, {}], req_plus_keyword({"a"=>1, :a=>1})) @@ -4165,24 +3318,16 @@ def test_keyword_split assert_equal([1, {:a=>1}], opt_plus_keyword(:a=>1)) assert_equal([1, {"a"=>1}], opt_plus_keyword("a"=>1)) assert_equal([1, {"a"=>1, :a=>1}], opt_plus_keyword("a"=>1, :a=>1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `opt_plus_keyword'/m) do - assert_equal([1, {:a=>1}], opt_plus_keyword({:a=>1})) - end + assert_equal([{:a=>1}, {}], opt_plus_keyword({:a=>1})) assert_equal([{"a"=>1}, {}], opt_plus_keyword({"a"=>1})) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `opt_plus_keyword'/m) do - assert_equal([{"a"=>1}, {:a=>1}], opt_plus_keyword({"a"=>1, :a=>1})) - end + assert_equal([{"a"=>1, :a=>1}, {}], opt_plus_keyword({"a"=>1, :a=>1})) assert_equal([[], {:a=>1}], splat_plus_keyword(:a=>1)) assert_equal([[], {"a"=>1}], splat_plus_keyword("a"=>1)) assert_equal([[], {"a"=>1, :a=>1}], splat_plus_keyword("a"=>1, :a=>1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `splat_plus_keyword'/m) do - assert_equal([[], {:a=>1}], splat_plus_keyword({:a=>1})) - end + assert_equal([[{:a=>1}], {}], splat_plus_keyword({:a=>1})) assert_equal([[{"a"=>1}], {}], splat_plus_keyword({"a"=>1})) - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `splat_plus_keyword'/m) do - assert_equal([[{"a"=>1}], {:a=>1}], splat_plus_keyword({"a"=>1, :a=>1})) - end + assert_equal([[{"a"=>1, :a=>1}], {}], splat_plus_keyword({"a"=>1, :a=>1})) end def test_bare_kwrest @@ -4367,9 +3512,7 @@ def foo(a, b, c=1, *d, e, f:2, **g) [a, b, c, d, e, f, g] end end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `foo'/m) do - assert_equal([1, 2, 1, [], {:f=>5}, 2, {}], a.new.foo(1, 2, f:5), bug8993) - end + assert_raise(ArgumentError) { a.new.foo(1, 2, f:5) } end def test_splat_keyword_nondestructive @@ -4396,18 +3539,12 @@ def o2.to_hash() { b: 2 } end assert_equal({a: 1, b: 2}, m1(**o, **o2) {|x| break x}, bug9898) end - def test_implicit_hash_conversion - bug10016 = '[ruby-core:63593] [Bug #10016]' - + def test_no_implicit_hash_conversion o = Object.new def o.to_hash() { k: 9 } end assert_equal([1, 42, [], o, :key, {}, nil], f9(1, o)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m1'/m) do - assert_equal([1, 9], m1(1, o) {|a, k: 0| break [a, k]}, bug10016) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `m1'/m) do - assert_equal([1, 9], m1(1, o, &->(a, k: 0) {break [a, k]}), bug10016) - end + assert_equal([1, 0], m1(1, o) {|a, k: 0| break [a, k]}) + assert_raise(ArgumentError) { m1(1, o, &->(a, k: 0) {break [a, k]}) } end def test_splat_hash @@ -4418,7 +3555,7 @@ def m.f2(a = nil) a; end def m.f3(**a) a; end def m.f4(*a) a; end o = {a: 1} - assert_raise_with_message(ArgumentError, /unknown keyword: :a/) { + assert_raise_with_message(ArgumentError, /wrong number of arguments \(given 1, expected 0\)/) { m.f(**o) } o = {} @@ -4711,22 +3848,12 @@ def c.m; end assert_raise(ArgumentError) { c.call(**h3, &:m) } assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m) } - redef = -> do - c.singleton_class.remove_method(:m) - eval <<-END - def c.m(args) - args - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.call(**{}, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal(kw, c.call(**kw, &:m)) + c.singleton_class.remove_method(:m) + def c.m(args) + args end + assert_raise(ArgumentError) { c.call(**{}, &:m) } + assert_raise(ArgumentError) { c.call(**kw, &:m) } assert_equal(h, c.call(**h, &:m)) assert_equal(h, c.call(a: 1, &:m)) assert_equal(h2, c.call(**h2, &:m)) @@ -4744,50 +3871,21 @@ def c.m(**args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(h, c.call(h, &:m)) - end + assert_raise(ArgumentError) { c.call(h, &:m) } assert_raise(ArgumentError) { c.call(h2, &:m) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do - assert_raise(ArgumentError) { c.call(h3, &:m) } - end + assert_raise(ArgumentError) { c.call(h3, &:m) } - redef = -> do - c.singleton_class.remove_method(:m) - eval <<-END - def c.m(arg, **args) - [arg, args] - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], c.call(**{}, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([kw, kw], c.call(**kw, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.call(**h, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h, kw], c.call(a: 1, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h2, kw], c.call(**h2, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.call(**h3, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `m'/m) do - assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) + c.singleton_class.remove_method(:m) + def c.m(arg, **args) + [arg, args] end + assert_raise(ArgumentError) { c.call(**{}, &:m) } + assert_raise(ArgumentError) { c.call(**kw, &:m) } + assert_raise(ArgumentError) { c.call(**h, &:m) } + assert_raise(ArgumentError) { c.call(a: 1, &:m) } + assert_raise(ArgumentError) { c.call(**h2, &:m) } + assert_raise(ArgumentError) { c.call(**h3, &:m) } + assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m) } c.singleton_class.remove_method(:m) def c.m(arg=1, **args) @@ -4831,22 +3929,12 @@ def c.method_missing(_) end assert_raise(ArgumentError) { c.call(**h3, &:m) } assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, args) - args - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.call(**{}, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.call(**kw, &:m)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, args) + args end + assert_raise(ArgumentError) { c.call(**{}, &:m) } + assert_raise(ArgumentError) { c.call(**kw, &:m) } assert_equal(h, c.call(**h, &:m)) assert_equal(h, c.call(a: 1, &:m)) assert_equal(h2, c.call(**h2, &:m)) @@ -4864,50 +3952,21 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m)) assert_equal(h3, c.call(**h3, &:m)) assert_equal(h3, c.call(a: 1, **h2, &:m)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(h, c.call(h, &:m2)) - end + assert_raise(ArgumentError) { c.call(h, &:m2) } assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do - assert_raise(ArgumentError) { c.call(h3, &:m2) } - end + assert_raise(ArgumentError) { c.call(h3, &:m2) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, arg, **args) - [arg, args] - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.call(**{}, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.call(**kw, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.call(**h, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.call(a: 1, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, kw], c.call(**h2, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.call(**h3, &:m)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.call(a: 1, **h2, &:m)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, arg, **args) + [arg, args] end + assert_raise(ArgumentError) { c.call(**{}, &:m2) } + assert_raise(ArgumentError) { c.call(**kw, &:m2) } + assert_raise(ArgumentError) { c.call(**h, &:m2) } + assert_raise(ArgumentError) { c.call(a: 1, &:m2) } + assert_raise(ArgumentError) { c.call(**h2, &:m2) } + assert_raise(ArgumentError) { c.call(**h3, &:m2) } + assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m2) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg=1, **args) @@ -4951,22 +4010,12 @@ def c.method_missing(_) end assert_raise(ArgumentError) { c.call(**h3, &:m2) } assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m2) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, args) - args - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.call(**{}, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal(kw, c.call(**kw, &:m2)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, args) + args end + assert_raise(ArgumentError) { c.call(**{}, &:m2) } + assert_raise(ArgumentError) { c.call(**kw, &:m2) } assert_equal(h, c.call(**h, &:m2)) assert_equal(h, c.call(a: 1, &:m2)) assert_equal(h2, c.call(**h2, &:m2)) @@ -4984,50 +4033,21 @@ def c.method_missing(_, **args) assert_equal(h2, c.call(**h2, &:m2)) assert_equal(h3, c.call(**h3, &:m2)) assert_equal(h3, c.call(a: 1, **h2, &:m2)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(h, c.call(h, &:m2)) - end + assert_raise(ArgumentError) { c.call(h, &:m2) } assert_raise(ArgumentError) { c.call(h2, &:m2) } - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `call'/m) do - assert_raise(ArgumentError) { c.call(h3, &:m2) } - end + assert_raise(ArgumentError) { c.call(h3, &:m2) } - redef = -> do - c.singleton_class.remove_method(:method_missing) - eval <<-END - def c.method_missing(_, arg, **args) - [arg, args] - end - END - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.call(**{}, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([kw, kw], c.call(**kw, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.call(**h, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h, kw], c.call(a: 1, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h2, kw], c.call(**h2, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.call(**h3, &:m2)) - end - redef[] - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `method_missing'/m) do - assert_equal([h3, kw], c.call(a: 1, **h2, &:m2)) + c.singleton_class.remove_method(:method_missing) + def c.method_missing(_, arg, **args) + [arg, args] end + assert_raise(ArgumentError) { c.call(**{}, &:m2) } + assert_raise(ArgumentError) { c.call(**kw, &:m2) } + assert_raise(ArgumentError) { c.call(**h, &:m2) } + assert_raise(ArgumentError) { c.call(a: 1, &:m2) } + assert_raise(ArgumentError) { c.call(**h2, &:m2) } + assert_raise(ArgumentError) { c.call(**h3, &:m2) } + assert_raise(ArgumentError) { c.call(a: 1, **h2, &:m2) } c.singleton_class.remove_method(:method_missing) def c.method_missing(_, arg=1, **args) diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index f300710d2c53cf..74ea75ee42f31c 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -631,15 +631,16 @@ def test_unloadable_usrmarshal def test_no_internal_ids opt = %w[--disable=gems] - args = [opt, 'Marshal.dump("",STDOUT)', true, true, encoding: Encoding::ASCII_8BIT] - out, err, status = EnvUtil.invoke_ruby(*args) + args = [opt, 'Marshal.dump("",STDOUT)', true, true] + kw = {encoding: Encoding::ASCII_8BIT} + out, err, status = EnvUtil.invoke_ruby(*args, **kw) assert_empty(err) assert_predicate(status, :success?) expected = out opt << "--enable=frozen-string-literal" opt << "--debug=frozen-string-literal" - out, err, status = EnvUtil.invoke_ruby(*args) + out, err, status = EnvUtil.invoke_ruby(*args, **kw) assert_empty(err) assert_predicate(status, :success?) assert_equal(expected, out) diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 636f827fe33753..7ea02fdcbfd9a9 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -293,12 +293,9 @@ def test_step assert_raise(ArgumentError, bug9811) { 1.step(10, 1, by: 11).size } - e = assert_warn(/Using the last argument as keyword parameters is deprecated/) { - 1.step(10, {by: "1"}) - } - assert_warn('') { - assert_raise(ArgumentError) {e.size} - } + e = 1.step(10, {by: "1"}) + assert_raise(TypeError) {e.next} + assert_raise(TypeError) {e.size} assert_equal(bignum*2+1, (-bignum).step(bignum, 1).size) assert_equal(bignum*2, (-bignum).step(bignum-1, 1).size) diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index fce1bd4a870b26..af4cf11623c444 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1501,29 +1501,15 @@ def test_compose_keywords g = ->(kw) { kw.merge(:a=>2) } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call(a: 3)[:a]) - end + assert_raise(ArgumentError) { (f << g).call(a: 3)[:a] } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (f >> g).call({a: 3})[:a]) - end + assert_raise(ArgumentError) { (f << g).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f >> g).call({a: 3})[:a] } assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call(a: 3)[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (g << f).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call({a: 3})[:a]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call(**{})[:a]) - end + assert_raise(ArgumentError) { (g >> f).call(a: 3)[:a] } + assert_raise(ArgumentError) { (g << f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (g >> f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f << g).call(**{})[:a] } assert_equal(2, (f >> g).call(**{})[:a]) end @@ -1531,29 +1517,15 @@ def test_compose_keywords_method f = ->(**kw) { kw.merge(:a=>1) }.method(:call) g = ->(kw) { kw.merge(:a=>2) }.method(:call) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call(a: 3)[:a]) - end + assert_raise(ArgumentError) { (f << g).call(a: 3)[:a] } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (f >> g).call({a: 3})[:a]) - end + assert_raise(ArgumentError) { (f << g).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f >> g).call({a: 3})[:a] } assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call(a: 3)[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (g << f).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call({a: 3})[:a]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call(**{})[:a]) - end + assert_raise(ArgumentError) { (g >> f).call(a: 3)[:a] } + assert_raise(ArgumentError) { (g << f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (g >> f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f << g).call(**{})[:a] } assert_equal(2, (f >> g).call(**{})[:a]) end @@ -1565,29 +1537,15 @@ def g.to_proc; method(:call).to_proc; end def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call(a: 3)[:a]) - end + assert_raise(ArgumentError) { (f << g).call(a: 3)[:a] } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (f << g).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (f >> g).call({a: 3})[:a]) - end + assert_raise(ArgumentError) { (f << g).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f >> g).call({a: 3})[:a] } assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call(a: 3)[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(2, (g << f).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do - assert_equal(1, (g >> f).call({a: 3})[:a]) - end - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `call'/m) do - assert_equal(1, (f << g).call(**{})[:a]) - end + assert_raise(ArgumentError) { (g >> f).call(a: 3)[:a] } + assert_raise(ArgumentError) { (g << f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (g >> f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f << g).call(**{})[:a] } assert_equal(2, (f >> g).call(**{})[:a]) f = ->(kw) { kw.merge(:a=>1) } @@ -1598,29 +1556,15 @@ def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end assert_equal(1, (f << g).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(2, (f >> g).call(a: 3)[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(1, (f << g).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(2, (f >> g).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(2, (g << f).call(a: 3)[:a]) - end + assert_raise(ArgumentError) { (f >> g).call(a: 3)[:a] } + assert_raise(ArgumentError) { (f << g).call({a: 3})[:a] } + assert_raise(ArgumentError) { (f >> g).call({a: 3})[:a] } + assert_raise(ArgumentError) { (g << f).call(a: 3)[:a] } assert_equal(1, (g >> f).call(a: 3)[:a]) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(2, (g << f).call({a: 3})[:a]) - end - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(1, (g >> f).call({a: 3})[:a]) - end + assert_raise(ArgumentError) { (g << f).call({a: 3})[:a] } + assert_raise(ArgumentError) { (g >> f).call({a: 3})[:a] } assert_equal(1, (f << g).call(**{})[:a]) - assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do - assert_equal(2, (f >> g).call(**{})[:a]) - end + assert_raise(ArgumentError) { (f >> g).call(**{})[:a] } end end diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index f13afbbdd4e30b..a7deb13a08aa26 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -115,7 +115,7 @@ def test_struct_new_with_keyword_init assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect # eval is needed to prevent the warning duplication filter k = eval("Class.new(@Struct::KeywordInitFalse) {def initialize(**) end}") - assert_warn(/Using the last argument as keyword parameters is deprecated/) {k.new(a: 1, b: 2)} + assert_raise(ArgumentError) { k.new(a: 1, b: 2) } k = Class.new(@Struct::KeywordInitTrue) {def initialize(**) end} assert_warn('') {k.new(a: 1, b: 2)} diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 72f539068d7493..01f329510141dc 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -182,9 +182,7 @@ def test_keyword_duplicated_splat h = {k3: 31} assert_raise(ArgumentError) {o.kw(**h)} h = {"k1"=>11, k2: 12} - assert_warn(/Splitting the last argument into positional and keyword parameters is deprecated.*The called method `kw'/m) do - assert_raise(ArgumentError) {o.kw(**h)} - end + assert_raise(ArgumentError) {o.kw(**h)} end def test_keyword_duplicated @@ -199,7 +197,7 @@ def a.f(k:) k; end assert_equal([1, 2], a, bug10315) a.clear r = nil - assert_warn(/duplicated/) {r = eval("a.f({k: a.add(1), k: a.add(2)})")} + assert_warn(/duplicated/) {r = eval("a.f(**{k: a.add(1), k: a.add(2)})")} assert_equal(2, r) assert_equal([1, 2], a, bug10315) end @@ -1523,12 +1521,12 @@ def obj3.bar(*args, &block) assert_warning('') { assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5)) } - warning = "warning: Using the last argument as keyword parameters is deprecated" - assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { - assert_equal([[], {}], obj.foo({}) {|*x| x}) + array = obj == obj3 ? [] : [{}] + assert_warning('') { + assert_equal([array, {}], obj.foo({}) {|*x| x}) } - assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { - assert_equal([[], {}], obj.foo({})) + assert_warning('') { + assert_equal([array, {}], obj.foo({})) } assert_equal(-1, obj.method(:foo).arity) parameters = obj.method(:foo).parameters diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index aa2675af5dcc01..1437bd8d8c2575 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -518,15 +518,15 @@ def test_require_bundler_with_bundler_version define_method "test_no_other_behavioral_changes_with_#{prefix.tr(".", "_")}warn" do lib = File.realpath("../../../lib", __FILE__) Dir.mktmpdir("warn_test") do |dir| - File.write(dir + "/main.rb", "#{prefix}warn({x:1}, {y:2}, [])\n") + File.write(dir + "/main.rb", "warn({x:1}, {y:2}, [])\n") _, err = capture_subprocess_io do - system(@@ruby, "-w", "--disable=gems", "-I", lib, "-C", dir, "main.rb") + system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb") end - assert_match(/{:x=>1}\n{:y=>2}\n$/, err) + assert_equal("{:x=>1}\n{:y=>2}\n", err) _, err = capture_subprocess_io do - system(@@ruby, "-w", "--enable=gems", "-I", lib, "-C", dir, "main.rb") + system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb") end - assert_match(/{:x=>1}\n{:y=>2}\n$/, err) + assert_equal("{:x=>1}\n{:y=>2}\n", err) end end end diff --git a/test/test_delegate.rb b/test/test_delegate.rb index 02a343358fbecb..303cd16897a63f 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -190,9 +190,7 @@ def foo.foo(*args, **kw) assert_equal([], d.bar) assert_equal([[], {:a=>1}], d.foo(:a=>1)) assert_equal([{:a=>1}], d.bar(:a=>1)) - assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `foo'/m) do - assert_equal([[], {:a=>1}], d.foo({:a=>1})) - end + assert_equal([[{:a=>1}], {}], d.foo({:a=>1})) assert_equal([{:a=>1}], d.bar({:a=>1})) end From e014e6bf6685f681998238ff005f6d161d43ce51 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 6 Oct 2019 09:26:58 -0700 Subject: [PATCH 291/878] Update specs for keyword argument separation --- spec/ruby/core/io/shared/new.rb | 38 +- spec/ruby/language/block_spec.rb | 158 ++++++--- spec/ruby/language/lambda_spec.rb | 64 +++- spec/ruby/language/method_spec.rb | 503 +++++++++++++++++++++------ spec/ruby/optional/capi/util_spec.rb | 83 +++-- 5 files changed, 633 insertions(+), 213 deletions(-) diff --git a/spec/ruby/core/io/shared/new.rb b/spec/ruby/core/io/shared/new.rb index a7b4fc1cbe812b..27d32f97eda6d8 100644 --- a/spec/ruby/core/io/shared/new.rb +++ b/spec/ruby/core/io/shared/new.rb @@ -197,11 +197,21 @@ @io.internal_encoding.to_s.should == 'IBM866' end - it "accepts nil options" do - @io = suppress_keyword_warning do - IO.send(@method, @fd, 'w', nil) + ruby_version_is ''...'2.8' do + it "accepts nil options" do + @io = suppress_keyword_warning do + IO.send(@method, @fd, 'w', nil) + end + @io.write("foo").should == 3 + end + end + + ruby_version_is '2.8' do + it "raises ArgumentError for nil options" do + -> { + IO.send(@method, @fd, 'w', nil) + }.should raise_error(ArgumentError) end - @io.write("foo").should == 3 end it "coerces mode with #to_str" do @@ -372,11 +382,21 @@ }.should raise_error(ArgumentError) end - it "raises TypeError if passed a hash for mode and nil for options" do - -> { - suppress_keyword_warning do + ruby_version_is ''...'2.8' do + it "raises TypeError if passed a hash for mode and nil for options" do + -> { + suppress_keyword_warning do + @io = IO.send(@method, @fd, {mode: 'w'}, nil) + end + }.should raise_error(TypeError) + end + end + + ruby_version_is '2.8' do + it "raises ArgumentError if passed a hash for mode and nil for options" do + -> { @io = IO.send(@method, @fd, {mode: 'w'}, nil) - end - }.should raise_error(TypeError) + }.should raise_error(ArgumentError) + end end end diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb index 6f92383af8ea95..1a8e79063d8910 100644 --- a/spec/ruby/language/block_spec.rb +++ b/spec/ruby/language/block_spec.rb @@ -44,27 +44,51 @@ def m(a) yield a end m([1, 2]) { |a, **k| [a, k] }.should == [1, {}] end - it "assigns elements to mixed argument types" do - suppress_keyword_warning do - result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] } - result.should == [1, 2, [], 3, 2, {x: 9}] + ruby_version_is ''..."2.8" do + it "assigns elements to mixed argument types" do + suppress_keyword_warning do + result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] } + result.should == [1, 2, [], 3, 2, {x: 9}] + end + end + + it "assigns symbol keys from a Hash to keyword arguments" do + suppress_keyword_warning do + result = m(["a" => 1, a: 10]) { |a=nil, **b| [a, b] } + result.should == [{"a" => 1}, a: 10] + end + end + + it "assigns symbol keys from a Hash returned by #to_hash to keyword arguments" do + suppress_keyword_warning do + obj = mock("coerce block keyword arguments") + obj.should_receive(:to_hash).and_return({"a" => 1, b: 2}) + + result = m([obj]) { |a=nil, **b| [a, b] } + result.should == [{"a" => 1}, b: 2] + end end end - it "assigns symbol keys from a Hash to keyword arguments" do - suppress_keyword_warning do + ruby_version_is "2.8" do + it "assigns elements to mixed argument types" do + result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] } + result.should == [1, 2, [3], {x: 9}, 2, {}] + end + + it "does not treat final Hash as keyword arguments" do result = m(["a" => 1, a: 10]) { |a=nil, **b| [a, b] } - result.should == [{"a" => 1}, a: 10] + result.should == [{"a" => 1, a: 10}, {}] end - end - it "assigns symbol keys from a Hash returned by #to_hash to keyword arguments" do - suppress_keyword_warning do - obj = mock("coerce block keyword arguments") - obj.should_receive(:to_hash).and_return({"a" => 1, b: 2}) + it "does not call #to_hash on final argument to get keyword arguments" do + suppress_keyword_warning do + obj = mock("coerce block keyword arguments") + obj.should_not_receive(:to_hash) - result = m([obj]) { |a=nil, **b| [a, b] } - result.should == [{"a" => 1}, b: 2] + result = m([obj]) { |a=nil, **b| [a, b] } + result.should == [obj, {}] + end end end @@ -78,7 +102,7 @@ def m(a) yield a end end end - ruby_version_is "2.7" do + ruby_version_is "2.7"...'2.8' do it "calls #to_hash on the argument but ignores result when optional argument and keyword argument accepted" do obj = mock("coerce block keyword arguments") obj.should_receive(:to_hash).and_return({"a" => 1, "b" => 2}) @@ -88,11 +112,31 @@ def m(a) yield a end end end + ruby_version_is "2.8" do + it "does not call #to_hash on the argument when optional argument and keyword argument accepted" do + obj = mock("coerce block keyword arguments") + obj.should_not_receive(:to_hash) + + result = m([obj]) { |a=nil, **b| [a, b] } + result.should == [obj, {}] + end + end + describe "when non-symbol keys are in a keyword arguments Hash" do - it "separates non-symbol keys and symbol keys" do - suppress_keyword_warning do - result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] } - result.should == [{"a" => 10}, {b: 2}] + ruby_version_is ""..."2.8" do + it "separates non-symbol keys and symbol keys" do + suppress_keyword_warning do + result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] } + result.should == [{"a" => 10}, {b: 2}] + end + end + end + ruby_version_is "2.8" do + it "does not separates non-symbol keys and symbol keys" do + suppress_keyword_warning do + result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] } + result.should == [{"a" => 10, b: 2}, {}] + end end end end @@ -102,51 +146,71 @@ def m(a) yield a end result.should == [{"a" => 10}, {}] end - it "calls #to_hash on the last element if keyword arguments are present" do - suppress_keyword_warning do + ruby_version_is ''...'2.8' do + it "calls #to_hash on the last element if keyword arguments are present" do + suppress_keyword_warning do + obj = mock("destructure block keyword arguments") + obj.should_receive(:to_hash).and_return({x: 9}) + + result = m([1, 2, 3, obj]) { |a, *b, c, **k| [a, b, c, k] } + result.should == [1, [2], 3, {x: 9}] + end + end + + it "assigns the last element to a non-keyword argument if #to_hash returns nil" do + suppress_keyword_warning do + obj = mock("destructure block keyword arguments") + obj.should_receive(:to_hash).and_return(nil) + + result = m([1, 2, 3, obj]) { |a, *b, c, **k| [a, b, c, k] } + result.should == [1, [2, 3], obj, {}] + end + end + + it "calls #to_hash on the last element when there are more arguments than parameters" do + suppress_keyword_warning do + x = mock("destructure matching block keyword argument") + x.should_receive(:to_hash).and_return({x: 9}) + + result = m([1, 2, 3, {y: 9}, 4, 5, x]) { |a, b=5, c, **k| [a, b, c, k] } + result.should == [1, 2, 3, {x: 9}] + end + end + + it "raises a TypeError if #to_hash does not return a Hash" do obj = mock("destructure block keyword arguments") - obj.should_receive(:to_hash).and_return({x: 9}) + obj.should_receive(:to_hash).and_return(1) - result = m([1, 2, 3, obj]) { |a, *b, c, **k| [a, b, c, k] } - result.should == [1, [2], 3, {x: 9}] + -> { m([1, 2, 3, obj]) { |a, *b, c, **k| } }.should raise_error(TypeError) + end + + it "raises the error raised inside #to_hash" do + obj = mock("destructure block keyword arguments") + error = RuntimeError.new("error while converting to a hash") + obj.should_receive(:to_hash).and_raise(error) + + -> { m([1, 2, 3, obj]) { |a, *b, c, **k| } }.should raise_error(error) end end - it "assigns the last element to a non-keyword argument if #to_hash returns nil" do - suppress_keyword_warning do + ruby_version_is '2.8' do + it "does not call #to_hash on the last element if keyword arguments are present" do obj = mock("destructure block keyword arguments") - obj.should_receive(:to_hash).and_return(nil) + obj.should_not_receive(:to_hash) result = m([1, 2, 3, obj]) { |a, *b, c, **k| [a, b, c, k] } result.should == [1, [2, 3], obj, {}] end - end - it "calls #to_hash on the last element when there are more arguments than parameters" do - suppress_keyword_warning do + it "does not call #to_hash on the last element when there are more arguments than parameters" do x = mock("destructure matching block keyword argument") - x.should_receive(:to_hash).and_return({x: 9}) + x.should_not_receive(:to_hash) result = m([1, 2, 3, {y: 9}, 4, 5, x]) { |a, b=5, c, **k| [a, b, c, k] } - result.should == [1, 2, 3, {x: 9}] + result.should == [1, 2, 3, {}] end end - it "raises a TypeError if #to_hash does not return a Hash" do - obj = mock("destructure block keyword arguments") - obj.should_receive(:to_hash).and_return(1) - - -> { m([1, 2, 3, obj]) { |a, *b, c, **k| } }.should raise_error(TypeError) - end - - it "raises the error raised inside #to_hash" do - obj = mock("destructure block keyword arguments") - error = RuntimeError.new("error while converting to a hash") - obj.should_receive(:to_hash).and_raise(error) - - -> { m([1, 2, 3, obj]) { |a, *b, c, **k| } }.should raise_error(error) - end - it "does not call #to_ary on the Array" do ary = [1, 2] ary.should_not_receive(:to_ary) diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb index ddd0b574b39646..85abf3b996363b 100644 --- a/spec/ruby/language/lambda_spec.rb +++ b/spec/ruby/language/lambda_spec.rb @@ -179,17 +179,33 @@ def create_lambda result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12] end - evaluate <<-ruby do - @a = -> (*, **k) { k } - ruby + ruby_version_is ''...'2.8' do + evaluate <<-ruby do + @a = -> (*, **k) { k } + ruby + + @a.().should == {} + @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} + + suppress_keyword_warning do + h = mock("keyword splat") + h.should_receive(:to_hash).and_return({a: 1}) + @a.(h).should == {a: 1} + end + end + end - @a.().should == {} - @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} + ruby_version_is '2.8' do + evaluate <<-ruby do + @a = -> (*, **k) { k } + ruby + + @a.().should == {} + @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} - suppress_keyword_warning do h = mock("keyword splat") - h.should_receive(:to_hash).and_return({a: 1}) - @a.(h).should == {a: 1} + h.should_not_receive(:to_hash) + @a.(h).should == {} end end @@ -533,17 +549,33 @@ def m2() yield end result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12] end - evaluate <<-ruby do - @a = lambda { |*, **k| k } - ruby + ruby_version_is ''...'2.8' do + evaluate <<-ruby do + @a = lambda { |*, **k| k } + ruby - @a.().should == {} - @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} + @a.().should == {} + @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} + + suppress_keyword_warning do + h = mock("keyword splat") + h.should_receive(:to_hash).and_return({a: 1}) + @a.(h).should == {a: 1} + end + end + end + + ruby_version_is '2.8' do + evaluate <<-ruby do + @a = lambda { |*, **k| k } + ruby + + @a.().should == {} + @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} - suppress_keyword_warning do h = mock("keyword splat") - h.should_receive(:to_hash).and_return({a: 1}) - @a.(h).should == {a: 1} + h.should_not_receive(:to_hash) + @a.(h).should == {} end end diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb index 04860257927605..f98e8569f8a661 100644 --- a/spec/ruby/language/method_spec.rb +++ b/spec/ruby/language/method_spec.rb @@ -713,36 +713,67 @@ def m(a, b:) [a, b] end end end - evaluate <<-ruby do - def m(a, b: 1) [a, b] end - ruby + ruby_version_is ""..."2.8" do + evaluate <<-ruby do + def m(a, b: 1) [a, b] end + ruby - m(2).should == [2, 1] - m(1, b: 2).should == [1, 2] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [{"a" => 1, b: 2}, 1] + m(2).should == [2, 1] + m(1, b: 2).should == [1, 2] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [{"a" => 1, b: 2}, 1] + end end - end - evaluate <<-ruby do - def m(a, **) a end - ruby + evaluate <<-ruby do + def m(a, **) a end + ruby - m(1).should == 1 - m(1, a: 2, b: 3).should == 1 - suppress_keyword_warning do - m("a" => 1, b: 2).should == {"a" => 1, b: 2} + m(1).should == 1 + m(1, a: 2, b: 3).should == 1 + suppress_keyword_warning do + m("a" => 1, b: 2).should == {"a" => 1, b: 2} + end + end + + evaluate <<-ruby do + def m(a, **k) [a, k] end + ruby + + m(1).should == [1, {}] + m(1, a: 2, b: 3).should == [1, {a: 2, b: 3}] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [{"a" => 1, b: 2}, {}] + end end end - evaluate <<-ruby do - def m(a, **k) [a, k] end - ruby + ruby_version_is "2.8" do + evaluate <<-ruby do + def m(a, b: 1) [a, b] end + ruby - m(1).should == [1, {}] - m(1, a: 2, b: 3).should == [1, {a: 2, b: 3}] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [{"a" => 1, b: 2}, {}] + m(2).should == [2, 1] + m(1, b: 2).should == [1, 2] + -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError) + end + + evaluate <<-ruby do + def m(a, **) a end + ruby + + m(1).should == 1 + m(1, a: 2, b: 3).should == 1 + -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError) + end + + evaluate <<-ruby do + def m(a, **k) [a, k] end + ruby + + m(1).should == [1, {}] + m(1, a: 2, b: 3).should == [1, {a: 2, b: 3}] + -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError) end end @@ -854,26 +885,49 @@ def m(a=1, (b, *c), (d, (*e, f))) result.should == [[1, 2, 3], 4, [5, 6], 7, [], 8] end - evaluate <<-ruby do - def m(a=1, b:) [a, b] end - ruby + ruby_version_is ""..."2.8" do + evaluate <<-ruby do + def m(a=1, b:) [a, b] end + ruby - m(b: 2).should == [1, 2] - m(2, b: 1).should == [2, 1] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [{"a" => 1}, 2] + m(b: 2).should == [1, 2] + m(2, b: 1).should == [2, 1] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [{"a" => 1}, 2] + end + end + + evaluate <<-ruby do + def m(a=1, b: 2) [a, b] end + ruby + + m().should == [1, 2] + m(2).should == [2, 2] + m(b: 3).should == [1, 3] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [{"a" => 1}, 2] + end end end - evaluate <<-ruby do - def m(a=1, b: 2) [a, b] end - ruby + ruby_version_is "2.8" do + evaluate <<-ruby do + def m(a=1, b:) [a, b] end + ruby - m().should == [1, 2] - m(2).should == [2, 2] - m(b: 3).should == [1, 3] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [{"a" => 1}, 2] + m(b: 2).should == [1, 2] + m(2, b: 1).should == [2, 1] + -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError) + end + + evaluate <<-ruby do + def m(a=1, b: 2) [a, b] end + ruby + + m().should == [1, 2] + m(2).should == [2, 2] + m(b: 3).should == [1, 3] + -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError) end end @@ -936,77 +990,77 @@ def m(*a, b) [a, b] end m(1, 2, 3).should == [[1, 2], 3] end - evaluate <<-ruby do - def m(*, a:) a end - ruby + ruby_version_is ""..."2.7" do + evaluate <<-ruby do + def m(*, a:) a end + ruby - m(a: 1).should == 1 - m(1, 2, a: 3).should == 3 - suppress_keyword_warning do - m("a" => 1, a: 2).should == 2 + m(a: 1).should == 1 + m(1, 2, a: 3).should == 3 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end end - end - evaluate <<-ruby do - def m(*a, b:) [a, b] end - ruby + evaluate <<-ruby do + def m(*a, b:) [a, b] end + ruby - m(b: 1).should == [[], 1] - m(1, 2, b: 3).should == [[1, 2], 3] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + m(b: 1).should == [[], 1] + m(1, 2, b: 3).should == [[1, 2], 3] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end end - end - evaluate <<-ruby do - def m(*, a: 1) a end - ruby + evaluate <<-ruby do + def m(*, a: 1) a end + ruby - m().should == 1 - m(1, 2).should == 1 - m(a: 2).should == 2 - m(1, a: 2).should == 2 - suppress_keyword_warning do - m("a" => 1, a: 2).should == 2 + m().should == 1 + m(1, 2).should == 1 + m(a: 2).should == 2 + m(1, a: 2).should == 2 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end end - end - evaluate <<-ruby do - def m(*a, b: 1) [a, b] end - ruby + evaluate <<-ruby do + def m(*a, b: 1) [a, b] end + ruby - m().should == [[], 1] - m(1, 2, 3, b: 4).should == [[1, 2, 3], 4] - suppress_keyword_warning do - m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + m().should == [[], 1] + m(1, 2, 3, b: 4).should == [[1, 2, 3], 4] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end + + a = mock("splat") + a.should_not_receive(:to_ary) + m(*a).should == [[a], 1] end - a = mock("splat") - a.should_not_receive(:to_ary) - m(*a).should == [[a], 1] - end + evaluate <<-ruby do + def m(*, **) end + ruby - evaluate <<-ruby do - def m(*, **) end - ruby + m().should be_nil + m(a: 1, b: 2).should be_nil + m(1, 2, 3, a: 4, b: 5).should be_nil - m().should be_nil - m(a: 1, b: 2).should be_nil - m(1, 2, 3, a: 4, b: 5).should be_nil + h = mock("keyword splat") + h.should_receive(:to_hash).and_return({a: 1}) + suppress_keyword_warning do + m(h).should be_nil + end - h = mock("keyword splat") - h.should_receive(:to_hash).and_return({a: 1}) - suppress_keyword_warning do - m(h).should be_nil + h = mock("keyword splat") + error = RuntimeError.new("error while converting to a hash") + h.should_receive(:to_hash).and_raise(error) + -> { m(h) }.should raise_error(error) end - h = mock("keyword splat") - error = RuntimeError.new("error while converting to a hash") - h.should_receive(:to_hash).and_raise(error) - -> { m(h) }.should raise_error(error) - end - - ruby_version_is ""..."2.7" do evaluate <<-ruby do def m(*a, **) a end ruby @@ -1093,7 +1147,57 @@ def bo.to_hash; {:b => 2, :c => 3}; end end end - ruby_version_is "2.7" do + ruby_version_is "2.7"...'2.8' do + evaluate <<-ruby do + def m(*, a:) a end + ruby + + m(a: 1).should == 1 + m(1, 2, a: 3).should == 3 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end + end + + evaluate <<-ruby do + def m(*a, b:) [a, b] end + ruby + + m(b: 1).should == [[], 1] + m(1, 2, b: 3).should == [[1, 2], 3] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end + end + + evaluate <<-ruby do + def m(*, a: 1) a end + ruby + + m().should == 1 + m(1, 2).should == 1 + m(a: 2).should == 2 + m(1, a: 2).should == 2 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end + end + + evaluate <<-ruby do + def m(*a, b: 1) [a, b] end + ruby + + m().should == [[], 1] + m(1, 2, 3, b: 4).should == [[1, 2, 3], 4] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end + + a = mock("splat") + a.should_not_receive(:to_ary) + m(*a).should == [[a], 1] + end + evaluate <<-ruby do def m(*a, **) a end ruby @@ -1184,6 +1288,139 @@ def bo.to_hash; {:b => 2, :c => 3}; end m(*bo, **bo).should == [[1, 2, 3], {:b => 2, :c => 3}] end + + evaluate <<-ruby do + def m(*, a:) a end + ruby + + m(a: 1).should == 1 + m(1, 2, a: 3).should == 3 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end + end + + evaluate <<-ruby do + def m(*a, b:) [a, b] end + ruby + + m(b: 1).should == [[], 1] + m(1, 2, b: 3).should == [[1, 2], 3] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end + end + + evaluate <<-ruby do + def m(*, a: 1) a end + ruby + + m().should == 1 + m(1, 2).should == 1 + m(a: 2).should == 2 + m(1, a: 2).should == 2 + suppress_keyword_warning do + m("a" => 1, a: 2).should == 2 + end + end + + evaluate <<-ruby do + def m(*a, b: 1) [a, b] end + ruby + + m().should == [[], 1] + m(1, 2, 3, b: 4).should == [[1, 2, 3], 4] + suppress_keyword_warning do + m("a" => 1, b: 2).should == [[{"a" => 1}], 2] + end + + a = mock("splat") + a.should_not_receive(:to_ary) + m(*a).should == [[a], 1] + end + + evaluate <<-ruby do + def m(*a, **) a end + ruby + + m().should == [] + m(1, 2, 3, a: 4, b: 5).should == [1, 2, 3] + m("a" => 1, a: 1).should == [] + m(1, **{a: 2}).should == [1] + + h = mock("keyword splat") + h.should_receive(:to_hash) + -> { m(**h) }.should raise_error(TypeError) + end + + evaluate <<-ruby do + def m(*, **k) k end + ruby + + m().should == {} + m(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5} + m("a" => 1, a: 1).should == {"a" => 1, a: 1} + + h = mock("keyword splat") + h.should_receive(:to_hash).and_return({a: 1}) + m(h).should == {} + end + + evaluate <<-ruby do + def m(a = nil, **k) [a, k] end + ruby + + m().should == [nil, {}] + m("a" => 1).should == [nil, {"a" => 1}] + m(a: 1).should == [nil, {a: 1}] + m("a" => 1, a: 1).should == [nil, {"a" => 1, a: 1}] + m({ "a" => 1 }, a: 1).should == [{"a" => 1}, {a: 1}] + ->{m({a: 1}, {})}.should raise_error(ArgumentError) + + h = {"a" => 1, b: 2} + m(h).should == [{"a" => 1, b: 2}, {}] + h.should == {"a" => 1, b: 2} + + h = {"a" => 1} + m(h).first.should == h + + h = {} + r = m(h) + r.first.should == {} + r.last.should == {} + + hh = {} + h = mock("keyword splat empty hash") + h.should_not_receive(:to_hash) + m(h).should == [{}, {}] + + h = mock("keyword splat") + h.should_not_receive(:to_hash) + m(h).should == [{"a" => 1, a: 2}, {}] + end + + evaluate <<-ruby do + def m(*a, **k) [a, k] end + ruby + + m().should == [[], {}] + m(1).should == [[1], {}] + m(a: 1, b: 2).should == [[], {a: 1, b: 2}] + m(1, 2, 3, a: 2).should == [[1, 2, 3], {a: 2}] + + m("a" => 1).should == [[], {"a" => 1}] + m(a: 1).should == [[], {a: 1}] + m("a" => 1, a: 1).should == [[], {"a" => 1, a: 1}] + m({ "a" => 1 }, a: 1).should == [[{"a" => 1}], {a: 1}] + m({a: 1}, {}).should == [[{a: 1}, {}], {}] + m({a: 1}, {"a" => 1}).should == [[{a: 1}, {"a" => 1}], {}] + + bo = BasicObject.new + def bo.to_a; [1, 2, 3]; end + def bo.to_hash; {:b => 2, :c => 3}; end + + m(*bo, **bo).should == [[1, 2, 3], {:b => 2, :c => 3}] + end end evaluate <<-ruby do @@ -1261,9 +1498,7 @@ def m(a:, **k) [a, k] end m(a: 1).should == [1, {}] m(a: 1, b: 2, c: 3).should == [1, {b: 2, c: 3}] - suppress_warning do - m("a" => 1, a: 1, b: 2).should == [1, {"a" => 1, b: 2}] - end + m("a" => 1, a: 1, b: 2).should == [1, {"a" => 1, b: 2}] end end @@ -1361,37 +1596,73 @@ def m(a, b=1, *c, d, e:, f: 2, g:, **k, &l) result.should == [1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l] end - evaluate <<-ruby do - def m(a, b = nil, c = nil, d, e: nil, **f) - [a, b, c, d, e, f] + ruby_version_is ''...'2.8' do + evaluate <<-ruby do + def m(a, b = nil, c = nil, d, e: nil, **f) + [a, b, c, d, e, f] + end + ruby + + result = m(1, 2) + result.should == [1, nil, nil, 2, nil, {}] + + suppress_warning do + result = m(1, 2, {foo: :bar}) + result.should == [1, nil, nil, 2, nil, {foo: :bar}] end - ruby - result = m(1, 2) - result.should == [1, nil, nil, 2, nil, {}] + result = m(1, {foo: :bar}) + result.should == [1, nil, nil, {foo: :bar}, nil, {}] + end + end + + ruby_version_is '2.8' do + evaluate <<-ruby do + def m(a, b = nil, c = nil, d, e: nil, **f) + [a, b, c, d, e, f] + end + ruby + + result = m(1, 2) + result.should == [1, nil, nil, 2, nil, {}] - suppress_warning do result = m(1, 2, {foo: :bar}) - result.should == [1, nil, nil, 2, nil, {foo: :bar}] + result.should == [1, 2, nil, {foo: :bar}, nil, {}] + + result = m(1, {foo: :bar}) + result.should == [1, nil, nil, {foo: :bar}, nil, {}] end + end + end + + ruby_version_is ''...'2.8' do + context "assigns keyword arguments from a passed Hash without modifying it" do + evaluate <<-ruby do + def m(a: nil); a; end + ruby - result = m(1, {foo: :bar}) - result.should == [1, nil, nil, {foo: :bar}, nil, {}] + options = {a: 1}.freeze + -> do + suppress_warning do + m(options).should == 1 + end + end.should_not raise_error + options.should == {a: 1} + end end end - context "assigns keyword arguments from a passed Hash without modifying it" do - evaluate <<-ruby do - def m(a: nil); a; end - ruby + ruby_version_is '2.8' do + context "raises ArgumentError if passing hash as keyword arguments" do + evaluate <<-ruby do + def m(a: nil); a; end + ruby - options = {a: 1}.freeze - -> do - suppress_warning do - m(options).should == 1 - end - end.should_not raise_error - options.should == {a: 1} + options = {a: 1}.freeze + -> do + m(options) + end.should raise_error(ArgumentError) + end end end end diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb index 3556c8c01013ad..cf19c55b571669 100644 --- a/spec/ruby/optional/capi/util_spec.rb +++ b/spec/ruby/optional/capi/util_spec.rb @@ -115,11 +115,22 @@ ScratchPad.recorded.should == [1, nil] end - it "assigns required and Hash arguments with nil Hash" do - suppress_warning do - @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1 + ruby_version_is ''...'2.8' do + it "assigns required and Hash arguments with nil Hash" do + suppress_warning do + @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1 + end + ScratchPad.recorded.should == [1, nil] + end + end + + ruby_version_is '2.8' do + it "rejects the use of nil as a hash" do + -> { + @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1 + }.should raise_error(ArgumentError) + ScratchPad.recorded.should == [] end - ScratchPad.recorded.should == [1, nil] end it "assigns required and optional arguments with no hash argument given" do @@ -133,33 +144,55 @@ ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc] end - # r43934 - it "rejects non-keyword arguments" do - h = {1 => 2, 3 => 4} - -> { - suppress_warning do - @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc) - end - }.should raise_error(ArgumentError) - ScratchPad.recorded.should == [] - end + ruby_version_is ''...'2.8' do + # r43934 + it "rejects non-keyword arguments" do + h = {1 => 2, 3 => 4} + -> { + suppress_warning do + @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc) + end + }.should raise_error(ArgumentError) + ScratchPad.recorded.should == [] + end - it "rejects required and non-keyword arguments" do - h = {1 => 2, 3 => 4} - -> { + it "rejects required and non-keyword arguments" do + h = {1 => 2, 3 => 4} + -> { + suppress_warning do + @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc) + end + }.should raise_error(ArgumentError) + ScratchPad.recorded.should == [] + end + + it "considers the hash as a post argument when there is a splat" do + h = {1 => 2, 3 => 4} suppress_warning do - @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc) + @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 6 end - }.should raise_error(ArgumentError) - ScratchPad.recorded.should == [] + ScratchPad.recorded.should == [1, 2, [3, 4, 5], h, nil, @prc] + end end - it "considers the hash as a post argument when there is a splat" do - h = {1 => 2, 3 => 4} - suppress_warning do - @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 6 + ruby_version_is '2.8' do + it "does not reject non-symbol keys in keyword arguments" do + h = {1 => 2, 3 => 4} + @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc).should == 0 + ScratchPad.recorded.should == [h] + end + + it "does not reject non-symbol keys in keyword arguments with required argument" do + h = {1 => 2, 3 => 4} + @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc).should == 1 + ScratchPad.recorded.should == [1, h] + end + + it "considers keyword arguments with non-symbol keys as keywords when using splat and post arguments" do + h = {1 => 2, 3 => 4} + @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 5 + ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc] end - ScratchPad.recorded.should == [1, 2, [3, 4, 5], h, nil, @prc] end end From 170f4dbb9bf9363c9fd012fc3f4e340ccda43273 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Jan 2020 14:53:25 +0900 Subject: [PATCH 292/878] Fix unused warnings http://ci.rvm.jp/results/trunk_gcc7@silicon-docker/2539622 ``` /tmp/ruby/v2/src/trunk_gcc7/class.c: In function 'rb_scan_args_parse': /tmp/ruby/v2/src/trunk_gcc7/class.c:1971:12: warning: unused variable 'tmp_buffer' [-Wunused-variable] VALUE *tmp_buffer = arg->tmp_buffer; ^~~~~~~~~~ ``` ``` In file included from /tmp/ruby/v2/src/trunk_gcc7/vm_insnhelper.c:1895:0, from /tmp/ruby/v2/src/trunk_gcc7/vm.c:349: /tmp/ruby/v2/src/trunk_gcc7/vm_args.c:212:1: warning: 'args_stored_kw_argv_to_hash' defined but not used [-Wunused-function] args_stored_kw_argv_to_hash(struct args_info *args) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` --- class.c | 1 - vm_args.c | 23 ----------------------- 2 files changed, 24 deletions(-) diff --git a/class.c b/class.c index e42ee0821c8b8a..7db54d6038d88b 100644 --- a/class.c +++ b/class.c @@ -1968,7 +1968,6 @@ static void rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, struct rb_scan_args_t *arg) { const char *p = fmt; - VALUE *tmp_buffer = arg->tmp_buffer; int keyword_given = 0; int last_hash_keyword = 0; diff --git a/vm_args.c b/vm_args.c index 3558d6487f73bf..5bed9711de3152 100644 --- a/vm_args.c +++ b/vm_args.c @@ -208,29 +208,6 @@ args_kw_argv_to_hash(struct args_info *args) return args->argc; } -static void -args_stored_kw_argv_to_hash(struct args_info *args) -{ - int i; - const struct rb_call_info_kw_arg *kw_arg = args->kw_arg; - const VALUE *const passed_keywords = kw_arg->keywords; - const int passed_keyword_len = kw_arg->keyword_len; - VALUE h = rb_hash_new_with_size(passed_keyword_len); - - for (i=0; ikw_argv[i]); - } - args->kw_argv = NULL; - - if (args->rest) { - arg_rest_dup(args); - rb_ary_push(args->rest, h); - } - else { - args->argv[args->argc++] = h; - } -} - static inline void args_setup_lead_parameters(struct args_info *args, int argc, VALUE *locals) { From 0eeed5bcc5530edb0af2af2ccff09d067c59e8f9 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 30 Jul 2019 16:15:19 -0700 Subject: [PATCH 293/878] Make eval(code, binding) use (eval) as __FILE__ and 1 as __LINE__ This removes the warning that was added in 3802fb92ff8c83eed3e867db20f72c53932f542d, and switches the behavior so that the eval does not use the binding's __FILE__ and __LINE__ implicitly. Fixes [Bug #4352] --- parse.y | 24 -------- spec/ruby/core/binding/eval_spec.rb | 85 +++++++++++++++++++-------- spec/ruby/core/kernel/__dir___spec.rb | 16 ++++- spec/ruby/core/kernel/eval_spec.rb | 28 ++++++--- test/ruby/test_eval.rb | 9 ++- test/ruby/test_method.rb | 2 +- vm_eval.c | 6 -- 7 files changed, 103 insertions(+), 67 deletions(-) diff --git a/parse.y b/parse.y index 5f7884b5ae9d1d..75cd097adb41e5 100644 --- a/parse.y +++ b/parse.y @@ -315,7 +315,6 @@ struct parser_params { unsigned int do_loop: 1; unsigned int do_chomp: 1; unsigned int do_split: 1; - unsigned int warn_location: 1; NODE *eval_tree_begin; NODE *eval_tree; @@ -9917,19 +9916,6 @@ past_dvar_p(struct parser_params *p, ID id) } # endif -/* As Ripper#warn does not have arguments for the location, so the - * following messages cannot be separated */ -#define WARN_LOCATION(type) do { \ - if (p->warn_location) { \ - int line; \ - VALUE file = rb_source_location(&line); \ - rb_warn3(type" in eval may not return location in binding;" \ - " use Binding#source_location instead\n" \ - "%"PRIsWARN":%d: warning: in `%"PRIsWARN"'", \ - file, WARN_I(line), rb_id2str(rb_frame_this_func())); \ - } \ -} while (0) - static int numparam_nested_p(struct parser_params *p) { @@ -9963,7 +9949,6 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc) case keyword_false: return NEW_FALSE(loc); case keyword__FILE__: - WARN_LOCATION("__FILE__"); { VALUE file = p->ruby_sourcefile_string; if (NIL_P(file)) @@ -9975,7 +9960,6 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc) } return node; case keyword__LINE__: - WARN_LOCATION("__LINE__"); return NEW_LIT(INT2FIX(p->tokline), loc); case keyword__ENCODING__: node = NEW_LIT(rb_enc_from_encoding(p->enc), loc); @@ -12248,14 +12232,6 @@ rb_parser_set_options(VALUE vparser, int print, int loop, int chomp, int split) p->do_split = split; } -void -rb_parser_warn_location(VALUE vparser, int warn) -{ - struct parser_params *p; - TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p); - p->warn_location = warn; -} - static NODE * parser_append_options(struct parser_params *p, NODE *node) { diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb index fff8c9cf44d507..84096f8a91d2a2 100644 --- a/spec/ruby/core/binding/eval_spec.rb +++ b/spec/ruby/core/binding/eval_spec.rb @@ -23,29 +23,58 @@ bind2.local_variables.should == [] end - it "inherits __LINE__ from the enclosing scope" do - obj = BindingSpecs::Demo.new(1) - bind = obj.get_binding - suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding - end + ruby_version_is ""..."2.8" do + it "inherits __LINE__ from the enclosing scope" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding + end - it "preserves __LINE__ across multiple calls to eval" do - obj = BindingSpecs::Demo.new(1) - bind = obj.get_binding - suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding - suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding - end + it "preserves __LINE__ across multiple calls to eval" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding + end - it "increments __LINE__ on each line of a multiline eval" do - obj = BindingSpecs::Demo.new(1) - bind = obj.get_binding - suppress_warning {bind.eval("#foo\n__LINE__")}.should == obj.get_line_of_binding + 1 + it "increments __LINE__ on each line of a multiline eval" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + suppress_warning {bind.eval("#foo\n__LINE__")}.should == obj.get_line_of_binding + 1 + end + + it "inherits __LINE__ from the enclosing scope even if the Binding is created with #send" do + obj = BindingSpecs::Demo.new(1) + bind, line = obj.get_binding_with_send_and_line + suppress_warning {bind.eval("__LINE__")}.should == line + end end - it "inherits __LINE__ from the enclosing scope even if the Binding is created with #send" do - obj = BindingSpecs::Demo.new(1) - bind, line = obj.get_binding_with_send_and_line - suppress_warning {bind.eval("__LINE__")}.should == line + ruby_version_is "2.8" do + it "starts with line 1 if single argument is given" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + bind.eval("__LINE__").should == 1 + end + + it "preserves __LINE__ across multiple calls to eval" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + bind.eval("__LINE__").should == 1 + bind.eval("__LINE__").should == 1 + end + + it "increments __LINE__ on each line of a multiline eval" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + bind.eval("#foo\n__LINE__").should == 2 + end + + it "starts with line 1 if the Binding is created with #send" do + obj = BindingSpecs::Demo.new(1) + bind, line = obj.get_binding_with_send_and_line + bind.eval("__LINE__").should == 1 + end end it "starts with a __LINE__ of 1 if a filename is passed" do @@ -60,10 +89,20 @@ bind.eval("#foo\n__LINE__", "(test)", 88).should == 89 end - it "inherits __FILE__ from the enclosing scope" do - obj = BindingSpecs::Demo.new(1) - bind = obj.get_binding - suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding + ruby_version_is ""..."2.8" do + it "inherits __FILE__ from the enclosing scope" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding + end + end + + ruby_version_is "2.8" do + it "Uses (eval) as __FILE__ if single argument given" do + obj = BindingSpecs::Demo.new(1) + bind = obj.get_binding + bind.eval("__FILE__").should == '(eval)' + end end it "uses the __FILE__ that is passed in" do diff --git a/spec/ruby/core/kernel/__dir___spec.rb b/spec/ruby/core/kernel/__dir___spec.rb index 3c34277277128f..e2bcc6e65ac258 100644 --- a/spec/ruby/core/kernel/__dir___spec.rb +++ b/spec/ruby/core/kernel/__dir___spec.rb @@ -12,9 +12,19 @@ end end - context "when used in eval with top level binding" do - it "returns the real name of the directory containing the currently-executing file" do - eval("__dir__", binding).should == File.realpath(File.dirname(__FILE__)) + ruby_version_is ""..."2.7" do + context "when used in eval with top level binding" do + it "returns the real name of the directory containing the currently-executing file" do + eval("__dir__", binding).should == File.realpath(File.dirname(__FILE__)) + end + end + end + + ruby_version_is "2.7" do + context "when used in eval with top level binding" do + it "returns nil" do + eval("__dir__", binding).should == nil + end end end end diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb index 340ba23f2a16b5..09ccb9dc62bbf8 100644 --- a/spec/ruby/core/kernel/eval_spec.rb +++ b/spec/ruby/core/kernel/eval_spec.rb @@ -159,13 +159,27 @@ class Object end end - it "uses the filename of the binding if none is provided" do - eval("__FILE__").should == "(eval)" - suppress_warning {eval("__FILE__", binding)}.should == __FILE__ - eval("__FILE__", binding, "success").should == "success" - suppress_warning {eval("eval '__FILE__', binding")}.should == "(eval)" - suppress_warning {eval("eval '__FILE__', binding", binding)}.should == __FILE__ - suppress_warning {eval("eval '__FILE__', binding", binding, 'success')}.should == 'success' + ruby_version_is ""..."2.8" do + it "uses the filename of the binding if none is provided" do + eval("__FILE__").should == "(eval)" + suppress_warning {eval("__FILE__", binding)}.should == __FILE__ + eval("__FILE__", binding, "success").should == "success" + suppress_warning {eval("eval '__FILE__', binding")}.should == "(eval)" + suppress_warning {eval("eval '__FILE__', binding", binding)}.should == __FILE__ + suppress_warning {eval("eval '__FILE__', binding", binding, 'success')}.should == 'success' + end + end + + ruby_version_is "2.8" do + it "uses (eval) filename if none is provided" do + eval("__FILE__").should == "(eval)" + eval("__FILE__", binding).should == "(eval)" + eval("__FILE__", binding, "success").should == "success" + eval("eval '__FILE__', binding").should == "(eval)" + eval("eval '__FILE__', binding", binding).should == "(eval)" + eval("eval '__FILE__', binding", binding, 'success').should == '(eval)' + eval("eval '__FILE__', binding, 'success'", binding).should == 'success' + end end # Found via Rubinius bug github:#149 diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index 3d6116edbc6258..b1cb56217542a1 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -470,9 +470,12 @@ def test_eval_location_fstring end def test_eval_location_binding - assert_warning(/__FILE__ in eval/) do - assert_equal(__FILE__, eval("__FILE__", binding)) - end + assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", nil)) + assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", binding)) + assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", nil, 'foo')) + assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", binding, 'foo')) + assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", nil, 'foo', 2)) + assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", binding, 'foo', 2)) end def test_fstring_instance_eval diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index bb506f1258617f..207be5099b4f5f 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -790,7 +790,7 @@ def test___dir__ assert_instance_of String, __dir__ assert_equal(File.dirname(File.realpath(__FILE__)), __dir__) bug8436 = '[ruby-core:55123] [Bug #8436]' - assert_equal(__dir__, eval("__dir__", binding), bug8436) + assert_equal(__dir__, eval("__dir__", binding, *binding.source_location), bug8436) bug8662 = '[ruby-core:56099] [Bug #8662]' assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662) assert_equal("arbitrary", Object.new.instance_eval("__dir__", "arbitrary/file.rb"), bug8662) diff --git a/vm_eval.c b/vm_eval.c index cbed304e258626..1f5c4cf2bad0cb 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1497,12 +1497,6 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind, if (!NIL_P(fname)) fname = rb_fstring(fname); realpath = fname; } - else if (bind) { - fname = pathobj_path(bind->pathobj); - realpath = pathobj_realpath(bind->pathobj); - line = bind->first_lineno; - rb_parser_warn_location(parser, TRUE); - } else { fname = rb_fstring_lit("(eval)"); } From 04eb7c7e462d1fcbab9efc7022c1b43636ab878a Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 25 Aug 2019 21:11:46 -0700 Subject: [PATCH 294/878] Call initialize_clone with freeze: false if clone called with freeze: false This makes it possible to initialize_clone to correctly not freeze internal state if the freeze: false keyword is passed to clone. If clone is called with freeze: true or no keyword, do not pass a second argument to initialize_clone to keep backwards compatibility. This makes it so that external libraries that override initialize_clone but do not support the freeze keyword will fail with ArgumentError if passing freeze: false to clone. I think that is better than the current behavior, which succeeds but results in an unfrozen object with frozen internals. Fix related issues in set and delegate in stdlib. Fixes [Bug #14266] --- lib/delegate.rb | 4 ++-- lib/set.rb | 4 ++-- object.c | 52 +++++++++++++++++++++++++++++++++------- test/ruby/test_module.rb | 6 +++++ test/ruby/test_object.rb | 22 +++++++++++++++++ test/test_delegate.rb | 15 ++++++++++++ test/test_set.rb | 11 +++++++++ 7 files changed, 102 insertions(+), 12 deletions(-) diff --git a/lib/delegate.rb b/lib/delegate.rb index 8c176dc82c0a23..0bbe211a0553e8 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -211,8 +211,8 @@ def marshal_load(data) end end - def initialize_clone(obj) # :nodoc: - self.__setobj__(obj.__getobj__.clone) + def initialize_clone(obj, freeze: true) # :nodoc: + self.__setobj__(obj.__getobj__.clone(freeze: freeze)) end def initialize_dup(obj) # :nodoc: self.__setobj__(obj.__getobj__.dup) diff --git a/lib/set.rb b/lib/set.rb index e7d1be4f9fc4e4..684115539b32dd 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -137,9 +137,9 @@ def initialize_dup(orig) end # Clone internal hash. - def initialize_clone(orig) + def initialize_clone(orig, freeze: true) super - @hash = orig.instance_variable_get(:@hash).clone + @hash = orig.instance_variable_get(:@hash).clone(freeze: freeze) end def freeze # :nodoc: diff --git a/object.c b/object.c index f02b45af1c4ae4..0080c351a68a3a 100644 --- a/object.c +++ b/object.c @@ -476,11 +476,25 @@ mutable_obj_clone(VALUE obj, int kwfreeze) } init_copy(clone, obj); - rb_funcall(clone, id_init_clone, 1, obj); if (kwfreeze) { + rb_funcall(clone, id_init_clone, 1, obj); RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE; } + else { + static VALUE freeze_false_hash; + VALUE argv[2]; + if (!freeze_false_hash) { + freeze_false_hash = rb_hash_new(); + rb_hash_aset(freeze_false_hash, ID2SYM(rb_intern("freeze")), Qfalse); + rb_obj_freeze(freeze_false_hash); + rb_gc_register_mark_object(freeze_false_hash); + } + + argv[0] = obj; + argv[1] = freeze_false_hash; + rb_funcallv_kw(clone, id_init_clone, 2, argv, RB_PASS_CALLED_KEYWORDS); + } return clone; } @@ -637,10 +651,10 @@ rb_obj_init_copy(VALUE obj, VALUE orig) /*! * :nodoc: *-- - * Default implementation of \c #initialize_dup and \c #initialize_clone + * Default implementation of \c #initialize_dup * * \param[in,out] obj the receiver being initialized - * \param[in] orig the object to be dup or cloned from. + * \param[in] orig the object to be dup from. *++ **/ VALUE @@ -650,6 +664,27 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig) return obj; } +/*! + * :nodoc: + *-- + * Default implementation of \c #initialize_clone + * + * \param[in] The number of arguments + * \param[in] The array of arguments + * \param[in] obj the receiver being initialized + *++ + **/ +static VALUE +rb_obj_init_clone(int argc, VALUE *argv, VALUE obj) +{ + VALUE orig, opts; + rb_scan_args(argc, argv, "1:", &orig, &opts); + /* Ignore a freeze keyword */ + if (argc == 2) (void)freeze_opt(1, &opts); + rb_funcall(obj, id_init_copy, 1, orig); + return obj; +} + /** * call-seq: * obj.to_s -> string @@ -1968,10 +2003,11 @@ rb_mod_initialize(VALUE module) /* :nodoc: */ static VALUE -rb_mod_initialize_clone(VALUE clone, VALUE orig) +rb_mod_initialize_clone(int argc, VALUE* argv, VALUE clone) { - VALUE ret; - ret = rb_obj_init_dup_clone(clone, orig); + VALUE ret, orig, opts; + rb_scan_args(argc, argv, "1:", &orig, &opts); + ret = rb_obj_init_clone(argc, argv, clone); if (OBJ_FROZEN(orig)) rb_class_name(clone); return ret; @@ -4579,7 +4615,7 @@ InitVM_Object(void) rb_define_method(rb_mKernel, "then", rb_obj_yield_self, 0); rb_define_method(rb_mKernel, "initialize_copy", rb_obj_init_copy, 1); rb_define_method(rb_mKernel, "initialize_dup", rb_obj_init_dup_clone, 1); - rb_define_method(rb_mKernel, "initialize_clone", rb_obj_init_dup_clone, 1); + rb_define_method(rb_mKernel, "initialize_clone", rb_obj_init_clone, -1); rb_define_method(rb_mKernel, "taint", rb_obj_taint, 0); rb_define_method(rb_mKernel, "tainted?", rb_obj_tainted, 0); @@ -4666,7 +4702,7 @@ InitVM_Object(void) rb_define_alloc_func(rb_cModule, rb_module_s_alloc); rb_define_method(rb_cModule, "initialize", rb_mod_initialize, 0); - rb_define_method(rb_cModule, "initialize_clone", rb_mod_initialize_clone, 1); + rb_define_method(rb_cModule, "initialize_clone", rb_mod_initialize_clone, -1); rb_define_method(rb_cModule, "instance_methods", rb_class_instance_methods, -1); /* in class.c */ rb_define_method(rb_cModule, "public_instance_methods", rb_class_public_instance_methods, -1); /* in class.c */ diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 2e7e5804d0e74e..9373c48a9a41be 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -2491,6 +2491,12 @@ def test_constant_access_from_method_in_cloned_module assert_equal :M2, CloneTestC2.new.foo, '[Bug #15877]' end + def test_clone_freeze + m = Module.new.freeze + assert_predicate m.clone, :frozen? + assert_not_predicate m.clone(freeze: false), :frozen? + end + private def assert_top_method_is_private(method) diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index add5b9fb15e3f7..bfc7d7de1df93a 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -75,6 +75,28 @@ def d.e; 3; end assert_raise_with_message(ArgumentError, /\u{1f4a9}/) do Object.new.clone(freeze: x) end + + c = Class.new do + attr_reader :f + end + o = c.new + f = true + def o.initialize_clone(_, freeze: true) + @f = freeze + super + end + clone = o.clone + assert_kind_of c, clone + assert_equal true, clone.f + clone = o.clone(freeze: false) + assert_kind_of c, clone + assert_equal false, clone.f + + def o.initialize_clone(_) + super + end + assert_kind_of c, o.clone + assert_raise(ArgumentError) { o.clone(freeze: false) } end def test_init_dupclone diff --git a/test/test_delegate.rb b/test/test_delegate.rb index 303cd16897a63f..80bf41638ac7cc 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -50,6 +50,21 @@ def test_simpledelegator_class assert_equal(SimpleDelegator,simple.clone.class) end + def test_simpledelegator_clone + simple=SimpleDelegator.new([]) + simple.freeze + + clone = simple.clone + assert_predicate clone, :frozen? + assert_predicate clone.__getobj__, :frozen? + assert_equal true, Kernel.instance_method(:frozen?).bind(clone).call + + clone = simple.clone(freeze: false) + assert_not_predicate clone, :frozen? + assert_not_predicate clone.__getobj__, :frozen? + assert_equal false, Kernel.instance_method(:frozen?).bind(clone).call + end + class Object def m :o diff --git a/test/test_set.rb b/test/test_set.rb index b0f669ce869a20..68ee7ce8a36171 100644 --- a/test/test_set.rb +++ b/test/test_set.rb @@ -730,6 +730,17 @@ def test_freeze_clone } end + def test_freeze_clone_false + set1 = Set[1,2,3] + set1.freeze + set2 = set1.clone(freeze: false) + + assert_not_predicate set2, :frozen? + set2.add 5 + assert_equal Set[1,2,3,5], set2 + assert_equal Set[1,2,3], set1 + end + def test_inspect set1 = Set[1, 2] assert_equal('#', set1.inspect) From b594005c72f6ef3c84bc3699b30c6372cc7f9362 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 4 Jan 2020 13:13:37 +0900 Subject: [PATCH 295/878] * 2020-01-04 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1f1c64b6a98639..67cb2a88ea2773 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" From ce4d167778fa8c5c2aad8af560b4ec9fdf4aea29 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 5 Jan 2020 00:52:43 +0900 Subject: [PATCH 296/878] Fix output of example [ci skip] --- trace_point.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace_point.rb b/trace_point.rb index a8c46a0a0e70de..d6fc3f713be56e 100644 --- a/trace_point.rb +++ b/trace_point.rb @@ -183,7 +183,7 @@ def self.trace(*events) # t.enable(target: method(:m1)) # # m1 - # # prints # + # # prints # # m2 # # prints nothing # From ded072c2b7a6e95418fb3c70ccf8395ddd5aa83f Mon Sep 17 00:00:00 2001 From: git Date: Sun, 5 Jan 2020 00:53:22 +0900 Subject: [PATCH 297/878] * 2020-01-05 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 67cb2a88ea2773..4c88295e3ce932 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" From 9b928fa4437139147602bc62b3aaabdc87f7ff0b Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Fri, 27 Dec 2019 13:41:22 +0900 Subject: [PATCH 298/878] [ruby/reline] Sort completion list #### Legacy mode: ```console $ irb --legacy irb(main):001:0> l[TAB][TAB] lambda load local_variables loop ``` #### Before this patch: ```console $ irb irb(main):001:0> l[TAB][TAB] local_variables loop lambda load ``` #### After this patch: ```console $ irb irb(main):001:0> l[TAB][TAB] lambda load local_variables loop ``` https://github.com/ruby/reline/commit/6074069c7d --- lib/reline/line_editor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 3f6d7817dbc926..b46eddf31a1fc6 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -317,7 +317,7 @@ def rerender if @menu_info scroll_down(@highest_in_all - @first_line_started_from) @rerender_all = true - @menu_info.list.each do |item| + @menu_info.list.sort!.each do |item| Reline::IOGate.move_cursor_column(0) @output.print item @output.flush From c7f01d889becbeffc4254e1b0b7faecb80ea3f3e Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 5 Jan 2020 11:33:40 +0900 Subject: [PATCH 299/878] include/ruby/ruby.h: remove last_idx that is no longer variable Due to beae6cbf0fd8b6619e5212552de98022d4c4d4d4, the variable last_idx is no longer changed and always -1. This change simplifies the code by removing the variable. Coverity Scan pointed out this. --- include/ruby/ruby.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index d81c72e95b2072..56e293b0109c54 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2517,7 +2517,7 @@ rb_scan_args_set(int argc, const VALUE *argv, __attribute__((diagnose_if(rb_scan_args_count(fmt)!=varc,"variable argument length doesn't match","error"))) # endif { - int i, argi = 0, vari = 0, last_idx = -1; + int i, argi = 0, vari = 0; VALUE *var, hash = Qnil, last_hash = 0; const int n_mand = n_lead + n_trail; VALUE tmp_buffer = 0; @@ -2534,14 +2534,14 @@ rb_scan_args_set(int argc, const VALUE *argv, /* capture leading mandatory arguments */ for (i = n_lead; i-- > 0; ) { var = vars[vari++]; - if (var) *var = (argi == last_idx) ? last_hash : argv[argi]; + if (var) *var = argv[argi]; argi++; } /* capture optional arguments */ for (i = n_opt; i-- > 0; ) { var = vars[vari++]; if (argi < argc - n_trail) { - if (var) *var = (argi == last_idx) ? last_hash : argv[argi]; + if (var) *var = argv[argi]; argi++; } else { @@ -2555,7 +2555,7 @@ rb_scan_args_set(int argc, const VALUE *argv, var = vars[vari++]; if (0 < n_var) { if (var) { - int f_last = (last_idx + 1 == argc - n_trail); + int f_last = (argc == n_trail); *var = rb_ary_new4(n_var-f_last, &argv[argi]); if (f_last) rb_ary_push(*var, last_hash); } @@ -2568,7 +2568,7 @@ rb_scan_args_set(int argc, const VALUE *argv, /* capture trailing mandatory arguments */ for (i = n_trail; i-- > 0; ) { var = vars[vari++]; - if (var) *var = (argi == last_idx) ? last_hash : argv[argi]; + if (var) *var = argv[argi]; argi++; } /* capture an option hash - phase 2: assignment */ From 44a164c26f5371519636585d8ba7aa59f489442e Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 5 Jan 2020 11:36:10 +0900 Subject: [PATCH 300/878] include/ruby/ruby.h: remove a variable tmp_buffer as it does not change It is no longer used due to beae6cbf0fd8b6619e5212552de98022d4c4d4d4. Coverity Scan found this. --- include/ruby/ruby.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 56e293b0109c54..625636fcdcb3f3 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2520,7 +2520,6 @@ rb_scan_args_set(int argc, const VALUE *argv, int i, argi = 0, vari = 0; VALUE *var, hash = Qnil, last_hash = 0; const int n_mand = n_lead + n_trail; - VALUE tmp_buffer = 0; if (f_hash && argc > 0 && rb_keyword_given_p()) { hash = rb_hash_dup(argv[argc - 1]); @@ -2589,11 +2588,9 @@ rb_scan_args_set(int argc, const VALUE *argv, if (argi < argc) { argc_error: - if (tmp_buffer) rb_free_tmp_buffer(&tmp_buffer); rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt); } - if (tmp_buffer) rb_free_tmp_buffer(&tmp_buffer); return argc; } #endif From 5b0c3754d8578564e12df7182fff4a36b0a29938 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 5 Jan 2020 11:37:40 +0900 Subject: [PATCH 301/878] parse.y: fix a wrong sizeof argument for ruby_sized_xfree --- parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse.y b/parse.y index 75cd097adb41e5..d1d25694408f5d 100644 --- a/parse.y +++ b/parse.y @@ -5854,7 +5854,7 @@ vtable_free_gen(struct parser_params *p, int line, const char *name, if (tbl->tbl) { ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID)); } - ruby_sized_xfree(tbl, sizeof(tbl)); + ruby_sized_xfree(tbl, sizeof(*tbl)); } } #define vtable_free(tbl) vtable_free_gen(p, __LINE__, #tbl, tbl) From 787c6d591aa0a170d5f5b714df7aea6de6c5f0a2 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 5 Jan 2020 11:52:39 +0900 Subject: [PATCH 302/878] Remove unused last_idx in class.c ref c7f01d889becbeffc4254e1b0b7faecb80ea3f3e and beae6cbf0fd8b6619e5212552de98022d4c4d4d4 --- class.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/class.c b/class.c index 7db54d6038d88b..cda43dec0eb794 100644 --- a/class.c +++ b/class.c @@ -1958,7 +1958,6 @@ struct rb_scan_args_t { int n_trail; int n_mand; int argi; - int last_idx; VALUE hash; VALUE last_hash; VALUE *tmp_buffer; @@ -1972,7 +1971,6 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st int last_hash_keyword = 0; memset(arg, 0, sizeof(*arg)); - arg->last_idx = -1; arg->hash = Qnil; switch (kw_flag) { @@ -2043,14 +2041,14 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) /* capture leading mandatory arguments */ for (i = arg->n_lead; i-- > 0; ) { var = va_arg(vargs, VALUE *); - if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi]; + if (var) *var = arg->argv[argi]; argi++; } /* capture optional arguments */ for (i = arg->n_opt; i-- > 0; ) { var = va_arg(vargs, VALUE *); if (argi < arg->argc - arg->n_trail) { - if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi]; + if (var) *var = arg->argv[argi]; argi++; } else { @@ -2064,7 +2062,7 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) var = va_arg(vargs, VALUE *); if (0 < n_var) { if (var) { - int f_last = (arg->last_idx + 1 == arg->argc - arg->n_trail); + int f_last = (arg->argc == arg->n_trail); *var = rb_ary_new4(n_var - f_last, &arg->argv[argi]); if (f_last) rb_ary_push(*var, arg->last_hash); } @@ -2077,7 +2075,7 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) /* capture trailing mandatory arguments */ for (i = arg->n_trail; i-- > 0; ) { var = va_arg(vargs, VALUE *); - if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi]; + if (var) *var = arg->argv[argi]; argi++; } /* capture an option hash - phase 2: assignment */ From c7af1e432aed4c4586dd1e62b0431c14fa44289d Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 5 Jan 2020 12:25:24 +0900 Subject: [PATCH 303/878] Remove unused tmp_buffer in class.c ref 44a164c26f5371519636585d8ba7aa59f489442e and beae6cbf0fd8b6619e5212552de98022d4c4d4d4 --- class.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/class.c b/class.c index cda43dec0eb794..66c149b6bf77bc 100644 --- a/class.c +++ b/class.c @@ -1960,7 +1960,6 @@ struct rb_scan_args_t { int argi; VALUE hash; VALUE last_hash; - VALUE *tmp_buffer; }; static void @@ -2105,16 +2104,11 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) { int error; va_list vargs; - VALUE tmp_buffer = 0; struct rb_scan_args_t arg; - arg.tmp_buffer = &tmp_buffer; rb_scan_args_parse(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, argc, argv, fmt, &arg); va_start(vargs,fmt); error = rb_scan_args_assign(&arg, vargs); va_end(vargs); - if (tmp_buffer) { - rb_free_tmp_buffer(&tmp_buffer); - } if (error) { rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); } @@ -2126,16 +2120,11 @@ rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...) { int error; va_list vargs; - VALUE tmp_buffer = 0; struct rb_scan_args_t arg; - arg.tmp_buffer = &tmp_buffer; rb_scan_args_parse(kw_flag, argc, argv, fmt, &arg); va_start(vargs,fmt); error = rb_scan_args_assign(&arg, vargs); va_end(vargs); - if (tmp_buffer) { - rb_free_tmp_buffer(&tmp_buffer); - } if (error) { rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); } From 54fd50c951d7bee259bcbc491bf223fb992d12c9 Mon Sep 17 00:00:00 2001 From: zverok Date: Fri, 3 Jan 2020 00:02:26 +0200 Subject: [PATCH 304/878] Fix OpenStructDocumentation In https://github.com/ruby/ruby/commit/9be3295d53b6fd9f8a3ad8157aa0655b1976d8ac, OpenStruct's documentation stopped to be rendered by RDoc (there should be no additional code between documentation comment and documented class). Fixing this. --- lib/ostruct.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ostruct.rb b/lib/ostruct.rb index c40c897ff6ce3f..a151fc0bed13e1 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -9,6 +9,8 @@ # See OpenStruct for an example. # +require_relative 'ostruct/version' + # # An OpenStruct is a data structure, similar to a Hash, that allows the # definition of arbitrary attributes with their accompanying values. This is @@ -72,9 +74,6 @@ # the objects that are created, as there is much more overhead in the setting # of these properties compared to using a Hash or a Struct. # - -require_relative 'ostruct/version' - class OpenStruct # From da028a4fbf879144a09192c5cc4a0020c69048e0 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 5 Jan 2020 22:46:35 +0900 Subject: [PATCH 305/878] Rescue EOFError If C-d is pressed before IRB is ready, IRB crashes because EOFError occurs. --- lib/reline/ansi.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 27157f0db9f47e..cd780c61893d9b 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -41,12 +41,15 @@ def self.ungetc(c) end def self.retrieve_keybuffer + begin result = select([@@input], [], [], 0.001) return if result.nil? str = @@input.read_nonblock(1024) str.bytes.each do |c| @@buf.push(c) end + rescue EOFError + end end def self.get_screen_size From 439e1ccd088a2b8d7b965a46db0212db24b40fc4 Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 6 Jan 2020 01:20:24 +0900 Subject: [PATCH 306/878] Complete indented and quoted string correctly def foo ''.upca[TAB] This will be completed to be: def foo ''.upcase The indent was gone. This commit fixes the bug. --- lib/reline/line_editor.rb | 8 ++++-- test/reline/test_key_actor_emacs.rb | 41 +++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index b46eddf31a1fc6..475f76fd652792 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -905,7 +905,6 @@ def retrieve_completion_block(set_completion_quote_character = false) quote = nil i += 1 rest = nil - break_pointer = nil elsif quote and slice.start_with?(escaped_quote) # skip i += 2 @@ -915,7 +914,7 @@ def retrieve_completion_block(set_completion_quote_character = false) closing_quote = /(?!\\)#{Regexp.escape(quote)}/ escaped_quote = /\\#{Regexp.escape(quote)}/ i += 1 - break_pointer = i + break_pointer = i - 1 elsif not quote and slice =~ word_break_regexp rest = $' i += 1 @@ -937,6 +936,11 @@ def retrieve_completion_block(set_completion_quote_character = false) end else preposing = '' + if break_pointer + preposing = @line.byteslice(0, break_pointer) + else + preposing = '' + end target = before end [preposing.encode(@encoding), target.encode(@encoding), postposing.encode(@encoding)] diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 120f51453e2403..6de448fa03db0c 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -1325,6 +1325,37 @@ def test_completion assert_line('foo_ba') end + def test_completion_with_indent + @line_editor.completion_proc = proc { |word| + %w{ + foo_foo + foo_bar + foo_baz + qux + }.map { |i| + i.encode(@encoding) + } + } + input_keys(' fo') + assert_byte_pointer_size(' fo') + assert_cursor(4) + assert_cursor_max(4) + assert_line(' fo') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' foo_') + assert_cursor(6) + assert_cursor_max(6) + assert_line(' foo_') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' foo_') + assert_cursor(6) + assert_cursor_max(6) + assert_line(' foo_') + assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list) + end + def test_completion_with_indent_and_completer_quote_characters @line_editor.completion_proc = proc { |word| %w{ @@ -1336,11 +1367,11 @@ def test_completion_with_indent_and_completer_quote_characters i.encode(@encoding) } } - input_keys(' "".foo_') - assert_byte_pointer_size(' "".foo_') - assert_cursor(9) - assert_cursor_max(9) - assert_line(' "".foo_') + input_keys(' "".fo') + assert_byte_pointer_size(' "".fo') + assert_cursor(7) + assert_cursor_max(7) + assert_line(' "".fo') assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) input_keys("\C-i", false) assert_byte_pointer_size(' "".foo_') From 46845d03c20bf7d157a040762f33a8d2fb2c3de8 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 6 Jan 2020 01:24:34 +0900 Subject: [PATCH 307/878] * 2020-01-06 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 4c88295e3ce932..becce4d991b9dd 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" From ce072fe5689184cba5e4a86968367c525cb22a72 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 6 Jan 2020 11:36:51 +0900 Subject: [PATCH 308/878] script_compiled event on compile error. script_compiled event for TracePoint should not be invoked on compile error (SyntaxError) because it is not "compiled". [Bug #16459] --- test/ruby/test_settracefunc.rb | 9 +++++++++ vm_eval.c | 14 ++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 316e14e1efee34..ada7b7596aa7cb 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -2188,10 +2188,19 @@ def test_script_compiled [__FILE__+"/instance_eval", eval_script], [__FILE__+"/class_eval", eval_script], ], events + events.clear + tp.enable{ + begin + eval('a=') + rescue SyntaxError + end + } + assert_equal [], events, 'script_compiled event should not be invoked on compile error' skip "TODO: test for requires" + events.clear tp.enable{ require '' require_relative '' diff --git a/vm_eval.c b/vm_eval.c index 1f5c4cf2bad0cb..85c317d3ee0b1f 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1486,7 +1486,7 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind, const VALUE parser = rb_parser_new(); const rb_iseq_t *const parent = vm_block_iseq(base_block); VALUE realpath = Qnil; - rb_iseq_t *iseq = 0; + rb_iseq_t *iseq = NULL; rb_ast_t *ast; if (!fname) { @@ -1511,12 +1511,14 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind, } rb_ast_dispose(ast); - if (0 && iseq) { /* for debug */ - VALUE disasm = rb_iseq_disasm(iseq); - printf("%s\n", StringValuePtr(disasm)); - } + if (iseq != NULL) { + if (0 && iseq) { /* for debug */ + VALUE disasm = rb_iseq_disasm(iseq); + printf("%s\n", StringValuePtr(disasm)); + } - rb_exec_event_hook_script_compiled(GET_EC(), iseq, src); + rb_exec_event_hook_script_compiled(GET_EC(), iseq, src); + } return iseq; } From 33d866558b4792d877e7735d2239b1337d334c6c Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 6 Jan 2020 15:06:03 +0900 Subject: [PATCH 309/878] support RUBY_ON_BUG envval on assert failure. Check RUBY_ON_BUG env val also on rb_assert_failure(). --- error.c | 11 ----------- vm_dump.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/error.c b/error.c index fd6c8fed194c9c..1690658b8c3a0b 100644 --- a/error.c +++ b/error.c @@ -580,17 +580,6 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args) snprintf(buf, sizeof(buf), "\n%s\n\n", ruby_description); fputs(buf, out); preface_dump(out); - -#if RUBY_DEVEL - const char *cmd = getenv("RUBY_ON_BUG"); - if (cmd) { - snprintf(buf, sizeof(buf), "%s %"PRI_PIDT_PREFIX"d", cmd, getpid()); - int r = system(buf); - if (r == -1) { - snprintf(buf, sizeof(buf), "Launching RUBY_ON_BUG command failed."); - } - } -#endif } #define bug_report_begin(out, fmt) do { \ diff --git a/vm_dump.c b/vm_dump.c index 4bc41f21318d22..64a210543cccaf 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -925,6 +925,18 @@ rb_dump_machine_register(const ucontext_t *ctx) void rb_vm_bugreport(const void *ctx) { +#if RUBY_DEVEL + const char *cmd = getenv("RUBY_ON_BUG"); + if (cmd) { + char buf[0x100]; + snprintf(buf, sizeof(buf), "%s %"PRI_PIDT_PREFIX"d", cmd, getpid()); + int r = system(buf); + if (r == -1) { + snprintf(buf, sizeof(buf), "Launching RUBY_ON_BUG command failed."); + } + } +#endif + #ifdef __linux__ # define PROC_MAPS_NAME "/proc/self/maps" #endif From 1658e6b5db0380c39d2423281e10acc5b6c6a8bd Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 25 Aug 2019 17:21:02 -0700 Subject: [PATCH 310/878] [flori/json] Remove invalid JSON.generate description from JSON module rdoc This text used to be true in older versions of json, but has not been true for a number of years (since json version 2 I think). https://github.com/flori/json/commit/373b633f38 --- ext/json/lib/json.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index b5a69124152aba..947ac630ad9bad 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -44,14 +44,6 @@ # require 'json' # puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}" # -# JSON.generate only allows objects or arrays to be converted -# to JSON syntax. to_json, however, accepts many Ruby classes -# even though it acts only as a method for serialization: -# -# require 'json' -# -# 1.to_json => "1" -# module JSON require 'json/version' From 2e5ef30cb9f56e5a7a8139e0f1d75bbcf5ee8362 Mon Sep 17 00:00:00 2001 From: zverok Date: Thu, 8 Mar 2018 17:32:36 +0200 Subject: [PATCH 311/878] [flori/json] Enchance generic JSON and #generate docs https://github.com/flori/json/commit/4ede0a7d19 --- ext/json/lib/json.rb | 50 +++++++++++++++++++++++++++++++++---- ext/json/lib/json/common.rb | 29 +++++++++++---------- 2 files changed, 61 insertions(+), 18 deletions(-) diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index 947ac630ad9bad..ec9b571be2dfdc 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -9,8 +9,11 @@ # JSON is completely language agnostic, making it the ideal interchange format. # # Built on two universally available structures: -# 1. A collection of name/value pairs. Often referred to as an _object_, hash table, record, struct, keyed list, or associative array. -# 2. An ordered list of values. More commonly called an _array_, vector, sequence or list. +# +# 1. A collection of name/value pairs. Often referred to as an _object_, hash table, +# record, struct, keyed list, or associative array. +# 2. An ordered list of values. More commonly called an _array_, vector, sequence or +# list. # # To read more about JSON visit: http://json.org # @@ -22,7 +25,7 @@ # require 'json' # # my_hash = JSON.parse('{"hello": "goodbye"}') -# puts my_hash["hello"] => "goodbye" +# puts my_hash["hello"] # => "goodbye" # # Notice the extra quotes '' around the hash notation. Ruby expects # the argument to be a string and can't convert objects like a hash or array. @@ -37,13 +40,50 @@ # require 'json' # # my_hash = {:hello => "goodbye"} -# puts JSON.generate(my_hash) => "{\"hello\":\"goodbye\"}" +# puts JSON.generate(my_hash) # => "{\"hello\":\"goodbye\"}" # # Or an alternative way: # # require 'json' -# puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}" +# puts {:hello => "goodbye"}.to_json # => "{\"hello\":\"goodbye\"}" +# +# JSON.generate only allows objects or arrays to be converted +# to JSON syntax. to_json, however, accepts many Ruby classes +# even though it acts only as a method for serialization: +# +# require 'json' # +# 1.to_json => "1" +# +# The {#generate}[rdoc-ref:JSON#generate] method accepts a variety of options +# to set the formatting of string output and defining what input is accepteable. +# There are also shortcut methods pretty_generate (with a set of options to +# generate human-readable multiline JSON) and fast_generate (with a set of +# options to generate JSON faster at the price of disabling some checks). +# +# == Extended rendering and loading of Ruby objects +# +# JSON library provides optional _additions_ allowing to serialize and +# deserialize Ruby classes without loosing their type. +# +# # without additions +# require "json" +# json = JSON.generate({range: 1..3, regex: /test/}) +# # => '{"range":"1..3","regex":"(?-mix:test)"}' +# JSON.parse(json) +# # => {"range"=>"1..3", "regex"=>"(?-mix:test)"} +# +# # with additions +# require "json/add/range" +# require "json/add/regexp" +# json = JSON.generate({range: 1..3, regex: /test/}) +# # => '{"range":{"json_class":"Range","a":[1,3,false]},"regex":{"json_class":"Regexp","o":0,"s":"test"}}' +# JSON.parse(json) +# # => {"range"=>{"json_class"=>"Range", "a"=>[1, 3, false]}, "regex"=>{"json_class"=>"Regexp", "o"=>0, "s"=>"test"}} +# JSON.load(json) +# # => {"range"=>1..3, "regex"=>/test/} +# +# See JSON.load for details. module JSON require 'json/version' diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index 3be9fd8dc55b1b..5ba8f1d298da3f 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -180,27 +180,30 @@ def parse!(source, opts = {}) end # Generate a JSON document from the Ruby data structure _obj_ and return - # it. _state_ is * a JSON::State object, - # * or a Hash like object (responding to to_hash), - # * an object convertible into a hash by a to_h method, - # that is used as or to configure a State object. + # it. _opts_ is + # * a Hash like object (responding to +to_hash+), + # * or an object convertible into a hash by a +to_h+ method, + # * or a JSON::State object. # - # It defaults to a state object, that creates the shortest possible JSON text - # in one line, checks for circular data structures and doesn't allow NaN, + # If hash-alike or hash-convertible object is provided, it is internally + # converted into a State object. + # + # The default options are set to create the shortest possible JSON text + # in one line, check for circular data structures and do not allow NaN, # Infinity, and -Infinity. # - # A _state_ hash can have the following keys: - # * *indent*: a string used to indent levels (default: ''), - # * *space*: a string that is put after, a : or , delimiter (default: ''), - # * *space_before*: a string that is put before a : pair delimiter (default: ''), - # * *object_nl*: a string that is put at the end of a JSON object (default: ''), - # * *array_nl*: a string that is put at the end of a JSON array (default: ''), + # An _opts_ hash can have the following keys: + # * *indent*: a string used to indent levels (default: ''), + # * *space*: a string that is put after a : pair delimiter (default: ''), + # * *space_before*: a string that is put before a : pair delimiter (default: ''), + # * *object_nl*: a string that is put at the end of a JSON object (default: ''), + # * *array_nl*: a string that is put at the end of a JSON array (default: ''), # * *allow_nan*: true if NaN, Infinity, and -Infinity should be # generated, otherwise an exception is thrown if these values are # encountered. This options defaults to false. # * *max_nesting*: The maximum depth of nesting allowed in the data # structures from which JSON is to be generated. Disable depth checking - # with :max_nesting => false, it defaults to 100. + # with max_nesting: false, it defaults to 100. # # See also the fast_generate for the fastest creation method with the least # amount of sanity checks, and the pretty_generate method for some From 41ef6df8c93039aa1cd4a37e380a13cbfbc4d62f Mon Sep 17 00:00:00 2001 From: zverok Date: Sun, 29 Dec 2019 22:55:23 +0200 Subject: [PATCH 312/878] [flori/json] Fix examples syntax https://github.com/flori/json/commit/3845491d92 --- ext/json/lib/json.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index ec9b571be2dfdc..151d9c2f26ffd2 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -45,7 +45,7 @@ # Or an alternative way: # # require 'json' -# puts {:hello => "goodbye"}.to_json # => "{\"hello\":\"goodbye\"}" +# puts({:hello => "goodbye"}.to_json) # => "{\"hello\":\"goodbye\"}" # # JSON.generate only allows objects or arrays to be converted # to JSON syntax. to_json, however, accepts many Ruby classes @@ -53,7 +53,7 @@ # # require 'json' # -# 1.to_json => "1" +# 1.to_json # => "1" # # The {#generate}[rdoc-ref:JSON#generate] method accepts a variety of options # to set the formatting of string output and defining what input is accepteable. From 7f1e3a7b7ceb6e5bdfee13da50588d855156b7e0 Mon Sep 17 00:00:00 2001 From: zverok Date: Thu, 8 Mar 2018 20:32:00 +0200 Subject: [PATCH 313/878] [flori/json] Add :nodoc: for GeneratorMethods https://github.com/flori/json/commit/2f3f44c180 --- ext/json/generator/generator.c | 70 ++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index 881435e3dc3be0..ae60c4f467c088 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -328,6 +328,76 @@ static char *fstrndup(const char *ptr, unsigned long len) { * */ +/* Explanation of the following: that's the only way to not pollute + * standard library's docs with GeneratorMethods:: which + * are uninformative and take a large place in a list of classes + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Array + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Bignum + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::FalseClass + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Fixnum + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Float + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Hash + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Integer + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::NilClass + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::Object + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::String + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::String::Extend + * :nodoc: + */ + +/* + * Document-module: JSON::Ext::Generator::GeneratorMethods::TrueClass + * :nodoc: + */ + /* * call-seq: to_json(state = nil) * From 8cd292f5195be094d67096174e688504897663b7 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 Jan 2020 01:42:30 -0800 Subject: [PATCH 314/878] Directly refer to GitHub events instead of unnecessarily defining env vars --- .github/workflows/macos.yml | 8 ++------ .github/workflows/mingw.yml | 7 +++---- .github/workflows/mjit.yml | 8 ++------ .github/workflows/ubuntu.yml | 8 ++------ 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 39d0391b7f001b..f68a448644b405 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,12 +27,8 @@ jobs: if: github.event_name == 'push' - name: Checkout a pull request run: | - git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src - git -C src reset --hard "$GITHUB_REV" - env: - GITHUB_REV: ${{ github.event.pull_request.head.sha }} - GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }} - GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }} + git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src + git -C src reset --hard ${{ github.event.pull_request.head.sha }} if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh id: commit_info diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 9615c0007d1f26..af48f85fb976b4 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -42,11 +42,10 @@ jobs: git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - # It's hard to propagate `env` to this workflow's shell environment to checkout PR. Using unstable actions/checkout as a workaround. - name: Checkout a pull request - uses: actions/checkout@v2 - with: - path: src + run: | + git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src + git -C src reset --hard ${{ github.event.pull_request.head.sha }} if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh shell: bash diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 105639ef3978fc..879b0c0cc74e51 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -29,12 +29,8 @@ jobs: if: github.event_name == 'push' - name: Checkout a pull request run: | - git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src - git -C src reset --hard "$GITHUB_REV" - env: - GITHUB_REV: ${{ github.event.pull_request.head.sha }} - GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }} - GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }} + git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src + git -C src reset --hard ${{ github.event.pull_request.head.sha }} if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh id: commit_info diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7669038f701d31..fbb23d11ee027d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -60,12 +60,8 @@ jobs: if: github.event_name == 'push' - name: Checkout a pull request run: | - git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src - git -C src reset --hard "$GITHUB_REV" - env: - GITHUB_REV: ${{ github.event.pull_request.head.sha }} - GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }} - GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }} + git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src + git -C src reset --hard ${{ github.event.pull_request.head.sha }} if: github.event_name == 'pull_request' - run: ./src/tool/actions-commit-info.sh id: commit_info From e3aca289708845771052b698dac35e31c0254452 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 Jan 2020 01:45:47 -0800 Subject: [PATCH 315/878] Support running Actions on a fork Since 8c9450e7b875db846b19cc631af0d7fee66db5c6, we increased the chance to run GitHub Actions on a fork, as we usually use a topic branch instead of master when filing a pull request. This patch makes it possible to reuse the same GitHub Actions config on a fork repository. --- .github/workflows/cygwin.yml | 4 ++-- .github/workflows/macos.yml | 4 ++-- .github/workflows/mingw.yml | 4 ++-- .github/workflows/mjit.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index c7ea92bb40be12..59b70f76936330 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -42,9 +42,9 @@ jobs: run: | echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} if: github.event_name == 'push' shell: cmd diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f68a448644b405..ec2e631c733e00 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -20,9 +20,9 @@ jobs: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off sudo /usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index af48f85fb976b4..51e258c8485cf0 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -37,9 +37,9 @@ jobs: git config --system core.autocrlf false git config --system core.eol lf # Not using official actions/checkout@v2 because it's unstable. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 879b0c0cc74e51..2b923cfd05f7cb 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -22,9 +22,9 @@ jobs: sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index fbb23d11ee027d..65a140c1868248 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -53,9 +53,9 @@ jobs: sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cf4a4f6e12e465..357b3cfc7a3af9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,9 +38,9 @@ jobs: run: | choco install --no-progress openssl winflexbison3 # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby/ruby + - name: Checkout push to ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src + git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} if: github.event_name == 'push' - name: Checkout a pull request From e44e3716d01993b4f83af212ab33dce94f4207c9 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 Jan 2020 01:52:19 -0800 Subject: [PATCH 316/878] Slightly change the job wording [ci skip] mame-san said it's weird --- .github/workflows/cygwin.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 59b70f76936330..0918ddbb22b204 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -42,7 +42,7 @@ jobs: run: | echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ec2e631c733e00..5cbcd445aa2371 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -20,7 +20,7 @@ jobs: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off sudo /usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 51e258c8485cf0..61b607c90cd87b 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -37,7 +37,7 @@ jobs: git config --system core.autocrlf false git config --system core.eol lf # Not using official actions/checkout@v2 because it's unstable. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 2b923cfd05f7cb..540dbb7354f0d9 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -22,7 +22,7 @@ jobs: sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 65a140c1868248..66d7065d631bd7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -53,7 +53,7 @@ jobs: sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 357b3cfc7a3af9..3a4de2324502d8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,7 +38,7 @@ jobs: run: | choco install --no-progress openssl winflexbison3 # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout push to ruby + - name: Checkout ruby run: | git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} From 7392083c2ffa2dc5449ec0aa529f4a792fb1d2b4 Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 6 Jan 2020 21:50:48 +0900 Subject: [PATCH 317/878] Support history-size in .inputrc correctly --- lib/reline/config.rb | 8 +++++--- test/reline/test_config.rb | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/reline/config.rb b/lib/reline/config.rb index fdc2b39c1b68ea..61708f96a725c1 100644 --- a/lib/reline/config.rb +++ b/lib/reline/config.rb @@ -184,9 +184,8 @@ def handle_directive(directive, file, no) def bind_variable(name, value) case name - when *VARIABLE_NAMES then - variable_name = :"@#{name.tr(?-, ?_)}" - instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on') + when 'history-size' + @history_size = value.to_i when 'bell-style' @bell_style = case value @@ -225,6 +224,9 @@ def bind_variable(name, value) end when 'keyseq-timeout' @keyseq_timeout = value.to_i + when *VARIABLE_NAMES then + variable_name = :"@#{name.tr(?-, ?_)}" + instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on') end end diff --git a/test/reline/test_config.rb b/test/reline/test_config.rb index dd5142d587d53e..14342fff86c77f 100644 --- a/test/reline/test_config.rb +++ b/test/reline/test_config.rb @@ -195,4 +195,15 @@ def test_additional_key_bindings_with_nesting_and_comment_out expected = { 'ef'.bytes => 'EF'.bytes, 'gh'.bytes => 'GH'.bytes } assert_equal expected, @config.key_bindings end + + def test_history_size + @config.read_lines(<<~LINES.lines) + set history-size 5000 + LINES + + assert_equal 5000, @config.instance_variable_get(:@history_size) + history = Reline::History.new(@config) + history << "a\n" + assert_equal 1, history.size + end end From e92bebb0c562a2a7829914b5e34c63ba7d2b7e04 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Tue, 7 Jan 2020 01:33:30 +0900 Subject: [PATCH 318/878] Suppress some warnings ``` .../ruby/test/ruby/test_keyword.rb:3509: warning: assigned but unused variable - bug8993 .../ruby/test/ruby/test_object.rb:83: warning: assigned but unused variable - f .../ruby/test/ruby/test_object.rb:95: warning: method redefined; discarding old initialize_clone .../ruby/test/ruby/test_object.rb:84: warning: previous definition of initialize_clone was here ``` --- test/ruby/test_keyword.rb | 1 - test/ruby/test_object.rb | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index c49496d6a94f70..02745a1dfecda6 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -3506,7 +3506,6 @@ def foo(x, **h) end def test_precedence_of_keyword_arguments_with_post_argument - bug8993 = '[ruby-core:57706] [Bug #8993]' a = Class.new do def foo(a, b, c=1, *d, e, f:2, **g) [a, b, c, d, e, f, g] diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index bfc7d7de1df93a..55709bf3dce870 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -80,7 +80,6 @@ def d.e; 3; end attr_reader :f end o = c.new - f = true def o.initialize_clone(_, freeze: true) @f = freeze super @@ -92,6 +91,9 @@ def o.initialize_clone(_, freeze: true) assert_kind_of c, clone assert_equal false, clone.f + class << o + remove_method(:initialize_clone) + end def o.initialize_clone(_) super end From 95d23f36ff7be45bdca84c9ff6252593e73374a3 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 7 Jan 2020 01:40:26 +0900 Subject: [PATCH 319/878] * 2020-01-07 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index becce4d991b9dd..727f1284da51d5 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" From b0bf654c3164e9c6b5b38aa6fe23bd76d28a38d2 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 2 Jul 2019 10:33:40 +0100 Subject: [PATCH 320/878] always expand ivar arrays to max width If the instance variable table hasn't been "expanded", allocate the maximum size of the ivar table. This operates under the assumption that most objects will eventually expand their ivar array to the maximum width anyway, so we may as well avoid realloc calls. --- variable.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/variable.c b/variable.c index 46f7dea7259d0f..1db061454b2aab 100644 --- a/variable.c +++ b/variable.c @@ -896,8 +896,7 @@ iv_index_tbl_newsize(struct ivar_update *ivup) uint32_t index = (uint32_t)ivup->index; /* should not overflow */ uint32_t newsize = (index+1) + (index+1)/4; /* (index+1)*1.25 */ - if (!ivup->iv_extended && - ivup->u.iv_index_tbl->num_entries < (st_index_t)newsize) { + if (!ivup->iv_extended) { newsize = (uint32_t)ivup->u.iv_index_tbl->num_entries; } return newsize; From f132825ffa1c225b0055ce6b0aa0d8428fba2623 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 7 Jan 2020 04:23:04 +0100 Subject: [PATCH 321/878] Disable IPv6 on Travis s390x case. (#2819) This fixes following error that sometimes happens once in a few times on Travis s390x environment. ``` $ tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" + sudo -E apt-add-repository -y ppa:ubuntu-toolchain-r/test Error: retrieving gpg key timed out. ``` --- .travis.yml | 9 +++++++-- tool/travis_disable_ipv6.sh | 11 +++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100755 tool/travis_disable_ipv6.sh diff --git a/.travis.yml b/.travis.yml index fbcfe18d3d0c10..8b09d0cae956de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ env: - RUBY_PREFIX=/tmp/ruby-prefix - GEMS_FOR_TEST='timezone tzinfo' - UPDATE_UNICODE="UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." + - BEFORE_INSTALL=true # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7 - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages' - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options" @@ -68,10 +69,10 @@ env: # sources: # - ubuntu-toolchain-r-test before_install: + - bash -cx "${BEFORE_INSTALL}" - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - |- - ${BEFORE_INSTALL} tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ ccache \ gcc-8 \ @@ -132,7 +133,9 @@ env: name: s390x-linux arch: s390x <<: *gcc-8 - + env: + - BEFORE_INSTALL="tool/travis_disable_ipv6.sh" + - &jemalloc name: --with-jemalloc <<: *gcc-8 @@ -453,6 +456,8 @@ before_script: - echo JOBS=${JOBS} SETARCH=${SETARCH} - $SETARCH uname -a - $SETARCH uname -r + - ip a + - cat /etc/hosts - rm -fr .ext autom4te.cache - echo $TERM - |- diff --git a/tool/travis_disable_ipv6.sh b/tool/travis_disable_ipv6.sh new file mode 100755 index 00000000000000..97ba179d6e9425 --- /dev/null +++ b/tool/travis_disable_ipv6.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -ex +ip a +sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 +sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 +sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=1 +ip a + +cat /etc/hosts +sudo ruby -e "hosts = File.read('/etc/hosts').sub(/^::1\s*localhost.*$/, ''); File.write('/etc/hosts', hosts)" +cat /etc/hosts From beb59c3b4574e2bd6de3484a6cbcbdf6bd8aac48 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 8 Jan 2020 12:26:48 +0900 Subject: [PATCH 322/878] Add GC guard Try to fix infrequent error: https://rubyci.org/logs/rubyci.s3.amazonaws.com/solaris10-sunc/ruby-master/log/20200108T010004Z.fail.html.gz ``` 1) Error: DRbTests::TestDRbSSLCore#test_02_basic_object: RangeError: "348" is recycled object (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:366:in `_id2ref' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:366:in `to_obj' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1537:in `to_obj' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1856:in `to_obj' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:620:in `recv_request' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:931:in `recv_request' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1665:in `init_with_client' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1677:in `setup_message' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1641:in `perform' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1734:in `block (2 levels) in main_loop' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1730:in `loop' (drbssl://localhost:58371) /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/lib/drb/drb.rb:1730:in `block in main_loop' /export/home/users/chkbuild/cb-sunc/tmp/build/20200108T010004Z/ruby/test/drb/drbtest.rb:163:in `test_02_basic_object' ``` --- test/drb/ut_drb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb index b1306d0cb0676d..f05d3f8e1fb0ff 100644 --- a/test/drb/ut_drb.rb +++ b/test/drb/ut_drb.rb @@ -69,7 +69,7 @@ def foo; 1 end private def priv; 3; end end def basic_object - BO.new + @basic_object = BO.new end def unknown_class From f518b608d64d08024139e8259f5c7b77e630bfff Mon Sep 17 00:00:00 2001 From: git Date: Wed, 8 Jan 2020 12:30:37 +0900 Subject: [PATCH 323/878] * 2020-01-08 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 727f1284da51d5..1fe6cb4ec3170a 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 8 #include "ruby/version.h" From 13f4f07f215ca66cc727c75e0c3d77389c261e14 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 8 Jan 2020 16:11:52 +0900 Subject: [PATCH 324/878] Merge bundler-2.1.4 --- lib/bundler/cli/install.rb | 5 +- lib/bundler/gem_helper.rb | 5 +- lib/bundler/inline.rb | 2 +- .../lib/net/http/persistent.rb | 22 --- lib/bundler/version.rb | 2 +- man/bundle-add.1 | 2 +- man/bundle-add.1.txt | 2 +- man/bundle-binstubs.1 | 2 +- man/bundle-binstubs.1.txt | 2 +- man/bundle-cache.1 | 2 +- man/bundle-cache.1.txt | 2 +- man/bundle-check.1 | 2 +- man/bundle-check.1.txt | 2 +- man/bundle-clean.1 | 2 +- man/bundle-clean.1.txt | 2 +- man/bundle-config.1 | 2 +- man/bundle-config.1.txt | 2 +- man/bundle-doctor.1 | 2 +- man/bundle-doctor.1.txt | 2 +- man/bundle-exec.1 | 2 +- man/bundle-exec.1.txt | 2 +- man/bundle-gem.1 | 2 +- man/bundle-gem.1.txt | 2 +- man/bundle-info.1 | 2 +- man/bundle-info.1.txt | 2 +- man/bundle-init.1 | 2 +- man/bundle-init.1.txt | 2 +- man/bundle-inject.1 | 2 +- man/bundle-inject.1.txt | 2 +- man/bundle-install.1 | 2 +- man/bundle-install.1.txt | 2 +- man/bundle-list.1 | 2 +- man/bundle-list.1.txt | 2 +- man/bundle-lock.1 | 2 +- man/bundle-lock.1.txt | 2 +- man/bundle-open.1 | 2 +- man/bundle-open.1.txt | 2 +- man/bundle-outdated.1 | 2 +- man/bundle-outdated.1.txt | 2 +- man/bundle-platform.1 | 2 +- man/bundle-platform.1.txt | 2 +- man/bundle-pristine.1 | 2 +- man/bundle-pristine.1.txt | 2 +- man/bundle-remove.1 | 2 +- man/bundle-remove.1.txt | 2 +- man/bundle-show.1 | 2 +- man/bundle-show.1.txt | 2 +- man/bundle-update.1 | 2 +- man/bundle-update.1.txt | 2 +- man/bundle-viz.1 | 2 +- man/bundle-viz.1.txt | 2 +- man/bundle.1 | 2 +- man/bundle.1.txt | 2 +- man/gemfile.5 | 2 +- man/gemfile.5.txt | 2 +- spec/bundler/commands/outdated_spec.rb | 2 +- spec/bundler/commands/pristine_spec.rb | 2 +- spec/bundler/commands/update_spec.rb | 2 +- spec/bundler/install/deploy_spec.rb | 178 ++++++++++-------- spec/bundler/install/gemfile/gemspec_spec.rb | 2 +- spec/bundler/plugins/source/example_spec.rb | 10 +- spec/bundler/runtime/gem_tasks_spec.rb | 14 ++ spec/bundler/runtime/inline_spec.rb | 17 ++ spec/bundler/runtime/require_spec.rb | 2 - spec/bundler/runtime/setup_spec.rb | 29 ++- spec/bundler/support/builders.rb | 20 +- spec/bundler/support/helpers.rb | 6 +- spec/bundler/support/indexes.rb | 2 +- spec/bundler/support/matchers.rb | 4 +- 69 files changed, 242 insertions(+), 184 deletions(-) diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index d823fb632ff2ca..ecd474971dce82 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -38,7 +38,8 @@ def run if Bundler.feature_flag.deployment_means_frozen? Bundler.settings.set_command_option :deployment, true else - Bundler.settings.set_command_option :frozen, true + Bundler.settings.set_command_option :deployment, true if options[:deployment] + Bundler.settings.set_command_option :frozen, true if options[:frozen] end end @@ -169,7 +170,7 @@ def normalize_groups def normalize_settings Bundler.settings.set_command_option :path, nil if options[:system] Bundler.settings.temporary(:path_relative_to_cwd => false) do - Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment] + Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil? end Bundler.settings.set_command_option_if_given :path, options[:path] Bundler.settings.temporary(:path_relative_to_cwd => false) do diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index 7d4e382be8c482..204dd2405210d5 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -73,7 +73,7 @@ def install def build_gem file_name = nil - sh("#{gem_command} build -V #{spec_path}".shellsplit) do + sh("#{gem_command} build -V #{spec_path.shellescape}".shellsplit) do file_name = File.basename(built_gem_path) SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) } FileUtils.mv(built_gem_path, "pkg") @@ -130,9 +130,8 @@ def gem_push_host def perform_git_push(options = "") cmd = "git push #{options}" - out, status = sh_with_status(cmd) + out, status = sh_with_status(cmd.shellsplit) return if status.success? - cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin) raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" end diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index 5b2ddb7db68e55..f1f77a7a9c540b 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -78,7 +78,7 @@ def definition.lock(*); end if old_gemfile ENV["BUNDLE_GEMFILE"] = old_gemfile else - ENV.delete("BUNDLE_GEMFILE") + ENV["BUNDLE_GEMFILE"] = "" end end end diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb index e9c4c3e89ef6c9..f9d1401062d625 100644 --- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb @@ -3,11 +3,6 @@ require 'cgi' # for escaping require_relative '../../../../connection_pool/lib/connection_pool' -begin - require 'net/http/pipeline' -rescue LoadError -end - autoload :OpenSSL, 'openssl' ## @@ -773,23 +768,6 @@ def normalize_uri uri (uri =~ /^https?:/) ? uri : "http://#{uri}" end - ## - # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a - # block is given. Returns all responses received. - # - # See - # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html] - # for further details. - # - # Only if net-http-pipeline was required before - # net-http-persistent #pipeline will be present. - - def pipeline uri, requests, &block # :yields: responses - connection_for uri do |connection| - connection.http.pipeline requests, &block - end - end - ## # Sets this client's SSL private key diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index b63e39b8d20c2d..85704816e42454 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.1.2".freeze + VERSION = "2.1.4".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff --git a/man/bundle-add.1 b/man/bundle-add.1 index 24bfe50f4f0006..8b75859104f7f0 100644 --- a/man/bundle-add.1 +++ b/man/bundle-add.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-ADD" "1" "December 2019" "" "" +.TH "BUNDLE\-ADD" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install diff --git a/man/bundle-add.1.txt b/man/bundle-add.1.txt index aff9977fb1282d..dcd76df4ae78e4 100644 --- a/man/bundle-add.1.txt +++ b/man/bundle-add.1.txt @@ -55,4 +55,4 @@ OPTIONS - December 2019 BUNDLE-ADD(1) + January 2020 BUNDLE-ADD(1) diff --git a/man/bundle-binstubs.1 b/man/bundle-binstubs.1 index 4e69bfb715941c..4f9e5c0e3198b7 100644 --- a/man/bundle-binstubs.1 +++ b/man/bundle-binstubs.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-BINSTUBS" "1" "December 2019" "" "" +.TH "BUNDLE\-BINSTUBS" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems diff --git a/man/bundle-binstubs.1.txt b/man/bundle-binstubs.1.txt index 564989bd8a6835..cbd2b12da0e681 100644 --- a/man/bundle-binstubs.1.txt +++ b/man/bundle-binstubs.1.txt @@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS - December 2019 BUNDLE-BINSTUBS(1) + January 2020 BUNDLE-BINSTUBS(1) diff --git a/man/bundle-cache.1 b/man/bundle-cache.1 index 23bc757d035980..cb376777ffb9f8 100644 --- a/man/bundle-cache.1 +++ b/man/bundle-cache.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CACHE" "1" "December 2019" "" "" +.TH "BUNDLE\-CACHE" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application diff --git a/man/bundle-cache.1.txt b/man/bundle-cache.1.txt index 4dcc7c9cc96461..c0b8b5bf0781f1 100644 --- a/man/bundle-cache.1.txt +++ b/man/bundle-cache.1.txt @@ -75,4 +75,4 @@ REMOTE FETCHING - December 2019 BUNDLE-CACHE(1) + January 2020 BUNDLE-CACHE(1) diff --git a/man/bundle-check.1 b/man/bundle-check.1 index ac80f697f54343..aba5b66348f7d6 100644 --- a/man/bundle-check.1 +++ b/man/bundle-check.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CHECK" "1" "December 2019" "" "" +.TH "BUNDLE\-CHECK" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems diff --git a/man/bundle-check.1.txt b/man/bundle-check.1.txt index 05d1c7dc5c4eb5..cca5fae9e17cb6 100644 --- a/man/bundle-check.1.txt +++ b/man/bundle-check.1.txt @@ -30,4 +30,4 @@ OPTIONS - December 2019 BUNDLE-CHECK(1) + January 2020 BUNDLE-CHECK(1) diff --git a/man/bundle-clean.1 b/man/bundle-clean.1 index 61fcf9d3964907..cc5c8e86d7a8d9 100644 --- a/man/bundle-clean.1 +++ b/man/bundle-clean.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CLEAN" "1" "December 2019" "" "" +.TH "BUNDLE\-CLEAN" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory diff --git a/man/bundle-clean.1.txt b/man/bundle-clean.1.txt index 9438f8adc9060d..300d0c0b518c54 100644 --- a/man/bundle-clean.1.txt +++ b/man/bundle-clean.1.txt @@ -23,4 +23,4 @@ OPTIONS - December 2019 BUNDLE-CLEAN(1) + January 2020 BUNDLE-CLEAN(1) diff --git a/man/bundle-config.1 b/man/bundle-config.1 index 56ef24791d0550..c3464fb2ec487e 100644 --- a/man/bundle-config.1 +++ b/man/bundle-config.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CONFIG" "1" "December 2019" "" "" +.TH "BUNDLE\-CONFIG" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-config\fR \- Set bundler configuration options diff --git a/man/bundle-config.1.txt b/man/bundle-config.1.txt index bc3fe390699d1e..f5fc0ce12a43a7 100644 --- a/man/bundle-config.1.txt +++ b/man/bundle-config.1.txt @@ -525,4 +525,4 @@ CONFIGURE BUNDLER DIRECTORIES - December 2019 BUNDLE-CONFIG(1) + January 2020 BUNDLE-CONFIG(1) diff --git a/man/bundle-doctor.1 b/man/bundle-doctor.1 index d3e3e73bbe53a8..344c40066be2f5 100644 --- a/man/bundle-doctor.1 +++ b/man/bundle-doctor.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-DOCTOR" "1" "December 2019" "" "" +.TH "BUNDLE\-DOCTOR" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-doctor\fR \- Checks the bundle for common problems diff --git a/man/bundle-doctor.1.txt b/man/bundle-doctor.1.txt index 6b2fdcbdf42b62..595ba996333307 100644 --- a/man/bundle-doctor.1.txt +++ b/man/bundle-doctor.1.txt @@ -41,4 +41,4 @@ OPTIONS - December 2019 BUNDLE-DOCTOR(1) + January 2020 BUNDLE-DOCTOR(1) diff --git a/man/bundle-exec.1 b/man/bundle-exec.1 index fa0728a5de1278..555819a5b43850 100644 --- a/man/bundle-exec.1 +++ b/man/bundle-exec.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-EXEC" "1" "December 2019" "" "" +.TH "BUNDLE\-EXEC" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-exec\fR \- Execute a command in the context of the bundle diff --git a/man/bundle-exec.1.txt b/man/bundle-exec.1.txt index efcb130b48e577..ebdc2fda713ddc 100644 --- a/man/bundle-exec.1.txt +++ b/man/bundle-exec.1.txt @@ -175,4 +175,4 @@ RUBYGEMS PLUGINS - December 2019 BUNDLE-EXEC(1) + January 2020 BUNDLE-EXEC(1) diff --git a/man/bundle-gem.1 b/man/bundle-gem.1 index 9971e3528c21e8..baed185e70ac2b 100644 --- a/man/bundle-gem.1 +++ b/man/bundle-gem.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-GEM" "1" "December 2019" "" "" +.TH "BUNDLE\-GEM" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem diff --git a/man/bundle-gem.1.txt b/man/bundle-gem.1.txt index c95c409c659b02..554bb1a41b08ff 100644 --- a/man/bundle-gem.1.txt +++ b/man/bundle-gem.1.txt @@ -88,4 +88,4 @@ SEE ALSO - December 2019 BUNDLE-GEM(1) + January 2020 BUNDLE-GEM(1) diff --git a/man/bundle-info.1 b/man/bundle-info.1 index 9dbef738fa0a85..d7c73e9bb70ec6 100644 --- a/man/bundle-info.1 +++ b/man/bundle-info.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INFO" "1" "December 2019" "" "" +.TH "BUNDLE\-INFO" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-info\fR \- Show information for the given gem in your bundle diff --git a/man/bundle-info.1.txt b/man/bundle-info.1.txt index 102ec48f6ecfa8..67563aa191e0ee 100644 --- a/man/bundle-info.1.txt +++ b/man/bundle-info.1.txt @@ -18,4 +18,4 @@ OPTIONS - December 2019 BUNDLE-INFO(1) + January 2020 BUNDLE-INFO(1) diff --git a/man/bundle-init.1 b/man/bundle-init.1 index 8fe0d02406364a..803d4b9be80e6c 100644 --- a/man/bundle-init.1 +++ b/man/bundle-init.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INIT" "1" "December 2019" "" "" +.TH "BUNDLE\-INIT" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-init\fR \- Generates a Gemfile into the current working directory diff --git a/man/bundle-init.1.txt b/man/bundle-init.1.txt index 187ed4b3c04cfd..2565edbecef90c 100644 --- a/man/bundle-init.1.txt +++ b/man/bundle-init.1.txt @@ -31,4 +31,4 @@ SEE ALSO - December 2019 BUNDLE-INIT(1) + January 2020 BUNDLE-INIT(1) diff --git a/man/bundle-inject.1 b/man/bundle-inject.1 index afc328771e01c2..3370a915730f6a 100644 --- a/man/bundle-inject.1 +++ b/man/bundle-inject.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INJECT" "1" "December 2019" "" "" +.TH "BUNDLE\-INJECT" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile diff --git a/man/bundle-inject.1.txt b/man/bundle-inject.1.txt index a73927cef0cb5a..4707b99e5f4ff0 100644 --- a/man/bundle-inject.1.txt +++ b/man/bundle-inject.1.txt @@ -29,4 +29,4 @@ DESCRIPTION - December 2019 BUNDLE-INJECT(1) + January 2020 BUNDLE-INJECT(1) diff --git a/man/bundle-install.1 b/man/bundle-install.1 index 200acfca241271..4a289f5c2ed84a 100644 --- a/man/bundle-install.1 +++ b/man/bundle-install.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INSTALL" "1" "December 2019" "" "" +.TH "BUNDLE\-INSTALL" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile diff --git a/man/bundle-install.1.txt b/man/bundle-install.1.txt index 08a0869d6f81ee..b1a9ad1eb3cf95 100644 --- a/man/bundle-install.1.txt +++ b/man/bundle-install.1.txt @@ -398,4 +398,4 @@ SEE ALSO - December 2019 BUNDLE-INSTALL(1) + January 2020 BUNDLE-INSTALL(1) diff --git a/man/bundle-list.1 b/man/bundle-list.1 index 53427b4504cdc8..72bc391ac20976 100644 --- a/man/bundle-list.1 +++ b/man/bundle-list.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-LIST" "1" "December 2019" "" "" +.TH "BUNDLE\-LIST" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-list\fR \- List all the gems in the bundle diff --git a/man/bundle-list.1.txt b/man/bundle-list.1.txt index f4eab62783d687..645e62e4525056 100644 --- a/man/bundle-list.1.txt +++ b/man/bundle-list.1.txt @@ -40,4 +40,4 @@ OPTIONS - December 2019 BUNDLE-LIST(1) + January 2020 BUNDLE-LIST(1) diff --git a/man/bundle-lock.1 b/man/bundle-lock.1 index b64a645eb80ea3..89f6e35179940d 100644 --- a/man/bundle-lock.1 +++ b/man/bundle-lock.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-LOCK" "1" "December 2019" "" "" +.TH "BUNDLE\-LOCK" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing diff --git a/man/bundle-lock.1.txt b/man/bundle-lock.1.txt index a50ee25643c6c5..80dcada5b3310d 100644 --- a/man/bundle-lock.1.txt +++ b/man/bundle-lock.1.txt @@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS - December 2019 BUNDLE-LOCK(1) + January 2020 BUNDLE-LOCK(1) diff --git a/man/bundle-open.1 b/man/bundle-open.1 index 6213aeca6551af..5a11eeeb6441b7 100644 --- a/man/bundle-open.1 +++ b/man/bundle-open.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-OPEN" "1" "December 2019" "" "" +.TH "BUNDLE\-OPEN" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle diff --git a/man/bundle-open.1.txt b/man/bundle-open.1.txt index 9ecc89c10a9e12..288bbce0e3cbf8 100644 --- a/man/bundle-open.1.txt +++ b/man/bundle-open.1.txt @@ -26,4 +26,4 @@ DESCRIPTION - December 2019 BUNDLE-OPEN(1) + January 2020 BUNDLE-OPEN(1) diff --git a/man/bundle-outdated.1 b/man/bundle-outdated.1 index 81543bb65b3e02..408e568034befc 100644 --- a/man/bundle-outdated.1 +++ b/man/bundle-outdated.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-OUTDATED" "1" "December 2019" "" "" +.TH "BUNDLE\-OUTDATED" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-outdated\fR \- List installed gems with newer versions available diff --git a/man/bundle-outdated.1.txt b/man/bundle-outdated.1.txt index 905a1fd9fc920d..c938e0a4abcf61 100644 --- a/man/bundle-outdated.1.txt +++ b/man/bundle-outdated.1.txt @@ -128,4 +128,4 @@ FILTERING OUTPUT - December 2019 BUNDLE-OUTDATED(1) + January 2020 BUNDLE-OUTDATED(1) diff --git a/man/bundle-platform.1 b/man/bundle-platform.1 index f7f65045dc9195..c83aa3c5d4e053 100644 --- a/man/bundle-platform.1 +++ b/man/bundle-platform.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-PLATFORM" "1" "December 2019" "" "" +.TH "BUNDLE\-PLATFORM" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-platform\fR \- Displays platform compatibility information diff --git a/man/bundle-platform.1.txt b/man/bundle-platform.1.txt index d808bed64f7aa0..f9dc8ccc1f7d3e 100644 --- a/man/bundle-platform.1.txt +++ b/man/bundle-platform.1.txt @@ -54,4 +54,4 @@ OPTIONS - December 2019 BUNDLE-PLATFORM(1) + January 2020 BUNDLE-PLATFORM(1) diff --git a/man/bundle-pristine.1 b/man/bundle-pristine.1 index 5b3522dd1aed0a..460e3d4e5a1c18 100644 --- a/man/bundle-pristine.1 +++ b/man/bundle-pristine.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-PRISTINE" "1" "December 2019" "" "" +.TH "BUNDLE\-PRISTINE" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition diff --git a/man/bundle-pristine.1.txt b/man/bundle-pristine.1.txt index a22bd539273e91..8d474fe4972742 100644 --- a/man/bundle-pristine.1.txt +++ b/man/bundle-pristine.1.txt @@ -41,4 +41,4 @@ DESCRIPTION - December 2019 BUNDLE-PRISTINE(1) + January 2020 BUNDLE-PRISTINE(1) diff --git a/man/bundle-remove.1 b/man/bundle-remove.1 index 4a4ed7ac951b2f..cb4ad8d3847b19 100644 --- a/man/bundle-remove.1 +++ b/man/bundle-remove.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-REMOVE" "1" "December 2019" "" "" +.TH "BUNDLE\-REMOVE" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-remove\fR \- Removes gems from the Gemfile diff --git a/man/bundle-remove.1.txt b/man/bundle-remove.1.txt index 7c8945e2c066a0..7203422f3975f0 100644 --- a/man/bundle-remove.1.txt +++ b/man/bundle-remove.1.txt @@ -31,4 +31,4 @@ OPTIONS - December 2019 BUNDLE-REMOVE(1) + January 2020 BUNDLE-REMOVE(1) diff --git a/man/bundle-show.1 b/man/bundle-show.1 index 575619370b9113..2922a33467e406 100644 --- a/man/bundle-show.1 +++ b/man/bundle-show.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-SHOW" "1" "December 2019" "" "" +.TH "BUNDLE\-SHOW" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem diff --git a/man/bundle-show.1.txt b/man/bundle-show.1.txt index fa800814277ccc..58f16201683b07 100644 --- a/man/bundle-show.1.txt +++ b/man/bundle-show.1.txt @@ -24,4 +24,4 @@ OPTIONS - December 2019 BUNDLE-SHOW(1) + January 2020 BUNDLE-SHOW(1) diff --git a/man/bundle-update.1 b/man/bundle-update.1 index 6a3fd877e2a63c..f315532bb94603 100644 --- a/man/bundle-update.1 +++ b/man/bundle-update.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-UPDATE" "1" "December 2019" "" "" +.TH "BUNDLE\-UPDATE" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-update\fR \- Update your gems to the latest available versions diff --git a/man/bundle-update.1.txt b/man/bundle-update.1.txt index c54ade97136f97..b8208c75d37cfa 100644 --- a/man/bundle-update.1.txt +++ b/man/bundle-update.1.txt @@ -387,4 +387,4 @@ RECOMMENDED WORKFLOW - December 2019 BUNDLE-UPDATE(1) + January 2020 BUNDLE-UPDATE(1) diff --git a/man/bundle-viz.1 b/man/bundle-viz.1 index f1852e4206b898..a2153da28ddb0d 100644 --- a/man/bundle-viz.1 +++ b/man/bundle-viz.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-VIZ" "1" "December 2019" "" "" +.TH "BUNDLE\-VIZ" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile diff --git a/man/bundle-viz.1.txt b/man/bundle-viz.1.txt index 7956cf18ed8558..c934b4cf5bcf58 100644 --- a/man/bundle-viz.1.txt +++ b/man/bundle-viz.1.txt @@ -36,4 +36,4 @@ OPTIONS - December 2019 BUNDLE-VIZ(1) + January 2020 BUNDLE-VIZ(1) diff --git a/man/bundle.1 b/man/bundle.1 index 93a43c0c70062c..4a9a9bec4de7c7 100644 --- a/man/bundle.1 +++ b/man/bundle.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE" "1" "December 2019" "" "" +.TH "BUNDLE" "1" "January 2020" "" "" . .SH "NAME" \fBbundle\fR \- Ruby Dependency Management diff --git a/man/bundle.1.txt b/man/bundle.1.txt index cd0fabadeae8a8..e7eb35aa14aa16 100644 --- a/man/bundle.1.txt +++ b/man/bundle.1.txt @@ -113,4 +113,4 @@ OBSOLETE - December 2019 BUNDLE(1) + January 2020 BUNDLE(1) diff --git a/man/gemfile.5 b/man/gemfile.5 index 536af70a6e2142..a9d2cee7c701c8 100644 --- a/man/gemfile.5 +++ b/man/gemfile.5 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GEMFILE" "5" "December 2019" "" "" +.TH "GEMFILE" "5" "January 2020" "" "" . .SH "NAME" \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs diff --git a/man/gemfile.5.txt b/man/gemfile.5.txt index b3da595b17a1f0..71d2513271feb7 100644 --- a/man/gemfile.5.txt +++ b/man/gemfile.5.txt @@ -646,4 +646,4 @@ SOURCE PRIORITY - December 2019 GEMFILE(5) + January 2020 GEMFILE(5) diff --git a/spec/bundler/commands/outdated_spec.rb b/spec/bundler/commands/outdated_spec.rb index 6e82d34b056e70..df911eaffd8763 100644 --- a/spec/bundler/commands/outdated_spec.rb +++ b/spec/bundler/commands/outdated_spec.rb @@ -423,7 +423,7 @@ def test_group_option(group = nil, gems_list_size = 1) expect(err).to include("You are trying to check outdated gems in deployment mode.") expect(err).to include("Run `bundle outdated` elsewhere.") expect(err).to include("If this is a development machine, remove the ") - expect(err).to include("Gemfile freeze\nby running `bundle install --no-deployment`.") + expect(err).to include("Gemfile freeze\nby running `bundle config unset deployment`.") end end diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb index aa5c2213d1fcc8..cc7f760d747b1b 100644 --- a/spec/bundler/commands/pristine_spec.rb +++ b/spec/bundler/commands/pristine_spec.rb @@ -99,7 +99,7 @@ it "reinstall gemspec dependency" do spec = Bundler.definition.specs["baz-dev"].first - changed_file = Pathname.new(spec.full_gem_path).join("lib/baz-dev.rb") + changed_file = Pathname.new(spec.full_gem_path).join("lib/baz/dev.rb") diff = "#Pristine spec changes" File.open(changed_file, "a") {|f| f.puts "#Pristine spec changes" } diff --git a/spec/bundler/commands/update_spec.rb b/spec/bundler/commands/update_spec.rb index a0c7e33299f944..e4449312ebfbfb 100644 --- a/spec/bundler/commands/update_spec.rb +++ b/spec/bundler/commands/update_spec.rb @@ -286,7 +286,7 @@ expect(last_command).to be_failure expect(err).to match(/You are trying to install in deployment mode after changing.your Gemfile/m) - expect(err).to match(/freeze \nby running `bundle install --no-deployment`./m) + expect(err).to match(/freeze \nby running `bundle config unset deployment`./m) end it "should suggest different command when frozen is set globally", :bundler => "< 3" do diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index 89da3fc801461c..f92a531bf53f95 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -34,7 +34,7 @@ expect(exitstatus).to eq(15) if exitstatus end - it "works after you try to deploy without a lock" do + it "doesn't mess up a subsequent `bundle install` after you try to deploy without a lock" do bundle "install --deployment" bundle! :install expect(the_bundle).to include_gems "rack 1.0" @@ -42,7 +42,7 @@ end it "still works if you are not in the app directory and specify --gemfile" do - bundle "install" + bundle! "install" Dir.chdir tmp do simulate_new_machine bundle! :install, @@ -60,12 +60,12 @@ gem "foo", :git => "#{lib_path("foo-1.0")}" end G - bundle :install + bundle! :install bundle! :install, forgotten_command_line_options(:deployment => true, :without => "test") end it "works when you bundle exec bundle" do - bundle :install + bundle! :install bundle "install --deployment" bundle! "exec bundle check" end @@ -104,9 +104,90 @@ expect(the_bundle).to include_gems "rack 1.0" end + context "when replacing a host with the same host with credentials" do + before do + bundle! "install", forgotten_command_line_options(:path => "vendor/bundle") + gemfile <<-G + source "http://user_name:password@localgemserver.test/" + gem "rack" + G + + lockfile <<-G + GEM + remote: http://localgemserver.test/ + specs: + rack (1.0.0) + + PLATFORMS + #{local} + + DEPENDENCIES + rack + G + + bundle! "config set --local deployment true" + end + + it "prevents the replace by default" do + bundle :install + + expect(err).to match(/The list of sources changed/) + end + + context "when allow_deployment_source_credential_changes is true" do + before { bundle! "config set allow_deployment_source_credential_changes true" } + + it "allows the replace" do + bundle! :install + + expect(out).to match(/Bundle complete!/) + end + end + + context "when allow_deployment_source_credential_changes is false" do + before { bundle! "config set allow_deployment_source_credential_changes false" } + + it "prevents the replace" do + bundle :install + + expect(err).to match(/The list of sources changed/) + end + end + + context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is true" do + before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "true" } + + it "allows the replace" do + bundle :install + + expect(out).to match(/Bundle complete!/) + end + end + + context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is false" do + before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "false" } + + it "prevents the replace" do + bundle :install + + expect(err).to match(/The list of sources changed/) + end + end + end + describe "with an existing lockfile" do before do - bundle "install" + bundle! "install" + end + + it "installs gems by default to vendor/bundle", :bundler => "< 3" do + bundle! "install --deployment" + expect(out).to include("vendor/bundle") + end + + it "installs gems to custom path if specified", :bundler => "< 3" do + bundle! "install --path vendor/bundle2 --deployment" + expect(out).to include("vendor/bundle2") end it "works with the --deployment flag if you didn't change anything", :bundler => "< 3" do @@ -197,6 +278,19 @@ expect(err).not_to include("You have changed in the Gemfile") end + it "installs gems by default to vendor/bundle when `--deployment` is set via an environment variable", :bundler => "< 3" do + ENV["BUNDLE_DEPLOYMENT"] = "true" + bundle "install" + expect(out).to include("vendor/bundle") + end + + it "installs gems to custom path when deployment mode is set via an environment variable ", :bundler => "< 3" do + ENV["BUNDLE_DEPLOYMENT"] = "true" + ENV["BUNDLE_PATH"] = "vendor/bundle2" + bundle "install" + expect(out).to include("vendor/bundle2") + end + it "can have --frozen set to false via an environment variable" do gemfile <<-G source "#{file_uri_for(gem_repo1)}" @@ -280,80 +374,6 @@ expect(err).not_to include("You have deleted from the Gemfile") end - context "when replacing a host with the same host with credentials" do - let(:success_message) do - "Bundle complete!" - end - - before do - install_gemfile <<-G - source "http://user_name:password@localgemserver.test/" - gem "rack" - G - - lockfile <<-G - GEM - remote: http://localgemserver.test/ - specs: - rack (1.0.0) - - PLATFORMS - #{local} - - DEPENDENCIES - rack - G - - bundle! "config set --local deployment true" - end - - it "prevents the replace by default" do - bundle :install - - expect(err).to match(/The list of sources changed/) - end - - context "when allow_deployment_source_credential_changes is true" do - before { bundle! "config set allow_deployment_source_credential_changes true" } - - it "allows the replace" do - bundle :install - - expect(out).to match(/#{success_message}/) - end - end - - context "when allow_deployment_source_credential_changes is false" do - before { bundle! "config set allow_deployment_source_credential_changes false" } - - it "prevents the replace" do - bundle :install - - expect(err).to match(/The list of sources changed/) - end - end - - context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is true" do - before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "true" } - - it "allows the replace" do - bundle :install - - expect(out).to match(/#{success_message}/) - end - end - - context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is false" do - before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "false" } - - it "prevents the replace" do - bundle :install - - expect(err).to match(/The list of sources changed/) - end - end - end - it "remembers that the bundle is frozen at runtime" do bundle! :lock diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb index c50f8c96683141..26a62351668006 100644 --- a/spec/bundler/install/gemfile/gemspec_spec.rb +++ b/spec/bundler/install/gemfile/gemspec_spec.rb @@ -210,7 +210,7 @@ build_lib("foo", :path => bundled_app) gemspec = bundled_app("foo.gemspec").read bundled_app("foo.gemspec").open("w") do |f| - f.write "#{gemspec.strip}.tap { gem 'rack-obama'; require 'rack-obama' }" + f.write "#{gemspec.strip}.tap { gem 'rack-obama'; require 'rack/obama' }" end install_gemfile! <<-G diff --git a/spec/bundler/plugins/source/example_spec.rb b/spec/bundler/plugins/source/example_spec.rb index 64002d8f46c8fd..f2151a5a73eabf 100644 --- a/spec/bundler/plugins/source/example_spec.rb +++ b/spec/bundler/plugins/source/example_spec.rb @@ -125,14 +125,14 @@ def install(spec, opts) end it "installs the gem executables" do - build_lib "gem-with-bin" do |s| + build_lib "gem_with_bin" do |s| s.executables = ["foo"] end install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" # plugin source - source "#{lib_path("gem-with-bin-1.0")}", :type => :mpath do - gem "gem-with-bin" + source "#{lib_path("gem_with_bin-1.0")}", :type => :mpath do + gem "gem_with_bin" end G @@ -451,7 +451,7 @@ def installed? bundle "install" run <<-RUBY - require 'ma-gitp-gem' + require 'ma/gitp/gem' puts "WIN" unless defined?(MAGITPGEM_PREV_REF) RUBY expect(out).to eq("WIN") @@ -462,7 +462,7 @@ def installed? bundle "update ma-gitp-gem" run <<-RUBY - require 'ma-gitp-gem' + require 'ma/gitp/gem' puts "WIN" if defined?(MAGITPGEM_PREV_REF) RUBY expect(out).to eq("WIN") diff --git a/spec/bundler/runtime/gem_tasks_spec.rb b/spec/bundler/runtime/gem_tasks_spec.rb index 4b92de76bba8ef..74270a23164424 100644 --- a/spec/bundler/runtime/gem_tasks_spec.rb +++ b/spec/bundler/runtime/gem_tasks_spec.rb @@ -57,6 +57,20 @@ expect(err).to be_empty end + context "rake build when path has spaces" do + before do + spaced_bundled_app = tmp.join("bundled app") + FileUtils.mv bundled_app, spaced_bundled_app + Dir.chdir(spaced_bundled_app) + end + + it "still runs successfully" do + bundle! "exec rake build" + + expect(err).to be_empty + end + end + it "adds 'pkg' to rake/clean's CLOBBER" do with_gem_path_as(Spec::Path.base_system_gems.to_s) do sys_exec! %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect') diff --git a/spec/bundler/runtime/inline_spec.rb b/spec/bundler/runtime/inline_spec.rb index 94d8b086a293f4..cd762fe636098e 100644 --- a/spec/bundler/runtime/inline_spec.rb +++ b/spec/bundler/runtime/inline_spec.rb @@ -333,4 +333,21 @@ def confirm(msg, newline = nil) expect(last_command).to be_success expect(out).to include("BUNDLE_GEMFILE is empty") end + + it "resets BUNDLE_GEMFILE to the empty string if it wasn't set previously" do + ENV["BUNDLE_GEMFILE"] = nil + script <<-RUBY + gemfile do + source "#{file_uri_for(gem_repo1)}" + gem "rack" + end + + puts "BUNDLE_GEMFILE is empty" if ENV["BUNDLE_GEMFILE"].empty? + system("#{Gem.ruby} -w -e '42'") # this should see original value of BUNDLE_GEMFILE + exit $?.exitstatus + RUBY + + expect(last_command).to be_success + expect(out).to include("BUNDLE_GEMFILE is empty") + end end diff --git a/spec/bundler/runtime/require_spec.rb b/spec/bundler/runtime/require_spec.rb index 490b8c7631594c..a8d78261237d36 100644 --- a/spec/bundler/runtime/require_spec.rb +++ b/spec/bundler/runtime/require_spec.rb @@ -168,7 +168,6 @@ build_lib "jquery-rails", "1.0.0" do |s| s.write "lib/jquery/rails.rb", "puts 'jquery/rails'" end - lib_path("jquery-rails-1.0.0/lib/jquery-rails.rb").rmtree end it "requires gem names that are namespaced" do @@ -241,7 +240,6 @@ build_lib "load-fuuu", "1.0.0" do |s| s.write "lib/load/fuuu.rb", "raise LoadError.new(\"cannot load such file -- load-bar\")" end - lib_path("load-fuuu-1.0.0/lib/load-fuuu.rb").rmtree gemfile <<-G path "#{lib_path}" do diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb index 39240b7404a49e..7f00a630784c4d 100644 --- a/spec/bundler/runtime/setup_spec.rb +++ b/spec/bundler/runtime/setup_spec.rb @@ -899,17 +899,17 @@ def clean_load_path(lp) describe "with git gems that don't have gemspecs" do before :each do - build_git "no-gemspec", :gemspec => false + build_git "no_gemspec", :gemspec => false install_gemfile <<-G - gem "no-gemspec", "1.0", :git => "#{lib_path("no-gemspec-1.0")}" + gem "no_gemspec", "1.0", :git => "#{lib_path("no_gemspec-1.0")}" G end it "loads the library via a virtual spec" do run <<-R - require 'no-gemspec' - puts NOGEMSPEC + require 'no_gemspec' + puts NO_GEMSPEC R expect(out).to eq("1.0") @@ -1263,6 +1263,27 @@ def lock_with(ruby_version = nil) expect(out).to eq("{}") end + it "does not load net-http-pipeline too early" do + build_repo4 do + build_gem "net-http-pipeline", "1.0.1" + end + + system_gems "net-http-pipeline-1.0.1", :gem_repo => gem_repo4 do + gemfile <<-G + source "#{file_uri_for(gem_repo4)}" + gem "net-http-pipeline", "1.0.1" + G + + bundle "config set --local path vendor/bundle" + + bundle! :install + + bundle! :check + + expect(out).to eq("The Gemfile's dependencies are satisfied") + end + end + Gem::Specification.select(&:default_gem?).map(&:name).each do |g| it "activates newer versions of #{g}" do skip if exemptions.include?(g) diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index c7f299487c10d6..b3f5f9b8761254 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -611,7 +611,7 @@ def @spec.validate(*); end unless options[:no_default] gem_source = options[:source] || "path@#{path}" @files = _default_files. - merge("lib/#{name}/source.rb" => "#{Builders.constantize(name)}_SOURCE = #{gem_source.to_s.dump}"). + merge("lib/#{entrypoint}/source.rb" => "#{Builders.constantize(name)}_SOURCE = #{gem_source.to_s.dump}"). merge(@files) end @@ -627,15 +627,20 @@ def @spec.validate(*); end end def _default_files - @_default_files ||= begin - platform_string = " #{@spec.platform}" unless @spec.platform == Gem::Platform::RUBY - { "lib/#{name}.rb" => "#{Builders.constantize(name)} = '#{version}#{platform_string}'" } - end + @_default_files ||= { "lib/#{entrypoint}.rb" => "#{Builders.constantize(name)} = '#{version}#{platform_string}'" } + end + + def entrypoint + name.tr("-", "/") end def _default_path @context.tmp("libs", @spec.full_name) end + + def platform_string + " #{@spec.platform}" unless @spec.platform == Gem::Platform::RUBY + end end class GitBuilder < LibBuilder @@ -755,7 +760,10 @@ def _default_path class PluginBuilder < GemBuilder def _default_files - @_default_files ||= super.merge("plugins.rb" => "") + @_default_files ||= { + "lib/#{name}.rb" => "#{Builders.constantize(name)} = '#{version}#{platform_string}'", + "plugins.rb" => "", + } end end diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index 7d1bd65185417b..e9c9e766cf1c68 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -210,8 +210,10 @@ def sys_exec(cmd, env = {}) yield stdin, stdout, wait_thr if block_given? stdin.close - command_execution.stdout = Thread.new { stdout.read }.value.strip - command_execution.stderr = Thread.new { stderr.read }.value.strip + stdout_read_thread = Thread.new { stdout.read } + stderr_read_thread = Thread.new { stderr.read } + command_execution.stdout = stdout_read_thread.value.strip + command_execution.stderr = stderr_read_thread.value.strip command_execution.exitstatus = wait_thr && wait_thr.value.exitstatus end diff --git a/spec/bundler/support/indexes.rb b/spec/bundler/support/indexes.rb index b76f493d01320e..dc6e0bd1e91fcc 100644 --- a/spec/bundler/support/indexes.rb +++ b/spec/bundler/support/indexes.rb @@ -45,7 +45,7 @@ def should_resolve_and_include(specs, args = []) def should_conflict_on(names) got = resolve - flunk "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}" + raise "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}" rescue Bundler::VersionConflict => e expect(Array(names).sort).to eq(e.conflicts.sort) end diff --git a/spec/bundler/support/matchers.rb b/spec/bundler/support/matchers.rb index e1a08a30cc1de6..df35854c2f3d3b 100644 --- a/spec/bundler/support/matchers.rb +++ b/spec/bundler/support/matchers.rb @@ -128,7 +128,7 @@ def indent(string, padding = 4, indent_character = " ") groups << opts @errors = names.map do |name| name, version, platform = name.split(/\s+/) - require_path = name == "bundler" ? "#{lib_dir}/bundler" : name + require_path = name == "bundler" ? "#{lib_dir}/bundler" : name.tr("-", "/") version_const = name == "bundler" ? "Bundler::VERSION" : Spec::Builders.constantize(name) begin run! "require '#{require_path}.rb'; puts #{version_const}", *groups @@ -145,7 +145,7 @@ def indent(string, padding = 4, indent_character = " ") next unless source begin source_const = "#{Spec::Builders.constantize(name)}_SOURCE" - run! "require '#{name}/source'; puts #{source_const}", *groups + run! "require '#{require_path}/source'; puts #{source_const}", *groups rescue StandardError next "#{name} does not have a source defined:\n#{indent(e)}" end From 592d7ceeebb380d197876400efdb18a27d5192b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lourens=20Naud=C3=A9?= Date: Wed, 8 Jan 2020 00:19:26 +0000 Subject: [PATCH 325/878] Speeds up fallback to Hash#default_proc in rb_hash_aref by removing a method call --- benchmark/hash_defaults.yml | 6 ++++++ hash.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 benchmark/hash_defaults.yml diff --git a/benchmark/hash_defaults.yml b/benchmark/hash_defaults.yml new file mode 100644 index 00000000000000..833f10e1c766f2 --- /dev/null +++ b/benchmark/hash_defaults.yml @@ -0,0 +1,6 @@ +prelude: | + h = Hash.new { :foo } +benchmark: + default_aref: h[1] + default_method: h.default(1) +loop_count: 1000000 diff --git a/hash.c b/hash.c index 606d5d39300a24..b6bc44edc62af9 100644 --- a/hash.c +++ b/hash.c @@ -105,7 +105,7 @@ rb_hash_freeze(VALUE hash) VALUE rb_cHash; static VALUE envtbl; -static ID id_hash, id_yield, id_default, id_flatten_bang; +static ID id_hash, id_default, id_flatten_bang; static ID id_hash_iter_lev; VALUE @@ -1945,11 +1945,14 @@ rb_hash_rehash(VALUE hash) VALUE rb_hash_default_value(VALUE hash, VALUE key) { - if (rb_method_basic_definition_p(CLASS_OF(hash), id_default)) { + VALUE args[2]; + if (LIKELY(rb_method_basic_definition_p(CLASS_OF(hash), id_default))) { VALUE ifnone = RHASH_IFNONE(hash); if (!FL_TEST(hash, RHASH_PROC_DEFAULT)) return ifnone; if (key == Qundef) return Qnil; - return rb_funcall(ifnone, id_yield, 2, hash, key); + args[0] = hash; + args[1] = key; + return rb_proc_call_with_block(ifnone, 2, args, Qnil); } else { return rb_funcall(hash, id_default, 1, key); @@ -2124,7 +2127,7 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash) if (argc == 0) return Qnil; args[0] = hash; args[1] = argv[0]; - return rb_funcallv(ifnone, id_yield, 2, args); + return rb_proc_call_with_block(ifnone, 2, args, Qnil); } return ifnone; } @@ -6312,7 +6315,6 @@ Init_Hash(void) #undef rb_intern #define rb_intern(str) rb_intern_const(str) id_hash = rb_intern("hash"); - id_yield = rb_intern("yield"); id_default = rb_intern("default"); id_flatten_bang = rb_intern("flatten!"); id_hash_iter_lev = rb_make_internal_id(); From b8fa18079df01df41debc4dbc63e22ee98425b5e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 18:12:21 +0900 Subject: [PATCH 326/878] Adjusted indents [ci skip] --- hash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hash.c b/hash.c index b6bc44edc62af9..d99d41a10d911d 100644 --- a/hash.c +++ b/hash.c @@ -1950,9 +1950,9 @@ rb_hash_default_value(VALUE hash, VALUE key) VALUE ifnone = RHASH_IFNONE(hash); if (!FL_TEST(hash, RHASH_PROC_DEFAULT)) return ifnone; if (key == Qundef) return Qnil; - args[0] = hash; - args[1] = key; - return rb_proc_call_with_block(ifnone, 2, args, Qnil); + args[0] = hash; + args[1] = key; + return rb_proc_call_with_block(ifnone, 2, args, Qnil); } else { return rb_funcall(hash, id_default, 1, key); @@ -2127,7 +2127,7 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash) if (argc == 0) return Qnil; args[0] = hash; args[1] = argv[0]; - return rb_proc_call_with_block(ifnone, 2, args, Qnil); + return rb_proc_call_with_block(ifnone, 2, args, Qnil); } return ifnone; } From 5b06dd3a4237114aac093e560abe24f87536b621 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 18:13:35 +0900 Subject: [PATCH 327/878] Hoisted out call_default_proc --- hash.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hash.c b/hash.c index d99d41a10d911d..4f72b4ca361a96 100644 --- a/hash.c +++ b/hash.c @@ -1942,17 +1942,21 @@ rb_hash_rehash(VALUE hash) return hash; } +static VALUE +call_default_proc(VALUE proc, VALUE hash, VALUE key) +{ + VALUE args[2] = {hash, key}; + return rb_proc_call_with_block(proc, 2, args, Qnil); +} + VALUE rb_hash_default_value(VALUE hash, VALUE key) { - VALUE args[2]; if (LIKELY(rb_method_basic_definition_p(CLASS_OF(hash), id_default))) { VALUE ifnone = RHASH_IFNONE(hash); if (!FL_TEST(hash, RHASH_PROC_DEFAULT)) return ifnone; if (key == Qundef) return Qnil; - args[0] = hash; - args[1] = key; - return rb_proc_call_with_block(ifnone, 2, args, Qnil); + return call_default_proc(ifnone, hash, key); } else { return rb_funcall(hash, id_default, 1, key); @@ -2119,15 +2123,13 @@ rb_hash_fetch(VALUE hash, VALUE key) static VALUE rb_hash_default(int argc, VALUE *argv, VALUE hash) { - VALUE args[2], ifnone; + VALUE ifnone; rb_check_arity(argc, 0, 1); ifnone = RHASH_IFNONE(hash); if (FL_TEST(hash, RHASH_PROC_DEFAULT)) { if (argc == 0) return Qnil; - args[0] = hash; - args[1] = argv[0]; - return rb_proc_call_with_block(ifnone, 2, args, Qnil); + return call_default_proc(ifnone, hash, argv[0]); } return ifnone; } From 23218d4ab287c63e67314e33079fba56593af4c8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 18:35:21 +0900 Subject: [PATCH 328/878] config.status should be newer than config.cache if exists --- defs/gmake.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/defs/gmake.mk b/defs/gmake.mk index 226e1066a529bf..bde5a8f782072a 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -107,6 +107,8 @@ else $(Q) $(RMALL) make_des_table* endif +config.status: $(wildcard config.cache) + STUBPROGRAM = rubystub$(EXEEXT) IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# SCRIPTBINDIR := $(if $(EXEEXT),,exec/) From f74021e12ba3b067934271ab193ed8dc694ceb04 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Wed, 8 Jan 2020 20:47:10 +0100 Subject: [PATCH 329/878] Improve docs for String#=~ Move existing example to the corresponding paragraph and add an example for `string =~ regexp` vs. `regexp =~ string`; avoid using the receiver's identifier from the call-seq because it does not appear in rendered HTML docs; mention deprecation of Object#=~; fix some markup and typos. --- string.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/string.c b/string.c index c9383937ae72ab..af02cdde519fbf 100644 --- a/string.c +++ b/string.c @@ -3785,18 +3785,23 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) * call-seq: * str =~ obj -> integer or nil * - * Match---If obj is a Regexp, use it as a pattern to match - * against str,and returns the position the match starts, or - * nil if there is no match. Otherwise, invokes - * obj.=~, passing str as an argument. The default - * =~ in Object returns nil. - * - * Note: str =~ regexp is not the same as - * regexp =~ str. Strings captured from named capture groups - * are assigned to local variables only in the second case. + * Match---If obj is a Regexp, uses it as a pattern to match + * against the receiver, and returns the position the match starts, + * or +nil+ if there is no match. Otherwise, invokes obj.=~, + * passing the string as an argument. + * The default Object#=~ (deprecated) returns +nil+. * * "cat o' 9 tails" =~ /\d/ #=> 7 * "cat o' 9 tails" =~ 9 #=> nil + * + * Note that string =~ regexp is not the same as + * regexp =~ string. Strings captured from named capture groups + * are assigned to local variables only in the second case. + * + * "no. 9" =~ /(?\d+)/ + * number #=> nil (not assigned) + * /(?\d+)/ =~ "no. 9" + * number #=> "9" */ static VALUE From 841a945d63f0662b6eae7761b951e0ddc2d94553 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 9 Jan 2020 04:51:11 +0900 Subject: [PATCH 330/878] * 2020-01-09 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1fe6cb4ec3170a..1f525b9b2451f8 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #include "ruby/version.h" From 1d09acd82bc90c0794c0409e330ecc71a912d1b3 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Wed, 8 Jan 2020 20:53:31 +0100 Subject: [PATCH 331/878] [DOC] Improve docs for String#match Fix invalid code to make it syntax highlighted; other small fixes. --- string.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/string.c b/string.c index af02cdde519fbf..2413fbf8fc0ffa 100644 --- a/string.c +++ b/string.c @@ -3831,9 +3831,9 @@ static VALUE get_pat(VALUE); * str.match(pattern, pos) -> matchdata or nil * * Converts pattern to a Regexp (if it isn't already one), - * then invokes its match method on str. If the second - * parameter is present, it specifies the position in the string to begin the - * search. + * then invokes its match method on the receiver. + * If the second parameter is present, it specifies the position + * in the string to begin the search. * * 'hello'.match('(.)\1') #=> # * 'hello'.match('(.)\1')[0] #=> "ll" @@ -3841,18 +3841,18 @@ static VALUE get_pat(VALUE); * 'hello'.match(/(.)\1/, 3) #=> nil * 'hello'.match('xx') #=> nil * - * If a block is given, invoke the block with MatchData if match succeed, so - * that you can write + * If a block is given, invokes the block with MatchData if match succeeds, + * so that you can write * - * str.match(pat) {|m| ...} + * str.match(pat) {|m| block } * * instead of * * if m = str.match(pat) - * ... + * # ... * end * - * The return value is a value from block execution in this case. + * The return value in this case is the value from block execution. */ static VALUE From 65c2c75e162ebc8c4b35b0823967eeb132c00749 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 9 Jan 2020 08:21:42 +0900 Subject: [PATCH 332/878] lib/net/imap.rb: use `&blk` instead of Kernel#proc with no block [Bug #16488] --- lib/net/imap.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/net/imap.rb b/lib/net/imap.rb index aa46e47ef119b2..720acbc86d0b42 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -903,8 +903,9 @@ def uid_sort(sort_keys, search_keys, charset) # end # } # - def add_response_handler(handler = Proc.new) - @response_handlers.push(handler) + def add_response_handler(handler = nil, &block) + raise ArgumentError, "two Procs are passed" if handler && block + @response_handlers.push(block || handler) end # Removes the response handler. @@ -959,7 +960,7 @@ def idle(timeout = nil, &response_handler) put_string("#{tag} IDLE#{CRLF}") begin - add_response_handler(response_handler) + add_response_handler(&response_handler) @idle_done_cond = new_cond @idle_done_cond.wait(timeout) @idle_done_cond = nil @@ -1267,7 +1268,7 @@ def send_command(cmd, *args, &block) @logout_command_tag = tag end if block - add_response_handler(block) + add_response_handler(&block) end begin return get_tagged_response(tag, cmd) From d254d5563e0e599f25aca9507683ee0abb9e18de Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 21:39:39 +0900 Subject: [PATCH 333/878] vcs.rb: Get rid of Kernel#open --- tool/lib/vcs.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index 3553ed51a9b0ee..85e119995aa15d 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -411,9 +411,7 @@ def export_changelog(url, from, to, path) range = [to || 'HEAD', (from ? from+1 : branch_beginning(url))].compact.join(':') IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}, %W"#{COMMAND} log -r#{range} #{url}") do |r| - open(path, 'w') do |w| - IO.copy_stream(r, w) - end + IO.copy_stream(r, path) end end @@ -661,7 +659,7 @@ def format_changelog(path, arg) def format_changelog_as_svn(path, arg) cmd = %W"#{COMMAND} log --topo-order --no-notes -z --format=%an%n%at%n%B" cmd.concat(arg) - open(path, 'w') do |w| + File.open(path, 'w') do |w| sep = "-"*72 + "\n" w.print sep cmd_pipe(cmd) do |r| From b369f5e8a2c1e4bc90c561365d42dc5674f83d6e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 10:13:08 +0900 Subject: [PATCH 334/878] Fixed up 0eeed5bcc5530edb0af2af2ccff09d067c59e8f9 `Binding#source_location` returns the `__FILE__` when created, and may not be an absolute or real path. And in the `eval` context with an explicit file name, `__dir__` also returns that name. On the other hand, `__FILE__` in `require`d script file has been expanded at searching the library. --- test/ruby/test_method.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 207be5099b4f5f..7577a53b7a16be 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -790,7 +790,9 @@ def test___dir__ assert_instance_of String, __dir__ assert_equal(File.dirname(File.realpath(__FILE__)), __dir__) bug8436 = '[ruby-core:55123] [Bug #8436]' - assert_equal(__dir__, eval("__dir__", binding, *binding.source_location), bug8436) + file, line = *binding.source_location + file = File.realpath(file) + assert_equal(__dir__, eval("__dir__", binding, file, line), bug8436) bug8662 = '[ruby-core:56099] [Bug #8662]' assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662) assert_equal("arbitrary", Object.new.instance_eval("__dir__", "arbitrary/file.rb"), bug8662) From b0e9db65c3f05e1443c2d8f4ca139182a771500c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 15:57:10 +0900 Subject: [PATCH 335/878] Include the standard `id` command output On macOS, GNU coreutils `id` is limited to NGROUPS_MAX groups, because of the backward compatibility of getgroups(2). --- spec/ruby/core/process/groups_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/ruby/core/process/groups_spec.rb b/spec/ruby/core/process/groups_spec.rb index cbbe4fed254066..33e0f9d7b3daee 100644 --- a/spec/ruby/core/process/groups_spec.rb +++ b/spec/ruby/core/process/groups_spec.rb @@ -4,6 +4,10 @@ platform_is_not :windows do it "gets an Array of the gids of groups in the supplemental group access list" do groups = `id -G`.scan(/\d+/).map { |i| i.to_i } + # Include the standard `id` command output. On macOS, GNU + # coreutils `id` is limited to NGROUPS_MAX groups, because of + # the backward compatibility of getgroups(2). + (groups |= `/usr/bin/id -G`.scan(/\d+/).map { |i| i.to_i }) rescue nil gid = Process.gid expected = (groups.sort - [gid]).uniq.sort From 97485302db2d8c66e7f6a61e38e9d5dd32d1a8c9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 23:55:40 +0900 Subject: [PATCH 336/878] Also clear MT to initialize the siphash seed --- random.c | 1 + 1 file changed, 1 insertion(+) diff --git a/random.c b/random.c index 29ac3883116065..388a3e932a149c 100644 --- a/random.c +++ b/random.c @@ -1479,6 +1479,7 @@ Init_RandomSeedCore(void) init_seed(&mt); explicit_bzero(initial_seed, DEFAULT_SEED_LEN); + explicit_bzero(&mt, sizeof(mt)); } static VALUE From 23fbee0311d34da4f623a828bf0c015a90d8edc9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 17:26:01 +0900 Subject: [PATCH 337/878] Renamed `seed` as `hash_salt` The role of this is a so-called "salt" but not "seed", rename to get rid of confusion with other "seed" of PRNG. --- random.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/random.c b/random.c index 388a3e932a149c..85e70122bd0038 100644 --- a/random.c +++ b/random.c @@ -1427,33 +1427,33 @@ random_s_rand(int argc, VALUE *argv, VALUE obj) typedef struct { st_index_t hash; uint8_t sip[16]; -} seed_keys_t; +} hash_salt_t; static union { - seed_keys_t key; - uint32_t u32[type_roomof(seed_keys_t, uint32_t)]; -} seed; + hash_salt_t key; + uint32_t u32[type_roomof(hash_salt_t, uint32_t)]; +} hash_salt; static void init_seed(struct MT *mt) { int i; - for (i = 0; i < numberof(seed.u32); ++i) - seed.u32[i] = genrand_int32(mt); + for (i = 0; i < numberof(hash_salt.u32); ++i) + hash_salt.u32[i] = genrand_int32(mt); } NO_SANITIZE("unsigned-integer-overflow", extern st_index_t rb_hash_start(st_index_t h)); st_index_t rb_hash_start(st_index_t h) { - return st_hash_start(seed.key.hash + h); + return st_hash_start(hash_salt.key.hash + h); } st_index_t rb_memhash(const void *ptr, long len) { - sip_uint64_t h = sip_hash13(seed.key.sip, ptr, len); + sip_uint64_t h = sip_hash13(hash_salt.key.sip, ptr, len); #ifdef HAVE_UINT64_T return (st_index_t)h; #else From 661e07c97e1cc742290d045dc5102e5fbdbae6a1 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 19:08:54 +0900 Subject: [PATCH 338/878] Moved the definition of `rb_define_method_if_constexpr` Inside the block where `RB_METHOD_DEFINITION_DECL` family are defined. --- include/ruby/intern.h | 4 ++++ include/ruby/ruby.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 2f60fb569ecbee..7854d637642a9c 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -1052,6 +1052,10 @@ extern "C++" { } #endif +#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) +#define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) +#endif + #define RB_UNWRAP_MACRO(...) __VA_ARGS__ #ifdef __cplusplus diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 625636fcdcb3f3..ada86dab958355 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2703,7 +2703,6 @@ RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *nam #ifdef __cplusplus #define rb_define_method(m, n, f, a) rb_define_method_tmpl::define(m, n, f) #else -#define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) #define rb_define_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method15,rb_define_methodm3) #define rb_define_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method14,rb_define_method_choose_prototype15(n)) #define rb_define_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method13,rb_define_method_choose_prototype14(n)) From 4c5eac73238a203830d43bccf22eee27d242616f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 21:39:12 +0900 Subject: [PATCH 339/878] Renamed `init_seed` as `init_hash_salt` too --- random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/random.c b/random.c index 85e70122bd0038..e96c76a7686b74 100644 --- a/random.c +++ b/random.c @@ -1435,7 +1435,7 @@ static union { } hash_salt; static void -init_seed(struct MT *mt) +init_hash_salt(struct MT *mt) { int i; @@ -1476,7 +1476,7 @@ Init_RandomSeedCore(void) fill_random_seed(initial_seed, DEFAULT_SEED_CNT); init_by_array(&mt, initial_seed, DEFAULT_SEED_CNT); - init_seed(&mt); + init_hash_salt(&mt); explicit_bzero(initial_seed, DEFAULT_SEED_LEN); explicit_bzero(&mt, sizeof(mt)); From c6b26f5ccf9296f7fbb23c055401c4f55d32efa0 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 9 Jan 2020 23:52:01 +0900 Subject: [PATCH 340/878] io.c, ruby.c: include internal/variable.h for rb_gvar_readonly_setter Same as 053f78e13988e9253d1f207bf5e23d9505112b32. emscripten requires a prototype declaration of rb_gvar_readonly_setter if it is refered as a function pointer. --- io.c | 1 + ruby.c | 1 + 2 files changed, 2 insertions(+) diff --git a/io.c b/io.c index a6a7dd3f82c399..294abfe6b057b6 100644 --- a/io.c +++ b/io.c @@ -127,6 +127,7 @@ #include "ccan/list/list.h" #include "internal/thread.h" #include "internal/transcode.h" +#include "internal/variable.h" #include "ruby/io.h" #include "ruby/thread.h" #include "ruby/util.h" diff --git a/ruby.c b/ruby.c index 2d1a437e7d7460..509ba61352be2b 100644 --- a/ruby.c +++ b/ruby.c @@ -56,6 +56,7 @@ #include "internal/missing.h" #include "internal/object.h" #include "internal/parse.h" +#include "internal/variable.h" #include "mjit.h" #include "ruby/encoding.h" #include "ruby/thread.h" From d3b28ebc7ac527724831a9fb9ec2f963235f9a21 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Thu, 9 Jan 2020 13:09:06 -0800 Subject: [PATCH 341/878] Fix warnings for URI.encode and URI.decode Use __callee__ to display the called method. Fixes [Bug #16469] --- lib/uri/common.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/uri/common.rb b/lib/uri/common.rb index b886923c9e42bc..e3ed4058572a58 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -99,7 +99,7 @@ module Escape # # => "@%3F@%21" # def escape(*arg) - warn "URI.escape is obsolete", uplevel: 1 + warn "URI.#{__callee__} is obsolete", uplevel: 1 DEFAULT_PARSER.escape(*arg) end alias encode escape @@ -130,7 +130,7 @@ def escape(*arg) # # => "http://example.com/?a=\t\r" # def unescape(*arg) - warn "URI.unescape is obsolete", uplevel: 1 + warn "URI.#{__callee__} is obsolete", uplevel: 1 DEFAULT_PARSER.unescape(*arg) end alias decode unescape From 5bdc6a012378eec226b2d7e450513f279308e907 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 10 Jan 2020 06:11:12 +0900 Subject: [PATCH 342/878] * 2020-01-10 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1f525b9b2451f8..a1ae67b9422c85 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h" From 54e31f4a5f29b076960fa6ebdd189369af982d49 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 10 Jan 2020 09:09:39 +0900 Subject: [PATCH 343/878] Update dependencies for c6b26f5ccf9296f7fbb23c055401c4f55d32efa0 --- common.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common.mk b/common.mk index 40e34fe36d5031..6341b430ce0ca1 100644 --- a/common.mk +++ b/common.mk @@ -2557,16 +2557,19 @@ io.$(OBJEXT): $(top_srcdir)/internal/stdbool.h io.$(OBJEXT): $(top_srcdir)/internal/string.h io.$(OBJEXT): $(top_srcdir)/internal/thread.h io.$(OBJEXT): $(top_srcdir)/internal/transcode.h +io.$(OBJEXT): $(top_srcdir)/internal/variable.h io.$(OBJEXT): $(top_srcdir)/internal/vm.h io.$(OBJEXT): $(top_srcdir)/internal/warnings.h io.$(OBJEXT): {$(VPATH)}assert.h io.$(OBJEXT): {$(VPATH)}builtin.h io.$(OBJEXT): {$(VPATH)}config.h +io.$(OBJEXT): {$(VPATH)}constant.h io.$(OBJEXT): {$(VPATH)}defines.h io.$(OBJEXT): {$(VPATH)}dln.h io.$(OBJEXT): {$(VPATH)}encindex.h io.$(OBJEXT): {$(VPATH)}encoding.h io.$(OBJEXT): {$(VPATH)}id.h +io.$(OBJEXT): {$(VPATH)}id_table.h io.$(OBJEXT): {$(VPATH)}intern.h io.$(OBJEXT): {$(VPATH)}internal.h io.$(OBJEXT): {$(VPATH)}io.c @@ -3522,16 +3525,19 @@ ruby.$(OBJEXT): $(top_srcdir)/internal/serial.h ruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h ruby.$(OBJEXT): $(top_srcdir)/internal/stdbool.h ruby.$(OBJEXT): $(top_srcdir)/internal/string.h +ruby.$(OBJEXT): $(top_srcdir)/internal/variable.h ruby.$(OBJEXT): $(top_srcdir)/internal/vm.h ruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h ruby.$(OBJEXT): {$(VPATH)}assert.h ruby.$(OBJEXT): {$(VPATH)}config.h +ruby.$(OBJEXT): {$(VPATH)}constant.h ruby.$(OBJEXT): {$(VPATH)}debug_counter.h ruby.$(OBJEXT): {$(VPATH)}defines.h ruby.$(OBJEXT): {$(VPATH)}dln.h ruby.$(OBJEXT): {$(VPATH)}encoding.h ruby.$(OBJEXT): {$(VPATH)}eval_intern.h ruby.$(OBJEXT): {$(VPATH)}id.h +ruby.$(OBJEXT): {$(VPATH)}id_table.h ruby.$(OBJEXT): {$(VPATH)}intern.h ruby.$(OBJEXT): {$(VPATH)}internal.h ruby.$(OBJEXT): {$(VPATH)}io.h From 499de0a0f684e4bf766bac09b02806391f62c2f3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 8 Jan 2020 23:21:42 +0900 Subject: [PATCH 344/878] Fill siphash salt directly with random data Expanding less random data with MT is not needed when it succeeded. --- random.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/random.c b/random.c index e96c76a7686b74..d02cd016c03811 100644 --- a/random.c +++ b/random.c @@ -454,6 +454,7 @@ ruby_fill_random_bytes(void *seed, size_t size, int need_secure) #define fill_random_bytes ruby_fill_random_bytes +/* cnt must be 4 or more */ static void fill_random_seed(uint32_t *seed, size_t cnt) { @@ -1466,7 +1467,12 @@ rb_memhash(const void *ptr, long len) void Init_RandomSeedCore(void) { + if (!fill_random_bytes(&hash_salt, sizeof(hash_salt), FALSE)) return; + /* + If failed to fill siphash's salt with random data, expand less random + data with MT. + Don't reuse this MT for Random::DEFAULT. Random::DEFAULT::seed shouldn't provide a hint that an attacker guess siphash's seed. */ From 0a67c214010d6b77cf1f5e520933052c5368fb7d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 9 Jan 2020 00:27:29 +0900 Subject: [PATCH 345/878] Ensure seed data to be cleared To prevent from leaking the seed data. --- random.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/random.c b/random.c index d02cd016c03811..788511da5c3cd0 100644 --- a/random.c +++ b/random.c @@ -504,6 +504,10 @@ make_seed_value(uint32_t *ptr, size_t len) return seed; } +#define with_random_seed(size, add) \ + for (uint32_t seedbuf[(size)+(add)], loop = (fill_random_seed(seedbuf, (size)), 1); \ + loop; explicit_bzero(seedbuf, (size)*sizeof(seedbuf[0])), loop = 0) + /* * call-seq: Random.new_seed -> integer * @@ -516,10 +520,9 @@ static VALUE random_seed(VALUE _) { VALUE v; - uint32_t buf[DEFAULT_SEED_CNT+1]; - fill_random_seed(buf, DEFAULT_SEED_CNT); - v = make_seed_value(buf, DEFAULT_SEED_CNT); - explicit_bzero(buf, DEFAULT_SEED_LEN); + with_random_seed(DEFAULT_SEED_CNT, 1) { + v = make_seed_value(seedbuf, DEFAULT_SEED_CNT); + } return v; } @@ -1477,30 +1480,15 @@ Init_RandomSeedCore(void) provide a hint that an attacker guess siphash's seed. */ struct MT mt; - uint32_t initial_seed[DEFAULT_SEED_CNT]; - fill_random_seed(initial_seed, DEFAULT_SEED_CNT); - init_by_array(&mt, initial_seed, DEFAULT_SEED_CNT); + with_random_seed(DEFAULT_SEED_CNT, 0) { + init_by_array(&mt, seedbuf, DEFAULT_SEED_CNT); + } init_hash_salt(&mt); - - explicit_bzero(initial_seed, DEFAULT_SEED_LEN); explicit_bzero(&mt, sizeof(mt)); } -static VALUE -init_randomseed(struct MT *mt) -{ - uint32_t initial[DEFAULT_SEED_CNT+1]; - VALUE seed; - - fill_random_seed(initial, DEFAULT_SEED_CNT); - init_by_array(mt, initial, DEFAULT_SEED_CNT); - seed = make_seed_value(initial, DEFAULT_SEED_CNT); - explicit_bzero(initial, DEFAULT_SEED_LEN); - return seed; -} - /* construct Random::DEFAULT bits */ static VALUE Init_Random_default(VALUE klass) @@ -1510,7 +1498,10 @@ Init_Random_default(VALUE klass) VALUE v = TypedData_Wrap_Struct(klass, &random_mt_type, r); rb_gc_register_mark_object(v); - r->seed = init_randomseed(mt); + with_random_seed(DEFAULT_SEED_CNT, 1) { + init_by_array(mt, seedbuf, DEFAULT_SEED_CNT); + r->seed = make_seed_value(seedbuf, DEFAULT_SEED_CNT); + } return v; } From db0398dc04a5eb1e76955f6a80fcfe3041782371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 10 Jan 2020 15:16:48 +0900 Subject: [PATCH 346/878] fix typos --- internal/bits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/bits.h b/internal/bits.h index 7c1be2aa17a9f3..802a8af7eb4b11 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -213,7 +213,7 @@ nlz_int32(uint32_t x) #elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) return (unsigned int)_lzcnt_u32(x); -#elif defined(_MSC_VER) && defined(_Win64) /* &&! defined(__AVX2__) */ +#elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ unsigned long r; return _BitScanReverse(&r, x) ? (int)r : 32; @@ -242,7 +242,7 @@ nlz_int64(uint64_t x) #elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) return (unsigned int)_lzcnt_u64(x); -#elif defined(_MSC_VER) && defined(_Win64) /* &&! defined(__AVX2__) */ +#elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ unsigned long r; return _BitScanReverse64(&r, x) ? (unsigned int)r : 64; @@ -285,7 +285,7 @@ nlz_int128(uint128_t x) return 128; } else if (y == 0) { - return (unsigned int)nlz_int64(y) + 64; + return (unsigned int)nlz_int64(x) + 64; } else { return (unsigned int)nlz_int64(y); From 7fed7eb50b2b95ac4eeb3d29af3ce7b7d500032a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 10 Jan 2020 19:24:59 +0900 Subject: [PATCH 347/878] fix Windows breakage Fixing typo revealed that _BitScanReverse is BSR, which behaves differently than LZCNT. What we want here is LZCNT so we have to emulate. --- internal/bits.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/bits.h b/internal/bits.h index 802a8af7eb4b11..9d4e71fc8fbebf 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -215,7 +215,7 @@ nlz_int32(uint32_t x) #elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ unsigned long r; - return _BitScanReverse(&r, x) ? (int)r : 32; + return _BitScanReverse(&r, x) ? (31 - (int)r) : 32; #elif __has_builtin(__builtin_clz) STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT == 32); @@ -244,7 +244,7 @@ nlz_int64(uint64_t x) #elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ unsigned long r; - return _BitScanReverse64(&r, x) ? (unsigned int)r : 64; + return _BitScanReverse64(&r, x) ? (63u - (unsigned int)r) : 64; #elif __has_builtin(__builtin_clzl) if (x == 0) { From 79dcd26aecaba5f9cff284ad6680e526e9c0f0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 9 Jan 2020 15:13:52 +0900 Subject: [PATCH 348/878] more use of MSC_VERSION_SINCE Replaces `#ifdef _MSC_VER` with more accurate version checks. Also, `defined(_WIN64) && defined(__AVX2__)` is redundant because there is no such tihng like a 32bit AVX2 machine. --- internal/bits.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/internal/bits.h b/internal/bits.h index 9d4e71fc8fbebf..1016f31803f320 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -25,8 +25,9 @@ #include "ruby/config.h" #include /* for CHAR_BITS */ #include /* for uintptr_t */ +#include "internal/compilers.h" /* for MSC_VERSION_SINCE */ -#ifdef _MSC_VER +#if MSC_VERSION_SINCE(1310) # include /* for _byteswap_uint64 */ #endif @@ -35,16 +36,17 @@ # include /* for _lzcnt_u64 */ #endif -#if defined(_MSC_VER) && defined(_WIN64) +#if MSC_VERSION_SINCE(1400) # include /* for the following intrinsics */ # pragma intrinsic(_BitScanForward) -# pragma intrinsic(_BitScanForward64) # pragma intrinsic(_BitScanReverse) -# pragma intrinsic(_BitScanReverse64) +# ifdef _WIN64 +# pragma intrinsic(_BitScanForward64) +# pragma intrinsic(_BitScanReverse64) +# endif #endif #include "ruby/ruby.h" /* for VALUE */ -#include "internal/compilers.h" /* for __has_builtin */ #include "internal/static_assert.h" /* for STATIC_ASSERT */ /* The most significant bit of the lower part of half-long integer. @@ -156,7 +158,7 @@ ruby_swap16(uint16_t x) #if __has_builtin(__builtin_bswap16) return __builtin_bswap16(x); -#elif defined(_MSC_VER) +#elif MSC_VERSION_SINCE(1310) return _byteswap_ushort(x); #else @@ -171,7 +173,7 @@ ruby_swap32(uint32_t x) #if __has_builtin(__builtin_bswap32) return __builtin_bswap32(x); -#elif defined(_MSC_VER) +#elif MSC_VERSION_SINCE(1310) return _byteswap_ulong(x); #else @@ -188,7 +190,7 @@ ruby_swap64(uint64_t x) #if __has_builtin(__builtin_bswap64) return __builtin_bswap64(x); -#elif defined(_MSC_VER) +#elif MSC_VERSION_SINCE(1310) return _byteswap_uint64(x); #else @@ -203,7 +205,7 @@ ruby_swap64(uint64_t x) static inline unsigned int nlz_int32(uint32_t x) { -#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX2__) +#if defined(_MSC_VER) && defined(__AVX2__) /* Note: It seems there is no such tihng like __LZCNT__ predefined in MSVC. * AMD CPUs have had this instruction for decades (since K10) but for * Intel, Haswell is the oldest one. We need to use __AVX2__ for maximum @@ -213,7 +215,7 @@ nlz_int32(uint32_t x) #elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) return (unsigned int)_lzcnt_u32(x); -#elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ +#elif MSC_VERSION_SINCE(1400) /* &&! defined(__AVX2__) */ unsigned long r; return _BitScanReverse(&r, x) ? (31 - (int)r) : 32; @@ -236,13 +238,13 @@ nlz_int32(uint32_t x) static inline unsigned int nlz_int64(uint64_t x) { -#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX2__) +#if defined(_MSC_VER) && defined(__AVX2__) return (unsigned int)__lzcnt64(x); #elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) return (unsigned int)_lzcnt_u64(x); -#elif defined(_MSC_VER) && defined(_WIN64) /* &&! defined(__AVX2__) */ +#elif defined(_WIN64) && MSC_VERSION_SINCE(1400) /* &&! defined(__AVX2__) */ unsigned long r; return _BitScanReverse64(&r, x) ? (63u - (unsigned int)r) : 64; @@ -357,7 +359,7 @@ nlz_intptr(uintptr_t x) static inline unsigned int rb_popcount32(uint32_t x) { -#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX__) +#if defined(_MSC_VER) && defined(__AVX__) /* Note: CPUs since Nehalem and Barcelona have had this instruction so SSE * 4.2 should suffice, but it seems there is no such thing like __SSE_4_2__ * predefined macro in MSVC. They do have __AVX__ so use it instead. */ @@ -381,7 +383,7 @@ rb_popcount32(uint32_t x) static inline unsigned int rb_popcount64(uint64_t x) { -#if defined(_MSC_VER) && defined(_WIN64) && defined(__AVX__) +#if defined(_MSC_VER) && defined(__AVX__) return (unsigned int)__popcnt64(x); #elif __has_builtin(__builtin_popcount) @@ -428,7 +430,7 @@ ntz_int32(uint32_t x) #if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER) return (unsigned)_tzcnt_u32(x); -#elif defined(_MSC_VER) && defined(_WIN64) +#elif MSC_VERSION_SINCE(1400) /* :FIXME: Is there any way to issue TZCNT instead of BSF, apart from using * assembly? Because issueing LZCNT seems possible (see nlz.h). */ unsigned long r; @@ -450,7 +452,7 @@ ntz_int64(uint64_t x) #if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER) return (unsigned)_tzcnt_u64(x); -#elif defined(_MSC_VER) && defined(_WIN64) +#elif defined(_WIN64) && MSC_VERSION_SINCE(1400) unsigned long r; return _BitScanForward64(&r, x) ? (int)r : 64; From 13064fe5db237872fcb9dfafb05cbdf2ddd07e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 9 Jan 2020 16:50:59 +0900 Subject: [PATCH 349/878] avoid undefined behaviour when n==0 ISO/IEC 9899:1999 section 6.5.7 states that "If the value of the right operand is negative or is greater than or equal to the width of the promoted left operand, the behavior is undefined". So we have to take care of such situations. This has not been a problem because contemporary C compilers are extraordinary smart to compile the series of shifts into a single ROTLQ/ROTRQ machine instruction. In contrast to what C says those instructions have fully defined behaviour for all possible inputs. Hence it has been quite difficult to observe the undefined-ness of such situations. But undefined is undefined. We should not rely on such target-specific assumptions. We are fixing the situation by carefully avoiding shifts with out-of- range values. At least GCC since 4.6.3 and Clang since 8.0 can issue the exact same instructions like before the changeset. Also in case of Intel processors, there supposedly be intrinsics named _rotr/_rotl that do exactly what we need. They, in practice, are absent on Clang before 9.x so we cannot blindly use. But we can at least save MSVC. See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57157 https://bugs.llvm.org/show_bug.cgi?id=17332 --- configure.ac | 1 + internal/bits.h | 56 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 55b2d93eae59fa..548849d612b715 100644 --- a/configure.ac +++ b/configure.ac @@ -1104,6 +1104,7 @@ AC_CHECK_HEADERS(syscall.h) AC_CHECK_HEADERS(time.h) AC_CHECK_HEADERS(ucontext.h) AC_CHECK_HEADERS(utime.h) +AC_CHECK_HEADERS(x86intrin.h) AC_ARG_WITH([gmp], [AS_HELP_STRING([--without-gmp], diff --git a/internal/bits.h b/internal/bits.h index 1016f31803f320..52da71264c8099 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -15,12 +15,16 @@ * @see https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateleft * @see https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateright * @see https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/byteswap-uint64-byteswap-ulong-byteswap-ushort + * @see https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/rotl-rotl64-rotr-rotr64 * @see https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64 * @see https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanreverse-bitscanreverse64 * @see https://docs.microsoft.com/en-us/cpp/intrinsics/lzcnt16-lzcnt-lzcnt64 * @see https://docs.microsoft.com/en-us/cpp/intrinsics/popcnt16-popcnt-popcnt64 * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_lzcnt_u32 * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_tzcnt_u32 + * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_rotl64 + * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_rotr64 + * @see https://stackoverflow.com/a/776523 */ #include "ruby/config.h" #include /* for CHAR_BITS */ @@ -31,13 +35,33 @@ # include /* for _byteswap_uint64 */ #endif -#if defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER) +#if defined(HAVE_X86INTRIN_H) && ! defined(MJIT_HEADER) # /* Rule out MJIT_HEADER, which does not interface well with */ -# include /* for _lzcnt_u64 */ +# include /* for _lzcnt_u64 */ +#elif MSC_VERSION_SINCE(1310) +# include /* for the following intrinsics */ +#endif + +#if defined(_MSC_VER) && defined(__AVX__) +# pragma intrinsic(__popcnt) +# pragma intrinsic(__popcnt64) +#endif + +#if defined(_MSC_VER) && defined(__AVX2__) +# pragma intrinsic(__lzcnt) +# pragma intrinsic(__lzcnt64) +#endif + +#if MSC_VERSION_SINCE(1310) +# pragma intrinsic(_rotl) +# pragma intrinsic(_rotr) +# ifdef _WIN64 +# pragma intrinsic(_rotl64) +# pragma intrinsic(_rotr64) +# endif #endif #if MSC_VERSION_SINCE(1400) -# include /* for the following intrinsics */ # pragma intrinsic(_BitScanForward) # pragma intrinsic(_BitScanReverse) # ifdef _WIN64 @@ -500,9 +524,18 @@ RUBY_BIT_ROTL(VALUE v, int n) #elif __has_builtin(__builtin_rotateleft64) && (SIZEOF_VALUE * CHAR_BIT == 64) return __builtin_rotateleft64(v, n); +#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 32) + return _rotl(v, n); + +#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 64) + return _rotl64(v, n); + +#elif defined(_lrotl) && (SIZEOF_VALUE == SIZEOF_LONG) + return _lrotl(v, n); + #else - const int m = sizeof(VALUE) * CHAR_BIT; - return (v << n) | (v >> (m - n)); + const int m = (sizeof(VALUE) * CHAR_BIT) - 1; + return (v << (n & m)) | (v >> (-n & m)); #endif } @@ -515,9 +548,18 @@ RUBY_BIT_ROTR(VALUE v, int n) #elif __has_builtin(__builtin_rotateright64) && (SIZEOF_VALUE * CHAR_BIT == 64) return __builtin_rotateright64(v, n); +#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 32) + return _rotr(v, n); + +#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 64) + return _rotr64(v, n); + +#elif defined(_lrotr) && (SIZEOF_VALUE == SIZEOF_LONG) + return _lrotr(v, n); + #else - const int m = sizeof(VALUE) * CHAR_BIT; - return (v << (m - n)) | (v >> n); + const int m = (sizeof(VALUE) * CHAR_BIT) - 1; + return (v << (-n & m)) | (v >> (n & m)); #endif } From 135b533e84ea04d0a494422efba635e5c9f2bfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 10 Jan 2020 20:29:24 +0900 Subject: [PATCH 350/878] add missing #include --- internal/compilers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/compilers.h b/internal/compilers.h index 68e2d33e288905..bdaaa20a21b418 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -210,6 +210,7 @@ __extension__({ \ RB_BUILTIN_TYPE(arg_obj); \ }) #else +# include "ruby/ruby.h" static inline int rb_obj_builtin_type(VALUE obj) { From 1b4d406e3a04032b6d01e92b6d184a16945c6ac3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 10 Jan 2020 21:26:43 +0900 Subject: [PATCH 351/878] Hash#transform_values should return a plain new Hash [Bug #16498] --- hash.c | 13 +++++++++---- test/ruby/test_hash.rb | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hash.c b/hash.c index 4f72b4ca361a96..f68eaaabd4086f 100644 --- a/hash.c +++ b/hash.c @@ -1549,10 +1549,8 @@ rb_hash_new_with_size(st_index_t size) } static VALUE -hash_dup(VALUE hash, VALUE klass, VALUE flags) +hash_copy(VALUE ret, VALUE hash) { - VALUE ret = hash_alloc_flags(klass, flags, - RHASH_IFNONE(hash)); if (!RHASH_EMPTY_P(hash)) { if (RHASH_AR_TABLE_P(hash)) ar_copy(ret, hash); @@ -1562,6 +1560,13 @@ hash_dup(VALUE hash, VALUE klass, VALUE flags) return ret; } +static VALUE +hash_dup(VALUE hash, VALUE klass, VALUE flags) +{ + return hash_copy(hash_alloc_flags(klass, flags, RHASH_IFNONE(hash)), + hash); +} + VALUE rb_hash_dup(VALUE hash) { @@ -3213,7 +3218,7 @@ rb_hash_transform_values(VALUE hash) VALUE result; RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); - result = hash_dup(hash, rb_cHash, 0); + result = hash_copy(hash_alloc(rb_cHash), hash); if (!RHASH_EMPTY_P(hash)) { rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, 0); diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 733bccd1386b45..ef32cff8682aa3 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1674,9 +1674,15 @@ def test_transform_keys_bang def test_transform_values x = @cls[a: 1, b: 2, c: 3] + x.default = 42 y = x.transform_values {|v| v ** 2 } assert_equal([1, 4, 9], y.values_at(:a, :b, :c)) assert_not_same(x, y) + assert_nil(y.default) + + x.default_proc = proc {|h, k| k} + y = x.transform_values {|v| v ** 2 } + assert_nil(y.default_proc) y = x.transform_values.with_index {|v, i| "#{v}.#{i}" } assert_equal(%w(1.0 2.1 3.2), y.values_at(:a, :b, :c)) From 7693897a1153c83cb2bdc147552e2fa2aa47f0c7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 10 Jan 2020 21:48:20 +0900 Subject: [PATCH 352/878] Reduced duplicate code --- hash.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hash.c b/hash.c index f68eaaabd4086f..878f2b1790a3b3 100644 --- a/hash.c +++ b/hash.c @@ -1801,12 +1801,7 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass) tmp = rb_hash_s_try_convert(Qnil, argv[0]); if (!NIL_P(tmp)) { hash = hash_alloc(klass); - if (RHASH_AR_TABLE_P(tmp)) { - ar_copy(hash, tmp); - } - else { - RHASH_ST_TABLE_SET(hash, st_copy(RHASH_ST_TABLE(tmp))); - } + hash_copy(hash, tmp); return hash; } From e04366056af5fb55db1e3d38a39fbe3316b13e9c Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 10 Jan 2020 22:56:46 +0900 Subject: [PATCH 353/878] Update the upstream repository of bundler --- doc/maintainers.rdoc | 2 +- tool/sync_default_gems.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 98de9f25497550..81e42fe6320837 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -148,7 +148,7 @@ Zachary Scott (zzak) https://rubygems.org/gems/benchmark [lib/bundler.rb, lib/bundler/*] Hiroshi SHIBATA (hsbt) - https://github.com/bundler/bundler + https://github.com/rubygems/bundler https://rubygems.org/gems/bundler [lib/cgi.rb, lib/cgi/*] Takeyuki Fujioka (xibbar) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index c9ca81f786a284..c206017ae24ac8 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -1,7 +1,7 @@ # sync following repositories to ruby repository # # * https://github.com/rubygems/rubygems -# * https://github.com/bundler/bundler +# * https://github.com/rubygems/bundler # * https://github.com/ruby/rdoc # * https://github.com/ruby/reline # * https://github.com/flori/json @@ -56,7 +56,7 @@ $repositories = { rubygems: 'rubygems/rubygems', - bundler: 'bundler/bundler', + bundler: 'rubygems/bundler', rdoc: 'ruby/rdoc', reline: 'ruby/reline', json: 'flori/json', From b53d8230f1fed0f99a8a852d853bbd9b5c353fed Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 10 Jan 2020 22:57:20 +0900 Subject: [PATCH 354/878] Fixed the wrong url for benchmark --- doc/maintainers.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 81e42fe6320837..071c958d30e43b 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -144,7 +144,7 @@ Zachary Scott (zzak) [lib/benchmark.rb] _unmaintained_ - https://github.com/bundler/benchmark + https://github.com/ruby/benchmark https://rubygems.org/gems/benchmark [lib/bundler.rb, lib/bundler/*] Hiroshi SHIBATA (hsbt) From 40c57ad4a13898760b81a99dac181e5bf61afe47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lourens=20Naud=C3=A9?= Date: Sat, 4 Jan 2020 00:45:58 +0000 Subject: [PATCH 355/878] Let execution context local storage be an ID table --- benchmark/fiber_locals.yml | 8 ++++++++ common.mk | 1 + cont.c | 5 +++-- thread.c | 35 ++++++++++++++++++----------------- vm.c | 13 +++++++++++-- vm_core.h | 2 +- 6 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 benchmark/fiber_locals.yml diff --git a/benchmark/fiber_locals.yml b/benchmark/fiber_locals.yml new file mode 100644 index 00000000000000..8588686477853a --- /dev/null +++ b/benchmark/fiber_locals.yml @@ -0,0 +1,8 @@ +prelude: | + th = Thread.current + th[:key] = :val +benchmark: + key?: th.key?(:key) + []: th[:key] + keys: th.keys +loop_count: 1_000_000 diff --git a/common.mk b/common.mk index 6341b430ce0ca1..22e7d99237fbfa 100644 --- a/common.mk +++ b/common.mk @@ -1919,6 +1919,7 @@ cont.$(OBJEXT): {$(VPATH)}defines.h cont.$(OBJEXT): {$(VPATH)}eval_intern.h cont.$(OBJEXT): {$(VPATH)}gc.h cont.$(OBJEXT): {$(VPATH)}id.h +cont.$(OBJEXT): {$(VPATH)}id_table.h cont.$(OBJEXT): {$(VPATH)}intern.h cont.$(OBJEXT): {$(VPATH)}internal.h cont.$(OBJEXT): {$(VPATH)}method.h diff --git a/cont.c b/cont.c index d4a2bf93538032..df197a7363aa5c 100644 --- a/cont.c +++ b/cont.c @@ -27,6 +27,7 @@ #include "internal/warnings.h" #include "mjit.h" #include "vm_core.h" +#include "id_table.h" static const int DEBUG = 0; @@ -1018,7 +1019,7 @@ fiber_free(void *ptr) //if (DEBUG) fprintf(stderr, "fiber_free: %p[%p]\n", fiber, fiber->stack.base); if (fiber->cont.saved_ec.local_storage) { - st_free_table(fiber->cont.saved_ec.local_storage); + rb_id_table_free(fiber->cont.saved_ec.local_storage); } cont_free(&fiber->cont); @@ -1037,7 +1038,7 @@ fiber_memsize(const void *ptr) * vm.c::thread_memsize already counts th->ec->local_storage */ if (saved_ec->local_storage && fiber != th->root_fiber) { - size += st_memsize(saved_ec->local_storage); + size += rb_id_table_memsize(saved_ec->local_storage); } size += cont_memsize(&fiber->cont); return size; diff --git a/thread.c b/thread.c index 4faf04c1ce9ff5..5b23eaa92e324e 100644 --- a/thread.c +++ b/thread.c @@ -3219,11 +3219,11 @@ threadptr_local_aref(rb_thread_t *th, ID id) return th->ec->local_storage_recursive_hash; } else { - st_data_t val; - st_table *local_storage = th->ec->local_storage; + VALUE val; + struct rb_id_table *local_storage = th->ec->local_storage; - if (local_storage != NULL && st_lookup(local_storage, id, &val)) { - return (VALUE)val; + if (local_storage != NULL && rb_id_table_lookup(local_storage, id, &val)) { + return val; } else { return Qnil; @@ -3340,7 +3340,7 @@ rb_thread_fetch(int argc, VALUE *argv, VALUE self) return target_th->ec->local_storage_recursive_hash; } else if (id && target_th->ec->local_storage && - st_lookup(target_th->ec->local_storage, id, &val)) { + rb_id_table_lookup(target_th->ec->local_storage, id, &val)) { return val; } else if (block_given) { @@ -3362,18 +3362,18 @@ threadptr_local_aset(rb_thread_t *th, ID id, VALUE val) return val; } else { - st_table *local_storage = th->ec->local_storage; + struct rb_id_table *local_storage = th->ec->local_storage; if (NIL_P(val)) { if (!local_storage) return Qnil; - st_delete_wrap(local_storage, id); + rb_id_table_delete(local_storage, id); return Qnil; } else { if (local_storage == NULL) { - th->ec->local_storage = local_storage = st_init_numtable(); + th->ec->local_storage = local_storage = rb_id_table_create(0); } - st_insert(local_storage, id, val); + rb_id_table_insert(local_storage, id, val); return val; } } @@ -3486,13 +3486,14 @@ rb_thread_variable_set(VALUE thread, VALUE id, VALUE val) static VALUE rb_thread_key_p(VALUE self, VALUE key) { + VALUE val; ID id = rb_check_id(&key); - st_table *local_storage = rb_thread_ptr(self)->ec->local_storage; + struct rb_id_table *local_storage = rb_thread_ptr(self)->ec->local_storage; if (!id || local_storage == NULL) { return Qfalse; } - else if (st_is_member(local_storage, id)) { + else if (rb_id_table_lookup(local_storage, id, &val)) { return Qtrue; } else { @@ -3500,11 +3501,11 @@ rb_thread_key_p(VALUE self, VALUE key) } } -static int -thread_keys_i(ID key, VALUE value, VALUE ary) +static enum rb_id_table_iterator_result +thread_keys_i(ID key, VALUE value, void *ary) { - rb_ary_push(ary, ID2SYM(key)); - return ST_CONTINUE; + rb_ary_push((VALUE)ary, ID2SYM(key)); + return ID_TABLE_CONTINUE; } int @@ -3530,11 +3531,11 @@ rb_thread_alone(void) static VALUE rb_thread_keys(VALUE self) { - st_table *local_storage = rb_thread_ptr(self)->ec->local_storage; + struct rb_id_table *local_storage = rb_thread_ptr(self)->ec->local_storage; VALUE ary = rb_ary_new(); if (local_storage) { - st_foreach(local_storage, thread_keys_i, ary); + rb_id_table_foreach(local_storage, thread_keys_i, (void *)ary); } return ary; } diff --git a/vm.c b/vm.c index 5dd78a5e83b77e..e772d3b1124413 100644 --- a/vm.c +++ b/vm.c @@ -2501,6 +2501,13 @@ rb_execution_context_update(const rb_execution_context_t *ec) } } +static enum rb_id_table_iterator_result +mark_local_storage_i(VALUE local, void *data) +{ + rb_gc_mark(local); + return ID_TABLE_CONTINUE; +} + void rb_execution_context_mark(const rb_execution_context_t *ec) { @@ -2544,7 +2551,9 @@ rb_execution_context_mark(const rb_execution_context_t *ec) RUBY_MARK_UNLESS_NULL(ec->errinfo); RUBY_MARK_UNLESS_NULL(ec->root_svar); - rb_mark_tbl(ec->local_storage); + if (ec->local_storage) { + rb_id_table_foreach_values(ec->local_storage, mark_local_storage_i, NULL); + } RUBY_MARK_UNLESS_NULL(ec->local_storage_recursive_hash); RUBY_MARK_UNLESS_NULL(ec->local_storage_recursive_hash_for_trace); RUBY_MARK_UNLESS_NULL(ec->private_const_reference); @@ -2639,7 +2648,7 @@ thread_memsize(const void *ptr) size += th->ec->vm_stack_size * sizeof(VALUE); } if (th->ec->local_storage) { - size += st_memsize(th->ec->local_storage); + size += rb_id_table_memsize(th->ec->local_storage); } return size; } diff --git a/vm_core.h b/vm_core.h index 70575fa66b8088..a2f6af3c3095ba 100644 --- a/vm_core.h +++ b/vm_core.h @@ -865,7 +865,7 @@ typedef struct rb_execution_context_struct { struct rb_thread_struct *thread_ptr; /* storage (ec (fiber) local) */ - st_table *local_storage; + struct rb_id_table *local_storage; VALUE local_storage_recursive_hash; VALUE local_storage_recursive_hash_for_trace; From 52a9e4ffd3c868214ded91592cf12837bc60f80e Mon Sep 17 00:00:00 2001 From: git Date: Sat, 11 Jan 2020 10:40:57 +0900 Subject: [PATCH 356/878] * 2020-01-11 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index a1ae67b9422c85..2ce6702e90a5d1 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" From 8bb24712de04cfa8bb1dbfc0c3cee3de6eb4b40d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 11 Jan 2020 10:14:53 +0900 Subject: [PATCH 357/878] Added assertions for newline decorators --- test/ruby/test_econv.rb | 13 +++++++++++++ test/ruby/test_transcode.rb | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index a469614d8491ba..caa0fca8b700ae 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -912,6 +912,19 @@ def test_newline_option assert_raise_with_message(ArgumentError, /\u{3042}/) { Encoding::Converter.new("", "", newline: "\u{3042}".to_sym) } + newlines = %i[universal_newline crlf_newline cr_newline] + (2..newlines.size).each do |i| + newlines.combination(i) do |opts| + assert_raise(Encoding::ConverterNotFoundError, "#{opts} are mutually exclusive") do + Encoding::Converter.new("", "", **opts.inject({}) {|o,nl|o[nl]=true;o}) + end + end + end + newlines.each do |nl| + opts = {newline: :universal, nl => true} + ec2 = Encoding::Converter.new("", "", **opts) + assert_equal(ec1, ec2) + end end def test_default_external diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index f405877dd521a5..3466a3bf933c49 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -2242,12 +2242,19 @@ def test_scrub_encode_with_coderange "#{bug} coderange should not have side effects") end - def test_universal_newline + def test_newline_options bug11324 = '[ruby-core:69841] [Bug #11324]' usascii = Encoding::US_ASCII s = "A\nB\r\nC".force_encoding(usascii) assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true), bug11324) assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true, undef: :replace), bug11324) assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true, undef: :replace, replace: ''), bug11324) + assert_equal("A\nB\nC", s.encode(usascii, newline: :universal)) + assert_equal("A\nB\nC", s.encode(usascii, newline: :universal, undef: :replace)) + assert_equal("A\nB\nC", s.encode(usascii, newline: :universal, undef: :replace, replace: '')) + assert_equal("A\rB\r\rC", s.encode(usascii, cr_newline: true)) + assert_equal("A\rB\r\rC", s.encode(usascii, newline: :cr)) + assert_equal("A\r\nB\r\r\nC", s.encode(usascii, crlf_newline: true)) + assert_equal("A\r\nB\r\r\nC", s.encode(usascii, newline: :crlf)) end end From eb737916b1e435ff8212913c03e5798089b0d3fe Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 11 Jan 2020 10:19:29 +0900 Subject: [PATCH 358/878] Warn when :newline precedes other newline options --- test/ruby/test_econv.rb | 4 +++- transcode.c | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index caa0fca8b700ae..5a4af9b6a3d8d1 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -922,7 +922,9 @@ def test_newline_option end newlines.each do |nl| opts = {newline: :universal, nl => true} - ec2 = Encoding::Converter.new("", "", **opts) + ec2 = assert_warning(/:newline option preceds/, opts.inspect) do + Encoding::Converter.new("", "", **opts) + end assert_equal(ec1, ec2) end end diff --git a/transcode.c b/transcode.c index a336f5d9ada1d4..5cdaaaf61fa5d4 100644 --- a/transcode.c +++ b/transcode.c @@ -2418,6 +2418,7 @@ static int econv_opts(VALUE opt, int ecflags) { VALUE v; + int newlineflag = 0; v = rb_hash_aref(opt, sym_invalid); if (NIL_P(v)) { @@ -2463,6 +2464,7 @@ econv_opts(VALUE opt, int ecflags) #ifdef ENABLE_ECONV_NEWLINE_OPTION v = rb_hash_aref(opt, sym_newline); if (!NIL_P(v)) { + newlineflag = 2; ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK; if (v == sym_universal) { ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR; @@ -2484,10 +2486,9 @@ econv_opts(VALUE opt, int ecflags) rb_raise(rb_eArgError, "unexpected value for newline option"); } } - else #endif { - int setflags = 0, newlineflag = 0; + int setflags = 0; v = rb_hash_aref(opt, sym_universal_newline); if (RTEST(v)) @@ -2504,9 +2505,15 @@ econv_opts(VALUE opt, int ecflags) setflags |= ECONV_CR_NEWLINE_DECORATOR; newlineflag |= !NIL_P(v); - if (newlineflag) { + switch (newlineflag) { + case 1: ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK; ecflags |= setflags; + break; + + case 3: + rb_warning(":newline option preceds other newline options"); + break; } } From 7584853cfed9eaeaf6e932578362db0ffa74bcac Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 11 Jan 2020 10:43:39 +0900 Subject: [PATCH 359/878] st_delete_wrap is no longer used --- thread.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/thread.c b/thread.c index 5b23eaa92e324e..ee73f364bc4455 100644 --- a/thread.c +++ b/thread.c @@ -150,12 +150,6 @@ struct waiting_fd { int fd; }; -inline static void -st_delete_wrap(st_table *table, st_data_t key) -{ - st_delete(table, &key, 0); -} - /********************************************************************************/ #define THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION From e62aead26909e83f2c8b940186047f0a88b9f2d6 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sat, 11 Jan 2020 16:24:16 +0900 Subject: [PATCH 360/878] Add branch option to checkout on push --- .github/workflows/cygwin.yml | 4 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/mingw.yml | 3 ++- .github/workflows/mjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 0918ddbb22b204..b8360d4523f24a 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -44,10 +44,10 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} if: github.event_name == 'push' - shell: cmd + shell: bash - name: Checkout a pull request run: | git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5cbcd445aa2371..d86f03845f9426 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 61b607c90cd87b..cea26a51c26581 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -39,9 +39,10 @@ jobs: # Not using official actions/checkout@v2 because it's unstable. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' + shell: bash - name: Checkout a pull request run: | git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 540dbb7354f0d9..e7730506d23760 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -24,7 +24,7 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 66d7065d631bd7..7a40c24acf6a9a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -55,7 +55,7 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard "$GITHUB_SHA" if: github.event_name == 'push' - name: Checkout a pull request diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3a4de2324502d8..82cca9353b677a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,9 +40,10 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} if: github.event_name == 'push' + shell: bash - name: Checkout a pull request run: | git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src From 012f297311817ecb19f78c55854b033bb4b0397c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 11 Jan 2020 16:32:56 +0900 Subject: [PATCH 361/878] Get rid of use of magic number 'E' --- marshal.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/marshal.c b/marshal.c index 299902712c914c..532627118e08db 100644 --- a/marshal.c +++ b/marshal.c @@ -585,7 +585,7 @@ w_obj_each(st_data_t key, st_data_t val, st_data_t a) if (to_be_skipped_id(id)) { if (id == s_encoding_short) { - rb_warn("instance variable `E' on class %"PRIsVALUE" is not dumped", + rb_warn("instance variable `"name_s_encoding_short"' on class %"PRIsVALUE" is not dumped", CLASS_OF(arg->obj)); } return ST_CONTINUE; @@ -1371,6 +1371,13 @@ r_bytes0(long len, struct load_arg *arg) return str; } +static inline int +name_equal(const char *name, size_t nlen, const char *p, long l) +{ + if ((size_t)l != nlen || *p != *name) return 0; + return nlen == 1 || memcmp(p+1, name+1, nlen-1) == 0; +} + static int sym2encidx(VALUE sym, VALUE val) { @@ -1380,12 +1387,11 @@ sym2encidx(VALUE sym, VALUE val) if (rb_enc_get_index(sym) != ENCINDEX_US_ASCII) return -1; RSTRING_GETMEM(sym, p, l); if (l <= 0) return -1; - if (l == sizeof(name_encoding) && - memcmp(p, name_encoding, sizeof(name_encoding)) == 0) { + if (name_equal(name_encoding, sizeof(name_encoding), p, l)) { int idx = rb_enc_find_index(StringValueCStr(val)); return idx; } - else if (l == 1 && *p == 'E') { + if (name_equal(name_s_encoding_short, rb_strlen_lit(name_s_encoding_short), p, l)) { if (val == Qfalse) return rb_usascii_encindex(); else if (val == Qtrue) return rb_utf8_encindex(); /* bogus ignore */ From c3ccf23d5807f2ff20127bf5e42df0977bf672fb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 11 Jan 2020 21:37:00 +0900 Subject: [PATCH 362/878] Make rexml library to the bundle gems [Feature #16485][ruby-core:96683] --- doc/maintainers.rdoc | 6 +- doc/standard_library.rdoc | 2 +- gems/bundled_gems | 1 + lib/rexml/attlistdecl.rb | 63 - lib/rexml/attribute.rb | 205 - lib/rexml/cdata.rb | 68 - lib/rexml/child.rb | 97 - lib/rexml/comment.rb | 80 - lib/rexml/doctype.rb | 287 - lib/rexml/document.rb | 291 - lib/rexml/dtd/attlistdecl.rb | 11 - lib/rexml/dtd/dtd.rb | 47 - lib/rexml/dtd/elementdecl.rb | 18 - lib/rexml/dtd/entitydecl.rb | 57 - lib/rexml/dtd/notationdecl.rb | 40 - lib/rexml/element.rb | 1269 -- lib/rexml/encoding.rb | 51 - lib/rexml/entity.rb | 171 - lib/rexml/formatters/default.rb | 116 - lib/rexml/formatters/pretty.rb | 142 - lib/rexml/formatters/transitive.rb | 58 - lib/rexml/functions.rb | 447 - lib/rexml/instruction.rb | 79 - lib/rexml/light/node.rb | 196 - lib/rexml/namespace.rb | 59 - lib/rexml/node.rb | 76 - lib/rexml/output.rb | 30 - lib/rexml/parent.rb | 166 - lib/rexml/parseexception.rb | 52 - lib/rexml/parsers/baseparser.rb | 594 - lib/rexml/parsers/lightparser.rb | 59 - lib/rexml/parsers/pullparser.rb | 197 - lib/rexml/parsers/sax2parser.rb | 273 - lib/rexml/parsers/streamparser.rb | 61 - lib/rexml/parsers/treeparser.rb | 101 - lib/rexml/parsers/ultralightparser.rb | 57 - lib/rexml/parsers/xpathparser.rb | 675 - lib/rexml/quickpath.rb | 266 - lib/rexml/rexml.gemspec | 84 - lib/rexml/rexml.rb | 32 - lib/rexml/sax2listener.rb | 98 - lib/rexml/security.rb | 28 - lib/rexml/source.rb | 298 - lib/rexml/streamlistener.rb | 93 - lib/rexml/text.rb | 424 - lib/rexml/undefinednamespaceexception.rb | 9 - lib/rexml/validation/relaxng.rb | 539 - lib/rexml/validation/validation.rb | 144 - lib/rexml/validation/validationexception.rb | 10 - lib/rexml/xmldecl.rb | 130 - lib/rexml/xmltokens.rb | 85 - lib/rexml/xpath.rb | 81 - lib/rexml/xpath_parser.rb | 968 -- test/rexml/data/LostineRiver.kml.gz | Bin 50154 -> 0 bytes test/rexml/data/ProductionSupport.xml | 29 - test/rexml/data/axis.xml | 25 - test/rexml/data/bad.xml | 5 - test/rexml/data/basic.xml | 11 - test/rexml/data/basicupdate.xml | 47 - test/rexml/data/broken.rss | 20 - test/rexml/data/contents.xml | 70 - test/rexml/data/dash.xml | 12 - test/rexml/data/defaultNamespace.xml | 6 - test/rexml/data/doctype_test.xml | 34 - test/rexml/data/documentation.xml | 542 - test/rexml/data/euc.xml | 296 - test/rexml/data/evaluate.xml | 28 - test/rexml/data/fibo.xml | 29 - test/rexml/data/foo.xml | 10 - test/rexml/data/google.2.xml | 156 - test/rexml/data/id.xml | 21 - test/rexml/data/iso8859-1.xml | 4 - test/rexml/data/jaxen24.xml | 2 - test/rexml/data/jaxen3.xml | 15 - test/rexml/data/lang.xml | 11 - test/rexml/data/lang0.xml | 18 - test/rexml/data/message.xml | 27 - test/rexml/data/moreover.xml | 244 - test/rexml/data/much_ado.xml | 6850 -------- test/rexml/data/namespaces.xml | 18 - test/rexml/data/nitf.xml | 67 - test/rexml/data/numbers.xml | 18 - test/rexml/data/ofbiz-issues-full-177.xml | 13971 ---------------- test/rexml/data/pi.xml | 13 - test/rexml/data/pi2.xml | 6 - test/rexml/data/project.xml | 1 - test/rexml/data/simple.xml | 2 - test/rexml/data/stream_accents.xml | 4 - test/rexml/data/t63-1.xml | Bin 161690 -> 0 bytes test/rexml/data/t63-2.svg | 2828 ---- test/rexml/data/t75.xml | 31 - test/rexml/data/test/tests.xml | 683 - test/rexml/data/test/tests.xsl | 369 - test/rexml/data/testNamespaces.xml | 22 - test/rexml/data/testsrc.xml | 64 - test/rexml/data/text.xml | 10 - test/rexml/data/ticket_61.xml | 4 - test/rexml/data/ticket_68.xml | 590 - test/rexml/data/tutorial.xml | 678 - test/rexml/data/underscore.xml | 6 - test/rexml/data/utf16.xml | Bin 207464 -> 0 bytes test/rexml/data/web.xml | 42 - test/rexml/data/web2.xml | 7 - test/rexml/data/working.rss | 202 - test/rexml/data/xmlfile-bug.xml | 15 - test/rexml/data/xp.tst | 27 - test/rexml/data/yahoo.xml | 80 - test/rexml/formatter/test_default.rb | 19 - test/rexml/functions/test_base.rb | 261 - test/rexml/functions/test_boolean.rb | 75 - test/rexml/functions/test_local_name.rb | 44 - test/rexml/functions/test_number.rb | 38 - test/rexml/listener.rb | 51 - .../parse/test_document_type_declaration.rb | 50 - test/rexml/parse/test_element.rb | 51 - test/rexml/parse/test_notation_declaration.rb | 100 - .../parse/test_processing_instruction.rb | 25 - test/rexml/parser/test_sax2.rb | 203 - test/rexml/parser/test_stream.rb | 32 - test/rexml/parser/test_tree.rb | 43 - test/rexml/parser/test_ultra_light.rb | 70 - test/rexml/rexml_test_utils.rb | 10 - test/rexml/test_attribute.rb | 14 - test/rexml/test_attributes.rb | 223 - test/rexml/test_attributes_mixin.rb | 32 - test/rexml/test_changing_encoding.rb | 45 - test/rexml/test_comment.rb | 26 - test/rexml/test_contrib.rb | 585 - test/rexml/test_core.rb | 1517 -- test/rexml/test_doctype.rb | 157 - test/rexml/test_document.rb | 416 - test/rexml/test_element.rb | 18 - test/rexml/test_elements.rb | 119 - test/rexml/test_encoding.rb | 108 - test/rexml/test_entity.rb | 206 - test/rexml/test_instruction.rb | 14 - test/rexml/test_jaxen.rb | 131 - test/rexml/test_light.rb | 107 - test/rexml/test_lightparser.rb | 16 - test/rexml/test_listener.rb | 131 - test/rexml/test_martin_fowler.rb | 40 - test/rexml/test_namespace.rb | 41 - test/rexml/test_order.rb | 110 - test/rexml/test_preceding_sibling.rb | 41 - test/rexml/test_pullparser.rb | 103 - test/rexml/test_rexml_issuezilla.rb | 19 - test/rexml/test_sax.rb | 287 - test/rexml/test_stream.rb | 130 - test/rexml/test_text.rb | 75 - test/rexml/test_ticket_80.rb | 59 - test/rexml/test_validation_rng.rb | 793 - test/rexml/test_xml_declaration.rb | 48 - test/rexml/xpath/test_attribute.rb | 38 - .../xpath/test_axis_preceding_sibling.rb | 40 - test/rexml/xpath/test_base.rb | 1125 -- test/rexml/xpath/test_compare.rb | 256 - test/rexml/xpath/test_node.rb | 43 - test/rexml/xpath/test_predicate.rb | 83 - test/rexml/xpath/test_text.rb | 77 - tool/sync_default_gems.rb | 2 - 160 files changed, 4 insertions(+), 46104 deletions(-) delete mode 100644 lib/rexml/attlistdecl.rb delete mode 100644 lib/rexml/attribute.rb delete mode 100644 lib/rexml/cdata.rb delete mode 100644 lib/rexml/child.rb delete mode 100644 lib/rexml/comment.rb delete mode 100644 lib/rexml/doctype.rb delete mode 100644 lib/rexml/document.rb delete mode 100644 lib/rexml/dtd/attlistdecl.rb delete mode 100644 lib/rexml/dtd/dtd.rb delete mode 100644 lib/rexml/dtd/elementdecl.rb delete mode 100644 lib/rexml/dtd/entitydecl.rb delete mode 100644 lib/rexml/dtd/notationdecl.rb delete mode 100644 lib/rexml/element.rb delete mode 100644 lib/rexml/encoding.rb delete mode 100644 lib/rexml/entity.rb delete mode 100644 lib/rexml/formatters/default.rb delete mode 100644 lib/rexml/formatters/pretty.rb delete mode 100644 lib/rexml/formatters/transitive.rb delete mode 100644 lib/rexml/functions.rb delete mode 100644 lib/rexml/instruction.rb delete mode 100644 lib/rexml/light/node.rb delete mode 100644 lib/rexml/namespace.rb delete mode 100644 lib/rexml/node.rb delete mode 100644 lib/rexml/output.rb delete mode 100644 lib/rexml/parent.rb delete mode 100644 lib/rexml/parseexception.rb delete mode 100644 lib/rexml/parsers/baseparser.rb delete mode 100644 lib/rexml/parsers/lightparser.rb delete mode 100644 lib/rexml/parsers/pullparser.rb delete mode 100644 lib/rexml/parsers/sax2parser.rb delete mode 100644 lib/rexml/parsers/streamparser.rb delete mode 100644 lib/rexml/parsers/treeparser.rb delete mode 100644 lib/rexml/parsers/ultralightparser.rb delete mode 100644 lib/rexml/parsers/xpathparser.rb delete mode 100644 lib/rexml/quickpath.rb delete mode 100644 lib/rexml/rexml.gemspec delete mode 100644 lib/rexml/rexml.rb delete mode 100644 lib/rexml/sax2listener.rb delete mode 100644 lib/rexml/security.rb delete mode 100644 lib/rexml/source.rb delete mode 100644 lib/rexml/streamlistener.rb delete mode 100644 lib/rexml/text.rb delete mode 100644 lib/rexml/undefinednamespaceexception.rb delete mode 100644 lib/rexml/validation/relaxng.rb delete mode 100644 lib/rexml/validation/validation.rb delete mode 100644 lib/rexml/validation/validationexception.rb delete mode 100644 lib/rexml/xmldecl.rb delete mode 100644 lib/rexml/xmltokens.rb delete mode 100644 lib/rexml/xpath.rb delete mode 100644 lib/rexml/xpath_parser.rb delete mode 100644 test/rexml/data/LostineRiver.kml.gz delete mode 100644 test/rexml/data/ProductionSupport.xml delete mode 100644 test/rexml/data/axis.xml delete mode 100644 test/rexml/data/bad.xml delete mode 100644 test/rexml/data/basic.xml delete mode 100644 test/rexml/data/basicupdate.xml delete mode 100644 test/rexml/data/broken.rss delete mode 100644 test/rexml/data/contents.xml delete mode 100644 test/rexml/data/dash.xml delete mode 100644 test/rexml/data/defaultNamespace.xml delete mode 100644 test/rexml/data/doctype_test.xml delete mode 100644 test/rexml/data/documentation.xml delete mode 100644 test/rexml/data/euc.xml delete mode 100644 test/rexml/data/evaluate.xml delete mode 100644 test/rexml/data/fibo.xml delete mode 100644 test/rexml/data/foo.xml delete mode 100644 test/rexml/data/google.2.xml delete mode 100644 test/rexml/data/id.xml delete mode 100644 test/rexml/data/iso8859-1.xml delete mode 100644 test/rexml/data/jaxen24.xml delete mode 100644 test/rexml/data/jaxen3.xml delete mode 100644 test/rexml/data/lang.xml delete mode 100644 test/rexml/data/lang0.xml delete mode 100644 test/rexml/data/message.xml delete mode 100644 test/rexml/data/moreover.xml delete mode 100644 test/rexml/data/much_ado.xml delete mode 100644 test/rexml/data/namespaces.xml delete mode 100644 test/rexml/data/nitf.xml delete mode 100644 test/rexml/data/numbers.xml delete mode 100644 test/rexml/data/ofbiz-issues-full-177.xml delete mode 100644 test/rexml/data/pi.xml delete mode 100644 test/rexml/data/pi2.xml delete mode 100644 test/rexml/data/project.xml delete mode 100644 test/rexml/data/simple.xml delete mode 100644 test/rexml/data/stream_accents.xml delete mode 100644 test/rexml/data/t63-1.xml delete mode 100644 test/rexml/data/t63-2.svg delete mode 100644 test/rexml/data/t75.xml delete mode 100644 test/rexml/data/test/tests.xml delete mode 100644 test/rexml/data/test/tests.xsl delete mode 100644 test/rexml/data/testNamespaces.xml delete mode 100644 test/rexml/data/testsrc.xml delete mode 100644 test/rexml/data/text.xml delete mode 100644 test/rexml/data/ticket_61.xml delete mode 100644 test/rexml/data/ticket_68.xml delete mode 100644 test/rexml/data/tutorial.xml delete mode 100644 test/rexml/data/underscore.xml delete mode 100644 test/rexml/data/utf16.xml delete mode 100644 test/rexml/data/web.xml delete mode 100644 test/rexml/data/web2.xml delete mode 100644 test/rexml/data/working.rss delete mode 100644 test/rexml/data/xmlfile-bug.xml delete mode 100644 test/rexml/data/xp.tst delete mode 100644 test/rexml/data/yahoo.xml delete mode 100644 test/rexml/formatter/test_default.rb delete mode 100644 test/rexml/functions/test_base.rb delete mode 100644 test/rexml/functions/test_boolean.rb delete mode 100644 test/rexml/functions/test_local_name.rb delete mode 100644 test/rexml/functions/test_number.rb delete mode 100644 test/rexml/listener.rb delete mode 100644 test/rexml/parse/test_document_type_declaration.rb delete mode 100644 test/rexml/parse/test_element.rb delete mode 100644 test/rexml/parse/test_notation_declaration.rb delete mode 100644 test/rexml/parse/test_processing_instruction.rb delete mode 100644 test/rexml/parser/test_sax2.rb delete mode 100644 test/rexml/parser/test_stream.rb delete mode 100644 test/rexml/parser/test_tree.rb delete mode 100644 test/rexml/parser/test_ultra_light.rb delete mode 100644 test/rexml/rexml_test_utils.rb delete mode 100644 test/rexml/test_attribute.rb delete mode 100644 test/rexml/test_attributes.rb delete mode 100644 test/rexml/test_attributes_mixin.rb delete mode 100644 test/rexml/test_changing_encoding.rb delete mode 100644 test/rexml/test_comment.rb delete mode 100644 test/rexml/test_contrib.rb delete mode 100644 test/rexml/test_core.rb delete mode 100644 test/rexml/test_doctype.rb delete mode 100644 test/rexml/test_document.rb delete mode 100644 test/rexml/test_element.rb delete mode 100644 test/rexml/test_elements.rb delete mode 100644 test/rexml/test_encoding.rb delete mode 100644 test/rexml/test_entity.rb delete mode 100644 test/rexml/test_instruction.rb delete mode 100644 test/rexml/test_jaxen.rb delete mode 100644 test/rexml/test_light.rb delete mode 100644 test/rexml/test_lightparser.rb delete mode 100644 test/rexml/test_listener.rb delete mode 100644 test/rexml/test_martin_fowler.rb delete mode 100644 test/rexml/test_namespace.rb delete mode 100644 test/rexml/test_order.rb delete mode 100644 test/rexml/test_preceding_sibling.rb delete mode 100644 test/rexml/test_pullparser.rb delete mode 100644 test/rexml/test_rexml_issuezilla.rb delete mode 100644 test/rexml/test_sax.rb delete mode 100644 test/rexml/test_stream.rb delete mode 100644 test/rexml/test_text.rb delete mode 100644 test/rexml/test_ticket_80.rb delete mode 100644 test/rexml/test_validation_rng.rb delete mode 100644 test/rexml/test_xml_declaration.rb delete mode 100644 test/rexml/xpath/test_attribute.rb delete mode 100644 test/rexml/xpath/test_axis_preceding_sibling.rb delete mode 100644 test/rexml/xpath/test_base.rb delete mode 100644 test/rexml/xpath/test_compare.rb delete mode 100644 test/rexml/xpath/test_node.rb delete mode 100644 test/rexml/xpath/test_predicate.rb delete mode 100644 test/rexml/xpath/test_text.rb diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 071c958d30e43b..c8b4f9af20b99f 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -239,10 +239,6 @@ Zachary Scott (zzak) aycabta https://github.com/ruby/reline https://rubygems.org/gems/reline -[lib/rexml/*] - Kouhei Sutou (kou) - https://github.com/ruby/rexml - https://rubygems.org/gems/rexml [lib/rss.rb, lib/rss/*] Kouhei Sutou (kou) https://github.com/ruby/rss @@ -357,3 +353,5 @@ Zachary Scott (zzak) https://github.com/test-unit/test-unit [xmlrpc] https://github.com/ruby/xmlrpc +[rexml] + https://github.com/ruby/rexml diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index f71cedebf7fd67..82dda4b532f814 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -80,7 +80,6 @@ Prime:: Prime numbers and factorization library PStore:: Implements a file based persistence mechanism based on a Hash Racc:: A LALR(1) parser generator written in Ruby. RDoc:: Produces HTML and command-line documentation for Ruby -REXML:: An XML toolkit for Ruby RSS:: Family of libraries that support various formats of XML "feeds" Singleton:: Implementation of the Singleton pattern for Ruby Timeout:: Auto-terminate potentially long-running operations in Ruby @@ -119,3 +118,4 @@ PowerAssert:: Power Assert for Ruby. Rake:: Ruby build program with capabilities similar to make Test::Unit:: A compatibility layer for MiniTest XMLRPC:: Remote Procedure Call over HTTP support for Ruby +REXML:: An XML toolkit for Ruby diff --git a/gems/bundled_gems b/gems/bundled_gems index b2c6e2d5cb3b43..635ff1d1c6dfc1 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -4,3 +4,4 @@ power_assert 1.1.5 https://github.com/k-tsj/power_assert rake 13.0.1 https://github.com/ruby/rake test-unit 3.3.4 https://github.com/test-unit/test-unit xmlrpc 0.3.0 https://github.com/ruby/xmlrpc +rexml 3.2.3 https://github.com/ruby/rexml diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb deleted file mode 100644 index 44a91d66d63158..00000000000000 --- a/lib/rexml/attlistdecl.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: false -#vim:ts=2 sw=2 noexpandtab: -require_relative 'child' -require_relative 'source' - -module REXML - # This class needs: - # * Documentation - # * Work! Not all types of attlists are intelligently parsed, so we just - # spew back out what we get in. This works, but it would be better if - # we formatted the output ourselves. - # - # AttlistDecls provide *just* enough support to allow namespace - # declarations. If you need some sort of generalized support, or have an - # interesting idea about how to map the hideous, terrible design of DTD - # AttlistDecls onto an intuitive Ruby interface, let me know. I'm desperate - # for anything to make DTDs more palateable. - class AttlistDecl < Child - include Enumerable - - # What is this? Got me. - attr_reader :element_name - - # Create an AttlistDecl, pulling the information from a Source. Notice - # that this isn't very convenient; to create an AttlistDecl, you basically - # have to format it yourself, and then have the initializer parse it. - # Sorry, but for the foreseeable future, DTD support in REXML is pretty - # weak on convenience. Have I mentioned how much I hate DTDs? - def initialize(source) - super() - if (source.kind_of? Array) - @element_name, @pairs, @contents = *source - end - end - - # Access the attlist attribute/value pairs. - # value = attlist_decl[ attribute_name ] - def [](key) - @pairs[key] - end - - # Whether an attlist declaration includes the given attribute definition - # if attlist_decl.include? "xmlns:foobar" - def include?(key) - @pairs.keys.include? key - end - - # Iterate over the key/value pairs: - # attlist_decl.each { |attribute_name, attribute_value| ... } - def each(&block) - @pairs.each(&block) - end - - # Write out exactly what we got in. - def write out, indent=-1 - out << @contents - end - - def node_type - :attlistdecl - end - end -end diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb deleted file mode 100644 index 8933a013a25aa9..00000000000000 --- a/lib/rexml/attribute.rb +++ /dev/null @@ -1,205 +0,0 @@ -# frozen_string_literal: false -require_relative "namespace" -require_relative 'text' - -module REXML - # Defines an Element Attribute; IE, a attribute=value pair, as in: - # . Attributes can be in their own - # namespaces. General users of REXML will not interact with the - # Attribute class much. - class Attribute - include Node - include Namespace - - # The element to which this attribute belongs - attr_reader :element - # The normalized value of this attribute. That is, the attribute with - # entities intact. - attr_writer :normalized - PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um - - NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um - - # Constructor. - # FIXME: The parser doesn't catch illegal characters in attributes - # - # first:: - # Either: an Attribute, which this new attribute will become a - # clone of; or a String, which is the name of this attribute - # second:: - # If +first+ is an Attribute, then this may be an Element, or nil. - # If nil, then the Element parent of this attribute is the parent - # of the +first+ Attribute. If the first argument is a String, - # then this must also be a String, and is the content of the attribute. - # If this is the content, it must be fully normalized (contain no - # illegal characters). - # parent:: - # Ignored unless +first+ is a String; otherwise, may be the Element - # parent of this attribute, or nil. - # - # - # Attribute.new( attribute_to_clone ) - # Attribute.new( attribute_to_clone, parent_element ) - # Attribute.new( "attr", "attr_value" ) - # Attribute.new( "attr", "attr_value", parent_element ) - def initialize( first, second=nil, parent=nil ) - @normalized = @unnormalized = @element = nil - if first.kind_of? Attribute - self.name = first.expanded_name - @unnormalized = first.value - if second.kind_of? Element - @element = second - else - @element = first.element - end - elsif first.kind_of? String - @element = parent - self.name = first - @normalized = second.to_s - else - raise "illegal argument #{first.class.name} to Attribute constructor" - end - end - - # Returns the namespace of the attribute. - # - # e = Element.new( "elns:myelement" ) - # e.add_attribute( "nsa:a", "aval" ) - # e.add_attribute( "b", "bval" ) - # e.attributes.get_attribute( "a" ).prefix # -> "nsa" - # e.attributes.get_attribute( "b" ).prefix # -> "" - # a = Attribute.new( "x", "y" ) - # a.prefix # -> "" - def prefix - super - end - - # Returns the namespace URL, if defined, or nil otherwise - # - # e = Element.new("el") - # e.add_namespace("ns", "http://url") - # e.add_attribute("ns:a", "b") - # e.add_attribute("nsx:a", "c") - # e.attribute("ns:a").namespace # => "http://url" - # e.attribute("nsx:a").namespace # => nil - # - # This method always returns "" for no namespace attribute. Because - # the default namespace doesn't apply to attribute names. - # - # From https://www.w3.org/TR/xml-names/#uniqAttrs - # - # > the default namespace does not apply to attribute names - # - # e = REXML::Element.new("el") - # e.add_namespace("", "http://example.com/") - # e.namespace # => "http://example.com/" - # e.add_attribute("a", "b") - # e.attribute("a").namespace # => "" - def namespace arg=nil - arg = prefix if arg.nil? - if arg == "" - "" - else - @element.namespace(arg) - end - end - - # Returns true if other is an Attribute and has the same name and value, - # false otherwise. - def ==( other ) - other.kind_of?(Attribute) and other.name==name and other.value==value - end - - # Creates (and returns) a hash from both the name and value - def hash - name.hash + value.hash - end - - # Returns this attribute out as XML source, expanding the name - # - # a = Attribute.new( "x", "y" ) - # a.to_string # -> "x='y'" - # b = Attribute.new( "ns:x", "y" ) - # b.to_string # -> "ns:x='y'" - def to_string - if @element and @element.context and @element.context[:attribute_quote] == :quote - %Q^#@expanded_name="#{to_s().gsub(/"/, '"')}"^ - else - "#@expanded_name='#{to_s().gsub(/'/, ''')}'" - end - end - - def doctype - if @element - doc = @element.document - doc.doctype if doc - end - end - - # Returns the attribute value, with entities replaced - def to_s - return @normalized if @normalized - - @normalized = Text::normalize( @unnormalized, doctype ) - @unnormalized = nil - @normalized - end - - # Returns the UNNORMALIZED value of this attribute. That is, entities - # have been expanded to their values - def value - return @unnormalized if @unnormalized - @unnormalized = Text::unnormalize( @normalized, doctype ) - @normalized = nil - @unnormalized - end - - # Returns a copy of this attribute - def clone - Attribute.new self - end - - # Sets the element of which this object is an attribute. Normally, this - # is not directly called. - # - # Returns this attribute - def element=( element ) - @element = element - - if @normalized - Text.check( @normalized, NEEDS_A_SECOND_CHECK, doctype ) - end - - self - end - - # Removes this Attribute from the tree, and returns true if successful - # - # This method is usually not called directly. - def remove - @element.attributes.delete self.name unless @element.nil? - end - - # Writes this attribute (EG, puts 'key="value"' to the output) - def write( output, indent=-1 ) - output << to_string - end - - def node_type - :attribute - end - - def inspect - rv = "" - write( rv ) - rv - end - - def xpath - path = @element.xpath - path += "/@#{self.expanded_name}" - return path - end - end -end -#vim:ts=2 sw=2 noexpandtab: diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb deleted file mode 100644 index 997f5a08dbcea1..00000000000000 --- a/lib/rexml/cdata.rb +++ /dev/null @@ -1,68 +0,0 @@ -# frozen_string_literal: false -require_relative "text" - -module REXML - class CData < Text - START = '' - ILLEGAL = /(\]\]>)/ - - # Constructor. CData is data between - # - # _Examples_ - # CData.new( source ) - # CData.new( "Here is some CDATA" ) - # CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element ) - def initialize( first, whitespace=true, parent=nil ) - super( first, whitespace, parent, false, true, ILLEGAL ) - end - - # Make a copy of this object - # - # _Examples_ - # c = CData.new( "Some text" ) - # d = c.clone - # d.to_s # -> "Some text" - def clone - CData.new self - end - - # Returns the content of this CData object - # - # _Examples_ - # c = CData.new( "Some text" ) - # c.to_s # -> "Some text" - def to_s - @string - end - - def value - @string - end - - # == DEPRECATED - # See the rexml/formatters package - # - # Generates XML output of this object - # - # output:: - # Where to write the string. Defaults to $stdout - # indent:: - # The amount to indent this node by - # transitive:: - # Ignored - # ie_hack:: - # Ignored - # - # _Examples_ - # c = CData.new( " Some text " ) - # c.write( $stdout ) #-> - def write( output=$stdout, indent=-1, transitive=false, ie_hack=false ) - Kernel.warn( "#{self.class.name}.write is deprecated", uplevel: 1) - indent( output, indent ) - output << START - output << @string - output << STOP - end - end -end diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb deleted file mode 100644 index cc6e9a471991b0..00000000000000 --- a/lib/rexml/child.rb +++ /dev/null @@ -1,97 +0,0 @@ -# frozen_string_literal: false -require_relative "node" - -module REXML - ## - # A Child object is something contained by a parent, and this class - # contains methods to support that. Most user code will not use this - # class directly. - class Child - include Node - attr_reader :parent # The Parent of this object - - # Constructor. Any inheritors of this class should call super to make - # sure this method is called. - # parent:: - # if supplied, the parent of this child will be set to the - # supplied value, and self will be added to the parent - def initialize( parent = nil ) - @parent = nil - # Declare @parent, but don't define it. The next line sets the - # parent. - parent.add( self ) if parent - end - - # Replaces this object with another object. Basically, calls - # Parent.replace_child - # - # Returns:: self - def replace_with( child ) - @parent.replace_child( self, child ) - self - end - - # Removes this child from the parent. - # - # Returns:: self - def remove - unless @parent.nil? - @parent.delete self - end - self - end - - # Sets the parent of this child to the supplied argument. - # - # other:: - # Must be a Parent object. If this object is the same object as the - # existing parent of this child, no action is taken. Otherwise, this - # child is removed from the current parent (if one exists), and is added - # to the new parent. - # Returns:: The parent added - def parent=( other ) - return @parent if @parent == other - @parent.delete self if defined? @parent and @parent - @parent = other - end - - alias :next_sibling :next_sibling_node - alias :previous_sibling :previous_sibling_node - - # Sets the next sibling of this child. This can be used to insert a child - # after some other child. - # a = Element.new("a") - # b = a.add_element("b") - # c = Element.new("c") - # b.next_sibling = c - # # => - def next_sibling=( other ) - parent.insert_after self, other - end - - # Sets the previous sibling of this child. This can be used to insert a - # child before some other child. - # a = Element.new("a") - # b = a.add_element("b") - # c = Element.new("c") - # b.previous_sibling = c - # # => - def previous_sibling=(other) - parent.insert_before self, other - end - - # Returns:: the document this child belongs to, or nil if this child - # belongs to no document - def document - return parent.document unless parent.nil? - nil - end - - # This doesn't yet handle encodings - def bytes - document.encoding - - to_s - end - end -end diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb deleted file mode 100644 index 52c58b46f6fa09..00000000000000 --- a/lib/rexml/comment.rb +++ /dev/null @@ -1,80 +0,0 @@ -# frozen_string_literal: false -require_relative "child" - -module REXML - ## - # Represents an XML comment; that is, text between \ - class Comment < Child - include Comparable - START = "" - - # The content text - - attr_accessor :string - - ## - # Constructor. The first argument can be one of three types: - # @param first If String, the contents of this comment are set to the - # argument. If Comment, the argument is duplicated. If - # Source, the argument is scanned for a comment. - # @param second If the first argument is a Source, this argument - # should be nil, not supplied, or a Parent to be set as the parent - # of this object - def initialize( first, second = nil ) - super(second) - if first.kind_of? String - @string = first - elsif first.kind_of? Comment - @string = first.string - end - end - - def clone - Comment.new self - end - - # == DEPRECATED - # See REXML::Formatters - # - # output:: - # Where to write the string - # indent:: - # An integer. If -1, no indenting will be used; otherwise, the - # indentation will be this number of spaces, and children will be - # indented an additional amount. - # transitive:: - # Ignored by this class. The contents of comments are never modified. - # ie_hack:: - # Needed for conformity to the child API, but not used by this class. - def write( output, indent=-1, transitive=false, ie_hack=false ) - Kernel.warn("Comment.write is deprecated. See REXML::Formatters", uplevel: 1) - indent( output, indent ) - output << START - output << @string - output << STOP - end - - alias :to_s :string - - ## - # Compares this Comment to another; the contents of the comment are used - # in the comparison. - def <=>(other) - other.to_s <=> @string - end - - ## - # Compares this Comment to another; the contents of the comment are used - # in the comparison. - def ==( other ) - other.kind_of? Comment and - (other <=> self) == 0 - end - - def node_type - :comment - end - end -end -#vim:ts=2 sw=2 noexpandtab: diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb deleted file mode 100644 index 757b639639e8e0..00000000000000 --- a/lib/rexml/doctype.rb +++ /dev/null @@ -1,287 +0,0 @@ -# frozen_string_literal: false -require_relative "parent" -require_relative "parseexception" -require_relative "namespace" -require_relative 'entity' -require_relative 'attlistdecl' -require_relative 'xmltokens' - -module REXML - # Represents an XML DOCTYPE declaration; that is, the contents of . DOCTYPES can be used to declare the DTD of a document, as well as - # being used to declare entities used in the document. - class DocType < Parent - include XMLTokens - START = "" - SYSTEM = "SYSTEM" - PUBLIC = "PUBLIC" - DEFAULT_ENTITIES = { - 'gt'=>EntityConst::GT, - 'lt'=>EntityConst::LT, - 'quot'=>EntityConst::QUOT, - "apos"=>EntityConst::APOS - } - - # name is the name of the doctype - # external_id is the referenced DTD, if given - attr_reader :name, :external_id, :entities, :namespaces - - # Constructor - # - # dt = DocType.new( 'foo', '-//I/Hate/External/IDs' ) - # # - # dt = DocType.new( doctype_to_clone ) - # # Incomplete. Shallow clone of doctype - # - # +Note+ that the constructor: - # - # Doctype.new( Source.new( "" ) ) - # - # is _deprecated_. Do not use it. It will probably disappear. - def initialize( first, parent=nil ) - @entities = DEFAULT_ENTITIES - @long_name = @uri = nil - if first.kind_of? String - super() - @name = first - @external_id = parent - elsif first.kind_of? DocType - super( parent ) - @name = first.name - @external_id = first.external_id - elsif first.kind_of? Array - super( parent ) - @name = first[0] - @external_id = first[1] - @long_name = first[2] - @uri = first[3] - elsif first.kind_of? Source - super( parent ) - parser = Parsers::BaseParser.new( first ) - event = parser.pull - if event[0] == :start_doctype - @name, @external_id, @long_name, @uri, = event[1..-1] - end - else - super() - end - end - - def node_type - :doctype - end - - def attributes_of element - rv = [] - each do |child| - child.each do |key,val| - rv << Attribute.new(key,val) - end if child.kind_of? AttlistDecl and child.element_name == element - end - rv - end - - def attribute_of element, attribute - att_decl = find do |child| - child.kind_of? AttlistDecl and - child.element_name == element and - child.include? attribute - end - return nil unless att_decl - att_decl[attribute] - end - - def clone - DocType.new self - end - - # output:: - # Where to write the string - # indent:: - # An integer. If -1, no indentation will be used; otherwise, the - # indentation will be this number of spaces, and children will be - # indented an additional amount. - # transitive:: - # Ignored - # ie_hack:: - # Ignored - def write( output, indent=0, transitive=false, ie_hack=false ) - f = REXML::Formatters::Default.new - c = context - if c and c[:prologue_quote] == :apostrophe - quote = "'" - else - quote = "\"" - end - indent( output, indent ) - output << START - output << ' ' - output << @name - output << " #{@external_id}" if @external_id - output << " #{quote}#{@long_name}#{quote}" if @long_name - output << " #{quote}#{@uri}#{quote}" if @uri - unless @children.empty? - output << ' [' - @children.each { |child| - output << "\n" - f.write( child, output ) - } - output << "\n]" - end - output << STOP - end - - def context - if @parent - @parent.context - else - nil - end - end - - def entity( name ) - @entities[name].unnormalized if @entities[name] - end - - def add child - super(child) - @entities = DEFAULT_ENTITIES.clone if @entities == DEFAULT_ENTITIES - @entities[ child.name ] = child if child.kind_of? Entity - end - - # This method retrieves the public identifier identifying the document's - # DTD. - # - # Method contributed by Henrik Martensson - def public - case @external_id - when "SYSTEM" - nil - when "PUBLIC" - strip_quotes(@long_name) - end - end - - # This method retrieves the system identifier identifying the document's DTD - # - # Method contributed by Henrik Martensson - def system - case @external_id - when "SYSTEM" - strip_quotes(@long_name) - when "PUBLIC" - @uri.kind_of?(String) ? strip_quotes(@uri) : nil - end - end - - # This method returns a list of notations that have been declared in the - # _internal_ DTD subset. Notations in the external DTD subset are not - # listed. - # - # Method contributed by Henrik Martensson - def notations - children().select {|node| node.kind_of?(REXML::NotationDecl)} - end - - # Retrieves a named notation. Only notations declared in the internal - # DTD subset can be retrieved. - # - # Method contributed by Henrik Martensson - def notation(name) - notations.find { |notation_decl| - notation_decl.name == name - } - end - - private - - # Method contributed by Henrik Martensson - def strip_quotes(quoted_string) - quoted_string =~ /^[\'\"].*[\'\"]$/ ? - quoted_string[1, quoted_string.length-2] : - quoted_string - end - end - - # We don't really handle any of these since we're not a validating - # parser, so we can be pretty dumb about them. All we need to be able - # to do is spew them back out on a write() - - # This is an abstract class. You never use this directly; it serves as a - # parent class for the specific declarations. - class Declaration < Child - def initialize src - super() - @string = src - end - - def to_s - @string+'>' - end - - # == DEPRECATED - # See REXML::Formatters - # - def write( output, indent ) - output << to_s - end - end - - public - class ElementDecl < Declaration - def initialize( src ) - super - end - end - - class ExternalEntity < Child - def initialize( src ) - super() - @entity = src - end - def to_s - @entity - end - def write( output, indent ) - output << @entity - end - end - - class NotationDecl < Child - attr_accessor :public, :system - def initialize name, middle, pub, sys - super(nil) - @name = name - @middle = middle - @public = pub - @system = sys - end - - def to_s - c = nil - c = parent.context if parent - if c and c[:prologue_quote] == :apostrophe - quote = "'" - else - quote = "\"" - end - notation = "" - notation - end - - def write( output, indent=-1 ) - output << to_s - end - - # This method retrieves the name of the notation. - # - # Method contributed by Henrik Martensson - def name - @name - end - end -end diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb deleted file mode 100644 index adec29306675bd..00000000000000 --- a/lib/rexml/document.rb +++ /dev/null @@ -1,291 +0,0 @@ -# frozen_string_literal: false -require_relative "security" -require_relative "element" -require_relative "xmldecl" -require_relative "source" -require_relative "comment" -require_relative "doctype" -require_relative "instruction" -require_relative "rexml" -require_relative "parseexception" -require_relative "output" -require_relative "parsers/baseparser" -require_relative "parsers/streamparser" -require_relative "parsers/treeparser" - -module REXML - # Represents a full XML document, including PIs, a doctype, etc. A - # Document has a single child that can be accessed by root(). - # Note that if you want to have an XML declaration written for a document - # you create, you must add one; REXML documents do not write a default - # declaration for you. See |DECLARATION| and |write|. - class Document < Element - # A convenient default XML declaration. If you want an XML declaration, - # the easiest way to add one is mydoc << Document::DECLARATION - # +DEPRECATED+ - # Use: mydoc << XMLDecl.default - DECLARATION = XMLDecl.default - - # Constructor - # @param source if supplied, must be a Document, String, or IO. - # Documents have their context and Element attributes cloned. - # Strings are expected to be valid XML documents. IOs are expected - # to be sources of valid XML documents. - # @param context if supplied, contains the context of the document; - # this should be a Hash. - def initialize( source = nil, context = {} ) - @entity_expansion_count = 0 - super() - @context = context - return if source.nil? - if source.kind_of? Document - @context = source.context - super source - else - build( source ) - end - end - - def node_type - :document - end - - # Should be obvious - def clone - Document.new self - end - - # According to the XML spec, a root node has no expanded name - def expanded_name - '' - #d = doc_type - #d ? d.name : "UNDEFINED" - end - - alias :name :expanded_name - - # We override this, because XMLDecls and DocTypes must go at the start - # of the document - def add( child ) - if child.kind_of? XMLDecl - if @children[0].kind_of? XMLDecl - @children[0] = child - else - @children.unshift child - end - child.parent = self - elsif child.kind_of? DocType - # Find first Element or DocType node and insert the decl right - # before it. If there is no such node, just insert the child at the - # end. If there is a child and it is an DocType, then replace it. - insert_before_index = @children.find_index { |x| - x.kind_of?(Element) || x.kind_of?(DocType) - } - if insert_before_index # Not null = not end of list - if @children[ insert_before_index ].kind_of? DocType - @children[ insert_before_index ] = child - else - @children[ insert_before_index-1, 0 ] = child - end - else # Insert at end of list - @children << child - end - child.parent = self - else - rv = super - raise "attempted adding second root element to document" if @elements.size > 1 - rv - end - end - alias :<< :add - - def add_element(arg=nil, arg2=nil) - rv = super - raise "attempted adding second root element to document" if @elements.size > 1 - rv - end - - # @return the root Element of the document, or nil if this document - # has no children. - def root - elements[1] - #self - #@children.find { |item| item.kind_of? Element } - end - - # @return the DocType child of the document, if one exists, - # and nil otherwise. - def doctype - @children.find { |item| item.kind_of? DocType } - end - - # @return the XMLDecl of this document; if no XMLDecl has been - # set, the default declaration is returned. - def xml_decl - rv = @children[0] - return rv if rv.kind_of? XMLDecl - @children.unshift(XMLDecl.default)[0] - end - - # @return the XMLDecl version of this document as a String. - # If no XMLDecl has been set, returns the default version. - def version - xml_decl().version - end - - # @return the XMLDecl encoding of this document as an - # Encoding object. - # If no XMLDecl has been set, returns the default encoding. - def encoding - xml_decl().encoding - end - - # @return the XMLDecl standalone value of this document as a String. - # If no XMLDecl has been set, returns the default setting. - def stand_alone? - xml_decl().stand_alone? - end - - # :call-seq: - # doc.write(output=$stdout, indent=-1, transtive=false, ie_hack=false, encoding=nil) - # doc.write(options={:output => $stdout, :indent => -1, :transtive => false, :ie_hack => false, :encoding => nil}) - # - # Write the XML tree out, optionally with indent. This writes out the - # entire XML document, including XML declarations, doctype declarations, - # and processing instructions (if any are given). - # - # A controversial point is whether Document should always write the XML - # declaration () whether or not one is given by the - # user (or source document). REXML does not write one if one was not - # specified, because it adds unnecessary bandwidth to applications such - # as XML-RPC. - # - # Accept Nth argument style and options Hash style as argument. - # The recommended style is options Hash style for one or more - # arguments case. - # - # _Examples_ - # Document.new("").write - # - # output = "" - # Document.new("").write(output) - # - # output = "" - # Document.new("").write(:output => output, :indent => 2) - # - # See also the classes in the rexml/formatters package for the proper way - # to change the default formatting of XML output. - # - # _Examples_ - # - # output = "" - # tr = Transitive.new - # tr.write(Document.new(""), output) - # - # output:: - # output an object which supports '<< string'; this is where the - # document will be written. - # indent:: - # An integer. If -1, no indenting will be used; otherwise, the - # indentation will be twice this number of spaces, and children will be - # indented an additional amount. For a value of 3, every item will be - # indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1 - # transitive:: - # If transitive is true and indent is >= 0, then the output will be - # pretty-printed in such a way that the added whitespace does not affect - # the absolute *value* of the document -- that is, it leaves the value - # and number of Text nodes in the document unchanged. - # ie_hack:: - # This hack inserts a space before the /> on empty tags to address - # a limitation of Internet Explorer. Defaults to false - # encoding:: - # Encoding name as String. Change output encoding to specified encoding - # instead of encoding in XML declaration. - # Defaults to nil. It means encoding in XML declaration is used. - def write(*arguments) - if arguments.size == 1 and arguments[0].class == Hash - options = arguments[0] - - output = options[:output] - indent = options[:indent] - transitive = options[:transitive] - ie_hack = options[:ie_hack] - encoding = options[:encoding] - else - output, indent, transitive, ie_hack, encoding, = *arguments - end - - output ||= $stdout - indent ||= -1 - transitive = false if transitive.nil? - ie_hack = false if ie_hack.nil? - encoding ||= xml_decl.encoding - - if encoding != 'UTF-8' && !output.kind_of?(Output) - output = Output.new( output, encoding ) - end - formatter = if indent > -1 - if transitive - require_relative "formatters/transitive" - REXML::Formatters::Transitive.new( indent, ie_hack ) - else - REXML::Formatters::Pretty.new( indent, ie_hack ) - end - else - REXML::Formatters::Default.new( ie_hack ) - end - formatter.write( self, output ) - end - - - def Document::parse_stream( source, listener ) - Parsers::StreamParser.new( source, listener ).parse - end - - # Set the entity expansion limit. By default the limit is set to 10000. - # - # Deprecated. Use REXML::Security.entity_expansion_limit= instead. - def Document::entity_expansion_limit=( val ) - Security.entity_expansion_limit = val - end - - # Get the entity expansion limit. By default the limit is set to 10000. - # - # Deprecated. Use REXML::Security.entity_expansion_limit= instead. - def Document::entity_expansion_limit - return Security.entity_expansion_limit - end - - # Set the entity expansion limit. By default the limit is set to 10240. - # - # Deprecated. Use REXML::Security.entity_expansion_text_limit= instead. - def Document::entity_expansion_text_limit=( val ) - Security.entity_expansion_text_limit = val - end - - # Get the entity expansion limit. By default the limit is set to 10240. - # - # Deprecated. Use REXML::Security.entity_expansion_text_limit instead. - def Document::entity_expansion_text_limit - return Security.entity_expansion_text_limit - end - - attr_reader :entity_expansion_count - - def record_entity_expansion - @entity_expansion_count += 1 - if @entity_expansion_count > Security.entity_expansion_limit - raise "number of entity expansions exceeded, processing aborted." - end - end - - def document - self - end - - private - def build( source ) - Parsers::TreeParser.new( source, self ).parse - end - end -end diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb deleted file mode 100644 index 1326cb21e4c0f9..00000000000000 --- a/lib/rexml/dtd/attlistdecl.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: false -require_relative "../child" -module REXML - module DTD - class AttlistDecl < Child - START = ")/um - end - end -end diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb deleted file mode 100644 index 8b0f2d753afe21..00000000000000 --- a/lib/rexml/dtd/dtd.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: false -require_relative "elementdecl" -require_relative "entitydecl" -require_relative "../comment" -require_relative "notationdecl" -require_relative "attlistdecl" -require_relative "../parent" - -module REXML - module DTD - class Parser - def Parser.parse( input ) - case input - when String - parse_helper input - when File - parse_helper input.read - end - end - - # Takes a String and parses it out - def Parser.parse_helper( input ) - contents = Parent.new - while input.size > 0 - case input - when ElementDecl.PATTERN_RE - match = $& - contents << ElementDecl.new( match ) - when AttlistDecl.PATTERN_RE - matchdata = $~ - contents << AttlistDecl.new( matchdata ) - when EntityDecl.PATTERN_RE - matchdata = $~ - contents << EntityDecl.new( matchdata ) - when Comment.PATTERN_RE - matchdata = $~ - contents << Comment.new( matchdata ) - when NotationDecl.PATTERN_RE - matchdata = $~ - contents << NotationDecl.new( matchdata ) - end - end - contents - end - end - end -end diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb deleted file mode 100644 index 20ed0232441c2f..00000000000000 --- a/lib/rexml/dtd/elementdecl.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: false -require_relative "../child" -module REXML - module DTD - class ElementDecl < Child - START = "/um - PATTERN_RE = /^\s*#{START}\s+((?:[:\w][-\.\w]*:)?[-!\*\.\w]*)(.*?)>/ - #\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true) - - def initialize match - @name = match[1] - @rest = match[2] - end - end - end -end diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb deleted file mode 100644 index 312df655ff26a8..00000000000000 --- a/lib/rexml/dtd/entitydecl.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: false -require_relative "../child" -module REXML - module DTD - class EntityDecl < Child - START = "/um - SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um - PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um - PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um - # - # - def initialize src - super() - md = nil - if src.match( PUBLIC ) - md = src.match( PUBLIC, true ) - @middle = "PUBLIC" - @content = "#{md[2]} #{md[4]}" - elsif src.match( SYSTEM ) - md = src.match( SYSTEM, true ) - @middle = "SYSTEM" - @content = md[2] - elsif src.match( PLAIN ) - md = src.match( PLAIN, true ) - @middle = "" - @content = md[2] - elsif src.match( PERCENT ) - md = src.match( PERCENT, true ) - @middle = "" - @content = md[2] - end - raise ParseException.new("failed Entity match", src) if md.nil? - @name = md[1] - end - - def to_s - rv = " 0 - rv << @content - rv - end - - def write( output, indent ) - indent( output, indent ) - output << to_s - end - - def EntityDecl.parse_source source, listener - md = source.match( PATTERN_RE, true ) - thing = md[0].squeeze(" \t\n\r") - listener.send inspect.downcase, thing - end - end - end -end diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb deleted file mode 100644 index 04a9b08aa7ddb8..00000000000000 --- a/lib/rexml/dtd/notationdecl.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: false -require_relative "../child" -module REXML - module DTD - class NotationDecl < Child - START = "/um - SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um - def initialize src - super() - if src.match( PUBLIC ) - md = src.match( PUBLIC, true ) - elsif src.match( SYSTEM ) - md = src.match( SYSTEM, true ) - else - raise ParseException.new( "error parsing notation: no matching pattern", src ) - end - @name = md[1] - @middle = md[2] - @rest = md[3] - end - - def to_s - "" - end - - def write( output, indent ) - indent( output, indent ) - output << to_s - end - - def NotationDecl.parse_source source, listener - md = source.match( PATTERN_RE, true ) - thing = md[0].squeeze(" \t\n\r") - listener.send inspect.downcase, thing - end - end - end -end diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb deleted file mode 100644 index c706a7c245755d..00000000000000 --- a/lib/rexml/element.rb +++ /dev/null @@ -1,1269 +0,0 @@ -# frozen_string_literal: false -require_relative "parent" -require_relative "namespace" -require_relative "attribute" -require_relative "cdata" -require_relative "xpath" -require_relative "parseexception" - -module REXML - # An implementation note about namespaces: - # As we parse, when we find namespaces we put them in a hash and assign - # them a unique ID. We then convert the namespace prefix for the node - # to the unique ID. This makes namespace lookup much faster for the - # cost of extra memory use. We save the namespace prefix for the - # context node and convert it back when we write it. - @@namespaces = {} - - # Represents a tagged XML element. Elements are characterized by - # having children, attributes, and names, and can themselves be - # children. - class Element < Parent - include Namespace - - UNDEFINED = "UNDEFINED"; # The default name - - # Mechanisms for accessing attributes and child elements of this - # element. - attr_reader :attributes, :elements - # The context holds information about the processing environment, such as - # whitespace handling. - attr_accessor :context - - # Constructor - # arg:: - # if not supplied, will be set to the default value. - # If a String, the name of this object will be set to the argument. - # If an Element, the object will be shallowly cloned; name, - # attributes, and namespaces will be copied. Children will +not+ be - # copied. - # parent:: - # if supplied, must be a Parent, and will be used as - # the parent of this object. - # context:: - # If supplied, must be a hash containing context items. Context items - # include: - # * :respect_whitespace the value of this is :+all+ or an array of - # strings being the names of the elements to respect - # whitespace for. Defaults to :+all+. - # * :compress_whitespace the value can be :+all+ or an array of - # strings being the names of the elements to ignore whitespace on. - # Overrides :+respect_whitespace+. - # * :ignore_whitespace_nodes the value can be :+all+ or an array - # of strings being the names of the elements in which to ignore - # whitespace-only nodes. If this is set, Text nodes which contain only - # whitespace will not be added to the document tree. - # * :raw can be :+all+, or an array of strings being the names of - # the elements to process in raw mode. In raw mode, special - # characters in text is not converted to or from entities. - def initialize( arg = UNDEFINED, parent=nil, context=nil ) - super(parent) - - @elements = Elements.new(self) - @attributes = Attributes.new(self) - @context = context - - if arg.kind_of? String - self.name = arg - elsif arg.kind_of? Element - self.name = arg.expanded_name - arg.attributes.each_attribute{ |attribute| - @attributes << Attribute.new( attribute ) - } - @context = arg.context - end - end - - def inspect - rv = "<#@expanded_name" - - @attributes.each_attribute do |attr| - rv << " " - attr.write( rv, 0 ) - end - - if children.size > 0 - rv << "> ... " - else - rv << "/>" - end - end - - - # Creates a shallow copy of self. - # d = Document.new "" - # new_a = d.root.clone - # puts new_a # => "" - def clone - self.class.new self - end - - # Evaluates to the root node of the document that this element - # belongs to. If this element doesn't belong to a document, but does - # belong to another Element, the parent's root will be returned, until the - # earliest ancestor is found. - # - # Note that this is not the same as the document element. - # In the following example, is the document element, and the root - # node is the parent node of the document element. You may ask yourself - # why the root node is useful: consider the doctype and XML declaration, - # and any processing instructions before the document element... they - # are children of the root node, or siblings of the document element. - # The only time this isn't true is when an Element is created that is - # not part of any Document. In this case, the ancestor that has no - # parent acts as the root node. - # d = Document.new '' - # a = d[1] ; c = a[1][1] - # d.root_node == d # TRUE - # a.root_node # namely, d - # c.root_node # again, d - def root_node - parent.nil? ? self : parent.root_node - end - - def root - return elements[1] if self.kind_of? Document - return self if parent.kind_of? Document or parent.nil? - return parent.root - end - - # Evaluates to the document to which this element belongs, or nil if this - # element doesn't belong to a document. - def document - rt = root - rt.parent if rt - end - - # Evaluates to +true+ if whitespace is respected for this element. This - # is the case if: - # 1. Neither :+respect_whitespace+ nor :+compress_whitespace+ has any value - # 2. The context has :+respect_whitespace+ set to :+all+ or - # an array containing the name of this element, and - # :+compress_whitespace+ isn't set to :+all+ or an array containing the - # name of this element. - # The evaluation is tested against +expanded_name+, and so is namespace - # sensitive. - def whitespace - @whitespace = nil - if @context - if @context[:respect_whitespace] - @whitespace = (@context[:respect_whitespace] == :all or - @context[:respect_whitespace].include? expanded_name) - end - @whitespace = false if (@context[:compress_whitespace] and - (@context[:compress_whitespace] == :all or - @context[:compress_whitespace].include? expanded_name) - ) - end - @whitespace = true unless @whitespace == false - @whitespace - end - - def ignore_whitespace_nodes - @ignore_whitespace_nodes = false - if @context - if @context[:ignore_whitespace_nodes] - @ignore_whitespace_nodes = - (@context[:ignore_whitespace_nodes] == :all or - @context[:ignore_whitespace_nodes].include? expanded_name) - end - end - end - - # Evaluates to +true+ if raw mode is set for this element. This - # is the case if the context has :+raw+ set to :+all+ or - # an array containing the name of this element. - # - # The evaluation is tested against +expanded_name+, and so is namespace - # sensitive. - def raw - @raw = (@context and @context[:raw] and - (@context[:raw] == :all or - @context[:raw].include? expanded_name)) - @raw - end - - #once :whitespace, :raw, :ignore_whitespace_nodes - - ################################################# - # Namespaces # - ################################################# - - # Evaluates to an +Array+ containing the prefixes (names) of all defined - # namespaces at this context node. - # doc = Document.new("") - # doc.elements['//b'].prefixes # -> ['x', 'y'] - def prefixes - prefixes = [] - prefixes = parent.prefixes if parent - prefixes |= attributes.prefixes - return prefixes - end - - def namespaces - namespaces = {} - namespaces = parent.namespaces if parent - namespaces = namespaces.merge( attributes.namespaces ) - return namespaces - end - - # Evaluates to the URI for a prefix, or the empty string if no such - # namespace is declared for this element. Evaluates recursively for - # ancestors. Returns the default namespace, if there is one. - # prefix:: - # the prefix to search for. If not supplied, returns the default - # namespace if one exists - # Returns:: - # the namespace URI as a String, or nil if no such namespace - # exists. If the namespace is undefined, returns an empty string - # doc = Document.new("") - # b = doc.elements['//b'] - # b.namespace # -> '1' - # b.namespace("y") # -> '2' - def namespace(prefix=nil) - if prefix.nil? - prefix = prefix() - end - if prefix == '' - prefix = "xmlns" - else - prefix = "xmlns:#{prefix}" unless prefix[0,5] == 'xmlns' - end - ns = attributes[ prefix ] - ns = parent.namespace(prefix) if ns.nil? and parent - ns = '' if ns.nil? and prefix == 'xmlns' - return ns - end - - # Adds a namespace to this element. - # prefix:: - # the prefix string, or the namespace URI if +uri+ is not - # supplied - # uri:: - # the namespace URI. May be nil, in which +prefix+ is used as - # the URI - # Evaluates to: this Element - # a = Element.new("a") - # a.add_namespace("xmlns:foo", "bar" ) - # a.add_namespace("foo", "bar") # shorthand for previous line - # a.add_namespace("twiddle") - # puts a #-> - def add_namespace( prefix, uri=nil ) - unless uri - @attributes["xmlns"] = prefix - else - prefix = "xmlns:#{prefix}" unless prefix =~ /^xmlns:/ - @attributes[ prefix ] = uri - end - self - end - - # Removes a namespace from this node. This only works if the namespace is - # actually declared in this node. If no argument is passed, deletes the - # default namespace. - # - # Evaluates to: this element - # doc = Document.new "" - # doc.root.delete_namespace - # puts doc # -> - # doc.root.delete_namespace 'foo' - # puts doc # -> - def delete_namespace namespace="xmlns" - namespace = "xmlns:#{namespace}" unless namespace == 'xmlns' - attribute = attributes.get_attribute(namespace) - attribute.remove unless attribute.nil? - self - end - - ################################################# - # Elements # - ################################################# - - # Adds a child to this element, optionally setting attributes in - # the element. - # element:: - # optional. If Element, the element is added. - # Otherwise, a new Element is constructed with the argument (see - # Element.initialize). - # attrs:: - # If supplied, must be a Hash containing String name,value - # pairs, which will be used to set the attributes of the new Element. - # Returns:: the Element that was added - # el = doc.add_element 'my-tag' - # el = doc.add_element 'my-tag', {'attr1'=>'val1', 'attr2'=>'val2'} - # el = Element.new 'my-tag' - # doc.add_element el - def add_element element, attrs=nil - raise "First argument must be either an element name, or an Element object" if element.nil? - el = @elements.add(element) - attrs.each do |key, value| - el.attributes[key]=value - end if attrs.kind_of? Hash - el - end - - # Deletes a child element. - # element:: - # Must be an +Element+, +String+, or +Integer+. If Element, - # the element is removed. If String, the element is found (via XPath) - # and removed. This means that any parent can remove any - # descendant. If Integer, the Element indexed by that number will be - # removed. - # Returns:: the element that was removed. - # doc.delete_element "/a/b/c[@id='4']" - # doc.delete_element doc.elements["//k"] - # doc.delete_element 1 - def delete_element element - @elements.delete element - end - - # Evaluates to +true+ if this element has at least one child Element - # doc = Document.new "Text" - # doc.root.has_elements # -> true - # doc.elements["/a/b"].has_elements # -> false - # doc.elements["/a/c"].has_elements # -> false - def has_elements? - !@elements.empty? - end - - # Iterates through the child elements, yielding for each Element that - # has a particular attribute set. - # key:: - # the name of the attribute to search for - # value:: - # the value of the attribute - # max:: - # (optional) causes this method to return after yielding - # for this number of matching children - # name:: - # (optional) if supplied, this is an XPath that filters - # the children to check. - # - # doc = Document.new "" - # # Yields b, c, d - # doc.root.each_element_with_attribute( 'id' ) {|e| p e} - # # Yields b, d - # doc.root.each_element_with_attribute( 'id', '1' ) {|e| p e} - # # Yields b - # doc.root.each_element_with_attribute( 'id', '1', 1 ) {|e| p e} - # # Yields d - # doc.root.each_element_with_attribute( 'id', '1', 0, 'd' ) {|e| p e} - def each_element_with_attribute( key, value=nil, max=0, name=nil, &block ) # :yields: Element - each_with_something( proc {|child| - if value.nil? - child.attributes[key] != nil - else - child.attributes[key]==value - end - }, max, name, &block ) - end - - # Iterates through the children, yielding for each Element that - # has a particular text set. - # text:: - # the text to search for. If nil, or not supplied, will iterate - # over all +Element+ children that contain at least one +Text+ node. - # max:: - # (optional) causes this method to return after yielding - # for this number of matching children - # name:: - # (optional) if supplied, this is an XPath that filters - # the children to check. - # - # doc = Document.new 'bbd' - # # Yields b, c, d - # doc.each_element_with_text {|e|p e} - # # Yields b, c - # doc.each_element_with_text('b'){|e|p e} - # # Yields b - # doc.each_element_with_text('b', 1){|e|p e} - # # Yields d - # doc.each_element_with_text(nil, 0, 'd'){|e|p e} - def each_element_with_text( text=nil, max=0, name=nil, &block ) # :yields: Element - each_with_something( proc {|child| - if text.nil? - child.has_text? - else - child.text == text - end - }, max, name, &block ) - end - - # Synonym for Element.elements.each - def each_element( xpath=nil, &block ) # :yields: Element - @elements.each( xpath, &block ) - end - - # Synonym for Element.to_a - # This is a little slower than calling elements.each directly. - # xpath:: any XPath by which to search for elements in the tree - # Returns:: an array of Elements that match the supplied path - def get_elements( xpath ) - @elements.to_a( xpath ) - end - - # Returns the next sibling that is an element, or nil if there is - # no Element sibling after this one - # doc = Document.new 'text' - # doc.root.elements['b'].next_element #-> - # doc.root.elements['c'].next_element #-> nil - def next_element - element = next_sibling - element = element.next_sibling until element.nil? or element.kind_of? Element - return element - end - - # Returns the previous sibling that is an element, or nil if there is - # no Element sibling prior to this one - # doc = Document.new 'text' - # doc.root.elements['c'].previous_element #-> - # doc.root.elements['b'].previous_element #-> nil - def previous_element - element = previous_sibling - element = element.previous_sibling until element.nil? or element.kind_of? Element - return element - end - - - ################################################# - # Text # - ################################################# - - # Evaluates to +true+ if this element has at least one Text child - def has_text? - not text().nil? - end - - # A convenience method which returns the String value of the _first_ - # child text element, if one exists, and +nil+ otherwise. - # - # Note that an element may have multiple Text elements, perhaps - # separated by other children. Be aware that this method only returns - # the first Text node. - # - # This method returns the +value+ of the first text child node, which - # ignores the +raw+ setting, so always returns normalized text. See - # the Text::value documentation. - # - # doc = Document.new "

some text this is bold! more text

" - # # The element 'p' has two text elements, "some text " and " more text". - # doc.root.text #-> "some text " - def text( path = nil ) - rv = get_text(path) - return rv.value unless rv.nil? - nil - end - - # Returns the first child Text node, if any, or +nil+ otherwise. - # This method returns the actual +Text+ node, rather than the String content. - # doc = Document.new "

some text this is bold! more text

" - # # The element 'p' has two text elements, "some text " and " more text". - # doc.root.get_text.value #-> "some text " - def get_text path = nil - rv = nil - if path - element = @elements[ path ] - rv = element.get_text unless element.nil? - else - rv = @children.find { |node| node.kind_of? Text } - end - return rv - end - - # Sets the first Text child of this object. See text() for a - # discussion about Text children. - # - # If a Text child already exists, the child is replaced by this - # content. This means that Text content can be deleted by calling - # this method with a nil argument. In this case, the next Text - # child becomes the first Text child. In no case is the order of - # any siblings disturbed. - # text:: - # If a String, a new Text child is created and added to - # this Element as the first Text child. If Text, the text is set - # as the first Child element. If nil, then any existing first Text - # child is removed. - # Returns:: this Element. - # doc = Document.new '' - # doc.root.text = 'Sean' #-> 'Sean' - # doc.root.text = 'Elliott' #-> 'Elliott' - # doc.root.add_element 'c' #-> 'Elliott' - # doc.root.text = 'Russell' #-> 'Russell' - # doc.root.text = nil #-> '' - def text=( text ) - if text.kind_of? String - text = Text.new( text, whitespace(), nil, raw() ) - elsif !text.nil? and !text.kind_of? Text - text = Text.new( text.to_s, whitespace(), nil, raw() ) - end - old_text = get_text - if text.nil? - old_text.remove unless old_text.nil? - else - if old_text.nil? - self << text - else - old_text.replace_with( text ) - end - end - return self - end - - # A helper method to add a Text child. Actual Text instances can - # be added with regular Parent methods, such as add() and <<() - # text:: - # if a String, a new Text instance is created and added - # to the parent. If Text, the object is added directly. - # Returns:: this Element - # e = Element.new('a') #-> - # e.add_text 'foo' #-> foo - # e.add_text Text.new(' bar') #-> foo bar - # Note that at the end of this example, the branch has 3 nodes; the 'e' - # element and 2 Text node children. - def add_text( text ) - if text.kind_of? String - if @children[-1].kind_of? Text - @children[-1] << text - return - end - text = Text.new( text, whitespace(), nil, raw() ) - end - self << text unless text.nil? - return self - end - - def node_type - :element - end - - def xpath - path_elements = [] - cur = self - path_elements << __to_xpath_helper( self ) - while cur.parent - cur = cur.parent - path_elements << __to_xpath_helper( cur ) - end - return path_elements.reverse.join( "/" ) - end - - ################################################# - # Attributes # - ################################################# - - # Fetches an attribute value or a child. - # - # If String or Symbol is specified, it's treated as attribute - # name. Attribute value as String or +nil+ is returned. This case - # is shortcut of +attributes[name]+. - # - # If Integer is specified, it's treated as the index of - # child. It returns Nth child. - # - # doc = REXML::Document.new("") - # doc.root["attr"] # => "1" - # doc.root.attributes["attr"] # => "1" - # doc.root[1] # => - def [](name_or_index) - case name_or_index - when String - attributes[name_or_index] - when Symbol - attributes[name_or_index.to_s] - else - super - end - end - - def attribute( name, namespace=nil ) - prefix = nil - if namespaces.respond_to? :key - prefix = namespaces.key(namespace) if namespace - else - prefix = namespaces.index(namespace) if namespace - end - prefix = nil if prefix == 'xmlns' - - ret_val = - attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" ) - - return ret_val unless ret_val.nil? - return nil if prefix.nil? - - # now check that prefix'es namespace is not the same as the - # default namespace - return nil unless ( namespaces[ prefix ] == namespaces[ 'xmlns' ] ) - - attributes.get_attribute( name ) - - end - - # Evaluates to +true+ if this element has any attributes set, false - # otherwise. - def has_attributes? - return !@attributes.empty? - end - - # Adds an attribute to this element, overwriting any existing attribute - # by the same name. - # key:: - # can be either an Attribute or a String. If an Attribute, - # the attribute is added to the list of Element attributes. If String, - # the argument is used as the name of the new attribute, and the value - # parameter must be supplied. - # value:: - # Required if +key+ is a String, and ignored if the first argument is - # an Attribute. This is a String, and is used as the value - # of the new Attribute. This should be the unnormalized value of the - # attribute (without entities). - # Returns:: the Attribute added - # e = Element.new 'e' - # e.add_attribute( 'a', 'b' ) #-> - # e.add_attribute( 'x:a', 'c' ) #-> - # e.add_attribute Attribute.new('b', 'd') #-> - def add_attribute( key, value=nil ) - if key.kind_of? Attribute - @attributes << key - else - @attributes[key] = value - end - end - - # Add multiple attributes to this element. - # hash:: is either a hash, or array of arrays - # el.add_attributes( {"name1"=>"value1", "name2"=>"value2"} ) - # el.add_attributes( [ ["name1","value1"], ["name2"=>"value2"] ] ) - def add_attributes hash - if hash.kind_of? Hash - hash.each_pair {|key, value| @attributes[key] = value } - elsif hash.kind_of? Array - hash.each { |value| @attributes[ value[0] ] = value[1] } - end - end - - # Removes an attribute - # key:: - # either an Attribute or a String. In either case, the - # attribute is found by matching the attribute name to the argument, - # and then removed. If no attribute is found, no action is taken. - # Returns:: - # the attribute removed, or nil if this Element did not contain - # a matching attribute - # e = Element.new('E') - # e.add_attribute( 'name', 'Sean' ) #-> - # r = e.add_attribute( 'sur:name', 'Russell' ) #-> - # e.delete_attribute( 'name' ) #-> - # e.delete_attribute( r ) #-> - def delete_attribute(key) - attr = @attributes.get_attribute(key) - attr.remove unless attr.nil? - end - - ################################################# - # Other Utilities # - ################################################# - - # Get an array of all CData children. - # IMMUTABLE - def cdatas - find_all { |child| child.kind_of? CData }.freeze - end - - # Get an array of all Comment children. - # IMMUTABLE - def comments - find_all { |child| child.kind_of? Comment }.freeze - end - - # Get an array of all Instruction children. - # IMMUTABLE - def instructions - find_all { |child| child.kind_of? Instruction }.freeze - end - - # Get an array of all Text children. - # IMMUTABLE - def texts - find_all { |child| child.kind_of? Text }.freeze - end - - # == DEPRECATED - # See REXML::Formatters - # - # Writes out this element, and recursively, all children. - # output:: - # output an object which supports '<< string'; this is where the - # document will be written. - # indent:: - # An integer. If -1, no indenting will be used; otherwise, the - # indentation will be this number of spaces, and children will be - # indented an additional amount. Defaults to -1 - # transitive:: - # If transitive is true and indent is >= 0, then the output will be - # pretty-printed in such a way that the added whitespace does not affect - # the parse tree of the document - # ie_hack:: - # This hack inserts a space before the /> on empty tags to address - # a limitation of Internet Explorer. Defaults to false - # - # out = '' - # doc.write( out ) #-> doc is written to the string 'out' - # doc.write( $stdout ) #-> doc written to the console - def write(output=$stdout, indent=-1, transitive=false, ie_hack=false) - Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters", uplevel: 1) - formatter = if indent > -1 - if transitive - require_relative "formatters/transitive" - REXML::Formatters::Transitive.new( indent, ie_hack ) - else - REXML::Formatters::Pretty.new( indent, ie_hack ) - end - else - REXML::Formatters::Default.new( ie_hack ) - end - formatter.write( self, output ) - end - - - private - def __to_xpath_helper node - rv = node.expanded_name.clone - if node.parent - results = node.parent.find_all {|n| - n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name - } - if results.length > 1 - idx = results.index( node ) - rv << "[#{idx+1}]" - end - end - rv - end - - # A private helper method - def each_with_something( test, max=0, name=nil ) - num = 0 - @elements.each( name ){ |child| - yield child if test.call(child) and num += 1 - return if max>0 and num == max - } - end - end - - ######################################################################## - # ELEMENTS # - ######################################################################## - - # A class which provides filtering of children for Elements, and - # XPath search support. You are expected to only encounter this class as - # the element.elements object. Therefore, you are - # _not_ expected to instantiate this yourself. - class Elements - include Enumerable - # Constructor - # parent:: the parent Element - def initialize parent - @element = parent - end - - # Fetches a child element. Filters only Element children, regardless of - # the XPath match. - # index:: - # the search parameter. This is either an Integer, which - # will be used to find the index'th child Element, or an XPath, - # which will be used to search for the Element. Because - # of the nature of XPath searches, any element in the connected XML - # document can be fetched through any other element. The - # Integer index is 1-based, not 0-based. This means that the first - # child element is at index 1, not 0, and the +n+th element is at index - # +n+, not n-1. This is because XPath indexes element children - # starting from 1, not 0, and the indexes should be the same. - # name:: - # optional, and only used in the first argument is an - # Integer. In that case, the index'th child Element that has the - # supplied name will be returned. Note again that the indexes start at 1. - # Returns:: the first matching Element, or nil if no child matched - # doc = Document.new '' - # doc.root.elements[1] #-> - # doc.root.elements['c'] #-> - # doc.root.elements[2,'c'] #-> - def []( index, name=nil) - if index.kind_of? Integer - raise "index (#{index}) must be >= 1" if index < 1 - name = literalize(name) if name - num = 0 - @element.find { |child| - child.kind_of? Element and - (name.nil? ? true : child.has_name?( name )) and - (num += 1) == index - } - else - return XPath::first( @element, index ) - #{ |element| - # return element if element.kind_of? Element - #} - #return nil - end - end - - # Sets an element, replacing any previous matching element. If no - # existing element is found ,the element is added. - # index:: Used to find a matching element to replace. See [](). - # element:: - # The element to replace the existing element with - # the previous element - # Returns:: nil if no previous element was found. - # - # doc = Document.new '' - # doc.root.elements[10] = Element.new('b') #-> - # doc.root.elements[1] #-> - # doc.root.elements[1] = Element.new('c') #-> - # doc.root.elements['c'] = Element.new('d') #-> - def []=( index, element ) - previous = self[index] - if previous.nil? - @element.add element - else - previous.replace_with element - end - return previous - end - - # Returns +true+ if there are no +Element+ children, +false+ otherwise - def empty? - @element.find{ |child| child.kind_of? Element}.nil? - end - - # Returns the index of the supplied child (starting at 1), or -1 if - # the element is not a child - # element:: an +Element+ child - def index element - rv = 0 - found = @element.find do |child| - child.kind_of? Element and - (rv += 1) and - child == element - end - return rv if found == element - return -1 - end - - # Deletes a child Element - # element:: - # Either an Element, which is removed directly; an - # xpath, where the first matching child is removed; or an Integer, - # where the n'th Element is removed. - # Returns:: the removed child - # doc = Document.new '' - # b = doc.root.elements[1] - # doc.root.elements.delete b #-> - # doc.elements.delete("a/c[@id='1']") #-> - # doc.root.elements.delete 1 #-> - def delete element - if element.kind_of? Element - @element.delete element - else - el = self[element] - el.remove if el - end - end - - # Removes multiple elements. Filters for Element children, regardless of - # XPath matching. - # xpath:: all elements matching this String path are removed. - # Returns:: an Array of Elements that have been removed - # doc = Document.new '' - # deleted = doc.elements.delete_all 'a/c' #-> [, , , ] - def delete_all( xpath ) - rv = [] - XPath::each( @element, xpath) {|element| - rv << element if element.kind_of? Element - } - rv.each do |element| - @element.delete element - element.remove - end - return rv - end - - # Adds an element - # element:: - # if supplied, is either an Element, String, or - # Source (see Element.initialize). If not supplied or nil, a - # new, default Element will be constructed - # Returns:: the added Element - # a = Element.new('a') - # a.elements.add(Element.new('b')) #-> - # a.elements.add('c') #-> - def add element=nil - if element.nil? - Element.new("", self, @element.context) - elsif not element.kind_of?(Element) - Element.new(element, self, @element.context) - else - @element << element - element.context = @element.context - element - end - end - - alias :<< :add - - # Iterates through all of the child Elements, optionally filtering - # them by a given XPath - # xpath:: - # optional. If supplied, this is a String XPath, and is used to - # filter the children, so that only matching children are yielded. Note - # that XPaths are automatically filtered for Elements, so that - # non-Element children will not be yielded - # doc = Document.new 'sean' - # doc.root.elements.each {|e|p e} #-> Yields b, c, d, b, c, d elements - # doc.root.elements.each('b') {|e|p e} #-> Yields b, b elements - # doc.root.elements.each('child::node()') {|e|p e} - # #-> Yields , , , , , - # XPath.each(doc.root, 'child::node()', &block) - # #-> Yields , , , sean, , , - def each( xpath=nil ) - XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element } - end - - def collect( xpath=nil ) - collection = [] - XPath::each( @element, xpath ) {|e| - collection << yield(e) if e.kind_of?(Element) - } - collection - end - - def inject( xpath=nil, initial=nil ) - first = true - XPath::each( @element, xpath ) {|e| - if (e.kind_of? Element) - if (first and initial == nil) - initial = e - first = false - else - initial = yield( initial, e ) if e.kind_of? Element - end - end - } - initial - end - - # Returns the number of +Element+ children of the parent object. - # doc = Document.new 'seanelliottrussell' - # doc.root.size #-> 6, 3 element and 3 text nodes - # doc.root.elements.size #-> 3 - def size - count = 0 - @element.each {|child| count+=1 if child.kind_of? Element } - count - end - - # Returns an Array of Element children. An XPath may be supplied to - # filter the children. Only Element children are returned, even if the - # supplied XPath matches non-Element children. - # doc = Document.new 'seanelliott' - # doc.root.elements.to_a #-> [ , ] - # doc.root.elements.to_a("child::node()") #-> [ , ] - # XPath.match(doc.root, "child::node()") #-> [ sean, , elliott, ] - def to_a( xpath=nil ) - rv = XPath.match( @element, xpath ) - return rv.find_all{|e| e.kind_of? Element} if xpath - rv - end - - private - # Private helper class. Removes quotes from quoted strings - def literalize name - name = name[1..-2] if name[0] == ?' or name[0] == ?" #' - name - end - end - - ######################################################################## - # ATTRIBUTES # - ######################################################################## - - # A class that defines the set of Attributes of an Element and provides - # operations for accessing elements in that set. - class Attributes < Hash - # Constructor - # element:: the Element of which this is an Attribute - def initialize element - @element = element - end - - # Fetches an attribute value. If you want to get the Attribute itself, - # use get_attribute() - # name:: an XPath attribute name. Namespaces are relevant here. - # Returns:: - # the String value of the matching attribute, or +nil+ if no - # matching attribute was found. This is the unnormalized value - # (with entities expanded). - # - # doc = Document.new "" - # doc.root.attributes['att'] #-> '<' - # doc.root.attributes['bar:att'] #-> '2' - def [](name) - attr = get_attribute(name) - return attr.value unless attr.nil? - return nil - end - - def to_a - enum_for(:each_attribute).to_a - end - - # Returns the number of attributes the owning Element contains. - # doc = Document "" - # doc.root.attributes.length #-> 3 - def length - c = 0 - each_attribute { c+=1 } - c - end - alias :size :length - - # Iterates over the attributes of an Element. Yields actual Attribute - # nodes, not String values. - # - # doc = Document.new '' - # doc.root.attributes.each_attribute {|attr| - # p attr.expanded_name+" => "+attr.value - # } - def each_attribute # :yields: attribute - return to_enum(__method__) unless block_given? - each_value do |val| - if val.kind_of? Attribute - yield val - else - val.each_value { |atr| yield atr } - end - end - end - - # Iterates over each attribute of an Element, yielding the expanded name - # and value as a pair of Strings. - # - # doc = Document.new '' - # doc.root.attributes.each {|name, value| p name+" => "+value } - def each - return to_enum(__method__) unless block_given? - each_attribute do |attr| - yield [attr.expanded_name, attr.value] - end - end - - # Fetches an attribute - # name:: - # the name by which to search for the attribute. Can be a - # prefix:name namespace name. - # Returns:: The first matching attribute, or nil if there was none. This - # value is an Attribute node, not the String value of the attribute. - # doc = Document.new '' - # doc.root.attributes.get_attribute("foo").value #-> "2" - # doc.root.attributes.get_attribute("x:foo").value #-> "1" - def get_attribute( name ) - attr = fetch( name, nil ) - if attr.nil? - return nil if name.nil? - # Look for prefix - name =~ Namespace::NAMESPLIT - prefix, n = $1, $2 - if prefix - attr = fetch( n, nil ) - # check prefix - if attr == nil - elsif attr.kind_of? Attribute - return attr if prefix == attr.prefix - else - attr = attr[ prefix ] - return attr - end - end - element_document = @element.document - if element_document and element_document.doctype - expn = @element.expanded_name - expn = element_document.doctype.name if expn.size == 0 - attr_val = element_document.doctype.attribute_of(expn, name) - return Attribute.new( name, attr_val ) if attr_val - end - return nil - end - if attr.kind_of? Hash - attr = attr[ @element.prefix ] - end - return attr - end - - # Sets an attribute, overwriting any existing attribute value by the - # same name. Namespace is significant. - # name:: the name of the attribute - # value:: - # (optional) If supplied, the value of the attribute. If - # nil, any existing matching attribute is deleted. - # Returns:: - # Owning element - # doc = Document.new "" - # doc.root.attributes['y:foo'] = '2' - # doc.root.attributes['foo'] = '4' - # doc.root.attributes['x:foo'] = nil - def []=( name, value ) - if value.nil? # Delete the named attribute - attr = get_attribute(name) - delete attr - return - end - - unless value.kind_of? Attribute - if @element.document and @element.document.doctype - value = Text::normalize( value, @element.document.doctype ) - else - value = Text::normalize( value, nil ) - end - value = Attribute.new(name, value) - end - value.element = @element - old_attr = fetch(value.name, nil) - if old_attr.nil? - store(value.name, value) - elsif old_attr.kind_of? Hash - old_attr[value.prefix] = value - elsif old_attr.prefix != value.prefix - # Check for conflicting namespaces - if value.prefix != "xmlns" and old_attr.prefix != "xmlns" - old_namespace = old_attr.namespace - new_namespace = value.namespace - if old_namespace == new_namespace - raise ParseException.new( - "Namespace conflict in adding attribute \"#{value.name}\": "+ - "Prefix \"#{old_attr.prefix}\" = \"#{old_namespace}\" and "+ - "prefix \"#{value.prefix}\" = \"#{new_namespace}\"") - end - end - store value.name, {old_attr.prefix => old_attr, - value.prefix => value} - else - store value.name, value - end - return @element - end - - # Returns an array of Strings containing all of the prefixes declared - # by this set of # attributes. The array does not include the default - # namespace declaration, if one exists. - # doc = Document.new("") - # prefixes = doc.root.attributes.prefixes #-> ['x', 'y'] - def prefixes - ns = [] - each_attribute do |attribute| - ns << attribute.name if attribute.prefix == 'xmlns' - end - if @element.document and @element.document.doctype - expn = @element.expanded_name - expn = @element.document.doctype.name if expn.size == 0 - @element.document.doctype.attributes_of(expn).each { - |attribute| - ns << attribute.name if attribute.prefix == 'xmlns' - } - end - ns - end - - def namespaces - namespaces = {} - each_attribute do |attribute| - namespaces[attribute.name] = attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns' - end - if @element.document and @element.document.doctype - expn = @element.expanded_name - expn = @element.document.doctype.name if expn.size == 0 - @element.document.doctype.attributes_of(expn).each { - |attribute| - namespaces[attribute.name] = attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns' - } - end - namespaces - end - - # Removes an attribute - # attribute:: - # either a String, which is the name of the attribute to remove -- - # namespaces are significant here -- or the attribute to remove. - # Returns:: the owning element - # doc = Document.new "" - # doc.root.attributes.delete 'foo' #-> " - # doc.root.attributes.delete 'x:foo' #-> " - # attr = doc.root.attributes.get_attribute('y:foo') - # doc.root.attributes.delete attr #-> " - def delete( attribute ) - name = nil - prefix = nil - if attribute.kind_of? Attribute - name = attribute.name - prefix = attribute.prefix - else - attribute =~ Namespace::NAMESPLIT - prefix, name = $1, $2 - prefix = '' unless prefix - end - old = fetch(name, nil) - if old.kind_of? Hash # the supplied attribute is one of many - old.delete(prefix) - if old.size == 1 - repl = nil - old.each_value{|v| repl = v} - store name, repl - end - elsif old.nil? - return @element - else # the supplied attribute is a top-level one - super(name) - end - @element - end - - # Adds an attribute, overriding any existing attribute by the - # same name. Namespaces are significant. - # attribute:: An Attribute - def add( attribute ) - self[attribute.name] = attribute - end - - alias :<< :add - - # Deletes all attributes matching a name. Namespaces are significant. - # name:: - # A String; all attributes that match this path will be removed - # Returns:: an Array of the Attributes that were removed - def delete_all( name ) - rv = [] - each_attribute { |attribute| - rv << attribute if attribute.expanded_name == name - } - rv.each{ |attr| attr.remove } - return rv - end - - # The +get_attribute_ns+ method retrieves a method by its namespace - # and name. Thus it is possible to reliably identify an attribute - # even if an XML processor has changed the prefix. - # - # Method contributed by Henrik Martensson - def get_attribute_ns(namespace, name) - result = nil - each_attribute() { |attribute| - if name == attribute.name && - namespace == attribute.namespace() && - ( !namespace.empty? || !attribute.fully_expanded_name.index(':') ) - # foo will match xmlns:foo, but only if foo isn't also an attribute - result = attribute if !result or !namespace.empty? or - !attribute.fully_expanded_name.index(':') - end - } - result - end - end -end diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb deleted file mode 100644 index da2d70d6c9d7be..00000000000000 --- a/lib/rexml/encoding.rb +++ /dev/null @@ -1,51 +0,0 @@ -# coding: US-ASCII -# frozen_string_literal: false -module REXML - module Encoding - # ID ---> Encoding name - attr_reader :encoding - def encoding=(encoding) - encoding = encoding.name if encoding.is_a?(Encoding) - if encoding.is_a?(String) - original_encoding = encoding - encoding = find_encoding(encoding) - unless encoding - raise ArgumentError, "Bad encoding name #{original_encoding}" - end - end - return false if defined?(@encoding) and encoding == @encoding - if encoding - @encoding = encoding.upcase - else - @encoding = 'UTF-8' - end - true - end - - def encode(string) - string.encode(@encoding) - end - - def decode(string) - string.encode(::Encoding::UTF_8, @encoding) - end - - private - def find_encoding(name) - case name - when /\Ashift-jis\z/i - return "SHIFT_JIS" - when /\ACP-(\d+)\z/ - name = "CP#{$1}" - when /\AUTF-8\z/i - return name - end - begin - ::Encoding::Converter.search_convpath(name, 'UTF-8') - rescue ::Encoding::ConverterNotFoundError - return nil - end - name - end - end -end diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb deleted file mode 100644 index 89a9e84c577456..00000000000000 --- a/lib/rexml/entity.rb +++ /dev/null @@ -1,171 +0,0 @@ -# frozen_string_literal: false -require_relative 'child' -require_relative 'source' -require_relative 'xmltokens' - -module REXML - class Entity < Child - include XMLTokens - PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#" - SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))} - PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')} - EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))" - NDATADECL = "\\s+NDATA\\s+#{NAME}" - PEREFERENCE = "%#{NAME};" - ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))} - PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})" - ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))" - PEDECL = "" - GEDECL = "" - ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um - - attr_reader :name, :external, :ref, :ndata, :pubid - - # Create a new entity. Simple entities can be constructed by passing a - # name, value to the constructor; this creates a generic, plain entity - # reference. For anything more complicated, you have to pass a Source to - # the constructor with the entity definition, or use the accessor methods. - # +WARNING+: There is no validation of entity state except when the entity - # is read from a stream. If you start poking around with the accessors, - # you can easily create a non-conformant Entity. - # - # e = Entity.new( 'amp', '&' ) - def initialize stream, value=nil, parent=nil, reference=false - super(parent) - @ndata = @pubid = @value = @external = nil - if stream.kind_of? Array - @name = stream[1] - if stream[-1] == '%' - @reference = true - stream.pop - else - @reference = false - end - if stream[2] =~ /SYSTEM|PUBLIC/ - @external = stream[2] - if @external == 'SYSTEM' - @ref = stream[3] - @ndata = stream[4] if stream.size == 5 - else - @pubid = stream[3] - @ref = stream[4] - end - else - @value = stream[2] - end - else - @reference = reference - @external = nil - @name = stream - @value = value - end - end - - # Evaluates whether the given string matches an entity definition, - # returning true if so, and false otherwise. - def Entity::matches? string - (ENTITYDECL =~ string) == 0 - end - - # Evaluates to the unnormalized value of this entity; that is, replacing - # all entities -- both %ent; and &ent; entities. This differs from - # +value()+ in that +value+ only replaces %ent; entities. - def unnormalized - document.record_entity_expansion unless document.nil? - v = value() - return nil if v.nil? - @unnormalized = Text::unnormalize(v, parent) - @unnormalized - end - - #once :unnormalized - - # Returns the value of this entity unprocessed -- raw. This is the - # normalized value; that is, with all %ent; and &ent; entities intact - def normalized - @value - end - - # Write out a fully formed, correct entity definition (assuming the Entity - # object itself is valid.) - # - # out:: - # An object implementing << to which the entity will be - # output - # indent:: - # *DEPRECATED* and ignored - def write out, indent=-1 - out << '' - end - - # Returns this entity as a string. See write(). - def to_s - rv = '' - write rv - rv - end - - PEREFERENCE_RE = /#{PEREFERENCE}/um - # Returns the value of this entity. At the moment, only internal entities - # are processed. If the value contains internal references (IE, - # %blah;), those are replaced with their values. IE, if the doctype - # contains: - # - # - # then: - # doctype.entity('yada').value #-> "nanoo bar nanoo" - def value - if @value - matches = @value.scan(PEREFERENCE_RE) - rv = @value.clone - if @parent - sum = 0 - matches.each do |entity_reference| - entity_value = @parent.entity( entity_reference[0] ) - if sum + entity_value.bytesize > Security.entity_expansion_text_limit - raise "entity expansion has grown too large" - else - sum += entity_value.bytesize - end - rv.gsub!( /%#{entity_reference.join};/um, entity_value ) - end - end - return rv - end - nil - end - end - - # This is a set of entity constants -- the ones defined in the XML - # specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+. - # CAUTION: these entities does not have parent and document - module EntityConst - # +>+ - GT = Entity.new( 'gt', '>' ) - # +<+ - LT = Entity.new( 'lt', '<' ) - # +&+ - AMP = Entity.new( 'amp', '&' ) - # +"+ - QUOT = Entity.new( 'quot', '"' ) - # +'+ - APOS = Entity.new( 'apos', "'" ) - end -end diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb deleted file mode 100644 index 811b2ff3d5e4d1..00000000000000 --- a/lib/rexml/formatters/default.rb +++ /dev/null @@ -1,116 +0,0 @@ -# frozen_string_literal: false - -module REXML - module Formatters - class Default - # Prints out the XML document with no formatting -- except if ie_hack is - # set. - # - # ie_hack:: - # If set to true, then inserts whitespace before the close of an empty - # tag, so that IE's bad XML parser doesn't choke. - def initialize( ie_hack=false ) - @ie_hack = ie_hack - end - - # Writes the node to some output. - # - # node:: - # The node to write - # output:: - # A class implementing <<. Pass in an Output object to - # change the output encoding. - def write( node, output ) - case node - - when Document - if node.xml_decl.encoding != 'UTF-8' && !output.kind_of?(Output) - output = Output.new( output, node.xml_decl.encoding ) - end - write_document( node, output ) - - when Element - write_element( node, output ) - - when Declaration, ElementDecl, NotationDecl, ExternalEntity, Entity, - Attribute, AttlistDecl - node.write( output,-1 ) - - when Instruction - write_instruction( node, output ) - - when DocType, XMLDecl - node.write( output ) - - when Comment - write_comment( node, output ) - - when CData - write_cdata( node, output ) - - when Text - write_text( node, output ) - - else - raise Exception.new("XML FORMATTING ERROR") - - end - end - - protected - def write_document( node, output ) - node.children.each { |child| write( child, output ) } - end - - def write_element( node, output ) - output << "<#{node.expanded_name}" - - node.attributes.to_a.map { |a| - Hash === a ? a.values : a - }.flatten.sort_by {|attr| attr.name}.each do |attr| - output << " " - attr.write( output ) - end unless node.attributes.empty? - - if node.children.empty? - output << " " if @ie_hack - output << "/" - else - output << ">" - node.children.each { |child| - write( child, output ) - } - output << "" - end - - def write_text( node, output ) - output << node.to_s() - end - - def write_comment( node, output ) - output << Comment::START - output << node.to_s - output << Comment::STOP - end - - def write_cdata( node, output ) - output << CData::START - output << node.to_s - output << CData::STOP - end - - def write_instruction( node, output ) - output << Instruction::START - output << node.target - content = node.content - if content - output << ' ' - output << content - end - output << Instruction::STOP - end - end - end -end diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb deleted file mode 100644 index 562ef9462e1797..00000000000000 --- a/lib/rexml/formatters/pretty.rb +++ /dev/null @@ -1,142 +0,0 @@ -# frozen_string_literal: false -require_relative 'default' - -module REXML - module Formatters - # Pretty-prints an XML document. This destroys whitespace in text nodes - # and will insert carriage returns and indentations. - # - # TODO: Add an option to print attributes on new lines - class Pretty < Default - - # If compact is set to true, then the formatter will attempt to use as - # little space as possible - attr_accessor :compact - # The width of a page. Used for formatting text - attr_accessor :width - - # Create a new pretty printer. - # - # output:: - # An object implementing '<<(String)', to which the output will be written. - # indentation:: - # An integer greater than 0. The indentation of each level will be - # this number of spaces. If this is < 1, the behavior of this object - # is undefined. Defaults to 2. - # ie_hack:: - # If true, the printer will insert whitespace before closing empty - # tags, thereby allowing Internet Explorer's XML parser to - # function. Defaults to false. - def initialize( indentation=2, ie_hack=false ) - @indentation = indentation - @level = 0 - @ie_hack = ie_hack - @width = 80 - @compact = false - end - - protected - def write_element(node, output) - output << ' '*@level - output << "<#{node.expanded_name}" - - node.attributes.each_attribute do |attr| - output << " " - attr.write( output ) - end unless node.attributes.empty? - - if node.children.empty? - if @ie_hack - output << " " - end - output << "/" - else - output << ">" - # If compact and all children are text, and if the formatted output - # is less than the specified width, then try to print everything on - # one line - skip = false - if compact - if node.children.inject(true) {|s,c| s & c.kind_of?(Text)} - string = "" - old_level = @level - @level = 0 - node.children.each { |child| write( child, string ) } - @level = old_level - if string.length < @width - output << string - skip = true - end - end - end - unless skip - output << "\n" - @level += @indentation - node.children.each { |child| - next if child.kind_of?(Text) and child.to_s.strip.length == 0 - write( child, output ) - output << "\n" - } - @level -= @indentation - output << ' '*@level - end - output << "" - end - - def write_text( node, output ) - s = node.to_s() - s.gsub!(/\s/,' ') - s.squeeze!(" ") - s = wrap(s, @width - @level) - s = indent_text(s, @level, " ", true) - output << (' '*@level + s) - end - - def write_comment( node, output) - output << ' ' * @level - super - end - - def write_cdata( node, output) - output << ' ' * @level - super - end - - def write_document( node, output ) - # Ok, this is a bit odd. All XML documents have an XML declaration, - # but it may not write itself if the user didn't specifically add it, - # either through the API or in the input document. If it doesn't write - # itself, then we don't need a carriage return... which makes this - # logic more complex. - node.children.each { |child| - next if child == node.children[-1] and child.instance_of?(Text) - unless child == node.children[0] or child.instance_of?(Text) or - (child == node.children[1] and !node.children[0].writethis) - output << "\n" - end - write( child, output ) - } - end - - private - def indent_text(string, level=1, style="\t", indentfirstline=true) - return string if level < 0 - string.gsub(/\n/, "\n#{style*level}") - end - - def wrap(string, width) - parts = [] - while string.length > width and place = string.rindex(' ', width) - parts << string[0...place] - string = string[place+1..-1] - end - parts << string - parts.join("\n") - end - - end - end -end - diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb deleted file mode 100644 index 5ff51e10f3720f..00000000000000 --- a/lib/rexml/formatters/transitive.rb +++ /dev/null @@ -1,58 +0,0 @@ -# frozen_string_literal: false -require_relative 'pretty' - -module REXML - module Formatters - # The Transitive formatter writes an XML document that parses to an - # identical document as the source document. This means that no extra - # whitespace nodes are inserted, and whitespace within text nodes is - # preserved. Within these constraints, the document is pretty-printed, - # with whitespace inserted into the metadata to introduce formatting. - # - # Note that this is only useful if the original XML is not already - # formatted. Since this formatter does not alter whitespace nodes, the - # results of formatting already formatted XML will be odd. - class Transitive < Default - def initialize( indentation=2, ie_hack=false ) - @indentation = indentation - @level = 0 - @ie_hack = ie_hack - end - - protected - def write_element( node, output ) - output << "<#{node.expanded_name}" - - node.attributes.each_attribute do |attr| - output << " " - attr.write( output ) - end unless node.attributes.empty? - - output << "\n" - output << ' '*@level - if node.children.empty? - output << " " if @ie_hack - output << "/" - else - output << ">" - # If compact and all children are text, and if the formatted output - # is less than the specified width, then try to print everything on - # one line - @level += @indentation - node.children.each { |child| - write( child, output ) - } - @level -= @indentation - output << "" - end - - def write_text( node, output ) - output << node.to_s() - end - end - end -end diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb deleted file mode 100644 index 77926bf2af4775..00000000000000 --- a/lib/rexml/functions.rb +++ /dev/null @@ -1,447 +0,0 @@ -# frozen_string_literal: false -module REXML - # If you add a method, keep in mind two things: - # (1) the first argument will always be a list of nodes from which to - # filter. In the case of context methods (such as position), the function - # should return an array with a value for each child in the array. - # (2) all method calls from XML will have "-" replaced with "_". - # Therefore, in XML, "local-name()" is identical (and actually becomes) - # "local_name()" - module Functions - @@available_functions = {} - @@context = nil - @@namespace_context = {} - @@variables = {} - - INTERNAL_METHODS = [ - :namespace_context, - :namespace_context=, - :variables, - :variables=, - :context=, - :get_namespace, - :send, - ] - class << self - def singleton_method_added(name) - unless INTERNAL_METHODS.include?(name) - @@available_functions[name] = true - end - end - end - - def Functions::namespace_context=(x) ; @@namespace_context=x ; end - def Functions::variables=(x) ; @@variables=x ; end - def Functions::namespace_context ; @@namespace_context ; end - def Functions::variables ; @@variables ; end - - def Functions::context=(value); @@context = value; end - - def Functions::text( ) - if @@context[:node].node_type == :element - return @@context[:node].find_all{|n| n.node_type == :text}.collect{|n| n.value} - elsif @@context[:node].node_type == :text - return @@context[:node].value - else - return false - end - end - - # Returns the last node of the given list of nodes. - def Functions::last( ) - @@context[:size] - end - - def Functions::position( ) - @@context[:index] - end - - # Returns the size of the given list of nodes. - def Functions::count( node_set ) - node_set.size - end - - # Since REXML is non-validating, this method is not implemented as it - # requires a DTD - def Functions::id( object ) - end - - def Functions::local_name(node_set=nil) - get_namespace(node_set) do |node| - return node.local_name - end - "" - end - - def Functions::namespace_uri( node_set=nil ) - get_namespace( node_set ) {|node| node.namespace} - end - - def Functions::name( node_set=nil ) - get_namespace( node_set ) do |node| - node.expanded_name - end - end - - # Helper method. - def Functions::get_namespace( node_set = nil ) - if node_set == nil - yield @@context[:node] if @@context[:node].respond_to?(:namespace) - else - if node_set.respond_to? :each - result = [] - node_set.each do |node| - result << yield(node) if node.respond_to?(:namespace) - end - result - elsif node_set.respond_to? :namespace - yield node_set - end - end - end - - # A node-set is converted to a string by returning the string-value of the - # node in the node-set that is first in document order. If the node-set is - # empty, an empty string is returned. - # - # A number is converted to a string as follows - # - # NaN is converted to the string NaN - # - # positive zero is converted to the string 0 - # - # negative zero is converted to the string 0 - # - # positive infinity is converted to the string Infinity - # - # negative infinity is converted to the string -Infinity - # - # if the number is an integer, the number is represented in decimal form - # as a Number with no decimal point and no leading zeros, preceded by a - # minus sign (-) if the number is negative - # - # otherwise, the number is represented in decimal form as a Number - # including a decimal point with at least one digit before the decimal - # point and at least one digit after the decimal point, preceded by a - # minus sign (-) if the number is negative; there must be no leading zeros - # before the decimal point apart possibly from the one required digit - # immediately before the decimal point; beyond the one required digit - # after the decimal point there must be as many, but only as many, more - # digits as are needed to uniquely distinguish the number from all other - # IEEE 754 numeric values. - # - # The boolean false value is converted to the string false. The boolean - # true value is converted to the string true. - # - # An object of a type other than the four basic types is converted to a - # string in a way that is dependent on that type. - def Functions::string( object=@@context[:node] ) - if object.respond_to?(:node_type) - case object.node_type - when :attribute - object.value - when :element - string_value(object) - when :document - string_value(object.root) - when :processing_instruction - object.content - else - object.to_s - end - else - case object - when Array - string(object[0]) - when Float - if object.nan? - "NaN" - else - integer = object.to_i - if object == integer - "%d" % integer - else - object.to_s - end - end - else - object.to_s - end - end - end - - # A node-set is converted to a string by - # returning the concatenation of the string-value - # of each of the children of the node in the - # node-set that is first in document order. - # If the node-set is empty, an empty string is returned. - def Functions::string_value( o ) - rv = "" - o.children.each { |e| - if e.node_type == :text - rv << e.to_s - elsif e.node_type == :element - rv << string_value( e ) - end - } - rv - end - - def Functions::concat( *objects ) - concatenated = "" - objects.each do |object| - concatenated << string(object) - end - concatenated - end - - # Fixed by Mike Stok - def Functions::starts_with( string, test ) - string(string).index(string(test)) == 0 - end - - # Fixed by Mike Stok - def Functions::contains( string, test ) - string(string).include?(string(test)) - end - - # Kouhei fixed this - def Functions::substring_before( string, test ) - ruby_string = string(string) - ruby_index = ruby_string.index(string(test)) - if ruby_index.nil? - "" - else - ruby_string[ 0...ruby_index ] - end - end - - # Kouhei fixed this too - def Functions::substring_after( string, test ) - ruby_string = string(string) - return $1 if ruby_string =~ /#{test}(.*)/ - "" - end - - # Take equal portions of Mike Stok and Sean Russell; mix - # vigorously, and pour into a tall, chilled glass. Serves 10,000. - def Functions::substring( string, start, length=nil ) - ruby_string = string(string) - ruby_length = if length.nil? - ruby_string.length.to_f - else - number(length) - end - ruby_start = number(start) - - # Handle the special cases - return '' if ( - ruby_length.nan? or - ruby_start.nan? or - ruby_start.infinite? - ) - - infinite_length = ruby_length.infinite? == 1 - ruby_length = ruby_string.length if infinite_length - - # Now, get the bounds. The XPath bounds are 1..length; the ruby bounds - # are 0..length. Therefore, we have to offset the bounds by one. - ruby_start = round(ruby_start) - 1 - ruby_length = round(ruby_length) - - if ruby_start < 0 - ruby_length += ruby_start unless infinite_length - ruby_start = 0 - end - return '' if ruby_length <= 0 - ruby_string[ruby_start,ruby_length] - end - - # UNTESTED - def Functions::string_length( string ) - string(string).length - end - - # UNTESTED - def Functions::normalize_space( string=nil ) - string = string(@@context[:node]) if string.nil? - if string.kind_of? Array - string.collect{|x| string.to_s.strip.gsub(/\s+/um, ' ') if string} - else - string.to_s.strip.gsub(/\s+/um, ' ') - end - end - - # This is entirely Mike Stok's beast - def Functions::translate( string, tr1, tr2 ) - from = string(tr1) - to = string(tr2) - - # the map is our translation table. - # - # if a character occurs more than once in the - # from string then we ignore the second & - # subsequent mappings - # - # if a character maps to nil then we delete it - # in the output. This happens if the from - # string is longer than the to string - # - # there's nothing about - or ^ being special in - # http://www.w3.org/TR/xpath#function-translate - # so we don't build ranges or negated classes - - map = Hash.new - 0.upto(from.length - 1) { |pos| - from_char = from[pos] - unless map.has_key? from_char - map[from_char] = - if pos < to.length - to[pos] - else - nil - end - end - } - - if ''.respond_to? :chars - string(string).chars.collect { |c| - if map.has_key? c then map[c] else c end - }.compact.join - else - string(string).unpack('U*').collect { |c| - if map.has_key? c then map[c] else c end - }.compact.pack('U*') - end - end - - def Functions::boolean(object=@@context[:node]) - case object - when true, false - object - when Float - return false if object.zero? - return false if object.nan? - true - when Numeric - not object.zero? - when String - not object.empty? - when Array - not object.empty? - else - object ? true : false - end - end - - # UNTESTED - def Functions::not( object ) - not boolean( object ) - end - - # UNTESTED - def Functions::true( ) - true - end - - # UNTESTED - def Functions::false( ) - false - end - - # UNTESTED - def Functions::lang( language ) - lang = false - node = @@context[:node] - attr = nil - until node.nil? - if node.node_type == :element - attr = node.attributes["xml:lang"] - unless attr.nil? - lang = compare_language(string(language), attr) - break - else - end - end - node = node.parent - end - lang - end - - def Functions::compare_language lang1, lang2 - lang2.downcase.index(lang1.downcase) == 0 - end - - # a string that consists of optional whitespace followed by an optional - # minus sign followed by a Number followed by whitespace is converted to - # the IEEE 754 number that is nearest (according to the IEEE 754 - # round-to-nearest rule) to the mathematical value represented by the - # string; any other string is converted to NaN - # - # boolean true is converted to 1; boolean false is converted to 0 - # - # a node-set is first converted to a string as if by a call to the string - # function and then converted in the same way as a string argument - # - # an object of a type other than the four basic types is converted to a - # number in a way that is dependent on that type - def Functions::number(object=@@context[:node]) - case object - when true - Float(1) - when false - Float(0) - when Array - number(string(object)) - when Numeric - object.to_f - else - str = string(object) - case str.strip - when /\A\s*(-?(?:\d+(?:\.\d*)?|\.\d+))\s*\z/ - $1.to_f - else - Float::NAN - end - end - end - - def Functions::sum( nodes ) - nodes = [nodes] unless nodes.kind_of? Array - nodes.inject(0) { |r,n| r + number(string(n)) } - end - - def Functions::floor( number ) - number(number).floor - end - - def Functions::ceiling( number ) - number(number).ceil - end - - def Functions::round( number ) - number = number(number) - begin - neg = number.negative? - number = number.abs.round - neg ? -number : number - rescue FloatDomainError - number - end - end - - def Functions::processing_instruction( node ) - node.node_type == :processing_instruction - end - - def Functions::send(name, *args) - if @@available_functions[name.to_sym] - super - else - # TODO: Maybe, this is not XPath spec behavior. - # This behavior must be reconsidered. - XPath.match(@@context[:node], name.to_s) - end - end - end -end diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb deleted file mode 100644 index 318741f03b56f5..00000000000000 --- a/lib/rexml/instruction.rb +++ /dev/null @@ -1,79 +0,0 @@ -# frozen_string_literal: false - -require_relative "child" -require_relative "source" - -module REXML - # Represents an XML Instruction; IE, - # TODO: Add parent arg (3rd arg) to constructor - class Instruction < Child - START = "" - - # target is the "name" of the Instruction; IE, the "tag" in - # content is everything else. - attr_accessor :target, :content - - # Constructs a new Instruction - # @param target can be one of a number of things. If String, then - # the target of this instruction is set to this. If an Instruction, - # then the Instruction is shallowly cloned (target and content are - # copied). - # @param content Must be either a String, or a Parent. Can only - # be a Parent if the target argument is a Source. Otherwise, this - # String is set as the content of this instruction. - def initialize(target, content=nil) - case target - when String - super() - @target = target - @content = content - when Instruction - super(content) - @target = target.target - @content = target.content - else - message = - "processing instruction target must be String or REXML::Instruction: " - message << "<#{target.inspect}>" - raise ArgumentError, message - end - @content.strip! if @content - end - - def clone - Instruction.new self - end - - # == DEPRECATED - # See the rexml/formatters package - # - def write writer, indent=-1, transitive=false, ie_hack=false - Kernel.warn( "#{self.class.name}.write is deprecated", uplevel: 1) - indent(writer, indent) - writer << START - writer << @target - if @content - writer << ' ' - writer << @content - end - writer << STOP - end - - # @return true if other is an Instruction, and the content and target - # of the other matches the target and content of this object. - def ==( other ) - other.kind_of? Instruction and - other.target == @target and - other.content == @content - end - - def node_type - :processing_instruction - end - - def inspect - "" - end - end -end diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb deleted file mode 100644 index 01177c64d2846a..00000000000000 --- a/lib/rexml/light/node.rb +++ /dev/null @@ -1,196 +0,0 @@ -# frozen_string_literal: false -require_relative '../xmltokens' - -# [ :element, parent, name, attributes, children* ] - # a = Node.new - # a << "B" # => B - # a.b # => B - # a.b[1] # => B - # a.b[1]["x"] = "y" # => B - # a.b[0].c # => B - # a.b.c << "D" # => BD -module REXML - module Light - # Represents a tagged XML element. Elements are characterized by - # having children, attributes, and names, and can themselves be - # children. - class Node - NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u - PARENTS = [ :element, :document, :doctype ] - # Create a new element. - def initialize node=nil - @node = node - if node.kind_of? String - node = [ :text, node ] - elsif node.nil? - node = [ :document, nil, nil ] - elsif node[0] == :start_element - node[0] = :element - elsif node[0] == :start_doctype - node[0] = :doctype - elsif node[0] == :start_document - node[0] = :document - end - end - - def size - if PARENTS.include? @node[0] - @node[-1].size - else - 0 - end - end - - def each - size.times { |x| yield( at(x+4) ) } - end - - def name - at(2) - end - - def name=( name_str, ns=nil ) - pfx = '' - pfx = "#{prefix(ns)}:" if ns - _old_put(2, "#{pfx}#{name_str}") - end - - def parent=( node ) - _old_put(1,node) - end - - def local_name - namesplit - @name - end - - def local_name=( name_str ) - _old_put( 1, "#@prefix:#{name_str}" ) - end - - def prefix( namespace=nil ) - prefix_of( self, namespace ) - end - - def namespace( prefix=prefix() ) - namespace_of( self, prefix ) - end - - def namespace=( namespace ) - @prefix = prefix( namespace ) - pfx = '' - pfx = "#@prefix:" if @prefix.size > 0 - _old_put(1, "#{pfx}#@name") - end - - def []( reference, ns=nil ) - if reference.kind_of? String - pfx = '' - pfx = "#{prefix(ns)}:" if ns - at(3)["#{pfx}#{reference}"] - elsif reference.kind_of? Range - _old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) ) - else - _old_get( 4+reference ) - end - end - - def =~( path ) - XPath.match( self, path ) - end - - # Doesn't handle namespaces yet - def []=( reference, ns, value=nil ) - if reference.kind_of? String - value = ns unless value - at( 3 )[reference] = value - elsif reference.kind_of? Range - _old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns ) - else - if value - _old_put( 4+reference, ns, value ) - else - _old_put( 4+reference, ns ) - end - end - end - - # Append a child to this element, optionally under a provided namespace. - # The namespace argument is ignored if the element argument is an Element - # object. Otherwise, the element argument is a string, the namespace (if - # provided) is the namespace the element is created in. - def << element - if node_type() == :text - at(-1) << element - else - newnode = Node.new( element ) - newnode.parent = self - self.push( newnode ) - end - at(-1) - end - - def node_type - _old_get(0) - end - - def text=( foo ) - replace = at(4).kind_of?(String)? 1 : 0 - self._old_put(4,replace, normalizefoo) - end - - def root - context = self - context = context.at(1) while context.at(1) - end - - def has_name?( name, namespace = '' ) - at(3) == name and namespace() == namespace - end - - def children - self - end - - def parent - at(1) - end - - def to_s - - end - - private - - def namesplit - return if @name.defined? - at(2) =~ NAMESPLIT - @prefix = '' || $1 - @name = $2 - end - - def namespace_of( node, prefix=nil ) - if not prefix - name = at(2) - name =~ NAMESPLIT - prefix = $1 - end - to_find = 'xmlns' - to_find = "xmlns:#{prefix}" if not prefix.nil? - ns = at(3)[ to_find ] - ns ? ns : namespace_of( @node[0], prefix ) - end - - def prefix_of( node, namespace=nil ) - if not namespace - name = node.name - name =~ NAMESPLIT - $1 - else - ns = at(3).find { |k,v| v == namespace } - ns ? ns : prefix_of( node.parent, namespace ) - end - end - end - end -end diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb deleted file mode 100644 index 924edf950631cd..00000000000000 --- a/lib/rexml/namespace.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: false - -require_relative 'xmltokens' - -module REXML - # Adds named attributes to an object. - module Namespace - # The name of the object, valid if set - attr_reader :name, :expanded_name - # The expanded name of the object, valid if name is set - attr_accessor :prefix - include XMLTokens - NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u - - # Sets the name and the expanded name - def name=( name ) - @expanded_name = name - case name - when NAMESPLIT - if $1 - @prefix = $1 - else - @prefix = "" - @namespace = "" - end - @name = $2 - when "" - @prefix = nil - @namespace = nil - @name = nil - else - message = "name must be \#{PREFIX}:\#{LOCAL_NAME} or \#{LOCAL_NAME}: " - message += "<#{name.inspect}>" - raise ArgumentError, message - end - end - - # Compares names optionally WITH namespaces - def has_name?( other, ns=nil ) - if ns - return (namespace() == ns and name() == other) - elsif other.include? ":" - return fully_expanded_name == other - else - return name == other - end - end - - alias :local_name :name - - # Fully expand the name, even if the prefix wasn't specified in the - # source file. - def fully_expanded_name - ns = prefix - return "#{ns}:#@name" if ns.size > 0 - return @name - end - end -end diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb deleted file mode 100644 index 081caba6cb7c0c..00000000000000 --- a/lib/rexml/node.rb +++ /dev/null @@ -1,76 +0,0 @@ -# frozen_string_literal: false -require_relative "parseexception" -require_relative "formatters/pretty" -require_relative "formatters/default" - -module REXML - # Represents a node in the tree. Nodes are never encountered except as - # superclasses of other objects. Nodes have siblings. - module Node - # @return the next sibling (nil if unset) - def next_sibling_node - return nil if @parent.nil? - @parent[ @parent.index(self) + 1 ] - end - - # @return the previous sibling (nil if unset) - def previous_sibling_node - return nil if @parent.nil? - ind = @parent.index(self) - return nil if ind == 0 - @parent[ ind - 1 ] - end - - # indent:: - # *DEPRECATED* This parameter is now ignored. See the formatters in the - # REXML::Formatters package for changing the output style. - def to_s indent=nil - unless indent.nil? - Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated", uplevel: 1) - f = REXML::Formatters::Pretty.new( indent ) - f.write( self, rv = "" ) - else - f = REXML::Formatters::Default.new - f.write( self, rv = "" ) - end - return rv - end - - def indent to, ind - if @parent and @parent.context and not @parent.context[:indentstyle].nil? then - indentstyle = @parent.context[:indentstyle] - else - indentstyle = ' ' - end - to << indentstyle*ind unless ind<1 - end - - def parent? - false; - end - - - # Visit all subnodes of +self+ recursively - def each_recursive(&block) # :yields: node - self.elements.each {|node| - block.call(node) - node.each_recursive(&block) - } - end - - # Find (and return) first subnode (recursively) for which the block - # evaluates to true. Returns +nil+ if none was found. - def find_first_recursive(&block) # :yields: node - each_recursive {|node| - return node if block.call(node) - } - return nil - end - - # Returns the position that +self+ holds in its parent's array, indexed - # from 1. - def index_in_parent - parent.index(self)+1 - end - end -end diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb deleted file mode 100644 index 88a5fb378d9d12..00000000000000 --- a/lib/rexml/output.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: false -require_relative 'encoding' - -module REXML - class Output - include Encoding - - attr_reader :encoding - - def initialize real_IO, encd="iso-8859-1" - @output = real_IO - self.encoding = encd - - @to_utf = encoding != 'UTF-8' - - if encoding == "UTF-16" - @output << "\ufeff".encode("UTF-16BE") - self.encoding = "UTF-16BE" - end - end - - def <<( content ) - @output << (@to_utf ? self.encode(content) : content) - end - - def to_s - "Output[#{encoding}]" - end - end -end diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb deleted file mode 100644 index 6a53b37a123b65..00000000000000 --- a/lib/rexml/parent.rb +++ /dev/null @@ -1,166 +0,0 @@ -# frozen_string_literal: false -require_relative "child" - -module REXML - # A parent has children, and has methods for accessing them. The Parent - # class is never encountered except as the superclass for some other - # object. - class Parent < Child - include Enumerable - - # Constructor - # @param parent if supplied, will be set as the parent of this object - def initialize parent=nil - super(parent) - @children = [] - end - - def add( object ) - object.parent = self - @children << object - object - end - - alias :push :add - alias :<< :push - - def unshift( object ) - object.parent = self - @children.unshift object - end - - def delete( object ) - found = false - @children.delete_if {|c| c.equal?(object) and found = true } - object.parent = nil if found - found ? object : nil - end - - def each(&block) - @children.each(&block) - end - - def delete_if( &block ) - @children.delete_if(&block) - end - - def delete_at( index ) - @children.delete_at index - end - - def each_index( &block ) - @children.each_index(&block) - end - - # Fetches a child at a given index - # @param index the Integer index of the child to fetch - def []( index ) - @children[index] - end - - alias :each_child :each - - - - # Set an index entry. See Array.[]= - # @param index the index of the element to set - # @param opt either the object to set, or an Integer length - # @param child if opt is an Integer, this is the child to set - # @return the parent (self) - def []=( *args ) - args[-1].parent = self - @children[*args[0..-2]] = args[-1] - end - - # Inserts an child before another child - # @param child1 this is either an xpath or an Element. If an Element, - # child2 will be inserted before child1 in the child list of the parent. - # If an xpath, child2 will be inserted before the first child to match - # the xpath. - # @param child2 the child to insert - # @return the parent (self) - def insert_before( child1, child2 ) - if child1.kind_of? String - child1 = XPath.first( self, child1 ) - child1.parent.insert_before child1, child2 - else - ind = index(child1) - child2.parent.delete(child2) if child2.parent - @children[ind,0] = child2 - child2.parent = self - end - self - end - - # Inserts an child after another child - # @param child1 this is either an xpath or an Element. If an Element, - # child2 will be inserted after child1 in the child list of the parent. - # If an xpath, child2 will be inserted after the first child to match - # the xpath. - # @param child2 the child to insert - # @return the parent (self) - def insert_after( child1, child2 ) - if child1.kind_of? String - child1 = XPath.first( self, child1 ) - child1.parent.insert_after child1, child2 - else - ind = index(child1)+1 - child2.parent.delete(child2) if child2.parent - @children[ind,0] = child2 - child2.parent = self - end - self - end - - def to_a - @children.dup - end - - # Fetches the index of a given child - # @param child the child to get the index of - # @return the index of the child, or nil if the object is not a child - # of this parent. - def index( child ) - count = -1 - @children.find { |i| count += 1 ; i.hash == child.hash } - count - end - - # @return the number of children of this parent - def size - @children.size - end - - alias :length :size - - # Replaces one child with another, making sure the nodelist is correct - # @param to_replace the child to replace (must be a Child) - # @param replacement the child to insert into the nodelist (must be a - # Child) - def replace_child( to_replace, replacement ) - @children.map! {|c| c.equal?( to_replace ) ? replacement : c } - to_replace.parent = nil - replacement.parent = self - end - - # Deeply clones this object. This creates a complete duplicate of this - # Parent, including all descendants. - def deep_clone - cl = clone() - each do |child| - if child.kind_of? Parent - cl << child.deep_clone - else - cl << child.clone - end - end - cl - end - - alias :children :to_a - - def parent? - true - end - end -end diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb deleted file mode 100644 index 7b16cd1a411de4..00000000000000 --- a/lib/rexml/parseexception.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: false -module REXML - class ParseException < RuntimeError - attr_accessor :source, :parser, :continued_exception - - def initialize( message, source=nil, parser=nil, exception=nil ) - super(message) - @source = source - @parser = parser - @continued_exception = exception - end - - def to_s - # Quote the original exception, if there was one - if @continued_exception - err = @continued_exception.inspect - err << "\n" - err << @continued_exception.backtrace.join("\n") - err << "\n...\n" - else - err = "" - end - - # Get the stack trace and error message - err << super - - # Add contextual information - if @source - err << "\nLine: #{line}\n" - err << "Position: #{position}\n" - err << "Last 80 unconsumed characters:\n" - err << @source.buffer[0..80].force_encoding("ASCII-8BIT").gsub(/\n/, ' ') - end - - err - end - - def position - @source.current_line[0] if @source and defined? @source.current_line and - @source.current_line - end - - def line - @source.current_line[2] if @source and defined? @source.current_line and - @source.current_line - end - - def context - @source.current_line - end - end -end diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb deleted file mode 100644 index f76aed07875dc3..00000000000000 --- a/lib/rexml/parsers/baseparser.rb +++ /dev/null @@ -1,594 +0,0 @@ -# frozen_string_literal: false -require_relative '../parseexception' -require_relative '../undefinednamespaceexception' -require_relative '../source' -require 'set' -require "strscan" - -module REXML - module Parsers - # = Using the Pull Parser - # This API is experimental, and subject to change. - # parser = PullParser.new( "texttxet" ) - # while parser.has_next? - # res = parser.next - # puts res[1]['att'] if res.start_tag? and res[0] == 'b' - # end - # See the PullEvent class for information on the content of the results. - # The data is identical to the arguments passed for the various events to - # the StreamListener API. - # - # Notice that: - # parser = PullParser.new( "BAD DOCUMENT" ) - # while parser.has_next? - # res = parser.next - # raise res[1] if res.error? - # end - # - # Nat Price gave me some good ideas for the API. - class BaseParser - LETTER = '[:alpha:]' - DIGIT = '[:digit:]' - - COMBININGCHAR = '' # TODO - EXTENDER = '' # TODO - - NCNAME_STR= "[#{LETTER}_][-[:alnum:]._#{COMBININGCHAR}#{EXTENDER}]*" - QNAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})" - QNAME = /(#{QNAME_STR})/ - - # Just for backward compatibility. For example, kramdown uses this. - # It's not used in REXML. - UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}" - - NAMECHAR = '[\-\w\.:]' - NAME = "([\\w:]#{NAMECHAR}*)" - NMTOKEN = "(?:#{NAMECHAR})+" - NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*" - REFERENCE = "&(?:#{NAME};|#\\d+;|#x[0-9a-fA-F]+;)" - REFERENCE_RE = /#{REFERENCE}/ - - DOCTYPE_START = /\A\s*/um - DOCTYPE_PATTERN = /\s*)/um - ATTRIBUTE_PATTERN = /\s*(#{QNAME_STR})\s*=\s*(["'])(.*?)\4/um - COMMENT_START = /\A/um - CDATA_START = /\A/um - CDATA_PATTERN = //um - XMLDECL_START = /\A<\?xml\s/u; - XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>/um - INSTRUCTION_START = /\A<\?/u - INSTRUCTION_PATTERN = /<\?#{NAME}(\s+.*?)?\?>/um - TAG_MATCH = /^<((?>#{QNAME_STR}))/um - CLOSE_MATCH = /^\s*<\/(#{QNAME_STR})\s*>/um - - VERSION = /\bversion\s*=\s*["'](.*?)['"]/um - ENCODING = /\bencoding\s*=\s*["'](.*?)['"]/um - STANDALONE = /\bstandalone\s*=\s*["'](.*?)['"]/um - - ENTITY_START = /\A\s*/um - SYSTEMENTITY = /\A\s*(%.*?;)\s*$/um - ENUMERATION = "\\(\\s*#{NMTOKEN}(?:\\s*\\|\\s*#{NMTOKEN})*\\s*\\)" - NOTATIONTYPE = "NOTATION\\s+\\(\\s*#{NAME}(?:\\s*\\|\\s*#{NAME})*\\s*\\)" - ENUMERATEDTYPE = "(?:(?:#{NOTATIONTYPE})|(?:#{ENUMERATION}))" - ATTTYPE = "(CDATA|ID|IDREF|IDREFS|ENTITY|ENTITIES|NMTOKEN|NMTOKENS|#{ENUMERATEDTYPE})" - ATTVALUE = "(?:\"((?:[^<&\"]|#{REFERENCE})*)\")|(?:'((?:[^<&']|#{REFERENCE})*)')" - DEFAULTDECL = "(#REQUIRED|#IMPLIED|(?:(#FIXED\\s+)?#{ATTVALUE}))" - ATTDEF = "\\s+#{NAME}\\s+#{ATTTYPE}\\s+#{DEFAULTDECL}" - ATTDEF_RE = /#{ATTDEF}/ - ATTLISTDECL_START = /\A\s*/um - NOTATIONDECL_START = /\A\s*/um - SYSTEM = /\A\s*/um - - TEXT_PATTERN = /\A([^<]*)/um - - # Entity constants - PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#" - SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))} - PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')} - EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))" - NDATADECL = "\\s+NDATA\\s+#{NAME}" - PEREFERENCE = "%#{NAME};" - ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))} - PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})" - ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))" - PEDECL = "" - GEDECL = "" - ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um - - EREFERENCE = /&(?!#{NAME};)/ - - DEFAULT_ENTITIES = { - 'gt' => [/>/, '>', '>', />/], - 'lt' => [/</, '<', '<', / [/"/, '"', '"', /"/], - "apos" => [/'/, "'", "'", /'/] - } - - def initialize( source ) - self.stream = source - @listeners = [] - end - - def add_listener( listener ) - @listeners << listener - end - - attr_reader :source - - def stream=( source ) - @source = SourceFactory.create_from( source ) - @closed = nil - @document_status = nil - @tags = [] - @stack = [] - @entities = [] - @nsstack = [] - end - - def position - if @source.respond_to? :position - @source.position - else - # FIXME - 0 - end - end - - # Returns true if there are no more events - def empty? - return (@source.empty? and @stack.empty?) - end - - # Returns true if there are more events. Synonymous with !empty? - def has_next? - return !(@source.empty? and @stack.empty?) - end - - # Push an event back on the head of the stream. This method - # has (theoretically) infinite depth. - def unshift token - @stack.unshift(token) - end - - # Peek at the +depth+ event in the stack. The first element on the stack - # is at depth 0. If +depth+ is -1, will parse to the end of the input - # stream and return the last event, which is always :end_document. - # Be aware that this causes the stream to be parsed up to the +depth+ - # event, so you can effectively pre-parse the entire document (pull the - # entire thing into memory) using this method. - def peek depth=0 - raise %Q[Illegal argument "#{depth}"] if depth < -1 - temp = [] - if depth == -1 - temp.push(pull()) until empty? - else - while @stack.size+temp.size < depth+1 - temp.push(pull()) - end - end - @stack += temp if temp.size > 0 - @stack[depth] - end - - # Returns the next event. This is a +PullEvent+ object. - def pull - pull_event.tap do |event| - @listeners.each do |listener| - listener.receive event - end - end - end - - def pull_event - if @closed - x, @closed = @closed, nil - return [ :end_element, x ] - end - return [ :end_document ] if empty? - return @stack.shift if @stack.size > 0 - #STDERR.puts @source.encoding - @source.read if @source.buffer.size<2 - #STDERR.puts "BUFFER = #{@source.buffer.inspect}" - if @document_status == nil - #@source.consume( /^\s*/um ) - word = @source.match( /^((?:\s+)|(?:<[^>]*>))/um ) - word = word[1] unless word.nil? - #STDERR.puts "WORD = #{word.inspect}" - case word - when COMMENT_START - return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ] - when XMLDECL_START - #STDERR.puts "XMLDECL" - results = @source.match( XMLDECL_PATTERN, true )[1] - version = VERSION.match( results ) - version = version[1] unless version.nil? - encoding = ENCODING.match(results) - encoding = encoding[1] unless encoding.nil? - if need_source_encoding_update?(encoding) - @source.encoding = encoding - end - if encoding.nil? and /\AUTF-16(?:BE|LE)\z/i =~ @source.encoding - encoding = "UTF-16" - end - standalone = STANDALONE.match(results) - standalone = standalone[1] unless standalone.nil? - return [ :xmldecl, version, encoding, standalone ] - when INSTRUCTION_START - return process_instruction - when DOCTYPE_START - md = @source.match( DOCTYPE_PATTERN, true ) - @nsstack.unshift(curr_ns=Set.new) - identity = md[1] - close = md[2] - identity =~ IDENTITY - name = $1 - raise REXML::ParseException.new("DOCTYPE is missing a name") if name.nil? - pub_sys = $2.nil? ? nil : $2.strip - long_name = $4.nil? ? nil : $4.strip - uri = $6.nil? ? nil : $6.strip - args = [ :start_doctype, name, pub_sys, long_name, uri ] - if close == ">" - @document_status = :after_doctype - @source.read if @source.buffer.size<2 - md = @source.match(/^\s*/um, true) - @stack << [ :end_doctype ] - else - @document_status = :in_doctype - end - return args - when /^\s+/ - else - @document_status = :after_doctype - @source.read if @source.buffer.size<2 - md = @source.match(/\s*/um, true) - if @source.encoding == "UTF-8" - @source.buffer.force_encoding(::Encoding::UTF_8) - end - end - end - if @document_status == :in_doctype - md = @source.match(/\s*(.*?>)/um) - case md[1] - when SYSTEMENTITY - match = @source.match( SYSTEMENTITY, true )[1] - return [ :externalentity, match ] - - when ELEMENTDECL_START - return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ] - - when ENTITY_START - match = @source.match( ENTITYDECL, true ).to_a.compact - match[0] = :entitydecl - ref = false - if match[1] == '%' - ref = true - match.delete_at 1 - end - # Now we have to sort out what kind of entity reference this is - if match[2] == 'SYSTEM' - # External reference - match[3] = match[3][1..-2] # PUBID - match.delete_at(4) if match.size > 4 # Chop out NDATA decl - # match is [ :entity, name, SYSTEM, pubid(, ndata)? ] - elsif match[2] == 'PUBLIC' - # External reference - match[3] = match[3][1..-2] # PUBID - match[4] = match[4][1..-2] # HREF - match.delete_at(5) if match.size > 5 # Chop out NDATA decl - # match is [ :entity, name, PUBLIC, pubid, href(, ndata)? ] - else - match[2] = match[2][1..-2] - match.pop if match.size == 4 - # match is [ :entity, name, value ] - end - match << '%' if ref - return match - when ATTLISTDECL_START - md = @source.match( ATTLISTDECL_PATTERN, true ) - raise REXML::ParseException.new( "Bad ATTLIST declaration!", @source ) if md.nil? - element = md[1] - contents = md[0] - - pairs = {} - values = md[0].scan( ATTDEF_RE ) - values.each do |attdef| - unless attdef[3] == "#IMPLIED" - attdef.compact! - val = attdef[3] - val = attdef[4] if val == "#FIXED " - pairs[attdef[0]] = val - if attdef[0] =~ /^xmlns:(.*)/ - @nsstack[0] << $1 - end - end - end - return [ :attlistdecl, element, pairs, contents ] - when NOTATIONDECL_START - md = nil - if @source.match( PUBLIC ) - md = @source.match( PUBLIC, true ) - vals = [md[1],md[2],md[4],md[6]] - elsif @source.match( SYSTEM ) - md = @source.match( SYSTEM, true ) - vals = [md[1],md[2],nil,md[4]] - else - raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source ) - end - return [ :notationdecl, *vals ] - when DOCTYPE_END - @document_status = :after_doctype - @source.match( DOCTYPE_END, true ) - return [ :end_doctype ] - end - end - begin - if @source.buffer[0] == ?< - if @source.buffer[1] == ?/ - @nsstack.shift - last_tag = @tags.pop - md = @source.match( CLOSE_MATCH, true ) - if md and !last_tag - message = "Unexpected top-level end tag (got '#{md[1]}')" - raise REXML::ParseException.new(message, @source) - end - if md.nil? or last_tag != md[1] - message = "Missing end tag for '#{last_tag}'" - message << " (got '#{md[1]}')" if md - raise REXML::ParseException.new(message, @source) - end - return [ :end_element, last_tag ] - elsif @source.buffer[1] == ?! - md = @source.match(/\A(\s*[^>]*>)/um) - #STDERR.puts "SOURCE BUFFER = #{source.buffer}, #{source.buffer.size}" - raise REXML::ParseException.new("Malformed node", @source) unless md - if md[0][2] == ?- - md = @source.match( COMMENT_PATTERN, true ) - - case md[1] - when /--/, /-\z/ - raise REXML::ParseException.new("Malformed comment", @source) - end - - return [ :comment, md[1] ] if md - else - md = @source.match( CDATA_PATTERN, true ) - return [ :cdata, md[1] ] if md - end - raise REXML::ParseException.new( "Declarations can only occur "+ - "in the doctype declaration.", @source) - elsif @source.buffer[1] == ?? - return process_instruction - else - # Get the next tag - md = @source.match(TAG_MATCH, true) - unless md - raise REXML::ParseException.new("malformed XML: missing tag start", @source) - end - prefixes = Set.new - prefixes << md[2] if md[2] - @nsstack.unshift(curr_ns=Set.new) - attributes, closed = parse_attributes(prefixes, curr_ns) - # Verify that all of the prefixes have been defined - for prefix in prefixes - unless @nsstack.find{|k| k.member?(prefix)} - raise UndefinedNamespaceException.new(prefix,@source,self) - end - end - - if closed - @closed = md[1] - @nsstack.shift - else - @tags.push( md[1] ) - end - return [ :start_element, md[1], attributes ] - end - else - md = @source.match( TEXT_PATTERN, true ) - if md[0].length == 0 - @source.match( /(\s+)/, true ) - end - #STDERR.puts "GOT #{md[1].inspect}" unless md[0].length == 0 - #return [ :text, "" ] if md[0].length == 0 - # unnormalized = Text::unnormalize( md[1], self ) - # return PullEvent.new( :text, md[1], unnormalized ) - return [ :text, md[1] ] - end - rescue REXML::UndefinedNamespaceException - raise - rescue REXML::ParseException - raise - rescue => error - raise REXML::ParseException.new( "Exception parsing", - @source, self, (error ? error : $!) ) - end - return [ :dummy ] - end - private :pull_event - - def entity( reference, entities ) - value = nil - value = entities[ reference ] if entities - if not value - value = DEFAULT_ENTITIES[ reference ] - value = value[2] if value - end - unnormalize( value, entities ) if value - end - - # Escapes all possible entities - def normalize( input, entities=nil, entity_filter=nil ) - copy = input.clone - # Doing it like this rather than in a loop improves the speed - copy.gsub!( EREFERENCE, '&' ) - entities.each do |key, value| - copy.gsub!( value, "&#{key};" ) unless entity_filter and - entity_filter.include?(entity) - end if entities - copy.gsub!( EREFERENCE, '&' ) - DEFAULT_ENTITIES.each do |key, value| - copy.gsub!( value[3], value[1] ) - end - copy - end - - # Unescapes all possible entities - def unnormalize( string, entities=nil, filter=nil ) - rv = string.clone - rv.gsub!( /\r\n?/, "\n" ) - matches = rv.scan( REFERENCE_RE ) - return rv if matches.size == 0 - rv.gsub!( /�*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) { - m=$1 - m = "0#{m}" if m[0] == ?x - [Integer(m)].pack('U*') - } - matches.collect!{|x|x[0]}.compact! - if matches.size > 0 - matches.each do |entity_reference| - unless filter and filter.include?(entity_reference) - entity_value = entity( entity_reference, entities ) - if entity_value - re = /&#{entity_reference};/ - rv.gsub!( re, entity_value ) - else - er = DEFAULT_ENTITIES[entity_reference] - rv.gsub!( er[0], er[2] ) if er - end - end - end - rv.gsub!( /&/, '&' ) - end - rv - end - - private - def need_source_encoding_update?(xml_declaration_encoding) - return false if xml_declaration_encoding.nil? - return false if /\AUTF-16\z/i =~ xml_declaration_encoding - true - end - - def process_instruction - match_data = @source.match(INSTRUCTION_PATTERN, true) - unless match_data - message = "Invalid processing instruction node" - raise REXML::ParseException.new(message, @source) - end - [:processing_instruction, match_data[1], match_data[2]] - end - - def parse_attributes(prefixes, curr_ns) - attributes = {} - closed = false - match_data = @source.match(/^(.*?)(\/)?>/um, true) - if match_data.nil? - message = "Start tag isn't ended" - raise REXML::ParseException.new(message, @source) - end - - raw_attributes = match_data[1] - closed = !match_data[2].nil? - return attributes, closed if raw_attributes.nil? - return attributes, closed if raw_attributes.empty? - - scanner = StringScanner.new(raw_attributes) - until scanner.eos? - if scanner.scan(/\s+/) - break if scanner.eos? - end - - pos = scanner.pos - loop do - break if scanner.scan(ATTRIBUTE_PATTERN) - unless scanner.scan(QNAME) - message = "Invalid attribute name: <#{scanner.rest}>" - raise REXML::ParseException.new(message, @source) - end - name = scanner[0] - unless scanner.scan(/\s*=\s*/um) - message = "Missing attribute equal: <#{name}>" - raise REXML::ParseException.new(message, @source) - end - quote = scanner.scan(/['"]/) - unless quote - message = "Missing attribute value start quote: <#{name}>" - raise REXML::ParseException.new(message, @source) - end - unless scanner.scan(/.*#{Regexp.escape(quote)}/um) - match_data = @source.match(/^(.*?)(\/)?>/um, true) - if match_data - scanner << "/" if closed - scanner << ">" - scanner << match_data[1] - scanner.pos = pos - closed = !match_data[2].nil? - next - end - message = - "Missing attribute value end quote: <#{name}>: <#{quote}>" - raise REXML::ParseException.new(message, @source) - end - end - name = scanner[1] - prefix = scanner[2] - local_part = scanner[3] - # quote = scanner[4] - value = scanner[5] - if prefix == "xmlns" - if local_part == "xml" - if value != "http://www.w3.org/XML/1998/namespace" - msg = "The 'xml' prefix must not be bound to any other namespace "+ - "(http://www.w3.org/TR/REC-xml-names/#ns-decl)" - raise REXML::ParseException.new( msg, @source, self ) - end - elsif local_part == "xmlns" - msg = "The 'xmlns' prefix must not be declared "+ - "(http://www.w3.org/TR/REC-xml-names/#ns-decl)" - raise REXML::ParseException.new( msg, @source, self) - end - curr_ns << local_part - elsif prefix - prefixes << prefix unless prefix == "xml" - end - - if attributes.has_key?(name) - msg = "Duplicate attribute #{name.inspect}" - raise REXML::ParseException.new(msg, @source, self) - end - - attributes[name] = value - end - return attributes, closed - end - end - end -end - -=begin - case event[0] - when :start_element - when :text - when :end_element - when :processing_instruction - when :cdata - when :comment - when :xmldecl - when :start_doctype - when :end_doctype - when :externalentity - when :elementdecl - when :entity - when :attlistdecl - when :notationdecl - when :end_doctype - end -=end diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb deleted file mode 100644 index bdc08276a9ac4d..00000000000000 --- a/lib/rexml/parsers/lightparser.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: false -require_relative 'streamparser' -require_relative 'baseparser' -require_relative '../light/node' - -module REXML - module Parsers - class LightParser - def initialize stream - @stream = stream - @parser = REXML::Parsers::BaseParser.new( stream ) - end - - def add_listener( listener ) - @parser.add_listener( listener ) - end - - def rewind - @stream.rewind - @parser.stream = @stream - end - - def parse - root = context = [ :document ] - while true - event = @parser.pull - case event[0] - when :end_document - break - when :start_element, :start_doctype - new_node = event - context << new_node - new_node[1,0] = [context] - context = new_node - when :end_element, :end_doctype - context = context[1] - else - new_node = event - context << new_node - new_node[1,0] = [context] - end - end - root - end - end - - # An element is an array. The array contains: - # 0 The parent element - # 1 The tag name - # 2 A hash of attributes - # 3..-1 The child elements - # An element is an array of size > 3 - # Text is a String - # PIs are [ :processing_instruction, target, data ] - # Comments are [ :comment, data ] - # DocTypes are DocType structs - # The root is an array with XMLDecls, Text, DocType, Array, Text - end -end diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb deleted file mode 100644 index f8b232a2cd35a5..00000000000000 --- a/lib/rexml/parsers/pullparser.rb +++ /dev/null @@ -1,197 +0,0 @@ -# frozen_string_literal: false -require 'forwardable' - -require_relative '../parseexception' -require_relative 'baseparser' -require_relative '../xmltokens' - -module REXML - module Parsers - # = Using the Pull Parser - # This API is experimental, and subject to change. - # parser = PullParser.new( "texttxet" ) - # while parser.has_next? - # res = parser.next - # puts res[1]['att'] if res.start_tag? and res[0] == 'b' - # end - # See the PullEvent class for information on the content of the results. - # The data is identical to the arguments passed for the various events to - # the StreamListener API. - # - # Notice that: - # parser = PullParser.new( "BAD DOCUMENT" ) - # while parser.has_next? - # res = parser.next - # raise res[1] if res.error? - # end - # - # Nat Price gave me some good ideas for the API. - class PullParser - include XMLTokens - extend Forwardable - - def_delegators( :@parser, :has_next? ) - def_delegators( :@parser, :entity ) - def_delegators( :@parser, :empty? ) - def_delegators( :@parser, :source ) - - def initialize stream - @entities = {} - @listeners = nil - @parser = BaseParser.new( stream ) - @my_stack = [] - end - - def add_listener( listener ) - @listeners = [] unless @listeners - @listeners << listener - end - - def each - while has_next? - yield self.pull - end - end - - def peek depth=0 - if @my_stack.length <= depth - (depth - @my_stack.length + 1).times { - e = PullEvent.new(@parser.pull) - @my_stack.push(e) - } - end - @my_stack[depth] - end - - def pull - return @my_stack.shift if @my_stack.length > 0 - - event = @parser.pull - case event[0] - when :entitydecl - @entities[ event[1] ] = - event[2] unless event[2] =~ /PUBLIC|SYSTEM/ - when :text - unnormalized = @parser.unnormalize( event[1], @entities ) - event << unnormalized - end - PullEvent.new( event ) - end - - def unshift token - @my_stack.unshift token - end - end - - # A parsing event. The contents of the event are accessed as an +Array?, - # and the type is given either by the ...? methods, or by accessing the - # +type+ accessor. The contents of this object vary from event to event, - # but are identical to the arguments passed to +StreamListener+s for each - # event. - class PullEvent - # The type of this event. Will be one of :tag_start, :tag_end, :text, - # :processing_instruction, :comment, :doctype, :attlistdecl, :entitydecl, - # :notationdecl, :entity, :cdata, :xmldecl, or :error. - def initialize(arg) - @contents = arg - end - - def []( start, endd=nil) - if start.kind_of? Range - @contents.slice( start.begin+1 .. start.end ) - elsif start.kind_of? Numeric - if endd.nil? - @contents.slice( start+1 ) - else - @contents.slice( start+1, endd ) - end - else - raise "Illegal argument #{start.inspect} (#{start.class})" - end - end - - def event_type - @contents[0] - end - - # Content: [ String tag_name, Hash attributes ] - def start_element? - @contents[0] == :start_element - end - - # Content: [ String tag_name ] - def end_element? - @contents[0] == :end_element - end - - # Content: [ String raw_text, String unnormalized_text ] - def text? - @contents[0] == :text - end - - # Content: [ String text ] - def instruction? - @contents[0] == :processing_instruction - end - - # Content: [ String text ] - def comment? - @contents[0] == :comment - end - - # Content: [ String name, String pub_sys, String long_name, String uri ] - def doctype? - @contents[0] == :start_doctype - end - - # Content: [ String text ] - def attlistdecl? - @contents[0] == :attlistdecl - end - - # Content: [ String text ] - def elementdecl? - @contents[0] == :elementdecl - end - - # Due to the wonders of DTDs, an entity declaration can be just about - # anything. There's no way to normalize it; you'll have to interpret the - # content yourself. However, the following is true: - # - # * If the entity declaration is an internal entity: - # [ String name, String value ] - # Content: [ String text ] - def entitydecl? - @contents[0] == :entitydecl - end - - # Content: [ String text ] - def notationdecl? - @contents[0] == :notationdecl - end - - # Content: [ String text ] - def entity? - @contents[0] == :entity - end - - # Content: [ String text ] - def cdata? - @contents[0] == :cdata - end - - # Content: [ String version, String encoding, String standalone ] - def xmldecl? - @contents[0] == :xmldecl - end - - def error? - @contents[0] == :error - end - - def inspect - @contents[0].to_s + ": " + @contents[1..-1].inspect - end - end - end -end diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb deleted file mode 100644 index 6a24ce2227a522..00000000000000 --- a/lib/rexml/parsers/sax2parser.rb +++ /dev/null @@ -1,273 +0,0 @@ -# frozen_string_literal: false -require_relative 'baseparser' -require_relative '../parseexception' -require_relative '../namespace' -require_relative '../text' - -module REXML - module Parsers - # SAX2Parser - class SAX2Parser - def initialize source - @parser = BaseParser.new(source) - @listeners = [] - @procs = [] - @namespace_stack = [] - @has_listeners = false - @tag_stack = [] - @entities = {} - end - - def source - @parser.source - end - - def add_listener( listener ) - @parser.add_listener( listener ) - end - - # Listen arguments: - # - # Symbol, Array, Block - # Listen to Symbol events on Array elements - # Symbol, Block - # Listen to Symbol events - # Array, Listener - # Listen to all events on Array elements - # Array, Block - # Listen to :start_element events on Array elements - # Listener - # Listen to All events - # - # Symbol can be one of: :start_element, :end_element, - # :start_prefix_mapping, :end_prefix_mapping, :characters, - # :processing_instruction, :doctype, :attlistdecl, :elementdecl, - # :entitydecl, :notationdecl, :cdata, :xmldecl, :comment - # - # There is an additional symbol that can be listened for: :progress. - # This will be called for every event generated, passing in the current - # stream position. - # - # Array contains regular expressions or strings which will be matched - # against fully qualified element names. - # - # Listener must implement the methods in SAX2Listener - # - # Block will be passed the same arguments as a SAX2Listener method would - # be, where the method name is the same as the matched Symbol. - # See the SAX2Listener for more information. - def listen( *args, &blok ) - if args[0].kind_of? Symbol - if args.size == 2 - args[1].each { |match| @procs << [args[0], match, blok] } - else - add( [args[0], nil, blok] ) - end - elsif args[0].kind_of? Array - if args.size == 2 - args[0].each { |match| add( [nil, match, args[1]] ) } - else - args[0].each { |match| add( [ :start_element, match, blok ] ) } - end - else - add([nil, nil, args[0]]) - end - end - - def deafen( listener=nil, &blok ) - if listener - @listeners.delete_if {|item| item[-1] == listener } - @has_listeners = false if @listeners.size == 0 - else - @procs.delete_if {|item| item[-1] == blok } - end - end - - def parse - @procs.each { |sym,match,block| block.call if sym == :start_document } - @listeners.each { |sym,match,block| - block.start_document if sym == :start_document or sym.nil? - } - context = [] - while true - event = @parser.pull - case event[0] - when :end_document - handle( :end_document ) - break - when :start_doctype - handle( :doctype, *event[1..-1]) - when :end_doctype - context = context[1] - when :start_element - @tag_stack.push(event[1]) - # find the observers for namespaces - procs = get_procs( :start_prefix_mapping, event[1] ) - listeners = get_listeners( :start_prefix_mapping, event[1] ) - if procs or listeners - # break out the namespace declarations - # The attributes live in event[2] - event[2].each {|n, v| event[2][n] = @parser.normalize(v)} - nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ } - nsdecl.collect! { |n, value| [ n[6..-1], value ] } - @namespace_stack.push({}) - nsdecl.each do |n,v| - @namespace_stack[-1][n] = v - # notify observers of namespaces - procs.each { |ob| ob.call( n, v ) } if procs - listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners - end - end - event[1] =~ Namespace::NAMESPLIT - prefix = $1 - local = $2 - uri = get_namespace(prefix) - # find the observers for start_element - procs = get_procs( :start_element, event[1] ) - listeners = get_listeners( :start_element, event[1] ) - # notify observers - procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs - listeners.each { |ob| - ob.start_element( uri, local, event[1], event[2] ) - } if listeners - when :end_element - @tag_stack.pop - event[1] =~ Namespace::NAMESPLIT - prefix = $1 - local = $2 - uri = get_namespace(prefix) - # find the observers for start_element - procs = get_procs( :end_element, event[1] ) - listeners = get_listeners( :end_element, event[1] ) - # notify observers - procs.each { |ob| ob.call( uri, local, event[1] ) } if procs - listeners.each { |ob| - ob.end_element( uri, local, event[1] ) - } if listeners - - namespace_mapping = @namespace_stack.pop - # find the observers for namespaces - procs = get_procs( :end_prefix_mapping, event[1] ) - listeners = get_listeners( :end_prefix_mapping, event[1] ) - if procs or listeners - namespace_mapping.each do |ns_prefix, ns_uri| - # notify observers of namespaces - procs.each { |ob| ob.call( ns_prefix ) } if procs - listeners.each { |ob| ob.end_prefix_mapping(ns_prefix) } if listeners - end - end - when :text - #normalized = @parser.normalize( event[1] ) - #handle( :characters, normalized ) - copy = event[1].clone - - esub = proc { |match| - if @entities.has_key?($1) - @entities[$1].gsub(Text::REFERENCE, &esub) - else - match - end - } - - copy.gsub!( Text::REFERENCE, &esub ) - copy.gsub!( Text::NUMERICENTITY ) {|m| - m=$1 - m = "0#{m}" if m[0] == ?x - [Integer(m)].pack('U*') - } - handle( :characters, copy ) - when :entitydecl - handle_entitydecl( event ) - when :processing_instruction, :comment, :attlistdecl, - :elementdecl, :cdata, :notationdecl, :xmldecl - handle( *event ) - end - handle( :progress, @parser.position ) - end - end - - private - def handle( symbol, *arguments ) - tag = @tag_stack[-1] - procs = get_procs( symbol, tag ) - listeners = get_listeners( symbol, tag ) - # notify observers - procs.each { |ob| ob.call( *arguments ) } if procs - listeners.each { |l| - l.send( symbol.to_s, *arguments ) - } if listeners - end - - def handle_entitydecl( event ) - @entities[ event[1] ] = event[2] if event.size == 3 - parameter_reference_p = false - case event[2] - when "SYSTEM" - if event.size == 5 - if event.last == "%" - parameter_reference_p = true - else - event[4, 0] = "NDATA" - end - end - when "PUBLIC" - if event.size == 6 - if event.last == "%" - parameter_reference_p = true - else - event[5, 0] = "NDATA" - end - end - else - parameter_reference_p = (event.size == 4) - end - event[1, 0] = event.pop if parameter_reference_p - handle( event[0], event[1..-1] ) - end - - # The following methods are duplicates, but it is faster than using - # a helper - def get_procs( symbol, name ) - return nil if @procs.size == 0 - @procs.find_all do |sym, match, block| - ( - (sym.nil? or symbol == sym) and - ((name.nil? and match.nil?) or match.nil? or ( - (name == match) or - (match.kind_of? Regexp and name =~ match) - ) - ) - ) - end.collect{|x| x[-1]} - end - def get_listeners( symbol, name ) - return nil if @listeners.size == 0 - @listeners.find_all do |sym, match, block| - ( - (sym.nil? or symbol == sym) and - ((name.nil? and match.nil?) or match.nil? or ( - (name == match) or - (match.kind_of? Regexp and name =~ match) - ) - ) - ) - end.collect{|x| x[-1]} - end - - def add( pair ) - if pair[-1].respond_to? :call - @procs << pair unless @procs.include? pair - else - @listeners << pair unless @listeners.include? pair - @has_listeners = true - end - end - - def get_namespace( prefix ) - uris = (@namespace_stack.find_all { |ns| not ns[prefix].nil? }) || - (@namespace_stack.find { |ns| not ns[nil].nil? }) - uris[-1][prefix] unless uris.nil? or 0 == uris.size - end - end - end -end diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb deleted file mode 100644 index 9e0eb0b363c4eb..00000000000000 --- a/lib/rexml/parsers/streamparser.rb +++ /dev/null @@ -1,61 +0,0 @@ -# frozen_string_literal: false -require_relative "baseparser" - -module REXML - module Parsers - class StreamParser - def initialize source, listener - @listener = listener - @parser = BaseParser.new( source ) - @tag_stack = [] - end - - def add_listener( listener ) - @parser.add_listener( listener ) - end - - def parse - # entity string - while true - event = @parser.pull - case event[0] - when :end_document - unless @tag_stack.empty? - tag_path = "/" + @tag_stack.join("/") - raise ParseException.new("Missing end tag for '#{tag_path}'", - @parser.source) - end - return - when :start_element - @tag_stack << event[1] - attrs = event[2].each do |n, v| - event[2][n] = @parser.unnormalize( v ) - end - @listener.tag_start( event[1], attrs ) - when :end_element - @listener.tag_end( event[1] ) - @tag_stack.pop - when :text - normalized = @parser.unnormalize( event[1] ) - @listener.text( normalized ) - when :processing_instruction - @listener.instruction( *event[1,2] ) - when :start_doctype - @listener.doctype( *event[1..-1] ) - when :end_doctype - # FIXME: remove this condition for milestone:3.2 - @listener.doctype_end if @listener.respond_to? :doctype_end - when :comment, :attlistdecl, :cdata, :xmldecl, :elementdecl - @listener.send( event[0].to_s, *event[1..-1] ) - when :entitydecl, :notationdecl - @listener.send( event[0].to_s, event[1..-1] ) - when :externalentity - entity_reference = event[1] - content = entity_reference.gsub(/\A%|;\z/, "") - @listener.entity(content) - end - end - end - end - end -end diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb deleted file mode 100644 index bf9a42545b8084..00000000000000 --- a/lib/rexml/parsers/treeparser.rb +++ /dev/null @@ -1,101 +0,0 @@ -# frozen_string_literal: false -require_relative '../validation/validationexception' -require_relative '../undefinednamespaceexception' - -module REXML - module Parsers - class TreeParser - def initialize( source, build_context = Document.new ) - @build_context = build_context - @parser = Parsers::BaseParser.new( source ) - end - - def add_listener( listener ) - @parser.add_listener( listener ) - end - - def parse - tag_stack = [] - in_doctype = false - entities = nil - begin - while true - event = @parser.pull - #STDERR.puts "TREEPARSER GOT #{event.inspect}" - case event[0] - when :end_document - unless tag_stack.empty? - raise ParseException.new("No close tag for #{@build_context.xpath}", - @parser.source, @parser) - end - return - when :start_element - tag_stack.push(event[1]) - el = @build_context = @build_context.add_element( event[1] ) - event[2].each do |key, value| - el.attributes[key]=Attribute.new(key,value,self) - end - when :end_element - tag_stack.pop - @build_context = @build_context.parent - when :text - if not in_doctype - if @build_context[-1].instance_of? Text - @build_context[-1] << event[1] - else - @build_context.add( - Text.new(event[1], @build_context.whitespace, nil, true) - ) unless ( - @build_context.ignore_whitespace_nodes and - event[1].strip.size==0 - ) - end - end - when :comment - c = Comment.new( event[1] ) - @build_context.add( c ) - when :cdata - c = CData.new( event[1] ) - @build_context.add( c ) - when :processing_instruction - @build_context.add( Instruction.new( event[1], event[2] ) ) - when :end_doctype - in_doctype = false - entities.each { |k,v| entities[k] = @build_context.entities[k].value } - @build_context = @build_context.parent - when :start_doctype - doctype = DocType.new( event[1..-1], @build_context ) - @build_context = doctype - entities = {} - in_doctype = true - when :attlistdecl - n = AttlistDecl.new( event[1..-1] ) - @build_context.add( n ) - when :externalentity - n = ExternalEntity.new( event[1] ) - @build_context.add( n ) - when :elementdecl - n = ElementDecl.new( event[1] ) - @build_context.add(n) - when :entitydecl - entities[ event[1] ] = event[2] unless event[2] =~ /PUBLIC|SYSTEM/ - @build_context.add(Entity.new(event)) - when :notationdecl - n = NotationDecl.new( *event[1..-1] ) - @build_context.add( n ) - when :xmldecl - x = XMLDecl.new( event[1], event[2], event[3] ) - @build_context.add( x ) - end - end - rescue REXML::Validation::ValidationException - raise - rescue REXML::ParseException - raise - rescue - raise ParseException.new( $!.message, @parser.source, @parser, $! ) - end - end - end - end -end diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb deleted file mode 100644 index e0029f43da535d..00000000000000 --- a/lib/rexml/parsers/ultralightparser.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: false -require_relative 'streamparser' -require_relative 'baseparser' - -module REXML - module Parsers - class UltraLightParser - def initialize stream - @stream = stream - @parser = REXML::Parsers::BaseParser.new( stream ) - end - - def add_listener( listener ) - @parser.add_listener( listener ) - end - - def rewind - @stream.rewind - @parser.stream = @stream - end - - def parse - root = context = [] - while true - event = @parser.pull - case event[0] - when :end_document - break - when :end_doctype - context = context[1] - when :start_element, :start_doctype - context << event - event[1,0] = [context] - context = event - when :end_element - context = context[1] - else - context << event - end - end - root - end - end - - # An element is an array. The array contains: - # 0 The parent element - # 1 The tag name - # 2 A hash of attributes - # 3..-1 The child elements - # An element is an array of size > 3 - # Text is a String - # PIs are [ :processing_instruction, target, data ] - # Comments are [ :comment, data ] - # DocTypes are DocType structs - # The root is an array with XMLDecls, Text, DocType, Array, Text - end -end diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb deleted file mode 100644 index d01d325e04d705..00000000000000 --- a/lib/rexml/parsers/xpathparser.rb +++ /dev/null @@ -1,675 +0,0 @@ -# frozen_string_literal: false -require_relative '../namespace' -require_relative '../xmltokens' - -module REXML - module Parsers - # You don't want to use this class. Really. Use XPath, which is a wrapper - # for this class. Believe me. You don't want to poke around in here. - # There is strange, dark magic at work in this code. Beware. Go back! Go - # back while you still can! - class XPathParser - include XMLTokens - LITERAL = /^'([^']*)'|^"([^"]*)"/u - - def namespaces=( namespaces ) - Functions::namespace_context = namespaces - @namespaces = namespaces - end - - def parse path - path = path.dup - path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces - path.gsub!( /\s+([\]\)])/, '\1') - parsed = [] - OrExpr(path, parsed) - parsed - end - - def predicate path - parsed = [] - Predicate( "[#{path}]", parsed ) - parsed - end - - def abbreviate( path ) - path = path.kind_of?(String) ? parse( path ) : path - string = "" - document = false - while path.size > 0 - op = path.shift - case op - when :node - when :attribute - string << "/" if string.size > 0 - string << "@" - when :child - string << "/" if string.size > 0 - when :descendant_or_self - string << "/" - when :self - string << "." - when :parent - string << ".." - when :any - string << "*" - when :text - string << "text()" - when :following, :following_sibling, - :ancestor, :ancestor_or_self, :descendant, - :namespace, :preceding, :preceding_sibling - string << "/" unless string.size == 0 - string << op.to_s.tr("_", "-") - string << "::" - when :qname - prefix = path.shift - name = path.shift - string << prefix+":" if prefix.size > 0 - string << name - when :predicate - string << '[' - string << predicate_to_string( path.shift ) {|x| abbreviate( x ) } - string << ']' - when :document - document = true - when :function - string << path.shift - string << "( " - string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )} - string << " )" - when :literal - string << %Q{ "#{path.shift}" } - else - string << "/" unless string.size == 0 - string << "UNKNOWN(" - string << op.inspect - string << ")" - end - end - string = "/"+string if document - return string - end - - def expand( path ) - path = path.kind_of?(String) ? parse( path ) : path - string = "" - document = false - while path.size > 0 - op = path.shift - case op - when :node - string << "node()" - when :attribute, :child, :following, :following_sibling, - :ancestor, :ancestor_or_self, :descendant, :descendant_or_self, - :namespace, :preceding, :preceding_sibling, :self, :parent - string << "/" unless string.size == 0 - string << op.to_s.tr("_", "-") - string << "::" - when :any - string << "*" - when :qname - prefix = path.shift - name = path.shift - string << prefix+":" if prefix.size > 0 - string << name - when :predicate - string << '[' - string << predicate_to_string( path.shift ) { |x| expand(x) } - string << ']' - when :document - document = true - else - string << "/" unless string.size == 0 - string << "UNKNOWN(" - string << op.inspect - string << ")" - end - end - string = "/"+string if document - return string - end - - def predicate_to_string( path, &block ) - string = "" - case path[0] - when :and, :or, :mult, :plus, :minus, :neq, :eq, :lt, :gt, :lteq, :gteq, :div, :mod, :union - op = path.shift - case op - when :eq - op = "=" - when :lt - op = "<" - when :gt - op = ">" - when :lteq - op = "<=" - when :gteq - op = ">=" - when :neq - op = "!=" - when :union - op = "|" - end - left = predicate_to_string( path.shift, &block ) - right = predicate_to_string( path.shift, &block ) - string << " " - string << left - string << " " - string << op.to_s - string << " " - string << right - string << " " - when :function - path.shift - name = path.shift - string << name - string << "( " - string << predicate_to_string( path.shift, &block ) - string << " )" - when :literal - path.shift - string << " " - string << path.shift.inspect - string << " " - else - string << " " - string << yield( path ) - string << " " - end - return string.squeeze(" ") - end - - private - #LocationPath - # | RelativeLocationPath - # | '/' RelativeLocationPath? - # | '//' RelativeLocationPath - def LocationPath path, parsed - path = path.lstrip - if path[0] == ?/ - parsed << :document - if path[1] == ?/ - parsed << :descendant_or_self - parsed << :node - path = path[2..-1] - else - path = path[1..-1] - end - end - return RelativeLocationPath( path, parsed ) if path.size > 0 - end - - #RelativeLocationPath - # | Step - # | (AXIS_NAME '::' | '@' | '') AxisSpecifier - # NodeTest - # Predicate - # | '.' | '..' AbbreviatedStep - # | RelativeLocationPath '/' Step - # | RelativeLocationPath '//' Step - AXIS = /^(ancestor|ancestor-or-self|attribute|child|descendant|descendant-or-self|following|following-sibling|namespace|parent|preceding|preceding-sibling|self)::/ - def RelativeLocationPath path, parsed - loop do - original_path = path - path = path.lstrip - - return original_path if path.empty? - - # (axis or @ or ) nodetest predicate > - # OR > / Step - # (. or ..) > - if path[0] == ?. - if path[1] == ?. - parsed << :parent - parsed << :node - path = path[2..-1] - else - parsed << :self - parsed << :node - path = path[1..-1] - end - else - if path[0] == ?@ - parsed << :attribute - path = path[1..-1] - # Goto Nodetest - elsif path =~ AXIS - parsed << $1.tr('-','_').intern - path = $' - # Goto Nodetest - else - parsed << :child - end - - n = [] - path = NodeTest( path, n) - - path = Predicate( path, n ) - - parsed.concat(n) - end - - original_path = path - path = path.lstrip - return original_path if path.empty? - - return original_path if path[0] != ?/ - - if path[1] == ?/ - parsed << :descendant_or_self - parsed << :node - path = path[2..-1] - else - path = path[1..-1] - end - end - end - - # Returns a 1-1 map of the nodeset - # The contents of the resulting array are either: - # true/false, if a positive match - # String, if a name match - #NodeTest - # | ('*' | NCNAME ':' '*' | QNAME) NameTest - # | '*' ':' NCNAME NameTest since XPath 2.0 - # | NODE_TYPE '(' ')' NodeType - # | PI '(' LITERAL ')' PI - # | '[' expr ']' Predicate - PREFIX_WILDCARD = /^\*:(#{NCNAME_STR})/u - LOCAL_NAME_WILDCARD = /^(#{NCNAME_STR}):\*/u - QNAME = Namespace::NAMESPLIT - NODE_TYPE = /^(comment|text|node)\(\s*\)/m - PI = /^processing-instruction\(/ - def NodeTest path, parsed - original_path = path - path = path.lstrip - case path - when PREFIX_WILDCARD - prefix = nil - name = $1 - path = $' - parsed << :qname - parsed << prefix - parsed << name - when /^\*/ - path = $' - parsed << :any - when NODE_TYPE - type = $1 - path = $' - parsed << type.tr('-', '_').intern - when PI - path = $' - literal = nil - if path !~ /^\s*\)/ - path =~ LITERAL - literal = $1 - path = $' - raise ParseException.new("Missing ')' after processing instruction") if path[0] != ?) - path = path[1..-1] - end - parsed << :processing_instruction - parsed << (literal || '') - when LOCAL_NAME_WILDCARD - prefix = $1 - path = $' - parsed << :namespace - parsed << prefix - when QNAME - prefix = $1 - name = $2 - path = $' - prefix = "" unless prefix - parsed << :qname - parsed << prefix - parsed << name - else - path = original_path - end - return path - end - - # Filters the supplied nodeset on the predicate(s) - def Predicate path, parsed - original_path = path - path = path.lstrip - return original_path unless path[0] == ?[ - predicates = [] - while path[0] == ?[ - path, expr = get_group(path) - predicates << expr[1..-2] if expr - end - predicates.each{ |pred| - preds = [] - parsed << :predicate - parsed << preds - OrExpr(pred, preds) - } - path - end - - # The following return arrays of true/false, a 1-1 mapping of the - # supplied nodeset, except for axe(), which returns a filtered - # nodeset - - #| OrExpr S 'or' S AndExpr - #| AndExpr - def OrExpr path, parsed - n = [] - rest = AndExpr( path, n ) - if rest != path - while rest =~ /^\s*( or )/ - n = [ :or, n, [] ] - rest = AndExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| AndExpr S 'and' S EqualityExpr - #| EqualityExpr - def AndExpr path, parsed - n = [] - rest = EqualityExpr( path, n ) - if rest != path - while rest =~ /^\s*( and )/ - n = [ :and, n, [] ] - rest = EqualityExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| EqualityExpr ('=' | '!=') RelationalExpr - #| RelationalExpr - def EqualityExpr path, parsed - n = [] - rest = RelationalExpr( path, n ) - if rest != path - while rest =~ /^\s*(!?=)\s*/ - if $1[0] == ?! - n = [ :neq, n, [] ] - else - n = [ :eq, n, [] ] - end - rest = RelationalExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| RelationalExpr ('<' | '>' | '<=' | '>=') AdditiveExpr - #| AdditiveExpr - def RelationalExpr path, parsed - n = [] - rest = AdditiveExpr( path, n ) - if rest != path - while rest =~ /^\s*([<>]=?)\s*/ - if $1[0] == ?< - sym = "lt" - else - sym = "gt" - end - sym << "eq" if $1[-1] == ?= - n = [ sym.intern, n, [] ] - rest = AdditiveExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| AdditiveExpr ('+' | '-') MultiplicativeExpr - #| MultiplicativeExpr - def AdditiveExpr path, parsed - n = [] - rest = MultiplicativeExpr( path, n ) - if rest != path - while rest =~ /^\s*(\+|-)\s*/ - if $1[0] == ?+ - n = [ :plus, n, [] ] - else - n = [ :minus, n, [] ] - end - rest = MultiplicativeExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| MultiplicativeExpr ('*' | S ('div' | 'mod') S) UnaryExpr - #| UnaryExpr - def MultiplicativeExpr path, parsed - n = [] - rest = UnaryExpr( path, n ) - if rest != path - while rest =~ /^\s*(\*| div | mod )\s*/ - if $1[0] == ?* - n = [ :mult, n, [] ] - elsif $1.include?( "div" ) - n = [ :div, n, [] ] - else - n = [ :mod, n, [] ] - end - rest = UnaryExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace(n) - elsif n.size > 0 - parsed << n - end - rest - end - - #| '-' UnaryExpr - #| UnionExpr - def UnaryExpr path, parsed - path =~ /^(\-*)/ - path = $' - if $1 and (($1.size % 2) != 0) - mult = -1 - else - mult = 1 - end - parsed << :neg if mult < 0 - - n = [] - path = UnionExpr( path, n ) - parsed.concat( n ) - path - end - - #| UnionExpr '|' PathExpr - #| PathExpr - def UnionExpr path, parsed - n = [] - rest = PathExpr( path, n ) - if rest != path - while rest =~ /^\s*(\|)\s*/ - n = [ :union, n, [] ] - rest = PathExpr( $', n[-1] ) - end - end - if parsed.size == 0 and n.size != 0 - parsed.replace( n ) - elsif n.size > 0 - parsed << n - end - rest - end - - #| LocationPath - #| FilterExpr ('/' | '//') RelativeLocationPath - def PathExpr path, parsed - path = path.lstrip - n = [] - rest = FilterExpr( path, n ) - if rest != path - if rest and rest[0] == ?/ - rest = RelativeLocationPath(rest, n) - parsed.concat(n) - return rest - end - end - rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w*]/ - parsed.concat(n) - return rest - end - - #| FilterExpr Predicate - #| PrimaryExpr - def FilterExpr path, parsed - n = [] - path = PrimaryExpr( path, n ) - path = Predicate(path, n) - parsed.concat(n) - path - end - - #| VARIABLE_REFERENCE - #| '(' expr ')' - #| LITERAL - #| NUMBER - #| FunctionCall - VARIABLE_REFERENCE = /^\$(#{NAME_STR})/u - NUMBER = /^(\d*\.?\d+)/ - NT = /^comment|text|processing-instruction|node$/ - def PrimaryExpr path, parsed - case path - when VARIABLE_REFERENCE - varname = $1 - path = $' - parsed << :variable - parsed << varname - #arry << @variables[ varname ] - when /^(\w[-\w]*)(?:\()/ - fname = $1 - tmp = $' - return path if fname =~ NT - path = tmp - parsed << :function - parsed << fname - path = FunctionCall(path, parsed) - when NUMBER - varname = $1.nil? ? $2 : $1 - path = $' - parsed << :literal - parsed << (varname.include?('.') ? varname.to_f : varname.to_i) - when LITERAL - varname = $1.nil? ? $2 : $1 - path = $' - parsed << :literal - parsed << varname - when /^\(/ #/ - path, contents = get_group(path) - contents = contents[1..-2] - n = [] - OrExpr( contents, n ) - parsed.concat(n) - end - path - end - - #| FUNCTION_NAME '(' ( expr ( ',' expr )* )? ')' - def FunctionCall rest, parsed - path, arguments = parse_args(rest) - argset = [] - for argument in arguments - args = [] - OrExpr( argument, args ) - argset << args - end - parsed << argset - path - end - - # get_group( '[foo]bar' ) -> ['bar', '[foo]'] - def get_group string - ind = 0 - depth = 0 - st = string[0,1] - en = (st == "(" ? ")" : "]") - begin - case string[ind,1] - when st - depth += 1 - when en - depth -= 1 - end - ind += 1 - end while depth > 0 and ind < string.length - return nil unless depth==0 - [string[ind..-1], string[0..ind-1]] - end - - def parse_args( string ) - arguments = [] - ind = 0 - inquot = false - inapos = false - depth = 1 - begin - case string[ind] - when ?" - inquot = !inquot unless inapos - when ?' - inapos = !inapos unless inquot - else - unless inquot or inapos - case string[ind] - when ?( - depth += 1 - if depth == 1 - string = string[1..-1] - ind -= 1 - end - when ?) - depth -= 1 - if depth == 0 - s = string[0,ind].strip - arguments << s unless s == "" - string = string[ind+1..-1] - end - when ?, - if depth == 1 - s = string[0,ind].strip - arguments << s unless s == "" - string = string[ind+1..-1] - ind = -1 - end - end - end - end - ind += 1 - end while depth > 0 and ind < string.length - return nil unless depth==0 - [string,arguments] - end - end - end -end diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb deleted file mode 100644 index a0466b25d9b635..00000000000000 --- a/lib/rexml/quickpath.rb +++ /dev/null @@ -1,266 +0,0 @@ -# frozen_string_literal: false -require_relative 'functions' -require_relative 'xmltokens' - -module REXML - class QuickPath - include Functions - include XMLTokens - - # A base Hash object to be used when initializing a - # default empty namespaces set. - EMPTY_HASH = {} - - def QuickPath::first element, path, namespaces=EMPTY_HASH - match(element, path, namespaces)[0] - end - - def QuickPath::each element, path, namespaces=EMPTY_HASH, &block - path = "*" unless path - match(element, path, namespaces).each( &block ) - end - - def QuickPath::match element, path, namespaces=EMPTY_HASH - raise "nil is not a valid xpath" unless path - results = nil - Functions::namespace_context = namespaces - case path - when /^\/([^\/]|$)/u - # match on root - path = path[1..-1] - return [element.root.parent] if path == '' - results = filter([element.root], path) - when /^[-\w]*::/u - results = filter([element], path) - when /^\*/u - results = filter(element.to_a, path) - when /^[\[!\w:]/u - # match on child - children = element.to_a - results = filter(children, path) - else - results = filter([element], path) - end - return results - end - - # Given an array of nodes it filters the array based on the path. The - # result is that when this method returns, the array will contain elements - # which match the path - def QuickPath::filter elements, path - return elements if path.nil? or path == '' or elements.size == 0 - case path - when /^\/\//u # Descendant - return axe( elements, "descendant-or-self", $' ) - when /^\/?\b(\w[-\w]*)\b::/u # Axe - return axe( elements, $1, $' ) - when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u # Child - rest = $' - results = [] - elements.each do |element| - results |= filter( element.to_a, rest ) - end - return results - when /^\/?(\w[-\w]*)\(/u # / Function - return function( elements, $1, $' ) - when Namespace::NAMESPLIT # Element name - name = $2 - ns = $1 - rest = $' - elements.delete_if do |element| - !(element.kind_of? Element and - (element.expanded_name == name or - (element.name == name and - element.namespace == Functions.namespace_context[ns]))) - end - return filter( elements, rest ) - when /^\/\[/u - matches = [] - elements.each do |element| - matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element - end - return matches - when /^\[/u # Predicate - return predicate( elements, path ) - when /^\/?\.\.\./u # Ancestor - return axe( elements, "ancestor", $' ) - when /^\/?\.\./u # Parent - return filter( elements.collect{|e|e.parent}, $' ) - when /^\/?\./u # Self - return filter( elements, $' ) - when /^\*/u # Any - results = [] - elements.each do |element| - results |= filter( [element], $' ) if element.kind_of? Element - #if element.kind_of? Element - # children = element.to_a - # children.delete_if { |child| !child.kind_of?(Element) } - # results |= filter( children, $' ) - #end - end - return results - end - return [] - end - - def QuickPath::axe( elements, axe_name, rest ) - matches = [] - matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u - case axe_name - when /^descendant/u - elements.each do |element| - matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element - end - when /^ancestor/u - elements.each do |element| - while element.parent - matches << element.parent - element = element.parent - end - end - matches = filter( matches, rest ) - when "self" - matches = filter( elements, rest ) - when "child" - elements.each do |element| - matches |= filter( element.to_a, rest ) if element.kind_of? Element - end - when "attribute" - elements.each do |element| - matches << element.attributes[ rest ] if element.kind_of? Element - end - when "parent" - matches = filter(elements.collect{|element| element.parent}.uniq, rest) - when "following-sibling" - matches = filter(elements.collect{|element| element.next_sibling}.uniq, - rest) - when "previous-sibling" - matches = filter(elements.collect{|element| - element.previous_sibling}.uniq, rest ) - end - return matches.uniq - end - - OPERAND_ = '((?=(?:(?!and|or).)*[^\s<>=])[^\s<>=]+)' - # A predicate filters a node-set with respect to an axis to produce a - # new node-set. For each node in the node-set to be filtered, the - # PredicateExpr is evaluated with that node as the context node, with - # the number of nodes in the node-set as the context size, and with the - # proximity position of the node in the node-set with respect to the - # axis as the context position; if PredicateExpr evaluates to true for - # that node, the node is included in the new node-set; otherwise, it is - # not included. - # - # A PredicateExpr is evaluated by evaluating the Expr and converting - # the result to a boolean. If the result is a number, the result will - # be converted to true if the number is equal to the context position - # and will be converted to false otherwise; if the result is not a - # number, then the result will be converted as if by a call to the - # boolean function. Thus a location path para[3] is equivalent to - # para[position()=3]. - def QuickPath::predicate( elements, path ) - ind = 1 - bcount = 1 - while bcount > 0 - bcount += 1 if path[ind] == ?[ - bcount -= 1 if path[ind] == ?] - ind += 1 - end - ind -= 1 - predicate = path[1..ind-1] - rest = path[ind+1..-1] - - # have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c' - # - predicate.gsub!( - /#{OPERAND_}\s*([<>=])\s*#{OPERAND_}\s*([<>=])\s*#{OPERAND_}/u, - '\1 \2 \3 and \3 \4 \5' ) - # Let's do some Ruby trickery to avoid some work: - predicate.gsub!( /&/u, "&&" ) - predicate.gsub!( /=/u, "==" ) - predicate.gsub!( /@(\w[-\w.]*)/u, 'attribute("\1")' ) - predicate.gsub!( /\bmod\b/u, "%" ) - predicate.gsub!( /\b(\w[-\w.]*\()/u ) { - fname = $1 - fname.gsub( /-/u, "_" ) - } - - Functions.pair = [ 0, elements.size ] - results = [] - elements.each do |element| - Functions.pair[0] += 1 - Functions.node = element - res = eval( predicate ) - case res - when true - results << element - when Integer - results << element if Functions.pair[0] == res - when String - results << element - end - end - return filter( results, rest ) - end - - def QuickPath::attribute( name ) - return Functions.node.attributes[name] if Functions.node.kind_of? Element - end - - def QuickPath::name() - return Functions.node.name if Functions.node.kind_of? Element - end - - def QuickPath::method_missing( id, *args ) - begin - Functions.send( id.id2name, *args ) - rescue Exception - raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}" - end - end - - def QuickPath::function( elements, fname, rest ) - args = parse_args( elements, rest ) - Functions.pair = [0, elements.size] - results = [] - elements.each do |element| - Functions.pair[0] += 1 - Functions.node = element - res = Functions.send( fname, *args ) - case res - when true - results << element - when Integer - results << element if Functions.pair[0] == res - end - end - return results - end - - def QuickPath::parse_args( element, string ) - # /.*?(?:\)|,)/ - arguments = [] - buffer = "" - while string and string != "" - c = string[0] - string.sub!(/^./u, "") - case c - when ?, - # if depth = 1, then we start a new argument - arguments << evaluate( buffer ) - #arguments << evaluate( string[0..count] ) - when ?( - # start a new method call - function( element, buffer, string ) - buffer = "" - when ?) - # close the method call and return arguments - return arguments - else - buffer << c - end - end - "" - end - end -end diff --git a/lib/rexml/rexml.gemspec b/lib/rexml/rexml.gemspec deleted file mode 100644 index 263f013aae7b7e..00000000000000 --- a/lib/rexml/rexml.gemspec +++ /dev/null @@ -1,84 +0,0 @@ -begin - require_relative "lib/rexml/rexml" -rescue LoadError - # for Ruby core repository - require_relative "rexml" -end - -Gem::Specification.new do |spec| - spec.name = "rexml" - spec.version = REXML::VERSION - spec.authors = ["Kouhei Sutou"] - spec.email = ["kou@cozmixng.org"] - - spec.summary = %q{An XML toolkit for Ruby} - spec.description = %q{An XML toolkit for Ruby} - spec.homepage = "https://github.com/ruby/rexml" - spec.license = "BSD-2-Clause" - - spec.files = [ - ".gitignore", - ".travis.yml", - "Gemfile", - "LICENSE.txt", - "NEWS.md", - "README.md", - "Rakefile", - "lib/rexml/attlistdecl.rb", - "lib/rexml/attribute.rb", - "lib/rexml/cdata.rb", - "lib/rexml/child.rb", - "lib/rexml/comment.rb", - "lib/rexml/doctype.rb", - "lib/rexml/document.rb", - "lib/rexml/dtd/attlistdecl.rb", - "lib/rexml/dtd/dtd.rb", - "lib/rexml/dtd/elementdecl.rb", - "lib/rexml/dtd/entitydecl.rb", - "lib/rexml/dtd/notationdecl.rb", - "lib/rexml/element.rb", - "lib/rexml/encoding.rb", - "lib/rexml/entity.rb", - "lib/rexml/formatters/default.rb", - "lib/rexml/formatters/pretty.rb", - "lib/rexml/formatters/transitive.rb", - "lib/rexml/functions.rb", - "lib/rexml/instruction.rb", - "lib/rexml/light/node.rb", - "lib/rexml/namespace.rb", - "lib/rexml/node.rb", - "lib/rexml/output.rb", - "lib/rexml/parent.rb", - "lib/rexml/parseexception.rb", - "lib/rexml/parsers/baseparser.rb", - "lib/rexml/parsers/lightparser.rb", - "lib/rexml/parsers/pullparser.rb", - "lib/rexml/parsers/sax2parser.rb", - "lib/rexml/parsers/streamparser.rb", - "lib/rexml/parsers/treeparser.rb", - "lib/rexml/parsers/ultralightparser.rb", - "lib/rexml/parsers/xpathparser.rb", - "lib/rexml/quickpath.rb", - "lib/rexml/rexml.rb", - "lib/rexml/sax2listener.rb", - "lib/rexml/security.rb", - "lib/rexml/source.rb", - "lib/rexml/streamlistener.rb", - "lib/rexml/text.rb", - "lib/rexml/undefinednamespaceexception.rb", - "lib/rexml/validation/relaxng.rb", - "lib/rexml/validation/validation.rb", - "lib/rexml/validation/validationexception.rb", - "lib/rexml/xmldecl.rb", - "lib/rexml/xmltokens.rb", - "lib/rexml/xpath.rb", - "lib/rexml/xpath_parser.rb", - "rexml.gemspec", - ] - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ["lib"] - - spec.add_development_dependency "bundler" - spec.add_development_dependency "rake" -end diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb deleted file mode 100644 index 944d88a869fb81..00000000000000 --- a/lib/rexml/rexml.rb +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# frozen_string_literal: false -# REXML is an XML toolkit for Ruby[http://www.ruby-lang.org], in Ruby. -# -# REXML is a _pure_ Ruby, XML 1.0 conforming, -# non-validating[http://www.w3.org/TR/2004/REC-xml-20040204/#sec-conformance] -# toolkit with an intuitive API. REXML passes 100% of the non-validating Oasis -# tests[http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.shtml], -# and provides tree, stream, SAX2, pull, and lightweight APIs. REXML also -# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since -# Ruby 1.8, REXML is included in the standard Ruby distribution. -# -# Main page:: http://www.germane-software.com/software/rexml -# Author:: Sean Russell -# Date:: 2008/019 -# Version:: 3.1.7.3 -# -# This API documentation can be downloaded from the REXML home page, or can -# be accessed online[http://www.germane-software.com/software/rexml_doc] -# -# A tutorial is available in the REXML distribution in docs/tutorial.html, -# or can be accessed -# online[http://www.germane-software.com/software/rexml/docs/tutorial.html] -module REXML - COPYRIGHT = "Copyright © 2001-2008 Sean Russell " - DATE = "2008/019" - VERSION = "3.2.3" - REVISION = "" - - Copyright = COPYRIGHT - Version = VERSION -end diff --git a/lib/rexml/sax2listener.rb b/lib/rexml/sax2listener.rb deleted file mode 100644 index 5afdc80890e7bd..00000000000000 --- a/lib/rexml/sax2listener.rb +++ /dev/null @@ -1,98 +0,0 @@ -# frozen_string_literal: false -module REXML - # A template for stream parser listeners. - # Note that the declarations (attlistdecl, elementdecl, etc) are trivially - # processed; REXML doesn't yet handle doctype entity declarations, so you - # have to parse them out yourself. - # === Missing methods from SAX2 - # ignorable_whitespace - # === Methods extending SAX2 - # +WARNING+ - # These methods are certainly going to change, until DTDs are fully - # supported. Be aware of this. - # start_document - # end_document - # doctype - # elementdecl - # attlistdecl - # entitydecl - # notationdecl - # cdata - # xmldecl - # comment - module SAX2Listener - def start_document - end - def end_document - end - def start_prefix_mapping prefix, uri - end - def end_prefix_mapping prefix - end - def start_element uri, localname, qname, attributes - end - def end_element uri, localname, qname - end - def characters text - end - def processing_instruction target, data - end - # Handles a doctype declaration. Any attributes of the doctype which are - # not supplied will be nil. # EG, - # @p name the name of the doctype; EG, "me" - # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC" - # @p long_name the supplied long name, or nil. EG, "foo" - # @p uri the uri of the doctype, or nil. EG, "bar" - def doctype name, pub_sys, long_name, uri - end - # If a doctype includes an ATTLIST declaration, it will cause this - # method to be called. The content is the declaration itself, unparsed. - # EG, will come to this method as "el - # attr CDATA #REQUIRED". This is the same for all of the .*decl - # methods. - def attlistdecl(element, pairs, contents) - end - # - def elementdecl content - end - # - # The argument passed to this method is an array of the entity - # declaration. It can be in a number of formats, but in general it - # returns (example, result): - # - # ["%", "YN", "\"Yes\""] - # - # ["%", "YN", "Yes"] - # - # ["WhatHeSaid", "He said %YN;"] - # - # ["open-hatch", "SYSTEM", "http://www.textuality.com/boilerplate/OpenHatch.xml"] - # - # ["open-hatch", "PUBLIC", "-//Textuality//TEXT Standard open-hatch boilerplate//EN", "http://www.textuality.com/boilerplate/OpenHatch.xml"] - # - # ["hatch-pic", "SYSTEM", "../grafix/OpenHatch.gif", "NDATA", "gif"] - def entitydecl declaration - end - # - def notationdecl name, public_or_system, public_id, system_id - end - # Called when is encountered in a document. - # @p content "..." - def cdata content - end - # Called when an XML PI is encountered in the document. - # EG: - # @p version the version attribute value. EG, "1.0" - # @p encoding the encoding attribute value, or nil. EG, "utf" - # @p standalone the standalone attribute value, or nil. EG, nil - # @p spaced the declaration is followed by a line break - def xmldecl version, encoding, standalone - end - # Called when a comment is encountered. - # @p comment The content of the comment - def comment comment - end - def progress position - end - end -end diff --git a/lib/rexml/security.rb b/lib/rexml/security.rb deleted file mode 100644 index 99b74607728b94..00000000000000 --- a/lib/rexml/security.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: false -module REXML - module Security - @@entity_expansion_limit = 10_000 - - # Set the entity expansion limit. By default the limit is set to 10000. - def self.entity_expansion_limit=( val ) - @@entity_expansion_limit = val - end - - # Get the entity expansion limit. By default the limit is set to 10000. - def self.entity_expansion_limit - return @@entity_expansion_limit - end - - @@entity_expansion_text_limit = 10_240 - - # Set the entity expansion limit. By default the limit is set to 10240. - def self.entity_expansion_text_limit=( val ) - @@entity_expansion_text_limit = val - end - - # Get the entity expansion limit. By default the limit is set to 10240. - def self.entity_expansion_text_limit - return @@entity_expansion_text_limit - end - end -end diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb deleted file mode 100644 index 90b370b989d665..00000000000000 --- a/lib/rexml/source.rb +++ /dev/null @@ -1,298 +0,0 @@ -# coding: US-ASCII -# frozen_string_literal: false -require_relative 'encoding' - -module REXML - # Generates Source-s. USE THIS CLASS. - class SourceFactory - # Generates a Source object - # @param arg Either a String, or an IO - # @return a Source, or nil if a bad argument was given - def SourceFactory::create_from(arg) - if arg.respond_to? :read and - arg.respond_to? :readline and - arg.respond_to? :nil? and - arg.respond_to? :eof? - IOSource.new(arg) - elsif arg.respond_to? :to_str - require 'stringio' - IOSource.new(StringIO.new(arg)) - elsif arg.kind_of? Source - arg - else - raise "#{arg.class} is not a valid input stream. It must walk \n"+ - "like either a String, an IO, or a Source." - end - end - end - - # A Source can be searched for patterns, and wraps buffers and other - # objects and provides consumption of text - class Source - include Encoding - # The current buffer (what we're going to read next) - attr_reader :buffer - # The line number of the last consumed text - attr_reader :line - attr_reader :encoding - - # Constructor - # @param arg must be a String, and should be a valid XML document - # @param encoding if non-null, sets the encoding of the source to this - # value, overriding all encoding detection - def initialize(arg, encoding=nil) - @orig = @buffer = arg - if encoding - self.encoding = encoding - else - detect_encoding - end - @line = 0 - end - - - # Inherited from Encoding - # Overridden to support optimized en/decoding - def encoding=(enc) - return unless super - encoding_updated - end - - # Scans the source for a given pattern. Note, that this is not your - # usual scan() method. For one thing, the pattern argument has some - # requirements; for another, the source can be consumed. You can easily - # confuse this method. Originally, the patterns were easier - # to construct and this method more robust, because this method - # generated search regexps on the fly; however, this was - # computationally expensive and slowed down the entire REXML package - # considerably, since this is by far the most commonly called method. - # @param pattern must be a Regexp, and must be in the form of - # /^\s*(#{your pattern, with no groups})(.*)/. The first group - # will be returned; the second group is used if the consume flag is - # set. - # @param consume if true, the pattern returned will be consumed, leaving - # everything after it in the Source. - # @return the pattern, if found, or nil if the Source is empty or the - # pattern is not found. - def scan(pattern, cons=false) - return nil if @buffer.nil? - rv = @buffer.scan(pattern) - @buffer = $' if cons and rv.size>0 - rv - end - - def read - end - - def consume( pattern ) - @buffer = $' if pattern.match( @buffer ) - end - - def match_to( char, pattern ) - return pattern.match(@buffer) - end - - def match_to_consume( char, pattern ) - md = pattern.match(@buffer) - @buffer = $' - return md - end - - def match(pattern, cons=false) - md = pattern.match(@buffer) - @buffer = $' if cons and md - return md - end - - # @return true if the Source is exhausted - def empty? - @buffer == "" - end - - def position - @orig.index( @buffer ) - end - - # @return the current line in the source - def current_line - lines = @orig.split - res = lines.grep @buffer[0..30] - res = res[-1] if res.kind_of? Array - lines.index( res ) if res - end - - private - def detect_encoding - buffer_encoding = @buffer.encoding - detected_encoding = "UTF-8" - begin - @buffer.force_encoding("ASCII-8BIT") - if @buffer[0, 2] == "\xfe\xff" - @buffer[0, 2] = "" - detected_encoding = "UTF-16BE" - elsif @buffer[0, 2] == "\xff\xfe" - @buffer[0, 2] = "" - detected_encoding = "UTF-16LE" - elsif @buffer[0, 3] == "\xef\xbb\xbf" - @buffer[0, 3] = "" - detected_encoding = "UTF-8" - end - ensure - @buffer.force_encoding(buffer_encoding) - end - self.encoding = detected_encoding - end - - def encoding_updated - if @encoding != 'UTF-8' - @buffer = decode(@buffer) - @to_utf = true - else - @to_utf = false - @buffer.force_encoding ::Encoding::UTF_8 - end - end - end - - # A Source that wraps an IO. See the Source class for method - # documentation - class IOSource < Source - #attr_reader :block_size - - # block_size has been deprecated - def initialize(arg, block_size=500, encoding=nil) - @er_source = @source = arg - @to_utf = false - @pending_buffer = nil - - if encoding - super("", encoding) - else - super(@source.read(3) || "") - end - - if !@to_utf and - @buffer.respond_to?(:force_encoding) and - @source.respond_to?(:external_encoding) and - @source.external_encoding != ::Encoding::UTF_8 - @force_utf8 = true - else - @force_utf8 = false - end - end - - def scan(pattern, cons=false) - rv = super - # You'll notice that this next section is very similar to the same - # section in match(), but just a liiittle different. This is - # because it is a touch faster to do it this way with scan() - # than the way match() does it; enough faster to warrant duplicating - # some code - if rv.size == 0 - until @buffer =~ pattern or @source.nil? - begin - @buffer << readline - rescue Iconv::IllegalSequence - raise - rescue - @source = nil - end - end - rv = super - end - rv.taint if RUBY_VERSION < '2.7' - rv - end - - def read - begin - @buffer << readline - rescue Exception, NameError - @source = nil - end - end - - def consume( pattern ) - match( pattern, true ) - end - - def match( pattern, cons=false ) - rv = pattern.match(@buffer) - @buffer = $' if cons and rv - while !rv and @source - begin - @buffer << readline - rv = pattern.match(@buffer) - @buffer = $' if cons and rv - rescue - @source = nil - end - end - rv.taint if RUBY_VERSION < '2.7' - rv - end - - def empty? - super and ( @source.nil? || @source.eof? ) - end - - def position - @er_source.pos rescue 0 - end - - # @return the current line in the source - def current_line - begin - pos = @er_source.pos # The byte position in the source - lineno = @er_source.lineno # The XML < position in the source - @er_source.rewind - line = 0 # The \r\n position in the source - begin - while @er_source.pos < pos - @er_source.readline - line += 1 - end - rescue - end - @er_source.seek(pos) - rescue IOError - pos = -1 - line = -1 - end - [pos, lineno, line] - end - - private - def readline - str = @source.readline(@line_break) - if @pending_buffer - if str.nil? - str = @pending_buffer - else - str = @pending_buffer + str - end - @pending_buffer = nil - end - return nil if str.nil? - - if @to_utf - decode(str) - else - str.force_encoding(::Encoding::UTF_8) if @force_utf8 - str - end - end - - def encoding_updated - case @encoding - when "UTF-16BE", "UTF-16LE" - @source.binmode - @source.set_encoding(@encoding, @encoding) - end - @line_break = encode(">") - @pending_buffer, @buffer = @buffer, "" - @pending_buffer.force_encoding(@encoding) - super - end - end -end diff --git a/lib/rexml/streamlistener.rb b/lib/rexml/streamlistener.rb deleted file mode 100644 index 30c89451795485..00000000000000 --- a/lib/rexml/streamlistener.rb +++ /dev/null @@ -1,93 +0,0 @@ -# frozen_string_literal: false -module REXML - # A template for stream parser listeners. - # Note that the declarations (attlistdecl, elementdecl, etc) are trivially - # processed; REXML doesn't yet handle doctype entity declarations, so you - # have to parse them out yourself. - module StreamListener - # Called when a tag is encountered. - # @p name the tag name - # @p attrs an array of arrays of attribute/value pairs, suitable for - # use with assoc or rassoc. IE, - # will result in - # tag_start( "tag", # [["attr1","value1"],["attr2","value2"]]) - def tag_start name, attrs - end - # Called when the end tag is reached. In the case of , tag_end - # will be called immediately after tag_start - # @p the name of the tag - def tag_end name - end - # Called when text is encountered in the document - # @p text the text content. - def text text - end - # Called when an instruction is encountered. EG: - # @p name the instruction name; in the example, "xsl" - # @p instruction the rest of the instruction. In the example, - # "sheet='foo'" - def instruction name, instruction - end - # Called when a comment is encountered. - # @p comment The content of the comment - def comment comment - end - # Handles a doctype declaration. Any attributes of the doctype which are - # not supplied will be nil. # EG, - # @p name the name of the doctype; EG, "me" - # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC" - # @p long_name the supplied long name, or nil. EG, "foo" - # @p uri the uri of the doctype, or nil. EG, "bar" - def doctype name, pub_sys, long_name, uri - end - # Called when the doctype is done - def doctype_end - end - # If a doctype includes an ATTLIST declaration, it will cause this - # method to be called. The content is the declaration itself, unparsed. - # EG, will come to this method as "el - # attr CDATA #REQUIRED". This is the same for all of the .*decl - # methods. - def attlistdecl element_name, attributes, raw_content - end - # - def elementdecl content - end - # - # The argument passed to this method is an array of the entity - # declaration. It can be in a number of formats, but in general it - # returns (example, result): - # - # ["YN", "\"Yes\"", "%"] - # - # ["YN", "Yes", "%"] - # - # ["WhatHeSaid", "He said %YN;"] - # - # ["open-hatch", "SYSTEM", "http://www.textuality.com/boilerplate/OpenHatch.xml"] - # - # ["open-hatch", "PUBLIC", "-//Textuality//TEXT Standard open-hatch boilerplate//EN", "http://www.textuality.com/boilerplate/OpenHatch.xml"] - # - # ["hatch-pic", "SYSTEM", "../grafix/OpenHatch.gif", "gif"] - def entitydecl content - end - # - def notationdecl content - end - # Called when %foo; is encountered in a doctype declaration. - # @p content "foo" - def entity content - end - # Called when is encountered in a document. - # @p content "..." - def cdata content - end - # Called when an XML PI is encountered in the document. - # EG: - # @p version the version attribute value. EG, "1.0" - # @p encoding the encoding attribute value, or nil. EG, "utf" - # @p standalone the standalone attribute value, or nil. EG, nil - def xmldecl version, encoding, standalone - end - end -end diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb deleted file mode 100644 index 050b09c97eeac7..00000000000000 --- a/lib/rexml/text.rb +++ /dev/null @@ -1,424 +0,0 @@ -# frozen_string_literal: false -require_relative 'security' -require_relative 'entity' -require_relative 'doctype' -require_relative 'child' -require_relative 'doctype' -require_relative 'parseexception' - -module REXML - # Represents text nodes in an XML document - class Text < Child - include Comparable - # The order in which the substitutions occur - SPECIALS = [ /&(?!#?[\w-]+;)/u, //u, /"/u, /'/u, /\r/u ] - SUBSTITUTES = ['&', '<', '>', '"', ''', ' '] - # Characters which are substituted in written strings - SLAICEPS = [ '<', '>', '"', "'", '&' ] - SETUTITSBUS = [ /</u, />/u, /"/u, /'/u, /&/u ] - - # If +raw+ is true, then REXML leaves the value alone - attr_accessor :raw - - NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um - NUMERICENTITY = /�*((?:\d+)|(?:x[a-fA-F0-9]+));/ - VALID_CHAR = [ - 0x9, 0xA, 0xD, - (0x20..0xD7FF), - (0xE000..0xFFFD), - (0x10000..0x10FFFF) - ] - - if String.method_defined? :encode - VALID_XML_CHARS = Regexp.new('^['+ - VALID_CHAR.map { |item| - case item - when Integer - [item].pack('U').force_encoding('utf-8') - when Range - [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8') - end - }.join + - ']*$') - else - VALID_XML_CHARS = /^( - [\x09\x0A\x0D\x20-\x7E] # ASCII - | [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte - | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs - | [\xE1-\xEC\xEE][\x80-\xBF]{2} # straight 3-byte - | \xEF[\x80-\xBE]{2} # - | \xEF\xBF[\x80-\xBD] # excluding U+fffe and U+ffff - | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates - | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3 - | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15 - | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16 - )*$/nx; - end - - # Constructor - # +arg+ if a String, the content is set to the String. If a Text, - # the object is shallowly cloned. - # - # +respect_whitespace+ (boolean, false) if true, whitespace is - # respected - # - # +parent+ (nil) if this is a Parent object, the parent - # will be set to this. - # - # +raw+ (nil) This argument can be given three values. - # If true, then the value of used to construct this object is expected to - # contain no unescaped XML markup, and REXML will not change the text. If - # this value is false, the string may contain any characters, and REXML will - # escape any and all defined entities whose values are contained in the - # text. If this value is nil (the default), then the raw value of the - # parent will be used as the raw value for this node. If there is no raw - # value for the parent, and no value is supplied, the default is false. - # Use this field if you have entities defined for some text, and you don't - # want REXML to escape that text in output. - # Text.new( "<&", false, nil, false ) #-> "<&" - # Text.new( "<&", false, nil, false ) #-> "&lt;&amp;" - # Text.new( "<&", false, nil, true ) #-> Parse exception - # Text.new( "<&", false, nil, true ) #-> "<&" - # # Assume that the entity "s" is defined to be "sean" - # # and that the entity "r" is defined to be "russell" - # Text.new( "sean russell" ) #-> "&s; &r;" - # Text.new( "sean russell", false, nil, true ) #-> "sean russell" - # - # +entity_filter+ (nil) This can be an array of entities to match in the - # supplied text. This argument is only useful if +raw+ is set to false. - # Text.new( "sean russell", false, nil, false, ["s"] ) #-> "&s; russell" - # Text.new( "sean russell", false, nil, true, ["s"] ) #-> "sean russell" - # In the last example, the +entity_filter+ argument is ignored. - # - # +illegal+ INTERNAL USE ONLY - def initialize(arg, respect_whitespace=false, parent=nil, raw=nil, - entity_filter=nil, illegal=NEEDS_A_SECOND_CHECK ) - - @raw = false - @parent = nil - @entity_filter = nil - - if parent - super( parent ) - @raw = parent.raw - end - - if arg.kind_of? String - @string = arg.dup - elsif arg.kind_of? Text - @string = arg.instance_variable_get(:@string).dup - @raw = arg.raw - @entity_filter = arg.instance_variable_get(:@entity_filter) - else - raise "Illegal argument of type #{arg.type} for Text constructor (#{arg})" - end - - @string.squeeze!(" \n\t") unless respect_whitespace - @string.gsub!(/\r\n?/, "\n") - @raw = raw unless raw.nil? - @entity_filter = entity_filter if entity_filter - clear_cache - - Text.check(@string, illegal, doctype) if @raw - end - - def parent= parent - super(parent) - Text.check(@string, NEEDS_A_SECOND_CHECK, doctype) if @raw and @parent - end - - # check for illegal characters - def Text.check string, pattern, doctype - - # illegal anywhere - if string !~ VALID_XML_CHARS - if String.method_defined? :encode - string.chars.each do |c| - case c.ord - when *VALID_CHAR - else - raise "Illegal character #{c.inspect} in raw string #{string.inspect}" - end - end - else - string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/n) do |c| - case c.unpack('U') - when *VALID_CHAR - else - raise "Illegal character #{c.inspect} in raw string #{string.inspect}" - end - end - end - end - - # context sensitive - string.scan(pattern) do - if $1[-1] != ?; - raise "Illegal character #{$1.inspect} in raw string #{string.inspect}" - elsif $1[0] == ?& - if $5 and $5[0] == ?# - case ($5[1] == ?x ? $5[2..-1].to_i(16) : $5[1..-1].to_i) - when *VALID_CHAR - else - raise "Illegal character #{$1.inspect} in raw string #{string.inspect}" - end - # FIXME: below can't work but this needs API change. - # elsif @parent and $3 and !SUBSTITUTES.include?($1) - # if !doctype or !doctype.entities.has_key?($3) - # raise "Undeclared entity '#{$1}' in raw string \"#{string}\"" - # end - end - end - end - end - - def node_type - :text - end - - def empty? - @string.size==0 - end - - - def clone - return Text.new(self, true) - end - - - # Appends text to this text node. The text is appended in the +raw+ mode - # of this text node. - # - # +returns+ the text itself to enable method chain like - # 'text << "XXX" << "YYY"'. - def <<( to_append ) - @string << to_append.gsub( /\r\n?/, "\n" ) - clear_cache - self - end - - - # +other+ a String or a Text - # +returns+ the result of (to_s <=> arg.to_s) - def <=>( other ) - to_s() <=> other.to_s - end - - def doctype - if @parent - doc = @parent.document - doc.doctype if doc - end - end - - REFERENCE = /#{Entity::REFERENCE}/ - # Returns the string value of this text node. This string is always - # escaped, meaning that it is a valid XML text node string, and all - # entities that can be escaped, have been inserted. This method respects - # the entity filter set in the constructor. - # - # # Assume that the entity "s" is defined to be "sean", and that the - # # entity "r" is defined to be "russell" - # t = Text.new( "< & sean russell", false, nil, false, ['s'] ) - # t.to_s #-> "< & &s; russell" - # t = Text.new( "< & &s; russell", false, nil, false ) - # t.to_s #-> "< & &s; russell" - # u = Text.new( "sean russell", false, nil, true ) - # u.to_s #-> "sean russell" - def to_s - return @string if @raw - @normalized ||= Text::normalize( @string, doctype, @entity_filter ) - end - - def inspect - @string.inspect - end - - # Returns the string value of this text. This is the text without - # entities, as it might be used programmatically, or printed to the - # console. This ignores the 'raw' attribute setting, and any - # entity_filter. - # - # # Assume that the entity "s" is defined to be "sean", and that the - # # entity "r" is defined to be "russell" - # t = Text.new( "< & sean russell", false, nil, false, ['s'] ) - # t.value #-> "< & sean russell" - # t = Text.new( "< & &s; russell", false, nil, false ) - # t.value #-> "< & sean russell" - # u = Text.new( "sean russell", false, nil, true ) - # u.value #-> "sean russell" - def value - @unnormalized ||= Text::unnormalize( @string, doctype ) - end - - # Sets the contents of this text node. This expects the text to be - # unnormalized. It returns self. - # - # e = Element.new( "a" ) - # e.add_text( "foo" ) # foo - # e[0].value = "bar" # bar - # e[0].value = "" # <a> - def value=( val ) - @string = val.gsub( /\r\n?/, "\n" ) - clear_cache - @raw = false - end - - def wrap(string, width, addnewline=false) - # Recursively wrap string at width. - return string if string.length <= width - place = string.rindex(' ', width) # Position in string with last ' ' before cutoff - if addnewline then - return "\n" + string[0,place] + "\n" + wrap(string[place+1..-1], width) - else - return string[0,place] + "\n" + wrap(string[place+1..-1], width) - end - end - - def indent_text(string, level=1, style="\t", indentfirstline=true) - return string if level < 0 - new_string = '' - string.each_line { |line| - indent_string = style * level - new_line = (indent_string + line).sub(/[\s]+$/,'') - new_string << new_line - } - new_string.strip! unless indentfirstline - return new_string - end - - # == DEPRECATED - # See REXML::Formatters - # - def write( writer, indent=-1, transitive=false, ie_hack=false ) - Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters", uplevel: 1) - formatter = if indent > -1 - REXML::Formatters::Pretty.new( indent ) - else - REXML::Formatters::Default.new - end - formatter.write( self, writer ) - end - - # FIXME - # This probably won't work properly - def xpath - path = @parent.xpath - path += "/text()" - return path - end - - # Writes out text, substituting special characters beforehand. - # +out+ A String, IO, or any other object supporting <<( String ) - # +input+ the text to substitute and the write out - # - # z=utf8.unpack("U*") - # ascOut="" - # z.each{|r| - # if r < 0x100 - # ascOut.concat(r.chr) - # else - # ascOut.concat(sprintf("&#x%x;", r)) - # end - # } - # puts ascOut - def write_with_substitution out, input - copy = input.clone - # Doing it like this rather than in a loop improves the speed - copy.gsub!( SPECIALS[0], SUBSTITUTES[0] ) - copy.gsub!( SPECIALS[1], SUBSTITUTES[1] ) - copy.gsub!( SPECIALS[2], SUBSTITUTES[2] ) - copy.gsub!( SPECIALS[3], SUBSTITUTES[3] ) - copy.gsub!( SPECIALS[4], SUBSTITUTES[4] ) - copy.gsub!( SPECIALS[5], SUBSTITUTES[5] ) - out << copy - end - - private - def clear_cache - @normalized = nil - @unnormalized = nil - end - - # Reads text, substituting entities - def Text::read_with_substitution( input, illegal=nil ) - copy = input.clone - - if copy =~ illegal - raise ParseException.new( "malformed text: Illegal character #$& in \"#{copy}\"" ) - end if illegal - - copy.gsub!( /\r\n?/, "\n" ) - if copy.include? ?& - copy.gsub!( SETUTITSBUS[0], SLAICEPS[0] ) - copy.gsub!( SETUTITSBUS[1], SLAICEPS[1] ) - copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] ) - copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] ) - copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] ) - copy.gsub!( /�*((?:\d+)|(?:x[a-f0-9]+));/ ) { - m=$1 - #m='0' if m=='' - m = "0#{m}" if m[0] == ?x - [Integer(m)].pack('U*') - } - end - copy - end - - EREFERENCE = /&(?!#{Entity::NAME};)/ - # Escapes all possible entities - def Text::normalize( input, doctype=nil, entity_filter=nil ) - copy = input.to_s - # Doing it like this rather than in a loop improves the speed - #copy = copy.gsub( EREFERENCE, '&' ) - copy = copy.gsub( "&", "&" ) - if doctype - # Replace all ampersands that aren't part of an entity - doctype.entities.each_value do |entity| - copy = copy.gsub( entity.value, - "&#{entity.name};" ) if entity.value and - not( entity_filter and entity_filter.include?(entity.name) ) - end - else - # Replace all ampersands that aren't part of an entity - DocType::DEFAULT_ENTITIES.each_value do |entity| - copy = copy.gsub(entity.value, "&#{entity.name};" ) - end - end - copy - end - - # Unescapes all possible entities - def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil ) - sum = 0 - string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) { - s = Text.expand($&, doctype, filter) - if sum + s.bytesize > Security.entity_expansion_text_limit - raise "entity expansion has grown too large" - else - sum += s.bytesize - end - s - } - end - - def Text.expand(ref, doctype, filter) - if ref[1] == ?# - if ref[2] == ?x - [ref[3...-1].to_i(16)].pack('U*') - else - [ref[2...-1].to_i].pack('U*') - end - elsif ref == '&' - '&' - elsif filter and filter.include?( ref[1...-1] ) - ref - elsif doctype - doctype.entity( ref[1...-1] ) or ref - else - entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ] - entity_value ? entity_value.value : ref - end - end - end -end diff --git a/lib/rexml/undefinednamespaceexception.rb b/lib/rexml/undefinednamespaceexception.rb deleted file mode 100644 index 492a098183e3cc..00000000000000 --- a/lib/rexml/undefinednamespaceexception.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: false -require_relative 'parseexception' -module REXML - class UndefinedNamespaceException < ParseException - def initialize( prefix, source, parser ) - super( "Undefined prefix #{prefix} found" ) - end - end -end diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb deleted file mode 100644 index f29a2c05e5782f..00000000000000 --- a/lib/rexml/validation/relaxng.rb +++ /dev/null @@ -1,539 +0,0 @@ -# frozen_string_literal: false -require_relative "validation" -require_relative "../parsers/baseparser" - -module REXML - module Validation - # Implemented: - # * empty - # * element - # * attribute - # * text - # * optional - # * choice - # * oneOrMore - # * zeroOrMore - # * group - # * value - # * interleave - # * mixed - # * ref - # * grammar - # * start - # * define - # - # Not implemented: - # * data - # * param - # * include - # * externalRef - # * notAllowed - # * anyName - # * nsName - # * except - # * name - class RelaxNG - include Validator - - INFINITY = 1.0 / 0.0 - EMPTY = Event.new( nil ) - TEXT = [:start_element, "text"] - attr_accessor :current - attr_accessor :count - attr_reader :references - - # FIXME: Namespaces - def initialize source - parser = REXML::Parsers::BaseParser.new( source ) - - @count = 0 - @references = {} - @root = @current = Sequence.new(self) - @root.previous = true - states = [ @current ] - begin - event = parser.pull - case event[0] - when :start_element - case event[1] - when "empty" - when "element", "attribute", "text", "value" - states[-1] << event - when "optional" - states << Optional.new( self ) - states[-2] << states[-1] - when "choice" - states << Choice.new( self ) - states[-2] << states[-1] - when "oneOrMore" - states << OneOrMore.new( self ) - states[-2] << states[-1] - when "zeroOrMore" - states << ZeroOrMore.new( self ) - states[-2] << states[-1] - when "group" - states << Sequence.new( self ) - states[-2] << states[-1] - when "interleave" - states << Interleave.new( self ) - states[-2] << states[-1] - when "mixed" - states << Interleave.new( self ) - states[-2] << states[-1] - states[-1] << TEXT - when "define" - states << [ event[2]["name"] ] - when "ref" - states[-1] << Ref.new( event[2]["name"] ) - when "anyName" - states << AnyName.new( self ) - states[-2] << states[-1] - when "nsName" - when "except" - when "name" - when "data" - when "param" - when "include" - when "grammar" - when "start" - when "externalRef" - when "notAllowed" - end - when :end_element - case event[1] - when "element", "attribute" - states[-1] << event - when "zeroOrMore", "oneOrMore", "choice", "optional", - "interleave", "group", "mixed" - states.pop - when "define" - ref = states.pop - @references[ ref.shift ] = ref - #when "empty" - end - when :end_document - states[-1] << event - when :text - states[-1] << event - end - end while event[0] != :end_document - end - - def receive event - validate( event ) - end - end - - class State - def initialize( context ) - @previous = [] - @events = [] - @current = 0 - @count = context.count += 1 - @references = context.references - @value = false - end - - def reset - return if @current == 0 - @current = 0 - @events.each {|s| s.reset if s.kind_of? State } - end - - def previous=( previous ) - @previous << previous - end - - def next( event ) - #print "In next with #{event.inspect}. " - #p @previous - return @previous.pop.next( event ) if @events[@current].nil? - expand_ref_in( @events, @current ) if @events[@current].class == Ref - if ( @events[@current].kind_of? State ) - @current += 1 - @events[@current-1].previous = self - return @events[@current-1].next( event ) - end - if ( @events[@current].matches?(event) ) - @current += 1 - if @events[@current].nil? - return @previous.pop - elsif @events[@current].kind_of? State - @current += 1 - @events[@current-1].previous = self - return @events[@current-1] - else - return self - end - else - return nil - end - end - - def to_s - # Abbreviated: - self.class.name =~ /(?:::)(\w)\w+$/ - # Full: - #self.class.name =~ /(?:::)(\w+)$/ - "#$1.#@count" - end - - def inspect - "< #{to_s} #{@events.collect{|e| - pre = e == @events[@current] ? '#' : '' - pre + e.inspect unless self == e - }.join(', ')} >" - end - - def expected - return [@events[@current]] - end - - def <<( event ) - add_event_to_arry( @events, event ) - end - - - protected - def expand_ref_in( arry, ind ) - new_events = [] - @references[ arry[ind].to_s ].each{ |evt| - add_event_to_arry(new_events,evt) - } - arry[ind,1] = new_events - end - - def add_event_to_arry( arry, evt ) - evt = generate_event( evt ) - if evt.kind_of? String - arry[-1].event_arg = evt if arry[-1].kind_of? Event and @value - @value = false - else - arry << evt - end - end - - def generate_event( event ) - return event if event.kind_of? State or event.class == Ref - evt = nil - arg = nil - case event[0] - when :start_element - case event[1] - when "element" - evt = :start_element - arg = event[2]["name"] - when "attribute" - evt = :start_attribute - arg = event[2]["name"] - when "text" - evt = :text - when "value" - evt = :text - @value = true - end - when :text - return event[1] - when :end_document - return Event.new( event[0] ) - else # then :end_element - case event[1] - when "element" - evt = :end_element - when "attribute" - evt = :end_attribute - end - end - return Event.new( evt, arg ) - end - end - - - class Sequence < State - def matches?(event) - @events[@current].matches?( event ) - end - end - - - class Optional < State - def next( event ) - if @current == 0 - rv = super - return rv if rv - @prior = @previous.pop - return @prior.next( event ) - end - super - end - - def matches?(event) - @events[@current].matches?(event) || - (@current == 0 and @previous[-1].matches?(event)) - end - - def expected - return [ @prior.expected, @events[0] ].flatten if @current == 0 - return [@events[@current]] - end - end - - - class ZeroOrMore < Optional - def next( event ) - expand_ref_in( @events, @current ) if @events[@current].class == Ref - if ( @events[@current].matches?(event) ) - @current += 1 - if @events[@current].nil? - @current = 0 - return self - elsif @events[@current].kind_of? State - @current += 1 - @events[@current-1].previous = self - return @events[@current-1] - else - return self - end - else - @prior = @previous.pop - return @prior.next( event ) if @current == 0 - return nil - end - end - - def expected - return [ @prior.expected, @events[0] ].flatten if @current == 0 - return [@events[@current]] - end - end - - - class OneOrMore < State - def initialize context - super - @ord = 0 - end - - def reset - super - @ord = 0 - end - - def next( event ) - expand_ref_in( @events, @current ) if @events[@current].class == Ref - if ( @events[@current].matches?(event) ) - @current += 1 - @ord += 1 - if @events[@current].nil? - @current = 0 - return self - elsif @events[@current].kind_of? State - @current += 1 - @events[@current-1].previous = self - return @events[@current-1] - else - return self - end - else - return @previous.pop.next( event ) if @current == 0 and @ord > 0 - return nil - end - end - - def matches?( event ) - @events[@current].matches?(event) || - (@current == 0 and @ord > 0 and @previous[-1].matches?(event)) - end - - def expected - if @current == 0 and @ord > 0 - return [@previous[-1].expected, @events[0]].flatten - else - return [@events[@current]] - end - end - end - - - class Choice < State - def initialize context - super - @choices = [] - end - - def reset - super - @events = [] - @choices.each { |c| c.each { |s| s.reset if s.kind_of? State } } - end - - def <<( event ) - add_event_to_arry( @choices, event ) - end - - def next( event ) - # Make the choice if we haven't - if @events.size == 0 - c = 0 ; max = @choices.size - while c < max - if @choices[c][0].class == Ref - expand_ref_in( @choices[c], 0 ) - @choices += @choices[c] - @choices.delete( @choices[c] ) - max -= 1 - else - c += 1 - end - end - @events = @choices.find { |evt| evt[0].matches? event } - # Remove the references - # Find the events - end - unless @events - @events = [] - return nil - end - super - end - - def matches?( event ) - return @events[@current].matches?( event ) if @events.size > 0 - !@choices.find{|evt| evt[0].matches?(event)}.nil? - end - - def expected - return [@events[@current]] if @events.size > 0 - return @choices.collect do |x| - if x[0].kind_of? State - x[0].expected - else - x[0] - end - end.flatten - end - - def inspect - "< #{to_s} #{@choices.collect{|e| e.collect{|f|f.to_s}.join(', ')}.join(' or ')} >" - end - - protected - def add_event_to_arry( arry, evt ) - if evt.kind_of? State or evt.class == Ref - arry << [evt] - elsif evt[0] == :text - if arry[-1] and - arry[-1][-1].kind_of?( Event ) and - arry[-1][-1].event_type == :text and @value - - arry[-1][-1].event_arg = evt[1] - @value = false - end - else - arry << [] if evt[0] == :start_element - arry[-1] << generate_event( evt ) - end - end - end - - - class Interleave < Choice - def initialize context - super - @choice = 0 - end - - def reset - @choice = 0 - end - - def next_current( event ) - # Expand references - c = 0 ; max = @choices.size - while c < max - if @choices[c][0].class == Ref - expand_ref_in( @choices[c], 0 ) - @choices += @choices[c] - @choices.delete( @choices[c] ) - max -= 1 - else - c += 1 - end - end - @events = @choices[@choice..-1].find { |evt| evt[0].matches? event } - @current = 0 - if @events - # reorder the choices - old = @choices[@choice] - idx = @choices.index( @events ) - @choices[@choice] = @events - @choices[idx] = old - @choice += 1 - end - - @events = [] unless @events - end - - - def next( event ) - # Find the next series - next_current(event) unless @events[@current] - return nil unless @events[@current] - - expand_ref_in( @events, @current ) if @events[@current].class == Ref - if ( @events[@current].kind_of? State ) - @current += 1 - @events[@current-1].previous = self - return @events[@current-1].next( event ) - end - return @previous.pop.next( event ) if @events[@current].nil? - if ( @events[@current].matches?(event) ) - @current += 1 - if @events[@current].nil? - return self unless @choices[@choice].nil? - return @previous.pop - elsif @events[@current].kind_of? State - @current += 1 - @events[@current-1].previous = self - return @events[@current-1] - else - return self - end - else - return nil - end - end - - def matches?( event ) - return @events[@current].matches?( event ) if @events[@current] - !@choices[@choice..-1].find{|evt| evt[0].matches?(event)}.nil? - end - - def expected - return [@events[@current]] if @events[@current] - return @choices[@choice..-1].collect do |x| - if x[0].kind_of? State - x[0].expected - else - x[0] - end - end.flatten - end - - def inspect - "< #{to_s} #{@choices.collect{|e| e.collect{|f|f.to_s}.join(', ')}.join(' and ')} >" - end - end - - class Ref - def initialize value - @value = value - end - def to_s - @value - end - def inspect - "{#{to_s}}" - end - end - end -end diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb deleted file mode 100644 index 0ad6ada4277777..00000000000000 --- a/lib/rexml/validation/validation.rb +++ /dev/null @@ -1,144 +0,0 @@ -# frozen_string_literal: false -require_relative 'validationexception' - -module REXML - module Validation - module Validator - NILEVENT = [ nil ] - def reset - @current = @root - @root.reset - @root.previous = true - @attr_stack = [] - self - end - def dump - puts @root.inspect - end - def validate( event ) - @attr_stack = [] unless defined? @attr_stack - match = @current.next(event) - raise ValidationException.new( "Validation error. Expected: "+ - @current.expected.join( " or " )+" from #{@current.inspect} "+ - " but got #{Event.new( event[0], event[1] ).inspect}" ) unless match - @current = match - - # Check for attributes - case event[0] - when :start_element - @attr_stack << event[2] - begin - sattr = [:start_attribute, nil] - eattr = [:end_attribute] - text = [:text, nil] - k, = event[2].find { |key,value| - sattr[1] = key - m = @current.next( sattr ) - if m - # If the state has text children... - if m.matches?( eattr ) - @current = m - else - text[1] = value - m = m.next( text ) - text[1] = nil - return false unless m - @current = m if m - end - m = @current.next( eattr ) - if m - @current = m - true - else - false - end - else - false - end - } - event[2].delete(k) if k - end while k - when :end_element - attrs = @attr_stack.pop - raise ValidationException.new( "Validation error. Illegal "+ - " attributes: #{attrs.inspect}") if attrs.length > 0 - end - end - end - - class Event - def initialize(event_type, event_arg=nil ) - @event_type = event_type - @event_arg = event_arg - end - - attr_reader :event_type - attr_accessor :event_arg - - def done? - @done - end - - def single? - return (@event_type != :start_element and @event_type != :start_attribute) - end - - def matches?( event ) - return false unless event[0] == @event_type - case event[0] - when nil - return true - when :start_element - return true if event[1] == @event_arg - when :end_element - return true - when :start_attribute - return true if event[1] == @event_arg - when :end_attribute - return true - when :end_document - return true - when :text - return (@event_arg.nil? or @event_arg == event[1]) -=begin - when :processing_instruction - false - when :xmldecl - false - when :start_doctype - false - when :end_doctype - false - when :externalentity - false - when :elementdecl - false - when :entity - false - when :attlistdecl - false - when :notationdecl - false - when :end_doctype - false -=end - else - false - end - end - - def ==( other ) - return false unless other.kind_of? Event - @event_type == other.event_type and @event_arg == other.event_arg - end - - def to_s - inspect - end - - def inspect - "#{@event_type.inspect}( #@event_arg )" - end - end - end -end diff --git a/lib/rexml/validation/validationexception.rb b/lib/rexml/validation/validationexception.rb deleted file mode 100644 index 78cd63fd04662c..00000000000000 --- a/lib/rexml/validation/validationexception.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: false -module REXML - module Validation - class ValidationException < RuntimeError - def initialize msg - super - end - end - end -end diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb deleted file mode 100644 index d19407cefdd4ee..00000000000000 --- a/lib/rexml/xmldecl.rb +++ /dev/null @@ -1,130 +0,0 @@ -# frozen_string_literal: false - -require_relative 'encoding' -require_relative 'source' - -module REXML - # NEEDS DOCUMENTATION - class XMLDecl < Child - include Encoding - - DEFAULT_VERSION = "1.0" - DEFAULT_ENCODING = "UTF-8" - DEFAULT_STANDALONE = "no" - START = "" - - attr_accessor :version, :standalone - attr_reader :writeencoding, :writethis - - def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil) - @writethis = true - @writeencoding = !encoding.nil? - if version.kind_of? XMLDecl - super() - @version = version.version - self.encoding = version.encoding - @writeencoding = version.writeencoding - @standalone = version.standalone - @writethis = version.writethis - else - super() - @version = version - self.encoding = encoding - @standalone = standalone - end - @version = DEFAULT_VERSION if @version.nil? - end - - def clone - XMLDecl.new(self) - end - - # indent:: - # Ignored. There must be no whitespace before an XML declaration - # transitive:: - # Ignored - # ie_hack:: - # Ignored - def write(writer, indent=-1, transitive=false, ie_hack=false) - return nil unless @writethis or writer.kind_of? Output - writer << START - writer << " #{content encoding}" - writer << STOP - end - - def ==( other ) - other.kind_of?(XMLDecl) and - other.version == @version and - other.encoding == self.encoding and - other.standalone == @standalone - end - - def xmldecl version, encoding, standalone - @version = version - self.encoding = encoding - @standalone = standalone - end - - def node_type - :xmldecl - end - - alias :stand_alone? :standalone - alias :old_enc= :encoding= - - def encoding=( enc ) - if enc.nil? - self.old_enc = "UTF-8" - @writeencoding = false - else - self.old_enc = enc - @writeencoding = true - end - self.dowrite - end - - # Only use this if you do not want the XML declaration to be written; - # this object is ignored by the XML writer. Otherwise, instantiate your - # own XMLDecl and add it to the document. - # - # Note that XML 1.1 documents *must* include an XML declaration - def XMLDecl.default - rv = XMLDecl.new( "1.0" ) - rv.nowrite - rv - end - - def nowrite - @writethis = false - end - - def dowrite - @writethis = true - end - - def inspect - "#{START} ... #{STOP}" - end - - private - def content(enc) - context = nil - context = parent.context if parent - if context and context[:prologue_quote] == :quote - quote = "\"" - else - quote = "'" - end - - rv = "version=#{quote}#{@version}#{quote}" - if @writeencoding or enc !~ /\Autf-8\z/i - rv << " encoding=#{quote}#{enc}#{quote}" - end - if @standalone - rv << " standalone=#{quote}#{@standalone}#{quote}" - end - rv - end - end -end diff --git a/lib/rexml/xmltokens.rb b/lib/rexml/xmltokens.rb deleted file mode 100644 index 392b47b1d33cf5..00000000000000 --- a/lib/rexml/xmltokens.rb +++ /dev/null @@ -1,85 +0,0 @@ -# frozen_string_literal: false -module REXML - # Defines a number of tokens used for parsing XML. Not for general - # consumption. - module XMLTokens - # From http://www.w3.org/TR/REC-xml/#sec-common-syn - # - # [4] NameStartChar ::= - # ":" | - # [A-Z] | - # "_" | - # [a-z] | - # [#xC0-#xD6] | - # [#xD8-#xF6] | - # [#xF8-#x2FF] | - # [#x370-#x37D] | - # [#x37F-#x1FFF] | - # [#x200C-#x200D] | - # [#x2070-#x218F] | - # [#x2C00-#x2FEF] | - # [#x3001-#xD7FF] | - # [#xF900-#xFDCF] | - # [#xFDF0-#xFFFD] | - # [#x10000-#xEFFFF] - name_start_chars = [ - ":", - "A-Z", - "_", - "a-z", - "\\u00C0-\\u00D6", - "\\u00D8-\\u00F6", - "\\u00F8-\\u02FF", - "\\u0370-\\u037D", - "\\u037F-\\u1FFF", - "\\u200C-\\u200D", - "\\u2070-\\u218F", - "\\u2C00-\\u2FEF", - "\\u3001-\\uD7FF", - "\\uF900-\\uFDCF", - "\\uFDF0-\\uFFFD", - "\\u{10000}-\\u{EFFFF}", - ] - # From http://www.w3.org/TR/REC-xml/#sec-common-syn - # - # [4a] NameChar ::= - # NameStartChar | - # "-" | - # "." | - # [0-9] | - # #xB7 | - # [#x0300-#x036F] | - # [#x203F-#x2040] - name_chars = name_start_chars + [ - "\\-", - "\\.", - "0-9", - "\\u00B7", - "\\u0300-\\u036F", - "\\u203F-\\u2040", - ] - NAME_START_CHAR = "[#{name_start_chars.join('')}]" - NAME_CHAR = "[#{name_chars.join('')}]" - NAMECHAR = NAME_CHAR # deprecated. Use NAME_CHAR instead. - - # From http://www.w3.org/TR/xml-names11/#NT-NCName - # - # [6] NCNameStartChar ::= NameStartChar - ':' - ncname_start_chars = name_start_chars - [":"] - # From http://www.w3.org/TR/xml-names11/#NT-NCName - # - # [5] NCNameChar ::= NameChar - ':' - ncname_chars = name_chars - [":"] - NCNAME_STR = "[#{ncname_start_chars.join('')}][#{ncname_chars.join('')}]*" - NAME_STR = "(?:#{NCNAME_STR}:)?#{NCNAME_STR}" - - NAME = "(#{NAME_START_CHAR}#{NAME_CHAR}*)" - NMTOKEN = "(?:#{NAME_CHAR})+" - NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*" - REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)" - - #REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})" - #ENTITYREF = "&#{NAME};" - #CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;" - end -end diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb deleted file mode 100644 index a0921bd8e10d8c..00000000000000 --- a/lib/rexml/xpath.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: false -require_relative 'functions' -require_relative 'xpath_parser' - -module REXML - # Wrapper class. Use this class to access the XPath functions. - class XPath - include Functions - # A base Hash object, supposing to be used when initializing a - # default empty namespaces set, but is currently unused. - # TODO: either set the namespaces=EMPTY_HASH, or deprecate this. - EMPTY_HASH = {} - - # Finds and returns the first node that matches the supplied xpath. - # element:: - # The context element - # path:: - # The xpath to search for. If not supplied or nil, returns the first - # node matching '*'. - # namespaces:: - # If supplied, a Hash which defines a namespace mapping. - # variables:: - # If supplied, a Hash which maps $variables in the query - # to values. This can be used to avoid XPath injection attacks - # or to automatically handle escaping string values. - # - # XPath.first( node ) - # XPath.first( doc, "//b"} ) - # XPath.first( node, "a/x:b", { "x"=>"http://doofus" } ) - # XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) - def XPath::first(element, path=nil, namespaces=nil, variables={}, options={}) - raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash) - raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash) - parser = XPathParser.new(**options) - parser.namespaces = namespaces - parser.variables = variables - path = "*" unless path - element = [element] unless element.kind_of? Array - parser.parse(path, element).flatten[0] - end - - # Iterates over nodes that match the given path, calling the supplied - # block with the match. - # element:: - # The context element - # path:: - # The xpath to search for. If not supplied or nil, defaults to '*' - # namespaces:: - # If supplied, a Hash which defines a namespace mapping - # variables:: - # If supplied, a Hash which maps $variables in the query - # to values. This can be used to avoid XPath injection attacks - # or to automatically handle escaping string values. - # - # XPath.each( node ) { |el| ... } - # XPath.each( node, '/*[@attr='v']' ) { |el| ... } - # XPath.each( node, 'ancestor::x' ) { |el| ... } - # XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \ - # {|el| ... } - def XPath::each(element, path=nil, namespaces=nil, variables={}, options={}, &block) - raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash) - raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash) - parser = XPathParser.new(**options) - parser.namespaces = namespaces - parser.variables = variables - path = "*" unless path - element = [element] unless element.kind_of? Array - parser.parse(path, element).each( &block ) - end - - # Returns an array of nodes matching a given XPath. - def XPath::match(element, path=nil, namespaces=nil, variables={}, options={}) - parser = XPathParser.new(**options) - parser.namespaces = namespaces - parser.variables = variables - path = "*" unless path - element = [element] unless element.kind_of? Array - parser.parse(path,element) - end - end -end diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb deleted file mode 100644 index b9897254032d5d..00000000000000 --- a/lib/rexml/xpath_parser.rb +++ /dev/null @@ -1,968 +0,0 @@ -# frozen_string_literal: false - -require "pp" - -require_relative 'namespace' -require_relative 'xmltokens' -require_relative 'attribute' -require_relative 'parsers/xpathparser' - -class Object - # provides a unified +clone+ operation, for REXML::XPathParser - # to use across multiple Object types - def dclone - clone - end -end -class Symbol - # provides a unified +clone+ operation, for REXML::XPathParser - # to use across multiple Object types - def dclone ; self ; end -end -class Integer - # provides a unified +clone+ operation, for REXML::XPathParser - # to use across multiple Object types - def dclone ; self ; end -end -class Float - # provides a unified +clone+ operation, for REXML::XPathParser - # to use across multiple Object types - def dclone ; self ; end -end -class Array - # provides a unified +clone+ operation, for REXML::XPathParser - # to use across multiple Object+ types - def dclone - klone = self.clone - klone.clear - self.each{|v| klone << v.dclone} - klone - end -end - -module REXML - # You don't want to use this class. Really. Use XPath, which is a wrapper - # for this class. Believe me. You don't want to poke around in here. - # There is strange, dark magic at work in this code. Beware. Go back! Go - # back while you still can! - class XPathParser - include XMLTokens - LITERAL = /^'([^']*)'|^"([^"]*)"/u - - DEBUG = (ENV["REXML_XPATH_PARSER_DEBUG"] == "true") - - def initialize(strict: false) - @debug = DEBUG - @parser = REXML::Parsers::XPathParser.new - @namespaces = nil - @variables = {} - @nest = 0 - @strict = strict - end - - def namespaces=( namespaces={} ) - Functions::namespace_context = namespaces - @namespaces = namespaces - end - - def variables=( vars={} ) - Functions::variables = vars - @variables = vars - end - - def parse path, nodeset - path_stack = @parser.parse( path ) - match( path_stack, nodeset ) - end - - def get_first path, nodeset - path_stack = @parser.parse( path ) - first( path_stack, nodeset ) - end - - def predicate path, nodeset - path_stack = @parser.parse( path ) - match( path_stack, nodeset ) - end - - def []=( variable_name, value ) - @variables[ variable_name ] = value - end - - - # Performs a depth-first (document order) XPath search, and returns the - # first match. This is the fastest, lightest way to return a single result. - # - # FIXME: This method is incomplete! - def first( path_stack, node ) - return nil if path.size == 0 - - case path[0] - when :document - # do nothing - return first( path[1..-1], node ) - when :child - for c in node.children - r = first( path[1..-1], c ) - return r if r - end - when :qname - name = path[2] - if node.name == name - return node if path.size == 3 - return first( path[3..-1], node ) - else - return nil - end - when :descendant_or_self - r = first( path[1..-1], node ) - return r if r - for c in node.children - r = first( path, c ) - return r if r - end - when :node - return first( path[1..-1], node ) - when :any - return first( path[1..-1], node ) - end - return nil - end - - - def match(path_stack, nodeset) - nodeset = nodeset.collect.with_index do |node, i| - position = i + 1 - XPathNode.new(node, position: position) - end - result = expr(path_stack, nodeset) - case result - when Array # nodeset - unnode(result) - else - [result] - end - end - - private - def strict? - @strict - end - - # Returns a String namespace for a node, given a prefix - # The rules are: - # - # 1. Use the supplied namespace mapping first. - # 2. If no mapping was supplied, use the context node to look up the namespace - def get_namespace( node, prefix ) - if @namespaces - return @namespaces[prefix] || '' - else - return node.namespace( prefix ) if node.node_type == :element - return '' - end - end - - - # Expr takes a stack of path elements and a set of nodes (either a Parent - # or an Array and returns an Array of matching nodes - def expr( path_stack, nodeset, context=nil ) - enter(:expr, path_stack, nodeset) if @debug - return nodeset if path_stack.length == 0 || nodeset.length == 0 - while path_stack.length > 0 - trace(:while, path_stack, nodeset) if @debug - if nodeset.length == 0 - path_stack.clear - return [] - end - op = path_stack.shift - case op - when :document - first_raw_node = nodeset.first.raw_node - nodeset = [XPathNode.new(first_raw_node.root_node, position: 1)] - when :self - nodeset = step(path_stack) do - [nodeset] - end - when :child - nodeset = step(path_stack) do - child(nodeset) - end - when :literal - trace(:literal, path_stack, nodeset) if @debug - return path_stack.shift - when :attribute - nodeset = step(path_stack, any_type: :attribute) do - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - next unless raw_node.node_type == :element - attributes = raw_node.attributes - next if attributes.empty? - nodesets << attributes.each_attribute.collect.with_index do |attribute, i| - XPathNode.new(attribute, position: i + 1) - end - end - nodesets - end - when :namespace - pre_defined_namespaces = { - "xml" => "http://www.w3.org/XML/1998/namespace", - } - nodeset = step(path_stack, any_type: :namespace) do - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - case raw_node.node_type - when :element - if @namespaces - nodesets << pre_defined_namespaces.merge(@namespaces) - else - nodesets << pre_defined_namespaces.merge(raw_node.namespaces) - end - when :attribute - if @namespaces - nodesets << pre_defined_namespaces.merge(@namespaces) - else - nodesets << pre_defined_namespaces.merge(raw_node.element.namespaces) - end - end - end - nodesets - end - when :parent - nodeset = step(path_stack) do - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - if raw_node.node_type == :attribute - parent = raw_node.element - else - parent = raw_node.parent - end - nodesets << [XPathNode.new(parent, position: 1)] if parent - end - nodesets - end - when :ancestor - nodeset = step(path_stack) do - nodesets = [] - # new_nodes = {} - nodeset.each do |node| - raw_node = node.raw_node - new_nodeset = [] - while raw_node.parent - raw_node = raw_node.parent - # next if new_nodes.key?(node) - new_nodeset << XPathNode.new(raw_node, - position: new_nodeset.size + 1) - # new_nodes[node] = true - end - nodesets << new_nodeset unless new_nodeset.empty? - end - nodesets - end - when :ancestor_or_self - nodeset = step(path_stack) do - nodesets = [] - # new_nodes = {} - nodeset.each do |node| - raw_node = node.raw_node - next unless raw_node.node_type == :element - new_nodeset = [XPathNode.new(raw_node, position: 1)] - # new_nodes[node] = true - while raw_node.parent - raw_node = raw_node.parent - # next if new_nodes.key?(node) - new_nodeset << XPathNode.new(raw_node, - position: new_nodeset.size + 1) - # new_nodes[node] = true - end - nodesets << new_nodeset unless new_nodeset.empty? - end - nodesets - end - when :descendant_or_self - nodeset = step(path_stack) do - descendant(nodeset, true) - end - when :descendant - nodeset = step(path_stack) do - descendant(nodeset, false) - end - when :following_sibling - nodeset = step(path_stack) do - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - next unless raw_node.respond_to?(:parent) - next if raw_node.parent.nil? - all_siblings = raw_node.parent.children - current_index = all_siblings.index(raw_node) - following_siblings = all_siblings[(current_index + 1)..-1] - next if following_siblings.empty? - nodesets << following_siblings.collect.with_index do |sibling, i| - XPathNode.new(sibling, position: i + 1) - end - end - nodesets - end - when :preceding_sibling - nodeset = step(path_stack, order: :reverse) do - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - next unless raw_node.respond_to?(:parent) - next if raw_node.parent.nil? - all_siblings = raw_node.parent.children - current_index = all_siblings.index(raw_node) - preceding_siblings = all_siblings[0, current_index].reverse - next if preceding_siblings.empty? - nodesets << preceding_siblings.collect.with_index do |sibling, i| - XPathNode.new(sibling, position: i + 1) - end - end - nodesets - end - when :preceding - nodeset = step(path_stack, order: :reverse) do - unnode(nodeset) do |node| - preceding(node) - end - end - when :following - nodeset = step(path_stack) do - unnode(nodeset) do |node| - following(node) - end - end - when :variable - var_name = path_stack.shift - return [@variables[var_name]] - - when :eq, :neq, :lt, :lteq, :gt, :gteq - left = expr( path_stack.shift, nodeset.dup, context ) - right = expr( path_stack.shift, nodeset.dup, context ) - res = equality_relational_compare( left, op, right ) - trace(op, left, right, res) if @debug - return res - - when :or - left = expr(path_stack.shift, nodeset.dup, context) - return true if Functions.boolean(left) - right = expr(path_stack.shift, nodeset.dup, context) - return Functions.boolean(right) - - when :and - left = expr(path_stack.shift, nodeset.dup, context) - return false unless Functions.boolean(left) - right = expr(path_stack.shift, nodeset.dup, context) - return Functions.boolean(right) - - when :div, :mod, :mult, :plus, :minus - left = expr(path_stack.shift, nodeset, context) - right = expr(path_stack.shift, nodeset, context) - left = unnode(left) if left.is_a?(Array) - right = unnode(right) if right.is_a?(Array) - left = Functions::number(left) - right = Functions::number(right) - case op - when :div - return left / right - when :mod - return left % right - when :mult - return left * right - when :plus - return left + right - when :minus - return left - right - else - raise "[BUG] Unexpected operator: <#{op.inspect}>" - end - when :union - left = expr( path_stack.shift, nodeset, context ) - right = expr( path_stack.shift, nodeset, context ) - left = unnode(left) if left.is_a?(Array) - right = unnode(right) if right.is_a?(Array) - return (left | right) - when :neg - res = expr( path_stack, nodeset, context ) - res = unnode(res) if res.is_a?(Array) - return -Functions.number(res) - when :not - when :function - func_name = path_stack.shift.tr('-','_') - arguments = path_stack.shift - - if nodeset.size != 1 - message = "[BUG] Node set size must be 1 for function call: " - message += "<#{func_name}>: <#{nodeset.inspect}>: " - message += "<#{arguments.inspect}>" - raise message - end - - node = nodeset.first - if context - target_context = context - else - target_context = {:size => nodeset.size} - if node.is_a?(XPathNode) - target_context[:node] = node.raw_node - target_context[:index] = node.position - else - target_context[:node] = node - target_context[:index] = 1 - end - end - args = arguments.dclone.collect do |arg| - result = expr(arg, nodeset, target_context) - result = unnode(result) if result.is_a?(Array) - result - end - Functions.context = target_context - return Functions.send(func_name, *args) - - else - raise "[BUG] Unexpected path: <#{op.inspect}>: <#{path_stack.inspect}>" - end - end # while - return nodeset - ensure - leave(:expr, path_stack, nodeset) if @debug - end - - def step(path_stack, any_type: :element, order: :forward) - nodesets = yield - begin - enter(:step, path_stack, nodesets) if @debug - nodesets = node_test(path_stack, nodesets, any_type: any_type) - while path_stack[0] == :predicate - path_stack.shift # :predicate - predicate_expression = path_stack.shift.dclone - nodesets = evaluate_predicate(predicate_expression, nodesets) - end - if nodesets.size == 1 - ordered_nodeset = nodesets[0] - else - raw_nodes = [] - nodesets.each do |nodeset| - nodeset.each do |node| - if node.respond_to?(:raw_node) - raw_nodes << node.raw_node - else - raw_nodes << node - end - end - end - ordered_nodeset = sort(raw_nodes, order) - end - new_nodeset = [] - ordered_nodeset.each do |node| - # TODO: Remove duplicated - new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1) - end - new_nodeset - ensure - leave(:step, path_stack, new_nodeset) if @debug - end - end - - def node_test(path_stack, nodesets, any_type: :element) - enter(:node_test, path_stack, nodesets) if @debug - operator = path_stack.shift - case operator - when :qname - prefix = path_stack.shift - name = path_stack.shift - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - case raw_node.node_type - when :element - if prefix.nil? - raw_node.name == name - elsif prefix.empty? - if strict? - raw_node.name == name and raw_node.namespace == "" - else - # FIXME: This DOUBLES the time XPath searches take - ns = get_namespace(raw_node, prefix) - raw_node.name == name and raw_node.namespace == ns - end - else - # FIXME: This DOUBLES the time XPath searches take - ns = get_namespace(raw_node, prefix) - raw_node.name == name and raw_node.namespace == ns - end - when :attribute - if prefix.nil? - raw_node.name == name - elsif prefix.empty? - raw_node.name == name and raw_node.namespace == "" - else - # FIXME: This DOUBLES the time XPath searches take - ns = get_namespace(raw_node.element, prefix) - raw_node.name == name and raw_node.namespace == ns - end - else - false - end - end - end - when :namespace - prefix = path_stack.shift - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - case raw_node.node_type - when :element - namespaces = @namespaces || raw_node.namespaces - raw_node.namespace == namespaces[prefix] - when :attribute - namespaces = @namespaces || raw_node.element.namespaces - raw_node.namespace == namespaces[prefix] - else - false - end - end - end - when :any - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - raw_node.node_type == any_type - end - end - when :comment - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - raw_node.node_type == :comment - end - end - when :text - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - raw_node.node_type == :text - end - end - when :processing_instruction - target = path_stack.shift - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - raw_node = node.raw_node - (raw_node.node_type == :processing_instruction) and - (target.empty? or (raw_node.target == target)) - end - end - when :node - new_nodesets = nodesets.collect do |nodeset| - filter_nodeset(nodeset) do |node| - true - end - end - else - message = "[BUG] Unexpected node test: " + - "<#{operator.inspect}>: <#{path_stack.inspect}>" - raise message - end - new_nodesets - ensure - leave(:node_test, path_stack, new_nodesets) if @debug - end - - def filter_nodeset(nodeset) - new_nodeset = [] - nodeset.each do |node| - next unless yield(node) - new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1) - end - new_nodeset - end - - def evaluate_predicate(expression, nodesets) - enter(:predicate, expression, nodesets) if @debug - new_nodesets = nodesets.collect do |nodeset| - new_nodeset = [] - subcontext = { :size => nodeset.size } - nodeset.each_with_index do |node, index| - if node.is_a?(XPathNode) - subcontext[:node] = node.raw_node - subcontext[:index] = node.position - else - subcontext[:node] = node - subcontext[:index] = index + 1 - end - result = expr(expression.dclone, [node], subcontext) - trace(:predicate_evaluate, expression, node, subcontext, result) if @debug - result = result[0] if result.kind_of? Array and result.length == 1 - if result.kind_of? Numeric - if result == node.position - new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1) - end - elsif result.instance_of? Array - if result.size > 0 and result.inject(false) {|k,s| s or k} - if result.size > 0 - new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1) - end - end - else - if result - new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1) - end - end - end - new_nodeset - end - new_nodesets - ensure - leave(:predicate, new_nodesets) if @debug - end - - def trace(*args) - indent = " " * @nest - PP.pp(args, "").each_line do |line| - puts("#{indent}#{line}") - end - end - - def enter(tag, *args) - trace(:enter, tag, *args) - @nest += 1 - end - - def leave(tag, *args) - @nest -= 1 - trace(:leave, tag, *args) - end - - # Reorders an array of nodes so that they are in document order - # It tries to do this efficiently. - # - # FIXME: I need to get rid of this, but the issue is that most of the XPath - # interpreter functions as a filter, which means that we lose context going - # in and out of function calls. If I knew what the index of the nodes was, - # I wouldn't have to do this. Maybe add a document IDX for each node? - # Problems with mutable documents. Or, rewrite everything. - def sort(array_of_nodes, order) - new_arry = [] - array_of_nodes.each { |node| - node_idx = [] - np = node.node_type == :attribute ? node.element : node - while np.parent and np.parent.node_type == :element - node_idx << np.parent.index( np ) - np = np.parent - end - new_arry << [ node_idx.reverse, node ] - } - ordered = new_arry.sort_by do |index, node| - if order == :forward - index - else - -index - end - end - ordered.collect do |_index, node| - node - end - end - - def descendant(nodeset, include_self) - nodesets = [] - nodeset.each do |node| - new_nodeset = [] - new_nodes = {} - descendant_recursive(node.raw_node, new_nodeset, new_nodes, include_self) - nodesets << new_nodeset unless new_nodeset.empty? - end - nodesets - end - - def descendant_recursive(raw_node, new_nodeset, new_nodes, include_self) - if include_self - return if new_nodes.key?(raw_node) - new_nodeset << XPathNode.new(raw_node, position: new_nodeset.size + 1) - new_nodes[raw_node] = true - end - - node_type = raw_node.node_type - if node_type == :element or node_type == :document - raw_node.children.each do |child| - descendant_recursive(child, new_nodeset, new_nodes, true) - end - end - end - - # Builds a nodeset of all of the preceding nodes of the supplied node, - # in reverse document order - # preceding:: includes every element in the document that precedes this node, - # except for ancestors - def preceding(node) - ancestors = [] - parent = node.parent - while parent - ancestors << parent - parent = parent.parent - end - - precedings = [] - preceding_node = preceding_node_of(node) - while preceding_node - if ancestors.include?(preceding_node) - ancestors.delete(preceding_node) - else - precedings << XPathNode.new(preceding_node, - position: precedings.size + 1) - end - preceding_node = preceding_node_of(preceding_node) - end - precedings - end - - def preceding_node_of( node ) - psn = node.previous_sibling_node - if psn.nil? - if node.parent.nil? or node.parent.class == Document - return nil - end - return node.parent - #psn = preceding_node_of( node.parent ) - end - while psn and psn.kind_of? Element and psn.children.size > 0 - psn = psn.children[-1] - end - psn - end - - def following(node) - followings = [] - following_node = next_sibling_node(node) - while following_node - followings << XPathNode.new(following_node, - position: followings.size + 1) - following_node = following_node_of(following_node) - end - followings - end - - def following_node_of( node ) - if node.kind_of? Element and node.children.size > 0 - return node.children[0] - end - return next_sibling_node(node) - end - - def next_sibling_node(node) - psn = node.next_sibling_node - while psn.nil? - if node.parent.nil? or node.parent.class == Document - return nil - end - node = node.parent - psn = node.next_sibling_node - end - return psn - end - - def child(nodeset) - nodesets = [] - nodeset.each do |node| - raw_node = node.raw_node - node_type = raw_node.node_type - # trace(:child, node_type, node) - case node_type - when :element - nodesets << raw_node.children.collect.with_index do |child_node, i| - XPathNode.new(child_node, position: i + 1) - end - when :document - new_nodeset = [] - raw_node.children.each do |child| - case child - when XMLDecl, Text - # Ignore - else - new_nodeset << XPathNode.new(child, position: new_nodeset.size + 1) - end - end - nodesets << new_nodeset unless new_nodeset.empty? - end - end - nodesets - end - - def norm b - case b - when true, false - return b - when 'true', 'false' - return Functions::boolean( b ) - when /^\d+(\.\d+)?$/, Numeric - return Functions::number( b ) - else - return Functions::string( b ) - end - end - - def equality_relational_compare(set1, op, set2) - set1 = unnode(set1) if set1.is_a?(Array) - set2 = unnode(set2) if set2.is_a?(Array) - - if set1.kind_of? Array and set2.kind_of? Array - # If both objects to be compared are node-sets, then the - # comparison will be true if and only if there is a node in the - # first node-set and a node in the second node-set such that the - # result of performing the comparison on the string-values of - # the two nodes is true. - set1.product(set2).any? do |node1, node2| - node_string1 = Functions.string(node1) - node_string2 = Functions.string(node2) - compare(node_string1, op, node_string2) - end - elsif set1.kind_of? Array or set2.kind_of? Array - # If one is nodeset and other is number, compare number to each item - # in nodeset s.t. number op number(string(item)) - # If one is nodeset and other is string, compare string to each item - # in nodeset s.t. string op string(item) - # If one is nodeset and other is boolean, compare boolean to each item - # in nodeset s.t. boolean op boolean(item) - if set1.kind_of? Array - a = set1 - b = set2 - else - a = set2 - b = set1 - end - - case b - when true, false - each_unnode(a).any? do |unnoded| - compare(Functions.boolean(unnoded), op, b) - end - when Numeric - each_unnode(a).any? do |unnoded| - compare(Functions.number(unnoded), op, b) - end - when /\A\d+(\.\d+)?\z/ - b = Functions.number(b) - each_unnode(a).any? do |unnoded| - compare(Functions.number(unnoded), op, b) - end - else - b = Functions::string(b) - each_unnode(a).any? do |unnoded| - compare(Functions::string(unnoded), op, b) - end - end - else - # If neither is nodeset, - # If op is = or != - # If either boolean, convert to boolean - # If either number, convert to number - # Else, convert to string - # Else - # Convert both to numbers and compare - compare(set1, op, set2) - end - end - - def value_type(value) - case value - when true, false - :boolean - when Numeric - :number - when String - :string - else - raise "[BUG] Unexpected value type: <#{value.inspect}>" - end - end - - def normalize_compare_values(a, operator, b) - a_type = value_type(a) - b_type = value_type(b) - case operator - when :eq, :neq - if a_type == :boolean or b_type == :boolean - a = Functions.boolean(a) unless a_type == :boolean - b = Functions.boolean(b) unless b_type == :boolean - elsif a_type == :number or b_type == :number - a = Functions.number(a) unless a_type == :number - b = Functions.number(b) unless b_type == :number - else - a = Functions.string(a) unless a_type == :string - b = Functions.string(b) unless b_type == :string - end - when :lt, :lteq, :gt, :gteq - a = Functions.number(a) unless a_type == :number - b = Functions.number(b) unless b_type == :number - else - message = "[BUG] Unexpected compare operator: " + - "<#{operator.inspect}>: <#{a.inspect}>: <#{b.inspect}>" - raise message - end - [a, b] - end - - def compare(a, operator, b) - a, b = normalize_compare_values(a, operator, b) - case operator - when :eq - a == b - when :neq - a != b - when :lt - a < b - when :lteq - a <= b - when :gt - a > b - when :gteq - a >= b - else - message = "[BUG] Unexpected compare operator: " + - "<#{operator.inspect}>: <#{a.inspect}>: <#{b.inspect}>" - raise message - end - end - - def each_unnode(nodeset) - return to_enum(__method__, nodeset) unless block_given? - nodeset.each do |node| - if node.is_a?(XPathNode) - unnoded = node.raw_node - else - unnoded = node - end - yield(unnoded) - end - end - - def unnode(nodeset) - each_unnode(nodeset).collect do |unnoded| - unnoded = yield(unnoded) if block_given? - unnoded - end - end - end - - # @private - class XPathNode - attr_reader :raw_node, :context - def initialize(node, context=nil) - if node.is_a?(XPathNode) - @raw_node = node.raw_node - else - @raw_node = node - end - @context = context || {} - end - - def position - @context[:position] - end - end -end diff --git a/test/rexml/data/LostineRiver.kml.gz b/test/rexml/data/LostineRiver.kml.gz deleted file mode 100644 index 68a00c51db2150ac9e3e41e515fed2c1840dcd7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50154 zcmV)dK&QVSiwFoe?fpUk159sobZKs7QfYQ&axQCaYyjL{>yBGDlKwxyyu(=sYs?_B z#NwTCy9b_JCIOOcU?&I`gZZI!%WlDH$)i>$@jlf)!#>#-{rwP;IfOR$vygX#Xr z!%OjF-N>fT{`ULztoe1ayqPZMPaeQfJ!mHLi^b)1{_@F#pML!6QGD>X^FROT>=jnS zs`HyC53W|L*Po3>lkswOHGH{Pyqryj7mMo=RvBq*AXooladCS+nXmBYra5~)pT2%Q zSvA+=-@l#CC)kE=YyHPRKmX$Ck5B)3_F^$#H8<1$nLPOv&d%ex2S-f0@pv zt2gKBY$Sf`1iE^Iqn%zpd9YlJFWcW9v?W-UCEOweAat>qEtcou#l;JyygeIrzxTzz zO)pnh=l*Qe{Xp%E?lyGx!(#SkkCx9ycRx7$=3+75Z)`UgW2}v1>we&t*BinmDnI`) z8(&PW$IDk-`Eqh|v7EkMA;ZsKE*dp7569Q9AAbT~J-(ivjbu4}(yqhTlksKK+#pr1 znitE(b@Rj3bUvTFX`cQ%X}%YWm4&`oyn4DS!=5eXFQ=>9%gH$t)8ZToS}KlL9YR#b zN{sY%mgD)$$vG$_Lib}|vYO6T=hmH#+8=uO3P+9`_#C1dT5DX4XCub?)s-WDH{Gy& z@p>{phqF=p|AgISng6t$oi7)Q74Fma_wR6XesVc^F}|IxKAlf-nVzWMt@58<@z0PK zlRxd5HJz^{Cl*T_?07Y~5%L?5h!p<^1C{ww>K5K{bNKTb9S+BiA8(iQW;S`TYR0SP z`^I==$@A6TtOz@>LTi6mT7)zV$%WuQFfD8-v~b~mv>EO&TqDy8^-jT=x9I%W&xFf+D;=9T6 z0wcwJ-Aa>!*?|q#*@L^4&N?66>9Zl20n6yP(T3WQ7THd$t|m?M%_G+=@tZv>(R66#no&)zucW2kT7aAaa+Xdhsj!fSf@0g8r3M+ zlQuUjzX6NrLzQ9bMYa2BV@sbWTDKAx2|PJ*sF0IA9qag$?(}NkG)i&wWzjzsIkp*W>0d-#m)? zucIF(^UK*}wV3ZmlmvP!PqYUc4{S%`Fku93Px>UC=zKX8FAC!;TCFQ@x3 zBo0+DX4`EHH#A1Wfqm30RBP3V=Q>G%1D4STJ!D<;QNOv#Y43b^wkIE~+IDi5=L!eD zons98;wH7to;V*+fCHA%hddZri(VVJS?zTcHkBreVVWPCQ^C`3+b^ zAJP5)?=GIsrZ=m}vU#@8!C0P=+wM-_Y~x{1O*=xklRi`@=?z#wM-5DNz4pDH^K4y< zefh90RL#@12j&C1m!bXJxYH+u9wL9rc-z>fXOX!%a z@b|GC_fQiab_g}Bx9YHAr#1PCN>HaAYLNT}ETW@m2fsfLo;R_(zq=n7Ah_+i!8vaa z{3jtpg|^n8yyuX`H(&{U@TjwoE}qVQ8PDJBmxE|$vqOH;d3WHyF*Ys^qgLkh9my=f z0n6wZj^vJqrtfJW0JdJV%5(JkuzsZTLku+i$vX^Ld;^xyN0XI&p9mA3d)RiL0_PiC zJn-FIZ-?k?`4i7RkN^iPqmP9X-#6c(OmDLHu%D%Hrd#Q4e9+;*Cs{rWqwSu;IB`B? z8nBFxz=yEw{hBr{*}pun|ItOBi}kxG2c-}E<^aGDK)Dk?)+7NASVkX?K0DA(#ljBxhNKVdPC~xS8m&3; zd;2870n6wp_x5*;GS|v%Iy3exuTO&h&Fw1%+5GX%S$zP z{@&~TD5BNY#}RS*U=MtWJE$RcY~0D~jV!+biRh@0Bi{4g)cdky+lAabb2#*27ofIG zDX3FVR%Q7OSVTv;;eU_6{Q3T?M^VE*fBKUrvh`)eykzd+uNv8*2_c^LgC!)t0gLEk z$zk8IBlqG3Y=7IRy$_NOObl=HOHo#xyoUkp<3=Q-4|(9ZZZ_^m2C&=Bg|Yg;Nea4O z+5g4E>2m_*IABp7f)n{w_Q}o7`KQ+X-~Tp%j>PN5&Ev+Up@Hrp^g)xm#zL*B(1fAV zUE$e?8<2!~x?G}9fn@otxp%vgT}NIOFIFYoV^#9|^=*XMJ#ByJt@_3EW;LE)Og?L@ zT05F<{xbe$al2}KbG5i#-ZVBg*VFmUU*EoypJDaM0cHD1|IYoU)V@O*PyaDlTu)ZZ zH${5g^YzQJ1vg~+=Rdvsaq;HvBh$_riFS|6I_q@}#aMo`h4z{1ccZ9<30-@%mWwq# zMCTyHf&z}ALp@YJ0?Wltj1>$JYTY(e0d?CxDbQ5kTHb=9``MxS{hESy?{3=U;^x3b zv91>fdf->g>n*ST?pR8rv|)Xeo*s*hNuu%z*)6E2ZoLvM#6;tFL5x4pTcp;3XaS|! zq4|#?delZjvnR4S9qVa2CW;QMGK8+(bmC%u*v@KG6FN|v*^#UitJIAMdlaj$9HH%B zoflLSs)bY(?IGi1kSMialBsper9KLfm}s=Ka)g#p?W+^uk5pwZVR1J)oyjLqdJHg` zwYv0!DAtymPTxP77Q4UmOE zFQ9Sv9Rx_KK+91_(i$3UWmoqNiH(RD$y~{Ccm{1n`)x1o`T?|On;!v=y!H{9F$l>^ z(RLF8AA~@XrVhLk5+QDbGjbhyEH=riq!Xoi*C_#kR*A)CdU)*ezAQ>0b z%oRG{dDn9b>KT<{QN(=}*0!{cgo5M}t+jG%yQhviMkU<>X)R@ih1P*~y^P_IacN=uep0R>uoWLWa~kH&kHbfrtFMm?R4eOK&+EVL$2 zG_MtbQEohl^nI+36kTj8HZ?^<+8K+L-HNU~__+mDj7m1B)PX*UW))9hO>?La3AJk| z$x`Yo)!AwU%^FG|q{_UNr{8Ll;^CT#yNVL*i_6G??8MuejJyI?=KI`?_aF zm2mJu8EOEHfk0U&$Vgj}E01U`enZp99f-68nnqegCHzMm0yiZZh%9&|beW2ss&+A@ zA`a9pfziswQ#sh6;zCH}QmCNTn|C#3JA3}NVnaq@y-jUv{cG6lAH%)QN2+&##iavR zP|t%Z9KjILh6<`}1q4&8N)d8K`^7>Qf~%m>R6uWgSr*Va*aS@smG5<#S5E;QQr~LD zF6-bNkFT^8OfTz_Skm4GUYD|qa2Eoj#kgBddIN$)35&IcSgC*g*lEt1;Q9%A zn8>}U;%jLX3-4bqKwz~}91U&AZ%0%%;K&V%F^JAAd6O~PP1~t+5~M2*q9yi`(SsIM zRivsu8G(}f(7r%OpibOr&Vz4s+Pz2D7K?qXBkKoOW0>}|gwcs_JnIQ3t2#}4)yld$ z(fCaz^O;|nr}lLaGf_Ytpd@<~*ur5nvDp&(5Y!Tg{g1?EGzgHjpWL*N#onT-gh1Gp zqq-&dmc4p%zCwz%Vn;eZ)bhSq+(ms@Eaz!Gw+RxZmSWA40;}U7X$YEjLWo|})ja0n zkm5R!n;N1OohnirAqwlE5)Uv!MQ^As)0zMIks@8(iqw7(oL6jz5Ebn^;(QRCP>zDp zHPG_-a35DjVs+nqnW{2@QK7;xSm&n1_$USDgiw_>j6r3`C`h~#mGmKUI5H#5<|f5r z+7F>PL_j$y#JmI*b0>)J9l0)u)_QlAn-7~TLUo;(d1b7hVhduTT^dqxuW|3E9<2;KvKqi{1Ue?W*pda^*Cwpmm~4?uA2QWuW~LDtBsM!G;pTDiC)h+tj+ zwdmfmky=Mt%Zv0CqEJJPeP_4Yxpxhk!#AA%roIPHsouI`#-KfNBB39hhto$kl4T}xi3nxG}ER|(6wzq4Qz#DzR#Dg?qkjAnB zDy|H0b~-EOvfcQQ2vH?uql>l|b%E7=C?Oi6lJfIHMx zjwd0z>{MLxxcEQHzXe+o+`t*VV2bSmaI9#w&=iWY)6OR$55;2<2gRTqb)w57phGhWYnd? zICPoGbmS;yvs+a0R2;)5C9xQ&)c69DBUd)PiX2lpar~cV^R-RF+QlvA7&1D9cvcilba~N-0;B{~WiVq#49+MvS(owPn{R>qre*TQqZi zwU5SM5+n%HW)yjBg+Fsm!C=dN8fsiIFU}KNTS92Xi6D`?M_-yY6*emR;w3Tib49T> z`ro1|oy{RyIR;iH@<^a^cAC?&BtI~lM=AM*3@$GA9#LK&l{PJ~YA?%l#U*WlDDzm= zXl6W5LzV0mqKZ*1nsVgAp&9c6C0%JsQcv++3j~GGjU~U+#3Y)vWRXy2HBlLgluhmE z9E+)Uw3C%mMKm$Ca?uIhJ8D`mi_g~)EEYj&+HOWf_6U*#W<;tVy+cZ^pjoakLk9|z z^D$qgn6quzd##v5A_FBpL6mf$$yul#wUo|9O(OC$6OqADz&^8a!ps5t zEUnAeqlUDkak5>*ps>-vi9~cM#kl!!)_4$gfwr9SV&>3S6&nT=Zx}BKrV<^j8F9f- zDb53%TEa}B8{sP-Mc#Y9W@S`QWnsH9`s~MFK<~LBv1^p?XI0yNbR}?Il&V)9t{myA zKFzVVZi-VvM%<*r9w^0NY;A`r_H_-fHRP-Nlv*=pv1T0z8z%s{7!>blIZnFIizt*CpVih5 zA#5yTE_M|47&cZJdg9DXF~mX^w_B42#Kp;SZ> z>5g2Ui0RS5hyOTfFHp^Oji}obp-=O-C~qU!hzxRZ2As zMCZNslOu8z7#S-TGVrNd8>kl4@-C{;E6~kaERKaK!SE(q|5rZxV$FJ1kS=J7%uIig zzC~GcIVa@L`^d4^)q*_K{=RfZRbrhS#0XWd)HhrMEcS_a;#-O-D!?|&0{K{avI6C* zzKkD3N1lLl0_Cb=0Wh9qS!yu?$2P^ric0dDKQdx`z$(dzk$~!To2aT-Etrjr6c)S0 z--w-(&sA6rR%GS^YgQe_N4&voA zInKJ{*|ex)R8SHf)&H;UUv? zItEc>q$XK}inGd(WpR@+ zR^|Ft7@8pnJ}>l*Hb>=8y<(Fg+m=N`nIRID8SzYUSFrLml5H|3%`X4HVEj&x6AR8us~W!<9a#3`#f`nl>cvRjJs zq61Ymi_<4vZiEVEO4&`YVr@=9rkz&YLasYDYP8?4tHK-%PjS0twuF`!#j^)RKL%GN z-^(V|THZipcv~wfZ*p_ThN8*iqMCQPwzoL5U#aEtF^U`6f0OC7Qkk>>CBY)YFIdsf z4ZtR&aV+hmg(D`Xwg|<^rS$}iJ;719>8~GabJx&Ky`YOD=^95jiZj^kfI<0gzD+}f zQ1HVvGNA%_EcMSb0V7u!98#xsl>FK)sW=q;$bGj`CkZ?Gtz7DKo~g2dqT1(4QT|`d z9P8xAM&^P~wf%^`9Z<>?{f_$7ga5Ybfik>NZy`?0R_}vyJ21CX-5J0l4|SHKirjZk z={g7ZP3xWf^WLwe^~xWq`U-nu zUdbst=L`l&3M7Oq?KN6Y5dTpxg!*wKPjZ|79`F~vH-d_0LaVp+@r+rguUMhMtkY*! zK8{UB9{!t3wT{~xT7)Od@)=et05*|a1MW6eg+O1G%|&EiL8RBsD&DAC8lm2(LL0JH zUv1^%PqN9-k8%-0oxA4m>tiG5d3Rf|uXL$_&0U8ELkAj?Mq@Nx=KtoT^l}*`eOtjr zQVkAg^P$3zR3Hk-F2W`~roZGok9kqndRo)W<8UTf^Bvxbo^wpmCoWEvNy{{-1?%4~77jT-RePr54avf2_HVf^xX zm4yD(x7&3OHPrY{)Zs^;><}0ig#@W6e+v&58Ew4gP1y4leQU>j0UOYFrjChg5E(+l zKg&@!>`pZ3;lyhs*%q~nX8%oL@S=%&Fr>!Lv$7U0Mizcwr)|65r}jN&^mL3mho@Z7GI>?1NWGc{aWIp+2`%q zc!$75s%T)WA0DSb28jw|-~JwSzJ*cOLR$*0yt>4{eUh7^zV^#AZH-$h&3i?}3RQlh z0kC(ohn#5d>cpXVQcs3G0Ru`cNz*?~^eOZk>15u}F=&oH4SJO6V16wqFceB3^d;Py zq<0#(f)`wh(j1m_#ANA>xNC-iOwrFBs*xx7TW^(qH2gO?I9T>`@l6)$YVO%l0^xC? zU?2gH3_mC()5g(3_aD&!XFR%C=q+GW zeyj~Bo!F@!e8IiF$+n@!77bNCsMU5)QG9YxV zWFRme*iz6b>Gb=&@cX*xTNfr9Nkb`npECC!kDJBJGeK7p4y%@gCL{Tvr65i5P%=u|zPT5jIICp7Q%O;bpo}FCg;7hpcUaLUNkm=3mXY?DwyZN2li zI4r~>5PciooSNu20~s>|3Y?8Vm*8wuMX(I?g!4EnYaG`4&Xq)+Iqpim!p%sVUh< z_@{^I);6hJJXSN5%0;vpL*Lrk&gGwP2b?_(ed~P8`|SuO?5@Z9c@SdMQN5`>7|YRb zuRpPTjNGa>p4#JVR4T3Yf!jS>Rn*T?9DNF<9uyEf6#eqE?zhyxKkD%)iZ z`CjzirjJAZ@*N$8yCyQDUeH&S?cJ4eq3d9kZn}>GgLiCbw)MzELrXNTJ^93z&S>=? zwYL$QYu%(zb$eh5@Z%(HCsK$mO8+w5bIsZVZ@ zjFqe6VN`TJt`$nAz2=WsZM6sN!%d$`ej=eogS%)jngx!wKbyY@I$kDihElqJ8W?nR z*Wvgr-w;KcjB~h5>XHX%F*F#ZydatuvhwtNTm1HDCPBMLp zkT!OoRS3l?QR<}LH1ACf{NI!eLs%iXO;PB2x<>;m{a(OjOA#8Z>c7w2L%i=Y zpC2j~H^REHd5p5}xfB?^EndLsRbKD@qS-z2L1*CgretvUJm1Pt6cd|gV6oA&b@-1G z{mAv|JU(ynHyKKVv5tt0V=Rw=`P*woko)H;#3o~KjjIG?M2(dEeVMb#K635(yx3be z{74uTENXj!NGOT(s+&0yodxzr5EacqjT0==G@r3g z(OW_$)ETq6r3cj_5{s~lg-Up^1f?GS2*H%aJUjw2;=@Yf-Y1w4QhTae>u@c$IJdz% z?TEQ#k5eM@zZllyM!T!P=dJR!y7I0u z91Vu4lyZOc7JNy*47q{~$MU+`(*Rq(0hmxRI$Sm>G0A(YMOZ ztD|pnQ}^}S1IM+7msv)A+cjlhkNp{k#eM%Q?)G5;oJX9u3x`vL2 z!dmplw`1NCf@)pDGBTmPt#4yyTiww@=qU|A*f^rEw@-KoBTw&NdwxMOd=I<>Pe%8JD*@|Ovd#c3Bs0BK~*ZV!}}fy&z1(O{7KoH_Ur zln1LIScWP}R&Uf>MZJ6d^_>Qa`ngkSL39Y_)trwW>LVUFG@e_vLw*fy>rQv{8;_u3 zXH6&6w_bF8D=OeRmwJ3o(R&2E3kJKp@-_NcmbfFSF{igmOa$-^^Fa8l*w&*0Qol#& z`&O2(l=1vi?HxXgDH1Eq@(g|d8wz%l;RlwZHz_-3h#YWO?VY zg=B<2Um1j9HHL>jS@-Nr(o zYssZ>n{sm_PvF64Z@k>}lqR9L@UfVa!H-;fv>==j8F#vcE~up}D6FLgzJl8#4RT=B zF_WWP4vF&@H_((GIBm+c2KHxT)$)D3N8sXT*EDDcDF$ZQgNbhh)^;87;ilEVk}vyR z)*%y5B6D{QW=6N;nQ>gf-(^$0Du*r2J|FOCZ_djxv4hBgA->PgmM@#`WT zh=BQI*PqM$q)y1&j)q^4XG+m6<|h39%=L=8)wt97k*hbKWLh&}`9et4tLlrq1;%zI zyCGChz<^xD*DH-~c1HS=kr;|dH)0N0K~cV$WkzF`{VGM?^}OWl6^T%nl6PNdmmn^K zfl)u**R0SpYen7CO-4aQeM!|pbME)Qr8ep`UgwL2OeNH>FiOOZ5}pVtIofB*z4=rv z4SzkoaH=w0OFzB7H5A>>pP({_jQ(dD$#i*GA_kw9?~nA;eVhgK%NH&ets?UrzS^vB|Pp1Ql3V-8joxx;IT&0+m^Bz=?&$ZlisxA28bqtQKjt&kMLL zw<_}x7S|*`X$g($u7N348W+E0*Ket$8{l2@UDKGkccfB_UcGc=Po7LW{6Y345Xcl!=w?C!8^H9lddQUXg6H!O% zeEdK`G-|F+9mudz%oXrnB{wGrZoo>$ZN^-|lfHWGeUltcbjn~yoX-xbAm(&V;ZMas z4PMDB8D_XS0{PZdVEmfatUs#KNs9LD@MS{IGz!8rXpfJB-@v_H$+R>E($=X`%0(g5 zgQA%lg*QcYl7p(Hvq$?Y6+3)x%g?8_0OknAkQ9|^jwq851 zJq(G+xRkJG9fZPSJ~EF=_g3XXD1yl=ny3VXwyh%(s~M0SYG1*V(&|yJmCV)F;XmTp z#!F^Jqs{1d@U_ptlAvTPK??G~$Dj#>CrmYG+vrDF37zbhdsYtG0}ZGS1pTbN z|5SglMvD)Rplg?~oQk`rUU?o7vDw1cBhMx`RJG6t`C9ZyQwrmftC!h@w7yksqe5WiOLA3RI}dPfBdnE}+b~@JwRI=Xqf9 z0%-sDb(AcN82Gx?5zn|<_;f-sA8imj>jTzidKs!97(;tk z`$Q``sDXX~)SB?O$xEQU*8K=?5(w|L`_+77e%>#bxg^L%jcl409n#Uj2CXX|Ymh>b zDTrgJ<)^$>kH=vd!)b~TQ(uLy#U-GtDR4-%eS}J*htx*iR9Pfnb%Z{#%-YmDxN%wl zr^e`6VKV3B5;D+UzHN~)89j=eqQob(S3rBTVLP7BS#(MsHt>6)7;rY21t^JI9l?*Q z$j@LxbQ0k;@V=FxSQZLi6TaE-&J<#}>Q4)CBAQ!tG)X@4h1a-W^qbX(P%rA6t0{w3 z9&)5}bhtyBFFSP~q3jIzSszVYiRl$P>%P#&#PY}?t)+i!Q6?d|zLVCKmkCDw!^doO)4J;Bn z0PdmEI+x}sUEoz`2^LT>D9EptD_K@7UMPk+3anZ^@VccpE`&lZtf|s~y9!z9=GB6L zpK8l`zCTs`qCSjg==n4(`SBzWu1A)1JNOL}Etn{3Y4_J ziYU0XFo@t1$_0biQ93O+AarL1qgpeLtr9s7S*~jg8Tq!_^Lek5Hbg~A+*(*#@i!~> zmZuO3xump6arflw7QP^8RdIV#5iZjkB{b;8H%}2_GX*T6)JDIDmkK?%)<1(`<`q0e zvdqY5P3FlBK`bB(xA+DvyEQJ4;2Oy;htD$1{W+;v2^}bb?mxKw;x6hw4w>F+S&qEZ z)y#T)M!c1p>F~`B=V-3Mt+8E1qk;5x-U>LQmT4tqmt^Q_p!#*5rKEk!BO~g4eR7J4@&aDL)9$Z5g7-5 zVqw?q!4{1*80vJpU+5fm-`_-$E_Baffuu~9jf6MJMy78QgwaHSjTH4!&CmW*miw(G zvH}?2M7t?QWbyYkR>60-mNg))Cvs-Dq_t>Fs)V-e-@aqHETrAF=(JQWp64k#sNwLv zwH^?P$BBw^Cv!mw?>tb>bVLvZJADf8KFb;T-MwWZOs0(mqh}rqf8cHIU#Nv;{ zb$*`8b2I$ftW`pN3h6z7viSj&qIQ|%14{TNHZii#L?l8Nw<(uNL0A+$$AC=<^%~)F z6|GbPSdtF)q^82KW4VsM`@BrAbu9kP;W9Q8lToy#^ROZRx1~+)j8>q5C%L(+pi$)I zSKL;vXu$ha`oLb8!u>oGNQQE=diHIgTW|| zg-Xc$t$#U!uS#`+Fs9^;>UeLfegU+W2`KlTH0`}SID)qvzhp6CXveN-j5MT%%$S>h^+@k z?}XEtQ|~zP>Z{H$J4I40o;a-Z!JVqU*6A^f#gE0eJqWg2EU^v9&mv>V126)V*rOCA z#4DZdWJ~E@Lgdz4@C;R{v;hn936xGRIZMG6oU*THoKzH2UMGJAl_i|-(JiH=<-%Gi zgWBy2C~|FAy&B?>Ha=i=8DY>0-`rS&uK|>XA|w1vp;ufAg2U|`A{Pa(X;Juc)hLfv zUK%Naie?l~=VV3>4P&na76)5!;$_@Bneij2Js~=b#W^X20wha-#rs1)qB!=Jg#mr1 zOGfi0o{qjDO-NmCksGL1aNpJg*G;7!JDVLNw|sL(_F99tLQ2lw=0rc5;Hix!FE3o0 z*^xvjo`Ea+Hcei*>(WCfxOUD9&jpp-sVEq?%^#Q=BR&@72bpmNSS*uSP(GMGMQ1aA zQ3nf^lW~yhdG(#N>?v9;x8C=3QGwsvmfnWQ6F#$peKiM@7|vv_Lx6V>s#&BK;cqt-OkW6@>zo<%-LZLNO;T{<~NDu3;^<$Z)g}dJA|~ zA0{LJqM*LHAQ_eJGBh)tBUcLZ@>3##UTs*rup=D+AuCm=|&G$ zS%Ke^k`s*po(&ha%V#^;fIhXt9)bX^f%PDJ%-LeACLj--yE|soMG^H%(ZJtVMG-Hv zM4K?-4W`LCQH!cC&+=~nazb!*izW2s70IKAmP|40R7pF_FOlC)S_m6!DO=}56Eq=9 z>+mgqcIXeO2k&Y1z`;UIEf^5x1&|0*4N~)@;WpJ&1CKNn(y&@neqxNZW6!J3df;s7 zLY(rsw@0*#!_mh>%&$Hllnk}0^<&w{{Mt8Jh!dbsi?B@MD3@G<6g`8YXra$S^0wbkXynGo{K6s9y!B{t#EHgc|O$`AS6y)}2FQ`5YB6D66guqLF zfo~5ysi2hbqx!6aN$}WJ(I-4AdY(vUHebV+Lou2*+>&K`9#7!eJlSq1zU`A)FwXQ; zK~ZmCc>-&aF}N%O54N~ zQt$DbbI;73DYZ;0@W~`GG8I^56$|3Or;G$;N`C5K%5dyc^qHU(oyE~t0Wt>Lgnxx0 z)kVdB^V$i?R#y&ft%Qt=nO)L#XWvyu?Mp}qWh)XbNjopIf9t!?P~VeN+&GnX>Se4` z@liDtv8ENB^lkHndIM@3Dn4>8QEk3eF8keJaLdwf&y9H@CQEkIu|Z{&(u_kX!bXrQDsr$Lz*jWRcEjz72j|Z^(L(_cFfd@PU@P z2(6BmH~g)4ukB+5+~nftCvBw$8^G^OHo?|k-?-+R+QDM#ya$s!K|eU;_*rnbVNF~1a9=_S`ylp3H1oLBY{qti}!i>@Y`+IqJOeOi`_ zChOxDVC3OUbmg~nN^$N!%NqfNK~RoH3pV?Xn#A$5&+gRi_^mW2KYm)Y3lqW{E16E5 zw49+fT4rhb+1v`F#gB`i`h>e-J9&b^P2IVD$aPZB#m~bx_E#5}%nFmZ1Xvf9;B0g9 z#!S_FT|c(uP4>gNz6$hc@V3&LnhRded8WsPrl&(UqjM${qLjUo`&2tugP1c`UJpfp zy*%bea^7U{qj7^W8(Oib>_J@cBltV#@pbhxG9t<-`QwGX$)|7QUM?Bv0`ll@$tZfP zpnB%hkR>m^QK1Myl3%j1jY3x&bdo6wVR^_~hAgLkt)2jgTtC-ZyNUP`$1nx9Z?N)&x<~7kSu%dgi6Ag<;RHK z8BIYh7RqMlb>L@9&xw9su)O+xgKsDSRe)S` z3Vs4Yr=5Y<8}+ed8Chp>`u7Ub zo!_SqsE$+b{07~ZdAm=XMn>{6`?wSsxnZ04L_1czf2k3e@26YEiudbQ{@^ zF1azBH+rz~vH2Mhj^Rqql~Dgtr*)AVEFaQ|b;0zWNfT2H8(L)1?{Uh@H)N+#tG9%( zg5j`8mBCNo7M0&SskD>*0v&XK=j`A1Pf8>sID#FcJ+xGmzz{C*!l3qnZ%V(XM>n=z7|{T(|>xM`TxPR6xa9T6$P3uEFzr z^RrPLwdFoV*(f+wkxUg}V--?=r^mC=zr5+NfEWkOG;Ee3`7|L<2C;tfe07=E-|391 z0N*7tJZ)XhH~i8@!PQKLedvI)ZMTv^Q83Bo-l%%NyU`>5JCEL zB94BdqZ!#vrI`$!?%lj_zf$YXn5@##6ClRK^S>SX?1BYi zL(YSWhucxkH#S(>>4H%#o$+II2xB`)-9-@wTqVG_ZpVOLnr6N0-Xd$9cIohZ4;vNg z!9mhDU&tn(i)baw>uX1t6GcCU@=ZohloNapj?p_fOzNK(mz!Lj9B5bO4}NAWwZ~l) zgVhA+ZRurv*r+&KXu$mNPo(oHbI00G-vr5cNk2lBfHI zdV>u;NsT`}YQBZ_i>gO7%(R}xYjh;Cu~>uA)aIi{q?e+=(6eCEJ4r2dG(P+W8CP<{ zRYEeOYD7L`kQQ0&N1NTzCwPtq24m+|R1P3aQ#7jjwXykS=1q< z9J6SB0n2K&V`PiGDQIwDw7`5+6r!vun(5no7`38-n4_A^5qguEQodw?`N@(22h3UK zLPMB)3HX$vPm>q|+1{QhzFi~T3!pYznDB#s(~TGzM?x}Jz=)htefoHp8W|o%X|5+8 z5BC#KK~StsPWTatvcuiT(f7(?MT!EADPi<7Pr`WQ2I7QNl4=xUTu>Ls3eGF1U$3%vV=lDRQV#f-x(Q> zJE|~|c$(qdm_~WM%D$hp*TK%r$X;V2%Nx}MQ7?`3)c27PG9q<41`|AsQlC%kAF4qt zptKs2k3i>A@vu(W+Cwdq)fq}X+`eaCUr39pm#wLaiLm{d^s z3W4^j?KGr~Hy8E{W&!=YS57+-@c_9HnkH&$Pja(5Q2`BWhdI`i*7{Jdv^+L$iE+^@ zIwZS0vgyh3?jXCrM^jYjTfD;2W%o2AOMP2`QqN>zy~=!&q=%78I{?ZB;jOKzb0F{A z)0opj`Q~giGA^=H5UVKd)UqhN2%*r&ljL_Kt7wcBCi&U$RP;Y~tYkrgg9`lo+W~YP zEwGUo;~j(^bvV5|I)=L7SxIy19?3t|`7HhB?v4^>w6F_eH7fbzh`GsF7L zOciwqPqn`b=U$K!HoX9DhBmC%O14Qwj~P}sDDBtcEUVT)zO#h5XkpESR{zmAkl7}C zTO*xD$=Em+n?|8{5c8e4+YaU|F)5f@plAG84iNr+m}u z7&^dV^7oCGkvle09#1CJBm7jKzo{vV3Vk@`M%y>x;i^T14z^@M7{ipSP(^t8p0+E& zMKL$IWCo#f=KL64b7PjGPY`T7lN`r1xDt!_?rZ+SMeXdZODYi2#ftOJJ9MRz-QmWFb}y4{H@sHg6CRjPhr zOvlLmo$<{Q7ax?Yx0ZTx0)1zcrIS4E9_w8%wv%wl(D{~zqFI0jx4-QicSaroFKGLL z+#yr1cPPh=_ILTD;6$tXyL@WrjNE8&P1N>jw5frr*4j4r8@WxYs9-8ovJJ+!ZB=fQ zdCYb=_l?r1>#2;^wH&lgc2E-|OW-5bjwi8^>pL~uP6Kq%L11z4i7?H=&;xw{F+k40 zYJ}Z5p#wFLk?x4mKC0WawZTds7Vli4Wl|Ov+Q?6CYUkz4Mgs$qk}vfwgR-+BZS=|b zDq`W&^whLg?utp1O5KmLHcErC6I37coiygBkFh4PqLp&XB^Fffr@`&*->5qg)h0i0 zt(NzL(t`@2$@}_jCl)6(LdWgZ6HK?{3Gj_zwsa_H;RExbkZ@=z$A-p#Cb{E}SN^+u={?oRQZh^JXrHATCceh`EsBuFKO3>!E zqx77Syr4?KzIt9kvP1X$E~id_eQt{!%adD+Jo%2d4Pi zT$>-Lk-LrMWALJ$A}JP2(^0Bm=fnJiQ_FcJdC>2XDfRL%{!zK-Tn_HdrQB8aG#=SO zYS5@)^vfOnm@IyDW?~Yh+~Iw~p_Co#9(^sSbY%jF*jQ8~t)m-{0X4_pL@^f${u;x#=RmSq(I z_{P*fj%Cr7jt_W|_6ACPA z14e>;1M290Qr-+ZhBjZ#h59<=_T~pow*+cKy^_JA3L!y+ZPRnu-7{*l|aV|6?7$~@+@l>Vcv^>$G*jf_XYN3xZ2(d3VMH@ zZ=O~6zM{0hv@n_+4em^9+1XT#Ov-XShP#atx72;--&Xq86%y01g9-#|h{~xr(AqcTu95R} zGHrn3GT%-2nk?cj_H>)Uwcd%@d&q$*Rx?_r)L>*zETc_+!d<cU>K}}OvOtzHxjR2tx0FPP9qp_f>SjG%&n?XF}hs{25;Mc+0E zhpoNapL!m2|8oVBy$8YjoSGm*Hgb@!slZ0jdLR{97;W#UFzRjYLalTDplC3YDJ3Vr z+sCpj8xPR$(zY9f;lsZO9sM&Y79-c&`gCwbZ(9?iZ!W$|)f^--DlM=Fm(~5pnZO45 zq0zg^VjeR<19PxNpvCg~#<@0f@m)+lEoCP=JLqGzS~~1z?0{^s%^iJQUqA42OC!`x zjN5JhqIWDx)PuR>Uu|;0Xv(b1fBmq6)3A}7WSKkG@kWCeb!K-$K{t$a+Cfaw%89 z(NS^0iyu#Dw1Ao@z6XyiE$=c~%3Mwwc(2fvq2&fZ1&tQ3fFX-~0>KzHLkg1UX?JnW zM&ucx5G-?}#6&I8B2b#(IvuTxO6U-}g*^O9y@N^;r3GB8KtH+LlSMA`0iuOjijPEj zhoFTpLc2@E5wf3=I${Bn&b2!^co$i+FHQ?06j0@oADY~ZZq|#3PDo9Epy_`5hBvwW zD6V#AwLRoQs4O3cr;#XHyjr1Zo!<&`_OxTRoskUYB<1C8rCpuU`g5Wz$RgTLZ*22& z?MoQTjslerX7>WYZ_F4!x1OZYh(+TP<)$xC&KQq zy?O75$gB8{dHzQyHU!Z2&^)~QU>oO?j`g(eE7qPUIOr0g)AySMD_YOebvN`IhaJTO z+wpr;sbT>Wx723_%qPJ79}D8diaF>zA+u|3W>6$BmoGZph$ZE*kv!(zRe`6KMQ?R3 z69^c2+}W=|U=k%a?|vYZ+OuRY{B5E|gO*ZQ~79_|I^O?tw?WLMqf z8we}egU9a6mB7aq-jQz434I`GH#WHo<0;xI8qa$uO+uX;)hBG^^SJbn1I*fbNA-=x zPP_Nd`$$&36BG=Uyi<>g^hHKPF2hgoLOe#g^F^{vW@&em1qK;a+o4&@Hx8GPubh-= zNlA8YM($r(l5>e1JO|6w@AibeHSOgcib~P)H!~^7L12blo6jTNzGkx+ZnUn5S5$%A zT*=Ga;#O9moxUxQiY$*cp#|VOwe2Auik(kk$KXN;`M2cxXVKe_p=E>RTRF8$%`kb!#OVeX-8l2O- z63#2j!>fW#k(>>aB$L{e-lH9xWcY8Q9h0s^8+m-$VwH-La%4a%GwamMi-`g~6V^Tv6#eb>}e(%I^<-L-s7Z=fMa%&TEnOYMx)?N)9+ivKP}J2lAagr||8N zsCSn&)7CMsFGn9oPWI{(Xb=~{9!}syqL;2_>U2IGEJ}<1>SaEK*W#64^ev##r=JL~ z1EaaH6+Ij>o2vgNctMy(@nf0%UR2AFj&`jiVmD~l9O&Q;C-sF!a`a{ptjhHD#a>Y`ok~8KNkvL8fIjsr`r4mtki<9jFIs$1d!-UGlmyG388kb20|P6L z`M_f&`XF@Hi@u$vL+B{6>htvLA4kny2WzKwTC30LAguUA2A0%x?-YNg>;z2PXmD<) zntVTur?01)vey)-Eva0o=jpa-N8vwcX4H4fd?IWrv-m2f{bISPeCsu0;eJSLmiWCAYpyia1@m6@4Ph8nwQ&n<~1eFv&(wxJ$In zQ+5eC(F~u66$d@v=4GDk^`7p8b{9E6r~4*f>k+oy24(t@h=sY)E5hgZse2RYn(5!t z=W<&_O8gragVLX29yWPiZSGGM@Q|yo1K0`Sf)nazBGqSv(k6!xFc^r(7ke`${Vd`)asMKYoewGp5%C2 z-cPUJJG<0Di~J2Ot{r#`*@Hgig3)XKt<*DjvJ;x79Zn6ErC^NmHFGEaksI0Sr1I0X z!w+hAYL2$Qfmf-CR(!ua$OGgVdIHde=hY@pw=&c}uU|GF#!F;~^&g&)*~r&0;T zwlA4MKO^&c>!OX~Xz71P9i+AnaNGL1KnB@Mia6B!wLgdWsmMcp0fbzWdiyKt@@wL; z8ZPqFqG?yGNpbr@E`BNk1=xRvX8{#1AB(cAOy710@MZpa+8uHMRo-s5cSQ#se+sIH z3|nj&T)peurT?iD9x}|4H_iJ-3skln2Fv>FP?YcEB7Y_rI%Mds#UFGZ6xDwM z#T}|RnGVX9VazUmiMUZWo0Xggp*VVWa`%VgsLsS;WkHn59^c@gu;?6V&g>@)@%sU_#kZA#myU*oPA~gRQCI@76JO7!r8O_75)1SV!hm7r+6P+^x zRVA%IpF3c51mtka+-W>b={!3qbI_WT2{n9sroBl&O|}=R(ULeLn+nZBb8nO6k#!G> zIZvLM?V!`q{Ih{}2^Iu6eQRy7RnHyBo_In#sE~-%>XBr1b2R!^8ou?1YX?1znU**p zs206FQHUS^$_JdxiExQA=VT7h&eel`+5)sQS8m5lZLx%XKu`B}qq9~uWy`k727T(3b{i&>a zxh%J!*?om)EpE@0EWB)v)HnNFysl62eJn;Z%I~~{j+UU)JE?~S6Kn}$qy3oC6#4Tp z^4ZNtqp_IEKRX}Qvs4CW-}wz&eAtbkb-y66KOegsu6CHw+^?%2irv*FiK;S=rmtJ> z&lfnG49B(EgxRJXnSS0VBpa;*-)55O?VjqOi5pXnT}-#K(5VIYk}00svl=|5`x?a_S{C3RunfNxX=SDPK>6^PeKmc$`oBJN9|WHM^F*P;c^4t8vXJZ5R5 zqB3P-s4_|9C*)bT0NXUzX#u2zwX6=XO#%hj4+s`mJ^@rW8JC*#8}I~VQ02`-fwVk} zC&~ue9Hr`Uu3Dnlp!g1ESTb>%03BaQ5Hh-O({4Y_Y3-m z0wek81f%IYE;V)ZKtcyvh7;_}G8jE3YDLK?nz8a#(3}J|FP0d5UYML*Nmt6am{63K zHlaV22^z+R5kx7OxhAd*vV;Xz{*HRaHqM21S%Ei`#lEIFPgozBtq}$BNE9V2V97X_ zQYRg&z-QEgln@Hner1WgT5vlu?Pe=jEd|0#3XM^^M9vhaPq55G7AJED;ajaJY5PUI zdFjuG+J}4?h6+OCXWkwBXY+ z7_BI_w8edNlsn$h#n0>J-_fEyT=2$Ytj|Mv%s;4++WtypW8Z5=;yoh{GW&(LIaHG4 z&K<+3d0+gX3+PV?Xa9^j{tTk=vp{Dj2^(9|qGm_q)VxuZ_c4@?@gqJIC}v~w^g=Hi zldQF+9|_&k(ehbxjA%neLuvt>XYDNyl>nhn6+<#27CaQUNZV8{My2=o*mQFH^Tzg^ z$q8gW7z%jx=$|JChkUs9Xlz2Q2rn@#Vcqvf6}I-#_^hkxT+=8@thlE06m#g1hecHs z)f*R8P*hKhf~~Yh-o#{xY^j~mfp1HsgXNCJ zUJ}=j8}X3`X^!9t=_b|U?`5Bxu zCuZaNsbBz=Pxtzg%rhY z1{oK?mgFK>A_)?&Nw#l%6BO<~SQku)M9@bi7Mv26)5yVPisghv{iMHYQ?M~Q*{bLA z<<|R?iKgGMTK1Yn=$V)6qdYjuxd!u#nw?`IG^c}Q@ zW=E-n>a~4>3U6|$PX6=d{wBlky!S+9x^Iu7f93+)WSFvgTW>?!g~*whZ*YuFZW!z~ z!ZHOz+4`SB&NjIm?M_dVKckLpa`w9G+xBy;j4B_8m;;`eowB1+NlHEKkkzOp0XvlW zD7pTjaZyZKBHu-)Nav9p!5tGc%G?=E2_y=8h#yg(w>XLcJl<7@LLcjMNMD~rj z^CoWaa-PocU2N|EwjU!6gE>% zXg8KpyAufPNxr5Wor$i}sa5cbRh0H&^XaK{6*b*cy4M;o>nRYpl}zmu1fDgNzMWWL z79;4PxYkzm9e9?musZrcxy1(3gjwH*lfMku(i(b^PefJyaNZxinySx5{qrTmruqR{ z$>cQ=H_E^_0sflY(4b83EBfrG^JI%S=xbsr zqd59jQ%QHUh%4uHC+q3O6HX?7fVlqXmF_TS_EWG{0_*hF(%Q|q_c1gWx+^C9136vl zYkqBo4*4LdNO33O&*bWx3|m5fMwK73+_e~zt8=AF97cuE^)FpYS^9VSQkw0% zSW@cipV!@3cT)?2x5IzFquA83yu(lEFwadN=Skl-UlE_DWt%L{Ny)u%tl~|UKV6YG zIs1r`NTIUSa{l->kV#k<{qlEJj3F7+)(IWH>B&Vz(c<3@s@7Lb54ir=4hrD!<)PW< zyuaJ$F_X9D6FvQ%%Fm?r=#=u7#NKYWv+*>-j`_Q;6+K497)0*ctN9*lK|`CQ3?y=HXW z-rMDU)DA!0B>(xY)5vW?_L9dLM?=itzOSn<3XcKSxZw9R8vcsvA4a4O7ovF>E9_)lNaa-2R|lCb zP0{pu3fv6;P8QVE|4bu%$kmrfA@H{2S*$GPyrX|6M>%At1_m?B^@N4d7FE=|A`-C& zf)AK8J{2H73+>M+h=+WCl&F08(AdVJ`K&l1h4xjgJ|i{Jr=?*JeuD0R+?`Bdxt#0q zgNiFwQ=6!(8NdHL0XkG)p(*hCHwU%ioctB(&I5Wt{rPzPkg;#-pn)nbe{|Y5Wx6Cw z&d?V4*0r7B(sC4d==L4D`k{X237s!xTv0g^d&+QGrO@gq-8DpV)3LX_sDPaDM{$E* zP3;FgL!d(y?AQXgJ3YUuL}=hRPGovrW9X?Vlh=)*XNWSHcnm!tA9(LmvLRRp@GZ%m zHZVYS;=<9KAUFDv%UHPtSClqyP9|_dbILia2=^!_HO^aikZ*FP6SW{(k)o9rc541@ z`PmI#ZvNS~XW%n=+>YvMO-{^Lu-h^@myC+L;GW4iXY9t&z|VbnFcFJ4%N){YD>1Kc zFtVjZ6649GxY0pe!VQ@zau^sMt69mxlLO=RUK2C(<`waofe-1@%#uE$^vNU9z4?=m z)DD%v(mF;h!FEhz{h%4>&++D;3bzpaJkgr~>p$Ak7qs3>WOz|^%4q~P=}*GY~D-w;RoKC(wT|)6c%CBdr>m+uHm)Oyk0JpGEGatb3RKw z6->+f(I=}cD%u@r=3K*#0@^DdPe;^liyPYUWeS`aM}d!On>~1QVaH%UqCf}`op_ zEEICE8goLgSm5!P*R7KqoTb)8N%UUW5~?hq#KscTnbsEBVp2cbwzcRoPJeRFh}OtO zU?iB$TYDn4&f+Xu0p?j2&X zJ+BGIv3rkmeVR`1WuhnLouS=LfQmNy7Qy~4{c*7VIt+3x=f?qhgOSL>F}^L>ywflOOUxz!ogw4OJBYIjG?P&ClBRq(``+r0FlV2hy;ud{Z< zCM7>bu)C45rTI>iF0gC2G@f0%yV;S;@=D2hPKoup?>-)lMiO7;O(eA zy{v>L{}FBFQgNy$@?7X1wYkyxY~c_Fz(14oZZfhE*j;t7?lYbaGUX98Sh^EQ#xJMUG=!RuF#_?$z1PSU7|;1mN^+k zNSJMCz91fVSs>8chc=M)PiA?SgsmSHK?c3tX>J^rPUn=p(kln0Cw;m$55tljkjzm$ zDUjCR;%n|fX7|N}!nZ?ObWyC!*MF3s6=KimMuj}D&X8}EPF)@HvtlhMVSVTYA9FS% z{%MOD9Y1Z6g(#Lve)_H~+}~Ps!1+)?Q>0T<@c2yVv4T8^rTR zd4AN~zJZwGQfZ2Hg&giFWj@1!8JAD13;C4@e2JvwH>}cen`aLJUjZJi!JhoR9yXuN zOwXuw?vDJfitiH`1+NwCw&%+;#L^u&xe}WFM^vlM=4m0>2`n%hz)tg`1Dk<9Q{f{wp zvMvgiV{w@)&^KPSc^6Wr-(%<%rCF-b3G9ttFd?-b161W_0#eaI^QQ`agOkOAYCY7W zrrBH1SCXe!s&o}uw*rP+bv=A#CGFxlN6p0~BKM=!n9l*Ba*WpY z>+d;dnWN4WvBX^SJT78d=DRDe?(wYEQwI}V5X?a)XjMXNZc80?$F(fnf>ko#7W3pg zU=EgxiiAg5RPsA`%Ea?l%il!c(Loi=QAv3FYe97w6_oTz_<6`)QQ|hkZNgGLML+UY zmEN6-S<@E4;GKGzu;o?@4*NG0*}g574~>aeI-aIn7A}%hUVIvp9vK;J$-$%eVwt&( zTu4q;@EC;3TJO@hEaa^`nUwDIgC!TsvkpX{Khv?UnIl|UexvVJRq~N`ibZV- z$j7Q(EKd-DN61tamRpDLmzJS)5Gts?HvV=144gY_Y6SyTxTJ>Pkd{%+?t9QEzKU&L zltj)GH#=9EWJ$27Oh7;R*bez9SGFLysI!k0eG9?RGpI9qWldxW0)0@KHMj&La(XM~ zp<}KYpr3>le~_c*ahweso-^q?C-Os&!J>>j7(EB9qC6^XpagP7Ra6{JJg=CzPLHlE zRayqhYXA=*^;nzKbwqnrw913x)7KGun5Tem$|92`P zYo35y_(x!bmUc1t5u&x1Mm8!%F^=X^9R27>21cf_&kjzWua5rB_IGrl zE%d;u*yC5Al{mRzA&{e7@iaCHKB20(*|U(vu~=f`1NKFwB5X-%pL|tk8T+(QXol+U zm6mubU~t(7xI7Kl(nO;AOnVmYyY|HPeOe$Z7hw<{p9;R$DCW9xnlFQdpVGa6L7&3^ zP{F{bp%#RuDD2gw;@L4iDH^X*?<4j$cA6+Y1=mgg$`2@Iugp#v2m zpZ4nhTSYnz>VA88P-2?fTWX`UDoiOYKwqyLA{-PpPMfdi0vZSX zWkdkKZUb)Ie6%f8imeD*(nghUI52J_Z&1z&_5XzgO#(f8WQZqB_` zfdW%ITxIA%@DF(wAAWA$^o7wHX(#ZCwYT3BjDOgzh`(pMQFwvejYVT! z-&jW_{f+D^rRBe_>f+-|VO`Bd1cOqDHFWr*TXY3#D{^?M#6fy*!?jbXEXFmsW|yb+ zX;*OE)btJ^bNo7WmB{(yrtvPN6EpFj@CNZD-pcA5qsPinN))}xdp5J_53798dr(9x2Qqx2pG9Wt{oDxxce>Yg_i zTO$~Siu^TYt8y3h)1Dn+>{$hhswAM-a%{+oCMv-fOClEM1}jUq&8Iw0&ZK#fr$H@<)~)EDiR?ESxfJsbh<+s|_>WjkNy`AmzF`9~@Fk7)eTyx+1m)xFc7@c)~PGuX&)g3=L33?vP#9M=g$ z*<8`@wD+kMbRa7>2MUZY@DwH zdbVQ(D3Yu0>xwmAsIuzoDhG?Xbi6dl_Rc;a;}Kb=5H_VlQ8WSdb-E#tah~L$S(>+> zb;^dsz1aeSJ`|6P%yZy%N|5I~PkHe_Oy)U5IO!BNnfWwqmO?15tgli#5AZe1&+u{rr9Y7G@J)Ls4F`r_d&^EoFTjC@eW26 za&7^I(EBAVrQCct$oy6^ZaMR)r12y3kVTYvqha|Jfi`MZ8IA@~pj6g5cMN${2EBX= zfvAGb!f2P^;!w$8MWejOC@R=^_2t=&6)osh6z@$L6;435BNpTovZSg3vraIAWKtV` z$f%Hfk4x%4Cb%}_&Ku3MC|O(^8q|U#r3p{H@JMqKl+lI#&T=KqT6hDaGnHa=8+h7M=$6OOQ*5Dk3WlCy z3&l+<2|)raOF+bb%CSsjJ;4H*A|X|&s-Ba}1Pd_zkkJ7&F^VHFlOKTX%=4|~29K%* zH{m=Fw#gUJKmjpz?ess>)uEzbp}BLb;GK|dX$M6?!OE6BnRy&QJ`YidJ+b z|CxpNkk4949I4BUTaJ<>?O|rqT$QUmqC=Wd#7Fzl>E0xD`BgB<<=ol|v<3b@NyDW>b$ShCXa`z(g`t1F2mZ8HEq>G@f$px)&f550fEJ4BU)E(L{ z+}83u3ZtmD@UE0&a7!)!)OI{76F)mK^wh>Tn8ogc4%&ZFl+YqMvmii;rP~RPX2>ha zTunnN$dvfc&{HHy-akJAC#&SzSqkiZ=H0`?dK9x%=~A&2q|MRODmvo|vX7)%cvIuC zX0mse(T`A3;w|5f3B|;w$>>=ih0^mCkF=dOr+(GB5 zUO2u+UpQp)kNM+V5bhMDj#bzO&G;S}b#ifXm)Z6$b8Q9KoK%9)%V?B)e%W<%5w z0xkGEl>k@q6gv%8g!bKOX9F_K5-E}6v89DOtx9b25~w_i(l9G4IWw-K6m(yFsq)(n z^Ls!Akt>Gogo-jNDKsr(gQh~QY6#_*wnlc*h7r^u3`V6Pc!7c>tTbfXwNC?H)3&** z{V$7Bv@+Qer5tiJ(|s?KO(wyqdiU#AQF6-&B$xj}6+; z5g8%+p8icHz306B+GwQVjQxyollhWh-}`Np>fbJO8>J@^X2VAXoeppd@C`JYv$1E# z$n++nj2*muqtWi$FN=)IBG)WFyp&6|%+1pct^BRITWyrw;&Dx5D7jqQi$;{2q6KnN zC~h*Hq{|*EAC%7G;{e+%Z*XM8T=q&+{v|&_TX-97|jL)o*vu57eSvHw3{45^P zL4zPd)r`m>)6HMrPsca<_Lpi^nCeM+9xOP{1R4k+cD3tdMz<%tp-~ndJrcZ3;#qnU zfEP?s{c91d4~w1n(1zVMDQ1sJ8>lu43{X$VmQ8NKef|kRu*u}pQT9DvvwY0KjbYu% zRyTRlQ-^9P3pP4vrI@e(K`H&3Mc6Dr1AB#eqv1zwQUx*{r4g(gI?0slgZ0a_VTUfCcja#E!4Wa1d6m$od@(41g5iq93anV3M7LccgirKsGJUT zzP^@iPcW1`Bdct)@iNw+PY>JEX%2f@ zi?i@bq3dhe0k}6B`FNJ?k8NbSIQ~ZzGD^+lb#{`OZIr!yr#FV#>5fOyc2W{Xx~n)Av~DVA+msC*L53tH_X;xcv2A;AJCO~IWXD!16d%lvozu~B zuB!i&W9onEa}?~Pw4b&?KBVWC_T&u%!ZORr<+f3tMFGPrHLyk1ouKZJqtmOnq+2MI zv!W1$?9E~DBNqfp38D)r8Apuj~gi3Ds(TraDoLl`(CU$fl+qa#7hEXuVOrAql|LMujKk|Bljg#9?|GZq58BU%y zLxmR;#~)79-;YPmFCs}QwvVc$GccQ%^&u|R`_ZUJsCMZP~^xJ00zrpa|~k48gBBm|TN=9BmVLrpla zQx5`R)C$I$I&CV|WYFS9g7OK?w^0(5D|D6}ko$p<@)G-bW(bdog5}zogHk0318(8f zQ9eaJGdEC_&j&&+P-_x7k<|UJexsD2(n>%VvvfxN+n*+4iS3}@)Ns_sO~~i`pNpbT z)%~3Ippkp&c|_87!gBu6;Z2It683X{uHQ*MO7!G6o;4-3rA5y0WryD}GCOO#5~65g zbO5FNOt#?iK}%q-s-~qMat=aN*8+3HTxt9WBj{hs?Td0=yDPZZd#{KkLWG<%d{#D)f^%CTo+Y_z`;V?z|D39A$;9CaQz{qiY^kJ4d5=tlKJXsL(u` zFULVE@7sVMR*%=&{If4AO42#& zrWpgjMY+a0J4MGZ)$a7uuJwW+2^!rgKCh0h*H3v=?J2|r8VR&AF#5fc&;H10mDUtA zdX#e(D>;g8Fbb*+ubk?r-~qzydq7RJB;Uc1j|Rpi{7PjzZ*DZxoAd!&t)js#M;!yp zgx}VT{i3Pu+$2=~%8t_79L^7SHfl#_!k{RfQB-D0#=mW`gd2z4`9~Qml{45_SP?X) zQ)8x2Rc$0VP8@rRl3+edMZ@_C(kva{O7yB@mLm$yO7~u>Ngo-1atf4s^0Bm?9y{u7 z1$(cBq=i`g-~o8m0$w)JuB8_;e*)b3utsCKJp-@^-$?E zK=Y(gKRSv|6tUzBlAG)Udt|`9REf+8mr8d!4~$aS8}+Q%OdjZU+kXvBE4ZE@^88s2 zj`kphu943ar^dg*%1sifep67QL{H78;Qah~AT+VQ?BbX}umfe*QAsVKZKczXT0v1I zIss;b$fXlSs{&fXOgRb{F?VR=O{U+BV|}!oGF1KaPw8+!FY7l*rkXj=(2uo(JE#-n z=a5Mb+yd%B%iqAm?3C%z@SF&k8zq@%Wp4`GM@~-GwzJthupCY?R(P4RU>~tu)Bz(| z<#1IcCoXdW?U63D%0f^04fTSyqiFp>QB(_ystL`bN3mve0!YT~S8Jn#YeE0Bw^zXt zwV)u|^;_8ej9&{Wnk##m5`{gnRMdxDqs4iWJ#I43Gn5ELgM`TTiqy;GlW-l2=HRec zbYlVYD}q^)l7F;J1)yX>7{9hB4+3-VPD&9Gz`bnXD0qd;{X{B{z!iZ$r zq`3-ylu2gFIboi7U!>tpUMi_o) zEu0uzce>~}hNYovBJh)1{g`o;Os}a{EB+($qFc~BhV}NLaH>(>#*cJIM_UIqW(s7F z!Eao*v%o>=k?Vv=^z%&c1f1R|MN%5R!v}laj0=)iie*p(8adAm!P5MBCD<2^GS2K? zI^^UrqM*$x(n9>(37;<7AifPctnAVWMHPy*=blxH(o?MlQF~CR4c$>V7Dg0p-foak zekLdR)_gE2&~7;amN!a|zFNgr8JXJMVBQ*oALv++U!Z}Jy9nIPlpMXfmf_2o{kc!% zh-T^es3vhv(pS{&otWy7qZyLg{nwHIqvYvT(o-tav=2HdidMzVoubh*oC=+0u=|6` z;TiR_WBJK{wb4M6FEv3}=!05SCU{nlA|DkCF$Oa2yHYWGz4ObAjHWhv-Je%S`Hi2% zHb|~r$csJ~aK9eD9^Wa74w;sg=+w7x{n_9@|vASai+v#D$_zqPM_1c&YU z8ILXe0Klgo<*i^H^j+@%6WW>=Td4`v=Ra{1G9>Swp1Ya3IHI}qdMlgZc%yASZ9AV> z4jX;UMo;ZC2#uTu^2y@5(Z~8No^l2nEH<<8pnP)a%p(^^pBr-S11zrfC-vlBz1kMM zP02gY#vv1UdqoK@b4y^Xq>h?J$-zL~&eE}n^g#ad6^k1Ua(=G;`NTOhlsxWpaWzRO zl!5+>MIbY{lF#RvnUTk{hvp13@1R@8oMkvz33bbWjKDl)Le&{5p@(<|R-i#NqMTf$ zp}^odVI4@L<&|LlQk0h0Nj$vKz{YRx=4f(@h9u#pXb6c2X)UZ-k-#xhJA~CQ@*M5b z@-|awYs*{U<#Pcr^9`Xm0cpWK&0>dq`Bqx6TPyh;+G!=MDNeg+PvS5W4u1XBkiF+W}371A*I1IG~Y>quUVd<{}^#h%c40655Nk(~(M1yi*_EQi^V=Dg_ox zm4Fi@%f)xdZ}X*wi`tX1@1Ylbox=^*sPrIJ)eUUvN(WDB1p;WLz|i)J>a?$rMy@Lj zb5SUil5QXjR-w!EBrfij5$Nd&*M-Bv!~|3bO(jZInoh_PPRN9Oqh zG7VIoXk{j&YRWEtDDU_lLn-%TY91WgCS|x-sZjp(mXuvb%Jb<{+5+sUeK=kevRWQN zE*t$LG!QNF&ow#iy$1GnuKp;>&<5MVO(bMs0Uy;0{~Y{j&idZCn~Q3i|KyqFzHSf` zL;GRgiu&1TXg#aPu4-SkJD~PPGnIS7i8f2xv~Ia(yxD`dJ8o79*Z^}GF z^I>59smX@oL4%?$#82}tBXke5$N7DBW5@c+46=JqJ?qCPBSZr6f4{eSY`O)g&ec%AM?gH(`K zYR7w@KEBDVH#s$5$Wc3BuI$%o+rTza`1^#q@3em#()aUOTP!*3unC`c|6vP3T+6!_i=swCY=Q5@Y)(R2(gZ(Bu;x zF~Oa34NL0n%$9vr$Dj(bGr>V?MlQR#CO|{yaMt+7QXp{kr~VrX1=Tnn70`U-Z(_oY zR%b87GeiUpYp=CZoo5J5vJ_|fLNg}W8+IM44TZ5n(P(4Ur>ME&N9B+T@Hf zYkA$O!$+&;LTJOlTnT<|M;262XvS*uB~j?pCaCNt-ZE6GqlqfJ!3cjn}(NeR%;J&chXxN^Vop9~c+;ND0k$<>Q$)b3oskh*-X@Qj?j z0xl^*66#X_9Xy#u4Xm`45}tP`O2d){HchX@E-WU+LBBUGo1E~YLg!Ly*ulMg^iw0_ zj<5GZizwlyr$58iJl-HcKN7Z);V*CTCaKXdFIfIVDk?QBk$dqu&GiB+y5Hoa8}(^P zi_nSFzNfd<#v0zl^cKNby$?qp2r2uIPyN*BX;Ni!f4?3G+pV>W`hZu-y=Sh>&tZ#^ z_8GddlFveZ+jF>sfn~ydZJD$A+>BSkge#-X*lXgxe8lX2XUuL9(Xa9eKx1U+drGdI z(BkOl6{3;LE%S-EdcNId_7okJiEt{axO%sg-JPM)_3=QvN*p5L$l@KWG{B=K414`t;>~^O<6HjY(=zup3|b@~hxfVfPP#LU*X4e@ zEWy^bD~n5Bgf>T?m^kd@aP%#(-g|R~7mQQKjY`Z9mE62fgBmTjr=3~_joQ$+lzP1- zd~Sc{HuZb`kB=U+I);*}O~cXjl{HOY^K~*`|E~nvX??eTIr0@aH+V9?w3VtqK=eCKR z^4pD8W@yL$Y-_%uuD*TRqP<+5m$dI&ZX?5`Uda)wsik?Dw7YA<0&L%l^SKRL6XaG1 z1^a0830A}3Mj9F{^}mt@)OUv2jW9-M5dYti{tx=p=~3_=Sy7>4GtP=OsMmQOlV5M0 z_EqlQ!cN`F{w1|5BbJASsSmbouFxvXv>1@VsM`}qM#f7#+ws9Mk`d8C$;5;+EUPMb z(XpLYbF>qRCkMUB(}Ty(6}M6Ifd5pRhL2v2mUL=fW~o#roZouO>kV$Yi#I>nZlvlZ zH&%ko>3b$K~7fH>%02<4hFc%<8w)F>B8=?3#Kb^48iQ`W4=OL1jZ-3KUgnbU| zYe{dF_1Q79b#lSA0qHW?VEBP^V<>4^NTFmQjQ4P=AO>?RbZCG>LYv7@f zU-P0*#Xp@-1Tcm!OIit7Z4!~jL1@a*)PgrbDTAlPVX z=?BH9-w?W+41-LPCuS%LLs61v(NPqmk-jh4HyI2weZwbhGKjQ71$qp+25uKT;0$~ZHKv(U!B5M{mE}|ZB!W4y&T>RH` zlDTEo;@AnHhhthQ&B5pd8px*|P8dpUQTg*}Qq&f*Ls|#wLC4~@bd)>dT8{?M79V9N zQPf7M{N-&Kw1X;MBDI&YW~0;5aJ{EnRAyAX)a`>l29SuCerVBT;Buo zHa^yaw&)5Mb^yg_B?|)GDVlyzd@F%v)W`+oz+`53ov2-CmkP|eiY8(Muv)hDjShP{ zhaXj8v|=8<&x_CC;YXzrFNS2%7E2*gJC*^NbIlzD-?Ahr5X9R2x(4qhdDM3$b6fKf zuG*w)PF>V!;+!PY3DhbJuJzEnspk0Mj|c06*v9hT^QKk#ULibByp0m76W?I#U>Ki=luq4!!JO9WRP>z&W!8@%sGuMwJ zSzA1LvE$R!>vyeBK53=+s3+zNkc`bjM2i_$VTwiz#4kJ><)-@~i<1LmjO`Qwx$;gq z_O(CJ>_t`H0LNvb{hW`8=4y@Nv$S~ugZ2u%c-wnRYbc%%*ti8uu)>OAgH1nj)-=&jAwg%=tC0C!KXb)AWR<;(o%;M`d@O)76T{nqa?@MH|;FG~E z%maqe(-nKN6jhM0f<}wTc$Lt`H;~OH<21LoHiY_G9Y5b)^(K2eJ1y{&Rc)g* zXa#o+iUuBf9f5(H-H-&-d5a{jQe4>nMRDGL%!E2C9Bim4+1FX4A%pqlmuu#AH&WCSyZ~)4_Rj|IQ9*1y4`(0wIRSP= zm$Ucw{FBr&@Mlab^;La=SIrI?2-Sw-2nZdTMEr;L|)V80_erop;gQ zy^f;~+9%Sr8cJ>G&hzRgocAUdrxMs)n4xQBMZM$Hm*%Ax5|L8#6;^~=f?&bFf=j|1Mw=ok z0hfe!Y*1}-4~WL)x)hUmM#QC1a@bK6BRAIP>D1iT89%zYJM~H#pBPu0-24m|{!#Xt zK5y*iw!8R`xOv4vvcsi3FO#5gbK(DobtK$3SP3*1u+18JOK5BPaq~^`U}W6*S_i(u zlj?+5G7AotW}$QcS@delne}>XSye7)%is9GMn=rC9|=m;sOr544(&Gmq?zRGZ3>ew zq+nC1HgtuSK)7fKP+_a^wPU)(^u(Mt+ZCATLvgJlM-n9vR+@jy zE93 zffl@x(B@V*iBshXadg|_qclzb_8WhBlR*rwO`(}tPR$u zbcf+BG4Xd}Hu~SGk%cFfCJjBXFJCoJCbf7uC}{>BqOx2{T;o0LkR7Dypr2=$M)qAd zGBr76-zs;BsqE~xE@Yt>fBa=T@KrjS-<7ndV#&m-LuChVU&?gzie)Ic=vZD`eauePEKXn@|7I`-jNgO}2C%NN+9_@G9$YUsO?nW~uu!nsg^-S1IG4 z#Ts!(Ps^A^T}fALi^i-iFS7}wE zdk9xc03QUTsHwX>+n2njczEU`wg}BE!gedC9KwHn!BrG_A5fq zG&UKX!3H!CqNF?5Zo(|c7mU5?i++T|r;*d7bYC$oFJTn@%Ykqu-7mXa3Vh{^jMk@G z89j5S=j8a-B=e_!=n6u1UF#se9XuC)7o$Tpcmz=bJ;t&rI71}Ds9VORelj+1GNdXg zlTQiQr`X%{UZhJ-3_{G8^uzoiLe|CH&abZO{KOF9y;R8{`xs~ahKt{1uW96;{eOC0 zdu3jM(X8YvCk@i5#Y%~`Fud~YktuCf9B#F8uM;k;RU>_Ek%c{4Gaba@PBk^X`y6rY ztdd<)@aDsu2HzUk@nkkiZ;us)u2JYdNCb&UOk)h#fS~`S2j2N26`m4BsGUfjrwVys zsuWMBWtt@s&4{SBX#KS^T7QT=S>?Nr`Rb20ip; zOfl4bd(7cJ_>sGwsnQdb>6i4(*9zX-wIIN?k=?O?jxkSMqzYSbyDKGQTmjEM>@RzukmH7>~ZDd^MiDg*%lGDOq?O-Jr#m$|VAu{;UIGbB0 zt9=R2vGhN8X+cmy(` z2O4$YK+z@oZiVYW{7w~7-j1vYcw>(u87ycYIS43vBoh@}qTwCzD^~J5PV2yH6p=|? z!F`9wpn)7mqcO228Wf~X6d~?j{a#6gn~(IFCf`t{c=Tb;pp1eei8N|8@o-Qdk&$gcDvt^RjEW^A4t@iTLALMJLvbkA9K2!B$`{(4 zgGfNNr~B)7GhI7`FqOuhQdt{(EG*<-CA4EC6Ya3(o3-+?$GcmV;(~*++BGA{L2wg~ zL88>)5c?YyZZs-WbZR7&Aw@so;WznQPO1Dzi?AUYomfDT;71)>xA1aPl^tk*5?O7~ zXr+A9RBSR1)6#?*jbPtW6Sst!4Rpyx!kXjagkpK55?o=_3J)KXz6iw~fMrHx6rCfL)UtT* zPgUlc)IQkyYIt#C++-f|q@C+;*K2s+R{ia|32JZ6BI<2r6~NLG)`LD_-?E^iczIfv z7MjpfIwL(%YTW@u9nHuqXjw*H0j`=T8oU~|gp{W#lOpV?c6qi(okE|&N7SUAfJbKd zA?yrWUvh$zy`}I9Mo(2uCkMBTO0KAze5Q=AqHig9#i!&WHJG6EKwL9ciqB>#2Ty

1DAcY2o98)l8d2q{`HK#|qdoOdx&r1&V>QGaSQ6nIZl zM-r-5s(+hkFkp5*SzR7_M5Ws48IonO$v}e`8s*61O3Z|%a|q~?d_rBBaAvJN3Sd~K zSKgnRR0a~rRD1bD=ur?1{jS9_>O%FA(c6-K#2Ee1CB&>QKaHBiE0qq(3l*Ak176ETF;;0rJ0gD zx}SnTMoLa7oY;jRor4Nr?^G`4EdZ2uzTg5tWsX38DuO46mWPN?IG$9yohB4V7i)|K z(GL`)6)S#r2nA786k{zU;1+?;com8jRRn36s|fc7QfsBCOT}N6Dwt_F@bX>JXUs3o z6NDFz4$K1jesAG9020&nC&m^G@r{g~!9eM(seaT;r7l#wF0cDB*hLY~tP1&cmkRMj z$g{N6BB+e+6iW4NB;`r6Zh%(s3G}5VAMg?woh%W6*BZDfm+B|5kY{WuhzD2qyWNMj z@Y`}Lcun<)NmVG?pQ7Er4X#ScJuW0<*Tqi=9jb_oxS~o9Zg!O1@^|>lomFyH^cYGy zsU%jE=8czU*D9742WY1Pa8ITCh?cAFIp1=`uZ#E;5Kr`UEtYPWz`MN@qZzFwTW%@7 zkt5eYrGgKeo%NwOY-9wNU;2~f4dQA44J}->GtrQ8YzDz z`#6(%%p!C-!w+m)C8zc8yFrQQAEYIZ=(v3$;rqxRPe#C!Yy@Qr&f%`nTUy21cG>sf}I%q5^UDW4+F!7Zy+49J@g^AJWeGEK_l#KJLQ50d1yKP|j zo9w)VR_(ack*TH0$C5VqNIn@k^Y4AEDAHCQS5cePr{pRr#R$l78!&4-gXn#FGFk4+ zx%ql0XYTJf?)+_a&OiBEmms5XgZ4`Io|lA9mr)|QPRZ5f$4T{17hyW>h(5drypg<;hXEKCf`_`rfdv_T)*u5P&$V^wIqPmM5jTZF%vQTH5tDm%EyW8!h zaaH09odj-Ac}MjHnVMhUk7%&!)tUo-)e!`;^4+YWQA>+U_>C5BN05ffhfU9N$K)}b zezoWJg!JroNNLYZs$lVXf0|2f)7245vXUEua#W!ghS^?QI{F5q;ZodCD%Z90U(hAt zp91>01yCRQ)pKZQu0=_D5Cb!}EA#i@?O!%ePal|Ilc{*%Qxv?eu{Zrbth8}k=~thN zTI6CPv5A(i>u>$rXeGC&blOs~?w*g%C0Tb~0<9~{ zbiw3NZpd9wlE<{CN^&t>Egsh0qHIGc4V=2*q8?(%fe9 zi(d8k8FI3lWau@DDVMi>R2N?7E1C(d-s(g zRQ_c#i;GRlgMNYrR%k9^T^pBimKBi&CGyV8Qs!5orTNEprAZO_|QopG`QI@yybUN^t&^acx`? ziz@J&{#~Y}_q%u}p}rk5)!I`JK5acX^-6P1ovd*A?vsZ|AKy-k4@4xt6}f{;8d#~$ zwVP0dzO7j%D1NIhGH4)*n}Nb@RPwq@hUV-_Qt~bl!-(S)p5~EsEg>os2f^-O6Wc@ zq><%*Zv;p?%-t6O>!P_;ABI6CTn+c^B6lF&tGJ*S3YctB{GHoH=SNz3{Tq2Y*Z(PV_>~LSpSsJfH3+7Z{jN_aG;mJU zMHjXic^DZRfBM!h#ihKRuibM|qr3y&vIhI&e8O&8S4%1nyJsP}^(FUHt{kl1Y_b0B zyOc@O?|>_1+0cPQU3EPt)a2@4jl%5O^FJpyDj%`t6n*O@&FtV)1Jgu2*jgty#c!>4 zyxWJ0qm3Gf;DL2#RdaM8esrzRG^!xP<4PG5b!osBQOTg2+~c>_9`KzsklsegZ*e5g zcUk!gHw`?l(`7`X+Lq*$1AIlR!eP^fo75+fgNEm^yOYRL%^cs4u)4t?YgqDuF{_>fL`$l962ip`m1x zPTh6!`fgQJi17VPlA|T1LkC9sJL)WD1oC9E5L)0Zw8WbG1yp*Xu3O+TRR(?jqTpbu z`MuMQAbio{he-;;u_n)BP=(@qrfUyK!C7gM&-k&9Rj{5^l|Dw4kakeRR zEo5mq?~kac;!bI;Qcqm$llD}HB z{hvT+A7uMZ`)R@fX?rFF;I5pK(uNbIRv(!0zpUlgNnM=580y!P{XXq9)K#f|m;Oe* zg!{_HP`97C=WCYmYMtb;sfHiA!N*UlM(At!}pM^OI|Rld*XF zeKW<8n6$miq7ag?4o$(uusqYkkU~!V&`z3Ylw4u75)j1X;DiNhP@L zZhccbZZh6sCHjZS*Zl}s9FeH zlI}&Hp>VO2^bHxh$#@^08ts({cOXS+6Hf#oH)8=cCgGvkj#2zjJOWIe=4&9OyP{(f ziYNk!dOnbAQ79G!wR<35t;wj27SuXv!40ej$@ybJJmdzlTlft12ZH$~T{RT;UwP@k zHtH4JTrh?rX0zO|u?H*;GJ5u*=o$%j^r(0-T5dM5jrzmFZx;DY#?$cf&6V{ZAbT`{ zauaxMwD_~gJ{WC|zV+@-6td&-JKDkAGqWo#QuZIIZ(UJB>%=0xO;~lF|`}gY* zIghKO-}w8=mKnqg{B~_@8^s=P*U8t=a$lE!eCanC&xKq4`O!Iv?e-(;=ikU3uhg#@ z_@HQrgo9J?aMwZ{{TrFLe+R377YV=M=l0{*p~XGD1<*@-vVbXyrzO z|M$u>fj7JTn{IWJ!P$C^PQ8w&3eV4cgVk&QSsuk(8u7^Phibj|=Z$EfoFMG`OgCcs9v_|M~bQVIf#ulGm&G!@?yDY|6HK_ zRPfC;bXtYLa(&2mSo4T_n@6PFRXlJ}a^s>9Rg;eMpC6%hlN7SDUXZ;>D01E8Nj$tD z;6XFzctR07(cJhSI(?`X6@V9S=FB$;t&R#6JCM1ka3AayG0@x@1xO9>%u0n64|~N6 zQ26IaF;i|1G((%$L=sJDSnl?2h)@hn$=oWKZ4{+rw|ETok_Vw4-?0=rr#v{l>MjAF zE*=lHR9erT_v{@_Kffs+GID%wRg9dGtg9vxpNj{t%)A&pbzv=}JQp~HHw)>6UunFYLR2!NaqPAVRupA^7BO4{cDxKse2C(N%K! zJBkR&l1Plna0FMBPXebC%@6Um^s$l(?YeL0`#0mb;hVe^5m3 zl}W5UcaH!&$ySp)B4Nt<*sKp3)X$@qO+_^N7Y+9pUE@BR$hJHzy8zI7?m6DIYfnr01-|t%@Lyri9E-Q(Dn1}>3UCG8BVmG z8-I$4?aV?IMM&#H25CY+L0t|RQM79=A^KART3924@gx7VA5p$#{>X&?sX^`kt>XVE z8U1g+!yci&_j+s0Q4kXPPqYVU3%`|ezm1wG=~hd#jr#>dX~9+GIPHzj_nZ2!H?jz3 zmy$Yja?hBcU^Me(cn5er!n|Oi*Z5mxOz16KM9}XWNz>WczqyJ;Kluw8r%>+a?POd?%VW`xPXwn;#zD~eDn<`a53e7I;%VTV z>x+yV$(ioYRZ@ZxLJzFS;;3>C@)Udn7;UmA2goG3C6^Ni$sx(}fsah=JK^P38--X< z!dnAHBV8g@&s0~qCobKMN-QwBq&DR7@wwmzVv%dUy`Ib4-(Roh67lr0jZnDbSvu0M zm^v3cWG#Kf*T|uIt=#l^?V)&0V0lHqdh2vQPfKi93H6kY`AHZ5gu=nfGIK6MJuzzG z#6uKi{%t#7Yd zMt3ju^K#3`=~nu5Xhl7jraarj91ARB%3F7qo(|Q1qmFN~r$v!YKf*XspT^A~`t=yu zWY4imf{rSvo{hdWDyn)yoc3|HF|w;avp=)a>^Cnioe7qw0KKETa@9^e1L^p)*@?Mt;<{%e&`4nu8Wm_q2JF zZa#ExtrDT#+Y;!8v)u%@Be*QE2@@v=ZEgtV8D&K@a`n`m_}?e$M&PlxbZW?Df_W!?45 z=*_|Db*_|ID60UTQnm!$sTOm+!n(RPLgo658D}lfLyFm~>ODpr^7L z!5z``w@Pi^SCAX^BVuGms~7e3(OHVG#ZGLjWLRV--Q`bzZe%Qv+MRqowm@H>CEcRl zeWArscZU8<7kak%q<^E9Z?bbwAzqU`wM%>oT&-!!Q#~ygt=A+}6rvQjDUH5G?0st$ zfpS6W);+v}8>D#?NGc;Dv^raAT)vweXN$Oz{>P^+xR6t_@A58$CST8V9_lHK;p>CZ zn`HKxSM@v{zObGSt*9rt9ntZbhR@oFBrVSaLCN9_?VdJ$RBF}D$2+K7>E`1dpSRIQ zhGWJ*k@Kye*2hiHIEP$0&C+n+-IyOb@A(;c3@F*DZ`8*cw^5G;*c+SToRUz_!ZYdS zZI}TZ=wmHZDUdcE6?(?S{!(|G)PzioCJfUU{c%zbw=b(JImzKH!%@Z1`;bxE}jp}#N)$V75 z3UHCw*4IVZ$l|F^BNxIW}+49lV`_X->`5-hKHYBkwy*4 zH)E{~LV-;h4_w#vpP%FTiGuHp8%ThlU~n})I#RLQzyuBM5JW5`fIJj2uN8ea%>RfU zlW0$5bJwX~{_Q6i#wIs(uP}J_yuH1NdIDz$C4b`47#V>SluV6l=cF(&nE8$zXGVS- zs3V$bPfthFRXe7C8jWMU1ySwgHc4o{iVyiWG?S4Lzr(s2l6|-fv9+G=j}lE|Dn9qL zv>F_$Z5o4~7#{|ielvaLer!@qyVF>%-vhr(m>?TlciMWOf?uZvI6lPivl< zcD*YyLwz?@`WBWGJ~cf3f@PYHno>P;_T)an8CY2bF@**;gl)0P_A&Fgw$GqM0hMo+`Hy50U8!ryCtWGCWmz<0g2LKxL-EK9k|;!CR)r_$~2v zqJOBLR>GiXlNUNpJs;^JkyOEZM36|}el>~~>P%~nKJ(v@JGW$gQPdf24FvG9->l#` zBhZKYn_;^9}L*nCr$t+o(5{JYa|W1KA<|wuBVVIi3s6Cn7$W$uXLv;_?dp z#6@WpZK6Ks`=d&=`*umhH^dFua}64wvEZIMl7R}6@h>BHMWfES|90{qYk&;^}yC*Z+czT2=rDZ<9cY4+mlNAo;RAV z=oEF!3cYzz)HR$&;#hT6qX~nqs*xZ6sO=WOm9^x0;i86lVpg-R1ig`);5jDCB`-o< z10cP4)H?$tQ2sYUN|>{`P0lxLz))RW1F!dxxRcCyUq zM|8MU*UMLt5;Ud^F2Tj?kTX7VC6S@}6$|s&*R7B*S2yA)GY?17nWFHVl&4S-=p0@q zqxl|fR6usl-U7?8lD*B}z-^oCHFXj^Yj#1Q^ZdCN;p&r1z+PS70A)t@`-Szxw_M#{ zV+Q5VG=jFw*16qRRpAm`75;{x{^{%rS3-8lnT5xik3rf@;DPX1kr+nFeSErN5@)nh z;C-#+PUDO4ASMP!HKlPCj1ZL^74?bydg=#ta`g)$Z!P6B{CXCIjmj>h3-=_ulF-8L zXN+ho5lcbNILisL7)6_V$Odtx(-YfwDx8ZtJClxzAWz+5&P1s2M0QN%`T@~G7WB0V zXDD<-M2D?+Ag7;oe0Z{=>t`pN3UX#n4Ifsi_l3UDxp>CUo#P;|IG*C#6g9d4By=7aOiZFpLU3L?i0>z4m|a{T~% zqTQTOd*?|`UVNX74xr@8J>0vuTex7}I~Xi7UtZRzX#YVmhGYJqC}GB1#v49Ap=3_| zXzOH=3l83j_8;EhC^O&WV>p-a$e^vydElqoilWxfU=(zlb=#V}2V@1y-`QF;R0Ub^ zELBk>wD`AySCf)`BuUOI2#01MEk@WljYrbLLC6zDd6&QsQ_*M!EW;7Vk>R7jx4<3& z1p`@X^D220L-y*#?+czDb<3S_(TtdpmSp$ssywk)3%O4WzrQhbGAfQPLT_!8OUV8$ z$z&NOYehf7K8)PGF@;PA+3hT)6h?ssjyfYFSh0}-ur+l@*cXnsTwo)^U8u(r^^ zG;wq?>fM@zWgix@e_4>BU=jq&l>F2z=bq0onIsbQ=pOHMpxu>RR$z0e z$1pKQPkpJk(!eE8$u1=^PfukypNAAn-i5V z{J4IrKtZSrC0A-UoYNKMKK6CbOGcqtmFW7TujWHrf;(z+K=UIeV6RF}e%4GHK=Jin z-Y!toj|~dQps25?%46{lC|H^$TO-tu{u&$*mcPM^%8ZVS(rCjQ^3QMUzgLiNt7zDZ zpZPyMDC443ZSj7Uz)aZJ-PI)!F8fN}=n_19v2cP{_;~1CzJf?}=;r+Dq7Q-MWo7}HJ*9pBM zS*HPL&UC{)F#XO`XYVWg^$90yTRnqNXmX|29~59?(3@ImTTgL~fWq1IDbC>~@J+Y! z@gw2>iBA@}Ty;+p)Jx-Od1(1T0e%t!p7PNsdZ1!W#kjP|ZE>FdbdsNUV z-GFWg74;2DkET_U@&(elRn^7hK4{_A=H*UWEii-kLJ@2fb(T1IkryB1@l*{(n}5se zx%iG9ykcNf-T6u$=zNl*cJ+a04T=UYkNR+SGTyCFH46FuJvpzRnL3~DKB2Z< zQM`W=y>D`MPQ7TMCYML)9<;aR!x+8PGqN8g!G>(ktmGLrySw2l8u6vJoEy@+VGBp> z$6s{3wsoaHV$Gf>$f3~lP>C$Ow}&Wh=LIs*|m}pmYMz6B(k(?TFi88 zxP#G;g7ZF2m3xw}?e(WvH=_#8U%MJVuU`K$1xioD1FD`U4a74&bpF)M&6AYO=4Tkk zuILTUAAMURFIummBWz2(mYBt;R}h(p%+1b?J3)N2?hi$JrU(XI*0^^H0hf^l;W|^C zK}FqwrsrAoBM_gBSB0!w4-J_z5pPqa-%sy|4bQjui6xWC@k39pbuU*Iq1dsy5`&d0 z!)t1V#$@=_53Nb*en}y8thj5I-ANJXi?6PL4GP}+DLGOd+*_+#I--c|hP~RTb-p00 z@Tb{7CCOLB?_eq|Q*kXI*Jr;~6x>(QX!yhpd-T9lQ5;-sosfE)5*$H-NUPRRpuY)7swrzed&S zV_irKb*Cb`|9vA=U9QV2!+%>?UBDx+Jq3MPvqE08@2b)m_3J`%JFozLSUIHxr)zcN zr{!59)bB&tQ1R|AbHqPu@`W9qlr{MR%#oR*k@^ws3O$dM86U3ya3P(%Gkk+4#e z-&v+ezEd(5f8u4}7e-oSI0n~uARO&$Y5(mTd@sm#q3R>jg!J@AsU z+EGvE>4D3tX$;XGyS?kYiQ$iBNjRf*;yO}l^JjEX6NM@39`sGoaCzK`YVk6jUQ?!V zaP22Go?Tx`Ndm_y(=*Z2==qE3i{j)$s5{d~;eAaB9REhf3t20ZQU6V}$^3z;^@7@g z1WwlD;H)acml%a0G{XoMDO={sa33XdV?U-TOx|O*9*oRZN3eL{^{CW$U9EbMmmm3v z*!_gNCDE~0TtiMQ-IqJhi=?{Z+<^*BE|PLhuEXX;I&xlqVVdYv$;*We);Y3Y9OXo9 z&C_K~@{#KK7CRVp@juZ5$Zl@4XeQqg%EJYNMEYwUw=F-YpN1jF-hs41rVezM#uJJ4 zxwnh*x9%U6B6&3T9F0Z4BTuIE+-|kRYVwt66WxF0c6oj9a>Q&j!;gYsFXwj8kFe2r zX|3eORr2lB6xFmnxG-P&7#oI?dlFQ3Q4 zIq={wi+@@8OYc&&WbQFZhjh->Px*+wXZO8JGvbcf?Z!IKL5=>HTFKFQq$}GO=?@C^ zIxVs%B*g3Ae+Y`2S43(Ax=$=UK(PV4d-Q>B+}G_)rFK_^_@+EHmxx(LOzt7atR=Y- zTG3#1)743tcUmH!2)%6RF|<^dbIif03&uZfDfe5t`bp&;D>QJ3VP*3hZ0_qj@pHbU z>{@Xmi&XL_g+C`$dZYDvW8UCC$CJ?~6MyA`wtUB|rz^GP4tKhkzT4Q|;yQ1AO>JxX zmWu8sEE2qLg}27qy8B~LlZQK2PoYM+-G~M1w%QegpV7E2=kDZk*j9B9crxak_ZUZ- zdi%wmw)^wYU}rXe7;mQW_0Z`&F$)znyoL1pD`C+Rb3dvSX-W1n3am8++{qs3_?ymm z|7XvcFlH$b3U`DeBipOzs7xfPQu3hwRDUhFI`tiz$ItW7W2@2+NdP) z$N%dc?-r)-;53Y-3- zjlwuucvg>}L(5RI2a0RLsE0af-0keGYVXKVw0H?&TeC+BqfoDwF2-Lv4*J&Pj!#Nl zW>JSd{8|t&qlpJ$=lE`lzNm6vd9c+RjfP^ZT3BU|#z&J;Z!oB|_*)OMLmrKWqPHoC zQS(>wJd9qs*q|~YZM89_F*+Tse?_rB2l*Gb>aWiSJzQ%$#WK*~u&y4qW%MBQkdZyy zV&^jPu5Xad=bur8er$B`SIqH{9}uU|AcKALN34TxaQ#-S4T{&TAfDq5y3c4g%Ge;s zLPc+IOKxnN9^8^x+&`k|SmB{TSd2D!9X6kt5z z@^{pOiw1YqM#fYno|PMr^k+oGKMkJISZs9`TbEO(G6v7WoWY$%S&KcTNNKPcXG z|Drhry9B6*mmNG<9$l6}f8+HBSVFM=2f>*gB#vEX%Ku@sPjA38q8gebw1=n%fc-_& zMc=Vd+Vn{X9P<87z9aaYtrTsyCIYLM^lpL;Z4nAS)mi8(f)m6%xP!KM9)!-UytwGn z7jcH-;V3%Gti_-6_Z2v{DcQqHFaC`OeO^4O9$A6&UN(=Pv|Vl=2(f%SVO|soteQC! z5{fCbbe%y1Z#d`Z#fXwUoHIG*wSw?DigNwg!!48FpyjCWaLXj}mGpuzQ(M#Y*vo_s z58@oS?pY2E3{ZH|6%Vf2d*El&_S=O+CQ&AP>@Ra(`YU?lh6jFOmZSv3E5ZGsWkJE} zskHv`%pUpuU9+_PO!J^Zphu1;ZkFL(-R$ZtsI>ct(*137zDR*0JT}ly`F=43gK8A3 zLqT7Vp}L*%3ZV7qC0)znG2IKvvDu}8PM%AiJ>4So2TFE!IoV8=5!tDMw?oSwn#Jrs zgnBghM5l93V8cCnE@F8hFfZp?;XgV4{--`iy^X{Vk}FU>dLG`AXB@HMOc5CgBNhpx z$uoCY)T`h(4dJF6MNVi54&u#B4-Z9RNlWao2+f|tAu@v`*TWjcRkb`G%TWUTOXBPa zH%cT4>JlA=$V6@RIu z=u^TK^+E1|tBaDMcsF{5E|&B5pp*bWmWL^96dTL@$WU#2Gb6V%^7E-rSM7{q%d{GJ zsmgK@rj^+lMXiNfi0iG!nMMsowZt%Fd2H8~dBFQk#}ZrxDcMIeXa13|vlQ$NK}5LL zNVv7^Z^(c{W+m~=Rx&#kk6e;EmO`ipxRfYqpDfR~wyg~hh1zQ#O2LoP^b9|=uF_5W zQ~O_0?-d0+6w56DG;z6}!6&)|kR7lG;+o3vnBz4H$MSbFOb9gv*E!~CfDB<|Jd-iNrpjQ{ z1$UMHzRXvK2WcxU2%jp$gF_dJ;4dRPnxD!i_NMosbOA0MONrj@s^$iExG%addRm_; zpPywA#m}F`UCim?fTY_?&t5?0>NA#4&V{~BU}2daTS{{YE|G~=MH6tV6s7hMSm5=L z3p}NzdA5htiN`lL7bFT&CO4{LYE*#R8xuJ$T4X&GP=XUx$<@gbD{YRaZ7I2yNxOL(GdC445$(MEDnN3h+o!}s5u!JieTwegMBMI{Qs7gqWY2gR zc??)~>kcx_lz=_!QAmR#l28%0ZNOtE@UFLY`6~{04Z{tg2+ov zmkCmF?%7EZFo@cllLJ?9^Q%QgLR=HsU00-uNQKg_h2wmcytdq_$ra|KlIgbGRBB^`v@= z*Ai%7H*u}qYD84Do!M!vo|ZLtY6jxsilw0nO2QS8C2$XROD#y%yC~q3q0LeL7I}jg zxlS00$)_}yhN9X;5@E%gEulzP;(op|nH>{Ka$qe9=;++Aqjsto6%J;>L{Wr$13N(B z!912pvGhG*N!iJSdUovDNeXgjP(#aK(TQ%gzzIs+vr^{I{(}F3qJd-S-^re%x$>rY z==doL16YMd5Xz1+T%mbOKG^j7TkzOVCPiE~K^6s22y8`t;xmai1t~UF3>%DM?M(_k zp;F(GRgd&_Q79IQl31wf!~jYXLctRvvC#R1BANK$g;YA21HC@|2N1S+mDRW|uy9Hq zpcokUkVqIVc$X!Ed>sr$oh9%BkaC1_VY8)z;M|=hOcerwM!6dVPn4xok_#y}Z@mPu zU8UfSg_5}KSiGO#_Ek*CB^h7>LB(~tGp8sjZx9T z!wx38lNLQx{96*2c94;S=4gsCwtM3PxfJXP)8V5Pax^?41L_YMtHLZ-jG{~m?P81V zG+HRzfTGwRLVlN0{6rCo+hhZGR*~@Okk@gKQ#Ad|(rKBnIHw#P<%dJ(IjG#R|0iEX4y-qFwVwKmk#zV;h3AP*sf%PL+~ys#dZ| z;pRb4PhM`gRa2B2THr}($3J%p;$Mx@7_h#c|ryx55i$70Ml*Jf4Boy{)7C%oiv)bZH>Ao;}QdsxO zdj1>QeHW$nBa(W#EGog)ZN6BM*wcM+B;L~fjt7sZ7sU?7R_z2T+!!2rdg?|eJ?;?2 zl7L0z<-d-sjs;n=Eky#OP^Z$*IgQIuMY$_*RyLb5ts_K*l3!iHd(u09ic=y*&Uu1# zTEY+A6og8hDogjU)cj~7(>qvrq!Cn0(MZYE*5gOf-KHHoyY{-`F+GE))WYDoSF-dE zVU5elbj?u^-Am;cGD7GuqJkb)e~#k18Vdk1c=)TLK~mClxE*rfsHo&4t*V$)g_lk} z=#RXM;GT*#ny=B(krFC7@Exv;o*&qH2N?J%Dz&1b6pF=vA-5w1syH@iyy2>)D9cIk za;bAH{x$>TejW^v>;_d9Y1P67|aOG@Jg;Avy_F#|IAYMcIN1^s31v)lG~5Sh$j6AcX*mt`;W>1 z@la8=LL%_7ir3835nn;k_Mxh%JQ`$$<%`p@bT?c05ezIgSEBH~JC8(e_)<&^>b@h_z3BGNWBZmqs+O@NS z@W9};>@|Z_jwmA;(MoF%1>cN^MfJxZa|W-`d#7sysqM!yGSH+J&lp@-YKtPP94+&Z zgJd&G2J17Q{(#&d0ks;|?Ofb0`XB1YZDXr@KE{-4H|;@52=7xHUxPn1v5m`*u11ml z{0y}FAi|E(qzdI7d#yG%im+2CYLLor6C2E!08LdDIajuN8mWndpDd6jRlricB&>@}ksE$%)cnJ3& zL%rM_q=-8D@*(qDgJGopsOjz>S=oOf!~CS+PXYK;IS#D>_y^S*C9gIO_KZsng~SA# znmr5%_EK^#u~WG{6zf`7R`jEZ-$c=|WxvxuyC{S!Ro0^4_!ccQ@o$dtrWOh{pz{XdI}F$={&d?+yOYrAXb!+m zCqj~QuV=Z;Xq*t|OhEHfFw1NG|=>dsE4foDjCO7D_N_C`!ovr(Cow zbIU5ui^5jr1RrI)9}a}6RI#)(MM9CC?P{YlT+w)@S;G`Nmh=(iLDu_(sJDtnCoCd> zRu0)mziB-28FE1m^{eD34rfzR6lZL1bkM;6)iO>68#}r9l_iJ^RFUD;E~YDisGQUU z1tFbUaJ;A>NTRvEL#!@bchp>-Y+pU+fF)at7z1(#DLHbxNr*pGbLIiPgP$YMn&kW~ zvjbMbZMvdw8QYk6Q9+Z*8mTBaoU%{)J$7QE2h?UT8bF_Xq$paQ=t*sLhhbH=CZPjr zR3cHF&=DvaN``XsR6D|Y5CF5TfhLi}%)hCV(d;OJnDayy3sqwM)5b%EXAU(C$7D}X z(H5B!p`9!6YK6*2SlFtJ<$ES5xnQ8_QdUtgeU*r#A;k-K^Ev%8fx5a+UJ+pw9W8}h zhmPd-(`I~1-a%9>UB%V`^a2b01xJXoqU2acULX(t(UF%FZG+JPG+>B#P%Jt&4^_sG zqR1^w&Ro-x7F0lMG=K0bx8s>hIIFR&$YaQ?q#(ByEoG$dvCLvoqZ{uEgvco7nn!3y z2^8G1B2k%Tw=29X(Sh1&i@>gA5ze@>gl{SGu%a0gL!pQ3l7(+0FLNWK-I@D{oVtqg z(rN`gr$~^B`qbv1t%m~ASi(rB>uO)xo_ z3$d(;Xv~TdcbW(=plJF*516@yxa=&JbuDNiy!Y%1M+iOF7=<2D)tx2#fQcH2r^%(0 z7eSpk)fMg3K;&YvXBX52JO?&MLYf#vfhqgB!$XgisO+Q)grXDVAEPLmkhr<;M5swqNwQJM#%+@YCmNj$z9L9cdb?ju9M9JCaP(I&o&BXbM6W@ z`kdbt1fQ{Y?mjI7>mj1nQEbw z9EOUc(eT1;pq%9P|3AEY{jdM!|M7qQ_y76-`oI6T|KorBxBvNn{(m<5U;oSh^S}SE z|J#52AOGwB`M>Mm|LcGGzx^No+yC`H{@efif9}8h@Bib!>;M11r8JJM!8ii|jAUR3 diff --git a/test/rexml/data/ProductionSupport.xml b/test/rexml/data/ProductionSupport.xml deleted file mode 100644 index 083cf64a6e8620..00000000000000 --- a/test/rexml/data/ProductionSupport.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - >#error:]]> - - - - - Update Policy request 9997: Please check CICS log - - - - - MotorInsuranceContract(Object)>>#error: - - Have not got a complete - - - Have not got a complete and consistent set of price matrices for policy period - ask back-end prod supp to sort out - - - - - - diff --git a/test/rexml/data/axis.xml b/test/rexml/data/axis.xml deleted file mode 100644 index bc996c571d47c0..00000000000000 --- a/test/rexml/data/axis.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/rexml/data/bad.xml b/test/rexml/data/bad.xml deleted file mode 100644 index 18786f2b436d36..00000000000000 --- a/test/rexml/data/bad.xml +++ /dev/null @@ -1,5 +0,0 @@ - - Here is an XML document. - - It has some elements, but it also has a hidden < error! (or two) - diff --git a/test/rexml/data/basic.xml b/test/rexml/data/basic.xml deleted file mode 100644 index 88385fb6e161d6..00000000000000 --- a/test/rexml/data/basic.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/rexml/data/basicupdate.xml b/test/rexml/data/basicupdate.xml deleted file mode 100644 index 57d458cf2aaf6a..00000000000000 --- a/test/rexml/data/basicupdate.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Goudse kaas - Rond - - - - - - - More cheese! - - - - - Even more cheese! - - - - - No sausages today - - - - - - - - - - - - - - - - - - diff --git a/test/rexml/data/broken.rss b/test/rexml/data/broken.rss deleted file mode 100644 index d5f29e5d1f1296..00000000000000 --- a/test/rexml/data/broken.rss +++ /dev/null @@ -1,20 +0,0 @@ - - - %HTMLlat1; -]> - - - - - O'Reilly Network Articles - http://www.oreillynet.com/ - - diff --git a/test/rexml/data/contents.xml b/test/rexml/data/contents.xml deleted file mode 100644 index 35e3ac7044540d..00000000000000 --- a/test/rexml/data/contents.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - Java and XML - - - Introduction - - What Is It? - - - How Do I Use It? - - - Why Should I Use It? - - - What's Next? - - - - - Creating XML - An XML Document - The Header - The Content - What's Next? - - - - Parsing XML - Getting Prepared - SAX Readers - Content Handlers - Error Handlers - - A Better Way to Load a Parser - - "Gotcha!" - What's Next? - - - - - - Web Publishing Frameworks - Selecting a Framework - Installation - - Using a Publishing Framework - - XSP - Cocoon 2.0 and Beyond - What's Next? - - - diff --git a/test/rexml/data/dash.xml b/test/rexml/data/dash.xml deleted file mode 100644 index e1be6557504cb6..00000000000000 --- a/test/rexml/data/dash.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - content-1-text - - - content-2-text - - - content-3-text - - diff --git a/test/rexml/data/defaultNamespace.xml b/test/rexml/data/defaultNamespace.xml deleted file mode 100644 index 1e32981506f847..00000000000000 --- a/test/rexml/data/defaultNamespace.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - Hello - - diff --git a/test/rexml/data/doctype_test.xml b/test/rexml/data/doctype_test.xml deleted file mode 100644 index a690cab99dd2c0..00000000000000 --- a/test/rexml/data/doctype_test.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - diff --git a/test/rexml/data/documentation.xml b/test/rexml/data/documentation.xml deleted file mode 100644 index a1ad6e878b5a2d..00000000000000 --- a/test/rexml/data/documentation.xml +++ /dev/null @@ -1,542 +0,0 @@ - - - - - - - - REXML - - - - @ANT_VERSION@ - - @ANT_DATE@ - - http://www.germane-software.com/software/rexml - - rexml - - ruby - - Sean - Russell - - - - -

REXML is a conformant XML processor for the Ruby programming - language. REXML passes 100% of the Oasis non-validating tests and - includes full XPath support. It is reasonably fast, and is implemented - in pure Ruby. Best of all, it has a clean, intuitive API. REXML is - included in the standard library of Ruby

- -

This software is distribute under the Ruby - license.

- - - -

REXML arose out of a desire for a straightforward XML API, and is an - attempt at an API that doesn't require constant referencing of - documentation to do common tasks. "Keep the common case simple, and the - uncommon, possible."

- -

REXML avoids The DOM API, which violates the maxim of simplicity. It - does provide a DOM model, but one that is Ruby-ized. It is an - XML API oriented for Ruby programmers, not for XML programmers coming - from Java.

- -

Some of the common differences are that the Ruby API relies on block - enumerations, rather than iterators. For example, the Java code:

- - for (Enumeration e=parent.getChildren(); e.hasMoreElements(); ) { - Element child = (Element)e.nextElement(); // Do something with child -} - -

in Ruby becomes:

- - parent.each_child{ |child| # Do something with child } - -

Can't you feel the peace and contentment in this block of code? Ruby - is the language Buddha would have programmed in.

- -

One last thing. If you use and like this software, and you're in a - position of power in a company in Western Europe and are looking for a - software architect or developer, drop me a line. I took a lot of French - classes in college (all of which I've forgotten), and I lived in Munich - long enough that I was pretty fluent by the time I left, and I'd love to - get back over there.

- - - - Four intuitive parsing APIs. - - Intuitive, powerful, and reasonably fast tree parsing API (a-la - DOM - - Fast stream parsing API (a-la SAX)This is not a SAX - API. - - SAX2-based APIIn addition to the native REXML streaming - API. This is slower than the native REXML API, but does a lot more work - for you. - - Pull parsing API. - - Small - - Reasonably fast (for interpreted code) - - Native Ruby - - Full XPath supportCurrently only available for the tree - API - - XML 1.0 conformantREXML passes all of the non-validating - OASIS tests. There are probably places where REXML isn't conformant, but - I try to fix them as they're reported. - - ISO-8859-1, UNILE, UTF-16 and UTF-8 input and output; also, - support for any encoding the iconv supports. - - Documentation - - - - - -

You don't have to install anything; if you're running a - version of Ruby greater than 1.8, REXML is included. However, if you - choose to upgrade from the REXML distribution, run the command: - ruby bin/install.rb. By the way, you really should look at - these sorts of files before you run them as root. They could contain - anything, and since (in Ruby, at least) they tend to be mercifully - short, it doesn't hurt to glance over them. If you want to uninstall - REXML, run ruby bin/install.rb -u.

- - - -

If you have Test::Unit installed, you can run the unit test cases. - Run the command: ruby bin/suite.rb; it runs against the - distribution, not against the installed version.

- - - -

There is a benchmark suite in benchmarks/. To run the - benchmarks, change into that directory and run ruby - comparison.rb. If you have nothing else installed, only the - benchmarks for REXML will be run. However, if you have any of the - following installed, benchmarks for those tools will also be run:

- - - NQXML - - XMLParser - - Electric XML (you must copy EXML.jar into the - benchmarks directory and compile - flatbench.java before running the test) - - -

The results will be written to index.html.

- - - -

Please see the Tutorial.

- -

The API documentation is available on-line, - or it can be downloaded as an archive in - tgz format (~70Kb) or (if you're a masochist) in - zip format (~280Kb). The best solution is to download and install - Dave Thomas' most excellent rdoc and generate the API docs - yourself; then you'll be sure to have the latest API docs and won't have - to keep downloading the doc archive.

- -

The unit tests in test/ and the benchmarking code in - benchmark/ provide additional examples of using REXML. The - Tutorial provides examples with commentary. The documentation unpacks - into rexml/doc.

- -

Kouhei Sutou maintains a Japanese - version of the REXML API docs. Kou's - documentation page contains links to binary archives for various - versions of the documentation.

- - - - - -

Unfortunately, NQXML is the only package REXML can be compared - against; XMLParser uses expat, which is a native library, and really is - a different beast altogether. So in comparing NQXML and REXML you can - look at four things: speed, size, completeness, and API.

- -

Benchmarks

- -

REXML is faster than NQXML in some things, and slower than NQXML in a - couple of things. You can see this for yourself by running the supplied - benchmarks. Most of the places where REXML are slower are because of the - convenience methodsFor example, - element.elements[index] isn't really an array operation; - index can be an Integer or an XPath, and this feature is relatively time - expensive.. On the positive side, most of the convenience - methods can be bypassed if you know what you are doing. Check the benchmark comparison page for a - general comparison. You can look at the benchmark code yourself - to decide how much salt to take with them.

- -

The sizes of the XML parsers are closeAs measured with - ruby -nle 'print unless /^\s*(#.*|)$/' *.rb | wc -l - . NQXML 1.1.3 has 1580 non-blank, non-comment lines of code; - REXML 2.0 has 2340REXML started out with about 1200, but that - number has been steadily increasing as features are added. XPath - accounts for 541 lines of that code, so the core REXML has about 1800 - LOC..

- -

REXML is a conformant XML 1.0 parser. It supports multiple language - encodings, and internal processing uses the required UTF-8 and UTF-16 - encodings. It passes 100% of the Oasis non-validating tests. - Furthermore, it provides a full implementation of XPath, a SAX2 and a - PullParser API.

- - - -

As of release 2.0, XPath 1.0 is fully implemented.

- -

I fully expect bugs to crop up from time to time, so if you see any - bogus XPath results, please let me know. That said, since I'm now - following the XPath grammar and spec fairly closely, I suspect that you - won't be surprised by REXML's XPath very often, and it should become - rock solid fairly quickly.

- -

Check the "bugs" section for known problems; there are little bits of - XPath here and there that are not yet implemented, but I'll get to them - soon.

- -

Namespace support is rather odd, but it isn't my fault. I can only do - so much and still conform to the specs. In particular, XPath attempts to - help as much as possible. Therefore, in the trivial cases, you can pass - namespace prefixes to Element.elements[...] and so on -- in these cases, - XPath will use the namespace environment of the base element you're - starting your XPath search from. However, if you want to do something - more complex, like pass in your own namespace environment, you have to - use the XPath first(), each(), and match() methods. Also, default - namespaces force you to use the XPath methods, rather than the - convenience methods, because there is no way for XPath to know what the - mappings for the default namespaces should be. This is exactly why I - loath namespaces -- a pox on the person(s) who thought them up!

- - - -

Namespace support is now fairly stable. One thing to be aware of is - that REXML is not (yet) a validating parser. This means that some - invalid namespace declarations are not caught.

- - - -

There is a low-volume mailing list dedicated to REXML. To subscribe, - send an empty email to ser-rexml-subscribe@germane-software.com. - This list is more or less spam proof. To unsubscribe, similarly send a - message to ser-rexml-unsubscribe@germane-software.com.

- - - -

An RSS - file for REXML is now being generated from the change log. This - allows you to be alerted of bug fixes and feature additions via "pull". - Another - RSS is available which contains a single item: the release notice - for the most recent release. This is an abuse of the RSS - mechanism, which was intended to be a distribution system for headlines - linked back to full articles, but it works. The headline for REXML is - the version number, and the description is the change log. The links all - link back to the REXML home page. The URL for the RSS itself is - http://www.germane-software.com/software/rexml/rss.xml.

- -

The changelog itself is here.

- -

For those who are interested, there's a SLOCCount (by David A. Wheeler) file - with stats on the REXML sourcecode. Note that the SLOCCount output - includes the files in the test/, benchmarks/, and bin/ directories, as - well as the main sourcecode for REXML itself.

- - - - - Raggle is a - console-based RSS aggregator. - - getrss - is an RSS aggregator - - Ned Konz's ruby-htmltools - uses REXML - - Hiroshi NAKAMURA's SOAP4R - package can use REXML as the XML processor. - - Chris Morris' XML - Serializer. XML Serializer provides a serialization mechanism - for Ruby that provides a bidirectional mapping between Ruby classes - and XML documents. - - Much of the RubyXML - site is generated with scripts that use REXML. RubyXML is a great - place to find information about th intersection between Ruby and - XML. - - - - -

You can submit bug reports and feature requests, and view the list of - known bugs, at the REXML bug report - page. Please do submit bug reports. If you really want your bug - fixed fast, include an runit or Test::Unit method (or methods) that - illustrates the problem. At the very least, send me some XML that REXML - doesn't process properly.

- -

You don't have to send an entire test suite -- just the unit test - methods. If you don't send me a unit test, I'll have to write one - myself, which will mean that your bug will take longer to fix.

- -

When submitting bug reports, please include the version of Ruby and - of REXML that you're using, and the operating system you're running on. - Just run: ruby -vrrexml/rexml -e 'p - REXML::VERSION,PLATFORM' and paste the results in your bug - report. Include your email if you want a response about the bug.

- - Attributes are not handled internally as nodes, so you can't - perform node functions on them. This will have to change. It'll also - probably mean that, rather than returning attribute values, XPath will - return the Attribute nodes. - - Some of the XPath functions are untestedMike - Stok has been testing, debugging, and implementing some of these - Functions (and he's been doing a good job) so there's steady improvement - in this area.. Any XPath functions that don't work are also - bugs... please report them. If you send a unit test that illustrates the - problem, I'll try to fix the problem within a couple of days (if I can) - and send you a patch, personally. - - Accessing prefixes for which there is no defined namespace in an - XPath should throw an exception. It currently doesn't -- it just fails - to match. - - - - Reparsing a tree with a pull/SAX parser - - Better namespace support in SAX - - Lazy tree parsing - - Segregate parsers, for optimized minimal distributions - - XML <-> Ruby - - Validation support - - True XML character support - - Add XPath support for streaming APIs - - XQuery support - - XUpdate support - - Make sure namespaces are supported in pull parser - - Add document start and entity replacement events - in pull parser - - Better stream parsing exception handling - - I'd like to hack XMLRPC4R to use REXML, for my own - purposes. - - - - - REXML is hanging while parsing one of my XML files. - - Your XML is probably malformed. Some malformed XML, especially XML that - contains literal '<' embedded in the document, causes REXML to hang. - REXML should be throwing an exception, but it doesn't; this is a bug. I'm - aware that it is an extremely annoying bug, and it is one I'm trying to - solve in a way that doesn't significantly reduce REXML's parsing - speed. - - I'm using the XPath '//foo' on an XML branch node X, and keep getting - all of the 'foo' elements in the entire document. Why? Shouldn't it return - only the 'foo' element descendants of X? - - No. XPath specifies that '/' returns the document root, regardless of - the context node. '//' also starts at the document root. If you want to - limit your search to a branch, you need to use the self:: axe. EG, - 'self::node()//foo', or the shorthand './/foo'. - - I want to parse a document both as a tree, and as a stream. Can I do - this? - - Yes, and no. There is no mechanism that directly supports this in - REXML. However, aside from writing your own traversal layer, there is a - way of doing this. To turn a tree into a stream, just turn the branch you - want to process as a stream back into a string, and re-parse it with your - preferred API. EG: pp = PullParser.new( some_element.to_s ). The other - direction is more difficult; you basically have to build a tree from the - events. REXML will have one of these builders, eventually, but it doesn't - currently exist. - - Why is Element.elements indexed off of '1' instead of '0'? - - Because of XPath. The XPath specification states that the index of the - first child node is '1'. Although it may be counter-intuitive to base - elements on 1, it is more undesireable to have element.elements[0] == - element.elements[ 'node()[1]' ]. Since I can't change the XPath - specification, the result is that Element.elements[1] is the first child - element. - - Why isn't REXML a validating parser? - - Because validating parsers must include code that parses and interprets - DTDs. I hate DTDs. REXML supports the barest minimum of DTD parsing, and - even that isn't complete. There is DTD parsing code in the works, but I - only work on it when I'm really, really bored. Rumor has it that a - contributor is working on a DTD parser for REXML; rest assured that any - such contribution will be included with REXML as soon as it is - available. - - I'm trying to create an ISO-8859-1 document, but when I add text to the - document it isn't being properly encoded. - - Regardless of what the encoding of your document is, when you add text - programmatically to a REXML document you must ensure that you are - only adding UTF-8 to the tree. In particular, you can't add ISO-8859-1 - encoded text that contains characters above 0x80 to REXML trees -- you - must convert it to UTF-8 before doing so. Luckily, this is easy: - text.unpack('C*').pack('U*') will do the trick. 7-bit ASCII - is identical to UTF-8, so you probably won't need to worry about this. - - How do I get the tag name of an Element? - - You take a look at the APIs, and notice that Element - includes Namespace. Then you click on the - Namespace link and look at the methods that - Element includes from Namespace. One of these is - name(). Another is expanded_name(). Yet another - is prefix(). Then, you email the author of rdoc and ask him - to extend rdoc so that it lists methods in the API that are included from - other files, so that you don't have to do all of that looking around for - your method. - - - -

I've had help from a number of resources; if I haven't listed you here, - it means that I just haven't gotten around to adding you, or that I'm a - dork and have forgotten. In either case, feel free to write me and - complain.

- - - Mike Stok has been very active, sending not only fixes for bugs - (especially in Functions), but also by providing unit tests and making - sure REXML runs under Ruby 1.7. He also sent the most awesome hand - knitted tea cozy, with "REXML" and the Ruby knitted into it. - - Kouhei Sutou translated the REXML API documentation to Japanese! - Links are in the API docs section of the main documentation. He has also - contributed a large number of bug reports and patches to fix bugs in - REXML. - - Erik Terpstra heard my pleas and submitted several logos for - REXML. After sagely procrastinating for several weeks, I finally forced - my poor slave of a wife to pick one (this is what we call "delegation"). - She did, with caveats; Erik quickly made the changes, and the result is - what you now see at the top of this page. He also supplied a smaller version that you can include - with your projects that use REXML, if you'd like. - - Ernest Ellingson contributed the sourcecode for turning UTF16 and - UNILE encodings into UTF8, which allowed REXML to get the 100% OASIS - valid tests rating. - - Ian Macdonald provided me with a comprehensive, well written RPM - spec file. - - Oliver M . Bolzer is maintaining a Debian package distribution of - REXML. He also has provided good feedback and bug reports about - namespace support. - - Michael Granger supplied a patch for REXML that make the unit - tests pass under Ruby 1.7. - - James Britt contributed code that makes using - Document.parse_stream easier to use by allowing it to be passed either a - Source, File, or String. - - Tobias Reif: Numerous bug reports, and suggestions for - improvement. - - Stefan Scholl, who provided a lot of feedback and bug reports - while I was trying to get ISO-8859-1 support working. - - Steven E Lumos for volunteering information about XPath - particulars. - - Fumitoshi UKAI provided some bug fixes for CData metacharacter - quoting. - - TAKAHASHI Masayoshi, for information on UTF - - Robert Feldt: Bug reports and suggestions/recommendations about - improving REXML. Testing is one of the most important aspects of - software development. - - Electric - XML: This was, after all, the inspiration for REXML. Originally, - I was just going to do a straight port, and although REXML doesn't in - any way, shape or form resemble Electric XML, still the basic framework - and philosophy was inspired by E-XML. And I still use E-XML in my Java - projects. - - NQXML: - While I may complain about the NQXML API, I wrote a few applications - using it that wouldn't have been written otherwise, and it was very - useful to me. It also encouraged me to write REXML. Never complain about - free software *slap*. - - See my technologies - page for a more comprehensive list of computer technologies that - I depend on for my day-to-day work. - - rdoc, an excellent JavaDoc analogWhen I was first - working on REXML, rdoc wasn't, IMO, very good, so I wrote API2XML. - API2XML was good enough for a while, and then there was a flurry of work - on rdoc, and it quickly surpassed API2XML in features. Since I was never - really interested in maintaining a JavaDoc analog, I stopped support of - API2XML, and am now recommending that people use - rdoc.. - - Many, many other people who've submitted bug reports, suggestions, - and positive feedback. You're all co-developers! - - - diff --git a/test/rexml/data/euc.xml b/test/rexml/data/euc.xml deleted file mode 100644 index a3c3419498ecf4..00000000000000 --- a/test/rexml/data/euc.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - -Ruby-mswin32 - - - -

Ruby-mswin32

-

뤤ϡWindowsȤνʤ襤 ;-(

-

[ܸ / English]

- - - -

ܼ

- - - - -

ջ

-

ΥڡǤϡmswin32rubyۤѹΤΤ餻ԤäƤޤ

-

̤˸ڡǤʤǤʤơ䤬˽񤤤ƤڡǤǤץࡦ(̵)ˤĤƤϡƼȽǤǤѤ
-䤤碌ءְäƤ¾οͤǤ򤫤褦ʤȤϤʤǤ͡

- - - -

RubyȤ?

-

RubyΥ

- - - -

mswin32rubyȤ?

-

mswin32rubyȤϡ32bitWindows(Windows95Windows98WindowsMeWindows NTWindows 2000WindowsXPWindows 2003 ServerʲWindowsɽ)ưRubyΥХʥΰĤǤ
-WindowsưRubyȤƤϡߡ5ΥХʥ꤬¸ߤޤϤ줾mswin32ǡcygwinǡmingw32ǡbccwin32ǡdjgppǤȸƤФƤޤ
-줾ΰ㤤ޤȤȰʲΤ褦ˤʤޤ(¸ǧФΤ餻)

-
-
mswin32
-

VC++ǥѥ뤵롣Windows鸫ФäȤ̡פΥХʥȸ뤬ȿ̡RubyUNIXħŪʵǽΰѤǤʤ1.7.3ʹߤmingw32Ǥȳĥ饤֥ˤĤƤϥХʥߴ롣
-RUBY_PLATFORM*-mswin32

-
-
cygwin
-

gccǥѥ뤵졢cygwinĶư롣cygwinĶUNIX饤ʴĶWindowsǹۤΤǤΤǡcygwinrubyϰ̤UNIXѤΤΤȤƱ褦ư(ȤԤǤ)
-RUBY_PLATFORM*-cygwin

-
-
mingw32
-

gccǥѥ뤵롣ϤۤȤmswin32Ǥȶ̤Ǥꡢ󥿥饤֥ⶦ(MSVCRT.dll)ʤΤǡư(餯)mswin32ǤȤۤƱ1.7.3ʹߤmswin32Ǥȳĥ饤֥ˤĤƤϥХʥߴ롣
-RUBY_PLATFORM*-mingw32

-
-
bccwin32
-

BC++ǥѥ뤵롣Ϥʤʬmswin32Ǥȶ̤ǤϤ뤬󥿥饤֥꤬ۤʤΤǡ٤Ȥǵưmswin32ǤȤϰۤʤ(Ϥ)1.7ʹߤǥݡȤ롣
-RUBY_PLATFORM*-bccwin32

-
-
djgpp
-

DJGPPǥѥ뤵롣DOSѤΥХʥʤΤǡDOSǤư롣ȿ̡WindowsˤäDOSˤʤǽ¿Ȥʤ(ͥåȥϢʤ)
-RUBY_PLATFORM*-msdosdjgpp

-
-
-

ΥڡǤϡ嵭Τmswin32ǤΤߤ򰷤äƤޤ
-ʤcygwinǡmingw32ǡdjgppǤˤĤƤϤ錄ʤ٤Ruby binariesǽǤޤbccwin32ǤˤĤƤϾRubyǽǤ

- - - -

Хʥ

-

ƤΥХʥVC++ 5.0(Version 11.00.7022 for 80x86)makeΤǤrubyΤ˴ؤƤϡɸۤΥ(ޤCVSΥ)餽Τޤ޺Ƥޤĥ饤֥ˤĤƤϳơΥ򻲾ȤƤ
-ΥХʥzipǥ֤Ƥޤ

-

md5sumΥåˡǤ㤨ruby󥹥ȡ뤵Ƥʤ鲼Τ褦ˡޤ
-ruby -r md5 -e "puts MD5.new(File.open('filename', 'rb').read).hexdigest"

- - - -

Release

- - - - - - - - -

Developing versions snapshots

- - - - -

Stable versions snapshots

-

1.8.0

- -

1.6.8

- - - - -

Extension libraries

-

1.8.0

- -

1.6.8

- - - - -

󥹥ȡ

-

嵭ΥХʥ򥤥󥹥ȡ뤹ϡߤΥǥ쥯ȥ(ʲ$TOPDIRȵ)ŸƤǥ쥯ȥդǰ̤ƤޤΤǡŸˤϥǥ쥯ȥդŸΤ˺줺(̣狼ʤͤϵˤʤƤǤ)
-Ÿϡ$TOPDIR\binPATH̤ƤƤ

-

ʤʲγĥ饤֥ϡʪ˴ޤޤʤΥ饤֥˰¸Ƥޤ

-
    -
  • curses.so : PDCurses˰¸Ƥޤ
    • -
  • dbm.so : GDBM˰¸Ƥޤ
    • -
  • gdbm.so : GDBM˰¸Ƥޤ
    • -
  • iconv.so : Iconv˰¸Ƥޤ
    • -
  • openssl.so : OpenSSL˰¸Ƥޤ
    • -
  • readline.so : readline˰¸Ƥޤ
    • -
  • tcltklib.so : Tcl/Tk˰¸Ƥޤ
    • -
  • zlib.so : Zlib˰¸Ƥޤ
    • -
-

嵭ΤPDCursesGDBMOpenSSLreadlineZlibˤĤƤϡPorting Libraries to Win32˥Хʥ꤬¸ߤޤ
-IconvˤĤƤϡMeadowy.orgۤƤiconv-1.8.win32.zipѤƤޤ
-Tcl/TkˤĤƤϡActiveStateۤƤActiveTclѤƤޤ

- - - -

Ƕν

- - - -

2004-01-27

-

ޤƤǤȤޤä٤!

-

ruby-1.8.1-20040127ruby-1.9.0-20040126֤ޤ
-Ԥϼ1.8.1꡼Ǥȯ줿ԶνǤԤϳȯǡ

- -

2003-12-25

-

꡼ꥹޥ! ruby-1.8.1꡼ޤ!
-(previewФ㤤ޤʤ...)

- -

2003-12-06

-

ruby-1.8.1-preview3֤ޤפΤ֤ۤ㤤ޤ͡

- -

2003-11-01

-

ruby-1.8.1-preview2֤ޤ

- -

2003-10-28

-

ruby-1.8.1-20031027֤ޤ
-racc-1.4.4-all֤ޤ

- -

2003-09-07

-

eruby-1.0.4vrswin-030906vruby-030906֤ޤ

- -

2003-08-12

-

ruby-1.8.0-20030812֤ޤ

-

vrswin-030811vruby-030811֤ޤ󤫤֤ĥ饤֥1.8Ѥˤʤޤ

- -

2003-08-04

-

ruby-1.8.0֤ޤRuby 1.8ϺǽΥ꡼Ȥʤޤ
-1.6ϤѹˤĤƤϡchanges.1.8.0ʤɤ

- -

2003-07-31

-

ruby-1.8.0-preview6֤ޤȡޤƤ2previewФͤǤ :)

- -

2003-07-28

-

ruby-1.8.0-preview5֤ޤ餯줬1.8.0κǸpreviewˤʤǤ礦
-ruby-1.6.8-20030727֤ޤ

- - - -

ĤƤν

-

ɤ

- - - -

-

mswin32Ǥ˴ؤ(Ȼפ)󥯤ǤĥäƤޤΤǡԹ礬ޤǤϢ

- - - - -

-[] -

-
written by U.Nakamura
-

-ruby 1.9.0 (2004-01-13)
-ERb 2.0.4
-RDtool 0.6.11
-rublog 0.0.2 -

- - - diff --git a/test/rexml/data/evaluate.xml b/test/rexml/data/evaluate.xml deleted file mode 100644 index 90d06bd652712c..00000000000000 --- a/test/rexml/data/evaluate.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - brown - - - moderate - - diff --git a/test/rexml/data/fibo.xml b/test/rexml/data/fibo.xml deleted file mode 100644 index 9b5d0ecd8705aa..00000000000000 --- a/test/rexml/data/fibo.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 0 - 1 - 1 - 2 - 3 - 5 - 8 - 13 - 21 - 34 - 55 - 89 - 144 - 233 - 377 - 610 - 987 - 1597 - 2584 - 4181 - 6765 - 10946 - 17711 - 28657 - 46368 - 75025 - diff --git a/test/rexml/data/foo.xml b/test/rexml/data/foo.xml deleted file mode 100644 index 53b9a4e003909f..00000000000000 --- a/test/rexml/data/foo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - -]> - - human leg - table leg - diff --git a/test/rexml/data/google.2.xml b/test/rexml/data/google.2.xml deleted file mode 100644 index a1df93b107bbc6..00000000000000 --- a/test/rexml/data/google.2.xml +++ /dev/null @@ -1,156 +0,0 @@ -
- - - - - - - - Campaign Name - - - - Current Status - - - Current Budget - - [?] - - - - Clicks - - - - - - Impr. - - - CTR - - - Avg. CPC - - - Cost - - - Conv. Rate - - - Cost/Conv. - - - - - - - - Test - - - - Paused - - - - Test - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - - - - - Test - - - - Paused - - - - Test - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - - - - - Test - - - - Test - - - - Test - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - -
diff --git a/test/rexml/data/id.xml b/test/rexml/data/id.xml deleted file mode 100644 index 749ab207ce6d73..00000000000000 --- a/test/rexml/data/id.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - -]> - - - - baz - gouda - baz - cheddar - baz - - diff --git a/test/rexml/data/iso8859-1.xml b/test/rexml/data/iso8859-1.xml deleted file mode 100644 index 5fb04ec9badacc..00000000000000 --- a/test/rexml/data/iso8859-1.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/test/rexml/data/jaxen24.xml b/test/rexml/data/jaxen24.xml deleted file mode 100644 index 9b819967eeae8b..00000000000000 --- a/test/rexml/data/jaxen24.xml +++ /dev/null @@ -1,2 +0,0 @@ - -

diff --git a/test/rexml/data/jaxen3.xml b/test/rexml/data/jaxen3.xml deleted file mode 100644 index a87723a3b9852c..00000000000000 --- a/test/rexml/data/jaxen3.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - 2 - - CE-A - - - - 1 - - CE-B - - - diff --git a/test/rexml/data/lang.xml b/test/rexml/data/lang.xml deleted file mode 100644 index 49b45db2915c40..00000000000000 --- a/test/rexml/data/lang.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/rexml/data/lang0.xml b/test/rexml/data/lang0.xml deleted file mode 100644 index 283b4e0f085b05..00000000000000 --- a/test/rexml/data/lang0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Ruby - - - Yukihiro Matsumoto - - - - - Python - - - Guido van Rossum - - - diff --git a/test/rexml/data/message.xml b/test/rexml/data/message.xml deleted file mode 100644 index 3b81df2a86d421..00000000000000 --- a/test/rexml/data/message.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -
- lookupformservice - 9 - stammdaten - new -
- - - - - iteminfo - ELE - - - parentinfo - Pruefgebiete - - - id - 1 - - - - - diff --git a/test/rexml/data/moreover.xml b/test/rexml/data/moreover.xml deleted file mode 100644 index 38d4c4f81cd0b4..00000000000000 --- a/test/rexml/data/moreover.xml +++ /dev/null @@ -1,244 +0,0 @@ - - -
- http://c.moreover.com/click/here.pl?x13563273 - e-Commerce Operators Present Version 1.0 of the XML Standard - StockAccess - text - moreover... - - http://www.stockaccess.com/index.html - Dec 24 2000 6:28AM - - -
-
- http://c.moreover.com/click/here.pl?x13560995 - W3C Publishes XML Protocol Requirements Document - Xml - text - moreover... - - http://www.xml.com/ - Dec 24 2000 12:22AM - - -
-
- http://c.moreover.com/click/here.pl?x13553521 - Prowler: Open Source XML-Based Content Management Framework - Xml - text - moreover... - - http://www.xml.com/ - Dec 23 2000 2:05PM - - -
-
- http://c.moreover.com/click/here.pl?x13549013 - The Middleware Company Debuts Public Training Courses in Ejb, J2ee And Xml - Java Industry Connection - text - moreover... - - http://industry.java.sun.com/javanews/more/hotnews/ - Dec 23 2000 12:15PM - - -
-
- http://c.moreover.com/click/here.pl?x13544467 - Revised Working Draft for the W3C XML Information Set - Xml - text - moreover... - - http://www.xml.com/ - Dec 23 2000 5:50AM - - -
-
- http://c.moreover.com/click/here.pl?x13534836 - XML: Its The Great Peacemaker - ZDNet - text - moreover... - - http://www.zdnet.com/intweek/ - Dec 22 2000 9:05PM - - -
-
- http://c.moreover.com/click/here.pl?x13533485 - Project eL - The XML Leningrad Codex Markup Project - Xml - text - moreover... - - http://www.xml.com/ - Dec 22 2000 8:34PM - - -
-
- http://c.moreover.com/click/here.pl?x13533488 - XML Linking Language (XLink) and XML Base Specifications Issued as W3C Proposed Recommenda - Xml - text - moreover... - - http://www.xml.com/ - Dec 22 2000 8:34PM - - -
-
- http://c.moreover.com/click/here.pl?x13533492 - W3C Releases XHTML Basic Specification as a W3C Recommendation - Xml - text - moreover... - - http://www.xml.com/ - Dec 22 2000 8:34PM - - -
-
- http://c.moreover.com/click/here.pl?x13521827 - Java, Xml And Oracle9i(TM) Make A Great Team - Java Industry Connection - text - moreover... - - http://industry.java.sun.com/javanews/more/hotnews/ - Dec 22 2000 3:21PM - - -
-
- http://c.moreover.com/click/here.pl?x13511233 - Competing initiatives to vie for security standard - ZDNet - text - moreover... - - http://www.zdnet.com/eweek/filters/news/ - Dec 22 2000 10:54AM - - -
-
- http://c.moreover.com/click/here.pl?x13492397 - Oracle Provides Developers with Great Xml Reading This Holiday Season - Java Industry Connection - text - moreover... - - http://industry.java.sun.com/javanews/more/hotnews/ - Dec 21 2000 8:08PM - - -
-
- http://c.moreover.com/click/here.pl?x13491292 - XML as the great peacemaker - Extensible Markup Language Accomplished The Seemingly Impossible This Year: It B - Hospitality Net - text - moreover... - - http://www.hospitalitynet.org/news/list.htm?c=2000 - Dec 21 2000 7:45PM - - -
-
- http://c.moreover.com/click/here.pl?x13484758 - XML as the great peacemaker - CNET - text - moreover... - - http://news.cnet.com/news/0-1003.html?tag=st.ne.1002.dir.1003 - Dec 21 2000 4:41PM - - -
-
- http://c.moreover.com/click/here.pl?x13480896 - COOP Switzerland Selects Mercator as Integration Platform - Stockhouse Canada - text - moreover... - - http://www.stockhouse.ca/news/ - Dec 21 2000 1:55PM - - -
-
- http://c.moreover.com/click/here.pl?x13471023 - Competing XML Specs Move Toward a Union - Internet World - text - moreover... - - http://www.internetworld.com/ - Dec 21 2000 11:14AM - - -
-
- http://c.moreover.com/click/here.pl?x13452280 - Next-generation XHTML stripped down for handhelds - CNET - text - moreover... - - http://news.cnet.com/news/0-1005.html?tag=st.ne.1002.dir.1005 - Dec 20 2000 9:11PM - - -
-
- http://c.moreover.com/click/here.pl?x13451789 - Xml Powers Oracle9i(TM) Dynamic Services - Java Industry Connection - text - moreover... - - http://industry.java.sun.com/javanews/more/hotnews/ - Dec 20 2000 9:05PM - - -
-
- http://c.moreover.com/click/here.pl?x13442097 - XML DOM reference guide - ASPWire - text - moreover... - - http://aspwire.com/ - Dec 20 2000 6:26PM - - -
-
- http://c.moreover.com/click/here.pl?x13424117 - Repeat/Xqsite And Bowstreet Team to Deliver Integrated Xml Solutions - Java Industry Connection - text - moreover... - - http://industry.java.sun.com/javanews/more/hotnews/ - Dec 20 2000 9:04AM - - -
- - diff --git a/test/rexml/data/much_ado.xml b/test/rexml/data/much_ado.xml deleted file mode 100644 index f008fadbb06bfb..00000000000000 --- a/test/rexml/data/much_ado.xml +++ /dev/null @@ -1,6850 +0,0 @@ - - -Much Ado about Nothing - - -

Text placed in the public domain by Moby Lexical Tools, 1992.

-

SGML markup by Jon Bosak, 1992-1994.

-

XML version by Jon Bosak, 1996-1998.

-

This work may be freely copied and distributed worldwide.

- - - - -Dramatis Personae - -DON PEDRO, prince of Arragon. -DON JOHN, his bastard brother. -CLAUDIO, a young lord of Florence. -BENEDICK, a young lord of Padua. -LEONATO, governor of Messina. -ANTONIO, his brother. -BALTHASAR, attendant on Don Pedro. - - -CONRADE -BORACHIO -followers of Don John. - - -FRIAR FRANCIS -DOGBERRY, a constable. -VERGES, a headborough. -A Sexton. -A Boy. -HERO, daughter to Leonato. -BEATRICE, niece to Leonato. - - -MARGARET -URSULA -gentlewomen attending on Hero. - - -Messengers, Watch, Attendants, &c. - - -SCENE Messina. - -MUCH ADO ABOUT NOTHING - -ACT I - -SCENE I. Before LEONATO'S house. -Enter LEONATO, HERO, and BEATRICE, with a -Messenger - - -LEONATO -I learn in this letter that Don Peter of Arragon -comes this night to Messina. - - - -Messenger -He is very near by this: he was not three leagues off -when I left him. - - - -LEONATO -How many gentlemen have you lost in this action? - - - -Messenger -But few of any sort, and none of name. - - - -LEONATO -A victory is twice itself when the achiever brings -home full numbers. I find here that Don Peter hath -bestowed much honour on a young Florentine called Claudio. - - - -Messenger -Much deserved on his part and equally remembered by -Don Pedro: he hath borne himself beyond the -promise of his age, doing, in the figure of a lamb, -the feats of a lion: he hath indeed better -bettered expectation than you must expect of me to -tell you how. - - - -LEONATO -He hath an uncle here in Messina will be very much -glad of it. - - - -Messenger -I have already delivered him letters, and there -appears much joy in him; even so much that joy could -not show itself modest enough without a badge of -bitterness. - - - -LEONATO -Did he break out into tears? - - - -Messenger -In great measure. - - - -LEONATO -A kind overflow of kindness: there are no faces -truer than those that are so washed. How much -better is it to weep at joy than to joy at weeping! - - - -BEATRICE -I pray you, is Signior Mountanto returned from the -wars or no? - - - -Messenger -I know none of that name, lady: there was none such -in the army of any sort. - - - -LEONATO -What is he that you ask for, niece? - - - -HERO -My cousin means Signior Benedick of Padua. - - - -Messenger -O, he's returned; and as pleasant as ever he was. - - - -BEATRICE -He set up his bills here in Messina and challenged -Cupid at the flight; and my uncle's fool, reading -the challenge, subscribed for Cupid, and challenged -him at the bird-bolt. I pray you, how many hath he -killed and eaten in these wars? But how many hath -he killed? for indeed I promised to eat all of his killing. - - - -LEONATO -Faith, niece, you tax Signior Benedick too much; -but he'll be meet with you, I doubt it not. - - - -Messenger -He hath done good service, lady, in these wars. - - - -BEATRICE -You had musty victual, and he hath holp to eat it: -he is a very valiant trencherman; he hath an -excellent stomach. - - - -Messenger -And a good soldier too, lady. - - - -BEATRICE -And a good soldier to a lady: but what is he to a lord? - - - -Messenger -A lord to a lord, a man to a man; stuffed with all -honourable virtues. - - - -BEATRICE -It is so, indeed; he is no less than a stuffed man: -but for the stuffing,--well, we are all mortal. - - - -LEONATO -You must not, sir, mistake my niece. There is a -kind of merry war betwixt Signior Benedick and her: -they never meet but there's a skirmish of wit -between them. - - - -BEATRICE -Alas! he gets nothing by that. In our last -conflict four of his five wits went halting off, and -now is the whole man governed with one: so that if -he have wit enough to keep himself warm, let him -bear it for a difference between himself and his -horse; for it is all the wealth that he hath left, -to be known a reasonable creature. Who is his -companion now? He hath every month a new sworn brother. - - - -Messenger -Is't possible? - - - -BEATRICE -Very easily possible: he wears his faith but as -the fashion of his hat; it ever changes with the -next block. - - - -Messenger -I see, lady, the gentleman is not in your books. - - - -BEATRICE -No; an he were, I would burn my study. But, I pray -you, who is his companion? Is there no young -squarer now that will make a voyage with him to the devil? - - - -Messenger -He is most in the company of the right noble Claudio. - - - -BEATRICE -O Lord, he will hang upon him like a disease: he -is sooner caught than the pestilence, and the taker -runs presently mad. God help the noble Claudio! if -he have caught the Benedick, it will cost him a -thousand pound ere a' be cured. - - - -Messenger -I will hold friends with you, lady. - - - -BEATRICE -Do, good friend. - - - -LEONATO -You will never run mad, niece. - - - -BEATRICE -No, not till a hot January. - - - -Messenger -Don Pedro is approached. - - - -Enter DON PEDRO, DON JOHN, CLAUDIO, BENEDICK, -and BALTHASAR - - -DON PEDRO -Good Signior Leonato, you are come to meet your -trouble: the fashion of the world is to avoid -cost, and you encounter it. - - - -LEONATO -Never came trouble to my house in the likeness of -your grace: for trouble being gone, comfort should -remain; but when you depart from me, sorrow abides -and happiness takes his leave. - - - -DON PEDRO -You embrace your charge too willingly. I think this -is your daughter. - - - -LEONATO -Her mother hath many times told me so. - - - -BENEDICK -Were you in doubt, sir, that you asked her? - - - -LEONATO -Signior Benedick, no; for then were you a child. - - - -DON PEDRO -You have it full, Benedick: we may guess by this -what you are, being a man. Truly, the lady fathers -herself. Be happy, lady; for you are like an -honourable father. - - - -BENEDICK -If Signior Leonato be her father, she would not -have his head on her shoulders for all Messina, as -like him as she is. - - - -BEATRICE -I wonder that you will still be talking, Signior -Benedick: nobody marks you. - - - -BENEDICK -What, my dear Lady Disdain! are you yet living? - - - -BEATRICE -Is it possible disdain should die while she hath -such meet food to feed it as Signior Benedick? -Courtesy itself must convert to disdain, if you come -in her presence. - - - -BENEDICK -Then is courtesy a turncoat. But it is certain I -am loved of all ladies, only you excepted: and I -would I could find in my heart that I had not a hard -heart; for, truly, I love none. - - - -BEATRICE -A dear happiness to women: they would else have -been troubled with a pernicious suitor. I thank God -and my cold blood, I am of your humour for that: I -had rather hear my dog bark at a crow than a man -swear he loves me. - - - -BENEDICK -God keep your ladyship still in that mind! so some -gentleman or other shall 'scape a predestinate -scratched face. - - - -BEATRICE -Scratching could not make it worse, an 'twere such -a face as yours were. - - - -BENEDICK -Well, you are a rare parrot-teacher. - - - -BEATRICE -A bird of my tongue is better than a beast of yours. - - - -BENEDICK -I would my horse had the speed of your tongue, and -so good a continuer. But keep your way, i' God's -name; I have done. - - - -BEATRICE -You always end with a jade's trick: I know you of old. - - - -DON PEDRO -That is the sum of all, Leonato. Signior Claudio -and Signior Benedick, my dear friend Leonato hath -invited you all. I tell him we shall stay here at -the least a month; and he heartily prays some -occasion may detain us longer. I dare swear he is no -hypocrite, but prays from his heart. - - - -LEONATO -If you swear, my lord, you shall not be forsworn. -To DON JOHN -Let me bid you welcome, my lord: being reconciled to -the prince your brother, I owe you all duty. - - - -DON JOHN -I thank you: I am not of many words, but I thank -you. - - - -LEONATO -Please it your grace lead on? - - - -DON PEDRO -Your hand, Leonato; we will go together. - - - -Exeunt all except BENEDICK and CLAUDIO - - -CLAUDIO -Benedick, didst thou note the daughter of Signior Leonato? - - - -BENEDICK -I noted her not; but I looked on her. - - - -CLAUDIO -Is she not a modest young lady? - - - -BENEDICK -Do you question me, as an honest man should do, for -my simple true judgment; or would you have me speak -after my custom, as being a professed tyrant to their sex? - - - -CLAUDIO -No; I pray thee speak in sober judgment. - - - -BENEDICK -Why, i' faith, methinks she's too low for a high -praise, too brown for a fair praise and too little -for a great praise: only this commendation I can -afford her, that were she other than she is, she -were unhandsome; and being no other but as she is, I -do not like her. - - - -CLAUDIO -Thou thinkest I am in sport: I pray thee tell me -truly how thou likest her. - - - -BENEDICK -Would you buy her, that you inquire after her? - - - -CLAUDIO -Can the world buy such a jewel? - - - -BENEDICK -Yea, and a case to put it into. But speak you this -with a sad brow? or do you play the flouting Jack, -to tell us Cupid is a good hare-finder and Vulcan a -rare carpenter? Come, in what key shall a man take -you, to go in the song? - - - -CLAUDIO -In mine eye she is the sweetest lady that ever I -looked on. - - - -BENEDICK -I can see yet without spectacles and I see no such -matter: there's her cousin, an she were not -possessed with a fury, exceeds her as much in beauty -as the first of May doth the last of December. But I -hope you have no intent to turn husband, have you? - - - -CLAUDIO -I would scarce trust myself, though I had sworn the -contrary, if Hero would be my wife. - - - -BENEDICK -Is't come to this? In faith, hath not the world -one man but he will wear his cap with suspicion? -Shall I never see a bachelor of three-score again? -Go to, i' faith; an thou wilt needs thrust thy neck -into a yoke, wear the print of it and sigh away -Sundays. Look Don Pedro is returned to seek you. - - - -Re-enter DON PEDRO - - -DON PEDRO -What secret hath held you here, that you followed -not to Leonato's? - - - -BENEDICK -I would your grace would constrain me to tell. - - - -DON PEDRO -I charge thee on thy allegiance. - - - -BENEDICK -You hear, Count Claudio: I can be secret as a dumb -man; I would have you think so; but, on my -allegiance, mark you this, on my allegiance. He is -in love. With who? now that is your grace's part. -Mark how short his answer is;--With Hero, Leonato's -short daughter. - - - -CLAUDIO -If this were so, so were it uttered. - - - -BENEDICK -Like the old tale, my lord: 'it is not so, nor -'twas not so, but, indeed, God forbid it should be -so.' - - - -CLAUDIO -If my passion change not shortly, God forbid it -should be otherwise. - - - -DON PEDRO -Amen, if you love her; for the lady is very well worthy. - - - -CLAUDIO -You speak this to fetch me in, my lord. - - - -DON PEDRO -By my troth, I speak my thought. - - - -CLAUDIO -And, in faith, my lord, I spoke mine. - - - -BENEDICK -And, by my two faiths and troths, my lord, I spoke mine. - - - -CLAUDIO -That I love her, I feel. - - - -DON PEDRO -That she is worthy, I know. - - - -BENEDICK -That I neither feel how she should be loved nor -know how she should be worthy, is the opinion that -fire cannot melt out of me: I will die in it at the stake. - - - -DON PEDRO -Thou wast ever an obstinate heretic in the despite -of beauty. - - - -CLAUDIO -And never could maintain his part but in the force -of his will. - - - -BENEDICK -That a woman conceived me, I thank her; that she -brought me up, I likewise give her most humble -thanks: but that I will have a recheat winded in my -forehead, or hang my bugle in an invisible baldrick, -all women shall pardon me. Because I will not do -them the wrong to mistrust any, I will do myself the -right to trust none; and the fine is, for the which -I may go the finer, I will live a bachelor. - - - -DON PEDRO -I shall see thee, ere I die, look pale with love. - - - -BENEDICK -With anger, with sickness, or with hunger, my lord, -not with love: prove that ever I lose more blood -with love than I will get again with drinking, pick -out mine eyes with a ballad-maker's pen and hang me -up at the door of a brothel-house for the sign of -blind Cupid. - - - -DON PEDRO -Well, if ever thou dost fall from this faith, thou -wilt prove a notable argument. - - - -BENEDICK -If I do, hang me in a bottle like a cat and shoot -at me; and he that hits me, let him be clapped on -the shoulder, and called Adam. - - - -DON PEDRO -Well, as time shall try: 'In time the savage bull -doth bear the yoke.' - - - -BENEDICK -The savage bull may; but if ever the sensible -Benedick bear it, pluck off the bull's horns and set -them in my forehead: and let me be vilely painted, -and in such great letters as they write 'Here is -good horse to hire,' let them signify under my sign -'Here you may see Benedick the married man.' - - - -CLAUDIO -If this should ever happen, thou wouldst be horn-mad. - - - -DON PEDRO -Nay, if Cupid have not spent all his quiver in -Venice, thou wilt quake for this shortly. - - - -BENEDICK -I look for an earthquake too, then. - - - -DON PEDRO -Well, you temporize with the hours. In the -meantime, good Signior Benedick, repair to -Leonato's: commend me to him and tell him I will -not fail him at supper; for indeed he hath made -great preparation. - - - -BENEDICK -I have almost matter enough in me for such an -embassage; and so I commit you-- - - - -CLAUDIO -To the tuition of God: From my house, if I had it,-- - - - -DON PEDRO -The sixth of July: Your loving friend, Benedick. - - - -BENEDICK -Nay, mock not, mock not. The body of your -discourse is sometime guarded with fragments, and -the guards are but slightly basted on neither: ere -you flout old ends any further, examine your -conscience: and so I leave you. - - - -Exit - - -CLAUDIO -My liege, your highness now may do me good. - - - -DON PEDRO -My love is thine to teach: teach it but how, -And thou shalt see how apt it is to learn -Any hard lesson that may do thee good. - - - -CLAUDIO -Hath Leonato any son, my lord? - - - -DON PEDRO -No child but Hero; she's his only heir. -Dost thou affect her, Claudio? - - - -CLAUDIO -O, my lord, -When you went onward on this ended action, -I look'd upon her with a soldier's eye, -That liked, but had a rougher task in hand -Than to drive liking to the name of love: -But now I am return'd and that war-thoughts -Have left their places vacant, in their rooms -Come thronging soft and delicate desires, -All prompting me how fair young Hero is, -Saying, I liked her ere I went to wars. - - - -DON PEDRO -Thou wilt be like a lover presently -And tire the hearer with a book of words. -If thou dost love fair Hero, cherish it, -And I will break with her and with her father, -And thou shalt have her. Was't not to this end -That thou began'st to twist so fine a story? - - - -CLAUDIO -How sweetly you do minister to love, -That know love's grief by his complexion! -But lest my liking might too sudden seem, -I would have salved it with a longer treatise. - - - -DON PEDRO -What need the bridge much broader than the flood? -The fairest grant is the necessity. -Look, what will serve is fit: 'tis once, thou lovest, -And I will fit thee with the remedy. -I know we shall have revelling to-night: -I will assume thy part in some disguise -And tell fair Hero I am Claudio, -And in her bosom I'll unclasp my heart -And take her hearing prisoner with the force -And strong encounter of my amorous tale: -Then after to her father will I break; -And the conclusion is, she shall be thine. -In practise let us put it presently. - - - -Exeunt - - -SCENE II. A room in LEONATO's house. -Enter LEONATO and ANTONIO, meeting - - -LEONATO -How now, brother! Where is my cousin, your son? -hath he provided this music? - - - -ANTONIO -He is very busy about it. But, brother, I can tell -you strange news that you yet dreamt not of. - - - -LEONATO -Are they good? - - - -ANTONIO -As the event stamps them: but they have a good -cover; they show well outward. The prince and Count -Claudio, walking in a thick-pleached alley in mine -orchard, were thus much overheard by a man of mine: -the prince discovered to Claudio that he loved my -niece your daughter and meant to acknowledge it -this night in a dance: and if he found her -accordant, he meant to take the present time by the -top and instantly break with you of it. - - - -LEONATO -Hath the fellow any wit that told you this? - - - -ANTONIO -A good sharp fellow: I will send for him; and -question him yourself. - - - -LEONATO -No, no; we will hold it as a dream till it appear -itself: but I will acquaint my daughter withal, -that she may be the better prepared for an answer, -if peradventure this be true. Go you and tell her of it. -Enter Attendants -Cousins, you know what you have to do. O, I cry you -mercy, friend; go you with me, and I will use your -skill. Good cousin, have a care this busy time. - - - -Exeunt - - -SCENE III. The same. -Enter DON JOHN and CONRADE - - -CONRADE -What the good-year, my lord! why are you thus out -of measure sad? - - - -DON JOHN -There is no measure in the occasion that breeds; -therefore the sadness is without limit. - - - -CONRADE -You should hear reason. - - - -DON JOHN -And when I have heard it, what blessing brings it? - - - -CONRADE -If not a present remedy, at least a patient -sufferance. - - - -DON JOHN -I wonder that thou, being, as thou sayest thou art, -born under Saturn, goest about to apply a moral -medicine to a mortifying mischief. I cannot hide -what I am: I must be sad when I have cause and smile -at no man's jests, eat when I have stomach and wait -for no man's leisure, sleep when I am drowsy and -tend on no man's business, laugh when I am merry and -claw no man in his humour. - - - -CONRADE -Yea, but you must not make the full show of this -till you may do it without controlment. You have of -late stood out against your brother, and he hath -ta'en you newly into his grace; where it is -impossible you should take true root but by the -fair weather that you make yourself: it is needful -that you frame the season for your own harvest. - - - -DON JOHN -I had rather be a canker in a hedge than a rose in -his grace, and it better fits my blood to be -disdained of all than to fashion a carriage to rob -love from any: in this, though I cannot be said to -be a flattering honest man, it must not be denied -but I am a plain-dealing villain. I am trusted with -a muzzle and enfranchised with a clog; therefore I -have decreed not to sing in my cage. If I had my -mouth, I would bite; if I had my liberty, I would do -my liking: in the meantime let me be that I am and -seek not to alter me. - - - -CONRADE -Can you make no use of your discontent? - - - -DON JOHN -I make all use of it, for I use it only. -Who comes here? -Enter BORACHIO -What news, Borachio? - - - -BORACHIO -I came yonder from a great supper: the prince your -brother is royally entertained by Leonato: and I -can give you intelligence of an intended marriage. - - - -DON JOHN -Will it serve for any model to build mischief on? -What is he for a fool that betroths himself to -unquietness? - - - -BORACHIO -Marry, it is your brother's right hand. - - - -DON JOHN -Who? the most exquisite Claudio? - - - -BORACHIO -Even he. - - - -DON JOHN -A proper squire! And who, and who? which way looks -he? - - - -BORACHIO -Marry, on Hero, the daughter and heir of Leonato. - - - -DON JOHN -A very forward March-chick! How came you to this? - - - -BORACHIO -Being entertained for a perfumer, as I was smoking a -musty room, comes me the prince and Claudio, hand -in hand in sad conference: I whipt me behind the -arras; and there heard it agreed upon that the -prince should woo Hero for himself, and having -obtained her, give her to Count Claudio. - - - -DON JOHN -Come, come, let us thither: this may prove food to -my displeasure. That young start-up hath all the -glory of my overthrow: if I can cross him any way, I -bless myself every way. You are both sure, and will assist me? - - - -CONRADE -To the death, my lord. - - - -DON JOHN -Let us to the great supper: their cheer is the -greater that I am subdued. Would the cook were of -my mind! Shall we go prove what's to be done? - - - -BORACHIO -We'll wait upon your lordship. - - - -Exeunt - - - - -ACT II - -SCENE I. A hall in LEONATO'S house. -Enter LEONATO, ANTONIO, HERO, BEATRICE, and others - - -LEONATO -Was not Count John here at supper? - - - -ANTONIO -I saw him not. - - - -BEATRICE -How tartly that gentleman looks! I never can see -him but I am heart-burned an hour after. - - - -HERO -He is of a very melancholy disposition. - - - -BEATRICE -He were an excellent man that were made just in the -midway between him and Benedick: the one is too -like an image and says nothing, and the other too -like my lady's eldest son, evermore tattling. - - - -LEONATO -Then half Signior Benedick's tongue in Count John's -mouth, and half Count John's melancholy in Signior -Benedick's face,-- - - - -BEATRICE -With a good leg and a good foot, uncle, and money -enough in his purse, such a man would win any woman -in the world, if a' could get her good-will. - - - -LEONATO -By my troth, niece, thou wilt never get thee a -husband, if thou be so shrewd of thy tongue. - - - -ANTONIO -In faith, she's too curst. - - - -BEATRICE -Too curst is more than curst: I shall lessen God's -sending that way; for it is said, 'God sends a curst -cow short horns;' but to a cow too curst he sends none. - - - -LEONATO -So, by being too curst, God will send you no horns. - - - -BEATRICE -Just, if he send me no husband; for the which -blessing I am at him upon my knees every morning and -evening. Lord, I could not endure a husband with a -beard on his face: I had rather lie in the woollen. - - - -LEONATO -You may light on a husband that hath no beard. - - - -BEATRICE -What should I do with him? dress him in my apparel -and make him my waiting-gentlewoman? He that hath a -beard is more than a youth, and he that hath no -beard is less than a man: and he that is more than -a youth is not for me, and he that is less than a -man, I am not for him: therefore, I will even take -sixpence in earnest of the bear-ward, and lead his -apes into hell. - - - -LEONATO -Well, then, go you into hell? - - - -BEATRICE -No, but to the gate; and there will the devil meet -me, like an old cuckold, with horns on his head, and -say 'Get you to heaven, Beatrice, get you to -heaven; here's no place for you maids:' so deliver -I up my apes, and away to Saint Peter for the -heavens; he shows me where the bachelors sit, and -there live we as merry as the day is long. - - - -ANTONIO -To HERO Well, niece, I trust you will be ruled -by your father. - - - -BEATRICE -Yes, faith; it is my cousin's duty to make curtsy -and say 'Father, as it please you.' But yet for all -that, cousin, let him be a handsome fellow, or else -make another curtsy and say 'Father, as it please -me.' - - - -LEONATO -Well, niece, I hope to see you one day fitted with a husband. - - - -BEATRICE -Not till God make men of some other metal than -earth. Would it not grieve a woman to be -overmastered with a pierce of valiant dust? to make -an account of her life to a clod of wayward marl? -No, uncle, I'll none: Adam's sons are my brethren; -and, truly, I hold it a sin to match in my kindred. - - - -LEONATO -Daughter, remember what I told you: if the prince -do solicit you in that kind, you know your answer. - - - -BEATRICE -The fault will be in the music, cousin, if you be -not wooed in good time: if the prince be too -important, tell him there is measure in every thing -and so dance out the answer. For, hear me, Hero: -wooing, wedding, and repenting, is as a Scotch jig, -a measure, and a cinque pace: the first suit is hot -and hasty, like a Scotch jig, and full as -fantastical; the wedding, mannerly-modest, as a -measure, full of state and ancientry; and then comes -repentance and, with his bad legs, falls into the -cinque pace faster and faster, till he sink into his grave. - - - -LEONATO -Cousin, you apprehend passing shrewdly. - - - -BEATRICE -I have a good eye, uncle; I can see a church by daylight. - - - -LEONATO -The revellers are entering, brother: make good room. - - -All put on their masks -Enter DON PEDRO, CLAUDIO, BENEDICK, BALTHASAR, -DON JOHN, BORACHIO, MARGARET, URSULA and others, masked - - -DON PEDRO -Lady, will you walk about with your friend? - - - -HERO -So you walk softly and look sweetly and say nothing, -I am yours for the walk; and especially when I walk away. - - - -DON PEDRO -With me in your company? - - - -HERO -I may say so, when I please. - - - -DON PEDRO -And when please you to say so? - - - -HERO -When I like your favour; for God defend the lute -should be like the case! - - - -DON PEDRO -My visor is Philemon's roof; within the house is Jove. - - - -HERO -Why, then, your visor should be thatched. - - - -DON PEDRO -Speak low, if you speak love. - - - -Drawing her aside - - -BALTHASAR -Well, I would you did like me. - - - -MARGARET -So would not I, for your own sake; for I have many -ill-qualities. - - - -BALTHASAR -Which is one? - - - -MARGARET -I say my prayers aloud. - - - -BALTHASAR -I love you the better: the hearers may cry, Amen. - - - -MARGARET -God match me with a good dancer! - - - -BALTHASAR -Amen. - - - -MARGARET -And God keep him out of my sight when the dance is -done! Answer, clerk. - - - -BALTHASAR -No more words: the clerk is answered. - - - -URSULA -I know you well enough; you are Signior Antonio. - - - -ANTONIO -At a word, I am not. - - - -URSULA -I know you by the waggling of your head. - - - -ANTONIO -To tell you true, I counterfeit him. - - - -URSULA -You could never do him so ill-well, unless you were -the very man. Here's his dry hand up and down: you -are he, you are he. - - - -ANTONIO -At a word, I am not. - - - -URSULA -Come, come, do you think I do not know you by your -excellent wit? can virtue hide itself? Go to, -mum, you are he: graces will appear, and there's an -end. - - - -BEATRICE -Will you not tell me who told you so? - - - -BENEDICK -No, you shall pardon me. - - - -BEATRICE -Nor will you not tell me who you are? - - - -BENEDICK -Not now. - - - -BEATRICE -That I was disdainful, and that I had my good wit -out of the 'Hundred Merry Tales:'--well this was -Signior Benedick that said so. - - - -BENEDICK -What's he? - - - -BEATRICE -I am sure you know him well enough. - - - -BENEDICK -Not I, believe me. - - - -BEATRICE -Did he never make you laugh? - - - -BENEDICK -I pray you, what is he? - - - -BEATRICE -Why, he is the prince's jester: a very dull fool; -only his gift is in devising impossible slanders: -none but libertines delight in him; and the -commendation is not in his wit, but in his villany; -for he both pleases men and angers them, and then -they laugh at him and beat him. I am sure he is in -the fleet: I would he had boarded me. - - - -BENEDICK -When I know the gentleman, I'll tell him what you say. - - - -BEATRICE -Do, do: he'll but break a comparison or two on me; -which, peradventure not marked or not laughed at, -strikes him into melancholy; and then there's a -partridge wing saved, for the fool will eat no -supper that night. -Music -We must follow the leaders. - - - -BENEDICK -In every good thing. - - - -BEATRICE -Nay, if they lead to any ill, I will leave them at -the next turning. - - - -Dance. Then exeunt all except DON JOHN, BORACHIO, -and CLAUDIO - - -DON JOHN -Sure my brother is amorous on Hero and hath -withdrawn her father to break with him about it. -The ladies follow her and but one visor remains. - - - -BORACHIO -And that is Claudio: I know him by his bearing. - - - -DON JOHN -Are not you Signior Benedick? - - - -CLAUDIO -You know me well; I am he. - - - -DON JOHN -Signior, you are very near my brother in his love: -he is enamoured on Hero; I pray you, dissuade him -from her: she is no equal for his birth: you may -do the part of an honest man in it. - - - -CLAUDIO -How know you he loves her? - - - -DON JOHN -I heard him swear his affection. - - - -BORACHIO -So did I too; and he swore he would marry her to-night. - - - -DON JOHN -Come, let us to the banquet. - - - -Exeunt DON JOHN and BORACHIO - - -CLAUDIO -Thus answer I in the name of Benedick, -But hear these ill news with the ears of Claudio. -'Tis certain so; the prince wooes for himself. -Friendship is constant in all other things -Save in the office and affairs of love: -Therefore, all hearts in love use their own tongues; -Let every eye negotiate for itself -And trust no agent; for beauty is a witch -Against whose charms faith melteth into blood. -This is an accident of hourly proof, -Which I mistrusted not. Farewell, therefore, Hero! - - - -Re-enter BENEDICK - - -BENEDICK -Count Claudio? - - - -CLAUDIO -Yea, the same. - - - -BENEDICK -Come, will you go with me? - - - -CLAUDIO -Whither? - - - -BENEDICK -Even to the next willow, about your own business, -county. What fashion will you wear the garland of? -about your neck, like an usurer's chain? or under -your arm, like a lieutenant's scarf? You must wear -it one way, for the prince hath got your Hero. - - - -CLAUDIO -I wish him joy of her. - - - -BENEDICK -Why, that's spoken like an honest drovier: so they -sell bullocks. But did you think the prince would -have served you thus? - - - -CLAUDIO -I pray you, leave me. - - - -BENEDICK -Ho! now you strike like the blind man: 'twas the -boy that stole your meat, and you'll beat the post. - - - -CLAUDIO -If it will not be, I'll leave you. - - - -Exit - - -BENEDICK -Alas, poor hurt fowl! now will he creep into sedges. -But that my Lady Beatrice should know me, and not -know me! The prince's fool! Ha? It may be I go -under that title because I am merry. Yea, but so I -am apt to do myself wrong; I am not so reputed: it -is the base, though bitter, disposition of Beatrice -that puts the world into her person and so gives me -out. Well, I'll be revenged as I may. - - - -Re-enter DON PEDRO - - -DON PEDRO -Now, signior, where's the count? did you see him? - - - -BENEDICK -Troth, my lord, I have played the part of Lady Fame. -I found him here as melancholy as a lodge in a -warren: I told him, and I think I told him true, -that your grace had got the good will of this young -lady; and I offered him my company to a willow-tree, -either to make him a garland, as being forsaken, or -to bind him up a rod, as being worthy to be whipped. - - - -DON PEDRO -To be whipped! What's his fault? - - - -BENEDICK -The flat transgression of a schoolboy, who, being -overjoyed with finding a birds' nest, shows it his -companion, and he steals it. - - - -DON PEDRO -Wilt thou make a trust a transgression? The -transgression is in the stealer. - - - -BENEDICK -Yet it had not been amiss the rod had been made, -and the garland too; for the garland he might have -worn himself, and the rod he might have bestowed on -you, who, as I take it, have stolen his birds' nest. - - - -DON PEDRO -I will but teach them to sing, and restore them to -the owner. - - - -BENEDICK -If their singing answer your saying, by my faith, -you say honestly. - - - -DON PEDRO -The Lady Beatrice hath a quarrel to you: the -gentleman that danced with her told her she is much -wronged by you. - - - -BENEDICK -O, she misused me past the endurance of a block! -an oak but with one green leaf on it would have -answered her; my very visor began to assume life and -scold with her. She told me, not thinking I had been -myself, that I was the prince's jester, that I was -duller than a great thaw; huddling jest upon jest -with such impossible conveyance upon me that I stood -like a man at a mark, with a whole army shooting at -me. She speaks poniards, and every word stabs: -if her breath were as terrible as her terminations, -there were no living near her; she would infect to -the north star. I would not marry her, though she -were endowed with all that Adam bad left him before -he transgressed: she would have made Hercules have -turned spit, yea, and have cleft his club to make -the fire too. Come, talk not of her: you shall find -her the infernal Ate in good apparel. I would to God -some scholar would conjure her; for certainly, while -she is here, a man may live as quiet in hell as in a -sanctuary; and people sin upon purpose, because they -would go thither; so, indeed, all disquiet, horror -and perturbation follows her. - - - -DON PEDRO -Look, here she comes. - - - -Enter CLAUDIO, BEATRICE, HERO, and LEONATO - - -BENEDICK -Will your grace command me any service to the -world's end? I will go on the slightest errand now -to the Antipodes that you can devise to send me on; -I will fetch you a tooth-picker now from the -furthest inch of Asia, bring you the length of -Prester John's foot, fetch you a hair off the great -Cham's beard, do you any embassage to the Pigmies, -rather than hold three words' conference with this -harpy. You have no employment for me? - - - -DON PEDRO -None, but to desire your good company. - - - -BENEDICK -O God, sir, here's a dish I love not: I cannot -endure my Lady Tongue. - - - -Exit - - -DON PEDRO -Come, lady, come; you have lost the heart of -Signior Benedick. - - - -BEATRICE -Indeed, my lord, he lent it me awhile; and I gave -him use for it, a double heart for his single one: -marry, once before he won it of me with false dice, -therefore your grace may well say I have lost it. - - - -DON PEDRO -You have put him down, lady, you have put him down. - - - -BEATRICE -So I would not he should do me, my lord, lest I -should prove the mother of fools. I have brought -Count Claudio, whom you sent me to seek. - - - -DON PEDRO -Why, how now, count! wherefore are you sad? - - - -CLAUDIO -Not sad, my lord. - - - -DON PEDRO -How then? sick? - - - -CLAUDIO -Neither, my lord. - - - -BEATRICE -The count is neither sad, nor sick, nor merry, nor -well; but civil count, civil as an orange, and -something of that jealous complexion. - - - -DON PEDRO -I' faith, lady, I think your blazon to be true; -though, I'll be sworn, if he be so, his conceit is -false. Here, Claudio, I have wooed in thy name, and -fair Hero is won: I have broke with her father, -and his good will obtained: name the day of -marriage, and God give thee joy! - - - -LEONATO -Count, take of me my daughter, and with her my -fortunes: his grace hath made the match, and an -grace say Amen to it. - - - -BEATRICE -Speak, count, 'tis your cue. - - - -CLAUDIO -Silence is the perfectest herald of joy: I were -but little happy, if I could say how much. Lady, as -you are mine, I am yours: I give away myself for -you and dote upon the exchange. - - - -BEATRICE -Speak, cousin; or, if you cannot, stop his mouth -with a kiss, and let not him speak neither. - - - -DON PEDRO -In faith, lady, you have a merry heart. - - - -BEATRICE -Yea, my lord; I thank it, poor fool, it keeps on -the windy side of care. My cousin tells him in his -ear that he is in her heart. - - - -CLAUDIO -And so she doth, cousin. - - - -BEATRICE -Good Lord, for alliance! Thus goes every one to the -world but I, and I am sunburnt; I may sit in a -corner and cry heigh-ho for a husband! - - - -DON PEDRO -Lady Beatrice, I will get you one. - - - -BEATRICE -I would rather have one of your father's getting. -Hath your grace ne'er a brother like you? Your -father got excellent husbands, if a maid could come by them. - - - -DON PEDRO -Will you have me, lady? - - - -BEATRICE -No, my lord, unless I might have another for -working-days: your grace is too costly to wear -every day. But, I beseech your grace, pardon me: I -was born to speak all mirth and no matter. - - - -DON PEDRO -Your silence most offends me, and to be merry best -becomes you; for, out of question, you were born in -a merry hour. - - - -BEATRICE -No, sure, my lord, my mother cried; but then there -was a star danced, and under that was I born. -Cousins, God give you joy! - - - -LEONATO -Niece, will you look to those things I told you of? - - - -BEATRICE -I cry you mercy, uncle. By your grace's pardon. - - - -Exit - - -DON PEDRO -By my troth, a pleasant-spirited lady. - - - -LEONATO -There's little of the melancholy element in her, my -lord: she is never sad but when she sleeps, and -not ever sad then; for I have heard my daughter say, -she hath often dreamed of unhappiness and waked -herself with laughing. - - - -DON PEDRO -She cannot endure to hear tell of a husband. - - - -LEONATO -O, by no means: she mocks all her wooers out of suit. - - - -DON PEDRO -She were an excellent wife for Benedict. - - - -LEONATO -O Lord, my lord, if they were but a week married, -they would talk themselves mad. - - - -DON PEDRO -County Claudio, when mean you to go to church? - - - -CLAUDIO -To-morrow, my lord: time goes on crutches till love -have all his rites. - - - -LEONATO -Not till Monday, my dear son, which is hence a just -seven-night; and a time too brief, too, to have all -things answer my mind. - - - -DON PEDRO -Come, you shake the head at so long a breathing: -but, I warrant thee, Claudio, the time shall not go -dully by us. I will in the interim undertake one of -Hercules' labours; which is, to bring Signior -Benedick and the Lady Beatrice into a mountain of -affection the one with the other. I would fain have -it a match, and I doubt not but to fashion it, if -you three will but minister such assistance as I -shall give you direction. - - - -LEONATO -My lord, I am for you, though it cost me ten -nights' watchings. - - - -CLAUDIO -And I, my lord. - - - -DON PEDRO -And you too, gentle Hero? - - - -HERO -I will do any modest office, my lord, to help my -cousin to a good husband. - - - -DON PEDRO -And Benedick is not the unhopefullest husband that -I know. Thus far can I praise him; he is of a noble -strain, of approved valour and confirmed honesty. I -will teach you how to humour your cousin, that she -shall fall in love with Benedick; and I, with your -two helps, will so practise on Benedick that, in -despite of his quick wit and his queasy stomach, he -shall fall in love with Beatrice. If we can do this, -Cupid is no longer an archer: his glory shall be -ours, for we are the only love-gods. Go in with me, -and I will tell you my drift. - - - -Exeunt - - -SCENE II. The same. -Enter DON JOHN and BORACHIO - - -DON JOHN -It is so; the Count Claudio shall marry the -daughter of Leonato. - - - -BORACHIO -Yea, my lord; but I can cross it. - - - -DON JOHN -Any bar, any cross, any impediment will be -medicinable to me: I am sick in displeasure to him, -and whatsoever comes athwart his affection ranges -evenly with mine. How canst thou cross this marriage? - - - -BORACHIO -Not honestly, my lord; but so covertly that no -dishonesty shall appear in me. - - - -DON JOHN -Show me briefly how. - - - -BORACHIO -I think I told your lordship a year since, how much -I am in the favour of Margaret, the waiting -gentlewoman to Hero. - - - -DON JOHN -I remember. - - - -BORACHIO -I can, at any unseasonable instant of the night, -appoint her to look out at her lady's chamber window. - - - -DON JOHN -What life is in that, to be the death of this marriage? - - - -BORACHIO -The poison of that lies in you to temper. Go you to -the prince your brother; spare not to tell him that -he hath wronged his honour in marrying the renowned -Claudio--whose estimation do you mightily hold -up--to a contaminated stale, such a one as Hero. - - - -DON JOHN -What proof shall I make of that? - - - -BORACHIO -Proof enough to misuse the prince, to vex Claudio, -to undo Hero and kill Leonato. Look you for any -other issue? - - - -DON JOHN -Only to despite them, I will endeavour any thing. - - - -BORACHIO -Go, then; find me a meet hour to draw Don Pedro and -the Count Claudio alone: tell them that you know -that Hero loves me; intend a kind of zeal both to the -prince and Claudio, as,--in love of your brother's -honour, who hath made this match, and his friend's -reputation, who is thus like to be cozened with the -semblance of a maid,--that you have discovered -thus. They will scarcely believe this without trial: -offer them instances; which shall bear no less -likelihood than to see me at her chamber-window, -hear me call Margaret Hero, hear Margaret term me -Claudio; and bring them to see this the very night -before the intended wedding,--for in the meantime I -will so fashion the matter that Hero shall be -absent,--and there shall appear such seeming truth -of Hero's disloyalty that jealousy shall be called -assurance and all the preparation overthrown. - - - -DON JOHN -Grow this to what adverse issue it can, I will put -it in practise. Be cunning in the working this, and -thy fee is a thousand ducats. - - - -BORACHIO -Be you constant in the accusation, and my cunning -shall not shame me. - - - -DON JOHN -I will presently go learn their day of marriage. - - - -Exeunt - - -SCENE III. LEONATO'S orchard. -Enter BENEDICK - - -BENEDICK -Boy! - - - -Enter Boy - - -Boy -Signior? - - - -BENEDICK -In my chamber-window lies a book: bring it hither -to me in the orchard. - - - -Boy -I am here already, sir. - - - -BENEDICK -I know that; but I would have thee hence, and here again. -Exit Boy -I do much wonder that one man, seeing how much -another man is a fool when he dedicates his -behaviors to love, will, after he hath laughed at -such shallow follies in others, become the argument -of his own scorn by failing in love: and such a man -is Claudio. I have known when there was no music -with him but the drum and the fife; and now had he -rather hear the tabour and the pipe: I have known -when he would have walked ten mile a-foot to see a -good armour; and now will he lie ten nights awake, -carving the fashion of a new doublet. He was wont to -speak plain and to the purpose, like an honest man -and a soldier; and now is he turned orthography; his -words are a very fantastical banquet, just so many -strange dishes. May I be so converted and see with -these eyes? I cannot tell; I think not: I will not -be sworn, but love may transform me to an oyster; but -I'll take my oath on it, till he have made an oyster -of me, he shall never make me such a fool. One woman -is fair, yet I am well; another is wise, yet I am -well; another virtuous, yet I am well; but till all -graces be in one woman, one woman shall not come in -my grace. Rich she shall be, that's certain; wise, -or I'll none; virtuous, or I'll never cheapen her; -fair, or I'll never look on her; mild, or come not -near me; noble, or not I for an angel; of good -discourse, an excellent musician, and her hair shall -be of what colour it please God. Ha! the prince and -Monsieur Love! I will hide me in the arbour. - - -Withdraws -Enter DON PEDRO, CLAUDIO, and LEONATO - - -DON PEDRO -Come, shall we hear this music? - - - -CLAUDIO -Yea, my good lord. How still the evening is, -As hush'd on purpose to grace harmony! - - - -DON PEDRO -See you where Benedick hath hid himself? - - - -CLAUDIO -O, very well, my lord: the music ended, -We'll fit the kid-fox with a pennyworth. - - - -Enter BALTHASAR with Music - - -DON PEDRO -Come, Balthasar, we'll hear that song again. - - - -BALTHASAR -O, good my lord, tax not so bad a voice -To slander music any more than once. - - - -DON PEDRO -It is the witness still of excellency -To put a strange face on his own perfection. -I pray thee, sing, and let me woo no more. - - - -BALTHASAR -Because you talk of wooing, I will sing; -Since many a wooer doth commence his suit -To her he thinks not worthy, yet he wooes, -Yet will he swear he loves. - - - -DON PEDRO -Now, pray thee, come; -Or, if thou wilt hold longer argument, -Do it in notes. - - - -BALTHASAR -Note this before my notes; -There's not a note of mine that's worth the noting. - - - -DON PEDRO -Why, these are very crotchets that he speaks; -Note, notes, forsooth, and nothing. - - - -Air - - -BENEDICK -Now, divine air! now is his soul ravished! Is it -not strange that sheeps' guts should hale souls out -of men's bodies? Well, a horn for my money, when -all's done. - - - -The Song - - -BALTHASAR -Sigh no more, ladies, sigh no more, -Men were deceivers ever, -One foot in sea and one on shore, -To one thing constant never: -Then sigh not so, but let them go, -And be you blithe and bonny, -Converting all your sounds of woe -Into Hey nonny, nonny. -Sing no more ditties, sing no moe, -Of dumps so dull and heavy; -The fraud of men was ever so, -Since summer first was leafy: -Then sigh not so, &c. - - - -DON PEDRO -By my troth, a good song. - - - -BALTHASAR -And an ill singer, my lord. - - - -DON PEDRO -Ha, no, no, faith; thou singest well enough for a shift. - - - -BENEDICK -An he had been a dog that should have howled thus, -they would have hanged him: and I pray God his bad -voice bode no mischief. I had as lief have heard the -night-raven, come what plague could have come after -it. - - - -DON PEDRO -Yea, marry, dost thou hear, Balthasar? I pray thee, -get us some excellent music; for to-morrow night we -would have it at the Lady Hero's chamber-window. - - - -BALTHASAR -The best I can, my lord. - - - -DON PEDRO -Do so: farewell. -Exit BALTHASAR -Come hither, Leonato. What was it you told me of -to-day, that your niece Beatrice was in love with -Signior Benedick? - - - -CLAUDIO -O, ay: stalk on. stalk on; the fowl sits. I did -never think that lady would have loved any man. - - - -LEONATO -No, nor I neither; but most wonderful that she -should so dote on Signior Benedick, whom she hath in -all outward behaviors seemed ever to abhor. - - - -BENEDICK -Is't possible? Sits the wind in that corner? - - - -LEONATO -By my troth, my lord, I cannot tell what to think -of it but that she loves him with an enraged -affection: it is past the infinite of thought. - - - -DON PEDRO -May be she doth but counterfeit. - - - -CLAUDIO -Faith, like enough. - - - -LEONATO -O God, counterfeit! There was never counterfeit of -passion came so near the life of passion as she -discovers it. - - - -DON PEDRO -Why, what effects of passion shows she? - - - -CLAUDIO -Bait the hook well; this fish will bite. - - - -LEONATO -What effects, my lord? She will sit you, you heard -my daughter tell you how. - - - -CLAUDIO -She did, indeed. - - - -DON PEDRO -How, how, pray you? You amaze me: I would have I -thought her spirit had been invincible against all -assaults of affection. - - - -LEONATO -I would have sworn it had, my lord; especially -against Benedick. - - - -BENEDICK -I should think this a gull, but that the -white-bearded fellow speaks it: knavery cannot, -sure, hide himself in such reverence. - - - -CLAUDIO -He hath ta'en the infection: hold it up. - - - -DON PEDRO -Hath she made her affection known to Benedick? - - - -LEONATO -No; and swears she never will: that's her torment. - - - -CLAUDIO -'Tis true, indeed; so your daughter says: 'Shall -I,' says she, 'that have so oft encountered him -with scorn, write to him that I love him?' - - - -LEONATO -This says she now when she is beginning to write to -him; for she'll be up twenty times a night, and -there will she sit in her smock till she have writ a -sheet of paper: my daughter tells us all. - - - -CLAUDIO -Now you talk of a sheet of paper, I remember a -pretty jest your daughter told us of. - - - -LEONATO -O, when she had writ it and was reading it over, she -found Benedick and Beatrice between the sheet? - - - -CLAUDIO -That. - - - -LEONATO -O, she tore the letter into a thousand halfpence; -railed at herself, that she should be so immodest -to write to one that she knew would flout her; 'I -measure him,' says she, 'by my own spirit; for I -should flout him, if he writ to me; yea, though I -love him, I should.' - - - -CLAUDIO -Then down upon her knees she falls, weeps, sobs, -beats her heart, tears her hair, prays, curses; 'O -sweet Benedick! God give me patience!' - - - -LEONATO -She doth indeed; my daughter says so: and the -ecstasy hath so much overborne her that my daughter -is sometime afeared she will do a desperate outrage -to herself: it is very true. - - - -DON PEDRO -It were good that Benedick knew of it by some -other, if she will not discover it. - - - -CLAUDIO -To what end? He would make but a sport of it and -torment the poor lady worse. - - - -DON PEDRO -An he should, it were an alms to hang him. She's an -excellent sweet lady; and, out of all suspicion, -she is virtuous. - - - -CLAUDIO -And she is exceeding wise. - - - -DON PEDRO -In every thing but in loving Benedick. - - - -LEONATO -O, my lord, wisdom and blood combating in so tender -a body, we have ten proofs to one that blood hath -the victory. I am sorry for her, as I have just -cause, being her uncle and her guardian. - - - -DON PEDRO -I would she had bestowed this dotage on me: I would -have daffed all other respects and made her half -myself. I pray you, tell Benedick of it, and hear -what a' will say. - - - -LEONATO -Were it good, think you? - - - -CLAUDIO -Hero thinks surely she will die; for she says she -will die, if he love her not, and she will die, ere -she make her love known, and she will die, if he woo -her, rather than she will bate one breath of her -accustomed crossness. - - - -DON PEDRO -She doth well: if she should make tender of her -love, 'tis very possible he'll scorn it; for the -man, as you know all, hath a contemptible spirit. - - - -CLAUDIO -He is a very proper man. - - - -DON PEDRO -He hath indeed a good outward happiness. - - - -CLAUDIO -Before God! and, in my mind, very wise. - - - -DON PEDRO -He doth indeed show some sparks that are like wit. - - - -CLAUDIO -And I take him to be valiant. - - - -DON PEDRO -As Hector, I assure you: and in the managing of -quarrels you may say he is wise; for either he -avoids them with great discretion, or undertakes -them with a most Christian-like fear. - - - -LEONATO -If he do fear God, a' must necessarily keep peace: -if he break the peace, he ought to enter into a -quarrel with fear and trembling. - - - -DON PEDRO -And so will he do; for the man doth fear God, -howsoever it seems not in him by some large jests -he will make. Well I am sorry for your niece. Shall -we go seek Benedick, and tell him of her love? - - - -CLAUDIO -Never tell him, my lord: let her wear it out with -good counsel. - - - -LEONATO -Nay, that's impossible: she may wear her heart out first. - - - -DON PEDRO -Well, we will hear further of it by your daughter: -let it cool the while. I love Benedick well; and I -could wish he would modestly examine himself, to see -how much he is unworthy so good a lady. - - - -LEONATO -My lord, will you walk? dinner is ready. - - - -CLAUDIO -If he do not dote on her upon this, I will never -trust my expectation. - - - -DON PEDRO -Let there be the same net spread for her; and that -must your daughter and her gentlewomen carry. The -sport will be, when they hold one an opinion of -another's dotage, and no such matter: that's the -scene that I would see, which will be merely a -dumb-show. Let us send her to call him in to dinner. - - - -Exeunt DON PEDRO, CLAUDIO, and LEONATO - - -BENEDICK -Coming forward This can be no trick: the -conference was sadly borne. They have the truth of -this from Hero. They seem to pity the lady: it -seems her affections have their full bent. Love me! -why, it must be requited. I hear how I am censured: -they say I will bear myself proudly, if I perceive -the love come from her; they say too that she will -rather die than give any sign of affection. I did -never think to marry: I must not seem proud: happy -are they that hear their detractions and can put -them to mending. They say the lady is fair; 'tis a -truth, I can bear them witness; and virtuous; 'tis -so, I cannot reprove it; and wise, but for loving -me; by my troth, it is no addition to her wit, nor -no great argument of her folly, for I will be -horribly in love with her. I may chance have some -odd quirks and remnants of wit broken on me, -because I have railed so long against marriage: but -doth not the appetite alter? a man loves the meat -in his youth that he cannot endure in his age. -Shall quips and sentences and these paper bullets of -the brain awe a man from the career of his humour? -No, the world must be peopled. When I said I would -die a bachelor, I did not think I should live till I -were married. Here comes Beatrice. By this day! -she's a fair lady: I do spy some marks of love in -her. - - - -Enter BEATRICE - - -BEATRICE -Against my will I am sent to bid you come in to dinner. - - - -BENEDICK -Fair Beatrice, I thank you for your pains. - - - -BEATRICE -I took no more pains for those thanks than you take -pains to thank me: if it had been painful, I would -not have come. - - - -BENEDICK -You take pleasure then in the message? - - - -BEATRICE -Yea, just so much as you may take upon a knife's -point and choke a daw withal. You have no stomach, -signior: fare you well. - - - -Exit - - -BENEDICK -Ha! 'Against my will I am sent to bid you come in -to dinner;' there's a double meaning in that 'I took -no more pains for those thanks than you took pains -to thank me.' that's as much as to say, Any pains -that I take for you is as easy as thanks. If I do -not take pity of her, I am a villain; if I do not -love her, I am a Jew. I will go get her picture. - - - -Exit - - - - -ACT III - -SCENE I. LEONATO'S garden. -Enter HERO, MARGARET, and URSULA - - -HERO -Good Margaret, run thee to the parlor; -There shalt thou find my cousin Beatrice -Proposing with the prince and Claudio: -Whisper her ear and tell her, I and Ursula -Walk in the orchard and our whole discourse -Is all of her; say that thou overheard'st us; -And bid her steal into the pleached bower, -Where honeysuckles, ripen'd by the sun, -Forbid the sun to enter, like favourites, -Made proud by princes, that advance their pride -Against that power that bred it: there will she hide her, -To listen our purpose. This is thy office; -Bear thee well in it and leave us alone. - - - -MARGARET -I'll make her come, I warrant you, presently. - - - -Exit - - -HERO -Now, Ursula, when Beatrice doth come, -As we do trace this alley up and down, -Our talk must only be of Benedick. -When I do name him, let it be thy part -To praise him more than ever man did merit: -My talk to thee must be how Benedick -Is sick in love with Beatrice. Of this matter -Is little Cupid's crafty arrow made, -That only wounds by hearsay. -Enter BEATRICE, behind -Now begin; -For look where Beatrice, like a lapwing, runs -Close by the ground, to hear our conference. - - - -URSULA -The pleasant'st angling is to see the fish -Cut with her golden oars the silver stream, -And greedily devour the treacherous bait: -So angle we for Beatrice; who even now -Is couched in the woodbine coverture. -Fear you not my part of the dialogue. - - - -HERO -Then go we near her, that her ear lose nothing -Of the false sweet bait that we lay for it. -Approaching the bower -No, truly, Ursula, she is too disdainful; -I know her spirits are as coy and wild -As haggerds of the rock. - - - -URSULA -But are you sure -That Benedick loves Beatrice so entirely? - - - -HERO -So says the prince and my new-trothed lord. - - - -URSULA -And did they bid you tell her of it, madam? - - - -HERO -They did entreat me to acquaint her of it; -But I persuaded them, if they loved Benedick, -To wish him wrestle with affection, -And never to let Beatrice know of it. - - - -URSULA -Why did you so? Doth not the gentleman -Deserve as full as fortunate a bed -As ever Beatrice shall couch upon? - - - -HERO -O god of love! I know he doth deserve -As much as may be yielded to a man: -But Nature never framed a woman's heart -Of prouder stuff than that of Beatrice; -Disdain and scorn ride sparkling in her eyes, -Misprising what they look on, and her wit -Values itself so highly that to her -All matter else seems weak: she cannot love, -Nor take no shape nor project of affection, -She is so self-endeared. - - - -URSULA -Sure, I think so; -And therefore certainly it were not good -She knew his love, lest she make sport at it. - - - -HERO -Why, you speak truth. I never yet saw man, -How wise, how noble, young, how rarely featured, -But she would spell him backward: if fair-faced, -She would swear the gentleman should be her sister; -If black, why, Nature, drawing of an antique, -Made a foul blot; if tall, a lance ill-headed; -If low, an agate very vilely cut; -If speaking, why, a vane blown with all winds; -If silent, why, a block moved with none. -So turns she every man the wrong side out -And never gives to truth and virtue that -Which simpleness and merit purchaseth. - - - -URSULA -Sure, sure, such carping is not commendable. - - - -HERO -No, not to be so odd and from all fashions -As Beatrice is, cannot be commendable: -But who dare tell her so? If I should speak, -She would mock me into air; O, she would laugh me -Out of myself, press me to death with wit. -Therefore let Benedick, like cover'd fire, -Consume away in sighs, waste inwardly: -It were a better death than die with mocks, -Which is as bad as die with tickling. - - - -URSULA -Yet tell her of it: hear what she will say. - - - -HERO -No; rather I will go to Benedick -And counsel him to fight against his passion. -And, truly, I'll devise some honest slanders -To stain my cousin with: one doth not know -How much an ill word may empoison liking. - - - -URSULA -O, do not do your cousin such a wrong. -She cannot be so much without true judgment-- -Having so swift and excellent a wit -As she is prized to have--as to refuse -So rare a gentleman as Signior Benedick. - - - -HERO -He is the only man of Italy. -Always excepted my dear Claudio. - - - -URSULA -I pray you, be not angry with me, madam, -Speaking my fancy: Signior Benedick, -For shape, for bearing, argument and valour, -Goes foremost in report through Italy. - - - -HERO -Indeed, he hath an excellent good name. - - - -URSULA -His excellence did earn it, ere he had it. -When are you married, madam? - - - -HERO -Why, every day, to-morrow. Come, go in: -I'll show thee some attires, and have thy counsel -Which is the best to furnish me to-morrow. - - - -URSULA -She's limed, I warrant you: we have caught her, madam. - - - -HERO -If it proves so, then loving goes by haps: -Some Cupid kills with arrows, some with traps. - - - -Exeunt HERO and URSULA - - -BEATRICE -Coming forward -What fire is in mine ears? Can this be true? -Stand I condemn'd for pride and scorn so much? -Contempt, farewell! and maiden pride, adieu! -No glory lives behind the back of such. -And, Benedick, love on; I will requite thee, -Taming my wild heart to thy loving hand: -If thou dost love, my kindness shall incite thee -To bind our loves up in a holy band; -For others say thou dost deserve, and I -Believe it better than reportingly. - - - -Exit - - -SCENE II. A room in LEONATO'S house -Enter DON PEDRO, CLAUDIO, BENEDICK, and LEONATO - - -DON PEDRO -I do but stay till your marriage be consummate, and -then go I toward Arragon. - - - -CLAUDIO -I'll bring you thither, my lord, if you'll -vouchsafe me. - - - -DON PEDRO -Nay, that would be as great a soil in the new gloss -of your marriage as to show a child his new coat -and forbid him to wear it. I will only be bold -with Benedick for his company; for, from the crown -of his head to the sole of his foot, he is all -mirth: he hath twice or thrice cut Cupid's -bow-string and the little hangman dare not shoot at -him; he hath a heart as sound as a bell and his -tongue is the clapper, for what his heart thinks his -tongue speaks. - - - -BENEDICK -Gallants, I am not as I have been. - - - -LEONATO -So say I methinks you are sadder. - - - -CLAUDIO -I hope he be in love. - - - -DON PEDRO -Hang him, truant! there's no true drop of blood in -him, to be truly touched with love: if he be sad, -he wants money. - - - -BENEDICK -I have the toothache. - - - -DON PEDRO -Draw it. - - - -BENEDICK -Hang it! - - - -CLAUDIO -You must hang it first, and draw it afterwards. - - - -DON PEDRO -What! sigh for the toothache? - - - -LEONATO -Where is but a humour or a worm. - - - -BENEDICK -Well, every one can master a grief but he that has -it. - - - -CLAUDIO -Yet say I, he is in love. - - - -DON PEDRO -There is no appearance of fancy in him, unless it be -a fancy that he hath to strange disguises; as, to be -a Dutchman today, a Frenchman to-morrow, or in the -shape of two countries at once, as, a German from -the waist downward, all slops, and a Spaniard from -the hip upward, no doublet. Unless he have a fancy -to this foolery, as it appears he hath, he is no -fool for fancy, as you would have it appear he is. - - - -CLAUDIO -If he be not in love with some woman, there is no -believing old signs: a' brushes his hat o' -mornings; what should that bode? - - - -DON PEDRO -Hath any man seen him at the barber's? - - - -CLAUDIO -No, but the barber's man hath been seen with him, -and the old ornament of his cheek hath already -stuffed tennis-balls. - - - -LEONATO -Indeed, he looks younger than he did, by the loss of a beard. - - - -DON PEDRO -Nay, a' rubs himself with civet: can you smell him -out by that? - - - -CLAUDIO -That's as much as to say, the sweet youth's in love. - - - -DON PEDRO -The greatest note of it is his melancholy. - - - -CLAUDIO -And when was he wont to wash his face? - - - -DON PEDRO -Yea, or to paint himself? for the which, I hear -what they say of him. - - - -CLAUDIO -Nay, but his jesting spirit; which is now crept into -a lute-string and now governed by stops. - - - -DON PEDRO -Indeed, that tells a heavy tale for him: conclude, -conclude he is in love. - - - -CLAUDIO -Nay, but I know who loves him. - - - -DON PEDRO -That would I know too: I warrant, one that knows him not. - - - -CLAUDIO -Yes, and his ill conditions; and, in despite of -all, dies for him. - - - -DON PEDRO -She shall be buried with her face upwards. - - - -BENEDICK -Yet is this no charm for the toothache. Old -signior, walk aside with me: I have studied eight -or nine wise words to speak to you, which these -hobby-horses must not hear. - - - -Exeunt BENEDICK and LEONATO - - -DON PEDRO -For my life, to break with him about Beatrice. - - - -CLAUDIO -'Tis even so. Hero and Margaret have by this -played their parts with Beatrice; and then the two -bears will not bite one another when they meet. - - - -Enter DON JOHN - - -DON JOHN -My lord and brother, God save you! - - - -DON PEDRO -Good den, brother. - - - -DON JOHN -If your leisure served, I would speak with you. - - - -DON PEDRO -In private? - - - -DON JOHN -If it please you: yet Count Claudio may hear; for -what I would speak of concerns him. - - - -DON PEDRO -What's the matter? - - - -DON JOHN -To CLAUDIO Means your lordship to be married -to-morrow? - - - -DON PEDRO -You know he does. - - - -DON JOHN -I know not that, when he knows what I know. - - - -CLAUDIO -If there be any impediment, I pray you discover it. - - - -DON JOHN -You may think I love you not: let that appear -hereafter, and aim better at me by that I now will -manifest. For my brother, I think he holds you -well, and in dearness of heart hath holp to effect -your ensuing marriage;--surely suit ill spent and -labour ill bestowed. - - - -DON PEDRO -Why, what's the matter? - - - -DON JOHN -I came hither to tell you; and, circumstances -shortened, for she has been too long a talking of, -the lady is disloyal. - - - -CLAUDIO -Who, Hero? - - - -DON PEDRO -Even she; Leonato's Hero, your Hero, every man's Hero: - - - -CLAUDIO -Disloyal? - - - -DON JOHN -The word is too good to paint out her wickedness; I -could say she were worse: think you of a worse -title, and I will fit her to it. Wonder not till -further warrant: go but with me to-night, you shall -see her chamber-window entered, even the night -before her wedding-day: if you love her then, -to-morrow wed her; but it would better fit your honour -to change your mind. - - - -CLAUDIO -May this be so? - - - -DON PEDRO -I will not think it. - - - -DON JOHN -If you dare not trust that you see, confess not -that you know: if you will follow me, I will show -you enough; and when you have seen more and heard -more, proceed accordingly. - - - -CLAUDIO -If I see any thing to-night why I should not marry -her to-morrow in the congregation, where I should -wed, there will I shame her. - - - -DON PEDRO -And, as I wooed for thee to obtain her, I will join -with thee to disgrace her. - - - -DON JOHN -I will disparage her no farther till you are my -witnesses: bear it coldly but till midnight, and -let the issue show itself. - - - -DON PEDRO -O day untowardly turned! - - - -CLAUDIO -O mischief strangely thwarting! - - - -DON JOHN -O plague right well prevented! so will you say when -you have seen the sequel. - - - -Exeunt - - -SCENE III. A street. -Enter DOGBERRY and VERGES with the Watch - - -DOGBERRY -Are you good men and true? - - - -VERGES -Yea, or else it were pity but they should suffer -salvation, body and soul. - - - -DOGBERRY -Nay, that were a punishment too good for them, if -they should have any allegiance in them, being -chosen for the prince's watch. - - - -VERGES -Well, give them their charge, neighbour Dogberry. - - - -DOGBERRY -First, who think you the most desertless man to be -constable? - - - -First Watchman -Hugh Otecake, sir, or George Seacole; for they can -write and read. - - - -DOGBERRY -Come hither, neighbour Seacole. God hath blessed -you with a good name: to be a well-favoured man is -the gift of fortune; but to write and read comes by nature. - - - -Second Watchman -Both which, master constable,-- - - - -DOGBERRY -You have: I knew it would be your answer. Well, -for your favour, sir, why, give God thanks, and make -no boast of it; and for your writing and reading, -let that appear when there is no need of such -vanity. You are thought here to be the most -senseless and fit man for the constable of the -watch; therefore bear you the lantern. This is your -charge: you shall comprehend all vagrom men; you are -to bid any man stand, in the prince's name. - - - -Second Watchman -How if a' will not stand? - - - -DOGBERRY -Why, then, take no note of him, but let him go; and -presently call the rest of the watch together and -thank God you are rid of a knave. - - - -VERGES -If he will not stand when he is bidden, he is none -of the prince's subjects. - - - -DOGBERRY -True, and they are to meddle with none but the -prince's subjects. You shall also make no noise in -the streets; for, for the watch to babble and to -talk is most tolerable and not to be endured. - - - -Watchman -We will rather sleep than talk: we know what -belongs to a watch. - - - -DOGBERRY -Why, you speak like an ancient and most quiet -watchman; for I cannot see how sleeping should -offend: only, have a care that your bills be not -stolen. Well, you are to call at all the -ale-houses, and bid those that are drunk get them to bed. - - - -Watchman -How if they will not? - - - -DOGBERRY -Why, then, let them alone till they are sober: if -they make you not then the better answer, you may -say they are not the men you took them for. - - - -Watchman -Well, sir. - - - -DOGBERRY -If you meet a thief, you may suspect him, by virtue -of your office, to be no true man; and, for such -kind of men, the less you meddle or make with them, -why the more is for your honesty. - - - -Watchman -If we know him to be a thief, shall we not lay -hands on him? - - - -DOGBERRY -Truly, by your office, you may; but I think they -that touch pitch will be defiled: the most peaceable -way for you, if you do take a thief, is to let him -show himself what he is and steal out of your company. - - - -VERGES -You have been always called a merciful man, partner. - - - -DOGBERRY -Truly, I would not hang a dog by my will, much more -a man who hath any honesty in him. - - - -VERGES -If you hear a child cry in the night, you must call -to the nurse and bid her still it. - - - -Watchman -How if the nurse be asleep and will not hear us? - - - -DOGBERRY -Why, then, depart in peace, and let the child wake -her with crying; for the ewe that will not hear her -lamb when it baes will never answer a calf when he bleats. - - - -VERGES -'Tis very true. - - - -DOGBERRY -This is the end of the charge:--you, constable, are -to present the prince's own person: if you meet the -prince in the night, you may stay him. - - - -VERGES -Nay, by'r our lady, that I think a' cannot. - - - -DOGBERRY -Five shillings to one on't, with any man that knows -the statutes, he may stay him: marry, not without -the prince be willing; for, indeed, the watch ought -to offend no man; and it is an offence to stay a -man against his will. - - - -VERGES -By'r lady, I think it be so. - - - -DOGBERRY -Ha, ha, ha! Well, masters, good night: an there be -any matter of weight chances, call up me: keep your -fellows' counsels and your own; and good night. -Come, neighbour. - - - -Watchman -Well, masters, we hear our charge: let us go sit here -upon the church-bench till two, and then all to bed. - - - -DOGBERRY -One word more, honest neighbours. I pray you watch -about Signior Leonato's door; for the wedding being -there to-morrow, there is a great coil to-night. -Adieu: be vigitant, I beseech you. - - -Exeunt DOGBERRY and VERGES -Enter BORACHIO and CONRADE - - -BORACHIO -What Conrade! - - - -Watchman -Aside Peace! stir not. - - - -BORACHIO -Conrade, I say! - - - -CONRADE -Here, man; I am at thy elbow. - - - -BORACHIO -Mass, and my elbow itched; I thought there would a -scab follow. - - - -CONRADE -I will owe thee an answer for that: and now forward -with thy tale. - - - -BORACHIO -Stand thee close, then, under this pent-house, for -it drizzles rain; and I will, like a true drunkard, -utter all to thee. - - - -Watchman -Aside Some treason, masters: yet stand close. - - - -BORACHIO -Therefore know I have earned of Don John a thousand ducats. - - - -CONRADE -Is it possible that any villany should be so dear? - - - -BORACHIO -Thou shouldst rather ask if it were possible any -villany should be so rich; for when rich villains -have need of poor ones, poor ones may make what -price they will. - - - -CONRADE -I wonder at it. - - - -BORACHIO -That shows thou art unconfirmed. Thou knowest that -the fashion of a doublet, or a hat, or a cloak, is -nothing to a man. - - - -CONRADE -Yes, it is apparel. - - - -BORACHIO -I mean, the fashion. - - - -CONRADE -Yes, the fashion is the fashion. - - - -BORACHIO -Tush! I may as well say the fool's the fool. But -seest thou not what a deformed thief this fashion -is? - - - -Watchman -Aside I know that Deformed; a' has been a vile -thief this seven year; a' goes up and down like a -gentleman: I remember his name. - - - -BORACHIO -Didst thou not hear somebody? - - - -CONRADE -No; 'twas the vane on the house. - - - -BORACHIO -Seest thou not, I say, what a deformed thief this -fashion is? how giddily a' turns about all the hot -bloods between fourteen and five-and-thirty? -sometimes fashioning them like Pharaoh's soldiers -in the reeky painting, sometime like god Bel's -priests in the old church-window, sometime like the -shaven Hercules in the smirched worm-eaten tapestry, -where his codpiece seems as massy as his club? - - - -CONRADE -All this I see; and I see that the fashion wears -out more apparel than the man. But art not thou -thyself giddy with the fashion too, that thou hast -shifted out of thy tale into telling me of the fashion? - - - -BORACHIO -Not so, neither: but know that I have to-night -wooed Margaret, the Lady Hero's gentlewoman, by the -name of Hero: she leans me out at her mistress' -chamber-window, bids me a thousand times good -night,--I tell this tale vilely:--I should first -tell thee how the prince, Claudio and my master, -planted and placed and possessed by my master Don -John, saw afar off in the orchard this amiable encounter. - - - -CONRADE -And thought they Margaret was Hero? - - - -BORACHIO -Two of them did, the prince and Claudio; but the -devil my master knew she was Margaret; and partly -by his oaths, which first possessed them, partly by -the dark night, which did deceive them, but chiefly -by my villany, which did confirm any slander that -Don John had made, away went Claudio enraged; swore -he would meet her, as he was appointed, next morning -at the temple, and there, before the whole -congregation, shame her with what he saw o'er night -and send her home again without a husband. - - - -First Watchman -We charge you, in the prince's name, stand! - - - -Second Watchman -Call up the right master constable. We have here -recovered the most dangerous piece of lechery that -ever was known in the commonwealth. - - - -First Watchman -And one Deformed is one of them: I know him; a' -wears a lock. - - - -CONRADE -Masters, masters,-- - - - -Second Watchman -You'll be made bring Deformed forth, I warrant you. - - - -CONRADE -Masters,-- - - - -First Watchman -Never speak: we charge you let us obey you to go with us. - - - -BORACHIO -We are like to prove a goodly commodity, being taken -up of these men's bills. - - - -CONRADE -A commodity in question, I warrant you. Come, we'll obey you. - - - -Exeunt - - -SCENE IV. HERO's apartment. -Enter HERO, MARGARET, and URSULA - - -HERO -Good Ursula, wake my cousin Beatrice, and desire -her to rise. - - - -URSULA -I will, lady. - - - -HERO -And bid her come hither. - - - -URSULA -Well. - - - -Exit - - -MARGARET -Troth, I think your other rabato were better. - - - -HERO -No, pray thee, good Meg, I'll wear this. - - - -MARGARET -By my troth, 's not so good; and I warrant your -cousin will say so. - - - -HERO -My cousin's a fool, and thou art another: I'll wear -none but this. - - - -MARGARET -I like the new tire within excellently, if the hair -were a thought browner; and your gown's a most rare -fashion, i' faith. I saw the Duchess of Milan's -gown that they praise so. - - - -HERO -O, that exceeds, they say. - - - -MARGARET -By my troth, 's but a night-gown in respect of -yours: cloth o' gold, and cuts, and laced with -silver, set with pearls, down sleeves, side sleeves, -and skirts, round underborne with a bluish tinsel: -but for a fine, quaint, graceful and excellent -fashion, yours is worth ten on 't. - - - -HERO -God give me joy to wear it! for my heart is -exceeding heavy. - - - -MARGARET -'Twill be heavier soon by the weight of a man. - - - -HERO -Fie upon thee! art not ashamed? - - - -MARGARET -Of what, lady? of speaking honourably? Is not -marriage honourable in a beggar? Is not your lord -honourable without marriage? I think you would have -me say, 'saving your reverence, a husband:' and bad -thinking do not wrest true speaking, I'll offend -nobody: is there any harm in 'the heavier for a -husband'? None, I think, and it be the right husband -and the right wife; otherwise 'tis light, and not -heavy: ask my Lady Beatrice else; here she comes. - - - -Enter BEATRICE - - -HERO -Good morrow, coz. - - - -BEATRICE -Good morrow, sweet Hero. - - - -HERO -Why how now? do you speak in the sick tune? - - - -BEATRICE -I am out of all other tune, methinks. - - - -MARGARET -Clap's into 'Light o' love;' that goes without a -burden: do you sing it, and I'll dance it. - - - -BEATRICE -Ye light o' love, with your heels! then, if your -husband have stables enough, you'll see he shall -lack no barns. - - - -MARGARET -O illegitimate construction! I scorn that with my heels. - - - -BEATRICE -'Tis almost five o'clock, cousin; tis time you were -ready. By my troth, I am exceeding ill: heigh-ho! - - - -MARGARET -For a hawk, a horse, or a husband? - - - -BEATRICE -For the letter that begins them all, H. - - - -MARGARET -Well, and you be not turned Turk, there's no more -sailing by the star. - - - -BEATRICE -What means the fool, trow? - - - -MARGARET -Nothing I; but God send every one their heart's desire! - - - -HERO -These gloves the count sent me; they are an -excellent perfume. - - - -BEATRICE -I am stuffed, cousin; I cannot smell. - - - -MARGARET -A maid, and stuffed! there's goodly catching of cold. - - - -BEATRICE -O, God help me! God help me! how long have you -professed apprehension? - - - -MARGARET -Even since you left it. Doth not my wit become me rarely? - - - -BEATRICE -It is not seen enough, you should wear it in your -cap. By my troth, I am sick. - - - -MARGARET -Get you some of this distilled Carduus Benedictus, -and lay it to your heart: it is the only thing for a qualm. - - - -HERO -There thou prickest her with a thistle. - - - -BEATRICE -Benedictus! why Benedictus? you have some moral in -this Benedictus. - - - -MARGARET -Moral! no, by my troth, I have no moral meaning; I -meant, plain holy-thistle. You may think perchance -that I think you are in love: nay, by'r lady, I am -not such a fool to think what I list, nor I list -not to think what I can, nor indeed I cannot think, -if I would think my heart out of thinking, that you -are in love or that you will be in love or that you -can be in love. Yet Benedick was such another, and -now is he become a man: he swore he would never -marry, and yet now, in despite of his heart, he eats -his meat without grudging: and how you may be -converted I know not, but methinks you look with -your eyes as other women do. - - - -BEATRICE -What pace is this that thy tongue keeps? - - - -MARGARET -Not a false gallop. - - - -Re-enter URSULA - - -URSULA -Madam, withdraw: the prince, the count, Signior -Benedick, Don John, and all the gallants of the -town, are come to fetch you to church. - - - -HERO -Help to dress me, good coz, good Meg, good Ursula. - - - -Exeunt - - -SCENE V. Another room in LEONATO'S house. -Enter LEONATO, with DOGBERRY and VERGES - - -LEONATO -What would you with me, honest neighbour? - - - -DOGBERRY -Marry, sir, I would have some confidence with you -that decerns you nearly. - - - -LEONATO -Brief, I pray you; for you see it is a busy time with me. - - - -DOGBERRY -Marry, this it is, sir. - - - -VERGES -Yes, in truth it is, sir. - - - -LEONATO -What is it, my good friends? - - - -DOGBERRY -Goodman Verges, sir, speaks a little off the -matter: an old man, sir, and his wits are not so -blunt as, God help, I would desire they were; but, -in faith, honest as the skin between his brows. - - - -VERGES -Yes, I thank God I am as honest as any man living -that is an old man and no honester than I. - - - -DOGBERRY -Comparisons are odorous: palabras, neighbour Verges. - - - -LEONATO -Neighbours, you are tedious. - - - -DOGBERRY -It pleases your worship to say so, but we are the -poor duke's officers; but truly, for mine own part, -if I were as tedious as a king, I could find it in -my heart to bestow it all of your worship. - - - -LEONATO -All thy tediousness on me, ah? - - - -DOGBERRY -Yea, an 'twere a thousand pound more than 'tis; for -I hear as good exclamation on your worship as of any -man in the city; and though I be but a poor man, I -am glad to hear it. - - - -VERGES -And so am I. - - - -LEONATO -I would fain know what you have to say. - - - -VERGES -Marry, sir, our watch to-night, excepting your -worship's presence, ha' ta'en a couple of as arrant -knaves as any in Messina. - - - -DOGBERRY -A good old man, sir; he will be talking: as they -say, when the age is in, the wit is out: God help -us! it is a world to see. Well said, i' faith, -neighbour Verges: well, God's a good man; an two men -ride of a horse, one must ride behind. An honest -soul, i' faith, sir; by my troth he is, as ever -broke bread; but God is to be worshipped; all men -are not alike; alas, good neighbour! - - - -LEONATO -Indeed, neighbour, he comes too short of you. - - - -DOGBERRY -Gifts that God gives. - - - -LEONATO -I must leave you. - - - -DOGBERRY -One word, sir: our watch, sir, have indeed -comprehended two aspicious persons, and we would -have them this morning examined before your worship. - - - -LEONATO -Take their examination yourself and bring it me: I -am now in great haste, as it may appear unto you. - - - -DOGBERRY -It shall be suffigance. - - - -LEONATO -Drink some wine ere you go: fare you well. - - - -Enter a Messenger - - -Messenger -My lord, they stay for you to give your daughter to -her husband. - - - -LEONATO -I'll wait upon them: I am ready. - - - -Exeunt LEONATO and Messenger - - -DOGBERRY -Go, good partner, go, get you to Francis Seacole; -bid him bring his pen and inkhorn to the gaol: we -are now to examination these men. - - - -VERGES -And we must do it wisely. - - - -DOGBERRY -We will spare for no wit, I warrant you; here's -that shall drive some of them to a non-come: only -get the learned writer to set down our -excommunication and meet me at the gaol. - - - -Exeunt - - - - -ACT IV - -SCENE I. A church. -Enter DON PEDRO, DON JOHN, LEONATO, FRIAR FRANCIS, -CLAUDIO, BENEDICK, HERO, BEATRICE, and Attendants - - -LEONATO -Come, Friar Francis, be brief; only to the plain -form of marriage, and you shall recount their -particular duties afterwards. - - - -FRIAR FRANCIS -You come hither, my lord, to marry this lady. - - - -CLAUDIO -No. - - - -LEONATO -To be married to her: friar, you come to marry her. - - - -FRIAR FRANCIS -Lady, you come hither to be married to this count. - - - -HERO -I do. - - - -FRIAR FRANCIS -If either of you know any inward impediment why you -should not be conjoined, charge you, on your souls, -to utter it. - - - -CLAUDIO -Know you any, Hero? - - - -HERO -None, my lord. - - - -FRIAR FRANCIS -Know you any, count? - - - -LEONATO -I dare make his answer, none. - - - -CLAUDIO -O, what men dare do! what men may do! what men daily -do, not knowing what they do! - - - -BENEDICK -How now! interjections? Why, then, some be of -laughing, as, ah, ha, he! - - - -CLAUDIO -Stand thee by, friar. Father, by your leave: -Will you with free and unconstrained soul -Give me this maid, your daughter? - - - -LEONATO -As freely, son, as God did give her me. - - - -CLAUDIO -And what have I to give you back, whose worth -May counterpoise this rich and precious gift? - - - -DON PEDRO -Nothing, unless you render her again. - - - -CLAUDIO -Sweet prince, you learn me noble thankfulness. -There, Leonato, take her back again: -Give not this rotten orange to your friend; -She's but the sign and semblance of her honour. -Behold how like a maid she blushes here! -O, what authority and show of truth -Can cunning sin cover itself withal! -Comes not that blood as modest evidence -To witness simple virtue? Would you not swear, -All you that see her, that she were a maid, -By these exterior shows? But she is none: -She knows the heat of a luxurious bed; -Her blush is guiltiness, not modesty. - - - -LEONATO -What do you mean, my lord? - - - -CLAUDIO -Not to be married, -Not to knit my soul to an approved wanton. - - - -LEONATO -Dear my lord, if you, in your own proof, -Have vanquish'd the resistance of her youth, -And made defeat of her virginity,-- - - - -CLAUDIO -I know what you would say: if I have known her, -You will say she did embrace me as a husband, -And so extenuate the 'forehand sin: -No, Leonato, -I never tempted her with word too large; -But, as a brother to his sister, show'd -Bashful sincerity and comely love. - - - -HERO -And seem'd I ever otherwise to you? - - - -CLAUDIO -Out on thee! Seeming! I will write against it: -You seem to me as Dian in her orb, -As chaste as is the bud ere it be blown; -But you are more intemperate in your blood -Than Venus, or those pamper'd animals -That rage in savage sensuality. - - - -HERO -Is my lord well, that he doth speak so wide? - - - -LEONATO -Sweet prince, why speak not you? - - - -DON PEDRO -What should I speak? -I stand dishonour'd, that have gone about -To link my dear friend to a common stale. - - - -LEONATO -Are these things spoken, or do I but dream? - - - -DON JOHN -Sir, they are spoken, and these things are true. - - - -BENEDICK -This looks not like a nuptial. - - - -HERO -True! O God! - - - -CLAUDIO -Leonato, stand I here? -Is this the prince? is this the prince's brother? -Is this face Hero's? are our eyes our own? - - - -LEONATO -All this is so: but what of this, my lord? - - - -CLAUDIO -Let me but move one question to your daughter; -And, by that fatherly and kindly power -That you have in her, bid her answer truly. - - - -LEONATO -I charge thee do so, as thou art my child. - - - -HERO -O, God defend me! how am I beset! -What kind of catechising call you this? - - - -CLAUDIO -To make you answer truly to your name. - - - -HERO -Is it not Hero? Who can blot that name -With any just reproach? - - - -CLAUDIO -Marry, that can Hero; -Hero itself can blot out Hero's virtue. -What man was he talk'd with you yesternight -Out at your window betwixt twelve and one? -Now, if you are a maid, answer to this. - - - -HERO -I talk'd with no man at that hour, my lord. - - - -DON PEDRO -Why, then are you no maiden. Leonato, -I am sorry you must hear: upon mine honour, -Myself, my brother and this grieved count -Did see her, hear her, at that hour last night -Talk with a ruffian at her chamber-window -Who hath indeed, most like a liberal villain, -Confess'd the vile encounters they have had -A thousand times in secret. - - - -DON JOHN -Fie, fie! they are not to be named, my lord, -Not to be spoke of; -There is not chastity enough in language -Without offence to utter them. Thus, pretty lady, -I am sorry for thy much misgovernment. - - - -CLAUDIO -O Hero, what a Hero hadst thou been, -If half thy outward graces had been placed -About thy thoughts and counsels of thy heart! -But fare thee well, most foul, most fair! farewell, -Thou pure impiety and impious purity! -For thee I'll lock up all the gates of love, -And on my eyelids shall conjecture hang, -To turn all beauty into thoughts of harm, -And never shall it more be gracious. - - - -LEONATO -Hath no man's dagger here a point for me? - - - -HERO swoons - - -BEATRICE -Why, how now, cousin! wherefore sink you down? - - - -DON JOHN -Come, let us go. These things, come thus to light, -Smother her spirits up. - - - -Exeunt DON PEDRO, DON JOHN, and CLAUDIO - - -BENEDICK -How doth the lady? - - - -BEATRICE -Dead, I think. Help, uncle! -Hero! why, Hero! Uncle! Signior Benedick! Friar! - - - -LEONATO -O Fate! take not away thy heavy hand. -Death is the fairest cover for her shame -That may be wish'd for. - - - -BEATRICE -How now, cousin Hero! - - - -FRIAR FRANCIS -Have comfort, lady. - - - -LEONATO -Dost thou look up? - - - -FRIAR FRANCIS -Yea, wherefore should she not? - - - -LEONATO -Wherefore! Why, doth not every earthly thing -Cry shame upon her? Could she here deny -The story that is printed in her blood? -Do not live, Hero; do not ope thine eyes: -For, did I think thou wouldst not quickly die, -Thought I thy spirits were stronger than thy shames, -Myself would, on the rearward of reproaches, -Strike at thy life. Grieved I, I had but one? -Chid I for that at frugal nature's frame? -O, one too much by thee! Why had I one? -Why ever wast thou lovely in my eyes? -Why had I not with charitable hand -Took up a beggar's issue at my gates, -Who smirch'd thus and mired with infamy, -I might have said 'No part of it is mine; -This shame derives itself from unknown loins'? -But mine and mine I loved and mine I praised -And mine that I was proud on, mine so much -That I myself was to myself not mine, -Valuing of her,--why, she, O, she is fallen -Into a pit of ink, that the wide sea -Hath drops too few to wash her clean again -And salt too little which may season give -To her foul-tainted flesh! - - - -BENEDICK -Sir, sir, be patient. -For my part, I am so attired in wonder, -I know not what to say. - - - -BEATRICE -O, on my soul, my cousin is belied! - - - -BENEDICK -Lady, were you her bedfellow last night? - - - -BEATRICE -No, truly not; although, until last night, -I have this twelvemonth been her bedfellow. - - - -LEONATO -Confirm'd, confirm'd! O, that is stronger made -Which was before barr'd up with ribs of iron! -Would the two princes lie, and Claudio lie, -Who loved her so, that, speaking of her foulness, -Wash'd it with tears? Hence from her! let her die. - - - -FRIAR FRANCIS -Hear me a little; for I have only been -Silent so long and given way unto -This course of fortune -By noting of the lady. I have mark'd -A thousand blushing apparitions -To start into her face, a thousand innocent shames -In angel whiteness beat away those blushes; -And in her eye there hath appear'd a fire, -To burn the errors that these princes hold -Against her maiden truth. Call me a fool; -Trust not my reading nor my observations, -Which with experimental seal doth warrant -The tenor of my book; trust not my age, -My reverence, calling, nor divinity, -If this sweet lady lie not guiltless here -Under some biting error. - - - -LEONATO -Friar, it cannot be. -Thou seest that all the grace that she hath left -Is that she will not add to her damnation -A sin of perjury; she not denies it: -Why seek'st thou then to cover with excuse -That which appears in proper nakedness? - - - -FRIAR FRANCIS -Lady, what man is he you are accused of? - - - -HERO -They know that do accuse me; I know none: -If I know more of any man alive -Than that which maiden modesty doth warrant, -Let all my sins lack mercy! O my father, -Prove you that any man with me conversed -At hours unmeet, or that I yesternight -Maintain'd the change of words with any creature, -Refuse me, hate me, torture me to death! - - - -FRIAR FRANCIS -There is some strange misprision in the princes. - - - -BENEDICK -Two of them have the very bent of honour; -And if their wisdoms be misled in this, -The practise of it lives in John the bastard, -Whose spirits toil in frame of villanies. - - - -LEONATO -I know not. If they speak but truth of her, -These hands shall tear her; if they wrong her honour, -The proudest of them shall well hear of it. -Time hath not yet so dried this blood of mine, -Nor age so eat up my invention, -Nor fortune made such havoc of my means, -Nor my bad life reft me so much of friends, -But they shall find, awaked in such a kind, -Both strength of limb and policy of mind, -Ability in means and choice of friends, -To quit me of them throughly. - - - -FRIAR FRANCIS -Pause awhile, -And let my counsel sway you in this case. -Your daughter here the princes left for dead: -Let her awhile be secretly kept in, -And publish it that she is dead indeed; -Maintain a mourning ostentation -And on your family's old monument -Hang mournful epitaphs and do all rites -That appertain unto a burial. - - - -LEONATO -What shall become of this? what will this do? - - - -FRIAR FRANCIS -Marry, this well carried shall on her behalf -Change slander to remorse; that is some good: -But not for that dream I on this strange course, -But on this travail look for greater birth. -She dying, as it must so be maintain'd, -Upon the instant that she was accused, -Shall be lamented, pitied and excused -Of every hearer: for it so falls out -That what we have we prize not to the worth -Whiles we enjoy it, but being lack'd and lost, -Why, then we rack the value, then we find -The virtue that possession would not show us -Whiles it was ours. So will it fare with Claudio: -When he shall hear she died upon his words, -The idea of her life shall sweetly creep -Into his study of imagination, -And every lovely organ of her life -Shall come apparell'd in more precious habit, -More moving-delicate and full of life, -Into the eye and prospect of his soul, -Than when she lived indeed; then shall he mourn, -If ever love had interest in his liver, -And wish he had not so accused her, -No, though he thought his accusation true. -Let this be so, and doubt not but success -Will fashion the event in better shape -Than I can lay it down in likelihood. -But if all aim but this be levell'd false, -The supposition of the lady's death -Will quench the wonder of her infamy: -And if it sort not well, you may conceal her, -As best befits her wounded reputation, -In some reclusive and religious life, -Out of all eyes, tongues, minds and injuries. - - - -BENEDICK -Signior Leonato, let the friar advise you: -And though you know my inwardness and love -Is very much unto the prince and Claudio, -Yet, by mine honour, I will deal in this -As secretly and justly as your soul -Should with your body. - - - -LEONATO -Being that I flow in grief, -The smallest twine may lead me. - - - -FRIAR FRANCIS -'Tis well consented: presently away; -For to strange sores strangely they strain the cure. -Come, lady, die to live: this wedding-day -Perhaps is but prolong'd: have patience and endure. - - - -Exeunt all but BENEDICK and BEATRICE - - -BENEDICK -Lady Beatrice, have you wept all this while? - - - -BEATRICE -Yea, and I will weep a while longer. - - - -BENEDICK -I will not desire that. - - - -BEATRICE -You have no reason; I do it freely. - - - -BENEDICK -Surely I do believe your fair cousin is wronged. - - - -BEATRICE -Ah, how much might the man deserve of me that would right her! - - - -BENEDICK -Is there any way to show such friendship? - - - -BEATRICE -A very even way, but no such friend. - - - -BENEDICK -May a man do it? - - - -BEATRICE -It is a man's office, but not yours. - - - -BENEDICK -I do love nothing in the world so well as you: is -not that strange? - - - -BEATRICE -As strange as the thing I know not. It were as -possible for me to say I loved nothing so well as -you: but believe me not; and yet I lie not; I -confess nothing, nor I deny nothing. I am sorry for my cousin. - - - -BENEDICK -By my sword, Beatrice, thou lovest me. - - - -BEATRICE -Do not swear, and eat it. - - - -BENEDICK -I will swear by it that you love me; and I will make -him eat it that says I love not you. - - - -BEATRICE -Will you not eat your word? - - - -BENEDICK -With no sauce that can be devised to it. I protest -I love thee. - - - -BEATRICE -Why, then, God forgive me! - - - -BENEDICK -What offence, sweet Beatrice? - - - -BEATRICE -You have stayed me in a happy hour: I was about to -protest I loved you. - - - -BENEDICK -And do it with all thy heart. - - - -BEATRICE -I love you with so much of my heart that none is -left to protest. - - - -BENEDICK -Come, bid me do any thing for thee. - - - -BEATRICE -Kill Claudio. - - - -BENEDICK -Ha! not for the wide world. - - - -BEATRICE -You kill me to deny it. Farewell. - - - -BENEDICK -Tarry, sweet Beatrice. - - - -BEATRICE -I am gone, though I am here: there is no love in -you: nay, I pray you, let me go. - - - -BENEDICK -Beatrice,-- - - - -BEATRICE -In faith, I will go. - - - -BENEDICK -We'll be friends first. - - - -BEATRICE -You dare easier be friends with me than fight with mine enemy. - - - -BENEDICK -Is Claudio thine enemy? - - - -BEATRICE -Is he not approved in the height a villain, that -hath slandered, scorned, dishonoured my kinswoman? O -that I were a man! What, bear her in hand until they -come to take hands; and then, with public -accusation, uncovered slander, unmitigated rancour, ---O God, that I were a man! I would eat his heart -in the market-place. - - - -BENEDICK -Hear me, Beatrice,-- - - - -BEATRICE -Talk with a man out at a window! A proper saying! - - - -BENEDICK -Nay, but, Beatrice,-- - - - -BEATRICE -Sweet Hero! She is wronged, she is slandered, she is undone. - - - -BENEDICK -Beat-- - - - -BEATRICE -Princes and counties! Surely, a princely testimony, -a goodly count, Count Comfect; a sweet gallant, -surely! O that I were a man for his sake! or that I -had any friend would be a man for my sake! But -manhood is melted into courtesies, valour into -compliment, and men are only turned into tongue, and -trim ones too: he is now as valiant as Hercules -that only tells a lie and swears it. I cannot be a -man with wishing, therefore I will die a woman with grieving. - - - -BENEDICK -Tarry, good Beatrice. By this hand, I love thee. - - - -BEATRICE -Use it for my love some other way than swearing by it. - - - -BENEDICK -Think you in your soul the Count Claudio hath wronged Hero? - - - -BEATRICE -Yea, as sure as I have a thought or a soul. - - - -BENEDICK -Enough, I am engaged; I will challenge him. I will -kiss your hand, and so I leave you. By this hand, -Claudio shall render me a dear account. As you -hear of me, so think of me. Go, comfort your -cousin: I must say she is dead: and so, farewell. - - - -Exeunt - - -SCENE II. A prison. -Enter DOGBERRY, VERGES, and Sexton, in gowns; and -the Watch, with CONRADE and BORACHIO - - -DOGBERRY -Is our whole dissembly appeared? - - - -VERGES -O, a stool and a cushion for the sexton. - - - -Sexton -Which be the malefactors? - - - -DOGBERRY -Marry, that am I and my partner. - - - -VERGES -Nay, that's certain; we have the exhibition to examine. - - - -Sexton -But which are the offenders that are to be -examined? let them come before master constable. - - - -DOGBERRY -Yea, marry, let them come before me. What is your -name, friend? - - - -BORACHIO -Borachio. - - - -DOGBERRY -Pray, write down, Borachio. Yours, sirrah? - - - -CONRADE -I am a gentleman, sir, and my name is Conrade. - - - -DOGBERRY -Write down, master gentleman Conrade. Masters, do -you serve God? - - - -CONRADE -BORACHIO -Yea, sir, we hope. - - - -DOGBERRY -Write down, that they hope they serve God: and -write God first; for God defend but God should go -before such villains! Masters, it is proved already -that you are little better than false knaves; and it -will go near to be thought so shortly. How answer -you for yourselves? - - - -CONRADE -Marry, sir, we say we are none. - - - -DOGBERRY -A marvellous witty fellow, I assure you: but I -will go about with him. Come you hither, sirrah; a -word in your ear: sir, I say to you, it is thought -you are false knaves. - - - -BORACHIO -Sir, I say to you we are none. - - - -DOGBERRY -Well, stand aside. 'Fore God, they are both in a -tale. Have you writ down, that they are none? - - - -Sexton -Master constable, you go not the way to examine: -you must call forth the watch that are their accusers. - - - -DOGBERRY -Yea, marry, that's the eftest way. Let the watch -come forth. Masters, I charge you, in the prince's -name, accuse these men. - - - -First Watchman -This man said, sir, that Don John, the prince's -brother, was a villain. - - - -DOGBERRY -Write down Prince John a villain. Why, this is flat -perjury, to call a prince's brother villain. - - - -BORACHIO -Master constable,-- - - - -DOGBERRY -Pray thee, fellow, peace: I do not like thy look, -I promise thee. - - - -Sexton -What heard you him say else? - - - -Second Watchman -Marry, that he had received a thousand ducats of -Don John for accusing the Lady Hero wrongfully. - - - -DOGBERRY -Flat burglary as ever was committed. - - - -VERGES -Yea, by mass, that it is. - - - -Sexton -What else, fellow? - - - -First Watchman -And that Count Claudio did mean, upon his words, to -disgrace Hero before the whole assembly. and not marry her. - - - -DOGBERRY -O villain! thou wilt be condemned into everlasting -redemption for this. - - - -Sexton -What else? - - - -Watchman -This is all. - - - -Sexton -And this is more, masters, than you can deny. -Prince John is this morning secretly stolen away; -Hero was in this manner accused, in this very manner -refused, and upon the grief of this suddenly died. -Master constable, let these men be bound, and -brought to Leonato's: I will go before and show -him their examination. - - - -Exit - - -DOGBERRY -Come, let them be opinioned. - - - -VERGES -Let them be in the hands-- - - - -CONRADE -Off, coxcomb! - - - -DOGBERRY -God's my life, where's the sexton? let him write -down the prince's officer coxcomb. Come, bind them. -Thou naughty varlet! - - - -CONRADE -Away! you are an ass, you are an ass. - - - -DOGBERRY -Dost thou not suspect my place? dost thou not -suspect my years? O that he were here to write me -down an ass! But, masters, remember that I am an -ass; though it be not written down, yet forget not -that I am an ass. No, thou villain, thou art full of -piety, as shall be proved upon thee by good witness. -I am a wise fellow, and, which is more, an officer, -and, which is more, a householder, and, which is -more, as pretty a piece of flesh as any is in -Messina, and one that knows the law, go to; and a -rich fellow enough, go to; and a fellow that hath -had losses, and one that hath two gowns and every -thing handsome about him. Bring him away. O that -I had been writ down an ass! - - - -Exeunt - - - - -ACT V - -SCENE I. Before LEONATO'S house. -Enter LEONATO and ANTONIO - - -ANTONIO -If you go on thus, you will kill yourself: -And 'tis not wisdom thus to second grief -Against yourself. - - - -LEONATO -I pray thee, cease thy counsel, -Which falls into mine ears as profitless -As water in a sieve: give not me counsel; -Nor let no comforter delight mine ear -But such a one whose wrongs do suit with mine. -Bring me a father that so loved his child, -Whose joy of her is overwhelm'd like mine, -And bid him speak of patience; -Measure his woe the length and breadth of mine -And let it answer every strain for strain, -As thus for thus and such a grief for such, -In every lineament, branch, shape, and form: -If such a one will smile and stroke his beard, -Bid sorrow wag, cry 'hem!' when he should groan, -Patch grief with proverbs, make misfortune drunk -With candle-wasters; bring him yet to me, -And I of him will gather patience. -But there is no such man: for, brother, men -Can counsel and speak comfort to that grief -Which they themselves not feel; but, tasting it, -Their counsel turns to passion, which before -Would give preceptial medicine to rage, -Fetter strong madness in a silken thread, -Charm ache with air and agony with words: -No, no; 'tis all men's office to speak patience -To those that wring under the load of sorrow, -But no man's virtue nor sufficiency -To be so moral when he shall endure -The like himself. Therefore give me no counsel: -My griefs cry louder than advertisement. - - - -ANTONIO -Therein do men from children nothing differ. - - - -LEONATO -I pray thee, peace. I will be flesh and blood; -For there was never yet philosopher -That could endure the toothache patiently, -However they have writ the style of gods -And made a push at chance and sufferance. - - - -ANTONIO -Yet bend not all the harm upon yourself; -Make those that do offend you suffer too. - - - -LEONATO -There thou speak'st reason: nay, I will do so. -My soul doth tell me Hero is belied; -And that shall Claudio know; so shall the prince -And all of them that thus dishonour her. - - - -ANTONIO -Here comes the prince and Claudio hastily. - - - -Enter DON PEDRO and CLAUDIO - - -DON PEDRO -Good den, good den. - - - -CLAUDIO -Good day to both of you. - - - -LEONATO -Hear you. my lords,-- - - - -DON PEDRO -We have some haste, Leonato. - - - -LEONATO -Some haste, my lord! well, fare you well, my lord: -Are you so hasty now? well, all is one. - - - -DON PEDRO -Nay, do not quarrel with us, good old man. - - - -ANTONIO -If he could right himself with quarreling, -Some of us would lie low. - - - -CLAUDIO -Who wrongs him? - - - -LEONATO -Marry, thou dost wrong me; thou dissembler, thou:-- -Nay, never lay thy hand upon thy sword; -I fear thee not. - - - -CLAUDIO -Marry, beshrew my hand, -If it should give your age such cause of fear: -In faith, my hand meant nothing to my sword. - - - -LEONATO -Tush, tush, man; never fleer and jest at me: -I speak not like a dotard nor a fool, -As under privilege of age to brag -What I have done being young, or what would do -Were I not old. Know, Claudio, to thy head, -Thou hast so wrong'd mine innocent child and me -That I am forced to lay my reverence by -And, with grey hairs and bruise of many days, -Do challenge thee to trial of a man. -I say thou hast belied mine innocent child; -Thy slander hath gone through and through her heart, -And she lies buried with her ancestors; -O, in a tomb where never scandal slept, -Save this of hers, framed by thy villany! - - - -CLAUDIO -My villany? - - - -LEONATO -Thine, Claudio; thine, I say. - - - -DON PEDRO -You say not right, old man. - - - -LEONATO -My lord, my lord, -I'll prove it on his body, if he dare, -Despite his nice fence and his active practise, -His May of youth and bloom of lustihood. - - - -CLAUDIO -Away! I will not have to do with you. - - - -LEONATO -Canst thou so daff me? Thou hast kill'd my child: -If thou kill'st me, boy, thou shalt kill a man. - - - -ANTONIO -He shall kill two of us, and men indeed: -But that's no matter; let him kill one first; -Win me and wear me; let him answer me. -Come, follow me, boy; come, sir boy, come, follow me: -Sir boy, I'll whip you from your foining fence; -Nay, as I am a gentleman, I will. - - - -LEONATO -Brother,-- - - - -ANTONIO -Content yourself. God knows I loved my niece; -And she is dead, slander'd to death by villains, -That dare as well answer a man indeed -As I dare take a serpent by the tongue: -Boys, apes, braggarts, Jacks, milksops! - - - -LEONATO -Brother Antony,-- - - - -ANTONIO -Hold you content. What, man! I know them, yea, -And what they weigh, even to the utmost scruple,-- -Scrambling, out-facing, fashion-monging boys, -That lie and cog and flout, deprave and slander, -Go anticly, show outward hideousness, -And speak off half a dozen dangerous words, -How they might hurt their enemies, if they durst; -And this is all. - - - -LEONATO -But, brother Antony,-- - - - -ANTONIO -Come, 'tis no matter: -Do not you meddle; let me deal in this. - - - -DON PEDRO -Gentlemen both, we will not wake your patience. -My heart is sorry for your daughter's death: -But, on my honour, she was charged with nothing -But what was true and very full of proof. - - - -LEONATO -My lord, my lord,-- - - - -DON PEDRO -I will not hear you. - - - -LEONATO -No? Come, brother; away! I will be heard. - - - -ANTONIO -And shall, or some of us will smart for it. - - - -Exeunt LEONATO and ANTONIO - - -DON PEDRO -See, see; here comes the man we went to seek. - - - -Enter BENEDICK - - -CLAUDIO -Now, signior, what news? - - - -BENEDICK -Good day, my lord. - - - -DON PEDRO -Welcome, signior: you are almost come to part -almost a fray. - - - -CLAUDIO -We had like to have had our two noses snapped off -with two old men without teeth. - - - -DON PEDRO -Leonato and his brother. What thinkest thou? Had -we fought, I doubt we should have been too young for them. - - - -BENEDICK -In a false quarrel there is no true valour. I came -to seek you both. - - - -CLAUDIO -We have been up and down to seek thee; for we are -high-proof melancholy and would fain have it beaten -away. Wilt thou use thy wit? - - - -BENEDICK -It is in my scabbard: shall I draw it? - - - -DON PEDRO -Dost thou wear thy wit by thy side? - - - -CLAUDIO -Never any did so, though very many have been beside -their wit. I will bid thee draw, as we do the -minstrels; draw, to pleasure us. - - - -DON PEDRO -As I am an honest man, he looks pale. Art thou -sick, or angry? - - - -CLAUDIO -What, courage, man! What though care killed a cat, -thou hast mettle enough in thee to kill care. - - - -BENEDICK -Sir, I shall meet your wit in the career, and you -charge it against me. I pray you choose another subject. - - - -CLAUDIO -Nay, then, give him another staff: this last was -broke cross. - - - -DON PEDRO -By this light, he changes more and more: I think -he be angry indeed. - - - -CLAUDIO -If he be, he knows how to turn his girdle. - - - -BENEDICK -Shall I speak a word in your ear? - - - -CLAUDIO -God bless me from a challenge! - - - -BENEDICK -Aside to CLAUDIO You are a villain; I jest not: -I will make it good how you dare, with what you -dare, and when you dare. Do me right, or I will -protest your cowardice. You have killed a sweet -lady, and her death shall fall heavy on you. Let me -hear from you. - - - -CLAUDIO -Well, I will meet you, so I may have good cheer. - - - -DON PEDRO -What, a feast, a feast? - - - -CLAUDIO -I' faith, I thank him; he hath bid me to a calf's -head and a capon; the which if I do not carve most -curiously, say my knife's naught. Shall I not find -a woodcock too? - - - -BENEDICK -Sir, your wit ambles well; it goes easily. - - - -DON PEDRO -I'll tell thee how Beatrice praised thy wit the -other day. I said, thou hadst a fine wit: 'True,' -said she, 'a fine little one.' 'No,' said I, 'a -great wit:' 'Right,' says she, 'a great gross one.' -'Nay,' said I, 'a good wit:' 'Just,' said she, 'it -hurts nobody.' 'Nay,' said I, 'the gentleman -is wise:' 'Certain,' said she, 'a wise gentleman.' -'Nay,' said I, 'he hath the tongues:' 'That I -believe,' said she, 'for he swore a thing to me on -Monday night, which he forswore on Tuesday morning; -there's a double tongue; there's two tongues.' Thus -did she, an hour together, transshape thy particular -virtues: yet at last she concluded with a sigh, thou -wast the properest man in Italy. - - - -CLAUDIO -For the which she wept heartily and said she cared -not. - - - -DON PEDRO -Yea, that she did: but yet, for all that, an if she -did not hate him deadly, she would love him dearly: -the old man's daughter told us all. - - - -CLAUDIO -All, all; and, moreover, God saw him when he was -hid in the garden. - - - -DON PEDRO -But when shall we set the savage bull's horns on -the sensible Benedick's head? - - - -CLAUDIO -Yea, and text underneath, 'Here dwells Benedick the -married man'? - - - -BENEDICK -Fare you well, boy: you know my mind. I will leave -you now to your gossip-like humour: you break jests -as braggarts do their blades, which God be thanked, -hurt not. My lord, for your many courtesies I thank -you: I must discontinue your company: your brother -the bastard is fled from Messina: you have among -you killed a sweet and innocent lady. For my Lord -Lackbeard there, he and I shall meet: and, till -then, peace be with him. - - - -Exit - - -DON PEDRO -He is in earnest. - - - -CLAUDIO -In most profound earnest; and, I'll warrant you, for -the love of Beatrice. - - - -DON PEDRO -And hath challenged thee. - - - -CLAUDIO -Most sincerely. - - - -DON PEDRO -What a pretty thing man is when he goes in his -doublet and hose and leaves off his wit! - - - -CLAUDIO -He is then a giant to an ape; but then is an ape a -doctor to such a man. - - - -DON PEDRO -But, soft you, let me be: pluck up, my heart, and -be sad. Did he not say, my brother was fled? - - - -Enter DOGBERRY, VERGES, and the Watch, with CONRADE -and BORACHIO - - -DOGBERRY -Come you, sir: if justice cannot tame you, she -shall ne'er weigh more reasons in her balance: nay, -an you be a cursing hypocrite once, you must be looked to. - - - -DON PEDRO -How now? two of my brother's men bound! Borachio -one! - - - -CLAUDIO -Hearken after their offence, my lord. - - - -DON PEDRO -Officers, what offence have these men done? - - - -DOGBERRY -Marry, sir, they have committed false report; -moreover, they have spoken untruths; secondarily, -they are slanders; sixth and lastly, they have -belied a lady; thirdly, they have verified unjust -things; and, to conclude, they are lying knaves. - - - -DON PEDRO -First, I ask thee what they have done; thirdly, I -ask thee what's their offence; sixth and lastly, why -they are committed; and, to conclude, what you lay -to their charge. - - - -CLAUDIO -Rightly reasoned, and in his own division: and, by -my troth, there's one meaning well suited. - - - -DON PEDRO -Who have you offended, masters, that you are thus -bound to your answer? this learned constable is -too cunning to be understood: what's your offence? - - - -BORACHIO -Sweet prince, let me go no farther to mine answer: -do you hear me, and let this count kill me. I have -deceived even your very eyes: what your wisdoms -could not discover, these shallow fools have brought -to light: who in the night overheard me confessing -to this man how Don John your brother incensed me -to slander the Lady Hero, how you were brought into -the orchard and saw me court Margaret in Hero's -garments, how you disgraced her, when you should -marry her: my villany they have upon record; which -I had rather seal with my death than repeat over -to my shame. The lady is dead upon mine and my -master's false accusation; and, briefly, I desire -nothing but the reward of a villain. - - - -DON PEDRO -Runs not this speech like iron through your blood? - - - -CLAUDIO -I have drunk poison whiles he utter'd it. - - - -DON PEDRO -But did my brother set thee on to this? - - - -BORACHIO -Yea, and paid me richly for the practise of it. - - - -DON PEDRO -He is composed and framed of treachery: -And fled he is upon this villany. - - - -CLAUDIO -Sweet Hero! now thy image doth appear -In the rare semblance that I loved it first. - - - -DOGBERRY -Come, bring away the plaintiffs: by this time our -sexton hath reformed Signior Leonato of the matter: -and, masters, do not forget to specify, when time -and place shall serve, that I am an ass. - - - -VERGES -Here, here comes master Signior Leonato, and the -Sexton too. - - - -Re-enter LEONATO and ANTONIO, with the Sexton - - -LEONATO -Which is the villain? let me see his eyes, -That, when I note another man like him, -I may avoid him: which of these is he? - - - -BORACHIO -If you would know your wronger, look on me. - - - -LEONATO -Art thou the slave that with thy breath hast kill'd -Mine innocent child? - - - -BORACHIO -Yea, even I alone. - - - -LEONATO -No, not so, villain; thou beliest thyself: -Here stand a pair of honourable men; -A third is fled, that had a hand in it. -I thank you, princes, for my daughter's death: -Record it with your high and worthy deeds: -'Twas bravely done, if you bethink you of it. - - - -CLAUDIO -I know not how to pray your patience; -Yet I must speak. Choose your revenge yourself; -Impose me to what penance your invention -Can lay upon my sin: yet sinn'd I not -But in mistaking. - - - -DON PEDRO -By my soul, nor I: -And yet, to satisfy this good old man, -I would bend under any heavy weight -That he'll enjoin me to. - - - -LEONATO -I cannot bid you bid my daughter live; -That were impossible: but, I pray you both, -Possess the people in Messina here -How innocent she died; and if your love -Can labour ought in sad invention, -Hang her an epitaph upon her tomb -And sing it to her bones, sing it to-night: -To-morrow morning come you to my house, -And since you could not be my son-in-law, -Be yet my nephew: my brother hath a daughter, -Almost the copy of my child that's dead, -And she alone is heir to both of us: -Give her the right you should have given her cousin, -And so dies my revenge. - - - -CLAUDIO -O noble sir, -Your over-kindness doth wring tears from me! -I do embrace your offer; and dispose -For henceforth of poor Claudio. - - - -LEONATO -To-morrow then I will expect your coming; -To-night I take my leave. This naughty man -Shall face to face be brought to Margaret, -Who I believe was pack'd in all this wrong, -Hired to it by your brother. - - - -BORACHIO -No, by my soul, she was not, -Nor knew not what she did when she spoke to me, -But always hath been just and virtuous -In any thing that I do know by her. - - - -DOGBERRY -Moreover, sir, which indeed is not under white and -black, this plaintiff here, the offender, did call -me ass: I beseech you, let it be remembered in his -punishment. And also, the watch heard them talk of -one Deformed: they say be wears a key in his ear and -a lock hanging by it, and borrows money in God's -name, the which he hath used so long and never paid -that now men grow hard-hearted and will lend nothing -for God's sake: pray you, examine him upon that point. - - - -LEONATO -I thank thee for thy care and honest pains. - - - -DOGBERRY -Your worship speaks like a most thankful and -reverend youth; and I praise God for you. - - - -LEONATO -There's for thy pains. - - - -DOGBERRY -God save the foundation! - - - -LEONATO -Go, I discharge thee of thy prisoner, and I thank thee. - - - -DOGBERRY -I leave an arrant knave with your worship; which I -beseech your worship to correct yourself, for the -example of others. God keep your worship! I wish -your worship well; God restore you to health! I -humbly give you leave to depart; and if a merry -meeting may be wished, God prohibit it! Come, neighbour. - - - -Exeunt DOGBERRY and VERGES - - -LEONATO -Until to-morrow morning, lords, farewell. - - - -ANTONIO -Farewell, my lords: we look for you to-morrow. - - - -DON PEDRO -We will not fail. - - - -CLAUDIO -To-night I'll mourn with Hero. - - - -LEONATO -To the Watch Bring you these fellows on. We'll -talk with Margaret, -How her acquaintance grew with this lewd fellow. - - - -Exeunt, severally - - -SCENE II. LEONATO'S garden. -Enter BENEDICK and MARGARET, meeting - - -BENEDICK -Pray thee, sweet Mistress Margaret, deserve well at -my hands by helping me to the speech of Beatrice. - - - -MARGARET -Will you then write me a sonnet in praise of my beauty? - - - -BENEDICK -In so high a style, Margaret, that no man living -shall come over it; for, in most comely truth, thou -deservest it. - - - -MARGARET -To have no man come over me! why, shall I always -keep below stairs? - - - -BENEDICK -Thy wit is as quick as the greyhound's mouth; it catches. - - - -MARGARET -And yours as blunt as the fencer's foils, which hit, -but hurt not. - - - -BENEDICK -A most manly wit, Margaret; it will not hurt a -woman: and so, I pray thee, call Beatrice: I give -thee the bucklers. - - - -MARGARET -Give us the swords; we have bucklers of our own. - - - -BENEDICK -If you use them, Margaret, you must put in the -pikes with a vice; and they are dangerous weapons for maids. - - - -MARGARET -Well, I will call Beatrice to you, who I think hath legs. - - - -BENEDICK -And therefore will come. -Exit MARGARET -Sings -The god of love, -That sits above, -And knows me, and knows me, -How pitiful I deserve,-- -I mean in singing; but in loving, Leander the good -swimmer, Troilus the first employer of panders, and -a whole bookful of these quondam carpet-mangers, -whose names yet run smoothly in the even road of a -blank verse, why, they were never so truly turned -over and over as my poor self in love. Marry, I -cannot show it in rhyme; I have tried: I can find -out no rhyme to 'lady' but 'baby,' an innocent -rhyme; for 'scorn,' 'horn,' a hard rhyme; for, -'school,' 'fool,' a babbling rhyme; very ominous -endings: no, I was not born under a rhyming planet, -nor I cannot woo in festival terms. -Enter BEATRICE -Sweet Beatrice, wouldst thou come when I called thee? - - - -BEATRICE -Yea, signior, and depart when you bid me. - - - -BENEDICK -O, stay but till then! - - - -BEATRICE -'Then' is spoken; fare you well now: and yet, ere -I go, let me go with that I came; which is, with -knowing what hath passed between you and Claudio. - - - -BENEDICK -Only foul words; and thereupon I will kiss thee. - - - -BEATRICE -Foul words is but foul wind, and foul wind is but -foul breath, and foul breath is noisome; therefore I -will depart unkissed. - - - -BENEDICK -Thou hast frighted the word out of his right sense, -so forcible is thy wit. But I must tell thee -plainly, Claudio undergoes my challenge; and either -I must shortly hear from him, or I will subscribe -him a coward. And, I pray thee now, tell me for -which of my bad parts didst thou first fall in love with me? - - - -BEATRICE -For them all together; which maintained so politic -a state of evil that they will not admit any good -part to intermingle with them. But for which of my -good parts did you first suffer love for me? - - - -BENEDICK -Suffer love! a good epithet! I do suffer love -indeed, for I love thee against my will. - - - -BEATRICE -In spite of your heart, I think; alas, poor heart! -If you spite it for my sake, I will spite it for -yours; for I will never love that which my friend hates. - - - -BENEDICK -Thou and I are too wise to woo peaceably. - - - -BEATRICE -It appears not in this confession: there's not one -wise man among twenty that will praise himself. - - - -BENEDICK -An old, an old instance, Beatrice, that lived in -the lime of good neighbours. If a man do not erect -in this age his own tomb ere he dies, he shall live -no longer in monument than the bell rings and the -widow weeps. - - - -BEATRICE -And how long is that, think you? - - - -BENEDICK -Question: why, an hour in clamour and a quarter in -rheum: therefore is it most expedient for the -wise, if Don Worm, his conscience, find no -impediment to the contrary, to be the trumpet of his -own virtues, as I am to myself. So much for -praising myself, who, I myself will bear witness, is -praiseworthy: and now tell me, how doth your cousin? - - - -BEATRICE -Very ill. - - - -BENEDICK -And how do you? - - - -BEATRICE -Very ill too. - - - -BENEDICK -Serve God, love me and mend. There will I leave -you too, for here comes one in haste. - - - -Enter URSULA - - -URSULA -Madam, you must come to your uncle. Yonder's old -coil at home: it is proved my Lady Hero hath been -falsely accused, the prince and Claudio mightily -abused; and Don John is the author of all, who is -fed and gone. Will you come presently? - - - -BEATRICE -Will you go hear this news, signior? - - - -BENEDICK -I will live in thy heart, die in thy lap, and be -buried in thy eyes; and moreover I will go with -thee to thy uncle's. - - - -Exeunt - - -SCENE III. A church. -Enter DON PEDRO, CLAUDIO, and three or four -with tapers - - -CLAUDIO -Is this the monument of Leonato? - - - -Lord -It is, my lord. - - - -CLAUDIO -Reading out of a scroll -Done to death by slanderous tongues -Was the Hero that here lies: -Death, in guerdon of her wrongs, -Gives her fame which never dies. -So the life that died with shame -Lives in death with glorious fame. -Hang thou there upon the tomb, -Praising her when I am dumb. -Now, music, sound, and sing your solemn hymn. -SONG. -Pardon, goddess of the night, -Those that slew thy virgin knight; -For the which, with songs of woe, -Round about her tomb they go. -Midnight, assist our moan; -Help us to sigh and groan, -Heavily, heavily: -Graves, yawn and yield your dead, -Till death be uttered, -Heavily, heavily. - - - -CLAUDIO -Now, unto thy bones good night! -Yearly will I do this rite. - - - -DON PEDRO -Good morrow, masters; put your torches out: -The wolves have prey'd; and look, the gentle day, -Before the wheels of Phoebus, round about -Dapples the drowsy east with spots of grey. -Thanks to you all, and leave us: fare you well. - - - -CLAUDIO -Good morrow, masters: each his several way. - - - -DON PEDRO -Come, let us hence, and put on other weeds; -And then to Leonato's we will go. - - - -CLAUDIO -And Hymen now with luckier issue speed's -Than this for whom we render'd up this woe. - - - -Exeunt - - -SCENE IV. A room in LEONATO'S house. -Enter LEONATO, ANTONIO, BENEDICK, BEATRICE, -MARGARET, URSULA, FRIAR FRANCIS, and HERO - - -FRIAR FRANCIS -Did I not tell you she was innocent? - - - -LEONATO -So are the prince and Claudio, who accused her -Upon the error that you heard debated: -But Margaret was in some fault for this, -Although against her will, as it appears -In the true course of all the question. - - - -ANTONIO -Well, I am glad that all things sort so well. - - - -BENEDICK -And so am I, being else by faith enforced -To call young Claudio to a reckoning for it. - - - -LEONATO -Well, daughter, and you gentle-women all, -Withdraw into a chamber by yourselves, -And when I send for you, come hither mask'd. -Exeunt Ladies -The prince and Claudio promised by this hour -To visit me. You know your office, brother: -You must be father to your brother's daughter -And give her to young Claudio. - - - -ANTONIO -Which I will do with confirm'd countenance. - - - -BENEDICK -Friar, I must entreat your pains, I think. - - - -FRIAR FRANCIS -To do what, signior? - - - -BENEDICK -To bind me, or undo me; one of them. -Signior Leonato, truth it is, good signior, -Your niece regards me with an eye of favour. - - - -LEONATO -That eye my daughter lent her: 'tis most true. - - - -BENEDICK -And I do with an eye of love requite her. - - - -LEONATO -The sight whereof I think you had from me, -From Claudio and the prince: but what's your will? - - - -BENEDICK -Your answer, sir, is enigmatical: -But, for my will, my will is your good will -May stand with ours, this day to be conjoin'd -In the state of honourable marriage: -In which, good friar, I shall desire your help. - - - -LEONATO -My heart is with your liking. - - - -FRIAR FRANCIS -And my help. -Here comes the prince and Claudio. - - - -Enter DON PEDRO and CLAUDIO, and two or -three others - - -DON PEDRO -Good morrow to this fair assembly. - - - -LEONATO -Good morrow, prince; good morrow, Claudio: -We here attend you. Are you yet determined -To-day to marry with my brother's daughter? - - - -CLAUDIO -I'll hold my mind, were she an Ethiope. - - - -LEONATO -Call her forth, brother; here's the friar ready. - - - -Exit ANTONIO - - -DON PEDRO -Good morrow, Benedick. Why, what's the matter, -That you have such a February face, -So full of frost, of storm and cloudiness? - - - -CLAUDIO -I think he thinks upon the savage bull. -Tush, fear not, man; we'll tip thy horns with gold -And all Europa shall rejoice at thee, -As once Europa did at lusty Jove, -When he would play the noble beast in love. - - - -BENEDICK -Bull Jove, sir, had an amiable low; -And some such strange bull leap'd your father's cow, -And got a calf in that same noble feat -Much like to you, for you have just his bleat. - - - -CLAUDIO -For this I owe you: here comes other reckonings. -Re-enter ANTONIO, with the Ladies masked -Which is the lady I must seize upon? - - - -ANTONIO -This same is she, and I do give you her. - - - -CLAUDIO -Why, then she's mine. Sweet, let me see your face. - - - -LEONATO -No, that you shall not, till you take her hand -Before this friar and swear to marry her. - - - -CLAUDIO -Give me your hand: before this holy friar, -I am your husband, if you like of me. - - - -HERO -And when I lived, I was your other wife: -Unmasking -And when you loved, you were my other husband. - - - -CLAUDIO -Another Hero! - - - -HERO -Nothing certainer: -One Hero died defiled, but I do live, -And surely as I live, I am a maid. - - - -DON PEDRO -The former Hero! Hero that is dead! - - - -LEONATO -She died, my lord, but whiles her slander lived. - - - -FRIAR FRANCIS -All this amazement can I qualify: -When after that the holy rites are ended, -I'll tell you largely of fair Hero's death: -Meantime let wonder seem familiar, -And to the chapel let us presently. - - - -BENEDICK -Soft and fair, friar. Which is Beatrice? - - - -BEATRICE -Unmasking I answer to that name. What is your will? - - - -BENEDICK -Do not you love me? - - - -BEATRICE -Why, no; no more than reason. - - - -BENEDICK -Why, then your uncle and the prince and Claudio -Have been deceived; they swore you did. - - - -BEATRICE -Do not you love me? - - - -BENEDICK -Troth, no; no more than reason. - - - -BEATRICE -Why, then my cousin Margaret and Ursula -Are much deceived; for they did swear you did. - - - -BENEDICK -They swore that you were almost sick for me. - - - -BEATRICE -They swore that you were well-nigh dead for me. - - - -BENEDICK -'Tis no such matter. Then you do not love me? - - - -BEATRICE -No, truly, but in friendly recompense. - - - -LEONATO -Come, cousin, I am sure you love the gentleman. - - - -CLAUDIO -And I'll be sworn upon't that he loves her; -For here's a paper written in his hand, -A halting sonnet of his own pure brain, -Fashion'd to Beatrice. - - - -HERO -And here's another -Writ in my cousin's hand, stolen from her pocket, -Containing her affection unto Benedick. - - - -BENEDICK -A miracle! here's our own hands against our hearts. -Come, I will have thee; but, by this light, I take -thee for pity. - - - -BEATRICE -I would not deny you; but, by this good day, I yield -upon great persuasion; and partly to save your life, -for I was told you were in a consumption. - - - -BENEDICK -Peace! I will stop your mouth. - - - -Kissing her - - -DON PEDRO -How dost thou, Benedick, the married man? - - - -BENEDICK -I'll tell thee what, prince; a college of -wit-crackers cannot flout me out of my humour. Dost -thou think I care for a satire or an epigram? No: -if a man will be beaten with brains, a' shall wear -nothing handsome about him. In brief, since I do -purpose to marry, I will think nothing to any -purpose that the world can say against it; and -therefore never flout at me for what I have said -against it; for man is a giddy thing, and this is my -conclusion. For thy part, Claudio, I did think to -have beaten thee, but in that thou art like to be my -kinsman, live unbruised and love my cousin. - - - -CLAUDIO -I had well hoped thou wouldst have denied Beatrice, -that I might have cudgelled thee out of thy single -life, to make thee a double-dealer; which, out of -question, thou wilt be, if my cousin do not look -exceedingly narrowly to thee. - - - -BENEDICK -Come, come, we are friends: let's have a dance ere -we are married, that we may lighten our own hearts -and our wives' heels. - - - -LEONATO -We'll have dancing afterward. - - - -BENEDICK -First, of my word; therefore play, music. Prince, -thou art sad; get thee a wife, get thee a wife: -there is no staff more reverend than one tipped with horn. - - - -Enter a Messenger - - -Messenger -My lord, your brother John is ta'en in flight, -And brought with armed men back to Messina. - - - -BENEDICK -Think not on him till to-morrow: -I'll devise thee brave punishments for him. -Strike up, pipers. - - -Dance -Exeunt - - - diff --git a/test/rexml/data/namespaces.xml b/test/rexml/data/namespaces.xml deleted file mode 100644 index e8e4df83644b7c..00000000000000 --- a/test/rexml/data/namespaces.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Hello - - - - Hey - - - - Hey2 - - - - Hey3 - - diff --git a/test/rexml/data/nitf.xml b/test/rexml/data/nitf.xml deleted file mode 100644 index 269d99e211c4f9..00000000000000 --- a/test/rexml/data/nitf.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Use of Napster Quadruples - - By PETER SVENSSON - AP Business Writer - - The Associated Press - - NEW YORK - - - - -

Despite the uncertain legality of the Napster online music-sharing service, the number of people -using it more than quadrupled in just five months, Media Metrix said Monday.

-

That made Napster the fastest-growing software application ever recorded by the Internet research -company.

-

From 1.1 million home users in the United States in February, the first month Media Metrix -tracked the application, Napster use rocketed to 4.9 million users in July.

-

That represents 6 percent of U.S. home PC users who have modems, said Media Metrix, which pays -people to install monitoring software on their computers.

-

It estimates total usage from a panel of about 50,000 people in the United States.

-

Napster was also used at work by 887,000 people in July, Media Metrix said.

-

Napster Inc. has been sued by the recording industry for allegedly enabling copyright -infringement. The federal government weighed in on the case Friday, saying the service is not protected -under a key copyright law, as the San Mateo, Calif., company claims.

-

Bruce Ryon, head of Media Metrix's New Media Group, said Napster was used by "the full spectrum of PC users, not just the youth with time on their hands and a passion for music."

-

The Napster program allows users to copy digital music files from the hard drives of other -users over the Internet.

-

Napster Inc. said last week that 28 million people had downloaded its program. It does not reveal -its own figures for how many people actually use the software.

-

Because the program connects to the company's computers over the Internet every time -it is run, Napster Inc. can track usage exactly.

-

__

-

On the Net:

-

-http://www.napster.com

-

-http://www.mediametrix.com

- - - - diff --git a/test/rexml/data/numbers.xml b/test/rexml/data/numbers.xml deleted file mode 100644 index a1791cd63812f1..00000000000000 --- a/test/rexml/data/numbers.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - 3 - 24 - 55 - 11 - 2 - -3 - - - - - - - - diff --git a/test/rexml/data/ofbiz-issues-full-177.xml b/test/rexml/data/ofbiz-issues-full-177.xml deleted file mode 100644 index bfff771d1217bb..00000000000000 --- a/test/rexml/data/ofbiz-issues-full-177.xml +++ /dev/null @@ -1,13971 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - 1 - RESOLVED - P3 - FIXED - Documentation - CVS - All - issues@ofbiz - 20030820210924 - website - ajzeneski - not determined - DEFECT - 2003-08-13 22:35:10 - issues@ofbiz - - - - All - Website missing - - - ajzeneski - 2003-08-13 22:35:10 - Website is missing from CVS. - - - ajzeneski - 2003-08-19 12:09:17 - Website starting to move - - - ajzeneski - 2003-08-19 12:11:57 - Changed milestone - - - ajzeneski - 2003-08-20 21:09:24 - Website has been imported into CVS - - - ajzeneski - 2003-08-19 12:09:17 - issue_status - Status - NEW - STARTED - - - ajzeneski - 2003-08-19 12:09:17 - version - Version - unspecified - CVS - - - ajzeneski - 2003-08-19 12:11:57 - target_milestone - Target Milestone - milestone 1 - not determined - - - ajzeneski - 2003-08-20 21:09:24 - issue_status - Status - STARTED - RESOLVED - - - ajzeneski - 2003-08-20 21:09:24 - resolution - Resolution - - FIXED - - - - 2 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20030824004146 - Product - ajzeneski - not determined - DEFECT - 2003-08-23 14:25:20 - issues@ofbiz - - - - All - Missing FTL - - - ajzeneski - 2003-08-23 14:25:20 - Missing FTL file: - -Error: File not found: /feature/EditFeatureCategoryFeatures.ftl - - - jonesde - 2003-08-24 00:41:46 - Converted JSP to FTL, made some small corrections. - - - jonesde - 2003-08-24 00:41:46 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-08-24 00:41:46 - resolution - Resolution - - FIXED - - - - 3 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20030828103031 - Product - ajzeneski - not determined - DEFECT - 2003-08-23 14:27:14 - issues@ofbiz - - - - All - Edit Promo Bug - - - ajzeneski - 2003-08-23 14:27:14 - When editing a promo rule; the drop down for the current condition contains only -the existing condition (many times). - - - jonesde - 2003-08-28 10:30:31 - #list directive had a type. Fix in CVS. - - - jonesde - 2003-08-28 10:30:31 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-08-28 10:30:31 - resolution - Resolution - - FIXED - - - - 4 - VERIFIED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20030828103057 - Product - ajzeneski - not determined - DEFECT - 2003-08-23 14:30:52 - issues@ofbiz - - - - All - Price Rule Bug - - - ajzeneski - 2003-08-23 14:30:52 - When editing a price rule; changing the is "sale price" flag sets properly, -however always displays "no" as the selected choice. - - - jonesde - 2003-08-28 10:20:59 - Fixed conditional on the no button, now appears correctly. - - - jonesde - 2003-08-28 10:30:57 - Done - - - jonesde - 2003-08-28 10:20:59 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-08-28 10:20:59 - resolution - Resolution - - FIXED - - - jonesde - 2003-08-28 10:30:57 - issue_status - Status - RESOLVED - VERIFIED - - - - 5 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20030823144138 - Party - ajzeneski - not determined - DEFECT - 2003-08-23 14:41:38 - issues@ofbiz - - - - All - Relationship missing button - - - ajzeneski - 2003-08-23 14:41:38 - View/Edit party relationships page first is still JSP and second is missing the -links to communication event(s). - - - - 6 - CLOSED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20030918144334 - Entity - robdawson - not determined - DEFECT - 2003-09-04 02:09:57 - jonesde - - - - All - Entity Engine ConnectionFactory and DBCPConnectionFactory issues with Oracle - - - robdawson - 2003-09-04 02:09:57 - When using the Inline JDBC Functionality of the Entity Engine to access an Oracle -database the Entity Engine gives SQL no suitable driver exceptions. - -The fix for this involves changing: - loader.loadClass(driverClassName); -to - Class clazz = loader.loadClass(driverClassName); - clazz.newInstance(); -in both the ConnectionFactory and DBCPConnectionFactory classes. - -There will also need to be the appropriate exception handling. - -Please contact me if this requires any clarification. - - - ajzeneski - 2003-09-04 22:15:06 - The message you are getting means that the JDBC drivers for Oracle cannot be -found on the classpath. Contact the users mailing list if you need further help -with this issue. - - - ajzeneski - 2003-09-04 22:17:28 - Sorry; DBCP support is currently outdated and not used due to the fact that -there is no transaction support. It is recommended you use the JOTM/XAPool -connections. This issue will be addressed during a refactor of this class in the -coming months. - - - jonesde - 2003-09-18 14:43:34 - -This issue has been resolved with code changes similar to those recommended. - -HOWEVER: There is one caveat with this: I would NOT recommend running using -either of these blocks of code. Without a transaction aware connection pool -performance will be severely affected or operations may be performed outside of -transactions. So, I wouldn't use straight JDBC or DBCP right now. Hopefully in -the future DBCP will support XADataSources, then it may be an option. - -Later, --David Jones - - - - ajzeneski - 2003-09-04 22:15:06 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2003-09-04 22:15:06 - resolution - Resolution - - INVALID - - - jonesde - 2003-09-18 14:43:34 - issue_status - Status - RESOLVED - CLOSED - - - jonesde - 2003-09-18 14:43:34 - qa_contact - QA Contact - issues@ofbiz - jonesde - - - - 7 - NEW - P4 - - Components - CVS - All - issues@ofbiz - 20040304194045 - WebTools - fzhu_genshare - not determined - DEFECT - 2003-09-21 07:35:08 - issues@ofbiz - - http://localhost:8080/webtools/control/view/ModelGroupWriter?savetofile=true - - All - "Save Entity Group XML to File" error - - - 8 - jonesde - 2003-11-04 01:04:02 - - - fzhu_genshare - 2003-09-21 07:35:08 - If click "Save Entity Group XML to File" on the webtools, the new page opens and -the following error message appears: - -org.apache.jasper.JasperException: Unable to compile class for JSP - -An error occurred at line: -1 in the jsp file: null - -Generated servlet error: -[javac] Since fork is true, ignoring compiler setting. -[javac] Compiling 1 source file -[javac] Since fork is true, ignoring compiler setting. -[javac] C:\DOCUME~1\ADMINI~1\LOCALS~1 -\Temp\Jetty_0_0_0_0_8080__webtools\entity\ModelGroupWriter_jsp.java:72: -cannot resolve symbol -[javac] symbol : variable entityGroupResourceHandler -[javac] location: class org.ofbiz.entity.model.ModelGroupReader -[javac] ResourceHandler resourceHandler = -modelGroupReader.entityGroupResourceHandler; -[javac] ^ -[javac] 1 error - - - jonesde - 2003-11-04 01:04:02 - *** Issue 8 has been marked as a duplicate of this issue. *** - - - jonesde - 2004-03-04 19:40:45 - lower priority - - - jonesde - 2004-03-04 19:40:45 - priority - Priority - P3 - P4 - - - - 8 - RESOLVED - P3 - DUPLICATE - Components - CVS - All - issues@ofbiz - 20031104010402 - WebTools - fzhu_genshare - not determined - DEFECT - 2003-09-21 07:40:53 - issues@ofbiz - - http://localhost:8080/webtools/control/view/ModelGroupWriter - - All - "Generate Entity Group XML" error - - - 7 - jonesde - 2003-11-04 01:04:02 - - - fzhu_genshare - 2003-09-21 07:40:53 - If clicked "Generate Entity Group XML" on webtools, an error message occurs: - -org.apache.jasper.JasperException: Unable to compile class for JSP - -An error occurred at line: -1 in the jsp file: null - -Generated servlet error: -[javac] Since fork is true, ignoring compiler setting. -[javac] Compiling 1 source file -[javac] Since fork is true, ignoring compiler setting. -[javac] C:\DOCUME~1\ADMINI~1\LOCALS~1 -\Temp\Jetty_0_0_0_0_8080__webtools\entity\ModelGroupWriter_jsp.java:72: -cannot resolve symbol -[javac] symbol : variable entityGroupResourceHandler -[javac] location: class org.ofbiz.entity.model.ModelGroupReader -[javac] ResourceHandler resourceHandler = -modelGroupReader.entityGroupResourceHandler; -[javac] ^ -[javac] 1 error - -It seems the class ResourceHandler is missing. The same error result in several -links of webtools concerning entity engine xml export broken. - - - jonesde - 2003-11-04 01:04:02 - This issue is a duplicate of #7, they may be different links but they hit the same -request and code. - -*** This issue has been marked as a duplicate of 7 *** - - - jonesde - 2003-11-04 01:04:02 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-11-04 01:04:02 - resolution - Resolution - - DUPLICATE - - - - 9 - RESOLVED - P3 - WONTFIX - Components - CVS - All - issues@ofbiz - 20040223211140 - Entity - byersa - not determined - DEFECT - 2003-10-28 09:27:31 - issues@ofbiz - - - - All - GenericEntity.getBytes fails with HSQLDB - - - byersa - 2003-10-28 09:27:31 - getBytes internally casts to ByteWrapper which causes a ClassCastException. -Casting directly to byte[] seems to work. - -Don't know if it fails with other dbs. - - - jonesde - 2004-02-23 21:11:40 - This does not appear to be something that can be fixed in OFBiz, it appears to be a bug in HSQLDB, and -only in certain versions. Trying it with an earlier version it worked, but various other things didn't. We -may just have to be patient until HSQLDB has another stable release. - - - jonesde - 2004-02-23 21:11:40 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-02-23 21:11:40 - resolution - Resolution - - WONTFIX - - - - 10 - RESOLVED - P5 - FIXED - Components - CVS - All - ajzeneski - 20040630193003 - Service - byersa - not determined - ENHANCEMENT - 2003-10-31 08:53:59 - issues@ofbiz - - - - All - missing or incorrect service parameter message - - - byersa - 2003-10-31 08:53:59 - If possible, I think it would be very helpful to developers if the message that -informs on invalid service parameter conditions would clearly indicate whether -it is in the IN or OUT mode that the problem is occurring. - - - ajzeneski - 2004-03-08 12:17:42 - changed to enhancement - - - ajzeneski - 2004-03-08 17:49:18 - reassigned - - - ajzeneski - 2004-06-30 19:30:03 - The ServiceValidationException has been updated to support missing and extra fields as well as -knowing which "mode" (IN/OUT) the error occured in. - - - ajzeneski - 2004-03-08 12:17:42 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - ajzeneski - 2004-03-08 12:17:42 - priority - Priority - P3 - P5 - - - ajzeneski - 2004-03-08 17:49:17 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-06-30 19:30:03 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:30:03 - resolution - Resolution - - FIXED - - - - 11 - RESOLVED - P2 - INVALID - Components - CVS - PC - jonesde - 20031104002629 - Content - cyf - not determined - DEFECT - 2003-11-03 22:26:18 - issues@ofbiz - - - - Windows 2000 - "response.sendRedirect" in jsp could not take effect - - - cyf - 2003-11-03 22:26:18 - I have write a test.jsp code(like): -..... -hello world! -<%response.sendRedirect("control/main");%> -.... - -define : -in controller.xml: -<request-map uri="test" edit="true"> - <response name="success" type="view" value="test"/> - <response name="error" type="view" value="error"/> -</request-map> -..... -<view-map name="test" type="region"/> - -in region also configued - -when I test the page : -it's appear "hello world!",but didn't redirect. - -When I use this code as jsp page in normal web app,redirect can take effect. - -I think this is a bug of in region process. - - - jonesde - 2003-11-04 00:26:29 - -If I understand your complaint correctly it is because the way you organized -things the response output stream is committed before the sendRedirect is -called. There is absolutely nothing that can be done about this. - -If you want to send a redirect you should do so in an event or a non-region view -(and non-jpublish for that matter). Those composite view tools are meant for -generating views and involve templates that may cause the response to be -committed before you wrapped view is even called. - -BTW, this may be more appropriate as a question on the users list, not as a defect -bug report. - -Later, --David Jones - - - jonesde - 2003-11-04 00:26:29 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-11-04 00:26:29 - resolution - Resolution - - INVALID - - - - 12 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040223213513 - Entity - quake_wang - not determined - DEFECT - 2003-11-04 01:39:16 - issues@ofbiz - - - - All - entity cache is not synchronized with DB - - - quake_wang - 2003-11-04 01:39:16 - Quake, - -It might make sense to have an issue created on the ofbiz.dev.java.net -site that covers this problem, since it may take some time to resolve. -Could you create one there? It could just include text from messages -send back and forth in this email thread. - -Thanks, --David - -On Nov 3, 2003, at 6:57 PM, Quake_Wang wrote: - -> The immutable flag can solve some cache synchronize issues, it will -> help for debugging. But, please consider this scenario: -> -> Service A: -> OK, now base on policy: "NEVER read from the cache if you are planning -> on updating", we directly read from DB, -> order = findByPK ("Order", 10000); -> order.set("status", "DEF"); -> order.store(); -> -> -> Service B: -> order = findByPKCache("Order", 10000); -> just query, do not change any fields, entity engine will put the order -> 10000 with "DEF" status in cache, after some other operations (not on -> the order generic value) throw exception, rolled back service A and B, -> then PKCache is not synchronized with DB too, the immutable flag can -> not help any...... -> -> You wrote a service using cache for better performance, and someone -> may assembly your service in same transaction (group service, ECA -> service), the synchronizing may broken, it's really hard to find such -> problem. -> -> Any ideas? -> -> Quake -> -> -----Original Message----- -> From: David Jones [mailto:jonesde@ofbiz.org] -> Sent: Monday, November 03, 2003 11:05 PM -> To: dev@ofbiz.dev.java.net -> Subject: Re: [OFBiz] Dev - Important - [Bug] PKCache is not -> synchronized -> with DB -> -> -> -> Because of the possibility that this is happening and causing -> previously unexplained problems, I decided to go ahead and implement -> the immutable feature on the GenericEntity. This is now in CVS, but may -> cause problems with current code (and will most likely in many cases). -> Do disable this just comment out the line near the beginning of the set -> method in GenericEntity.java. It is around line 248 in the current -> revision of the file. -> -> I fixed a few places that had this problem, including createCustomer in -> ecommerce and the userLogin service. Creating a new customer and going -> through the checkout process works fine now, but variations on the way -> I did it may break. -> -> If we have too many problems with this, I'm okay with disabling it -> temporarily, but it would be nice to go this direction in the future. -> It will help resolve the possibility that strange things happen because -> things are being changed in the cache when they shouldn't be and the -> cache is out of sync with the database, ie is dirty. -> -> Feel free to report bugs along these lines, or better yet send -> patches... -> -> Later, -> -David -> -> -> On Nov 3, 2003, at 5:24 AM, David Jones wrote: -> ->> ->> Quake, ->> ->> Yes, I know this is a problem, although I had forgotten about it since ->> it hasn't come up for a long time. ->> ->> Our official answer on this, related to the use of the cache in ->> general is: NEVER read from the cache if you are planning on updating ->> something. It's tempting to change the GenericValue object to have an ->> unchangeable flag that is set for all versions that go into the ->> cache.... ->> ->> I agree with you, there doesn't seem to be an easy way to ->> automatically clear the cache on a rollback. In most cases the ->> rollback doesn't even go through the Entity Engine, it is done in ->> external code. So, the Entity Engine never gets a notification of the ->> rollback, and if it did it would have to remember every operation that ->> happened during that transaction so it could clear those dirty cache ->> entries. ->> ->> Thus the policy: never use the cache to read when you are planning on ->> writing to the database. And yeah, maybe I should throw some code in ->> there to enforce this... Any thoughts from anyone on that? ->> ->> Later, ->> -David ->> ->> ->> ->> On Nov 3, 2003, at 4:45 AM, Quake_Wang wrote: ->> ->>> Found a bug in the PKCache, below is the scenario ->>> ->>> Service A: ->>> 1. find an order with the order No. 10000, dummy code: ->>> order = findByPKCache("Order", 10000); ->>> assume we get an order with the status "ABC"; ->>> ->>> 2. set the order status to "DEF" and store, dummy code: ->>> order.set("status", "DEF"); ->>> order.store(); ->>> ->>> Service B: ->>> 1. find order 10000 again, dummy code: ->>> order = findByPKCache("Order", 10000); ->>> If the service A and B are in the same transaction (ex, group service ->>> or ECA service), entity engine will get the order with "DEF" status ->>> and put it in the PK cache. ->>> ->>> 2. some other operations, throw exception ->>> Service A and B are rolled back, as the result, the PKCache is not ->>> synchronized with DB: ->>> DB: order 10000, status "ABC" ->>> PKCache: order 10000, status "DEF" ->>> ->>> I spent some time to trace this bug, but can not find an easy way to ->>> fix it, just simply change the findByPKCache to findByPK in service ->>> B. ->>> I'm sending out this email in hopes of helping who may encounter the ->>> same problem and receiving a better fix method. ->>> ->>> Regards ->>> Quake ->>> ->>> --------------------------------------------------------------------- ->>> To unsubscribe, e-mail: dev-unsubscribe@ofbiz.dev.java.net ->>> For additional commands, e-mail: dev-help@ofbiz.dev.java.net ->> ->> ->> --------------------------------------------------------------------- ->> To unsubscribe, e-mail: dev-unsubscribe@ofbiz.dev.java.net ->> For additional commands, e-mail: dev-help@ofbiz.dev.java.net -> -> -> --------------------------------------------------------------------- -> To unsubscribe, e-mail: dev-unsubscribe@ofbiz.dev.java.net -> For additional commands, e-mail: dev-help@ofbiz.dev.java.net -> -> -> --------------------------------------------------------------------- -> To unsubscribe, e-mail: dev-unsubscribe@ofbiz.dev.java.net -> For additional commands, e-mail: dev-help@ofbiz.dev.java.net - - ---------------------------------------------------------------------- -To unsubscribe, e-mail: dev-unsubscribe@ofbiz.dev.java.net -For additional commands, e-mail: dev-help@ofbiz.dev.java.net - - - jonesde - 2004-02-23 21:35:13 - -Just a note on this. To fix it there need to be ThreadLocal caches that are maintained by a class that -implements the Synchronization interface for transactions. The idea would be that cache reads look in -the ThreadLocal cache first, then in the global cache, cache writes put everything in the ThreadLocal -cache and when the transaction is committed all ThreadLocal cache entries go into the global cache. --David - - - - 13 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20031112065558 - Entity - byersa - not determined - DEFECT - 2003-11-12 06:15:27 - issues@ofbiz - - - - All - setNonPKFields - - - byersa - 2003-11-12 06:15:27 - I had a situation in which I used setNonPKFields to populate an entity that had -createdData and lastModifiedDate from parameters thinking that it would be a -sort of parameter map. My intention was to then add the individual fields to a -service input, but it turns out that instead of converting the date string to -DateTime format, it kept them as strings and the service complained. I guess the -GenericValue only converts datatypes during the persistence phase? If that is -the case, it would be useful if it converted up loading. - - - jonesde - 2003-11-12 06:55:58 - This is really not the responsibility of the GenericValue object (or really the -GenericEntity object). This is difficult to handle as a defect report and should -be sent to the dev mailing for discussion of the best way to go about what you -are trying to do. The email message should perhaps include more detail about the -overall goal you are trying to accomplish. Note that the GenericEntity, at the -moment, does not enforce types going in, but may be changed to do that and throw -an exception if the type is wrong. -David - - - jonesde - 2003-11-12 06:55:58 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2003-11-12 06:55:58 - resolution - Resolution - - INVALID - - - - 14 - NEW - P3 - - Components - CVS - Macintosh - issues@ofbiz - 20040107162053 - Order - jonesde - not determined - DEFECT - 2004-01-07 16:20:53 - issues@ofbiz - - - - All - Order Summary pages don't show free shipping promo - - - jonesde - 2004-01-07 16:20:53 - Here is a description from Si Chen who reported the problem: - -One thing that I noticed that is anomalous, though, is that the order review -pages still show an estimate for shipping charges, even though the customer -should get free shipping. It seems that the checkout review pages are using -org.ofbiz.order.shoppingcart.shipping.ShippingEvents.getShipEstimate, while on -actual checkout it is using -org.ofbiz.order.order.OrderReadHelper.getShippingTotal. - -The former is not taking into account shipping adjustments. - - - - 15 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040210064750 - Order - nowpulse - not determined - PATCH - 2004-02-10 01:36:16 - issues@ofbiz - - - - All - Order Stats showing incorrect YTD info - - - nowpulse - 2004-02-10 01:36:16 - The YTD info is incorrect since the Java month starts at 0 instead of 1. - -ofbiz/components/order/webapp/ordermgr/WEB-INF/actions/order/orderstats.bsh -On Line 71 the 1 should be replaced with a 0 - -cal.set(Calendar.MONTH, 0); - -thank you, -sterling - - - jonesde - 2004-02-10 06:47:50 - Fixed as recommended. - - - jonesde - 2004-02-10 06:47:50 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-02-10 06:47:50 - resolution - Resolution - - FIXED - - - - 16 - NEW - P4 - - Components - CVS - All - jonesde - 20040527233859 - Product - jonesde - not determined - FEATURE - 2004-02-24 02:56:29 - issues@ofbiz - - - - All - Limit Categories Shown in Drop Downs - - - jonesde - 2004-02-24 02:56:29 - Add "show in drop-down" option ProductCategory, filter by it in all combo style category drop downs, -and change existing category drop-downs to be combo-boxes, include those on the EditProduct, -EditProductCategories, EditCategory, EditCategoryProducts, EditPromoRules pages. - - - jonesde - 2004-05-27 23:38:59 - Some progress has been made on this, but something still needs to be done with the form tool, etc to -limit the drop downs. - - - ajzeneski - 2004-03-18 11:59:21 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-05-27 23:38:59 - priority - Priority - P1 - P4 - - - - 17 - RESOLVED - P1 - FIXED - Components - CVS - All - jonesde - 20040318120731 - Product - jonesde - not determined - FEATURE - 2004-02-24 02:58:45 - issues@ofbiz - - - - All - Filter Promotion Products to exclude discontinued - - - jonesde - 2004-02-24 02:58:45 - Add code to the ProductPromoWorker to (perhaps optionally) filter products included by the -salesDiscontinuationDate, and of course make sure the category member from/thru dates are being -honored. - - - jonesde - 2004-02-25 21:00:44 - Now implemented. - - - jonesde - 2004-02-25 21:00:44 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-02-25 21:00:44 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:07:31 - version - Version - Pre3.0.0 - CVS - - - - 18 - RESOLVED - P1 - FIXED - Components - CVS - All - jonesde - 20040318120740 - Product - jonesde - not determined - DEFECT - 2004-02-24 03:01:49 - issues@ofbiz - - - - All - Back ordered, or insufficient quantities not handled right - - - jonesde - 2004-02-24 03:01:49 - It appears that when a product is back-ordered, or reserved in excess of the AvailableToPromise the -calculations and setting of values are messed up. - -Here is a report on this from Bryce Ewing on Feb 5th, 2004: - -================================================= -I have found something that appears to be a bug (but I am not totally sure), I will explain this in two -cases below: - -case 1: buy 1 item of product1 with no inventory - - inventory item created with 0 on hand, and -1 available to promise - - order item inventory res created with quantity of 1 and quantity not available of 1 - -case 2: buy 2 items of product2 with 1 item in inventory - - inventory item updated with 1 on hand, and -1 available to promise - - order item inventory res created with quantity of 2 and quantity not available of 0 - -For case 1 the system is doing exactly what I would expect, but in case 2 I would have expected that -the order item inventory res record would have had a quantity not available of 1 rather than 0. - -Am I mistaken in this expectation, or is this infact a bug? -================================================= - -Here is a comment on some apparently related findings by Jacopo Cappellato: - -================================================= -I'm studying the simple method InventoryServices.reserveProductInventory -that implements the inventory reservation of on order/order item, and I've -got a question about this issue. -What is the meaning of the quantityNotAvailable field in -OrderItemInventoryRes entity? Where and how is it used (or intended to be -used for)? I've noticed that this quantity is considered in the pick list -reports... - -Probably the quantityNotAvailable field should contain the quantity reserved -that caused inventory item's atp to be less than zero: if so, why in the -reserveProductInventory method the quantityNotAvailable is set only in line -498 and not also after line 458? And in which way, once set, could this -quantity return to zero? -================================================= - - - jonesde - 2004-02-24 18:35:45 - After a patch from Bryce Ewing it appears to be fixed. - - - jonesde - 2004-02-24 18:35:45 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-02-24 18:35:45 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:07:40 - version - Version - Pre3.0.0 - CVS - - - - 19 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120748 - Product - jacopo - not determined - PATCH - 2004-02-24 06:44:51 - issues@ofbiz - - - - All - Patch for bug in the Inventory Receive function - - - jacopo - 2004-02-24 06:44:51 - In Facility manager, when you receive a purchase order delivered with more than -one shipments and you select to receive only one shipment the proposed -quantities are the quantities of the original purchase order and not the -quantities of the shipment. -In my patches I tried to change the minimum amount of code and the -result is that the code is not well written... obviously feel free to change -my code. -PS: I submitted this patches to the dev list in january 2004. -PPS: the two patches are in Unified Output Format - - -Index: ofbiz/components/product/webapp/facility/inventory/receiveInventory.ftl -=================================================================== -RCS -file: /cvs/ofbiz/components/product/webapp/facility/inventory/receiveInventory.f -tl,v -retrieving revision 1.5 -diff -u -r1.5 receiveInventory.ftl ---- ofbiz/components/product/webapp/facility/inventory/receiveInventory.ftl - 17 Dec 2003 22:46:36 -0000 1.5 -+++ ofbiz/components/product/webapp/facility/inventory/receiveInventory.ftl - 14 Jan 2004 11:05:06 -0000 -@@ -312,6 +312,9 @@ - </tr> - <#list purchaseOrderItems as orderItem> - <#assign defaultQuantity = orderItem.quantity - receivedQuantities -[orderItem.orderItemSeqId]?double> -+ <#if shipment?has_content> -+ <#assign defaultQuantity = shippedQuantities -[orderItem.orderItemSeqId]?double - receivedQuantities -[orderItem.orderItemSeqId]?double> -+ </#if> - <#if 0 < defaultQuantity> - <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")> - <input type="hidden" name="orderId_o_${rowCount}" -value="${orderItem.orderId}"> - - - - - - - -Index: ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh -=================================================================== -RCS file: /cvs/ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh,v -retrieving revision 1.4 -diff -u -r1.4 receiveInventory.bsh ---- ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh 25 Aug 2003 15:28:00 -0000 - 1.4 -+++ ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh 14 Jan 2004 11:08:14 -0000 -@@ -69,6 +69,7 @@ - shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap -("shipmentId", shipmentId)); - } - -+shippedQuantities = new HashMap(); - purchaseOrderItems = null; - if (purchaseOrder != null) { - if (product != null) { -@@ -80,14 +81,18 @@ - exprs = new ArrayList(); - while (issueIter.hasNext()) { - issuance = issueIter.next(); -- exprs.add(new EntityExpr("orderItemSeqId", EntityOperator.EQUALS, -issuance.getString("orderItemSeqId"))); -+ exprs.add(new EntityExpr("orderItemSeqId", EntityOperator.EQUALS, -issuance.getString("orderItemSeqId"))); -+ double issuanceQty = issuance.getDouble("quantity").doubleValue(); -+ if (shippedQuantities.containsKey(issuance.getString -("orderItemSeqId"))) { -+ issuanceQty += ((Double)shippedQuantities.get -(issuance.getString("orderItemSeqId"))).doubleValue(); -+ } -+ shippedQuantities.put(issuance.getString("orderItemSeqId"), -issuanceQty); - } - purchaseOrderItems = EntityUtil.filterByOr(orderItems, exprs); - } else { - purchaseOrderItems = purchaseOrder.getRelated("OrderItem"); - } - } -- - receivedQuantities = new HashMap(); - if (purchaseOrderItems != null && purchaseOrderItems.size() > 0) { - context.put("firstOrderItem", EntityUtil.getFirst(purchaseOrderItems)); -@@ -100,7 +105,13 @@ - if (receipts != null && receipts.size() > 0) { - recIter = receipts.iterator(); - while (recIter.hasNext()) { -- rec = recIter.next(); -+ rec = recIter.next(); -+ if (shipment != null) { -+ if (rec.getString("shipmentId") == null || -+ !rec.getString("shipmentId").equals(shipment.getString -("shipmentId"))) { -+ continue; -+ } -+ } - accepted = rec.getDouble("quantityAccepted"); - rejected = rec.getDouble("quantityRejected"); - if (accepted != null) -@@ -140,6 +151,7 @@ - context.put("product", product); - context.put("shipments", shipments); - context.put("shipment", shipment); -+context.put("shippedQuantities", shippedQuantities); - context.put("purchaseOrderItems", purchaseOrderItems); - context.put("receivedQuantities", receivedQuantities); - context.put("rejectReasons", rejectReasons); - - - jacopo - 2004-02-24 06:55:45 - Created an attachment (id=1) -Patch files in UOF for receiveInventory,bsh and receiveInventory.ftl - - - - jonesde - 2004-03-01 06:35:22 - The changes are in CVS. Thanks Jacopo! - - - text/plain - 1 - 2004-02-24 06:55:45 - Patch files in UOF for receiveInventory,bsh and receiveInventory.ftl - 1 - receiveInventory.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/1/receiveInventory.patch - - - jacopo - 2004-02-24 06:55:45 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=1) -Patch files in UOF for receiveInventory,bsh and receiveInventory.ftl - - - - jonesde - 2004-03-01 06:35:22 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 06:35:22 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:07:48 - version - Version - Pre3.0.0 - CVS - - - - 20 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120758 - Party - jacopo - not determined - PATCH - 2004-02-24 07:36:49 - issues@ofbiz - - - - All - List All Visits link in the Party Profile page returns an error with 0 visits - - - jacopo - 2004-02-24 07:36:50 - List All Visits link in the Party Profile page returns an error with 0 visits -(see attached patch file) due to wrong bsh code. - - - jacopo - 2004-02-24 07:38:20 - Created an attachment (id=2) -Patch for bug in uof - - - - jonesde - 2004-03-01 06:39:57 - The changes are in CVS. Thanks Jacopo! - - - text/plain - 2 - 2004-02-24 07:38:20 - Patch for bug in uof - 1 - showvisits.bsh.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/2/showvisits.bsh.patch - - - jacopo - 2004-02-24 07:38:20 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=2) -Patch for bug in uof - - - - jonesde - 2004-03-01 06:39:57 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 06:39:57 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:07:58 - version - Version - Pre3.0.0 - CVS - - - - 21 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120807 - Party - jacopo - not determined - PATCH - 2004-02-24 07:40:56 - issues@ofbiz - - - - All - findparty page returns JavaScript errors when clicking on the LookupParty link and when the lookup fields are hidden - - - jacopo - 2004-02-24 07:40:56 - findparty page returns JavaScript errors when clicking on the LookupParty link -and when the lookup fields are hidden. The attached patch should fix the -problem. - - - jacopo - 2004-02-24 07:41:29 - Created an attachment (id=3) -Patch for bug in uof - - - - jonesde - 2004-03-01 06:44:01 - Your changes are in CVS. Thanks Jacopo! - - - text/plain - 3 - 2004-02-24 07:41:29 - Patch for bug in uof - 1 - findparty.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/3/findparty.ftl.patch - - - jacopo - 2004-02-24 07:41:29 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=3) -Patch for bug in uof - - - - jonesde - 2004-03-01 06:44:01 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 06:44:01 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:07 - version - Version - Pre3.0.0 - CVS - - - - 22 - NEW - P3 - - Components - CVS - All - ajzeneski - 20040318115951 - Order - jacopo - not determined - DEFECT - 2004-02-24 08:52:07 - issues@ofbiz - - - - All - Errors in order entry when "Payment Already Received" type is selected. - - - jacopo - 2004-02-24 08:52:08 - In Order Entry: -when you finalize an order and, in the "Order Entry Payment -Settings" page, you select the "Payment Already Received" type, in the -following page you get JavaScript errors when you click over -the links (stating that the object "document.billsetupform" doesn't exist); -and so you cannot submit the order. - - - jonesde - 2004-02-26 07:08:20 - -This has been an issue for a while now. It's good to have it in the tracking system since it may not get -fixed right away. Andy is more aware of what is happening there than I am, so he may have more -feedback on it. -David - - - jonesde - 2004-02-26 07:08:20 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - jonesde - 2004-02-26 07:08:20 - priority - Priority - P2 - P3 - - - ajzeneski - 2004-03-18 11:59:51 - version - Version - Pre3.0.0 - CVS - - - - 23 - NEW - P4 - - Components - CVS - All - ajzeneski - 20040318120006 - Product - jacopo - not determined - DEFECT - 2004-02-24 08:56:40 - issues@ofbiz - - - - All - Inventory receive ignores the inventory item id field. - - - jacopo - 2004-02-24 08:56:40 - In Facility Manager -> Inventory receive: -it always creates a new inventory item even if the "inventory item id" optional -field is filled with an existing inventory item id. - - - ajzeneski - 2004-03-08 17:38:11 - reassigned - - - ajzeneski - 2004-03-08 17:38:11 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-03-18 12:00:06 - version - Version - Pre3.0.0 - CVS - - - - 24 - NEW - P4 - - Components - CVS - All - ajzeneski - 20040318120024 - Product - jacopo - not determined - DEFECT - 2004-02-24 09:01:59 - issues@ofbiz - - - - All - Receive return: it always creates serialized inventory items. - - - jacopo - 2004-02-24 09:01:59 - In Facility Manager -->Receive return - -it always creates a serialized inventory item (even if 'non-serialized' is -selected) and so the received quantities are lost (if more than one). - - - ajzeneski - 2004-03-08 17:38:55 - reassigned - - - ajzeneski - 2004-03-08 17:38:55 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-03-18 12:00:24 - version - Version - Pre3.0.0 - CVS - - - - 25 - RESOLVED - P2 - INVALID - Components - CVS - All - ajzeneski - 20040318120814 - Accounting - jonesde - not determined - DEFECT - 2004-02-25 14:58:53 - issues@ofbiz - - - - All - Permission Checks missing in various part of Accounting Manager - - - jonesde - 2004-02-25 14:58:53 - Various pages in the Accounting Manager have no view permission checking, including the billing -account, invoice, etc pages. - - - jaz - 2004-02-25 15:36:03 - I'm not involved in this project. - - - jonesde - 2004-02-25 16:13:54 - -Fixed assigned to mistake. - - - ajzeneski - 2004-03-08 10:48:28 - All components have a default VIEW permission based on the component configuration. Each page no -longer needs to have the added code as long as require auth is set in the controller.xml file. The -checkLogin event will make sure the user has the default permission for the specific component. -Additional permissions are only necessary when not using the default permission. - - - jaz - 2004-02-25 15:36:03 - assigned_to - Assigned To - jaz - jonesde - - - jonesde - 2004-02-25 16:13:54 - assigned_to - Assigned To - jonesde - ajzeneski - - - ajzeneski - 2004-03-08 10:48:28 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-03-08 10:48:28 - resolution - Resolution - - INVALID - - - ajzeneski - 2004-03-18 12:08:14 - version - Version - Pre3.0.0 - CVS - - - - 26 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040308115822 - Order - jonesde - not determined - DEFECT - 2004-02-25 21:11:36 - issues@ofbiz - - - - All - Billing Account Errors - - - jonesde - 2004-02-25 21:11:36 - This issue was reported by Si Chen, Olivier Heintz, and some others. - -The following is some text from an email fro Si Chen on Jan 26, 2004; the attached patch is also from -this email. - -======================================= -Hello. After some work we have tracked down the problem with using -billingAccount in the order manager and were able to fix it. The -problem is stated in the order manager's billsettings.ftl, it was -passing in "EXT_BILLACT|10000" for the checkoutPaymentId instead of -separate checkoutPaymentId and billingAccountId. Olivier had suggested -a good patch earlier which parses this form of checkoutPaymentId in the -CheckOutEvents.java. We took a different approach and used code from -ecommerce to pass both checkoutPaymentId and billingAccountId. We also -fixed CheckOutEvents.java to get the billingAccountId from the request -and associate it with the cart. Both are shown in the attached patch. - -One last problem: in ecommerce, in checkoutpayment.ftl, gift cards, -credit cards, and billing accounts are all using "amount_<account_id>" -as the name of the input fields. As a result, when the -toggleBillingAccount javascript function tries to toggle the billing -account selected for entering the amount to pay, it gets confused and -cannot do this. As a result, when you use the multi-page rather than -express checkout in ecommerce, it does not work properly. I'll be happy -to elaborate on this if you need me to. -======================================= - - - jonesde - 2004-02-25 21:14:01 - Created an attachment (id=4) -Patch to fix BillingAccount issues - - - - ajzeneski - 2004-03-08 11:58:22 - Applied patch; fixed JS in ecommerce - - - text/plain - 4 - 2004-02-25 21:14:01 - Patch to fix BillingAccount issues - 1 - BillingAccountError.patch - 3 - jonesde - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/4/BillingAccountError.patch - - - jonesde - 2004-02-25 21:14:01 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=4) -Patch to fix BillingAccount issues - - - - ajzeneski - 2004-03-08 11:58:22 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-03-08 11:58:22 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-08 11:58:22 - version - Version - Pre3.0.0 - CVS - - - - 27 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120822 - WorkEffort - jacopo - not determined - PATCH - 2004-02-26 03:20:00 - issues@ofbiz - - - - All - Patch for missing pagedef file for popup template that causes lookup error (due to i18n changes) - - - jacopo - 2004-02-26 03:20:00 - The lookup link in New Event -> Parties page is broken. -The popup template doesn't run the envsetup script that loads the localized -labels. - -PATCH: add a file named "popup.xml" to the template folder containing the -following lines: - -<?xml version="1.0" encoding="UTF-8"?> -<page> - <template-action name="/includes/envsetup.bsh"/> -</page> - - - jonesde - 2004-03-01 07:16:55 - -I have added the popup.xml file to CVS. Thanks for sending it over Jacopo. - - - jonesde - 2004-03-01 07:16:55 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 07:16:55 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:22 - version - Version - Pre3.0.0 - CVS - - - - 28 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040806161040 - WorkEffort - jacopo - not determined - PATCH - 2004-02-26 03:32:11 - issues@ofbiz - - - - All - Added lookup link for parties in month view - - - jacopo - 2004-02-26 03:32:11 - Added lookup link for parties in month view. -All the stuff was already in place... I just added the link. -However I think this is a very useful enhancement. - - - jacopo - 2004-02-26 03:32:44 - Created an attachment (id=5) -Patch in UOF - - - - jonesde - 2004-03-03 08:10:20 - Changed issue type as per email from Jacopo. - - - jonesde - 2004-08-06 16:10:40 - Thanks Jacopo, this is now in CVS. - - - text/plain - 5 - 2004-02-26 03:32:44 - Patch in UOF - 1 - month.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/5/month.ftl.patch - - - jacopo - 2004-02-26 03:32:44 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=5) -Patch in UOF - - - - jonesde - 2004-03-03 08:10:20 - issue_type - Issue Type - ENHANCEMENT - PATCH - - - ajzeneski - 2004-03-18 12:00:44 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-08-06 16:10:40 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-06 16:10:40 - resolution - Resolution - - FIXED - - - - 29 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120831 - WorkEffort - jacopo - not determined - PATCH - 2004-02-26 03:56:48 - issues@ofbiz - - - - All - When creating a new event from calendar, start and end date were not filled properly in the form - - - jacopo - 2004-02-26 03:56:48 - When creating a new event from calendar, start and end date were not filled -properly in the event form. -The two patches (one for the event.ftl file and one for the event.bsh file) -will solve this problem. - - - jacopo - 2004-02-26 03:59:24 - Created an attachment (id=6) -Patch for event.bsh in UOF - - - - jacopo - 2004-02-26 03:59:58 - Created an attachment (id=7) -Patch for event.ftl file in UOF - - - - jonesde - 2004-03-01 07:28:02 - Your changes are in CVS, thanks Jacopo! - - - text/plain - 6 - 2004-02-26 03:59:24 - Patch for event.bsh in UOF - 1 - event.bsh.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/6/event.bsh.patch - - - text/plain - 7 - 2004-02-26 03:59:58 - Patch for event.ftl file in UOF - 1 - event.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/7/event.ftl.patch - - - jacopo - 2004-02-26 03:59:24 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=6) -Patch for event.bsh in UOF - - - - jacopo - 2004-02-26 03:59:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=7) -Patch for event.ftl file in UOF - - - - jonesde - 2004-03-01 07:28:02 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 07:28:02 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:31 - version - Version - Pre3.0.0 - CVS - - - - 30 - NEW - P5 - - Components - CVS - All - ajzeneski - 20040308175050 - Order - jackhung - not determined - DEFECT - 2004-02-26 04:17:49 - issues@ofbiz - - - - All - Fail to approval order - - - jackhung - 2004-02-26 04:17:49 - 19285437[ ControlServlet.java:133:DEBUG] [[[updateactivityassign] Servlet -Starting, doing setup- total:0.0,since last(Begin):0.0]] -19285438[ ControlServlet.java:182:DEBUG] [[[updateactivityassign] Setup -done, doing Event(s) and View(s)- total:0.0,since last([updateactivityas...):0.0]] -19285440[ RequestHandler.java:200:INFO ] [Processing Request]: -updateactivityassign -19285744[ WfProcessMgrImpl.java:106:INFO ] [WfProcessMgr.init] : Create -process manager (org.ofbiz.order[20030730144901] / ProcessOrder[20030730144901]) -19285890[ BshUtil.java:75 :ERROR] BSH Evaluation error. -Sourced file: <Inline eval of: approvalCode.equals("0"); > : Attempt to resolve -method: equals() on undefined variable or class name: approvalCode : at Line: 1 -: in file: <Inline eval of: approvalCode.equals("0"); > : approvalCode .equals ( -"0" ) - - at bsh.UtilEvalError.toEvalError(UtilEvalError.java:82) - at bsh.UtilEvalError.toEvalError(UtilEvalError.java:87) - at bsh.BSHMethodInvocation.eval(BSHMethodInvocation.java:79) - at bsh.BSHPrimaryExpression.eval(BSHPrimaryExpression.java:69) - at bsh.Interpreter.evalParsedScript(Interpreter.java:1104) - at bsh.Interpreter.eval(Interpreter.java:590) - at bsh.Interpreter.eval(Interpreter.java:616) - at bsh.Interpreter.eval(Interpreter.java:606) - at org.ofbiz.base.util.BshUtil.eval(BshUtil.java:64) - at -org.ofbiz.workflow.impl.WfExecutionObjectImpl.evalBshCondition(WfExecutionObjectImpl.java:718) - at -org.ofbiz.workflow.impl.WfProcessImpl.getTransFrom(WfProcessImpl.java:477) - at org.ofbiz.workflow.impl.WfProcessImpl.queueNext(WfProcessImpl.java:298) - at -org.ofbiz.workflow.impl.WfProcessImpl.activityComplete(WfProcessImpl.java:286) - at org.ofbiz.workflow.impl.WfActivityImpl.complete(WfActivityImpl.java:408) - at -org.ofbiz.workflow.impl.WfAssignmentImpl.complete(WfAssignmentImpl.java:175) - at -org.ofbiz.workflow.client.WorkflowClient.complete(WorkflowClient.java:266) - at -org.ofbiz.workflow.client.WorkflowServices.completeAssignment(WorkflowServices.java:418) - - - ajzeneski - 2004-03-08 12:08:46 - I cannot duplicate this problem; please provide more information or we will have to close this has no -longer an issue. - - - ajzeneski - 2004-03-08 17:50:50 - reassigned - - - ajzeneski - 2004-03-08 12:08:46 - issue_status - Status - NEW - STARTED - - - ajzeneski - 2004-03-08 12:08:46 - op_sys - OS/Version - Linux - All - - - ajzeneski - 2004-03-08 12:08:46 - rep_platform - Platform - PC - All - - - ajzeneski - 2004-03-08 12:08:46 - short_desc - Summary - Fail to approval order - Fail to approval order - - - ajzeneski - 2004-03-08 17:50:50 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-03-08 17:50:50 - issue_status - Status - STARTED - NEW - - - ajzeneski - 2004-03-08 17:50:50 - priority - Priority - P2 - P5 - - - - 31 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040318120101 - WorkEffort - jacopo - not determined - DEFECT - 2004-02-26 05:39:36 - issues@ofbiz - - - - All - Error message when you try to create new contact information under an event - - - jacopo - 2004-02-26 05:39:36 - An error message is returned when you try to create new contact information -under an event: Cannot locate service by name (createWorkEffortContactMech) - -This is the complete message: - -ERROR: Could not complete the Create an email address for WorkEffort process -[problem invoking the [createWorkEffortContactMech] service with the map named -[context] containing [{locale=en_US, infoString=foo@bar.com, userLogin= -[GenericEntity:UserLogin][partyId,admin(java.lang.String)][disabledDateTime,null -()][passwordHint,null()][createdTxStamp,null()][successiveFailedLogins,null()] -[enabled,Y(java.lang.String)][userLoginId,admin(java.lang.String)] -[currentPassword,ofbiz(java.lang.String)][lastUpdatedTxStamp,null()] -[lastUpdatedStamp,null()][createdStamp,null()], workEffortId=10030, -contactMechTypeId=EMAIL_ADDRESS}]: Cannot locate service by name -(createWorkEffortContactMech)] - - - ajzeneski - 2004-03-18 12:01:01 - version - Version - Pre3.0.0 - CVS - - - - 32 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040409054533 - WorkEffort - jacopo - not determined - DEFECT - 2004-02-26 05:50:01 - issues@ofbiz - - - - All - Errors that prevent adding a new phase to a project. - - - jacopo - 2004-02-26 05:50:01 - It's impossible to add a new phase to a project. Even if you fill all the -fields of the new phase form when you press the 'create' button you get an -error in the system log (however no error messages are shown in the html page). - -This is the complete error message: - -1160388[ ServiceDispatcher.java:309:ERROR] Service Error [createPhase]: ERROR: -Could not complete the Create Project Phase process [problem creating the newEnt -ity value: while inserting: [GenericEntity:WorkEffortAssoc][createdTxStamp,2004- -02-26 14:44:26.096(java.sql.Timestamp)][workEffortIdTo,10034(java.lang.String)][ -workEffortIdFrom,10031(java.lang.String)][workEffortAssocTypeId,WORK_EFF_BREAKDO -WN(java.lang.String)][lastUpdatedTxStamp,2004-02-26 14:44:26.096(java.sql.Timest -amp)][createdStamp,2004-02-26 14:44:26.106(java.sql.Timestamp)][lastUpdatedStamp -,2004-02-26 14:44:26.106(java.sql.Timestamp)] (SQL Exception while executing the - following:INSERT INTO WORK_EFFORT_ASSOC (WORK_EFFORT_ID_FROM, WORK_EFFORT_ID_TO -, WORK_EFFORT_ASSOC_TYPE_ID, SEQUENCE_NUM, FROM_DATE, THRU_DATE, LAST_UPDATED_ST -AMP, LAST_UPDATED_TX_STAMP, CREATED_STAMP, CREATED_TX_STAMP) VALUES (?, ?, ?, ?, - ?, ?, ?, ?, ?, ?) ([-5005] (at 124): Missing non-NULL value))] - - - jacopo - 2004-04-09 05:45:33 - David Jones has fixed this problem in date 2004-04-08 (see the -thread "createphase ERROR in OFBiz 3.0 and OFBiz CVS versions" in the dev-list). - - - - ajzeneski - 2004-03-18 12:01:18 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2004-04-09 05:45:33 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-04-09 05:45:33 - resolution - Resolution - - FIXED - - - - 33 - RESOLVED - P4 - FIXED - Components - CVS - All - issues@ofbiz - 20050209023142 - WorkEffort - jacopo - not determined - DEFECT - 2004-02-26 06:00:26 - issues@ofbiz - - - - All - When you create a new request and you don't fill correctly all the fields no error messages are shown - - - jacopo - 2004-02-26 06:00:26 - When you create a new request and you don't fill correctly all the fields no -error messages are shown. - - - jacopo - 2005-02-09 02:31:42 - Fixed after the refactoring to screen widget. - - - ajzeneski - 2004-03-18 12:01:30 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2005-02-09 02:31:42 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2005-02-09 02:31:42 - resolution - Resolution - - FIXED - - - - 34 - RESOLVED - P5 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120838 - Order - jacopo - not determined - PATCH - 2004-02-26 06:11:14 - issues@ofbiz - - - - All - Little JavaScript in "find returns" when lookup fields are hidden - - - jacopo - 2004-02-26 06:11:14 - Little JavaScript in "find returns" when lookup fields are hidden - -Patch for findReturns.ftl is attached. - - - jacopo - 2004-02-26 06:11:49 - Created an attachment (id=8) -Patch for findReturn.ftl in UOF - - - - jonesde - 2004-03-01 11:18:49 - Your changes are in CVS. Thanks for sending that over. - - - text/plain - 8 - 2004-02-26 06:11:49 - Patch for findReturn.ftl in UOF - 1 - findReturn.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/8/findReturn.ftl.patch - - - jacopo - 2004-02-26 06:11:49 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=8) -Patch for findReturn.ftl in UOF - - - - jonesde - 2004-03-01 11:18:49 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 11:18:49 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:38 - version - Version - Pre3.0.0 - CVS - - - - 35 - RESOLVED - P1 - FIXED - Components - CVS - All - ajzeneski - 20040308103928 - E-Commerce - razorb - not determined - DEFECT - 2004-02-26 06:18:48 - issues@ofbiz - - http://localhost:8080/ecommerce/control/product/~category_id=100/~product_id=GZ-1006 - - All - Single variant combo doesn't select properly - - - razorb - 2004-02-26 06:18:48 - Using the drop down menu to select a variantion i.e. LGPL does not set the -selection on the menu. Using the swatch/images does correctly set the menu -selection and allows adding to the basket. - -I suspect a little JS error somewhere for single variant items. - - - jonesde - 2004-02-26 06:52:49 - -I just reproduced this against the latest code base, appears to still be an issue with single feature type -virtual products. - - - ajzeneski - 2004-03-08 09:54:51 - Updated since this is a CVS bug and updated status - - - ajzeneski - 2004-03-08 10:39:28 - fixed JS bugs in productdetail - - - jonesde - 2004-02-26 06:52:48 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - jonesde - 2004-02-26 06:52:48 - priority - Priority - P3 - P1 - - - ajzeneski - 2004-03-08 09:54:51 - issue_status - Status - NEW - STARTED - - - ajzeneski - 2004-03-08 09:54:51 - version - Version - Pre3.0.0 - CVS - - - ajzeneski - 2004-03-08 10:39:28 - issue_status - Status - STARTED - RESOLVED - - - ajzeneski - 2004-03-08 10:39:28 - resolution - Resolution - - FIXED - - - - 36 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120846 - Product - jacopo - not determined - PATCH - 2004-02-26 23:17:51 - issues@ofbiz - - - - All - Facility Manager: in 'inventory receive' the type of order is not checked and it's possible to receive a sales order if you enter its id in the 'purchase order id' field - - - jacopo - 2004-02-26 23:17:51 - Facility Manager: in 'inventory receive' the type of order is not checked and -it's possible to receive a sales order if you enter its id in the 'purchase -order id' field. - -This is the patch in UOF for the receiveInventory.bsh file (pay attention that -some days ago I've submitted a patch for the same file against the same CVS -release): - -Index: ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh -=================================================================== -RCS file: /cvs/ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh,v -retrieving revision 1.4 -diff -u -r1.4 receiveInventory.bsh ---- ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh 25 Aug 2003 15:28:00 -0000 - 1.4 -+++ ofbiz/components/product/webapp/facility/WEB- -INF/actions/inventory/receiveInventory.bsh 27 Feb 2004 07:17:08 -0000 -@@ -43,6 +43,9 @@ - purchaseOrder = null; - if (purchaseOrderId != null && purchaseOrderId.length() > 0) { - purchaseOrder = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap -("orderId", purchaseOrderId)); -+ if (purchaseOrder != null && !"PURCHASE_ORDER".equals -(purchaseOrder.getString("orderTypeId"))) { -+ purchaseOrder = null; -+ } - } - - product = null; - - - jonesde - 2004-02-28 11:58:13 - The patch is in CVS. - - - jonesde - 2004-02-28 11:58:13 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-02-28 11:58:13 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:46 - version - Version - Pre3.0.0 - CVS - - - - 37 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120856 - Product - jacopo - not determined - DEFECT - 2004-02-27 02:05:25 - issues@ofbiz - - - - All - Facility Manager: error message when trying to confirm stock moves needed. - - - jacopo - 2004-02-27 02:05:25 - In the Facility Manager, int the PickList -> Stock Moves page, if I try to -confirm the "stock moves needed" proposed by the system I get the following -error: - -Error calling event: org.ofbiz.content.webapp.event.EventHandlerException: No -rows to process - -And the movements are not performed. - - - jonesde - 2004-03-01 17:22:23 - This is caused by some code that was added to display warning messages that wiped out the rowCount -variable. The warning message loop now uses a variable names messageCount. - - - jonesde - 2004-03-01 17:22:23 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 17:22:23 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:08:56 - version - Version - Pre3.0.0 - CVS - - - - 38 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120905 - Product - jacopo - not determined - PATCH - 2004-02-27 02:23:36 - issues@ofbiz - - - - All - Facility Manager: in Edit shipment -> items tab, a wrong link to EditProduct page caused a controller error. - - - jacopo - 2004-02-27 02:23:36 - Facility Manager: in Edit shipment -> items tab, a wrong link to EditProduct -page caused a controller error. - -Patch for EditShipmentItems.ftl file is attached. - - - jacopo - 2004-02-27 02:24:16 - Created an attachment (id=9) -Patch for EditShipmentItems.ftl in UOF - - - - jonesde - 2004-03-01 07:38:50 - Your changes are in CVS. Thanks for the patch Jacopo. - - - text/plain - 9 - 2004-02-27 02:24:16 - Patch for EditShipmentItems.ftl in UOF - 1 - EditShipmentItems.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/9/EditShipmentItems.ftl.patch - - - jacopo - 2004-02-27 02:24:16 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=9) -Patch for EditShipmentItems.ftl in UOF - - - - jonesde - 2004-03-01 07:38:50 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 07:38:50 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:09:05 - version - Version - Pre3.0.0 - CVS - - - - 39 - NEW - P2 - - Components - CVS - All - issues@ofbiz - 20040318120141 - Order - jacopo - not determined - DEFECT - 2004-02-27 04:05:34 - issues@ofbiz - - - - All - SapDB problem when displaying order task list assigned to user role - - - jacopo - 2004-02-27 04:05:34 - SapDB problem when displaying order task list assigned to user role: -if more than one order is assigned to user role, in "Order List" page the -orders are shown 5 times! -If only one order is assigned to the user role, the order is shown well (1 -time). - -See picture attached. - - - jacopo - 2004-02-27 04:07:00 - Created an attachment (id=10) -Bug example showing two orders waiting approval duplicated 5 times. - - - - image/gif - 10 - 2004-02-27 04:07:00 - Bug example showing two orders waiting approval duplicated 5 times. - - order_list_bug.GIF - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/10/order_list_bug.GIF - - - jacopo - 2004-02-27 04:07:00 - attachments.thedata - Attachment Data - - Created an attachment (id=10) -Bug example showing two orders waiting approval duplicated 5 times. - - - - ajzeneski - 2004-03-18 12:01:41 - version - Version - Pre3.0.0 - CVS - - - - 40 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20050209023003 - WorkEffort - jacopo - not determined - DEFECT - 2004-02-27 07:27:15 - issues@ofbiz - - - - All - Party lookup with empty fields returns only one person repeated many times (= number of persons). - - - jacopo - 2004-02-27 07:27:15 - If, in Party lookup, you perform a lookup with empty fields (all records), -returns only one person repeated many times (= number of persons). -I suspect that the problem is in the "lookupParty" simple method in common -component. - - - jacopo - 2005-02-09 02:30:03 - Fixed changing the way the lookup is implemented (see Jira issue OFBIZ-114). - - - ajzeneski - 2004-03-18 12:01:50 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2005-02-09 02:30:03 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2005-02-09 02:30:03 - resolution - Resolution - - FIXED - - - - 41 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120912 - Product - jacopo - not determined - PATCH - 2004-02-27 08:53:04 - issues@ofbiz - - - - All - Facility Manager: in Edit shipment -> items tab, a wrong link to EditProduct caused a controller error (same as issue #38) - - - jacopo - 2004-02-27 08:53:04 - Facility Manager: in View shipment tab, a wrong link to EditProduct -page caused a controller error (same as issue #38). - -Patch for ViewShipmentItemInfo.ftl file is attached. - - - jacopo - 2004-02-27 08:53:50 - Created an attachment (id=11) -Patch for file ViewShipmentItemInfo.ftl in UOF - - - - jonesde - 2004-03-01 07:41:15 - Your changes are now in CVS. Thanks for sending those over Jacopo. - - - text/plain - 11 - 2004-02-27 08:53:50 - Patch for file ViewShipmentItemInfo.ftl in UOF - 1 - ViewShipmentItemInfo.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/11/ViewShipmentItemInfo.ftl.patch - - - jacopo - 2004-02-27 08:53:50 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=11) -Patch for file ViewShipmentItemInfo.ftl in UOF - - - - jonesde - 2004-03-01 07:41:15 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 07:41:15 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:09:12 - version - Version - Pre3.0.0 - CVS - - - - 42 - RESOLVED - P4 - WONTFIX - Components - CVS - All - ajzeneski - 20040630193328 - Product - jacopo - not determined - DEFECT - 2004-02-28 22:34:42 - issues@ofbiz - - - - All - In shipment, the following error message appears: "Applet Package Weight Reader notinited" - - - jacopo - 2004-02-28 22:34:42 - In shipment, the following error message appears: "Applet Package Weight Reader -notinited". -I think the problem is caused by the fact that the class ShipmentScaleApplet is -not built in the ant task. -Was this done intentionally? (I think this applet tries to connect to a scale -device connected to a serial port and so probably this could cause some -problems...). - - - ajzeneski - 2004-03-08 17:39:52 - reassigned; I will comment out the applet code until this is finished - - - ajzeneski - 2004-06-30 19:33:28 - The applet is going to be replaced with a think client shipment station UI - - - ajzeneski - 2004-03-08 17:39:52 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-03-18 12:01:59 - version - Version - Pre3.0.0 - CVS - - - ajzeneski - 2004-06-30 19:33:28 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:33:28 - resolution - Resolution - - WONTFIX - - - - 43 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040318120921 - E-Commerce - jacopo - not determined - PATCH - 2004-02-28 22:46:49 - issues@ofbiz - - - - All - In "Create Return", select-all checkbox doesn't work due to wrong form name. - - - jacopo - 2004-02-28 22:46:49 - In "Create Return", select-all checkbox doesn't work due to wrong form name. - -Patch attached for requestreturn.ftl in Unified Output Format. - - - jacopo - 2004-02-28 22:47:40 - Created an attachment (id=12) -Patch attached for requestreturn.ftl in UOF. - - - - jonesde - 2004-03-01 07:48:30 - Your changes are in CVS. Thanks for fixing that. - - - text/plain - 12 - 2004-02-28 22:47:39 - Patch attached for requestreturn.ftl in UOF. - 1 - requestreturn.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/12/requestreturn.ftl.patch - - - jacopo - 2004-02-28 22:47:40 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=12) -Patch attached for requestreturn.ftl in UOF. - - - - jonesde - 2004-03-01 07:48:30 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-01 07:48:30 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-18 12:09:21 - version - Version - Pre3.0.0 - CVS - - - - 44 - NEW - P4 - - Components - CVS - All - issues@ofbiz - 20040229030013 - Product - jacopo - not determined - ENHANCEMENT - 2004-02-29 03:00:13 - issues@ofbiz - - - - All - Packages: ShipmentPackage's weight automatically updated when ShipmentPackageContent entries are added/deleted (weight taken from the Product entity). - - - jacopo - 2004-02-29 03:00:13 - Packages: ShipmentPackage's weight automatically updated when -ShipmentPackageContent entries are added/deleted (weight taken from the Product -entity). - - - - 45 - RESOLVED - P1 - FIXED - Components - CVS - All - issues@ofbiz - 20040301155709 - Order - jacopo - not determined - DEFECT - 2004-02-29 06:17:33 - issues@ofbiz - - - - All - In orderview page, if you select the "QuickShip order link" you get a controller error. - - - jacopo - 2004-02-29 06:17:33 - In orderview page (/ordermgr/control/orderview), if you select the "QuickShip -order link" you get a controller error: - -org.ofbiz.content.webapp.control.RequestHandlerException: Unknown request -[quickShipOrderMultiFacility]; this request does not exist or cannot be called -directly. - - - jonesde - 2004-03-01 12:11:07 - I'll get on this... - - - jonesde - 2004-03-01 15:57:09 - Changed the default behavior for this; also added request-map and service defs for the quick ship from -multi facilites. - - - jonesde - 2004-03-01 12:11:07 - issue_status - Status - NEW - STARTED - - - jonesde - 2004-03-01 15:57:09 - issue_status - Status - STARTED - RESOLVED - - - jonesde - 2004-03-01 15:57:09 - resolution - Resolution - - FIXED - - - - 46 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040806152631 - Product - jacopo - not determined - PATCH - 2004-03-02 05:13:01 - issues@ofbiz - - - - All - Patch for multiple inventory facility reservation - - - jacopo - 2004-03-02 05:13:01 - Patch for multiple inventory facility reservation: -the intent of this is to perform reservation only if all items are available in -one facility: that, I think, is the declared behaviour, and what is checked -with the isInventoryAvailable method. - - - jacopo - 2004-03-02 05:13:49 - Created an attachment (id=13) -Patch for ProductStoreWorker.java in UOF - - - - jonesde - 2004-08-06 15:26:31 - Thanks Jacopo, your patch is now in CVS. - - - text/plain - 13 - 2004-03-02 05:13:49 - Patch for ProductStoreWorker.java in UOF - 1 - ProductStoreWorker.java.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/13/ProductStoreWorker.java.patch - - - jacopo - 2004-03-02 05:13:49 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=13) -Patch for ProductStoreWorker.java in UOF - - - - ajzeneski - 2004-03-18 12:02:10 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-08-06 15:26:31 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-06 15:26:31 - resolution - Resolution - - FIXED - - - - 47 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040323221326 - Product - jacopo - not determined - PATCH - 2004-03-02 06:06:51 - issues@ofbiz - - - - All - Facility -> Shipment: patch for JavaScript error introduced during i18n process. - - - jacopo - 2004-03-02 06:06:51 - Facility -> Shipment: patch for JavaScript error introduced during i18n process. - - - jacopo - 2004-03-02 06:07:51 - Created an attachment (id=14) -Patch for AddItemsFromOrder.ftl file in UOF - - - - ajzeneski - 2004-03-08 17:42:45 - reassigned - - - jacopo - 2004-03-23 22:13:26 - This bug has been fixed by the code for the new feature regarding shipment -plans. - - - text/plain - 14 - 2004-03-02 06:07:51 - Patch for AddItemsFromOrder.ftl file in UOF - 1 - AddItemsFromOrder.ftl.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/14/AddItemsFromOrder.ftl.patch - - - jacopo - 2004-03-02 06:07:51 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=14) -Patch for AddItemsFromOrder.ftl file in UOF - - - - ajzeneski - 2004-03-08 17:42:45 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-03-18 12:02:18 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2004-03-23 22:13:26 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-03-23 22:13:26 - resolution - Resolution - - FIXED - - - - 48 - NEW - P2 - - Components - CVS - All - issues@ofbiz - 20040318120228 - Product - jacopo - not determined - DEFECT - 2004-03-02 06:28:37 - issues@ofbiz - - - - All - Facility -> Shipment -> Items: delete shipment item link returns a constraint violation error. - - - jacopo - 2004-03-02 06:28:37 - Facility -> Shipment -> Items: delete shipment item link returns a constraint -violation error: - -The following errors occurred: -ERROR: Could not complete the Delete ShipmentItem process [problem removing the -lookedUpValue value: Exception while deleting the following entity: -[GenericEntity:ShipmentItem][shipmentId,10010(java.lang.String)] -[shipmentItemSeqId,00001(java.lang.String)] (SQL Exception while executing the -following:DELETE FROM SHIPMENT_ITEM WHERE SHIPMENT_ID=? AND -SHIPMENT_ITEM_SEQ_ID=? (Integrity constraint violation ITEM_ISS_SHITM table: -ITEM_ISSUANCE in statement [DELETE FROM SHIPMENT_ITEM WHERE SHIPMENT_ID=? AND -SHIPMENT_ITEM_SEQ_ID=?]))] - -In my opinion, the delete shipment item link should perform something like this -(instead of barely trying to remove the ShipmentItem entry): it should remove -the item issuances, recreate the reservations and then remove the shipment item. - - - ajzeneski - 2004-03-18 12:02:28 - version - Version - Pre3.0.0 - CVS - - - - 49 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040528001027 - Product - jacopo - not determined - PATCH - 2004-03-03 03:11:18 - issues@ofbiz - - - - All - Facility -> Receive PO: at now it's possible to receive multiple times the same shipment items. This is a partial patch for this problem. - - - jacopo - 2004-03-03 03:11:18 - Facility -> Receive PO: at now it's possible to receive multiple times the same -shipment items. This is a partial patch for this problem. With the attached -patch the shipment already delivered (or cancelled) are not shown (and so the -user cannot receive them again). -In order to completely fix this issue the best solution is, in my opinion, to -automatically update the shipment status to "delivered" when the user receives -an item: this could be done modifying the service -group "receiveInventoryProduct" by adding to it the "updateShipment" service -(to update the shipment status). However I'm going to add this comments to a -new "DEFECT" issue. - - - jacopo - 2004-03-03 03:12:11 - Created an attachment (id=15) -Patch for file receiveInventory.bsh in UOF. - - - - jonesde - 2004-05-28 00:10:27 - This is now in CVS, thanks for sending it over Jacopo. - - - text/plain - 15 - 2004-03-03 03:12:11 - Patch for file receiveInventory.bsh in UOF. - 1 - receiveInventory.bsh.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/15/receiveInventory.bsh.patch - - - jacopo - 2004-03-03 03:12:11 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=15) -Patch for file receiveInventory.bsh in UOF. - - - - ajzeneski - 2004-03-18 12:02:37 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-05-28 00:10:27 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-28 00:10:27 - resolution - Resolution - - FIXED - - - - 50 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040528000924 - Product - jacopo - not determined - DEFECT - 2004-03-03 03:15:23 - issues@ofbiz - - - - All - Facility -> Receive PO: at now it's possible to receive multiple times the same shipment items. - - - jacopo - 2004-03-03 03:15:24 - Facility -> Receive PO: at now it's possible to receive multiple times the same -shipment items. -This problem was partially fixed by the patch attached to issue #49. -With that patch the shipment already delivered (or cancelled) are not shown -(and so the user cannot receive them again). -In order to completely fix this issue the best solution is, in my opinion, to -automatically update the shipment status to "delivered" when the user receives -an item: this could be done modifying the service -group "receiveInventoryProduct" by adding to it the "updateShipment" service -(to update the shipment status). However I'm going to add this comments to a -new "DEFECT" issue. - - - jonesde - 2004-05-28 00:09:24 - The patch is in, now just need to update the shipment status as mentioned in the description. - - - ajzeneski - 2004-03-18 12:02:49 - version - Version - Pre3.0.0 - CVS - - - - 51 - RESOLVED - P3 - REMIND - Base - CVS - All - issues@ofbiz - 20040811004716 - Startup - jacopo - not determined - DEFECT - 2004-03-03 06:37:30 - issues@ofbiz - - - - All - Several SapDB error messages are generated at startup when entities are created. - - - jacopo - 2004-03-03 06:37:30 - Several SapDB error messages are generated at startup when entities are created. -The messages appear during the indices' generation phase, not for all entities -(maybe 5-10%); here is an example: - -147042[ DatabaseUtil.java:319:ERROR] Could not create foreign key indices -for entity "EftAccount": SQL Exception while executing the following: -CREATE INDEX EFTACCT_PMETH ON EFT_ACCOUNT (PAYMENT_METHOD_ID) -Error was: com.sap.dbtech.jdbc.exceptions.DatabaseException: [-7055] (at 44): -Column(s) already indexed:EFTACCT_PMETH -SQL Exception while executing the following: -CREATE INDEX EFTACCT_PADDR ON EFT_ACCOUNT (CONTACT_MECH_ID) -Error was: com.sap.dbtech.jdbc.exceptions.DatabaseException: [-7055] (at 44): -Column(s) already indexed:EFTACCT_PADDR - - - jacopo - 2004-08-11 00:47:16 - I've created a new issue (OFBIZ-1) for this in Jira; in it you will find a lot -of details. - - - - ajzeneski - 2004-03-18 12:03:00 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2004-08-11 00:47:16 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-08-11 00:47:16 - resolution - Resolution - - REMIND - - - - 52 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040308121509 - Order - jacopo - not determined - DEFECT - 2004-03-04 03:14:08 - issues@ofbiz - - - - All - Billing accounts selectable by users during order entry are not correctly filtered out. - - - jacopo - 2004-03-04 03:14:08 - Billing accounts selectable by users as payment methods during order entry are -not correctly filtered out: removed billing accounts are also shown (i.e. -billing accounts with thru date < now). - - - ajzeneski - 2004-03-08 12:15:09 - Billing accounts are now filtered by date so expired accounts no longer show on order manager order -entry and the ecommerce checkout pages - - - ajzeneski - 2004-03-08 12:15:09 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-03-08 12:15:09 - resolution - Resolution - - FIXED - - - ajzeneski - 2004-03-08 12:15:09 - version - Version - Pre3.0.0 - CVS - - - - 53 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040528010450 - Product - jacopo - not determined - DEFECT - 2004-03-05 06:01:05 - issues@ofbiz - - - - All - In Shipment: it's possible to issue 0 quantities from AddItemsFormOrder page. - - - jacopo - 2004-03-05 06:01:05 - In Shipment: it's possible to issue 0 quantities from AddItemsFormOrder page -(an ItemIssuance record is created with 0 quantity). -I think this should be avoided by submitting only quantities > 0. - - - jonesde - 2004-05-28 01:04:50 - Now checks to see if quantity is empty or 0 when issuing OIIRs to the shipment. - - - ajzeneski - 2004-03-18 12:03:13 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-05-28 01:04:50 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-28 01:04:50 - resolution - Resolution - - FIXED - - - - 54 - RESOLVED - P1 - FIXED - Components - CVS - All - issues@ofbiz - 20040630124239 - Product - jacopo - not determined - DEFECT - 2004-03-05 06:20:02 - issues@ofbiz - - - - All - In Shipment: if you enter a non numeric value (such as null quantity) in the issue field the program returns a bad error. - - - jacopo - 2004-03-05 06:20:02 - In Shipment: if you enter a non numeric value (such as null quantity) in the -issue field the program returns a bad error. -See also issue#53. -I'm running SapDB and after this error I need to restart OFBiz because in every -page I receive SQL errors like the following: - -Target exception: org.ofbiz.entity.GenericDataSourceException: SQL Exception -occurred on commit (Cannot commit a transactional connection: See JDBC 2.0 -Optional Package Specification section 7.1 (p25)) -BSF info: ..\ofbiz\components\content\webapp\content\WEB- -INF\actions\includes\envsetup.bsh at line: 0 column: 0) - - - ajzeneski - 2004-06-30 12:42:39 - Applied patch which fixes a bug in the service multi event handler - - - ajzeneski - 2004-03-18 12:03:23 - version - Version - Pre3.0.0 - CVS - - - ajzeneski - 2004-06-30 12:42:39 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 12:42:39 - resolution - Resolution - - FIXED - - - - 55 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040323221851 - Product - jacopo - not determined - DEFECT - 2004-03-05 06:25:34 - issues@ofbiz - - - - All - In shipment, it's possible to issue to shipment items with negative reservations (atp < 0); as a consequence of this, also the inventory items' quantity on hand can be negative. - - - jacopo - 2004-03-05 06:25:34 - I've noticed that, in shipment, it's possible to issue to shipment items with -negative reservations (atp < 0); as a consequence of this, also the inventory -items' quantity on hand can be negative. -In my opinion, in this situation at least a warning message should be -provided. - - - jacopo - 2004-03-23 22:18:51 - In "Order Items" page a new column has been added that tells users if they are -issuing negative reservations and the default issuance value is also -decremented by this quantity. -However is still possible to override this value and force an issuance for a -negative reservation. - - - - - ajzeneski - 2004-03-18 12:03:32 - version - Version - Pre3.0.0 - CVS - - - jacopo - 2004-03-23 22:18:51 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-03-23 22:18:51 - resolution - Resolution - - FIXED - - - - 56 - RESOLVED - P3 - WONTFIX - Components - CVS - PC - issues@ofbiz - 20040308173638 - Party - vivalinux - not determined - PATCH - 2004-03-08 14:07:32 - issues@ofbiz - - http://<ofbiz_root_url>/partymgr/control/findparty - - All - Selecting "Show All Records" displays all names as "(Not selected)" - - - vivalinux - 2004-03-08 14:07:32 - The findparty.bsh constructs a dynamic view tailored to the search fields -submited by the lookupparty form. Since selecting all does not give a hint about -which fields the client is interested in, the findparty.bsh fails to include any -of the name (firstName, lastName, groupName) fields. - -The can be corrected with the patch that follows or handling the select all -records as yet another case. I think, I'll side with simplicity, and sacrify -efficiency .... - -Hope this helps. - - -Index: components/party/webapp/partymgr/WEB-INF/actions/party/findparty.bsh -=================================================================== -RCS file: -/cvs/ofbiz/components/party/webapp/partymgr/WEB-INF/actions/party/findparty.bsh,v -retrieving revision 1.13 -diff -u -r1.13 findparty.bsh ---- components/party/webapp/partymgr/WEB-INF/actions/party/findparty.bsh 27 Jan -2004 19:44:36 -0000 1.13 -+++ components/party/webapp/partymgr/WEB-INF/actions/party/findparty.bsh 8 Mar -2004 22:06:24 -0000 -@@ -100,8 +100,15 @@ - - // default view settings - dynamicView.addMemberEntity("PT", "Party"); -+ dynamicView.addMemberEntity("PG", "PartyGroup"); -+ dynamicView.addMemberEntity("PP", "Person"); - dynamicView.addAlias("PT", "partyId"); - dynamicView.addAlias("PT", "partyTypeId"); -+ dynamicView.addAlias("PG", "groupName"); -+ dynamicView.addAlias("PP", "firstName"); -+ dynamicView.addAlias("PP", "lastName"); -+ dynamicView.addViewLink("PT","PG",true,UtilMisc.toList(new -ModelKeyMap("partyId", "partyId"))); -+ dynamicView.addViewLink("PT","PP",true,UtilMisc.toList(new -ModelKeyMap("partyId", "partyId"))); - dynamicView.addRelation("one-nofk", "", "PartyType", -ModelKeyMap.makeKeyMapList("partyTypeId")); - dynamicView.addRelation("many", "", "UserLogin", -ModelKeyMap.makeKeyMapList("partyId")); - -@@ -143,11 +150,6 @@ - if (groupName != null && groupName.length() > 0) { - paramList = paramList + "&groupName=" + groupName; - -- // modify the dynamic view -- dynamicView.addMemberEntity("PG", "PartyGroup"); -- dynamicView.addAlias("PG", "groupName"); -- dynamicView.addViewLink("PT", "PG", Boolean.FALSE, -ModelKeyMap.makeKeyMapList("partyId")); -- - // add the expr - andExprs.add(new EntityExpr("groupName", true, EntityOperator.LIKE, -"%"+groupName+"%", true)); - } -@@ -160,14 +162,6 @@ - firstName = request.getParameter("firstName"); - lastName = request.getParameter("lastName"); - -- // modify the dynamic view -- if ((firstName != null && firstName.length() > 0) || (lastName != null && -lastName.length() > 0)) { -- dynamicView.addMemberEntity("PE", "Person"); -- dynamicView.addAlias("PE", "firstName"); -- dynamicView.addAlias("PE", "lastName"); -- dynamicView.addViewLink("PT", "PE", Boolean.FALSE, -ModelKeyMap.makeKeyMapList("partyId")); -- } -- - // filter on firstName - if (firstName != null && firstName.length() > 0) { - paramList = paramList + "&firstName=" + firstName; -@@ -319,6 +313,12 @@ - List orderBy = new ArrayList(); - fieldsToSelect.add("partyId"); - fieldsToSelect.add("partyTypeId"); -+ fieldsToSelect.add("firstName"); -+ fieldsToSelect.add("lastName"); -+ fieldsToSelect.add("groupName"); -+ orderBy.add("-partyTypeId"); -+ orderBy.add("lastName"); -+ orderBy.add("groupName"); - - // UserLogin - if (userLoginId != null && userLoginId.length() > 0) { -@@ -327,14 +327,11 @@ - - // Person - if ((firstName != null && firstName.length() > 0) || (lastName != null -&& lastName.length() > 0)) { -- fieldsToSelect.add("firstName"); -- fieldsToSelect.add("lastName"); - orderBy.add("lastName"); - orderBy.add("firstName"); - } - // PartyGroup - if (groupName != null && groupName.length() > 0) { -- fieldsToSelect.add("groupName"); - orderBy.add("groupName"); - } - // RoleType -Index: components/party/webapp/partymgr/party/findparty.ftl -=================================================================== -RCS file: /cvs/ofbiz/components/party/webapp/partymgr/party/findparty.ftl,v -retrieving revision 1.10 -diff -u -r1.10 findparty.ftl ---- components/party/webapp/partymgr/party/findparty.ftl 1 Mar 2004 14:43:27 --0000 1.10 -+++ components/party/webapp/partymgr/party/findparty.ftl 8 Mar 2004 22:06:24 -0000 -@@ -212,13 +212,12 @@ - </table> - <input type="image" src="/images/spacer.gif" -onClick="javascript:document.lookupparty.submit();"> - </form> --<#if requestParameters.hideFields?default("N") != "Y"> - <script language="JavaScript"> - <!--// - document.lookupparty.partyId.focus(); - //--> - </script> --</#if> -+ - <#if partyList?exists> - <br> - <table border=0 width='100%' cellspacing='0' cellpadding='0' -class='boxoutside'> -@@ -292,21 +291,13 @@ - </td> - <td> - <div class="tabletext"> -- <#if partyRow.containsKey("lastName")> - <#if partyRow.lastName?has_content> - ${partyRow.lastName}<#if -partyRow.firstName?has_content>, ${partyRow.firstName}</#if> -- <#else> -- (No Name Found) -- </#if> -- <#elseif partyRow.containsKey("groupName")> -- <#if partyRow.groupName?has_content> -+ <#elseif partyRow.groupName?has_content> - ${partyRow.groupName} - <#else> -- (No Name Found) -+ (Not Selected) - </#if> -- <#else> -- (Not Selected) -- </#if> - </td> - <#if extInfo?default("") == "P"> - <td><div -class="tabletext">${partyRow.postalCode?if_exists}</div></td> - - - ajzeneski - 2004-03-08 17:36:38 - This page has been changed from using the left joins in the dynamic view. Using left joins performs too -poorly for actual use. This patch has been rejected; a new task will be opened for fixing the problem of -the name not being displayed. - - - ajzeneski - 2004-03-08 17:36:38 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-03-08 17:36:38 - resolution - Resolution - - WONTFIX - - - - 57 - NEW - P4 - - Components - CVS - All - ajzeneski - 20040308174641 - Party - ajzeneski - not determined - DEFECT - 2004-03-08 17:36:18 - issues@ofbiz - - - - All - Find Party - Show all does not show name - - - ajzeneski - 2004-03-08 17:36:18 - The name is not displayed when selecting show all in the party manager. - - - ajzeneski - 2004-03-08 17:46:41 - reassigned - - - ajzeneski - 2004-03-08 17:46:41 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - - 58 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040308185722 - Content - vivalinux - not determined - ENHANCEMENT - 2004-03-08 18:57:22 - issues@ofbiz - - - - All - Inherited hidden fields overide child fields when they have use-when - - - vivalinux - 2004-03-08 18:57:22 - In working with inherited forms I noticed that hidden fields are hard -to override if the overriding field has a use-when attribute: - - Since the HtmlFormRenderer gives precedence to hidden fields, and new -fields with "use-when" are only placed in front of existing fields -but not merged with, the resulting behavior is that hidden fields of -parent forms always get rendered even when the use-when condition is -true. This causes the hidden field to take precedence over the user -input when the form is submitted. - - Here is a posible solution: - -Index: components/content/src/org/ofbiz/content/widget/form/ModelForm.java -=================================================================== -RCS file: -/usr/local/cvsrepos/newriverbiz/components/content/src/org/ofbiz/content/widget/form/ModelForm.java,v -retrieving revision 1.1.1.4 -diff -u -r1.1.1.4 ModelForm.java ---- components/content/src/org/ofbiz/content/widget/form/ModelForm.java -2004/01/08 14:19:55 1.1.1.4 -+++ components/content/src/org/ofbiz/content/widget/form/ModelForm.java -2004/01/29 20:23:20 -@@ -277,15 +277,25 @@ - public ModelFormField addUpdateField(ModelFormField modelFormField) { - if (!modelFormField.isUseWhenEmpty()) { - // is a conditional field, add to the List but don't worry about -the Map -- //for adding to list, see if there is another field with that name -in the list and if so, put it before that one -+ //for adding to list, see if there is another field with that name -+ //in the list and if so, put it before that one - boolean inserted = false; - for (int i = 0; i < this.fieldList.size(); i++) { - ModelFormField curField = (ModelFormField) this.fieldList.get(i); -+ // BUG FIX: parent hidden fields are left and rendered even when they -+ // are overriden with fields that have a use-when - if (curField.getName() != null && -curField.getName().equals(modelFormField.getName())) { -- this.fieldList.add(i, modelFormField); -- inserted = true; -- break; -+ if ((curField.getFieldInfo().getFieldType() != -ModelFormField.FieldInfo.HIDDEN) && -+ (curField.getFieldInfo().getFieldType() != ModelFormField.FieldInfo.IGNORED)) { -+ this.fieldList.add(i, modelFormField); -+ inserted = true; -+ break; -+ } else { -+ curField.mergeOverrideModelFormField(modelFormField); -+ break; -+ } - } -+ //End of BUG fix - } - if (!inserted) { - this.fieldList.add(modelFormField); - - - - 59 - NEW - P1 - - Components - CVS - All - issues@ofbiz - 20040318120354 - Workflow - mbennani - not determined - DEFECT - 2004-03-09 06:47:17 - issues@ofbiz - - - - All - Serious Problem in Sub-flow Implementation: in-Memory Requester Used!! - - - mbennani - 2004-03-09 06:47:17 - I am running ofbiz almost v.3 :-) (image from late 2003 from cvs). -(subflow implementation did not change since 1.2 anyways, I believe) - -Quick Description: ------------------- -Subflows are using the in-memory requester object which -does not persist over server re-starts. This is serious one guys. - -More Description (Scenario): ---------------------------- -I have a main process with 3 steps(step1,step2-subflow,step3). A subflow -process being the second step. This second step calls another process that I -call sub. sub has 2 simple steps (substep1,substep2). - -Now, in normal time (i.e no server restart), it all works fine and my main -process runs fine, calls the subflow, subflow runs, the call returns and my -step3 of the main process runs successfully and main completes fine. - -The problem arises when say I run step 1 of main process, subflow gets -initiated, substep1 is executed, and before substep2 is executed, I stop the -server (faking a server problem..., connection lost...whatever). -When I restart the server, the subflow resumes at substep2 which executes fine, -and eventually completes the subflow process. But, step-subflow activity in the -workeffort table still shows WF_RUNNING. Therefore, my main process is hanging -there and will never move along. The waitForResult() is not executed anymore -after server restart. -This is happening in WfActivitySubFlowImplementation on runService. - -Even More Details, code wise, if you want to look at it: -------------------------------------------------------- -In a normal scenario (no server stopped), the runService of -WfActivitySubFlowImplementation eventually calls the runSync in WorkflowEngine -and then waitForResult. I put a system out message in the waiter class and I -can see my message being displayed in the console forever ("waiting..."), until -the subflow process finishes. And that's ok, that's what we want. When the -subflow process finishes, the call is returned back to the runService in -WfActivitySubFlowImplementation() and the setComplete is called, which changes -the status of my step2-subflow activity in the main process to WF_COMPLETED to -advance the main process. It also calls setResults() to propagate the results -from the subflow up to the main process. - -BUT, now if I stop my server during that wait, and restart it the call never -reachs the setComplete nor the setResults, making therefore my main process -unusable anymore. - - - ajzeneski - 2004-03-18 12:03:54 - op_sys - OS/Version - Windows 2000 - All - - - ajzeneski - 2004-03-18 12:03:54 - version - Version - Pre3.0.0 - CVS - - - - 60 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040707152609 - Entity - doogie - not determined - ENHANCEMENT - 2004-03-09 07:09:04 - issues@ofbiz - - - - All - Replace simplistic caching with complex reverse dependency resolver - - - doogie - 2004-03-09 07:09:04 - This patch removes all simple caching from GenericDelegator, and replaces -it with a stand-alone class, that handles all entity cache management. It -uses new features in the entity model, that keeps track of view entities -that are referenced by regular entities. As entities are updated, all -cached lists of views or condition caches are cleared. - -With this patch applied, view entities can be cached, without worry that -they will become stale. Which then allows very complex views to be -created, that emulate complex code patterns, while still allowing for -caching. This can speed up code tremendously. - -Additionally, since cache clearing now works, it almost always makes more -sense to use the cache variation of the methods. - - - doogie - 2004-03-09 07:14:24 - Created an attachment (id=16) -The patch - - - - doogie - 2004-04-29 15:44:46 - This patch is on hold, until some other patches are committed. Some of them -need to have bugs filed, which I am working on. Plus, this patch needs to be -updated to the latest code base(not a big task, done locally). - - - doogie - 2004-07-07 15:26:09 - This is now in cvs. - - - text/plain - 16 - 2004-03-09 07:14:24 - The patch - 1 - EntityCache.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/16/EntityCache.patch - - - doogie - 2004-03-09 07:14:24 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=16) -The patch - - - - doogie - 2004-04-29 15:44:46 - issue_status - Status - NEW - STARTED - - - doogie - 2004-04-29 16:16:01 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-07-07 15:26:09 - issue_status - Status - STARTED - RESOLVED - - - doogie - 2004-07-07 15:26:09 - resolution - Resolution - - FIXED - - - - 61 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422222023 - Product - doogie - not determined - FEATURE - 2004-03-09 07:18:26 - issues@ofbiz - - - - All - Allow for easier extension of this class. - - - doogie - 2004-03-09 07:18:26 - This patch makes a protected writeValues() method, which allows sub-classes -to redirect the output to other places, as needed. - - - doogie - 2004-03-09 07:18:49 - Created an attachment (id=17) -The patch - - - - doogie - 2004-04-22 22:20:23 - Applied the patch. - - - text/plain - 17 - 2004-03-09 07:18:49 - The patch - 1 - EntitySaxReader-extension.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/17/EntitySaxReader-extension.patch - - - doogie - 2004-03-09 07:18:49 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=17) -The patch - - - - doogie - 2004-04-22 22:20:23 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:20:23 - resolution - Resolution - - FIXED - - - - 62 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422223418 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:34:07 - issues@ofbiz - - - - All - Allow for UPPER() and LOWER() sorting - - - doogie - 2004-03-09 07:34:07 - See $summary. - - - doogie - 2004-03-09 07:34:26 - Created an attachment (id=18) -The patch. - - - - doogie - 2004-04-22 22:34:18 - Applied patch. - - - text/plain - 18 - 2004-03-09 07:34:26 - The patch. - 1 - EntityUtil-UPPER_LOWER.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/18/EntityUtil-UPPER_LOWER.patch - - - doogie - 2004-03-09 07:34:26 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=18) -The patch. - - - - doogie - 2004-04-22 22:34:18 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:34:18 - resolution - Resolution - - FIXED - - - - 63 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040429160209 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:36:19 - issues@ofbiz - - - - All - Add support for turning off schemas completely - - - doogie - 2004-03-09 07:36:19 - See $summary. - - - doogie - 2004-03-09 07:36:42 - Created an attachment (id=19) -The patch - - - - doogie - 2004-04-29 16:02:09 - Applied this patch. - - - text/plain - 19 - 2004-03-09 07:36:42 - The patch - 1 - use-schemas.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/19/use-schemas.patch - - - doogie - 2004-03-09 07:36:42 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=19) -The patch - - - - doogie - 2004-04-29 16:02:09 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-29 16:02:09 - resolution - Resolution - - FIXED - - - - 64 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422222810 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:43:55 - issues@ofbiz - - - - All - Make the code look like the rest of the file. - - - doogie - 2004-03-09 07:43:55 - See $summary. - - - doogie - 2004-03-09 07:44:21 - Created an attachment (id=20) -The patch - - - - doogie - 2004-04-22 22:28:10 - Applied patch. - - - text/plain - 20 - 2004-03-09 07:44:21 - The patch - 1 - SqlJdbcUtil-Cast.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/20/SqlJdbcUtil-Cast.patch - - - doogie - 2004-03-09 07:44:21 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=20) -The patch - - - - doogie - 2004-04-22 22:28:10 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:28:10 - resolution - Resolution - - FIXED - - - - 65 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040429163146 - Entity - doogie - not determined - ENHANCEMENT - 2004-03-09 07:46:14 - issues@ofbiz - - - - All - Add java.util.Date support. - - - doogie - 2004-03-09 07:46:14 - See $summary. - - - doogie - 2004-03-09 07:46:39 - Created an attachment (id=21) -The patch - - - - doogie - 2004-04-29 16:31:46 - Applied the patch. - - - text/plain - 21 - 2004-03-09 07:46:39 - The patch - 1 - SqlJdbcUtil-Java_Util_Date.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/21/SqlJdbcUtil-Java_Util_Date.patch - - - doogie - 2004-03-09 07:46:39 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=21) -The patch - - - - doogie - 2004-04-29 16:16:03 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 16:31:45 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-29 16:31:45 - resolution - Resolution - - FIXED - - - - 66 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422221943 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:47:46 - issues@ofbiz - - - - All - Use UtilValidate.isNotEmpty. - - - doogie - 2004-03-09 07:47:46 - See $summary. - - - doogie - 2004-03-09 07:48:06 - Created an attachment (id=22) -The patch - - - - doogie - 2004-04-22 22:19:43 - Applied patch, which uses UtilValidate.isNotEmpty in SqlJdbcUtil. - - - text/plain - 22 - 2004-03-09 07:48:06 - The patch - 1 - SqlJdbcUtil-UtilValidate.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/22/SqlJdbcUtil-UtilValidate.patch - - - doogie - 2004-03-09 07:48:06 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=22) -The patch - - - - doogie - 2004-04-22 22:19:43 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:19:43 - resolution - Resolution - - FIXED - - - - 67 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040429161604 - Entity - doogie - not determined - ENHANCEMENT - 2004-03-09 07:49:20 - issues@ofbiz - - - - All - Add support for <constraint> on relations and views. - - - doogie - 2004-03-09 07:49:20 - When defining a view or relation, you can now constrain the returned -values to those that match an EntityCondition. This is really helpful -for complex views. - - - doogie - 2004-03-09 07:49:42 - Created an attachment (id=23) -The patch - - - - text/plain - 23 - 2004-03-09 07:49:42 - The patch - 1 - model-constraint.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/23/model-constraint.patch - - - doogie - 2004-03-09 07:49:42 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=23) -The patch - - - - doogie - 2004-04-29 16:16:04 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - - 68 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040423074926 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:51:20 - issues@ofbiz - - - - All - Use a NumberFormat for casting number objects to strings. - - - doogie - 2004-03-09 07:51:20 - See $summary. - - - doogie - 2004-03-09 07:51:40 - Created an attachment (id=24) -The patch - - - - doogie - 2004-04-23 07:49:26 - Applied patch. - - - text/plain - 24 - 2004-03-09 07:51:40 - The patch - 1 - GenericEntity-NumberFormat.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/24/GenericEntity-NumberFormat.patch - - - doogie - 2004-03-09 07:51:40 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=24) -The patch - - - - doogie - 2004-04-23 07:49:26 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-23 07:49:26 - resolution - Resolution - - FIXED - - - - 69 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040423075223 - Entity - doogie - not determined - FEATURE - 2004-03-09 07:52:20 - issues@ofbiz - - - - All - Add addToXmlElement method - - - doogie - 2004-03-09 07:52:20 - See $summary. - - - doogie - 2004-03-09 07:52:42 - Created an attachment (id=25) -The patch - - - - doogie - 2004-04-23 07:52:23 - Applied patch. - - - text/plain - 25 - 2004-03-09 07:52:42 - The patch - 1 - GenericEntity-addToXmlElement.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/25/GenericEntity-addToXmlElement.patch - - - doogie - 2004-03-09 07:52:42 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=25) -The patch - - - - doogie - 2004-04-23 07:52:23 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-23 07:52:23 - resolution - Resolution - - FIXED - - - - 70 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422221512 - Entity - doogie - not determined - DEFECT - 2004-03-09 07:54:40 - issues@ofbiz - - - - All - Fix modelEntity dereferencing - - - doogie - 2004-03-09 07:54:40 - When GenericEntities have been deserialized, modelEntity will be null. -getModelEntity() should be called, to repopulate it. - - - doogie - 2004-03-09 07:54:57 - Created an attachment (id=26) -The patch - - - - doogie - 2004-04-22 22:15:12 - Applied patch, plus fixed it in a few other areas. - - - text/plain - 26 - 2004-03-09 07:54:57 - The patch - 1 - GenericEntity-getModelEntity.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/26/GenericEntity-getModelEntity.patch - - - doogie - 2004-03-09 07:54:57 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=26) -The patch - - - - doogie - 2004-04-22 22:15:12 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:15:12 - resolution - Resolution - - FIXED - - - - 71 - NEW - P4 - - Components - CVS - All - issues@ofbiz - 20040501214447 - Content - doogie - not determined - ENHANCEMENT - 2004-03-09 07:56:46 - issues@ofbiz - - - - All - Factor out the code - - - doogie - 2004-03-09 07:56:46 - See $summary. - - - doogie - 2004-03-09 07:57:40 - Created an attachment (id=27) -The patch. - - - - doogie - 2004-04-29 19:57:51 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:06:43 - Not adding this patch, breaks the Server Stats Since Start page in WebTools, and not totally sure the -cleanup is worth it yet. - - - doogie - 2004-05-01 21:44:47 - I'll fix that page then, and submit a revised patch. - - - text/plain - 27 - 2004-03-09 07:57:40 - The patch. - 1 - ServerHitBin-factor.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/27/ServerHitBin-factor.patch - - - doogie - 2004-03-09 07:57:40 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=27) -The patch. - - - - doogie - 2004-04-29 16:16:02 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 19:57:51 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:07:05 - priority - Priority - P2 - P4 - - - - 72 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422223139 - Entity - doogie - not determined - FEATURE - 2004-03-09 08:04:05 - issues@ofbiz - - - - All - Add a matches(condition) helper method. - - - doogie - 2004-03-09 08:04:05 - See $summary. - - - doogie - 2004-03-09 08:04:31 - Created an attachment (id=28) -The patch - - - - doogie - 2004-04-22 22:31:39 - Applied patch. - - - text/plain - 28 - 2004-03-09 08:04:31 - The patch - 1 - GenericEntity-matches-condition.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/28/GenericEntity-matches-condition.patch - - - doogie - 2004-03-09 08:04:31 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=28) -The patch - - - - doogie - 2004-04-22 22:31:39 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:31:39 - resolution - Resolution - - FIXED - - - - 73 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422221835 - Entity - doogie - not determined - DEFECT - 2004-03-09 08:05:30 - issues@ofbiz - - - - All - Fix deserializing of these objects. - - - doogie - 2004-03-09 08:05:30 - See $summary. - - - doogie - 2004-03-09 08:05:51 - Created an attachment (id=29) -The patch. - - - - doogie - 2004-04-22 22:18:35 - Applied patch, which set delegatorName to "default" when it is null. - - - text/plain - 29 - 2004-03-09 08:05:50 - The patch. - 1 - GenericDelegator-fix-serialization.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/29/GenericDelegator-fix-serialization.patch - - - doogie - 2004-03-09 08:05:51 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=29) -The patch. - - - - doogie - 2004-04-22 22:18:35 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:18:35 - resolution - Resolution - - FIXED - - - - 74 - NEW - P2 - - Components - CVS - All - issues@ofbiz - 20040429200642 - Order - doogie - not determined - ENHANCEMENT - 2004-03-09 08:08:00 - issues@ofbiz - - - - All - Fix all fetchers of shopping cart to use a static method - - - doogie - 2004-03-09 08:08:00 - This patch fixes all code that fetches the ShoppingCart from the session, -to use a static method instead. It also adds the beginning of named -ShoppingCart support. - - - doogie - 2004-03-09 08:08:22 - Created an attachment (id=30) -The patch. - - - - doogie - 2004-04-29 19:57:51 - Changing priority, so that someone else can see the ones I want applied next. - - - doogie - 2004-04-29 20:05:04 - This patch depends on EntityCache, which isn't ready for inclussion yet, -reducing priority. - - - doogie - 2004-04-29 20:06:42 - Oops, modified wrong issue. - - - text/plain - 30 - 2004-03-09 08:08:22 - The patch. - 1 - ShoppingCart-getShoppingCart.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/30/ShoppingCart-getShoppingCart.patch - - - doogie - 2004-03-09 08:08:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=30) -The patch. - - - - doogie - 2004-04-29 16:16:03 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 19:57:51 - priority - Priority - P3 - P2 - - - doogie - 2004-04-29 20:05:04 - priority - Priority - P2 - P3 - - - doogie - 2004-04-29 20:06:41 - priority - Priority - P3 - P2 - - - - 75 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429171641 - Base - doogie - not determined - ENHANCEMENT - 2004-03-09 08:09:21 - issues@ofbiz - - - - All - Allow code to detect whether a cacheline has expired. - - - doogie - 2004-03-09 08:09:21 - See $summary. - - - doogie - 2004-03-09 08:09:41 - Created an attachment (id=31) -The patch - - - - doogie - 2004-04-29 16:57:47 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:16:41 - Now in CVS, thanks Adam. - - - text/plain - 31 - 2004-03-09 08:09:41 - The patch - 1 - UtilCache-hasExpired.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/31/UtilCache-hasExpired.patch - - - doogie - 2004-03-09 08:09:41 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=31) -The patch - - - - doogie - 2004-04-29 16:16:04 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 16:57:47 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:16:41 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:16:41 - resolution - Resolution - - FIXED - - - - 76 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429171643 - Base - doogie - not determined - ENHANCEMENT - 2004-03-09 08:10:31 - issues@ofbiz - - - - All - Allow code to get the values stored in the cache. - - - doogie - 2004-03-09 08:10:31 - See $summary. - - - doogie - 2004-03-09 08:10:58 - Created an attachment (id=32) -The patch - - - - doogie - 2004-04-29 16:57:47 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:16:43 - Now in CVS, thanks Adam. - - - text/plain - 32 - 2004-03-09 08:10:58 - The patch - 1 - UtilCache-getCacheLineValues.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/32/UtilCache-getCacheLineValues.patch - - - doogie - 2004-03-09 08:10:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=32) -The patch - - - - doogie - 2004-04-29 16:16:05 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 16:57:47 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:16:43 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:16:43 - resolution - Resolution - - FIXED - - - - 77 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429171648 - Base - doogie - not determined - ENHANCEMENT - 2004-03-09 08:11:52 - issues@ofbiz - - - - All - Allow registering of listeners for the various events on caches. - - - doogie - 2004-03-09 08:11:52 - See $summary. - - - doogie - 2004-03-09 08:12:13 - Created an attachment (id=33) -The patch - - - - doogie - 2004-04-29 16:57:48 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:16:48 - Now in CVS, thanks Adam. - - - text/plain - 33 - 2004-03-09 08:12:12 - The patch - 1 - UtilCache-listeners.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/33/UtilCache-listeners.patch - - - doogie - 2004-03-09 08:12:13 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=33) -The patch - - - - doogie - 2004-04-29 16:16:05 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 16:57:48 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:16:48 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:16:48 - resolution - Resolution - - FIXED - - - - 78 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040423080723 - Entity - doogie - not determined - FEATURE - 2004-03-09 08:19:59 - issues@ofbiz - - - - All - Some additional methods to manipulate the embedded cache. - - - doogie - 2004-03-09 08:19:59 - See $summary. - - - doogie - 2004-03-09 08:20:20 - Created an attachment (id=34) -The patch - - - - doogie - 2004-04-23 08:07:23 - Add some more methods to GenericValue to manipulate the cache. - - - text/plain - 34 - 2004-03-09 08:20:20 - The patch - 1 - GenericValue-EmbeddedCache.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/34/GenericValue-EmbeddedCache.patch - - - doogie - 2004-03-09 08:20:20 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=34) -The patch - - - - doogie - 2004-04-23 08:07:23 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-23 08:07:23 - resolution - Resolution - - FIXED - - - - 79 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040429200727 - Product - doogie - not determined - ENHANCEMENT - 2004-03-09 08:21:27 - issues@ofbiz - - - - All - methods to fetch the list of available catalogs. - - - doogie - 2004-03-09 08:21:27 - See $summary. - - - doogie - 2004-03-09 08:21:46 - Created an attachment (id=35) -The patch - - - - doogie - 2004-04-29 19:57:52 - Changing priority, so that someone else can see the ones I want applied next. - - - doogie - 2004-04-29 20:07:27 - This patch depends on EntityCache, which isn't ready for inclussion yet, -reducing priority. - - - text/plain - 35 - 2004-03-09 08:21:46 - The patch - 1 - CatalogWorker-getCatalogsAvailable.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/35/CatalogWorker-getCatalogsAvailable.patch - - - doogie - 2004-03-09 08:21:46 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=35) -The patch - - - - doogie - 2004-04-29 16:16:05 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 19:57:52 - priority - Priority - P3 - P2 - - - doogie - 2004-04-29 20:07:27 - priority - Priority - P2 - P3 - - - - 80 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040422222535 - Entity - doogie - not determined - DEFECT - 2004-03-09 08:22:53 - issues@ofbiz - - - - All - Create a separate makeIndexName helper method. - - - doogie - 2004-03-09 08:22:53 - This patch also truncates the index name, based on the clipping value. - - - doogie - 2004-03-09 08:23:14 - Created an attachment (id=36) -The patch - - - - doogie - 2004-04-22 22:25:35 - Applied patch. - - - text/plain - 36 - 2004-03-09 08:23:14 - The patch - 1 - DatabaseUtil-makeIndexName.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/36/DatabaseUtil-makeIndexName.patch - - - doogie - 2004-03-09 08:23:14 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=36) -The patch - - - - doogie - 2004-04-22 22:25:35 - issue_status - Status - NEW - RESOLVED - - - doogie - 2004-04-22 22:25:35 - resolution - Resolution - - FIXED - - - - 81 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429172408 - Base - doogie - not determined - ENHANCEMENT - 2004-03-09 08:23:52 - issues@ofbiz - - - - All - Add support for writing elements. - - - doogie - 2004-03-09 08:23:52 - See $summary. - - - doogie - 2004-03-09 08:24:13 - Created an attachment (id=37) -The patch - - - - doogie - 2004-04-29 16:57:47 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:24:08 - Now in CVS, thanks Adam. - - - text/plain - 37 - 2004-03-09 08:24:12 - The patch - 1 - UtilXml-writeElement.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/37/UtilXml-writeElement.patch - - - doogie - 2004-03-09 08:24:13 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=37) -The patch - - - - doogie - 2004-04-29 16:16:03 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 16:57:47 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:24:08 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:24:08 - resolution - Resolution - - FIXED - - - - 82 - NEW - P2 - - Components - CVS - All - issues@ofbiz - 20040429195752 - Party - doogie - not determined - ENHANCEMENT - 2004-03-09 08:25:06 - issues@ofbiz - - - - All - Services/etc for manipulating PartyAttributes. - - - doogie - 2004-03-09 08:25:06 - See $summary. - - - doogie - 2004-03-09 08:25:27 - Created an attachment (id=38) -The patch - - - - doogie - 2004-04-29 19:57:52 - Changing priority, so that someone else can see the ones I want applied next. - - - text/plain - 38 - 2004-03-09 08:25:27 - The patch - 1 - PartyAttributes.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/38/PartyAttributes.patch - - - doogie - 2004-03-09 08:25:27 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=38) -The patch - - - - doogie - 2004-04-29 16:16:04 - issue_type - Issue Type - FEATURE - ENHANCEMENT - - - doogie - 2004-04-29 19:57:52 - priority - Priority - P3 - P2 - - - - 83 - NEW - P5 - - Components - CVS - All - issues@ofbiz - 20040309095844 - Content - jacopo - not determined - DEFECT - 2004-03-09 09:58:44 - issues@ofbiz - - - - All - Problems displaying the Euro symbol in order confirmation by email with MS Outlook - - - jacopo - 2004-03-09 09:58:44 - Problems displaying the Euro symbol in order confirmation by email with MS -Outlook: instead of the beautyful Euro symbol you see a '?'. -Ok, maybe I should create an issue to the Microsoft issue tracker... however -I've reported this for two reasons: -1) other users reported this some time ago in the mailing lists -2) maybe, in general, for the currency symbols in ftl templates we should use -the html entity references (i.e. &euro; for the Euro symbol): this will solve -all the display problems with virtually any client software. - - - - 84 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040309101202 - Product - jacopo - not determined - ENHANCEMENT - 2004-03-09 10:12:02 - issues@ofbiz - - - - All - In shipment, it's possible to issue to shipment items with negative reservations (atp < 0); as a consequence of this, also the inventory items' quantity on hand can be negative. - - - jacopo - 2004-03-09 10:12:02 - In shipment, it's possible to issue to shipment items with negative -reservations (atp < 0); as a consequence of this, also the inventory items' -quantity on hand can be negative. -In fact, when the issuance is performed, the (negative) reservation is deleted -and a new issuance is created and the inventory's qoh is decremented. -In my opinion, in this situation a warning message should be provided. -Also, David Jones has suggested to create a report of all negative QOH -InventoryItems and add a link for each one to get a physical inventory variance -started. - - - - 85 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040730212116 - Party - jonesde - not determined - ENHANCEMENT - 2004-03-11 08:14:35 - issues@ofbiz - - - - All - The showvisits page in the Party Manager is very slow when there are many visits - - - jonesde - 2004-03-11 08:14:35 - The showvisits page is not coded to efficiently display a subset of the visits when there are many active. -When there are tens of thousands the current code doesn't work very efficiently. - - - ajzeneski - 2004-07-30 21:21:16 - The code for visit display utilized the entity list iterator and pulls a subset for each page. The query -fields are indexed (as of now) so depending on the JDBC driver being used this should be quite efficient. -If you experience further problems, send more information to the DEV list. - - - ajzeneski - 2004-03-18 12:04:04 - version - Version - Pre3.0.0 - CVS - - - ajzeneski - 2004-07-30 21:21:16 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 21:21:16 - resolution - Resolution - - INVALID - - - - 86 - NEW - P4 - - Components - CVS - All - issues@ofbiz - 20040312164734 - Content - jonesde - not determined - PATCH - 2004-03-12 16:45:26 - issues@ofbiz - - - - All - Error Message (esp Map) Improvements from Quake Wang - - - jonesde - 2004-03-12 16:45:26 - A description from an email from Quake: - -================================ -David, - The attachment is my patch. The main changes are: - -1. Now the event and the service invoke will use the same message fields in SimpleMethod. -2. Add the errorMessageMap and successMessageMap for the message handling - - I only change the envsetup.bsh and errormsg.ftl in the ecommerce component, please use the -ecommerce to review the backward compatiblity. - -Regards -Quake -============================= - - - jonesde - 2004-03-12 16:47:34 - Created an attachment (id=39) -Error Message patch from Quake Wang - - - - text/plain - 39 - 2004-03-12 16:47:34 - Error Message patch from Quake Wang - 1 - quake.errormessages.patch - 3 - jonesde - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/39/quake.errormessages.patch - - - jonesde - 2004-03-12 16:47:34 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=39) -Error Message patch from Quake Wang - - - - - 87 - NEW - P3 - - Base - CVS - All - issues@ofbiz - 20040312165745 - Base - doogie - not determined - DEFECT - 2004-03-12 16:56:52 - issues@ofbiz - - - - All - bsf.jar in base is old - - - doogie - 2004-03-12 16:56:52 - bsf is no longer part of IBM. Instead, it has moved to jakarta. - -Attached patch changes imports, etc. It can't change the bsf.jar in -base/lib/scripting/, however. - - - doogie - 2004-03-12 16:57:45 - Created an attachment (id=40) -The patch. - - - - text/plain - 40 - 2004-03-12 16:57:45 - The patch. - 1 - IBM-Jakarta-BSF.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/40/IBM-Jakarta-BSF.patch - - - doogie - 2004-03-12 16:57:45 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=40) -The patch. - - - - - 88 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040312165737 - Order - jonesde - not determined - DEFECT - 2004-03-12 16:57:37 - issues@ofbiz - - - - All - Promotion/other adjustments not as expected when cancelling order items - - - jonesde - 2004-03-12 16:57:37 - When order items are cancelled some order level adjustments are not changed, like order level -promotion adjustments. Because of this order totals can easily become negative. The question is what -to do about it? - -Andy wrote this at one point in an email: - -============================ -I was aware of this; the only order level adjustments which are currently re-calculated are shipping and -tax, order level promotions are not done at this time so we will need to add this in. In order to do this -promotion evaluation will need to be able to be done without a shopping cart. -============================ - -I'm not sure I totally agree with this, I think short of that it would still be good to at least pro-rate these -order adjustments like we do with tax and shipping. - -Or would it be better on any order change to just cancel the order and create a new one with full re- -calculations, including promotions, tax, shipping, etc, etc? If that is done should we apply promotions, -etc as if it was the original order date, or using today's date? (could be a big difference based on -promotions that come and go over time) - - - - 89 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040312171315 - Product - jonesde - not determined - PATCH - 2004-03-12 17:10:18 - issues@ofbiz - - - - All - In product detail show variant prices (from Brian Johnson) - - - jonesde - 2004-03-12 17:10:18 - Here is a description from an email from Brian Johnson: - -=================================== -I've changed productdetail to better handle variants with different prices. When you first bring-up the -page it says "make selections", then when you select the features from the drop-downs it'll show the -price for the product with those features. --- -Brian Johnson -=================================== - - - jonesde - 2004-03-12 17:13:15 - Created an attachment (id=41) -Show prices for variants along with drop down, patch from Brian Johnson - - - - text/plain - 41 - 2004-03-12 17:13:15 - Show prices for variants along with drop down, patch from Brian Johnson - 1 - productdetail-variantprices.patch - 3 - jonesde - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/41/productdetail-variantprices.patch - - - jonesde - 2004-03-12 17:11:11 - issue_type - Issue Type - DEFECT - PATCH - - - jonesde - 2004-03-12 17:13:15 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=41) -Show prices for variants along with drop down, patch from Brian Johnson - - - - - 90 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040312172159 - E-Commerce - jonesde - not determined - FEATURE - 2004-03-12 17:21:59 - issues@ofbiz - - - - All - Web/order/etc marketing reports like Core Metrics - - - jonesde - 2004-03-12 17:21:59 - The feature here is to create a standard set of reports commonly used to keep tabs on a web content -and/or ecommerce site. These reports would be similar to what a company like Core Metrics offers. - -Would include reports for a given time period such as for things like hits, visits/sessions, orders, -tracking codes, percent of customers that order, orders per customer, pages/products/etc viewed, -searches done, referring sites & search strings, etc, etc, etc. - - - - 91 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040315011245 - Product - jacopo - not determined - DEFECT - 2004-03-15 01:12:45 - issues@ofbiz - - - - All - Shipment: potential problem when issuing negative reservations (quantityNotAvailable could be lost) - - - jacopo - 2004-03-15 01:12:45 - This is a potential problem when you issue negative reservation to a shipment. -Here is the scenario: - -1) inventory item 9000 for product WG-1111 with atp/qoh = 10/10 -2) two orders are received for WG-1111: the first for 8 items, the second -for 5 items -3) two reservations are made: the first for 8 items and the second for 5 -items but with quantityNotAvailable = 3 -4) the inventory item 9000 is now: atp/qoh = -3/10 -5) only the second order is issued to shipment: the reservation record is -deleted and the qoh is decremented -6) the inventory item 9000 is now: atp/qoh = -3/5 but the reservation for -the first order (for quantity = 8) has quantityNotAvailable = 0 (ERROR: it -should be 3) - -A possible patch: if we issue a negative reservation we should try to assign -the quantityNotAvailable to another reservation in the same inventory item. - -In order to do this, David Jones has proposed to do a re-reservation whenever a -reservation is issued to a shipment, considering that (like in this scenario) -shipments may occur in a different order than reservations. - -In fact, when new inventory is received a re-reservation is already done for -all OIIR that are associated to inventory items (of the same product) that have -negative ATP. -In a similar way, when we issue a OIIR, we could do a re-reservation for all -the OIIR associated to the inventory item. - - - - 92 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20040416115022 - E-Commerce - holivier - not determined - PATCH - 2004-03-16 06:35:41 - issues@ofbiz - - - - All - Simple Update for localization - - - holivier - 2004-03-16 06:35:41 - In the ecommerce component -2 UiLabels change (the # is now in the label) -and some french UiLabel correction - - - holivier - 2004-03-16 06:38:00 - Created an attachment (id=42) -the Ecommerce UiLabel patch - - - - jonesde - 2004-04-16 11:50:22 - Patch is in CVS. Thanks for doing these Olivier. - - - text/plain - 42 - 2004-03-16 06:38:00 - the Ecommerce UiLabel patch - 1 - EcommerceUiLabel.update.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/42/EcommerceUiLabel.update.patch - - - holivier - 2004-03-16 06:38:00 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=42) -the Ecommerce UiLabel patch - - - - ajzeneski - 2004-03-18 12:04:15 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-04-16 11:50:22 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-16 11:50:22 - resolution - Resolution - - FIXED - - - - 93 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20040416115029 - Order - holivier - not determined - PATCH - 2004-03-16 08:00:55 - issues@ofbiz - - - - All - Simple Update for localization - - - holivier - 2004-03-16 08:00:55 - Order component, some french UiLabels correction - - - holivier - 2004-03-16 08:02:07 - Created an attachment (id=43) -The OrderUilabel properties patch file - - - - jonesde - 2004-04-16 11:50:29 - Patch is in CVS. Thanks for doing these Olivier. - - - text/plain - 43 - 2004-03-16 08:02:07 - The OrderUilabel properties patch file - 1 - OrderUilabelCorrection.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/43/OrderUilabelCorrection.patch - - - holivier - 2004-03-16 08:02:07 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=43) -The OrderUilabel properties patch file - - - - ajzeneski - 2004-03-18 12:04:26 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-04-16 11:50:29 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-16 11:50:29 - resolution - Resolution - - FIXED - - - - 94 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20040416115037 - Party - holivier - not determined - PATCH - 2004-03-16 09:28:27 - issues@ofbiz - - - - All - Simple Update for localization - - - holivier - 2004-03-16 09:28:27 - simple french correction & translation in the Party and workeffort components - - - holivier - 2004-03-16 09:29:26 - Created an attachment (id=44) -the PartyUiLabel correction patch file - - - - holivier - 2004-03-16 09:30:03 - Created an attachment (id=45) -the workeffortUilabel correction patch file - - - - jonesde - 2004-04-16 11:50:37 - Patch is in CVS. Thanks for doing these Olivier. - - - text/plain - 44 - 2004-03-16 09:29:26 - the PartyUiLabel correction patch file - 1 - PartyUiLabelCorrection040316.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/44/PartyUiLabelCorrection040316.patch - - - text/plain - 45 - 2004-03-16 09:30:03 - the workeffortUilabel correction patch file - 1 - WorkeffortUiLabelCorrection040316.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/45/WorkeffortUiLabelCorrection040316.patch - - - holivier - 2004-03-16 09:29:26 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=44) -the PartyUiLabel correction patch file - - - - holivier - 2004-03-16 09:30:03 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=45) -the workeffortUilabel correction patch file - - - - ajzeneski - 2004-03-18 12:04:35 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-04-16 11:50:37 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-16 11:50:37 - resolution - Resolution - - FIXED - - - - 95 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20040416115047 - Product - holivier - not determined - PATCH - 2004-03-16 09:32:59 - issues@ofbiz - - - - All - Simple Update for localization - - - holivier - 2004-03-16 09:32:59 - Product components internationalization and the UiLabel files associated - - - holivier - 2004-03-16 09:36:08 - Created an attachment (id=46) -the patch file for produt bsh, xml, ftl and properties - - - - jonesde - 2004-04-16 11:50:47 - Patch is in CVS. Thanks for doing these Olivier. - - - text/plain - 46 - 2004-03-16 09:36:08 - the patch file for produt bsh, xml, ftl and properties - 1 - ProductUiLabelMigration040316.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/46/ProductUiLabelMigration040316.patch - - - holivier - 2004-03-16 09:36:08 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=46) -the patch file for produt bsh, xml, ftl and properties - - - - ajzeneski - 2004-03-18 12:04:46 - version - Version - Pre3.0.0 - CVS - - - jonesde - 2004-04-16 11:50:47 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-16 11:50:47 - resolution - Resolution - - FIXED - - - - 96 - RESOLVED - P3 - FIXED - Components - CVS - All - jonesde - 20040730204543 - Security Extensions - holivier - not determined - PATCH - 2004-03-16 13:30:49 - issues@ofbiz - - - - All - Typo error correction in emailPassword (bcc in place of cc) - - - holivier - 2004-03-16 13:30:49 - just a simple typo correction.In the emailPassword method when reading and -populated the service fields they was an error. - serviceContext.put("sendBcc", productStoreEmail.get("ccAddress")); -I have change cc to bcc - - - holivier - 2004-03-16 13:31:26 - Created an attachment (id=47) -the patch file - - - - ajzeneski - 2004-07-30 20:45:43 - this has already been fixed in cvs. - - - text/plain - 47 - 2004-03-16 13:31:26 - the patch file - 1 - EmailPassword040316.patch - 165 - holivier - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/47/EmailPassword040316.patch - - - holivier - 2004-03-16 13:31:26 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=47) -the patch file - - - - ajzeneski - 2004-03-18 12:04:54 - version - Version - Pre3.0.0 - CVS - - - ajzeneski - 2004-07-30 20:45:43 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 20:45:43 - resolution - Resolution - - FIXED - - - - 97 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040527234819 - Accounting - jacopo - not determined - DEFECT - 2004-03-18 06:59:56 - issues@ofbiz - - - - All - Error when creating an invoice with billing account payment type. - - - jacopo - 2004-03-18 06:59:56 - The following error is generated when you try to create an invoice for an order -with payment type == billing account: - ----------------------------------------- -803495[ InvoiceServices.java:583:ERROR] Problems storing invoice items -org.ofbiz.entity.GenericEntityException: Exception occurred in storeAll (while i -nserting: [GenericEntity:InvoiceContactMech][createdTxStamp,2004-03-18 15:29:46. -156(java.sql.Timestamp)][invoiceId,10010(java.lang.String)][contactMechPurposeTy -peId,BILLING_LOCATION(java.lang.String)][lastUpdatedTxStamp,2004-03-18 15:29:46. -156(java.sql.Timestamp)][contactMechId,null()][createdStamp,2004-03-18 15:29:46. -977(java.sql.Timestamp)][lastUpdatedStamp,2004-03-18 15:29:46.977(java.sql.Times -tamp)] (SQL Exception while executing the following:INSERT INTO INVOICE_CONTACT_ -MECH (INVOICE_ID, CONTACT_MECH_PURPOSE_TYPE_ID, CONTACT_MECH_ID, LAST_UPDATED_ST -AMP, LAST_UPDATED_TX_STAMP, CREATED_STAMP, CREATED_TX_STAMP) VALUES (?, ?, ?, ?, - ?, ?, ?) ([-5005] (at 83): Missing non-NULL value))) ----------------------------------------- - -I think I've tracked down the source of this problem: -the field contactMechId for the billing account entry in BillingAccount entity -is empty. - - - jacopo - 2004-05-26 10:12:53 - The error happens when no Billing Contact Mechanism is specified in the billing -account. -In order to fix this issue the input field "Billing Contact Mech" in the -EditBillingAccount page should be marked as mandatory. - - - - jonesde - 2004-05-27 23:48:19 - Fixed by changing the code to not try to create that record when the BillingAccount.contactMechId is -empty. - - - jonesde - 2004-05-27 23:48:18 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-27 23:48:18 - resolution - Resolution - - FIXED - - - - 98 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040322173551 - Product - jacopo - not determined - FEATURE - 2004-03-19 07:41:21 - issues@ofbiz - - - - All - New Shipment Plan feature for the shipment process. - - - jacopo - 2004-03-19 07:41:21 - New Shipment Plan feature for the shipment process. - -In order to support some of the tasks in the manufacturing industry there was -the need of some simple shipment planning functionality: we need to assign a -group of customer order items to a scheduled shipment (but without actually -picking and issuing the items from warehouse). - -The patches in the attached zip file add this functionality to the shipment ui. -This is the list of changes: - -NEW FILES (new page, within the shipment ui, for ShipmentPlan management) - -product/webapp/facility/shipment/EditShipmentPlan.ftl -product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh -product/webapp/facility/WEB-INF/pagedefs/shipment/EditShipmentPlan.xml - -PATCHES -product/webapp/facility/shipment/ShipmentTabBar.ftl (added new link to -EditShipmentPlan page) - -product/webapp/facility/shipment/ShipmentForms.xml (some new forms for the -EditShipmentPlan page) - -product/webapp/facility/WEB-INF/controller.xml (controller definitions for the -EditShipmentPlan page) - -product/webapp/facility/shipment/AddItemsFromOrder.ftl (added some info, also -fixed issues #47 and #55) -product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.bsh (added -code to get reservations also from shipment plan) - -product/servicedef/services_shipment.xml (definitions for two new services to -add/delete entries in the Shipment Plan) -product/scripts/org/ofbiz/shipment/shipment/ShipmentSerices.xml (implementation -of the two new services) - -product/entitydef/entitygroup.xml (declaration of the new entity ShipmentPlan) -product/entitydef/entitymodel_shipment.xml (definition of the new entity -ShipmentPlan) - -product/config/ProductUiLabels.properties (some new labels) -product/config/ProductUiLabels_fr.properties (some new labels in ENGLISH) - - - jacopo - 2004-03-19 07:42:41 - Created an attachment (id=48) -The patches and new files - - - - jonesde - 2004-03-22 17:35:51 - This patch is now in place. Thanks for sending it in Jacopo. BTW, for future patches a consolidated -patch file is nice. - - - application/x-compressed - 48 - 2004-03-19 07:42:41 - The patches and new files - - ShipmentPlan.zip - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/48/ShipmentPlan.zip - - - jacopo - 2004-03-19 07:42:41 - attachments.thedata - Attachment Data - - Created an attachment (id=48) -The patches and new files - - - - jonesde - 2004-03-22 17:35:51 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-03-22 17:35:51 - resolution - Resolution - - FIXED - - - - 99 - RESOLVED - P4 - FIXED - Components - CVS - All - issues@ofbiz - 20040806160304 - Product - jacopo - not determined - PATCH - 2004-03-28 01:13:10 - issues@ofbiz - - - - All - New html report that shows inventory availability by product - - - jacopo - 2004-03-28 01:13:10 - This is a new html report (patches are in the attached zip file) for the -Facility Manager Application that shows info about stock levels and -reservations from a product point of view (instead of inventory item). -The action code is very simple (the bsh action calls a service to -compute atp and qoh per product); the report is formatted by the form widget -stuff. -It is not internationalized. -In my local setup I've added a link to it from the Inventory Item page but fell -free to modify it and put it where you want. - - - jacopo - 2004-03-28 01:14:46 - Created an attachment (id=49) -Files and patches for the new report. - - - - jonesde - 2004-08-06 16:03:04 - Okay, this is in CVS, and I added a link to it from the facility inventory items page. Thanks for sending -this over. - - - application/x-compressed - 49 - 2004-03-28 01:14:46 - Files and patches for the new report. - - inventory_report.zip - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/49/inventory_report.zip - - - jacopo - 2004-03-28 01:14:46 - attachments.thedata - Attachment Data - - Created an attachment (id=49) -Files and patches for the new report. - - - - jonesde - 2004-08-06 16:03:04 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-06 16:03:04 - resolution - Resolution - - FIXED - - - - 100 - RESOLVED - P3 - FIXED - Components - REL 3.0.0 - All - issues@ofbiz - 20040403232241 - E-Commerce - dlouzado - not determined - DEFECT - 2004-03-28 13:50:10 - issues@ofbiz - - - - All - crash on Shipping Information page - - - dlouzado - 2004-03-28 13:50:10 - I was logged as "admin" user and buying something on the test store on ofbiz -instance running on a standalone machine (no connection with the internet). - -I was filling the shipping information and when I clicked 'continue' the -following exception was thrown: - - -"org.ofbiz.base.util.GeneralException: JPublish execution error (BeanShell -script error: Sourced file: -C:\jtools\ofbiz\components\ecommerce\webapp\ecommerce\WEB-INF\actions\order\optionsettings.bsh -: Error in method invocation: Attempt to pass void argument (position 0) to -method: getContactMechByType : at Line: 65 : in file: -C:\jtools\ofbiz\components\ecommerce\webapp\ecommerce\WEB-INF\actions\order\optionsettings.bsh -: ContactHelper .getContactMechByType ( party , "EMAIL_ADDRESS" , false ) -BSF info: -C:\jtools\ofbiz\components\ecommerce\webapp\ecommerce\WEB-INF\actions\order\optionsettings.bsh -at line: 0 column: 0)" - - - jonesde - 2004-04-03 23:22:41 - Fixed so that "party" would exist where it is referenced there. - - - jonesde - 2004-04-03 23:22:41 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-03 23:22:41 - resolution - Resolution - - FIXED - - - - 101 - RESOLVED - P5 - FIXED - Components - CVS - All - ajzeneski - 20040730152858 - Content - eckardjf - not determined - DEFECT - 2004-04-02 09:44:46 - issues@ofbiz - - - - All - https Website Settings Ignored - - - eckardjf - 2004-04-02 09:44:46 - org.ofbiz.content.webapp.control.RequestHandler.doRequest() checks to see if a request should be -secure, but is not - and will redirect to a secure url if necessary. However, when rewriting the url to -make it secure, it does not check the website settings for the enableHttps, httpsHost and httpsPort. It -uses the global defaults from url.properties instead, which means the website settings have no effect. - - - ajzeneski - 2004-07-30 15:28:58 - this has now been corrected in CVS. - - - ajzeneski - 2004-06-30 19:43:50 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-07-30 15:28:58 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 15:28:58 - resolution - Resolution - - FIXED - - - - 102 - NEW - P4 - - Components - REL 3.0.0 - All - issues@ofbiz - 20040403233556 - Entity Extensions - jonesde - not determined - ENHANCEMENT - 2004-04-03 23:35:56 - issues@ofbiz - - - - All - Easy way to disabling Entity Sync oriented information - - - jonesde - 2004-04-03 23:35:56 - Need an easy way to disable the saving of Entity Sync oriented information such as the entity remove -information. May not want to disable the auto tx and individual timestamps because they are used in -other code that takes advantage of the fact that they are always present (though we still need to get rid -of the last updated and created timestamps that were added to various entities). - - - - 103 - RESOLVED - P1 - FIXED - Components - CVS - All - ajzeneski - 20040405070601 - Accounting - bryce_nz - not determined - DEFECT - 2004-04-05 00:05:28 - issues@ofbiz - - - - All - Nasty little error in PaymentGatewayServices - - - bryce_nz - 2004-04-05 00:05:28 - In PaymentGatewayServices.refundPayment there is a section of code for creating -the payment for the refund, then at line 1255 there is the following: - - Map result = ServiceUtil.returnSuccess(); - result.put("paymentId", "10000"); - return result; - -Obviously the payment id being returned shouldn't be hardcoded in, should read: - - Map result = ServiceUtil.returnSuccess(); - result.put("paymentId", paymentId); - return result; - - - ajzeneski - 2004-04-05 07:06:01 - This has been corrected in CVS, thank you. - - - ajzeneski - 2004-04-05 07:05:36 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-04-05 07:06:01 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 07:06:01 - resolution - Resolution - - FIXED - - - - 104 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405134511 - Workflow - elfring - not determined - FEATURE - 2004-04-05 13:22:20 - issues@ofbiz - - - - All - Job Definition - - - elfring - 2004-04-05 13:22:20 - This request might fit to the section "Service Engine Tools" on the page -"http://ofbiz.org/feature-list.html". - -Would you like to support the JDF -standard? -http://en.wikipedia.org/wiki/Job_Definition_Format - - - ajzeneski - 2004-04-05 13:45:11 - Not sure what this is supposed to be requesting. This issue contains no specific feature request. - - - ajzeneski - 2004-04-05 13:45:11 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 13:45:11 - resolution - Resolution - - INVALID - - - - 105 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405134741 - Service - elfring - not determined - FEATURE - 2004-04-05 13:28:41 - issues@ofbiz - - - - All - Support for dynamic Service Configuration - - - elfring - 2004-04-05 13:28:41 - Would you like to use a service configurator for your server? -- -http://www.cs.wustl.edu/~schmidt/ACE-papers.html -- -http://java.sun.com/j2se/1.5.0/docs/guide/jmx/tutorial/tutorialTOC.html - -Can this -request solved with JMX? -http://en.wikipedia.org/wiki/Java_Management_eXtensions - - - ajzeneski - 2004-04-05 13:47:41 - This issue contains no specific feature request. Not sure what you are requesting, so there is no way to -determine if JMX will solve the problem. - - - ajzeneski - 2004-04-05 13:47:41 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 13:47:41 - resolution - Resolution - - INVALID - - - - 106 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405134845 - WebTools - elfring - not determined - FEATURE - 2004-04-05 13:42:12 - issues@ofbiz - - - - All - Portlet Interface - - - elfring - 2004-04-05 13:42:12 - Would you like to integrate components with web portals? - -- -http://www.javaworld.com/javaworld/jw-09-2003/jw-0905-portlet2.html -- -http://www.javaworld.net/javaworld/jw-11-2003/jw-1114-jsfredux.html -- -http://en.wikipedia.org/wiki/Portlet - - - ajzeneski - 2004-04-05 13:48:45 - Sure we would love to integrate with web portals, however this issue contains no specific feature -request. - - - ajzeneski - 2004-04-05 13:48:45 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 13:48:45 - resolution - Resolution - - INVALID - - - - 107 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405135106 - WebTools - elfring - not determined - FEATURE - 2004-04-05 13:47:12 - issues@ofbiz - - - - All - Vector graphics and XForms - - - elfring - 2004-04-05 13:47:12 - Will the application support .svgz or .x3dz files that contain XForms? - -- -http://en.wikipedia.org/wiki/Scalable_Vector_Graphics -- -http://en.wikipedia.org/wiki/X3D -- http://en.wikipedia.org/wiki/XForms -- -http://xml.apache.org/batik/ - -See also the request "XForms" in the discussion forum by -Britton LaRoche from "August 28, 2003 12:38:36 AM -GMT". -https://ofbiz.dev.java.net/servlets/ProjectForumMessageView?forumID=282&messageID=1065 - - - ajzeneski - 2004-04-05 13:51:06 - This issue contains no specific feature request. No information was provided regarding how support for -these file types is desired and where the desired functionality is needed. - - - ajzeneski - 2004-04-05 13:51:06 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 13:51:06 - resolution - Resolution - - INVALID - - - - 108 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405140048 - Rules - elfring - not determined - FEATURE - 2004-04-05 13:51:31 - issues@ofbiz - - - - All - Integration with Knowledge Representation - - - elfring - 2004-04-05 13:51:31 - What is the current state of your support for this technology? -- -http://en.wikipedia.org/wiki/Knowledge_representation -- -http://en.wikipedia.org/wiki/Expert_system - - - ajzeneski - 2004-04-05 14:00:48 - This issue is not a valid feature request, questions of this sort should be discussed on the mailing lists. -In addition, do expect readers to follow links and read articles to get your point across it is highly -unlikely that people will spent the time to research something for you. Your best bet is to read the -articles and post a question asking something specific, then your chances of getting an intelligent -response is greater. - - - ajzeneski - 2004-04-05 14:00:48 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 14:00:48 - resolution - Resolution - - INVALID - - - - 109 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405140138 - Service - elfring - not determined - FEATURE - 2004-04-05 13:52:57 - issues@ofbiz - - - - All - Open Services Gateway - - - elfring - 2004-04-05 13:52:57 - Would you like to cooperate with these service APIs so that your software can be used over these -interfaces? -http://www.osgi.org/about/faqs.asp -http://en.wikipedia.org/wiki/OSGi - - - ajzeneski - 2004-04-05 14:01:37 - This issue contains no specific feature request. - - - ajzeneski - 2004-04-05 14:01:37 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 14:01:37 - resolution - Resolution - - INVALID - - - - 110 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405140228 - Entity - elfring - not determined - FEATURE - 2004-04-05 13:56:20 - issues@ofbiz - - - - All - Content Storage API - - - elfring - 2004-04-05 13:56:20 - Would you like to support the programming interface "Content -Repository"? -http://jcp.org/en/jsr/detail?id=170 - -This topic can be perhaps combined -with requests for CVS and Subversion integration. - - - ajzeneski - 2004-04-05 14:02:28 - This issue contains no specific feature request; please see issue #108 for more suggestions. - - - ajzeneski - 2004-04-05 14:02:28 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 14:02:28 - resolution - Resolution - - INVALID - - - - 111 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405140305 - Workflow - elfring - not determined - ENHANCEMENT - 2004-04-05 14:02:16 - issues@ofbiz - - - - All - Workflow Management - - - elfring - 2004-04-05 14:02:17 - How do you think about workflow modelling patterns? -Which of them are supported by your -software? (Is cooperation with other standards like BPML besides WfMC XPDL -possible?) -http://tmitwww.tm.tue.nl/research/patterns/ - - - ajzeneski - 2004-04-05 14:03:05 - see issue #108 - - - ajzeneski - 2004-04-05 14:03:05 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 14:03:05 - resolution - Resolution - - INVALID - - - - 112 - RESOLVED - P3 - INVALID - Components - CVS - All - issues@ofbiz - 20040405141257 - Entity Extensions - elfring - not determined - ENHANCEMENT - 2004-04-05 14:07:40 - issues@ofbiz - - - - All - relationships and object mapping - - - elfring - 2004-04-05 14:07:40 - I've got the impression from the discussion about the topic "entity-engine: thoughts on extends -(IS A) pattern and relationships" that there might be something useful from other information -sources. - -1. CORBA: Relationship Service -Specification -http://www.omg.org/technology/documents/formal/relationship_service.htm - -2. -ObJectRelationalBridge -http://db.apache.org/ojb/ - -3. alternative open source -implementation for JDO -http://speedo.objectweb.org/ - -4. Citations from -CiteSeer -http://citeseer.ist.psu.edu/cis?q=object+and+relational+and+mapping+and+database - -5. -a detailed Wiki -http://en.wikipedia.org/wiki/Object_database - -Would you like to reuse -anything from those implementations and experiences? - -How does your use of the Java Open -Transaction Manager (http://jotm.objectweb.org/) fit into this picture? - - - ajzeneski - 2004-04-05 14:12:57 - No specific enhancement requested. - - - ajzeneski - 2004-04-05 14:12:57 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-04-05 14:12:57 - resolution - Resolution - - INVALID - - - - 113 - RESOLVED - P3 - WORKSFORME - Components - CVS - All - issues@ofbiz - 20040406101817 - WebTools - ajzeneski - not determined - DEFECT - 2004-04-06 07:00:29 - issues@ofbiz - - - - All - EditEntity.jsp displays wrong field length - - - ajzeneski - 2004-04-06 07:00:29 - Reported by prozelit@yahoo.com: - -On EditEntity.jsp, there is a fields table. It is -supposed to display the length of each field, but it -looks like it displays the length of the field name -instead. It seems to me there is a bug at line 347. - - - jonesde - 2004-04-06 10:18:17 - -This is the expected behavior. The length in parenthesis there is meant to show you the length of the -column name so that you can tell if it is within the required length of the database, we generally -recommend (and always use) equal or less than 30 characters. - - - jonesde - 2004-04-06 10:18:17 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-06 10:18:17 - resolution - Resolution - - WORKSFORME - - - - 114 - NEW - P3 - - Components - CVS - PC - issues@ofbiz - 20040406100126 - WorkEffort - vivalinux - not determined - PATCH - 2004-04-06 10:01:26 - issues@ofbiz - - http://<ofbiz_URL>/workeffort/control/month?start=1083297600000 - - All - Daylight savings and the calendar - - - vivalinux - 2004-04-06 10:01:26 - On the months when daylight savings takes place, or stops taking place -(April/September in the US), the way the start of the period is computed in the -WorkEffortServices.getWorkEffortsByPeriod yields one extra hour after dayligh -savings kicks in. -The reason for this is that the absolute time is interpreted differently once -daylight savings is in place. -So I suggest using the attached patch which relies on UtilDateTime.getDayStart -to get the period start/end. - - - - 115 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040730150719 - Product - lykins - not determined - FEATURE - 2004-04-06 13:56:51 - issues@ofbiz - - - - All - Product to Order Lookup Link - - - lykins - 2004-04-06 13:56:51 - Something that should bring great benefit is the ability to link the product to -the orders from the product maintenance screen. It would be very beneficial to -know what purchase order the product came from. I noticed that there are links -to almost all other relations besides this. - -Thanks, -Patrick - - - ajzeneski - 2004-07-30 15:07:19 - good idea; now in CVS - - - ajzeneski - 2004-07-30 15:07:19 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 15:07:19 - resolution - Resolution - - FIXED - - - - 116 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040417174533 - Product - jacopo - not determined - PATCH - 2004-04-17 00:19:59 - issues@ofbiz - - - - All - Implementation of getProductVariant service. - - - jacopo - 2004-04-17 00:19:59 - Implementation of getProductVariant service. - - - jacopo - 2004-04-17 00:20:48 - Created an attachment (id=50) -Patch for the java implementation - - - - jacopo - 2004-04-17 00:21:21 - Created an attachment (id=51) -Patch for the service definition. - - - - jonesde - 2004-04-17 17:45:33 - It's in. Thanks Jacopo. - - - text/plain - 50 - 2004-04-17 00:20:48 - Patch for the java implementation - 1 - ProductServices.java.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/50/ProductServices.java.patch - - - text/plain - 51 - 2004-04-17 00:21:21 - Patch for the service definition. - 1 - services.xml.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/51/services.xml.patch - - - jacopo - 2004-04-17 00:20:48 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=50) -Patch for the java implementation - - - - jacopo - 2004-04-17 00:21:21 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=51) -Patch for the service definition. - - - - jonesde - 2004-04-17 17:45:33 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-17 17:45:33 - resolution - Resolution - - FIXED - - - - 117 - RESOLVED - P1 - FIXED - Components - CVS - All - issues@ofbiz - 20040422201817 - Accounting - colt_nz - not determined - DEFECT - 2004-04-20 14:45:56 - issues@ofbiz - - - - All - editPayment has wrongly named fields - - - colt_nz - 2004-04-20 14:45:56 - /accounting/webapp/accounting/payment/editPayment.ftl - -Input fields partyIdTo and partyIdFrom are round the wrong way. ie switch 'em. - - - jonesde - 2004-04-22 20:18:17 - -Thanks for reporting this, the fix is in CVS. Looks like it was perhaps an issue with the i18n... - - - jonesde - 2004-04-22 20:18:17 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-22 20:18:17 - resolution - Resolution - - FIXED - - - - 118 - RESOLVED - P4 - FIXED - Components - CVS - All - issues@ofbiz - 20040819001212 - Product - jonesde - not determined - FEATURE - 2004-04-23 21:32:35 - issues@ofbiz - - - - All - Make QuickAddVariants Easier to Use - - - jonesde - 2004-04-23 21:32:35 - Make QuickAddVariants Easier to Use: - -1. Change to multi-form -2. Allow enter pattern to use to pre-populate the various IDs - - - jacopo - 2004-08-19 00:12:11 - Some time ago I did this and you put all the stuff in CVS, so now it's done. - - - jacopo - 2004-08-19 00:12:10 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-08-19 00:12:10 - resolution - Resolution - - FIXED - - - - 119 - RESOLVED - P2 - FIXED - Components - CVS - All - jacopo - 20040717041328 - Manufacturing - jacopo - not determined - ENHANCEMENT - 2004-04-24 00:15:36 - issues@ofbiz - - - - All - Refactoring of the BOMEvent class that manages all the related to bill of materials editing. - - - jacopo - 2004-04-24 00:15:36 - Refactoring of the BOMEvent class that manages all the related to bill of -materials editing. - -Three new (simple) services should be created (create, update, delete). -An sECA rule should be added to the create and update services to update the -low level code. - - - jacopo - 2004-07-17 04:13:28 - Ok, the BOMEvent class has gone away; I have implemented some simple services -to add/update/remove/copy boms (performing all the needed checks for loops and -updating the product's llc). - - - - jacopo - 2004-07-17 04:13:28 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-17 04:13:28 - resolution - Resolution - - FIXED - - - - 120 - NEW - P3 - - Components - CVS - All - jacopo - 20040424001903 - Manufacturing - jacopo - not determined - ENHANCEMENT - 2004-04-24 00:19:03 - issues@ofbiz - - - - All - searchDuplicateAncenstor service should resolve also virtual to variant products to search for loops. - - - jacopo - 2004-04-24 00:19:03 - searchDuplicateAncenstor service should resolve also virtual to variant -products to search for loops. - - - - 121 - RESOLVED - P3 - FIXED - Components - CVS - All - jacopo - 20040717041557 - Manufacturing - jacopo - not determined - ENHANCEMENT - 2004-04-24 00:24:11 - issues@ofbiz - - - - All - Refactoring of the Bill of Material editor's ui: migration to the forms widget. - - - jacopo - 2004-04-24 00:24:11 - Refactoring of the Bill of Material editor's ui: migration to the forms widget. - -This will also include: -- i18n and l10n issues -- management of all the relavant fields that are missing -- lookup fields -- fields validation - - - jacopo - 2004-07-17 04:15:57 - I have not used the form widget (maybe in the future, together with some more -clean ups) here, but most of these points has been fixed. - - - jacopo - 2004-07-17 04:15:57 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-17 04:15:57 - resolution - Resolution - - FIXED - - - - 122 - NEW - P3 - - Components - CVS - All - jacopo - 20040424002537 - Manufacturing - jacopo - not determined - ENHANCEMENT - 2004-04-24 00:25:37 - issues@ofbiz - - - - All - updateLowLevelCode service - it should also update the low level code for variant products - - - jacopo - 2004-04-24 00:25:37 - updateLowLevelCode service - it should also update the low level code for -variant products - - - - 123 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501062848 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:05:20 - issues@ofbiz - - - - All - Add methods to check against classes, instead of only objects. - - - doogie - 2004-04-29 16:05:20 - This patch adds new versions of interfaceOf, isOrSubOf, and instanceOf, that -check against a class, instead of an Object. - - - doogie - 2004-04-29 16:06:57 - Created an attachment (id=52) -The patch. - - - - doogie - 2004-04-29 19:57:52 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:28:48 - This is now in CVS, thanks Adam! - - - text/plain - 52 - 2004-04-29 16:06:57 - The patch. - 1 - ObjectType-check-against-class.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/52/ObjectType-check-against-class.patch - - - doogie - 2004-04-29 16:06:57 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=52) -The patch. - - - - doogie - 2004-04-29 16:15:14 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - doogie - 2004-04-29 19:57:52 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:28:48 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:28:48 - resolution - Resolution - - FIXED - - - - 124 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501062855 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:08:48 - issues@ofbiz - - - - All - Handle is-* operators when value1 is null - - - doogie - 2004-04-29 16:08:48 - See $summary. - - - doogie - 2004-04-29 16:09:11 - Created an attachment (id=53) -The patch - - - - doogie - 2004-04-29 19:57:53 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:28:55 - This is now in CVS, thanks Adam! - - - text/plain - 53 - 2004-04-29 16:09:11 - The patch - 1 - ObjectType-is-compare-value1-null.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/53/ObjectType-is-compare-value1-null.patch - - - doogie - 2004-04-29 16:09:11 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=53) -The patch - - - - doogie - 2004-04-29 16:15:14 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - doogie - 2004-04-29 19:57:53 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:28:55 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:28:55 - resolution - Resolution - - FIXED - - - - 125 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501062903 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:10:04 - issues@ofbiz - - - - All - Convert classnames to full names. - - - doogie - 2004-04-29 16:10:04 - See $summary. - - - doogie - 2004-04-29 16:10:21 - Created an attachment (id=54) -The patch. - - - - doogie - 2004-04-29 19:57:48 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:29:03 - This is now in CVS, thanks Adam! - - - text/plain - 54 - 2004-04-29 16:10:21 - The patch. - 1 - ObjectType-convert-classname-to-full.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/54/ObjectType-convert-classname-to-full.patch - - - doogie - 2004-04-29 16:10:21 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=54) -The patch. - - - - doogie - 2004-04-29 16:15:13 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - doogie - 2004-04-29 19:57:48 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:29:03 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:29:03 - resolution - Resolution - - FIXED - - - - 126 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501062243 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:13:25 - issues@ofbiz - - - - All - Add some helper methods for objects implementing their own equals, compareTo, and hashCode - - - doogie - 2004-04-29 16:13:25 - Name: UtilObject.patch -Prune: 1 -Description: Add some helper methods for objects implementing their own equals, -compareTo, and hashCode. -DiffStat: - base/src/base/org/ofbiz/base/util/UtilObject.java | 35 ++++++++++++++++++++++ - 1 files changed, 35 insertions(+) - - - doogie - 2004-04-29 16:13:45 - Created an attachment (id=55) -The patch. - - - - doogie - 2004-04-29 19:57:49 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:22:43 - This is now in CVS, thanks Adam! - - - text/plain - 55 - 2004-04-29 16:13:45 - The patch. - 1 - UtilObject.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/55/UtilObject.patch - - - doogie - 2004-04-29 16:13:45 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=55) -The patch. - - - - doogie - 2004-04-29 16:15:13 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - doogie - 2004-04-29 19:57:49 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:22:43 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:22:43 - resolution - Resolution - - FIXED - - - - 127 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501055554 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:18:14 - issues@ofbiz - - - - All - Simplify the top-level build.xml - - - doogie - 2004-04-29 16:18:14 - Name: simpler-build.xml.patch -Prune: 1 -Description: Simplifies the top-level build.xml - This patch makes use of ant 1.6 features, to automate calling of sub - build.xmls. It also adds a 'test' target; note, however, that the - listed sub build.xmls don't actually have that test target yet. -DiffStat: - build.xml | 494 ++++---------------------------------------------------------- - 1 files changed, 32 insertions(+), 462 deletions(-) - - - doogie - 2004-04-29 16:18:43 - Created an attachment (id=56) -The patch. - - - - doogie - 2004-04-29 19:57:50 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 05:55:54 - This is now in, thanks Adam! - - - text/plain - 56 - 2004-04-29 16:18:43 - The patch. - 1 - simpler-build.xml.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/56/simpler-build.xml.patch - - - doogie - 2004-04-29 16:18:43 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=56) -The patch. - - - - doogie - 2004-04-29 16:19:44 - issue_type - Issue Type - DEFECT - ENHANCEMENT - - - doogie - 2004-04-29 19:57:50 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 05:55:54 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 05:55:54 - resolution - Resolution - - FIXED - - - - 128 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501051820 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:20:39 - issues@ofbiz - - - - All - Add support for formatting time intervals with human words - - - doogie - 2004-04-29 16:20:39 - Name: UtilDateTime-time-interval.patch -Prune: 1 -Description: Add support for formatting time intervals with human words -DiffStat: - base/config/DateTimeLabels.properties | 10 ++ - base/src/base/org/ofbiz/base/util/UtilDateTime.java | 90 ++++++++++++++++++++ - 2 files changed, 100 insertions(+) - - - doogie - 2004-04-29 16:20:57 - Created an attachment (id=57) -The patch. - - - - doogie - 2004-04-29 19:57:51 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 05:18:20 - These are now in CVS, thanks Adam! - - - text/plain - 57 - 2004-04-29 16:20:57 - The patch. - 1 - UtilDateTime-time-interval.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/57/UtilDateTime-time-interval.patch - - - doogie - 2004-04-29 16:20:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=57) -The patch. - - - - doogie - 2004-04-29 19:57:51 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 05:18:20 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 05:18:20 - resolution - Resolution - - FIXED - - - - 129 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429172414 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:22:10 - issues@ofbiz - - - - All - Add more childElementList and firstChildElement variants. - - - doogie - 2004-04-29 16:22:10 - Name: UtilXml-childElementList-firstChildElement.patch -Prune: 1 -Depends: UtilXml-writeElement.patch -Description: Add more childElementList and firstChildElement variants. -DiffStat: - base/src/base/org/ofbiz/base/component/ComponentLoaderConfig.java - | 2 - base/src/base/org/ofbiz/base/util/UtilXml.java - | 80 ++++++++++ - components/content/src/org/ofbiz/content/widget/form/ModelFormField.java - | 4 - components/entity/src/org/ofbiz/entity/model/ModelViewEntity.java - | 2 - components/minilang/src/org/ofbiz/minilang/SimpleMethod.java - | 2 - components/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java - | 2 - components/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java - | 2 - components/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java - | 2 - components/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java -| 2 - components/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java - | 2 - components/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java - | 4 - components/minilang/src/org/ofbiz/minilang/method/otherops/Log.java - | 2 - components/minilang/src/org/ofbiz/minilang/operation/MakeInString.java - | 2 - components/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java - | 2 - 14 files changed, 95 insertions(+), 15 deletions(-) - - - doogie - 2004-04-29 16:22:50 - Created an attachment (id=58) -The patch. - - - - doogie - 2004-04-29 16:57:47 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:24:14 - Now in CVS, thanks Adam. - - - text/plain - 58 - 2004-04-29 16:22:50 - The patch. - 1 - UtilXml-childElementList-firstChildElement.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/58/UtilXml-childElementList-firstChildElement.patch - - - doogie - 2004-04-29 16:22:50 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=58) -The patch. - - - - doogie - 2004-04-29 16:57:47 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:24:14 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:24:14 - resolution - Resolution - - FIXED - - - - 130 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429174623 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:24:36 - issues@ofbiz - - - - All - put now returns the previous value of the object, if it exists - - - doogie - 2004-04-29 16:24:36 - Name: UtilCache-put-returns-object.patch -Prune: 1 -Depends: UtilCache-listeners.patch -Description: put now returns the previous value of the object, if it exists -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - - - doogie - 2004-04-29 16:24:58 - Created an attachment (id=59) -The patch. - - - - doogie - 2004-04-29 16:57:48 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:46:23 - Now in CVS, thanks Adam. - - - text/plain - 59 - 2004-04-29 16:24:58 - The patch. - 1 - UtilCache-put-returns-object.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/59/UtilCache-put-returns-object.patch - - - doogie - 2004-04-29 16:24:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=59) -The patch. - - - - doogie - 2004-04-29 16:57:48 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:46:23 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:46:23 - resolution - Resolution - - FIXED - - - - 131 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040429174619 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 16:55:31 - issues@ofbiz - - - - All - Add getCacheLineKeys method. - - - doogie - 2004-04-29 16:55:31 - Name: UtilCache-getCacheLineKeys.patch -Prune: 1 -Depends: UtilCache-put-returns-object.patch -Description: Add getCacheLineKeys method. -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 4 ++++ - 1 files changed, 4 insertions(+) - - - doogie - 2004-04-29 16:55:56 - Created an attachment (id=60) -The patch. - - - - doogie - 2004-04-29 16:57:48 - Changing priority to P2, as I need these applied before I can commit my entity -cache work. - - - jonesde - 2004-04-29 17:46:19 - Now in CVS, thanks Adam. - - - text/plain - 60 - 2004-04-29 16:55:56 - The patch. - 1 - UtilCache-getCacheLineKeys.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/60/UtilCache-getCacheLineKeys.patch - - - doogie - 2004-04-29 16:55:56 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=60) -The patch. - - - - doogie - 2004-04-29 16:57:48 - priority - Priority - P3 - P2 - - - jonesde - 2004-04-29 17:46:19 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-04-29 17:46:19 - resolution - Resolution - - FIXED - - - - 132 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501051751 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 19:39:13 - issues@ofbiz - - - - All - Add entrySet(), which functions like Map.entrySet(). - - - doogie - 2004-04-29 19:39:13 - Name: UtilCache-entrySet.patch -Prune: 1 -Description: Add entrySet(), which functions like Map.entrySet(). -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 4 ++++ - 1 files changed, 4 insertions(+) - - - doogie - 2004-04-29 19:41:28 - Created an attachment (id=61) -The patch. - - - - doogie - 2004-04-29 19:57:53 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 05:17:51 - These are now in CVS, thanks Adam! - - - text/plain - 61 - 2004-04-29 19:41:27 - The patch. - 1 - UtilCache-entrySet.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/61/UtilCache-entrySet.patch - - - doogie - 2004-04-29 19:41:28 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=61) -The patch. - - - - doogie - 2004-04-29 19:57:53 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 05:17:51 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 05:17:51 - resolution - Resolution - - FIXED - - - - 133 - RESOLVED - P1 - FIXED - Base - CVS - All - issues@ofbiz - 20040501042628 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 19:42:19 - issues@ofbiz - - - - All - Add a new constructor. - - - doogie - 2004-04-29 19:42:19 - Name: UtilCache-new-constructor.patch -Prune: 1 -Depends: UtilCache-entrySet.patch -Description: Add a new constructor. -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 13 +++++++++++++ - 1 files changed, 13 insertions(+) - - - doogie - 2004-04-29 19:42:45 - Created an attachment (id=62) -The patch. - - - - doogie - 2004-04-29 19:57:48 - Changing priority, so that someone else can see the ones I want applied next. - - - doogie - 2004-04-30 10:42:15 - Changing these issuses, as they are needed by EntityCache.patch. - - - jonesde - 2004-05-01 04:26:28 - These are now in CVS, thanks Adam! - - - text/plain - 62 - 2004-04-29 19:42:45 - The patch. - 1 - UtilCache-new-constructor.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/62/UtilCache-new-constructor.patch - - - doogie - 2004-04-29 19:42:45 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=62) -The patch. - - - - doogie - 2004-04-29 19:57:48 - priority - Priority - P3 - P2 - - - doogie - 2004-04-30 10:42:15 - priority - Priority - P2 - P1 - - - jonesde - 2004-05-01 04:26:28 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 04:26:28 - resolution - Resolution - - FIXED - - - - 134 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501062248 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 19:43:49 - issues@ofbiz - - - - All - Change utilCacheTable to a WeakHashMap. - - - doogie - 2004-04-29 19:43:49 - Name: UtilCache-WeakHashMap.patch -Prune: 1 -Depends: UtilCache-new-constructor.patch -Description: Change utilCacheTable to a WeakHashMap. -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) - - - doogie - 2004-04-29 19:44:39 - Created an attachment (id=63) -The patch. - - - - doogie - 2004-04-29 19:57:49 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:22:48 - This is now in CVS, thanks Adam! - - - text/plain - 63 - 2004-04-29 19:44:39 - The patch. - 1 - UtilCache-WeakHashMap.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/63/UtilCache-WeakHashMap.patch - - - doogie - 2004-04-29 19:44:39 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=63) -The patch. - - - - doogie - 2004-04-29 19:57:49 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:22:48 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:22:48 - resolution - Resolution - - FIXED - - - - 135 - RESOLVED - P1 - FIXED - Base - CVS - All - issues@ofbiz - 20040501042633 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 19:45:22 - issues@ofbiz - - - - All - Methods that clear a cache by name or pattern. - - - doogie - 2004-04-29 19:45:22 - Name: UtilCache-clearCache-helpers.patch -Prune: 1 -Depends: UtilCache-WeakHashMap.patch -Description: Methods that clear a cache by name or pattern. -DiffStat: - base/src/base/org/ofbiz/base/util/UtilCache.java | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+) - - - doogie - 2004-04-29 19:45:43 - Created an attachment (id=64) -The patch. - - - - doogie - 2004-04-29 19:57:49 - Changing priority, so that someone else can see the ones I want applied next. - - - doogie - 2004-04-30 10:42:16 - Changing these issuses, as they are needed by EntityCache.patch. - - - jonesde - 2004-05-01 04:26:33 - These are now in CVS, thanks Adam! - - - text/plain - 64 - 2004-04-29 19:45:43 - The patch. - 1 - UtilCache-clearCache-helpers.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/64/UtilCache-clearCache-helpers.patch - - - doogie - 2004-04-29 19:45:43 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=64) -The patch. - - - - doogie - 2004-04-29 19:57:49 - priority - Priority - P3 - P2 - - - doogie - 2004-04-30 10:42:16 - priority - Priority - P2 - P1 - - - jonesde - 2004-05-01 04:26:33 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 04:26:33 - resolution - Resolution - - FIXED - - - - 136 - RESOLVED - P2 - FIXED - Base - CVS - All - issues@ofbiz - 20040501064335 - Base - doogie - not determined - ENHANCEMENT - 2004-04-29 19:46:54 - issues@ofbiz - - - - All - Place the loaded document object in a UtilCache instance. - - - doogie - 2004-04-29 19:46:54 - Name: ResourceLoader-document-in-cache.patch -Prune: 1 -Depends: UtilCache-clearCache-helpers.patch -Description: Place the loaded document object in a UtilCache instance. -DiffStat: - base/src/base/org/ofbiz/base/config/ResourceLoader.java | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - - - doogie - 2004-04-29 19:47:17 - Created an attachment (id=65) -The patch. - - - - doogie - 2004-04-29 19:57:50 - Changing priority, so that someone else can see the ones I want applied next. - - - jonesde - 2004-05-01 06:43:35 - This is now in CVS, thanks Adam! - - - text/plain - 65 - 2004-04-29 19:47:17 - The patch. - 1 - ResourceLoader-document-in-cache.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/65/ResourceLoader-document-in-cache.patch - - - doogie - 2004-04-29 19:47:17 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=65) -The patch. - - - - doogie - 2004-04-29 19:57:50 - priority - Priority - P3 - P2 - - - jonesde - 2004-05-01 06:43:35 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-01 06:43:35 - resolution - Resolution - - FIXED - - - - 137 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040527233355 - Accounting - sichen - not determined - DEFECT - 2004-05-03 14:48:41 - issues@ofbiz - - - - All - createInvoiceForOrder not get correct fields for terms - - - 141 - jacopo - 2004-05-26 10:48:21 - - - sichen - 2004-05-03 14:48:41 - InvoiceServices.createInvoiceForOrder is not getting correct fields for terms. -It is not automatically generating a key for InvoiceTerm entity and is also -looking for "termType" from BillingAccount when the field is actually "termTypeId." - - - sichen - 2004-05-03 14:50:09 - Created an attachment (id=66) -Patch fixes defect and allows invoices to be created correctly - - - - jacopo - 2004-05-04 00:50:17 - See also issue #97 - - - jacopo - 2004-05-26 10:48:20 - *** Issue 141 has been marked as a duplicate of this issue. *** - - - jonesde - 2004-05-27 23:33:55 - It's now in CVS, thanks to both Si Chen and Jacopo Cappellato for reporting/fixing this. - - - text/plain - 66 - 2004-05-03 14:50:09 - Patch fixes defect and allows invoices to be created correctly - 1 - InvoiceServices.java.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/66/InvoiceServices.java.patch - - - sichen - 2004-05-03 14:50:09 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=66) -Patch fixes defect and allows invoices to be created correctly - - - - jonesde - 2004-05-03 23:03:12 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - jonesde - 2004-05-27 23:33:55 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-05-27 23:33:55 - resolution - Resolution - - FIXED - - - - 138 - RESOLVED - P3 - WORKSFORME - Components - CVS - All - issues@ofbiz - 20040713022331 - Manufacturing - sichen - not determined - DEFECT - 2004-05-04 17:45:50 - issues@ofbiz - - - - Windows XP - Null delegator in FindProductRun - - - sichen - 2004-05-04 17:45:50 - I am getting a -4269781[ VisitHandler.java:130:ERROR] Could not find delegator with -delegatorName [null] in session, not creating Visit entity - -Is this a Windows problem or a bug? - -Thanks, - -Si Chen - - - sichen - 2004-05-04 17:46:33 - Created an attachment (id=67) -error log from running FindProductRun in Manufacturing - - - - jacopo - 2004-07-13 02:23:31 - I couldn't recreate this error. -However, from the log it seems something related to the Visit stuff. - - - text/plain - 67 - 2004-05-04 17:46:33 - error log from running FindProductRun in Manufacturing - - findproductrun.log - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/67/findproductrun.log - - - sichen - 2004-05-04 17:46:33 - attachments.thedata - Attachment Data - - Created an attachment (id=67) -error log from running FindProductRun in Manufacturing - - - - jacopo - 2004-07-13 02:23:31 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-13 02:23:31 - resolution - Resolution - - WORKSFORME - - - - 139 - NEW - P3 - - Components - CVS - All - david - 20040509064322 - E-Commerce - arukala - not determined - FEATURE - 2004-05-09 06:43:22 - issues@ofbiz - - - - All - Reading UiLable Properties in Email templates - - - arukala - 2004-05-09 06:43:22 - Hallo David, - -We are looking for your suggestions. on how should i call the UiLabel -Properties in eCommerce Email Templates. we are eager to see this feature in -email Confirmation after placing an order for customers?. suggest us how to? - - - - 140 - RESOLVED - P3 - FIXED - Components - CVS - All - jacopo - 20040518040000 - Manufacturing - jacopo - not determined - ENHANCEMENT - 2004-05-11 08:26:52 - issues@ofbiz - - - - All - Remove all the checks against the isVariant field. - - - jacopo - 2004-05-11 08:26:52 - Remove all the checks against the isVariant field: the best way to see if a -product is variant is to check the ProductAssoc entity. - - - jacopo - 2004-05-18 04:00:00 - Committed with the last changes a few days ago. - - - jacopo - 2004-05-18 04:00:00 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-05-18 04:00:00 - resolution - Resolution - - FIXED - - - - 141 - RESOLVED - P3 - DUPLICATE - Components - CVS - All - issues@ofbiz - 20040526104821 - Accounting - jacopo - not determined - PATCH - 2004-05-26 09:01:42 - issues@ofbiz - - - - All - Patch for bug in invoice creation when terms are specified for a billing account. - - - 137 - jacopo - 2004-05-26 10:48:21 - - - jacopo - 2004-05-26 09:01:42 - Patch for bug in invoice creation when terms are specified for billing account: -A wrong field name was used. -Also a non-null field was not set. - - - jacopo - 2004-05-26 09:02:49 - Created an attachment (id=68) -The patch file in UOF - - - - jacopo - 2004-05-26 10:48:21 - Ok, Si Chen had already fixed this!!! - -*** This issue has been marked as a duplicate of 137 *** - - - text/plain - 68 - 2004-05-26 09:02:49 - The patch file in UOF - 1 - InvoiceServices.java.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/68/InvoiceServices.java.patch - - - jacopo - 2004-05-26 09:02:49 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=68) -The patch file in UOF - - - - jacopo - 2004-05-26 10:48:21 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-05-26 10:48:21 - resolution - Resolution - - DUPLICATE - - - - 142 - RESOLVED - P3 - FIXED - Components - CVS - PC - ajzeneski - 20040630194530 - Party - jackhung - not determined - DEFECT - 2004-06-15 03:33:20 - issues@ofbiz - - - - Linux - Party Profile [New Communication] throws exception - - - jackhung - 2004-06-15 03:33:20 - Error: The application script threw an exception: Sourced file: -/mnt/hda6/jackwork/ofbiz3/workspace/ofbiz/components/party/webapp/partymgr/WEB-INF/actions/communication/editCommunication.bsh -: null : at Line: 47 : in file: -/mnt/hda6/jackwork/ofbiz3/workspace/ofbiz/components/party/webapp/partymgr/WEB-INF/actions/communication/editCommunication.bsh -: party .getRelatedOne ( "Person" ) Target exception: -java.lang.NullPointerException: Null Pointer in Method Invocation BSF info: -/mnt/hda6/jackwork/ofbiz3/workspace/ofbiz/components/party/webapp/partymgr/WEB-INF/actions/communication/editCommunication.bsh -at line: 0 column: 0 - - -URL: https://jhpc:18443/partymgr/control/viewCommunicationEvent?partyIdFrom=ltdadmin - -partyId = request.getParameter("party_id"); -... -party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)); -context.put("party", party); -context.put("lookupPerson", party.getRelatedOne("Person")); <--- - - - ajzeneski - 2004-06-30 19:45:30 - This has been fixed in CVS - - - jonesde - 2004-06-15 03:39:27 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-06-30 19:45:30 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:45:30 - resolution - Resolution - - FIXED - - - - 143 - NEW - P3 - - Components - CVS - All - ajzeneski - 20040630194322 - Order - sichen - not determined - FEATURE - 2004-06-17 10:51:48 - issues@ofbiz - - - - All - Allows orders to have shipBeforeDate and shipAfterDate - - - sichen - 2004-06-17 10:51:48 - Changed ShoppingCart.java and CheckoutHelper.java to allow ship before and -after dates to be set using the OrderShipmentPreference entity. -OrderServices.java is modified as well to allow these dates to go on the order -confirmation email. - - - sichen - 2004-06-17 10:53:16 - Created an attachment (id=69) -Patches ShoppingCart.java, CheckoutHelper.java, OrderServices.java, - - - - text/plain - 69 - 2004-06-17 10:53:16 - Patches ShoppingCart.java, CheckoutHelper.java, OrderServices.java, - 1 - order_dating_patch.txt - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/69/order_dating_patch.txt - - - sichen - 2004-06-17 10:53:16 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=69) -Patches ShoppingCart.java, CheckoutHelper.java, OrderServices.java, - - - - ajzeneski - 2004-06-30 19:43:22 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - ajzeneski - 2004-06-30 19:43:22 - short_desc - Summary - Allows orders to have shipBeforeDate and shipAfterDate - Allows orders to have shipBeforeDate and shipAfterDate - - - - 144 - RESOLVED - P3 - WORKSFORME - Base - CVS - PC - issues@ofbiz - 20040630194017 - Base - jackhung - not determined - DEFECT - 2004-06-18 02:57:10 - issues@ofbiz - - - - Linux - https connection broke Mozilla 1.3 and 1.4 - - - jackhung - 2004-06-18 02:57:10 - I'm getting a strange problem lately (2 days). I'm at the ecommerce's main page -and try to [Login] (url -https://www.myhost.net:8443/ecommerce/control/checkLogin/main). The -certification stuff comes up and I accepted it. On one of my system using -Mozilla 1.3, the browser popup a dialog saying: - "www.myhost.net has received an incorrect or unexpected message. Error Code: --12229" -For all subsequent attempt, the browser popup a dialog saying: - "The Document contains no data" -It appears that the browser is not sending any request to the server on -subsequent attempt. - -On another system using Mozilla 1.4, i did not get the "unexpected message", but -still got the "no data" one. - -I have an Crozilla 1.3a browser around (from the Mozilla SVG project). I tried -it and it works!! - -As a matter of fact, i'm having the same problem with any of the secure -components (webtools, partymgr, ...) - - - ajzeneski - 2004-06-30 19:40:17 - I cannot duplicate this issue with FireFox. It could be a bug in that version of mozilla. Is this still an -issue w/ the 1.5-1.7? - - - ajzeneski - 2004-06-30 19:40:17 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:40:17 - resolution - Resolution - - WORKSFORME - - - - 145 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040619093839 - Party - sichen - not determined - PATCH - 2004-06-18 09:57:41 - issues@ofbiz - - - - All - Fixes duplicated PartyContactMechPurposes when using updatePartyContactMech - - - sichen - 2004-06-18 09:57:41 - Fixes duplicated PartyContactMechPurposes when using updatePartyContactMech to -move a party's contact information from an old contactMechId to a -newContactMechId by checking to make sure the PartyContactMechPurpose does not -already exist. - - - sichen - 2004-06-18 09:58:34 - Created an attachment (id=70) -Patches PartyContactMechServices.xml - - - - jonesde - 2004-06-19 09:38:39 - It's in CVS now. Thanks Si. - - - text/plain - 70 - 2004-06-18 09:58:34 - Patches PartyContactMechServices.xml - 1 - PartyContactMechServices.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/70/PartyContactMechServices.patch - - - sichen - 2004-06-18 09:58:34 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=70) -Patches PartyContactMechServices.xml - - - - jonesde - 2004-06-19 09:38:39 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-06-19 09:38:39 - resolution - Resolution - - FIXED - - - - 146 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040622094557 - Party - sichen - not determined - PATCH - 2004-06-21 17:56:29 - issues@ofbiz - - - - All - Passes partyId into updatePostalAddress from updatepartyPostalAddress - - - sichen - 2004-06-21 17:56:29 - Passes partyId into updatePostalAddress from updatePartyPostalAddress, to -preserve it for updateCreditCard later. - - - sichen - 2004-06-21 17:57:02 - Created an attachment (id=71) -Passes partyId from updatePartyPostalAddress to updatePostalAddress - - - - jonesde - 2004-06-22 09:45:57 - It's in. Thanks Si Chen. - - - text/plain - 71 - 2004-06-21 17:57:02 - Passes partyId from updatePartyPostalAddress to updatePostalAddress - 1 - PartyContactMechServices.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/71/PartyContactMechServices.patch - - - sichen - 2004-06-21 17:57:02 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=71) -Passes partyId from updatePartyPostalAddress to updatePostalAddress - - - - jonesde - 2004-06-22 09:45:57 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-06-22 09:45:57 - resolution - Resolution - - FIXED - - - - 147 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040623161518 - Product - sichen - not determined - ENHANCEMENT - 2004-06-22 15:58:48 - issues@ofbiz - - - - All - Minor additions to calculateProductPrice - - - sichen - 2004-06-22 15:58:48 - Implements a "Percent of Default Price" price action for price rules and checks -both default and list prices when there is a "Promotional Price Override" price -action. - - - sichen - 2004-06-22 15:59:22 - Created an attachment (id=72) -minor additions to calculateProductPrice - - - - jonesde - 2004-06-23 16:15:18 - Okay, this patch is in. Thanks for working on this and sending it over Si. - - - text/plain - 72 - 2004-06-22 15:59:22 - minor additions to calculateProductPrice - 1 - calculateProductPrice.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/72/calculateProductPrice.patch - - - sichen - 2004-06-22 15:59:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=72) -minor additions to calculateProductPrice - - - - jonesde - 2004-06-23 16:15:18 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-06-23 16:15:18 - resolution - Resolution - - FIXED - - - - 148 - RESOLVED - P2 - WORKSFORME - Components - CVS - All - ajzeneski - 20040730233418 - Accounting - jacopo - not determined - DEFECT - 2004-06-23 05:42:27 - issues@ofbiz - - - - All - Duplicate invoices for the same order under some cicumstances. - - - jacopo - 2004-06-23 05:42:27 - With "Offline Payments", from the order detail page it is possible to -receive payments: when the payments cover the order's grand total an invoice -is generated; also when the shipment to which the order is issued changes -its status to PACKED an invoice is created: this can cause the creation -of two different invoices for the same order. - - - ajzeneski - 2004-07-30 21:11:52 - I cannot duplicate this problem; I attempted an offline order, received the payment - no invoice was -created; issued a quick ship a single invoice was created. Please provide more details. - - - jacopo - 2004-07-30 23:34:18 - I cannot believe... I have tried again and the problem is gone away. -However I'm totally sure (99%) that this was an issue... - - - - jonesde - 2004-06-23 16:16:30 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - jacopo - 2004-07-30 23:34:18 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-30 23:34:18 - resolution - Resolution - - WORKSFORME - - - - 149 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040818085225 - Order - jacopo - not determined - PATCH - 2004-06-26 01:51:16 - issues@ofbiz - - - - All - Patch for bug that happens when you try to cancel an order item. - - - jacopo - 2004-06-26 01:51:16 - In revision 1.30 of the services.xml file for the order component, the require- -new-transaction="true" was added to the resetGrandTotal service: this causes -problems when you cancel an order item because the resetGrandTotal is one of -the services that are triggered and it seems to hang up the process waiting for -a transaction (at least this happens with SAP-DB). - -The attached patch removes the require-new-transaction="true" parameter and -this solves the problem; however I don't know if this could cause other -problems in different parts of the system. - - - jacopo - 2004-06-26 01:51:58 - Created an attachment (id=73) -Patch in UOF - - - - jacopo - 2004-08-18 08:52:25 - The patch has been applied. - - - text/plain - 73 - 2004-06-26 01:51:58 - Patch in UOF - 1 - services.xml.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/73/services.xml.patch - - - jacopo - 2004-06-26 01:51:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=73) -Patch in UOF - - - - jacopo - 2004-08-18 08:52:25 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-08-18 08:52:25 - resolution - Resolution - - FIXED - - - - 150 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040630190556 - Order - jacopo - not determined - PATCH - 2004-06-26 01:56:29 - issues@ofbiz - - - - All - When you receive a purchase order the order lines are declared completed (also multiple times) even if it's not true. - - - jacopo - 2004-06-26 01:56:29 - The attached patch fixes two bugs that caused the problem. - - - jacopo - 2004-06-26 01:56:53 - Created an attachment (id=74) -Tha patch in UOF - - - - ajzeneski - 2004-06-30 19:05:56 - patch applied to CVS - - - text/plain - 74 - 2004-06-26 01:56:53 - Tha patch in UOF - 1 - OrderSimpleMethods.xml.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/74/OrderSimpleMethods.xml.patch - - - jacopo - 2004-06-26 01:56:53 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=74) -Tha patch in UOF - - - - ajzeneski - 2004-06-30 19:05:56 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:05:56 - resolution - Resolution - - FIXED - - - - 151 - RESOLVED - P3 - FIXED - Components - CVS - All - ajzeneski - 20040630224402 - Order - jacopo - not determined - PATCH - 2004-06-26 02:01:14 - issues@ofbiz - - - - All - In order entry, if no party is selected, during the checkout process some errors are generated: this patch fix the problem by disabling the checkout link if the party is missing. - - - jacopo - 2004-06-26 02:01:14 - In order entry, if no party is selected, during the checkout process some -errors are generated: this patch fix the problem by disabling the checkout link -if the party is missing. - - - jacopo - 2004-06-26 02:01:41 - Created an attachment (id=75) -Patch in UOF - - - - ajzeneski - 2004-06-30 19:19:39 - I cannot duplicate this issue; is it still a problem? - - - jacopo - 2004-06-30 22:44:02 - Hmmm, now it seems to work for me, too. -I'm wondering if something is changed during the last 10 days... I was quite -sure about this problem. -By the way, I'm going to declare resolved this issue, thanks. - - - - text/plain - 75 - 2004-06-26 02:01:41 - Patch in UOF - 1 - noparty.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/75/noparty.patch - - - jacopo - 2004-06-26 02:01:41 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=75) -Patch in UOF - - - - jacopo - 2004-06-30 22:44:02 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-06-30 22:44:02 - resolution - Resolution - - FIXED - - - - 152 - RESOLVED - P4 - LATER - Components - CVS - All - ajzeneski - 20040630192805 - Order - jacopo - not determined - PATCH - 2004-06-26 02:13:57 - issues@ofbiz - - - - All - Shipping location is missing in purchase orders: this causes problems when you try to cancel an order item. - - - jacopo - 2004-06-26 02:13:57 - In purchase order the shipping location address is not set and this causes -problems when you try to cancel order items (the shipping location is used is -some service that are triggered in this situation, such as the calcTax service -etc...). -In my opinion the best solution is to add a shipping location address to the -purchase order. -The address could be that of the facility that will receive the po. - -I have also attached a patch (not a good one, so probably you shouldn't apply -it) that fix this problem by allowing, during order entry, to select one of the -addresses of the facility that is linked to the productStore for which the -purchase order is taken: so in the checkinits page the store selection should -be enabled for purchase orders too. - - - jacopo - 2004-06-26 02:14:21 - Created an attachment (id=76) -Patch in UOF - - - - ajzeneski - 2004-06-30 19:28:05 - Sounds like there are more issues here. First off most likely tax should not be calculated for purchase -orders; nor should the same shipping charges which apply to sales orders should not apply to purchase -orders. - -I will see what I can do when working on some additional PO enhancements. - - - text/plain - 76 - 2004-06-26 02:14:20 - Patch in UOF - 1 - shipping_address.patch - 194 - jacopo - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/76/shipping_address.patch - - - jacopo - 2004-06-26 02:14:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=76) -Patch in UOF - - - - ajzeneski - 2004-06-30 19:28:05 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-06-30 19:28:05 - resolution - Resolution - - LATER - - - - 153 - NEW - P5 - - Components - CVS - All - ajzeneski - 20040707011403 - Service - eckardjf - not determined - DEFECT - 2004-07-05 12:19:00 - issues@ofbiz - - - - All - purgeOldJobs service leaves artifacts - - - eckardjf - 2004-07-05 12:19:00 - The purgeOldJobs service will remove qualifying JobSandbox entities, but will not remove the related -RuntimeData, RecurrenceInfo and RecurrenceRule entities (even if they are not referenced by an -existing WorkEffort). - - - jonesde - 2004-07-07 01:14:03 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - - 154 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040707150844 - Content - doogie - not determined - DEFECT - 2004-07-06 12:49:26 - issues@ofbiz - - - - All - Unknown import - - - doogie - 2004-07-06 12:49:26 - Region.java imports com.sun.rsasign.r. When compiling with jikes, this class is -not available. Removing the import, and the class compiles fine, so it's -obviously not needed. - - - doogie - 2004-07-06 12:49:58 - Created an attachment (id=77) -Remove the bad import - - - - jonesde - 2004-07-07 15:08:44 - This import has now been removed, not even sure why it was there in the first place... Thanks Adam. - - - text/plain - 77 - 2004-07-06 12:49:58 - Remove the bad import - 1 - Region.java.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/77/Region.java.patch - - - doogie - 2004-07-06 12:49:58 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=77) -Remove the bad import - - - - jonesde - 2004-07-07 15:08:44 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 15:08:44 - resolution - Resolution - - FIXED - - - - 155 - RESOLVED - P3 - FIXED - Base - CVS - All - issues@ofbiz - 20040707011249 - Base - doogie - not determined - DEFECT - 2004-07-06 14:27:26 - issues@ofbiz - - - - All - UtilCache does not allow for null keys - - - doogie - 2004-07-06 14:27:26 - UtilCache doesn't allow null keys to be stored. This is sub-optimal, and -actually causes problems with my enhanced entity cache code. Attached patch fixes. - - - doogie - 2004-07-06 14:28:17 - Created an attachment (id=78) -Allow for null keys - - - - jonesde - 2004-07-07 01:12:49 - This is now in CVS, thanks Adam! - - - text/plain - 78 - 2004-07-06 14:28:17 - Allow for null keys - 1 - UtilCache-null-key.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/78/UtilCache-null-key.patch - - - doogie - 2004-07-06 14:28:17 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=78) -Allow for null keys - - - - jonesde - 2004-07-07 01:12:49 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 01:12:49 - resolution - Resolution - - FIXED - - - - 156 - RESOLVED - P3 - FIXED - Base - CVS - All - issues@ofbiz - 20040707011312 - Base - doogie - not determined - ENHANCEMENT - 2004-07-06 14:30:09 - issues@ofbiz - - - - All - Allow specifying the expire time on put in UtilCache - - - doogie - 2004-07-06 14:30:09 - Add a new put method, that takes an expireTime parameter. - - - doogie - 2004-07-06 14:30:31 - Created an attachment (id=79) -The patch. - - - - jonesde - 2004-07-07 01:13:12 - This is now in CVS, thanks Adam! - - - text/plain - 79 - 2004-07-06 14:30:31 - The patch. - 1 - UtilCache-put-takes-expireTime.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/79/UtilCache-put-takes-expireTime.patch - - - doogie - 2004-07-06 14:30:31 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=79) -The patch. - - - - jonesde - 2004-07-07 01:13:12 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 01:13:12 - resolution - Resolution - - FIXED - - - - 157 - RESOLVED - P3 - FIXED - Base - CVS - All - issues@ofbiz - 20040707011225 - Base - doogie - not determined - ENHANCEMENT - 2004-07-06 14:35:33 - issues@ofbiz - - - - All - In UtilCache, allow for a list of property bases to be specified - - - doogie - 2004-07-06 14:35:33 - When a UtilCache instance is created, it currently will only look for a single -matching property value, by name. This patch allows for a list of base property -names to be specified, and the first one found will be used. - -I make use of this in my entity cache code. For instance: -== -Cache.entity-list.${delegator-name}.${entity-name}.expireTime=1800000 -Cache.entity-list.${delegator-name}.${entity-name}.maxSize=500 - -# high count, low access -# 5 minute cache time -Cache.entity-list.${delegator-name}.PartyAttribute=300000 -== - - - doogie - 2004-07-06 14:35:48 - Created an attachment (id=80) -The patch - - - - jonesde - 2004-07-07 01:12:25 - This is now in CVS, thanks Adam! - - - text/plain - 80 - 2004-07-06 14:35:48 - The patch - 1 - UtilCache-wildcard-config.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/80/UtilCache-wildcard-config.patch - - - doogie - 2004-07-06 14:35:48 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=80) -The patch - - - - jonesde - 2004-07-07 01:12:25 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 01:12:25 - resolution - Resolution - - FIXED - - - - 158 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040707011838 - Product - sichen - not determined - DEFECT - 2004-07-06 17:08:44 - issues@ofbiz - - - - All - distinct attribute for getProductFeatures is not working - - - sichen - 2004-07-06 17:08:44 - distinct attribute for getProductFeatures service does not work because it is -trying to use ProductFeatureType rather than ProductFeatureTypeId in -ProductServices.prodGetFeatures - - - sichen - 2004-07-06 17:16:51 - Created an attachment (id=81) -Corrects productFeatureType to productFeatureTypeId - - - - jonesde - 2004-07-07 01:18:38 - It's in CVS now, thanks Si! - - - text/plain - 81 - 2004-07-06 17:16:51 - Corrects productFeatureType to productFeatureTypeId - 1 - ProductServices_1.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/81/ProductServices_1.patch - - - sichen - 2004-07-06 17:16:51 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=81) -Corrects productFeatureType to productFeatureTypeId - - - - jonesde - 2004-07-07 01:18:38 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 01:18:38 - resolution - Resolution - - FIXED - - - - 159 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040707012137 - Product - sichen - not determined - ENHANCEMENT - 2004-07-06 17:26:05 - issues@ofbiz - - - - All - Adds productFeatureApplTypeId field to getProductFeatureSet service - - - sichen - 2004-07-06 17:26:05 - Adds productFeatureApplTypeId as optional field to getProductFeatureSet service. - If none is specified, it will still search for "SELECTABLE_FEATURE"s (to be -compatible with existing code), but if one is specified, it will use that -productFeatureApplTypeId, so the same service can now be used to search for -STANDARD, DISTINGUISHING, OPTIONAL features. - - - sichen - 2004-07-06 17:27:49 - Created an attachment (id=82) -Extends getProductFeatures with optional productFeatureApplTypeId field - - - - jonesde - 2004-07-07 01:21:37 - It's in CVS now, thanks Si! - - - text/plain - 82 - 2004-07-06 17:27:49 - Extends getProductFeatures with optional productFeatureApplTypeId field - 1 - ProductServices_2.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/82/ProductServices_2.patch - - - sichen - 2004-07-06 17:27:49 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=82) -Extends getProductFeatures with optional productFeatureApplTypeId field - - - - jonesde - 2004-07-07 01:21:37 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 01:21:37 - resolution - Resolution - - FIXED - - - - 160 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040707144701 - Entity Extensions - doogie - not determined - ENHANCEMENT - 2004-07-07 07:27:45 - issues@ofbiz - - - - All - implement condition versions of functions in entityext - - - doogie - 2004-07-07 07:27:45 - I had sent an earlier version of this patch to the mailing list. I'm now adding -it as an issue, as I have for all the other patches. - - - doogie - 2004-07-07 07:28:22 - Created an attachment (id=83) -The patch - - - - jonesde - 2004-07-07 14:47:01 - This is now in CVS. Thanks Adam! - - - text/plain - 83 - 2004-07-07 07:28:22 - The patch - 1 - cache-entityext.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/83/cache-entityext.patch - - - doogie - 2004-07-07 07:28:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=83) -The patch - - - - jonesde - 2004-07-07 14:47:01 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-07 14:47:01 - resolution - Resolution - - FIXED - - - - 161 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040708153407 - WebTools - doogie - not determined - DEFECT - 2004-07-08 11:51:01 - issues@ofbiz - - - - All - NPE in FindUtilCacheElements.jsp - - - doogie - 2004-07-08 11:51:01 - Missed one NPE when key is null(calls key.toString()). - - - doogie - 2004-07-08 11:51:22 - Created an attachment (id=84) -The patch - - - - jonesde - 2004-07-08 15:34:07 - Thanks Adam, it is now in CVS. - - - text/plain - 84 - 2004-07-08 11:51:22 - The patch - 1 - FindUtilCacheElements.jsp.patch - 270 - doogie - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/84/FindUtilCacheElements.jsp.patch - - - doogie - 2004-07-08 11:51:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=84) -The patch - - - - jonesde - 2004-07-08 15:34:07 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-08 15:34:07 - resolution - Resolution - - FIXED - - - - 162 - RESOLVED - P3 - WORKSFORME - Components - CVS - All - issues@ofbiz - 20040713170819 - Workflow - ktippetts - not determined - DEFECT - 2004-07-12 09:32:42 - issues@ofbiz - - - - Linux - NoSuchMethodError in Entity Data Maintenance - - - ktippetts - 2004-07-12 09:32:42 - Getting this error when trying to view entity data in Webtools | Entity Data -Maintenance: - -<snip> -Exception: java.lang.NoSuchMethodError -Message: -org.ofbiz.entity.condition.EntityFieldMap.<init>(Ljava/util/Map;Lorg/ofbiz/entity/condition/EntityOperator;)V ------ stack trace ---------------------------------------- -java.lang.NoSuchMethodError: -org.ofbiz.entity.condition.EntityFieldMap.<init>(Ljava/util/Map;Lorg/ofbiz/entity/condition/EntityOperator;)V -org.apache.jsp.entity.FindGeneric_jsp._jspService(FindGeneric_jsp.java:159) -<snip> - -To duplicate Using CVS code as of 09Jul2004: -* Webtools > Entity Data Maintenance -* Click 'All' on any entity. - -Possible Solution: -* in FindGeneric.jsp (line 94) change 2nd parameter to EntityJoinOperator.AND - - - jonesde - 2004-07-12 20:41:10 - This works fine from a clean compile, but if have partial old code and partial new code in a build it may -have problems. Try an "ant clean" and then an "ant". - - - doogie - 2004-07-13 17:08:19 - The signature of the constructor changed. It used to take an EntityOperator. -However, the code only accepted an EntityJoinOperator. Passing in an -EntityComparisonOperator would have caused it to fail. - -Also, running ant clean will *not* fix the problem. The parsed/compiled jsp -pages need to be cleaned out. - - - jonesde - 2004-07-12 20:41:10 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-07-12 20:41:10 - resolution - Resolution - - WORKSFORME - - - - 163 - RESOLVED - P3 - INVALID - Documentation - CVS - All - issues@ofbiz - 20040730150851 - website - michaelrempel - not determined - TASK - 2004-07-13 11:11:43 - issues@ofbiz - - - - All - cant get csv instructions - - - michaelrempel - 2004-07-13 11:11:43 - When I pull up csv instructions for either the wincsv or command line, I get a -logon request screen, even though I am logged on. - -Thx - -Michael Rempel - - - ajzeneski - 2004-07-30 15:08:51 - This is a java.net related issue not OFBiz; please contact the Java.Net team for help. - - - ajzeneski - 2004-07-30 15:08:51 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 15:08:51 - resolution - Resolution - - INVALID - - - - 164 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040730204811 - Security - adrianc - not determined - DEFECT - 2004-07-14 12:24:23 - issues@ofbiz - - - - All - SecurityData.xml File - - - adrianc - 2004-07-14 12:24:23 - From mailing list: - -On Jul 14, 2004, at 12:03 PM, Adrian Crum wrote: - -> I was just wondering... -> -> Why is the security data for ALL components in the SecurityData.xml file? This -file looks monolithic. Shouldn't each component load its own security data? -> -> -Adrian - - -Adrian, - -Yes, good point, monolithic is a good word for this. Ideally it should be split -up, I think that's a good idea. - -If anyone wants to work on this please do... In the mean time it might be a good -idea to create an issue for it. - --David - - - ajzeneski - 2004-07-30 20:48:11 - applied patch file(s); now in CVS - - - ajzeneski - 2004-07-30 20:48:11 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 20:48:11 - resolution - Resolution - - FIXED - - - - 165 - RESOLVED - P4 - FIXED - Components - CVS - All - ajzeneski - 20040730065021 - Order - pgoron - not determined - PATCH - 2004-07-15 06:34:37 - issues@ofbiz - - - - All - Allow user to specify default value for desired delivery date and comment fields in order entry GUI - - - pgoron - 2004-07-15 06:34:37 - This patch allows user to define default desired delivery date and default -comment during quickaddform filling in OrderEntry page. Thus, users are not -obliged any more to reinput these informations for each order item. - - - pgoron - 2004-07-15 06:35:35 - Created an attachment (id=85) -The patch - - - - jacopo - 2004-07-30 06:50:21 - The patch is in CVS. - - - text/plain - 85 - 2004-07-15 06:35:35 - The patch - 1 - order20040707.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/85/order20040707.patch - - - pgoron - 2004-07-15 06:35:35 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=85) -The patch - - - - jonesde - 2004-07-15 16:16:54 - assigned_to - Assigned To - issues@ofbiz - ajzeneski - - - jonesde - 2004-07-15 16:16:54 - issue_type - Issue Type - ENHANCEMENT - PATCH - - - jacopo - 2004-07-30 06:50:21 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-30 06:50:21 - resolution - Resolution - - FIXED - - - - 166 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040730115233 - Order - pgoron - not determined - PATCH - 2004-07-21 02:46:56 - issues@ofbiz - - - - All - Allow user to associate parties to an order in OrderEntry website - - - pgoron - 2004-07-21 02:46:56 - Hi, - -Currently, I did not found any way to associate additional parties to an order. -That's why I've written this enhancement patch. - - -This patch adds a new step during order entry in which user can associate -additional party&role to order. Then, these informations are stored in OrderRole -entity. - - -List of modifications : -- I've written a new view in which user can select a party and party's role to -associate to order -+ webapp/ordermgr/entry/SetAdditionalParty.ftl -+ webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.bsh -+ webapp/ordermgr/WEB-INF/pagedefs/entry/SetAdditionalParty.xml -+ webapp/ordermgr/entry/AdditionalPartyListing.ftl -+ webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.bsh -+ webapp/ordermgr/entry/PartySettingsForm.xml -M webapp/ordermgr/WEB-INF/controller.xml - -- I've included list of additional parties associated to order in confimorder view -M webapp/ordermgr/entry/confirmorder.ftl -M webapp/ordermgr/WEB-INF/pagedefs/entry/confirmorder.xml - -- I've modified these files so that my view is shown before order confirmation -M src/org/ofbiz/order/shoppingcart/CheckOutEvents.java -M webapp/ordermgr/entry/showcart.ftl - -- I've modified storeOrder service and ShoppingCart to take in account -additional parties. -M servicedef/services.xml -M src/org/ofbiz/order/order/OrderServices.java -M src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java -M src/org/ofbiz/order/shoppingcart/ShoppingCart.java - -- I've copied some files from content module to be able to use GenericLookup. -+ src/org/ofbiz/order/lookupParams.java -+ webapp/ordermgr/lookup/FieldLookupForms.xml -+ webapp/ordermgr/lookup/GenericLookup.ftl -+ webapp/ordermgr/templates/lookup.ftl -+ webapp/ordermgr/templates/lookup.xml -+ webapp/ordermgr/WEB-INF/actions/includes/findprepLk.bsh -+ webapp/ordermgr/WEB-INF/actions/includes/formprep.bsh -+ webapp/ordermgr/WEB-INF/actions/includes/pagelistprepLk.bsh -+ webapp/ordermgr/WEB-INF/pagedefs/lookup/GenericLookup.xml - - - pgoron - 2004-07-21 02:47:42 - Created an attachment (id=86) -The patch - - - - pgoron - 2004-07-22 00:38:39 - I've found some minor mistakes. I am correcting them and I will send a new patch -as soon as possible. - - - pgoron - 2004-07-22 01:29:07 - Created an attachment (id=87) -The corrected patch - - - - jacopo - 2004-07-30 11:52:33 - The patches are in CVS. - - - text/plain - 86 - 2004-07-21 02:47:42 - The patch - 1 - order20040721.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/86/order20040721.patch - - - text/plain - 87 - 2004-07-22 01:29:07 - The corrected patch - 1 - order20040722.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/87/order20040722.patch - - - pgoron - 2004-07-21 02:47:42 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=86) -The patch - - - - pgoron - 2004-07-22 01:29:07 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=87) -The corrected patch - - - - jacopo - 2004-07-30 11:52:33 - issue_status - Status - NEW - RESOLVED - - - jacopo - 2004-07-30 11:52:33 - resolution - Resolution - - FIXED - - - - 167 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040730145814 - Accounting - sichen - not determined - PATCH - 2004-07-28 17:15:09 - issues@ofbiz - - - - All - Fixes a couple of other getNextSeqId methods - - - sichen - 2004-07-28 17:15:09 - getNextSeqId now returns a string(), so .toString() is no longer needed and will -cause runtime exceptions. - - - sichen - 2004-07-28 17:19:29 - Created an attachment (id=88) -Changes getNextSeqId usage to PaymentGatewayServices and GenericAsyncEngine - - - - ajzeneski - 2004-07-30 14:58:14 - patch applied - - - text/plain - 88 - 2004-07-28 17:19:29 - Changes getNextSeqId usage to PaymentGatewayServices and GenericAsyncEngine - 1 - changes.txt - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/88/changes.txt - - - sichen - 2004-07-28 17:19:29 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=88) -Changes getNextSeqId usage to PaymentGatewayServices and GenericAsyncEngine - - - - ajzeneski - 2004-07-30 14:58:14 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 14:58:14 - resolution - Resolution - - FIXED - - - - 168 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040730144804 - Content - pgoron - not determined - PATCH - 2004-07-29 02:43:55 - issues@ofbiz - - - - All - FreeMarker localization issues - - - pgoron - 2004-07-29 02:43:55 - Hi, - -This patch resolves some localization issues. Currently, FreeMarker formats -number according to the machine's locale. My patch forces FreeMarker to use the -user session's locale. - -It must be applied in ofbiz/components/content/src/org/ofbiz/content/webapp/ftl -folder. - - - pgoron - 2004-07-29 02:45:19 - Created an attachment (id=89) -The patch - - - - ajzeneski - 2004-07-30 14:48:04 - This has been fixed in CVS - - - text/plain - 89 - 2004-07-29 02:45:19 - The patch - 1 - locale-freemaker-200040727.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/89/locale-freemaker-200040727.patch - - - pgoron - 2004-07-29 02:45:19 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=89) -The patch - - - - ajzeneski - 2004-07-30 14:48:04 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 14:48:04 - resolution - Resolution - - FIXED - - - - 169 - RESOLVED - P3 - FIXED - Components - CVS - PC - issues@ofbiz - 20040730220642 - E-Commerce - amheiss - not determined - DEFECT - 2004-07-30 09:53:11 - issues@ofbiz - - https://localhost:8443/ecommerce/control/finalizeOrder - - Linux - Party/Userlogin issues - - - amheiss - 2004-07-30 09:53:11 - Application will not allow run of createPartyPostalAddress (due to null user -login?). Sequence of events from july 30th, 11am build: goto ecommerce, -login, then logout. attempt to use anonymous checkout after this, and shipping -address feilds prepopulated with previous logins settings. After adjusting and -trying to save, get error 'User authorization is required for this service: -createPartyPostalAddress ' . - -Debug output from shipsettings.bsh: -Debug.log("party ID : " + partyId); ---> output admin ( i logged in as admin, -then logged out) -Debug.log("ul: " + session.getAttribute("userLogin")); ---> (null) - - - ajzeneski - 2004-07-30 22:06:42 - Yes, if there is an autoUserLogin attribute available that will break anonymous checkout. In theory, the -anonymous checkout links should not be displayed if there is an auto-userlogin. However, I have added -some code to clear this when entering the anonymous checkout process. - - - ajzeneski - 2004-07-30 22:06:42 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-07-30 22:06:42 - resolution - Resolution - - FIXED - - - - 170 - RESOLVED - P3 - FIXED - Components - CVS - All - issues@ofbiz - 20040804093020 - Product - sichen - not determined - ENHANCEMENT - 2004-08-03 17:02:41 - issues@ofbiz - - - - All - Optionally duplicates ProductContent when duplicating a Product - - - sichen - 2004-08-03 17:02:41 - Will now optionally duplicate ProductContent entries when duplicating a Product - - - sichen - 2004-08-03 17:03:19 - Created an attachment (id=90) -Patches services.xml, EditProduct.ftl, and ProductServices.xml - - - - jonesde - 2004-08-04 09:30:20 - Thanks Si. This is now in CVS. I also did a content remove option, and fixed an issue I noticed with the -product IDs (GoodIdentification). BTW, this is from a slightly earlier version of OFBiz than the current -CVS as this form has been moved to the file EditProductDupForm.ftl. - - - text/plain - 90 - 2004-08-03 17:03:19 - Patches services.xml, EditProduct.ftl, and ProductServices.xml - 1 - duplicateProduct.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/90/duplicateProduct.patch - - - sichen - 2004-08-03 17:03:19 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=90) -Patches services.xml, EditProduct.ftl, and ProductServices.xml - - - - jonesde - 2004-08-04 09:30:20 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-04 09:30:20 - resolution - Resolution - - FIXED - - - - 171 - RESOLVED - P2 - FIXED - Components - CVS - All - issues@ofbiz - 20040804091929 - Product - pgoron - not determined - PATCH - 2004-08-04 00:59:53 - issues@ofbiz - - - - All - Comparaison bug in InventoryServices.xml minilang script - - - pgoron - 2004-08-04 00:59:53 - Some if-compare element forget to declare type used to compare fields. By -default, string comparison is used whereas Double is required. - - -Applying patch : -cd /ofbiz/components/product/script/org/ofbiz/product/inventory -patch -p0 < InventoryServices.xml.patch - - - pgoron - 2004-08-04 01:01:13 - Created an attachment (id=91) -The patch - - - - jonesde - 2004-08-04 09:19:29 - Thanks, it's now in CVS. - - - text/plain - 91 - 2004-08-04 01:01:13 - The patch - 1 - InventoryServices.xml.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/91/InventoryServices.xml.patch - - - pgoron - 2004-08-04 01:01:13 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=91) -The patch - - - - jonesde - 2004-08-04 09:19:29 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-04 09:19:29 - resolution - Resolution - - FIXED - - - - 172 - NEW - P2 - - Components - CVS - All - issues@ofbiz - 20040819033400 - Order - pgoron - not determined - PATCH - 2004-08-05 07:09:49 - issues@ofbiz - - - - All - Bug in shippableWeight calculation from OrderReadHelper.getShippableWeight method - - - pgoron - 2004-08-05 07:09:49 - Hi, - -The purpose of this patch is to solve a bug in -OrderReadHelper.getShippableWeight method. The algorithm of shippable weight -calculation don't care of order item's quantity. So there is an inconsistency -with ShoppingCart.getShippableWeight method when order is modified after his -creation (for example, by RecalcShippingTotal service). - -Applying patch: -cd ofbiz/components/order/src/org/ofbiz/order/order -patch -p0 < OrderReadHelper-20040805.patch - -Peter Goron - - - pgoron - 2004-08-05 07:10:36 - Created an attachment (id=92) -The patch - - - - pgoron - 2004-08-19 03:34:00 - Created an attachment (id=96) -An up to date patch - - - - text/plain - 92 - 2004-08-05 07:10:36 - The patch - 1 - OrderReadHelper-20040805.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/92/OrderReadHelper-20040805.patch - - - text/plain - 96 - 2004-08-19 03:34:00 - An up to date patch - 1 - OrderReadHelper-200408019.patch - 392 - pgoron - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/96/OrderReadHelper-200408019.patch - - - pgoron - 2004-08-05 07:10:36 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=92) -The patch - - - - pgoron - 2004-08-19 03:34:00 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=96) -An up to date patch - - - - - 173 - RESOLVED - P3 - INVALID - Base - CVS - PC - issues@ofbiz - 20040809165336 - Startup - mn - not determined - PATCH - 2004-08-09 13:38:08 - issues@ofbiz - - - - Linux - typo in base/config/debug.properties - - - mn - 2004-08-09 13:38:08 - Index: base/config/debug.properties -=================================================================== -RCS file: /cvs/ofbiz/base/config/debug.properties,v -retrieving revision 1.10 -diff -u -r1.10 debug.properties ---- base/config/debug.properties 9 Jun 2004 18:12:59 -0000 1.10 -+++ base/config/debug.properties 9 Aug 2004 19:32:33 -0000 -@@ -7,7 +7,7 @@ - pack.exception=true - - # These top level switches are used before calling Log4J, or if Log4J is not used --print.verbose=ftrue -+print.verbose=true - print.timing=true - print.info=true - print.important=true - - - mn - 2004-08-09 13:40:09 - Created an attachment (id=93) -corerct typo for print.verbose property - - - - jonesde - 2004-08-09 16:25:29 - In this case "ftrue" is not a misspelling of "true", we add the "f" before "true" so that it is easier to switch -between true and false than it would be to type out "true" and "false". In other words, anything but -"true" is false. - - - mn - 2004-08-09 16:53:36 - What about placing comment into debug.properties about this decision? - - - text/plain - 93 - 2004-08-09 13:40:09 - corerct typo for print.verbose property - 1 - debug.properties.patch - 377 - mn - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/93/debug.properties.patch - - - mn - 2004-08-09 13:40:09 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=93) -corerct typo for print.verbose property - - - - jonesde - 2004-08-09 16:25:29 - issue_status - Status - NEW - RESOLVED - - - jonesde - 2004-08-09 16:25:29 - resolution - Resolution - - INVALID - - - - 174 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040810161004 - Accounting - amheiss - not determined - PATCH - 2004-08-10 16:08:36 - issues@ofbiz - - - - All - retry failed auths fix - - - amheiss - 2004-08-10 16:08:36 - retryFailedAuths service was creating superfluous retryFailedOrderAuth -services. I'll see if i can attach the patch to check on order status before -dispatching retryFailedOrderAuth service. If not, patch will be to dev list -soon enough. - - - amheiss - 2004-08-10 16:10:04 - Created an attachment (id=94) -Patch for retryFailedAuth fix - - - - text/plain - 94 - 2004-08-10 16:10:04 - Patch for retryFailedAuth fix - 1 - retryAuth.patch - 336 - amheiss - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/94/retryAuth.patch - - - amheiss - 2004-08-10 16:10:04 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=94) -Patch for retryFailedAuth fix - - - - - 175 - RESOLVED - P3 - FIXED - foo - unspecified - All - ajzeneski - 20040817213241 - bar - ajzeneski - milestone 1 - DEFECT - 2004-08-17 21:31:38 - ajzeneski - - - - All - bar - - - ajzeneski - 2004-08-17 21:31:38 - foo - - - ajzeneski - 2004-08-17 21:32:41 - . - - - ajzeneski - 2004-08-17 21:32:41 - issue_status - Status - NEW - RESOLVED - - - ajzeneski - 2004-08-17 21:32:41 - resolution - Resolution - - FIXED - - - - 176 - NEW - P3 - - Components - CVS - All - issues@ofbiz - 20040818174622 - Content - sichen - not determined - DEFECT - 2004-08-18 17:45:44 - issues@ofbiz - - - - All - Possible bug in renderContentAsText - - - sichen - 2004-08-18 17:45:44 - It seems that renderContentAsText is still trying to do a findByAnd on -SubContentDataResourceView with a fromDate as the orderBy, whereas -renderContentAsTextCache no longer does (it passes a null.) We got an -exception from this in ProductContentWrapper and made this change to fix it. -Is this a defect? - - - sichen - 2004-08-18 17:46:22 - Created an attachment (id=95) -Changes findByAnd of SubContentDataResourceView - - - - text/plain - 95 - 2004-08-18 17:46:22 - Changes findByAnd of SubContentDataResourceView - 1 - ContentWorker.patch - 178 - sichen - - https://ofbiz.dev.java.net/nonav/issues/showattachment.cgi/95/ContentWorker.patch - - - sichen - 2004-08-18 17:46:22 - attachments.ispatch - Attachment is Patch - - Created an attachment (id=95) -Changes findByAnd of SubContentDataResourceView - - - - - 177 - NEW - P3 - - Base - CVS - Other - issues@ofbiz - 20040910075014 - Base - lrawley - not determined - TASK - 2004-09-10 07:50:14 - issues@ofbiz - - - - Windows XP - HTTP Header needs Expires - - - lrawley - 2004-09-10 07:50:14 - Using Internet Explorer 6.0 with settings for automatically obtaining newer -versions of page. - -Images are cached and if changed are not refreshed on visits to the same page. -Pages get cached with login page because the first time a user requested they -were prompted to login first and then redirected to the page. - -This behavior is resolved if set to obtain newer versions on every visit, -however, this causes performance issues. So, automatically is the desired -browser setting. - -I would like to be able to set the EXPIRE in the HTTP header. I'm not sure -where this change needs to occur. Can you assist? Is this available in 3.0? -I am using 2.1.1. - -Please contact me at lrawley@tla.com. - -Lisa Rawley - - - diff --git a/test/rexml/data/pi.xml b/test/rexml/data/pi.xml deleted file mode 100644 index 980bbf98ec0b32..00000000000000 --- a/test/rexml/data/pi.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/test/rexml/data/pi2.xml b/test/rexml/data/pi2.xml deleted file mode 100644 index 46bce4505fe8de..00000000000000 --- a/test/rexml/data/pi2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - foo - - bar - diff --git a/test/rexml/data/project.xml b/test/rexml/data/project.xml deleted file mode 100644 index a02582fde58238..00000000000000 --- a/test/rexml/data/project.xml +++ /dev/null @@ -1 +0,0 @@ -tool testing diff --git a/test/rexml/data/simple.xml b/test/rexml/data/simple.xml deleted file mode 100644 index 3cff71a02b5e3e..00000000000000 --- a/test/rexml/data/simple.xml +++ /dev/null @@ -1,2 +0,0 @@ - -abd diff --git a/test/rexml/data/stream_accents.xml b/test/rexml/data/stream_accents.xml deleted file mode 100644 index 6def54ee55f5f5..00000000000000 --- a/test/rexml/data/stream_accents.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/test/rexml/data/t63-1.xml b/test/rexml/data/t63-1.xml deleted file mode 100644 index f8d0c543ef2bf3e6662f0baa94184e0bef4b5a5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161690 zcmeI5ZExF1w&(eF7ufG0q=AcjUnFt-lz6V&jU-NHGn0p&cDgeQ7%=SEPG`pLWNfE1 z!C=1n?*4x~E>%%1N+c!Gv{Wz>%M{6~I#qSf|2)?J`@h@S57|Gn-?Fo8ko}&WWEa_G z_A&dEooC-?cd`fBy=+Cl2m0nbd#~%q`u05gkbnDg_BMN--PK*2y61;%C;MO7|ID_t zzv;dsz44Ro+Zq0SaDC-qq@7s1tJm$`zkcWc&|7|09}d+%edMjD>dBdY?C`ytB28FAC5T##a|2unx=`ODE|HiOI|DLdwZ9VfX`&<}>yFyz}^w#&;-?J~e$I;V$Pv32I9YkpH zGGBN0j%V3lH8xMtgS>xh>fJ+)#n!!hd-;vGagE(C?GsiCyY^6&_)WC=BAPMd$N9Xm zilD%*)&XngB%jZ7ealR{C;9B29O%xI>>qm1Nxp)@)v+O}`gKuU5u3w#^zW_e(RR=_ zJ#~FMP@m}=&$+%GsNd(>YoBti5MK9vZaP}`#tXH>>NbuzP%9T|=eJ7QxLp#b!-ITh ztTmzo?H%bKeR!{NpXv9JdcnT^roa7u{;6>1AbVN3bCA8(Gf;;=9rQZ*ReW~Bh zc40nz`{4?TwY55IE1XaNJp70~c%^yVyZ%I9*N4yf?~Ci>Od~te$j*{?G4b`1JW_9+^t_!|iM4o@&%Q@FZ}Jrb@ADk_u2x4J zEBNQP^+dSZK51SL#AytP`F&H|+n*|03*U8bxX!|>yt}G}ZOsc3YBP;1Epw{@XeK$ldojjy)Hh7(?+&DEYv5d)Z&a)oss&Ploqx z=ewErfhUlrM(cC^g-*jRN6Q#!efiz)=i!U4^Xx$PU+Vvh980;U!NG&;dHr2?fS0(d zs8tPg{Zv=4u3HM%?jU<6ObS;XWIyRQ_=Oh1^zb1#Gzk3v9;cG5yHD zz4|R~&DeXZDYBi@#?aMk_2Ei1V|D*st+L+e6W9U$(f)?M$Q6f~j8=vfZPjuGIwN zxG_6)$Exz5M@MHei8-CcxZ?e@k*x{?I9;mQ*xZvI&G_+{z6qLgpAIxr%mXX)LZbpH zc>J}W?dO`3?WBEapdf+Q+7s+5C!@x_0i6y$SbQ&3f3EAliPmSrtVJYxr-0br=RJhK z+v-5$T+dg4qfb$%Sd-ns&1$UeZS6kR<`=bYTm((%QhfyJfuD=t7k8uW)H|X}6=i(u zI-1gky~Ncw4*J;|;WYr`Z?#@b>yTtv%PAV7(b=4|@p?()*l$%UYo|`yM{# zM({XayJq2F>`z3$tKllB>PeNgqu4`ltFZNF)MgbHHM*k3V^uo^Wb7ree^1fofd&CG zFxwUT#PeUb>b(@YC(Ys~jnLigHSdpli}euBj6`~ob7FKLG(;yY26_YQ{V-oKCcB^| z9L?ks`_VXbaqr#FWs1Y)AT16G*yT_j`3BuT>hopL4|trl zfR*kU9V%k{vJ+k6nF6+?3&Q5h>7d19;9R-xHSRy8JY6r=v4mH4YD zK(AQ6b~pPUNxr4uuQV6vIrQCe^7`$VWE!34qGcGA(3c-K!eS4-d>xNSZ1xh~LegUy zV6Ro-$U1ndIhLF!-ZCqaUkl^W+Ol9Rqe_TDnDr|BHXEF^F20m-R{wC8$^AMwtBePn z#5Y;r9(!yGd*I!gE%u0`4){}7h+|dK7_5P|Y_`=^wI0J7^a>o)A1q;9IbjL&i#uIC zVTmqnH|*g4*lwQXwwr_{igp{LO1D@7jV)n`{$UA|7{d=N+dx{{8N7Ou%f1OASq8Eq? zF+Jr-ztO3kY~*hjHypHMv8%Cb_lH_y_0_+c)emB;9tss$#>;x8eG-3YwS96Uf39ElNut@X10?%ovQJvXzT+!h#k4=jcg4-w zCq2U47czRRXxg{R6-mguiZ0!vaJ*Crg?m})aHo@gCQ*Gf{W73%!yKj%5B9WAsnY{u7RxP$YgZhyVgJ$F_|S; z^EdM>Kw>YcQxLc6o8B}|3n7Z4Us}kfMnkWX7Lv4(o6UJ^5MoPx2he zUnCFj$7`!9e_Qsn&u;edHOuKMm<0{H)o$?2E{b-uIN7=mYanr*zEx%CPZ1c-7u4Rm zZ1kpfgQs_UY)2lc=a}Tynjgw@OfqVp1a@hwjX^vJx#i*0F@8H9|J7@KI;*r*rX$xM zyY!YYF;6Q*n>?no=&L3A$?6W^PYx@J zSS1N3tzD1zUx`>%k9 zO{O0D>L`Vo5qMQtv(QEGK~btVKq2n?pq9g$A;g)%?dTD;LtOPVqng7S@%f;Z%N;%E zd2qeHH66p~Tdf`vwI-0IR)50Hk#V)bHEsQh3dhW>u%f6D5}VIGQHyv3Uo)#}POS<< z*bfi@u|Ui&J#&?~tonjQtKk_OKkKm>9amMT`y76&v*2`&$u*P6ro;+MM1=h~oWxjJ zrEnDg8O{<`g>p8P`TLka71YLPqT9LA%_EcFb30qLNoTYCyHUDysfSTn%kf5VK2j@H zO}hE2NyNZo^R1(Yz02jE!zBaxaIL-+70O){HZ>PbA|B-2oM^NQeZP}eHpRMal|)$q ztOvW-SIR>wQ*m!F%-$%j+WqS~JyvCp`y2+j)Du)e-_!H&g+P$N`$HY%o&Gw~-w*Sw zJpAF*e%)8EKq^R`eMRG)XdH)nmb!NQZP9uAdLIadI!Z+D-P3Q2Zbu$oD)NTPVT>fK z&s3xqyt;U0ndt`#`KM@?=vROJou_rDUE6%$LbtTun$c}{h&c^;-V(A(y z)?d5zcOuP<`u0igPDj7A{@T%xiuk{$_19R}b@JEIFRj03>(5!Gzlrl5rS;c%{f*LZ zdDb6ZbSm8AJKvXO_*kFu%iWVr_>0!kGFVNDG$4+Ec*^(k5MX`#EW3JBDzJXi84c6b zNnV#{2k#CsOwM~;FY1dGTzy6ZS<3t)n#*~9eEpr(YcET)Dm?Bz)HMh_Dz44}C+Luy zK$Rc!5z!(i7FjGt@hLyvI`5q>Rt)Mw4?8DmRURg*xL8#ah!gY1lqX1?(yb}GUz zihg@3Z*ht<8I3b3(x=;a6F63i`|n%jMTbc0WELj`I9=R7*_=eM|3Q(2&Ex*ZBS6lD zWG*ce(qSx*0UxPdPGD|^0qf$MABFjfXL%7VO3f%vdIpENN;1@+1Z~A4_YJ?Au0~D) zvMM~U3;RJ4iG^p3)$Qx7u~<5NI0@jI5NaFb#UZmkY98lnJbN2*JQ*E3u)Yo6jcy(`cv~C$*LlhB zvKPv>-<2Kyo%lSy0)CQ~W?EVuT6L>a!ReDu)jyre@LHYP`!|!z7_Q`$3EDK1wtv*S zO)+Bqpx$lE0__jg(pqbh@qW8AKyQB4h54T=(h+Z02JOw$?>1(C_J?YT*EQjFE_32G zW`6c%&E3wt&puJ__GNwck9vvkwc&fWG2^p8YtKtUX7)wDy{; zz0pj?wDzW<-m{&k&ApDO%x)L%dB@7>k_PVq9LU>hiuK zmcHqqWx;bo32`t#DhKtRem~FtsOXB@P+7Oh`0OkOsx<#iQAnH$zzGeU&9Jy5bz{CK zWI;`uWf<#~#`;;a+it{2hg379ea#RuD_n-|mS(|4L)VMicKA0QgH7}==MoVwTh13H zM(~m1Ae-fjy7!E$8A65oe%1_GQ$!_H=KKuuSU4l0>Xa!WFRNpti9qdJY&7eL+^JMG z#AOxruWHERM=XYW~)80;cc#f8k{3t8Kdm$8}v_0A%9DAdkRHY^G@n#^y%4~k}? zMlb%vL9$4VSfr{c)h&9%l9|w3KhaweO(gU-PfOgU>~VMto1!;wC5xl6Exi*B$@vti z3WJQKvMe6DW}eBqXeU<5mWU2=MyZyxA=_J(PjEfA8};^C{qWoe={%2BQRlh- z;gd0pfX&^snA6;THjs9NHTsjDBpcx*zt>wwT#xtlysxS_sXpr+?e2kEKh{ZLoV(6@ zk9FmZdW){+Pkpy*zM9jQT>m)Ed+|!+c&}c4%KLY!o)5BL^w(Lg*@1P!K7}>m_SDLS z+U9xg`%gW$r=R}{xXxtip+k;R7|K$u?jWZzG~7`{*ROdi{B@ScHCf~j(M`Vx{e>f; zjnboI{cp736IHGpI*8B5Q&HrO?(tl+Uf-IIVf3v7^^zHYmh|*OeQwc{c%@%>1caAt zpfMXLsM2g+SR=98xEQ>yYqc*n9@%OfV~E9PmR1pB`km&Ve9A>?bc;1Wri+3#cI6Xz ztA9`QZ!deMkzp5h_5k9kKI`vixjp=&EV@|AT`tLyEX2qO7r)QnE}D!if^WG!oj9*U z`9931?#>=}UXPs$8#G=Syb0ztFe~@t;akey6W51vEn#^lDq}Ru!Hw3eAO0Tmkl0M4 z^CMUBBd+AUfas1v{x=z(WsKq9Q_QHa+DM$=Y}B*3@z~YawfnMi&~owl*tK+LqLN=> zX@wMbOxhi3cck5c>`9y$b|l$R*29*CGf*7>`}U!t?x^2N zj3W_v#x0R0=;OQ6v_C3N4VwWmhr}EDC;9B2w3x?#=sk97ByUH@FKgYavUA(%j#$^W zhPDU)-l`sPTBh$cRjsUV2iJY$Isd)4s}`U0eQr8h_r?pg!^&}yai{7Dr)F2tW;`8M zMU53%ADsOo97DXX+j)COYLh;^*Q}lC_mQq*8Q~OfA}o2&PWF@T@^=pM_*Z}DKoPKZ zCw+V&tI;d{elY9{(sh9(I@O~_@nOXuT_2K9wInS_55o7|G$Tn3j5}J zQ0y7erP$p3NzmbHe^dH)pjwH{HqkAd1j|0cb_iGaC>k;rB4qGO5drG0Xl_4`TgT&j zQ|vj>*Di`T?DON`Ix}b|{S|vi)ew5fX|&W4ne>N|cIKZ5De5#@)14 ztjf2VJNK7SEnIEbKd~}~Yd`k=t7yOCEfTj7u7Pmp7?-Z*gz)@JQIa(cr*J-|-}UK8 zqZzfNTJOKpDy?fX_d9b^Tl3Le=Mfuc5{vje?8H7^yxbQ2s!on{Su1grw>4yzY|d3C zDz1oA#^*ne-VMql6lKNfx-;LAO@xL3EaFWq^cMX$(p)ZA6 z&^kU#f|)i3PQ4>Mf1&&_v_tbigTP+ty3?`Z&%*8S>Bc$+lEikARSXaFc-rd;RrBrj zdU7MlFFFKxMngRTlXrK7b9qobVopqje)b)I#%_yE; z&r$f6He-qRW;(qIyA3rG%nGrYqq~^4G^#6kODonXVrIeO^bq^&WuSf5)#|n-2hX&Y z4{}*URMUZG9i8$dk34nu%+=hQ@vFYWs{28Af7Wkgr@I?@XBFC$rc}->nng8(SHdnY zWQm+y&!9hg85T|=)tl%pSP#q#fMw2G<@~6|X`ar;VO*N(3}&@-7Wvs~W}HOOW^}WR z9d?y9{rcd18}_4}fwQYR5bwn8%`UqlBzr&S8@AWMpS~JJ=pWeD{>J)wBA(!__VCc> zx{eL!Ot`LSzr0hhr-Q&xuDJ;|W8@w-GH)TqZtN|vYXJ_AwGFrO^(a7(qjtpN_eEqr zT8XqSy+YlfXdx}O23<$5RB02%o|#2ukbS4!0?#)r0XHVz-=bcN9;EL?LuMlWo_MQC z|8ZI(Ys%@P76uMUlVN-UiD&)eg6FiA=A( z%>J(Tn&;*?z$isJv73um2704KnSU?7;4-le)Fbl&9jNsS{jf*w2%q5Z@!lWy4s&bw z4%8#78iO89uf0vGKa|@|l+#*jv*w;9%C)52^F+B;lrvv<;&aV+t7YpZ%C(^!{?$ae zHk1RoCCas-92#4qTpP;aElHGXLpiE1CCas-9CacR<=Rk=2*yOYW|ZU1HBNg=lxwQD zLOD+OO_XaxIXq~Ia&0L0SoX|Bx#pC6CVT3WM7hScl1*8bSLC@&Yp&^DW=b+AeWfPJUkvQvcFz7#rWFaV^_LHnrB zmqA~AE89WzS}_{VRZOK?faONJ_%x#RzUqxum9_YkAFq#!E8Y>lce-2!yuVbU;P+O( zV~F833dD03Mza>exI^M8*EO=fU|0sz{3^jk7y!{VF5?^Kit?yEXf#qw5k;QH3*lp$k>n~*<^eyw+P|jK| ze;vxH$~;J@a#pC4Oa_m#>Y>V5hAcUfo@-KNXOwGJ<+g&NCiC3!`MLF4pAH{xKa8|v#1k-kMYmB4Tf6ORz(a16IOAcQkX+}_KCVL)wLi}JqapiJC0y= z1YA9dakS}H_G4L3vcG?_-((RdxlXd+%ugO#4?;1gy*^6*lIDl8W~h&#R}6eiv{+UWU;_6 zIx0JxNi@zFHA%Uz-+z{^?MHd`|C&bzBn@{wb-I;m_~92ts-+WIM^Tj5f=$n|nMO~J zpU6tg2XzLiw;!JR?%xw?lk+)8z}1+;;t$s`P87QuyB0r3s4R_(XtS**Ozm(gS2d54 zVRZOY!kV4s@wi@wS~56v^v>~~iqX5F=rlNh$Sx$mc_$ue#lS^k2ml*F-()<|DED%W zK559)NqJ|fb&}p$*(ZC}ybV4@GgvgkG&JlMF|eZ-1u-m64S6StsI%a7&?>2&A{nNS zWH5T;LG<)4ql}o&ACvs`VhLhsU=br3`ezp)VwuQ`gcxRv7^?lc2^SP`K{chimHycD zlJxJJ72Ko|7GW=qlJuXS2i)l0CXR8u#UEcY`5-ZSzj>j%vh{O@23Y~-|K5fdE~>#<&gxOCTZD(6lMr4%5gsQvPDXe)bJ9a`E$?5Sk7HTomqD~M(S!Sn zK|nrmHpbs1s~OdqR^11!Jx*&Z=G*!a7e|J4D_-g9RExG_b)&u~$$2b~$#RU=>b|xe zbFx-WZ>?m9fo5hMv5UTfrV!UyK;agP+C*!qlXXvwPTz9*$>+FiV4zgc_V9vBhlI_}T*B&Jm z>C>$~1D{R$OyBgG7$Qj)>-ku$iIB%u{fBE*;^G79`K#+#tXHo6qYk@WYR@4PiSou8 z%h`_2YC265pJrb96}5|ZeoMc>y-=Vkd)`i(twv+SMD{I?4Lv&5Rf@%`Cp6X-8r#Y> zKNt5mIlI0a%d_iGibFh<-R)rH++-I;RLrw0Tcq1iu}fq}b;*S62C9^Kah-=sJ$6cIGeoYaDGASBJl+Uj9IcG(uaGe@`)gAlde&v+WtZ9}3w~8OYno z>mfV0Ho_c)6p84NE7&#FR6?fT{Ey>ire9F6qMV_aP+u3QkH{zTo!UfG%-0529U+WxI71X+ZbL$F^R&%95`wdn+nuDVhv3HB=CBXJbK}vZ*ut9l zWv8*o;Wq?LVQ0fuNDf&nUle{2THyxDlBI^#KtFxNVpy@0KeUX+Mk7PbU+VM?bWyIL zuTt6nR9Y#27t!7KS$}@qt}OO&TlzG*Hh6R=`;#OY5j}4-I>tpkN2}d!Q9i!}qjm2K zpTCXcC&m#TawyxvZyNs>?ba)Owv2PA!bo@XSvKp0+t2<*HbH4z76(&-w4YR#AM;_qpk4-5W2| zPPj%+)ss)U20dK+A#KLdVME;2YyeH@Kzm2}$0~fUS)=~^k$Q2cf7lJr^@+ahWIq+| z9AqyGcMh`G*LTv#7qURT((ebuIjP?c6(!&Ztd+3+a0SKM^79{m9%~ozg;d|&yZ%I9 z*N1)d-xufkOd~r|Z_f1Ot6*MU4zKf`4Xwimvc&C*GB1OX`YJXGumXiyZZSLgc7S=J9w&4m?>SiqT?4JH7 z<`aZM6)U7WE10WPmfVW=a(r)!JwFr|h7Vf>OwW%V2iKVoc=u=zsc}UQt>*TYdV}}R zc9_-sSc&$ps!hw3aC;gG`ZaF+u$t#ItGnc^_L%BVL5%f1XqM zZa>aRZ=J3(4zs!@{)^@e$F-PHIB{IxS&;R$%4ZFcf#1eg(jG;k&xCWD)ElkBgWyGvc)sbKRoK^BoWybKR^41A+-n>+ z3A$=g!vRB<@_d!r>xu=Q3wp4DJlp^Jvz^b|HTkoiAgH;7lZNWfdO| zQSeRM9YF0wF(OM74xSDNQ(@k$vGYa0VLOw!Dmv)0SsChc)mV-0crEjECw`mR)rMbY zdX}}HqL$m1GSKh}QpD>#3npL5Ri^}Tf72l5P&>DaNudtK}G-aEbZ ze_j2+>i2pF$-`#{7}Xv zW;q-kqd%{w-g~FTB^GOCaZQ^Vzj?@rS&JhRJZE7X_ND%Ik()%j_0NMwED`Z13Aap( zTSk3oZSugojB#kwze#uqo7uAAp)zNz!b4?_>G>YM(e_%S^&!k0FSk{XJJ-u&_WkyH zB+;N2tx9Y^{-KpWbqJ-?q7rRLJ6`Nh!B9vL_du4w}qHGMATNvt6zMYI2n^G$s0GFH_jny&owPB z_ZQ^~zEp-!w;a3J_9V{DE?+hzT;`fxa&C*0qYvPuS#oabf3J&EnXjbGyE)0146|j3 zjUe~MGUB|i298%1GfY(Rc$-N7d^ry^pX383o5-weBA$cqDSPHnmh4YD$>N9XseXT! zu4tcr(`R@lSnEpK*I<|-*Y5dl-TKV!rii8N0jZ*|&qBWtSB*u1U{~4;cEw=G znFl&4h>T`((s{Z%E~IYjVf_*pt5Wr>vxtULp=tk-F~wcoW)$(BxY{FRe&3#KTTZ^i z=VLYp&~4lX3JU6*6_noEiJnQjcG8LbEG)SYw6Z+wD0${LZ~yb z(ut;BryrAW5B}BV!aXthQH6WvC&Q?YfOgzehK;wE+8J5IKbLiG>a$U`W$|@x?4@KQ zSZxHeZQvQG@?1faDtjqsIrNXClYxxCEphbOa&)s;?n>V#lB^4D*zxdU%ageFa@A2V z)L-V9U2|>hnN|aCwp^R)S%w_TTpJG;GJ4T{Tn|J8YAHOr=GxeY`MWx+3~OV^wXuHr z$T2&;t#5uVV)j$k+3X?`9QSM!nbjqCZ_~d?G64C%T*y7fe{V_#H20U4txxshx4hMC zQ6tAdGyUS!c<1o4C44qu z_xzWh6#G!NjK{Ji##yV;__1Pwvtk^0GxxSF0}rMe4PH7<4z}Op;={&g%=Ixg4C_|n z)brrfMXPbQ9J|=|B+kwJFB@_$bIqWz_s;Hz`))lk7PDeC5SCHQArGJpHN38*@E1 znUgn9^zTqM;UoRNE6XWoe68fCCKKU(qECm)oyK~8SAVVQGxuOOKGn+L+~q!>noRut z_*2lA@zmsb;E%G0#>aq8lQ~WP7ZC+v#(%l3m><6!yE;1Vc$PHh(&E9t*;@H_3OKc7 zsh>p_uk*CWy*1-~HRJ&IEnbzHV5uf8C#=t^{)&%G3bXv{*I#M({5*X_t~OY^p83i$ z?Vca+i?S%7I=(1F1h@TscEf~aZd~Pys$cEFEX>XBZ+7>6#pn#rluy!LsNsTT@>nyC{zA+=S@&B) zBg7%bB4I2>reE1UM52O4qR(9eeS+B!p6yBUK2c zEMI0L%c%ZL?0I;ace$;YEE^YlPVG@wLn9V@&Kc9okabUvJ+>*UQMx9+jb?0Pk8$tu zvFBt6^i4B{w_8+diehvab-LP9Co=@*PuO}oZ2eTYhPu&RSCSpq z?j$Z;w+7+j*h4sj$ujai2kf2;bKbq30p)ObJq$dF3lkjx8Z7f+cr^7v7C#psI|!8+ zv4c>Fkke~7ug4ze$>Xv*p;+H6-CL3`iDOS6CqSm<6V(C#v+AWh(f>c|?9OM|U-j>) zW__MmdVI^1xHfBY*|2k&V^(qP(MTne>anY_Yu&}2mpT5dtnEgt(8^P8D`sskTUbUZ z6ps+IGr(>#KFqA%$TxfpRNG~b#JD|rXTSJ4v7}^iC;UAf{&ulZj-&V0u02ivCP@ZR z!E#E5klR&BhB6nNCC9aD*Uj*Jnd2s#w%N4%hr82BIPi|SrX z;<QQ0_Pz3btEfDPk5Bv+6E-T`VF1$%8UGHuR0- zXsg@WFC@*}r3k?3?IMmh+WE76i2tkClS!PqZvDbV zv|hSE+f{8(;@ows94->)E_2PQvD@SUSE26Fb1pCQIXlnucLtJ%edOS1RP-xZxMySG_FS~D zHty+qI9?i9UfQBrx$AJ^@TB3Jkp;~$e6ny?@$&w8A~{u?^OO>&o;}vCwl8;!yQ}*# ziR&(6?qnUV8}huaxh~Zu?1Tbmy_p_?gRZHd6Sr~0trp*Af=vM%5m-Web!mTEh^UeFu%|G^W%1Rv4`90Ihx&p#_%z(1G$s^ zNh3Pas - - - - - - - - - - - - - - - - - - - - - - - - SYMBOL 640 - - OFF - - - - SYMBOL 642 - - NORMAL - - - - SYMBOL 643 - - ARMED - - - - SYMBOL 644 - - ALARM - - - - SYMBOL 646 - - FAILED - - - - SYMBOL 652 - - ON - - - - SYMBOL 660 - - AUTO - - - - SYMBOL 675 - - MARGINAL - - - - SYMBOL 835 - - TRIPPED - - - - SYMBOL 922 - - MANUAL - - - - Select - - S - - - - Unack - - U - - - - Alarm - - A - - - - Deact - - D - - - - Alinh - - I - - - - Telem - - E - - - - Manual - - M - - - - TagInfo - - I - - - - - - - - TagCtl - - - - - - N - - - - TagCls - - - - - - H - - - - TagOpn - - O - - - - - - - - RDV - - R - - - - Gmerr - - G - - - - Limovr - - O - - - - Limit1 - - 1 - - - - Kimit2 - - 2 - - - - Limit3 - - 3 - - - - - - - - - - - - - 03/16/06 ADDED DFK 6 -- K. POPE - - - - - 01/05/05 FIXED DFK'S -- K. POPE - - - - - 10/14/04 CHANGED ACRONYM FOR REG CONTROL TO MANUAL / AUTO -- O. WAHLSTROM - - - - - 12/24/03 DISPLAY BUILT AND DATA ADDED -- K. POPE - - - - - 01/06/04 DISPLAY CORRECTED PER R. MCCORMICK -- N. FISHER - - - - - 03/18/04 DISPLAY UPDATED/DFK'S FIXED/APPENDED SYMBOLS MOVED -- T. TURNER - - - - - 03/29/04 REVIEWED -- O. WAHLSTROM - - - - - 05/11/04 RTU BOX FIXED AND DISPLAY UPDATED -- K. POPE - - - - - 10/18/05 REMOVED BUS VOLT MAXIMUM ALARM -- K. POPE - - - - - - - 118TH SOUTH (118TH-SO) - - - - - - - - - - - Salt Lake County, Utah - - - - - - - - - - - REG 1 AUTOMATIC (C) - - - - - To control regulator, right click on the tap position - - - - - indication and select the regulation option. - - - - - XFMR 1 TEMPERATURE - - - - - XFMR 1 NITROGEN CYL LOW - - - - - XFMR 1 LOW OIL LEVEL - - - - - XFMR 1 NITROGEN PRESSURE - - - - - XFMR 1 PRESSURE FAULT - - - - - XFMR 1 LTC CONTROL LOSS - - - - - RELAY LOSS OF AC - - - - - STATION SERVICE - - - - - XFMR 1 LTC FAIL - - - - - XFMR 1 WINDING TEMP TRIP - - - - - XFMR 1 LOCKOUT - - - - - CONTROL SYSTEM FAIL - - - - - UNDER FREQ TRIP RELAY - - - - - CB LOW SPRING CHARGE - - - - - RELAY FAILURE - - - - - CAP 1 VOLT CONTROL (C) - - - - - HMI PLC STALLED - - - - - XFMR 1 LTC FILTER - - - - - CONTROL SYSTEM NON CRITICAL - - - - - Station Alarms - - - - - Regulator 1 Control and Tap Position - - - - - REG 1 TAP POSITION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1234.6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1234.6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1234.6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 16 - - - 12 - - - 8 - - - 4 - - - 0 - - - -4 - - - -8 - - - -12 - - - -16 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REG 1 12KV BUS VOLTS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RTU STATUS: - - - - - - - - - - - - - - - RTU COMMUNICATIONS: - - - - - ENTRY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RTU - 481 - - - - diff --git a/test/rexml/data/t75.xml b/test/rexml/data/t75.xml deleted file mode 100644 index eb3cccee4ba37a..00000000000000 --- a/test/rexml/data/t75.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - ]> - - -Next_Actions - @class - @agenda - this is something I'd like to do - - @dorm - clean room - - @computer - Write general makefile for cs projects - Set up bash podder - - @errands - Purchase geo lab book - - @dublin - -projects - diff --git a/test/rexml/data/test/tests.xml b/test/rexml/data/test/tests.xml deleted file mode 100644 index cf03b42b0b3ee8..00000000000000 --- a/test/rexml/data/test/tests.xml +++ /dev/null @@ -1,683 +0,0 @@ - - - - - - - span - - - - - - - - - - - - - - abd - - - abd - - - a - - - d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 1 - 2 - - - - - - - true - true - - - - - - true - true - true - true - true - true - - - - - - - true - true - true - true - - - 0 - - 1 - - 3 - - false - - false - - false - - false - - true - - true - - - - - - - - - - - - order-by="x" - foo - order-by="x" - - - - - - foobar - - - - - - - - - - - - - - - - - - - - - - - - is tasty - - - - - - - - - - - - - - - - - - - - - true - true - false - true - true - false - - - - - - - - - - - - - - - - - - - - - - a.2 - a.1 - - - - a.4 - a.5 - - - - - - - - - snoop - snoop - file - file - - - - snoop - snoop - - - - - - - - - - - - - - - - - - - - web-app - - - - - - web-app - - - web-app - - - web-app - - - web-app - - - web-app - - - - - - - - - - - - - web-app - web-app - web-app - web-app - web-app - web-app - web-app - web-app - web-app - - - - - - - - - - - web-app - web-app - web-app - web-app - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://c.moreover.com/click/here.pl?x13563273 - - - http://c.moreover.com/click/here.pl?x13563273 - - - http://c.moreover.com/click/here.pl?x13563273 - - - http://c.moreover.com/click/here.pl?x13563273 - - - http://c.moreover.com/click/here.pl?x13563273 - - - http://c.moreover.com/click/here.pl?x13563273 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 196417 - 325 - 1 - 75025 - 46368 - - - - - - - - - - - - - - - - - - - - 2 - - 2 - - - - - - - - - - - - - - Much Ado about Nothing - 4 - 21 - 5 - 35 - 75 - - - - - - - 646 - 142 - 2 - 1 - 3 - 1 - 6 - - - - 5 - - - - - - - - - - - - - - - - - - snoop - snoop - - snoop - - - - 3foo3 - 3snoop3 - - - - - - Pruefgebiete - Pruefgebiete - - - - - - - - ab - ba - ba - db - - - - - - abcd - abcd - abcd - dcba - ab - cd - xy - abcd - abcd - - - - 234 - 12 - - - 12345 - - 345 - 12345 - - - - - - abc - a b c - a b c - - - - - - - - - - - - - SNOOPSERVLET - snoopservlet - SNOOPSERVLET - SNOOPSERVLET - SNOOPSERVLET - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hello - Hey - Hey3 - Hey3 - Hey3 - - - - - - - - - - - - - - - - - - baz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/rexml/data/test/tests.xsl b/test/rexml/data/test/tests.xsl deleted file mode 100644 index 3ecd648b3bf4e8..00000000000000 --- a/test/rexml/data/test/tests.xsl +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/rexml/data/testNamespaces.xml b/test/rexml/data/testNamespaces.xml deleted file mode 100644 index 50f7c9306bd654..00000000000000 --- a/test/rexml/data/testNamespaces.xml +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/test/rexml/data/testsrc.xml b/test/rexml/data/testsrc.xml deleted file mode 100644 index 9c7a78212f283c..00000000000000 --- a/test/rexml/data/testsrc.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - xmlhack - http://www.xmlhack.com - Developer news from the XML community - en-us - Copyright 1999-2001, xmlhack team. - editor@xmlhack.com - webmaster@xmlhack.com - - xmlhack - http://www.xmlhack.com/images/mynetscape88.gif - http://www.xmlhack.com - 88 - 31 - News, opinions, tips and issues concerning XML development - - -Experimental non-XML syntax for RELAX NG -http://www.xmlhack.com/read.php?item=1343 - - James Clark has announced the release of an experimental non-XML syntax for RELAX - NG and a Java translator implementation that converts - instances of the syntax into RELAX NG's XML syntax. - -Schemas - - -Long-awaited entity-resolver Java classes finally released -http://www.xmlhack.com/read.php?item=1342 -Norman Walsh has - announced the release of SAX entityResolver() and JAXP - URIResolver() Java - classes he wrote to implement the OASIS XML Catalogs - Committee Specification (in addition to the TR9401 and - Apache XCatalogs specifications). - -SGML/XML -Java - - - -Beepcore-C framework released -http://www.xmlhack.com/read.php?item=1341 -Invisible Worlds have announced the publication of Beepcore-C, an implementation of the BEEP framework written in C. -Protocols -C++ - - -SVG and XSL-FO by example -http://www.xmlhack.com/read.php?item=1340 -Jirka Jirat has announced the -addition of an XSL-FO and SVG examples repository to the Zvon developer -reference site. -SVG -XSL-FO - - - - - diff --git a/test/rexml/data/text.xml b/test/rexml/data/text.xml deleted file mode 100644 index e1865c7977fa57..00000000000000 --- a/test/rexml/data/text.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - baz - - baz - - baz - - diff --git a/test/rexml/data/ticket_61.xml b/test/rexml/data/ticket_61.xml deleted file mode 100644 index 4df1cc9b866052..00000000000000 --- a/test/rexml/data/ticket_61.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -


MY WORKMATTERADMINISTRATORAIEREPORTSHELPLOGOFF

ListMatters

Open | Closed | All
Open Matters











- diff --git a/test/rexml/data/ticket_68.xml b/test/rexml/data/ticket_68.xml deleted file mode 100644 index 7ab34b08cdddf1..00000000000000 --- a/test/rexml/data/ticket_68.xml +++ /dev/null @@ -1,590 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - -1000000 - -ヽ - - -くりかえし - - -&n; -repetition mark in katakana -Wiederholungszeichen für Katakana -normalerweise nur in vertikaler Schreibweise verwendet -marque de la répétition dans katakana -(JF2) - - - -1000010 - -ヾ - - -くりかえし - - -&n; -voiced repetition mark in katakana -stimmhaftes Wiederholungszeichen für Katakana -normalerweise nur in vertikaler Schreibweise verwendet -marque de la répétition sonore dans katakana -(JF2) - - - -1000020 - -ゝ - - -くりかえし - - -&n; -repetition mark in hiragana -Wiederholungszeichen für Hiragana -normalerweise nur in vertikaler Schreibweise verwendet -marque de la répétition dans hiragana -(JF2) - - - -1000030 - -ゞ - - -くりかえし - - -&n; -voiced repetition mark in hiragana -stimmhaftes Wiederholungszeichen für Hiragana -normalerweise nur in vertikaler Schreibweise verwendet -marque de la répétition sonore dans hiragana -(JF2) - - - -1000040 - -〃 - - -おなじく - - -&n; -ditto mark -знак "то же самое" -Wiederholungszeichen in Tabellen -idem marque -(JF2) - - - -1000050 - -仝 - - -どうじょう - - -&n; -"as above" mark -Abkürzung für "siehe oben" -comme au-dessus -(JF2) - - - -1000060 - -々 - - -くりかえし - - -&n; -repetition of kanji (sometimes voiced) -Wiederholungszeichen für Kanji -(Laut wird durch Wiederholung manchmal stimmhaft) -répétition de kanji(quelquefois a exprimé) -(JF2) - - - -1000070 - -〆 - - -しめ - - -&n; -end or closure mark -Zeichen als eine Art Versiegelung über der zugeklebten Lasche auf der Rückseite eines Briefumschlages -fin ou marque de la fermeture -(JF2) - - - -1000080 - -〇 - - -○ -&iK; - - -かんすうじゼロ - - -&n; -漢数字 -ゼロ -"kanji" zero -Kanji-Ziffer für Null -kanji -(JF2) - - - -1000090 - -○ - - -〇 -&iK; - - -まる - - -&n; -circle (sometimes used for zero) -круг -но́ль -Kreis -Markierung für "richtig" -Maru -(ein japan. Schriftfont hat mindestens drei verschiedene Codierungen und Darstellungen für "maru") -entourez -mettez à zéro -(JF2) - - - -1000100 - -ＡＢＣ順 - - -エービーシーじゅん - - -ええびいしいじゅん - - -&n; -alphabetical order -alphabetische Ordnung -alphabetische Reihenfolge -ordre alphabétique -(JF2) - - - -1000110 - -ＣＤプレーヤー - - -シーディープレーヤー - - -&n; -CD player -CD плеер -проигрыватель компакт-дисков - - - -1000120 - -Ｈな映画 - - -エッチな映画 - - -エッチなえいが - - -&n; -pornographic film -salacious film - - - -1000130 - -Ｎ響 - - -エヌきょう - - -&n; -&abbr; -NHK Symphony Orchestra -NHK Symphonie Orchestre(abbr) -(JF2) - - - -1000140 - -Ｏバック - - -&n; -O-back -skirt with peek-a-boo hole in rump -O En arrière -contournez avec coucou trou dans croupe -(JF2) - - - -1000150 - -ＲＳ２３２ケーブル - - -&n; -rs232 cable -les rs232 câblent -(JF2) - - - diff --git a/test/rexml/data/tutorial.xml b/test/rexml/data/tutorial.xml deleted file mode 100644 index bf5783d09a2423..00000000000000 --- a/test/rexml/data/tutorial.xml +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - - REXML Tutorial - - $Revision: 1.1.2.1 $ - - *2001-296+594 - - http://www.germane-software.com/~ser/software/rexml - - - - ruby - - Sean Russell - - - - -

This is a tutorial for using REXML, - a pure Ruby XML processor.

- - - -

REXML was inspired by the Electric XML library for Java, which - features an easy-to-use API, small size, and speed. Hopefully, REXML, - designed with the same philosophy, has these same features. I've tried - to keep the API as intuitive as possible, and have followed the Ruby - methodology for method naming and code flow, rather than mirroring the - Java API.

- -

REXML supports both tree and stream document parsing. Stream parsing - is faster (about 1.5 times as fast). However, with stream parsing, you - don't get access to features such as XPath.

- -

The API documentation also - contains code snippits to help you learn how to use various methods. - This tutorial serves as a starting point and quick guide to using - REXML.

- - -

We'll start with parsing an XML document

- - require "rexml/document" -file = File.new( "mydoc.xml" ) -doc = REXML::Document.new file - -

Line 3 creates a new document and parses the supplied file. You can - also do the following

- - require "rexml/document" -include REXML # so that we don't have to prefix everything with REXML::... -string = <<EOF - <mydoc> - <someelement attribute="nanoo">Text, text, text</someelement> - </mydoc> -EOF -doc = Document.new string - -

So parsing a string is just as easy as parsing a file. For future - examples, I'm going to omit both the require and - include lines.

- -

Once you have a document, you can access elements in that document - in a number of ways:

- - - The Element class itself has - each_element_with_attribute, a common way of accessing - elements. - - The attribute Element.elements is an - Elements class instance which has the each - and [] methods for accessing elements. Both methods can - be supplied with an XPath for filtering, which makes them very - powerful. - - Since Element is a subclass of Parent, you can - also access the element's children directly through the Array-like - methods Element[], Element.each, Element.find, - Element.delete. This is the fastest way of accessing - children, but note that, being a true array, XPath searches are not - supported, and that all of the element children are contained in - this array, not just the Element children. - - -

Here are a few examples using these methods. First is the source - document used in the examples. Save this as mydoc.xml before running - any of the examples that require it:

- - <inventory title="OmniCorp Store #45x10^3"> - <section name="health"> - <item upc="123456789" stock="12"> - <name>Invisibility Cream</name> - <price>14.50</price> - <description>Makes you invisible</description> - </item> - <item upc="445322344" stock="18"> - <name>Levitation Salve</name> - <price>23.99</price> - <description>Levitate yourself for up to 3 hours per application</description> - </item> - </section> - <section name="food"> - <item upc="485672034" stock="653"> - <name>Blork and Freen Instameal</name> - <price>4.95</price> - <description>A tasty meal in a tablet; just add water</description> - </item> - <item upc="132957764" stock="44"> - <name>Grob winglets</name> - <price>3.56</price> - <description>Tender winglets of Grob. Just add water</description> - </item> - </section> -</inventory> - - doc = Document.new File.new("mydoc.xml") -doc.elements.each("inventory/section") { |element| puts element.attributes["name"] } -# -> health -# -> food -doc.elements.each("*/section/item") { |element| puts element.attributes["upc"] } -# -> 123456789 -# -> 445322344 -# -> 485672034 -# -> 132957764 -root = doc.root -puts root.attributes["title"] -# -> OmniCorp Store #45x10^3 -puts root.elements["section/item[@stock='44']"].attributes["upc"] -# -> 132957764 -puts root.elements["section"].attributes["name"] -# -> health (returns the first encountered matching element) -puts root.elements[1].attributes["name"] -# -> health (returns the FIRST child element) -root.detect {|node| node.kind_of? Element and node.attributes["name"] == "food" } - -

Notice the second-to-last line of code. Element children in REXML - are indexed starting at 1, not 0. This is because XPath itself counts - elements from 1, and REXML maintains this relationship; IE, - root.elements['*[1]'] == root.elements[1]. The last line - finds the first child element with the name of "food". As you can see - in this example, accessing attributes is also straightforward.

- -

You can also access xpaths directly via the XPath class.

- - # The invisibility cream is the first <item> -invisibility = XPath.first( doc, "//item" ) -# Prints out all of the prices -XPath.each( doc, "//price") { |element| puts element.text } -# Gets an array of all of the "name" elements in the document. -names = XPath.match( doc, "//name" ) - -

Another way of getting an array of matching nodes is through - Element.elements.to_a(). Although this is a method on elements, if - passed an XPath it can return an array of arbitrary objects. This is - due to the fact that XPath itself can return arbitrary nodes - (Attribute nodes, Text nodes, and Element nodes).

- - all_elements = doc.elements.to_a -all_children = doc.to_a -all_upc_strings = doc.elements.to_a( "//item/attribute::upc" ) -all_name_elements = doc.elements.to_a( "//name" ) - - - -

REXML attempts to make the common case simple, but this means that - the uncommon case can be complicated. This is especially true with - Text nodes.

- -

Text nodes have a lot of behavior, and in the case of internal - entities, what you get may be different from what you expect. When - REXML reads an XML document, in parses the DTD and creates an internal - table of entities. If it finds any of these entities in the document, - it replaces them with their values:

- - doc = Document.new '<!DOCTYPE foo [ -<!ENTITY ent "replace"> -]><a>&ent;</a>' -doc.root.text #-> "replace" - - -

When you write the document back out, REXML replaces the values - with the entity reference:

- - doc.to_s -# Generates: -# <!DOCTYPE foo [ -# <!ENTITY ent "replace"> -# ]><a>&ent;</a> - -

But there's a problem. What happens if only some of the words are - also entity reference values?

- - doc = Document.new '<!DOCTYPE foo [ -<!ENTITY ent "replace"> -]><a>replace &ent;</a>' -doc.root.text #-> "replace replace" - - -

Well, REXML does the only thing it can:

- - doc.to_s -# Generates: -# <!DOCTYPE foo [ -# <!ENTITY ent "replace"> -# ]><a>&ent; &ent;</a> - -

This is probably not what you expect. However, when designing - REXML, I had a choice between this behavior, and using immutable text - nodes. The problem is that, if you can change the text in a node, - REXML can never tell which tokens you want to have replaced with - entities. There is a wrinkle: REXML will write what it gets in as long - as you don't access the text. This is because REXML does lazy - evaluation of entities. Therefore,

- - doc = Document.new( '<!DOCTYPE foo - [ <!ENTITY ent "replace"> ]><a>replace - &ent;</a>' ) doc.to_s # Generates: # <!DOCTYPE foo [ # - <!ENTITY ent "replace"> # ]><a>replace - &ent;</a> doc.root.text #-> Now accessed, - entities have been resolved doc.to_s # Generates: # <!DOCTYPE foo [ - # <!ENTITY ent "replace"> # ]><a>&ent; - &ent;</a> - -

There is a programmatic solution: :raw. If you set the - :raw flag on any Text or Element node, the entities - within that node will not be processed. This means that you'll have to - deal with entities yourself:

- - doc = Document.new('<!DOCTYPE - foo [ <!ENTITY ent "replace"> ]><a>replace - &ent;</a>',{:raw=>:all}) - doc.root.text #-> "replace &ent;" doc.to_s # Generates: # - <!DOCTYPE foo [ # <!ENTITY ent "replace"> # - ]><a>replace &ent;</a> - - - -

Again, there are a couple of mechanisms for creating XML documents - in REXML. Adding elements by hand is faster than the convenience - method, but which you use will probably be a matter of aesthetics.

- - el = someelement.add_element "myel" -# creates an element named "myel", adds it to "someelement", and returns it -el2 = el.add_element "another", {"id"=>"10"} -# does the same, but also sets attribute "id" of el2 to "10" -el3 = Element.new "blah" -el1.elements << el3 -el3.attributes["myid"] = "sean" -# creates el3 "blah", adds it to el1, then sets attribute "myid" to "sean" - -

If you want to add text to an element, you can do it by either - creating Text objects and adding them to the element, or by using the - convenience method text=

- - el1 = Element.new "myelement" -el1.text = "Hello world!" -# -> <myelement>Hello world!</myelement> -el1.add_text "Hello dolly" -# -> <myelement>Hello world!Hello dolly</element> -el1.add Text.new("Goodbye") -# -> <myelement>Hello world!Hello dollyGoodbye</element> -el1 << Text.new(" cruel world") -# -> <myelement>Hello world!Hello dollyGoodbye cruel world</element> - -

But note that each of these text objects are still stored as - separate objects; el1.text will return "Hello world!"; - el1[2] will return a Text object with the contents - "Goodbye".

- -

Please be aware that all text nodes in REXML are UTF-8 encoded, and - all of your code must reflect this. You may input and output other - encodings (UTF-8, UTF-16, ISO-8859-1, and UNILE are all supported, - input and output), but within your program, you must pass REXML UTF-8 - strings.

- -

I can't emphasize this enough, because people do have problems with - this. REXML can't possibly alway guess correctly how your text is - encoded, so it always assumes the text is UTF-8. It also does not warn - you when you try to add text which isn't properly encoded, for the - same reason. You must make sure that you are adding UTF-8 text. -  If you're adding standard 7-bit ASCII, which is most common, you - don't have to worry.  If you're using ISO-8859-1 text (characters - above 0x80), you must convert it to UTF-8 before adding it to an - element.  You can do this with the shard: - text.unpack("C*").pack("U*"). If you ignore this warning - and add 8-bit ASCII characters to your documents, your code may - work... or it may not.  In either case, REXML is not at fault. - You have been warned.

- -

One last thing: alternate encoding output support only works from - Document.write() and Document.to_s(). If you want to write out other - nodes with a particular encoding, you must wrap your output object - with Output:

- - e = Element.new "<a/>" -e.text = "f\xfcr" # ISO-8859-1 'ü' -o = '' -e.write( Output.new( o, "ISO-8859-1" ) ) - - -

You can pass Output any of the supported encodings.

- -

If you want to insert an element between two elements, you can use - either the standard Ruby array notation, or - Parent.insert_before and - Parent.insert_after.

- - doc = Document.new "<a><one/><three/></a>" -doc.root[1,0] = Element.new "two" -# -> <a><one/><two/><three/></a> -three = doc.elements["a/three"] -doc.root.insert_after three, Element.new "four" -# -> <a><one/><two/><three/><four/></a> -# A convenience method allows you to insert before/after an XPath: -doc.root.insert_after( "//one", Element.new("one-five") ) -# -> <a><one/><one-five/><two/><three/><four/></a> -# Another convenience method allows you to insert after/before an element: -four = doc.elements["//four"] -four.previous_sibling = Element.new("three-five") -# -> <a><one/><one-five/><two/><three/><three-five/><four/></a> - -

The raw flag in the Text constructor can - be used to tell REXML to leave strings which have entities defined for - them alone.

- - doc = Document.new( "<?xml version='1.0?> -<!DOCTYPE foo SYSTEM 'foo.dtd' [ -<!ENTITY % s "Sean"> -]> -<a/>" -t = Text.new( "Sean", false, nil, false ) -doc.root.text = t -t.to_s # -> &s; -t = Text.new( "Sean", false, nil, true ) -doc.root.text = t -t.to_s # -> Sean - -

Note that, in all cases, the value() method returns - the text with entities expanded, so the raw flag only - affects the to_s() method. If the raw is set - for a text node, then to_s() will not entities will not - normalize (turn into entities) entity values. You can not create raw - text nodes that contain illegal XML, so the following will generate a - parse error:

- - t = Text.new( "&", false, nil, true ) - -

You can also tell REXML to set the Text children of given elements - to raw automatically, on parsing or creating:

- - doc = REXML::Document.new( source, { :raw => %w{ tag1 tag2 tag3 } } - -

In this example, all tags named "tag1", "tag2", or "tag3" will have - any Text children set to raw text. If you want to have all of the text - processed as raw text, pass in the :all tag:

- - doc = REXML::Document.new( source, { :raw => :all }) - - - -

There aren't many things that are more simple than writing a REXML - tree. Simply pass an object that supports <<( String - ) to the write method of any object. In Ruby, both - IO instances (File) and String instances support <<.

- - doc.write $stdout -output = "" -doc.write output - -

If you want REXML to pretty-print output, pass write() - an indent value greater than -1:

- - doc.write( $stdout, 0 ) - -

REXML will not, by default, write out the XML declaration unless - you specifically ask for them. If a document is read that contains an - XML declaration, that declaration will be written - faithfully. The other way you can tell REXML to write the declaration - is to specifically add the declaration:

- - doc = Document.new -doc.add_element 'foo' -doc.to_s #-> <foo/> -doc << XMLDecl.new -doc.to_s #-> <?xml version='1.0'?><foo/> - - - -

There are four main methods of iterating over children. - Element.each, which iterates over all the children; - Element.elements.each, which iterates over just the child - Elements; Element.next_element and - Element.previous_element, which can be used to fetch the - next Element siblings; and Element.next_sibling and - Eleemnt.previous_sibling, which fetches the next and - previous siblings, regardless of type.

- - - -

REXML stream parsing requires you to supply a Listener class. When - REXML encounters events in a document (tag start, text, etc.) it - notifies your listener class of the event. You can supply any subset - of the methods, but make sure you implement method_missing if you - don't implement them all. A StreamListener module has been supplied as - a template for you to use.

- - list = MyListener.new -source = File.new "mydoc.xml" -REXML::Document.parse_stream(source, list) - -

Stream parsing in REXML is much like SAX, where events are - generated when the parser encounters them in the process of parsing - the document. When a tag is encountered, the stream listener's - tag_start() method is called. When the tag end is - encountered, tag_end() is called. When text is - encountered, text() is called, and so on, until the end - of the stream is reached. One other note: the method - entity() is called when an &entity; is - encountered in text, and only then.

- -

Please look at the StreamListener - API for more information.You must generate the API - documentation with rdoc or download the API documentation from the - REXML website for this documentation.

- - - -

By default, REXML respects whitespace in your document. In many - applications, you want the parser to compress whitespace in your - document. In these cases, you have to tell the parser which elements - you want to respect whitespace in by passing a context to the - parser:

- - doc = REXML::Document.new( source, { :compress_whitespace => %w{ tag1 tag2 tag3 } } - -

Whitespace for tags "tag1", "tag2", and "tag3" will be compressed; - all other tags will have their whitespace respected. Like :raw, you - can set :compress_whitespace to :all, and have all elements have their - whitespace compressed.

- -

You may also use the tag :respect_whitespace, which - flip-flops the behavior. If you use :respect_whitespace - for one or more tags, only those elements will have their whitespace - respected; all other tags will have their whitespace compressed.

- - - -

REXML does some automatic processing of entities for your - convenience. The processed entities are &, <, >, ", and '. - If REXML finds any of these characters in Text or Attribute values, it - automatically turns them into entity references when it writes them - out. Additionally, when REXML finds any of these entity references in - a document source, it converts them to their character equivalents. - All other entity references are left unprocessed. If REXML finds an - &, <, or > in the document source, it will generate a - parsing error.

- - bad_source = "<a>Cats & dogs</a>" -good_source = "<a>Cats &amp; &#100;ogs</a>" -doc = REXML::Document.new bad_source -# Generates a parse error -doc = REXML::Document.new good_source -puts doc.root.text -# -> "Cats & &#100;ogs" -doc.root.write $stdout -# -> "<a>Cats &amp; &#100;ogs</a>" -doc.root.attributes["m"] = "x'y\"z" -puts doc.root.attributes["m"] -# -> "x'y\"z" -doc.root.write $stdout -# -> "<a m='x&apos;y&quot;z'>Cats &amp; &#100;ogs</a>" - - - -

Namespaces are fully supported in REXML and within the XPath - parser. There are a few caveats when using XPath, however:

- - - If you don't supply a namespace mapping, the default namespace - mapping of the context element is used. This has its limitations, - but is convenient for most purposes. - - If you need to supply a namespace mapping, you must use the - XPath methods each, first, and - match and pass them the mapping. - - - source = "<a xmlns:x='foo' xmlns:y='bar'><x:b id='1'/><y:b id='2'/></a>" -doc = Document.new source -doc.elements["/a/x:b"].attributes["id"] # -> '1' -XPath.first(doc, "/a/m:b", {"m"=>"bar"}).attributes["id"] # -> '2' -doc.elements["//x:b"].prefix # -> 'x' -doc.elements["//x:b"].namespace # -> 'foo' -XPath.first(doc, "//m:b", {"m"=>"bar"}).prefix # -> 'y' - - - -

The pull parser API is not yet stable. When it settles down, I'll - fill in this section. For now, you'll have to bite the bullet and read - the PullParser - API docs. Ignore the PullListener class; it is a private helper - class.

- - - -

The original REXML stream parsing API is very minimal. This also - means that it is fairly fast. For a more complex, more "standard" API, - REXML also includes a streaming parser with a SAX2+ API. This API - differs from SAX2 in a couple of ways, such as having more filters and - multiple notification mechanisms, but the core API is SAX2.

- -

The two classes in the SAX2 API are SAX2Parser - and SAX2Listener. - You can use the parser in one of five ways, depending on your needs. - Three of the ways are useful if you are filtering for a small number - of events in the document, such as just printing out the names of all - of the elements in a document, or getting all of the text in a - document. The other two ways are for more complex processing, where - you want to be notified of multiple events. The first three involve - Procs, and the last two involve listeners. The listener mechanisms are - very similar to the original REXML streaming API, with the addition of - filtering options, and are faster than the proc mechanisms.

- -

An example is worth a thousand words, so we'll just take a look at - a small example of each of the mechanisms. The first example involves - printing out only the text content of a document.

- - require 'rexml/sax2parser' -parser = REXML::SAX2Parser.new( File.new( 'documentation.xml' ) ) -parser.listen( :characters ) {|text| puts text } -parser.parse - -

In this example, we tell the parser to call our block for every - characters event. "characters" is what SAX2 calls Text - nodes. The event is identified by the symbol :characters. - There are a number of these events, including - :element_start, :end_prefix_mapping, and so - on; the events are named after the methods in the - SAX2Listener API, so refer to that document for a - complete list.

- -

You can additionally filter for particular elements by passing an - array of tag names to the listen method. In further - examples, we will not include the require or parser - construction lines, as they are the same for all of these - examples.

- - parser.listen( :characters, %w{ changelog todo } ) {|text| puts text } -parser.parse - -

In this example, only the text content of changelog and todo - elements will be printed. The array of tag names can also contain - regular expressions which the element names will be matched - against.

- -

Finally, as a shortcut, if you do not pass a symbol to the listen - method, it will default to :element_start

- - parser.listen( %w{ item }) do |uri,localname,qname,attributes| - puts attributes['version'] -end -parser.parse - -

This example prints the "version" attribute of all "item" elements - in the document. Notice that the number of arguments passed to the - block is larger than for :text; again, check the - SAX2Listener API for a list of what arguments are passed the blocks - for a given event.

- -

The last two mechanisms for parsing use the SAX2Listener API. Like - StreamListener, SAX2Listener is a module, so you can - include it in your class to give you an adapter. To use - the listener model, create a class that implements some of the - SAX2Listener methods, or all of them if you don't include the - SAX2Listener model. Add them to a parser as you would blocks, and when - the parser is run, the methods will be called when events occur. - Listeners do not use event symbols, but they can filter on element - names.

- - listener1 = MySAX2Listener.new -listener2 = MySAX2Listener.new -parser.listen( listener1 ) -parser.listen( %{ changelog, todo, credits }, listener2 ) -parser.parse - -

In the previous example, listener1 will be notified of - all events that occur, and listener2 will only be - notified of events that occur in changelog, - todo, and credits elements. We also see that - multiple listeners can be added to the same parser; multiple blocks - can also be added, and listeners and blocks can be mixed together.

- -

There is, as yet, no mechanism for recursion. Two upcoming features - of the SAX2 API will be the ability to filter based on an XPath, and - the ability to specify filtering on an elemnt and all of its - descendants.

- -

WARNING: The SAX2 API for dealing with doctype (DTD) - events almost certainly will change.

- - - -

Michael Neumann contributed some convenience functions for nodes, - and they are general enough that I've included. Michael's use-case - examples follow: # - Starting with +root_node+, we recursively look for a node with the - given # +tag+, the given +attributes+ (a Hash) and whoose text equals - or matches the # +text+ string or regular expression. # # To find the - following node: # # <td class='abc'>text</td> # # We use: - # # find_node(root, 'td', {'class' => 'abc'}, "text") # # Returns - +nil+ if no matching node was found. def find_node(root_node, tag, - attributes, text) root_node.find_first_recursive {|node| node.name == - tag and attributes.all? {|attr, val| node.attributes[attr] == val} and - text === node.text } end # # Extract specific columns (specified by - the position of it's corresponding # header column) from a table. # # - Given the following table: # # <table> # <tr> # - <td>A</td> # <td>B</td> # - <td>C</td> # </tr> # <tr> # - <td>A.1</td> # <td>B.1</td> # - <td>C.1</td> # </tr> # <tr> # - <td>A.2</td> # <td>B.2</td> # - <td>C.2</td> # </tr> # </table> # # To extract - the first (A) and last (C) column: # # extract_from_table(root_node, - ["A", "C"]) # # And you get this as result: # # [ # ["A.1", "C.1"], # - ["A.2", "C.2"] # ] # def extract_from_table(root_node, headers) # - extract and collect all header nodes header_nodes = headers.collect { - |header| find_node(root_node, 'td', {}, header) } raise "some headers - not found" if header_nodes.compact.size < headers.size # assert - that all headers have the same parent 'header_row', which is the row # - in which the header_nodes are contained. 'table' is the surrounding - table tag. header_row = header_nodes.first.parent table = - header_row.parent raise "different parents" unless header_nodes.all? - {|n| n.parent == header_row} # we now iterate over all rows in the - table that follows the header_row. # for each row we collect the - elements at the same positions as the header_nodes. # this is what we - finally return from the method. (header_row.index_in_parent+1 .. - table.elements.size).collect do |inx| row = table.elements[inx] - header_nodes.collect { |n| row.elements[ n.index_in_parent ].text } - end end

- - - -

This isn't everything there is to REXML, but it should be enough to - get started. Check the API - documentationYou must generate the API documentation - with rdoc or download the API documentation from the REXML website for - this documentation. for particulars and more examples. - There are plenty of unit tests in the test/ directory, - and these are great sources of working examples.

- - - - - -

Among the people who've contributed to this document are:

- - - Eichert, Diana (bug - fix) - - - \ No newline at end of file diff --git a/test/rexml/data/underscore.xml b/test/rexml/data/underscore.xml deleted file mode 100644 index 111446f4bd4e50..00000000000000 --- a/test/rexml/data/underscore.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 1 - <_b>2 - - diff --git a/test/rexml/data/utf16.xml b/test/rexml/data/utf16.xml deleted file mode 100644 index f7e5e90d0cee84f53b1c3dbf565d98f9575169e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207464 zcmeF)*>Y7&vMy-d?lP-)z|KY4DWh_u4v=dbueC3| zpH1J+%siX9Gjn_9VQPJsc0Z-fzoi~D>Jh%YIc!V)|CRJU=k3&oO5A8%{l|KR#}8AR zvD!|}S7t8FTnpWLx7yKBbnVW3Ns8XyP0PFC?Lo@;zuNs*{!`Zvyu|zUt~WKd8~Ide zMgMxrR9&}|UL*Y<8SB-qe_y&0+30$?G4nQQEyuJx8)?S~{ub_@&GYO0U7lGAxBr%T zu$UP!*UhTA)c(3lTgqrGN5%nV37b*$xiBQpYB>#6xvs7K8(U+cN@UsHZPlo(U_hM!wL>EEYhdS8B&()oWI zN^36sJMeVz--f4W|7|Ee_b*84zup@E*%Tcmm3j&K_v~gRUAH^wO8TD4ZsC(R@3ZS2 zbbDjJFOrE(WBL+Fx|>gOu0{s-@=VQk9lQAMVO^6sTH70uo}W4?y?rQUd%8y7^%D1M z+N>5(@qT8jlhJ*-X%w~gO3!;8x$cRs^*(fNTH-C$kSo$gYjgDP>K7Vf~|I6<4gF%1CTRp1Q=`_^X(T!=CZ=#PGg^jdA zyQJ+I<+q&%Q5xpeq^u{cbmv-6R?2Q@HCu;T^HJscwPeMar?t}5M%V52?je1@WgZ@# zb0_qh=lG?THamB^aXEP#jZY}sOD%M%Mn(Hy+@f0>54@-qS~i8bG(LvIxi&5TrOaM^ zL+6(~)3}E7uk>HzB**vZ+DQLDCl5Ln@_Q;JSXMN>PkENU*wua`?{4I${`&uN=E=;1 z!~eGr|6k4jCz*r(nukwPtG|og-?QD{+7(Yi-*D{lcsthFL3;i!v>o5CK5wm9Jko<& z1^wIa)ik6)xs&A`UuVO)(AQX2bdyDEhvU`1*JE;cvy;zkJu9u{JC)C5_HH*upOWuP ze!q5O)z3?HeD3C@9cVp2tvqXGwzF4eJB}QctFKG1j;3dn?j|c+YtyK$Svw#3$!aPp z#>@4!j`OtDJj^kan6E;s6}}f9t#)&!&xtG0gth$LOun7`u&dUS&#q+Eky6&rT4oJC zv18HjBjtv?TkqD{Nm|oVapUA=hAnNRrQNLJci-*Pxx+S2mV0{r@4`C>19?Pyz{gR} z!6i15hI4&O$Cn$nrwwEAHm$wR({QBPuJKz?sapUp?l*72O?Bze+iGo-^F^RnZPy#?juLZMNxAn*SX-R4xs8MQPXkf=S!hr7?; zGarnTbzc8V6F!`k~X6rm=ch=IFP_)zNH<-)3$F z%`~g0)z#-3)@LSJo5t=-_rD}gqw0I_kFTe1^I6wl=;Enp>U7k#?&(dpgObLZzw_i& z(Cq(=X7it2U#3&g*L*w`Y9H#u)=7=i^tz|#|M7Nu8r!&>ti8V6u+34+i>-E)ZP{k| zaW>^2ZKv6yCvB(C-}+Pg$Wg2R@12xg%gnUzkayNh?NDtGF=OqDy*wc^c9N@Ub@YqE z2H>jp{o47D&eN!?n&>b^0qMlXrnxuSuSUJFAACRGQMFFnmr83q+gY+rQyI1}t<11~ zJQ~*%nl>`+-FVr_J?>~5TYcZlKdk#zCtr55#*JS;0_DXhtL1xnhII}3@j1KZ+ru8y zCC5i(^!-t_v>HkM-@3gE7C&CsXs%&hL;R>_E1U=Rucs`7CV#4hhEn`!xs$e8{)3Wo zCuwV#f7r&*vfd46#!;5>_pR(W=T5eQmHNKE)z7$2Vec@88eHJ2)HkU@7_=f8Z#6llgn<)WnHE`Q}#}B;vl+O+AtsQd)ejIa{tE2z7D6yXBB&VdI^Z!^f&7InBGp-HN6B{ ze{8LduYG!SAIs2I^{{_`&q$KM?3h9}+0tJ!wxeT$_MJmZ)m~4(7}nFUzfUvQCwizX zu9uxVy)=>e?iJ_ife2=;sCQDwF| zS!o`9?6^dh&{p~uhE_hGSgmxC1SCT1{ZS>_DD?XeIkDOG#rhw5ZbtJ!l?oFWU#E=* zHv4*LJ^DQ)}+)rEX0fm#>#&e@|__ zkB>yII3^e`35g@WMUI=#C&~G}npqaS1LCFZ4%6x!%`>d6jW7$Y5K;&nc~cq+3tX){ zPT%|0>dERFw!W2C%q>!|b|!qP`M{z(`u%UwlV0b?EVFBoHc%)&r<%Jc`d<0(zaO{e z)TG{Kb2U0e*@)UY6%FIo;Vd~S=dkDe0XVymxpnT)Q`pjm`D*31yvv==RFul&WZ9HGAcRur>Y$Z7->mzPK&{GsMm^-Rk#tf%-tjh^L^ z5t^1`vYu(J{VnsT#-!SsmSu4!+Fu*e{MO>$T9GzoWPxGbGmPV;LcR0(A&M~Z~wbn-%*qKC| z4rv*_J*qUFgvamvp)?uR+}=$qTkDDsLQD(EJ#2aO?ey|Z(;#iz%4n_k`o*X|HGIzw zP_hue@i)UZ?V@F8HgC2)i#M6gRXqECp6}OI_?aE}`!$Z|8`jFMWph>Z@>8)>x<>O1Ypb%~r|kQAzF*sD%QY60^^N8l*2sbt!SQhl$ELrVUV5~J zqN6WA`gT|YI{^M%J~sN|t0|NmmupyKtsUb9JLA)5IkAe*AI|loa~xd{+rc`Y%TKMC z(OTO3$r`-bAE9F*H4Jyx$s9-3(pnKscK%RjC_1W+_I|Q_@z?vFAM;uNwKrEC)AAf$ zQ)`Rlt9^O2miB(K2HITVL(MJ{<2I^YPUacbGqi=vj{()RD~!iVLSl}$n|mqA&Tdvv z$;5`L_(VR9>+{FuKQ*XvXrZz3#Q~n`WJ~dW)K(w0q#^an9~Uua*ZQ0`kFu~&bvRe8 z`J?lcggg3ulQBovN6oa{bB})-|4Mv_3Q5IxkeGVka9) zF#X+V`I`9~v3l8ty_PbnAC0~pt>GxG5SnfWJ?i~vEsc&gM!oj=BYGnaAFUVuh~}uK zaa!zcaDG1j-wq|=_w!8eqm@$Fk&)ud7;1#Wx1;5Uv%Tk!(^JY%e|vll(|R?nuF-ts z^?uD9+#FdIrS0=&jlUT!Td`j)U&DjQ-kO6)zaOoq=Gjn_?`PjIb+lBQcf%ZWnYp#k zO?x|9zRkAL^3A@O_I9*H@)=Gl32`sHEyT$R>;xi zTMG-(HYUrrx1;4rQZWytah(tw%GR0#-_J8zU%yL#PhYUUX$;@j0Qw!^B)NzB0`FzT zb=T+|r(1kKx6_$bTk{suDQXVaslro|A`;OdF3v)^EJQ z`}NLS-_OxeKT@^GNAQo>2%tA324>8a_ zWi)4tkmJ39fmFSH>Ui!}ugD(M_Lj(K&h3t4MQ@|^s1cX9)vM0o=h0g2Q;iFa(mrJ} z@32;7+vm}oJnT@@h2JfO`aGJeb}S?QF?s3oMZswLv@)&L^CJjTOPyAtpHag$`qa@f z_P*Z7SEJHWCUaJ#6MVaI(4JRuWRtn&Duk`iU1^hfVKL$wMFRG@Tk2%~#sSuJY0;%w z*UX*FzZ02hH>g<7HvgbMefqRgqI#>;!*I%)Y0*iIS39vqTb|JxU}80k`_<8>jpuDW zatlUj)$Gt|{ZU7gH}K2mkLy#%>+a`y@z#ASjkd|W-nN#9)bOYGZzjvNGC1@7oIRyO zdRm_*Yc6`*`(dAproO(>vb|+xW;Gjpm^zui*)L0nQcCWYHky0XmTGc!nA+#Zlcq_H zYBWBTpJbT(`+1MD6n@zXET&!$Yno~A%{p4oBtL%H3Jsf`rU!mMa_g6^Acpgotw3jO zr#X(=W%^yD-|zdhUJja5>S&U`JaxmA@w|PDVqR)@DGhwO&C<8p?+$(1WbNu|`&_?6 zlrG=WCrkA`pefr6il)}D$r7XQ3#Y7Bj_!SLBm8ZkVNT!YdrP5VfPKm+HNBlM7fp-4 zh5kNuJa^-QTfQo1OBv1C+X;BG@VnMGo!;J7X!Q0eqxJqfS`Up^&6*hP(WsRGx9)Wf zx`}zgu9#M;@&1q44`&bOYPH|b;n8+_3!=9G|7;7Qtz>N-Z$b2P$&Oxj#U#y*GecXZ zrA_7@+6gpCGaEI-^l7Df+u&hx|55wl?C&Ff68oV=C7;ZGIDd$I46TaMo|N`Iw8w`j zlX-`_zqrHVmek>!$#RYRc>DdF{apNG_Cw$2AF&^rzvyK4Lz7b{wI5o{*I#Qt{IVc^ zSrG0p>d$}t@-|GKwHe)Oe|Z~5*9`9m8Qw6AKjLj@dSvDodvM^ZV3sT1tm+JDpxOnnvGDmg{>_(RDan^q$m;U=_4d z-zzz^BYOL+PaUPLw;P(4)~Af->}`gMcl;Ta1ns!$?d^+EDtfy?-|(YP8O{0M-;(I{ z%269*ln?c;&DlR@Nz}?XsU^`?e{WliQY5|k9onoLrcLH9t6`Y;I6LCUtO%HNq4wx# zyqctAXfG5JApbCRTA4q`if}Tk>C4lt?4EKrZlBx>(ax#;EE}SyPAQrDZk>CcvXMJE71&pSrET0 zh#!xi8p^9bVnO`vcTMnU?Y-^OEspkRy?v;C7oK%8E21QFY1_wnAewI8sOn{R`9Vf4 zgrUE}o1;thv=6B{xz*76TkZF?jndcK2W=Ocu4DApf&TWNMr-SBg|@5pDdRa?&zt>q zl6a-1-*utm?SvMOaS}U$)>!=?S`XtC_oLO*+^3D^{<(2W4bwcC=Yf{nM)#zihc-_~ zt%%V+j@t!%cXh60{LN@Nx^qP@`Bs^ttWTTF+iZs3KPGoeoy=c00(-mlTmIuL2ld^4@wpJPGba`W<>#1qk0&QX0D+6%?C^6(DRM|;CB z(Bw*u_b_EL@6eC%uNccT+Ut|s60FUJHl4(lXzTo>wnTrTb=rxL;okf+Z3*8)^~;v{ z70>j`8$nz9b@t(}I{Wam;+dLO@mJdt%ZJ)lY4}HJqTcq}f9<}bX`}mZtF157_qX2l zZ$?Z0EL)=a22Ns2l+|+*TLKo?bkC-njP|Fu9D2R5SuLYEhgL(?IZT<%+iI~R%h^7U z=KQ%fL_@w$VneuTsrpr#y?Jn4>{5#$`MDNEo0})GABMhx{)tZ#aMyNzJ9rJ+U8wEkh*XzrnJVc~Zl(J-~ok0UJx z;AdJ1SASUvzfL{;idpK;iv6+@{<;&=;@C^FAGOc)yFQ^wP$mHKnM3~uzT(LRaQ(2(t;`ZM$;@UoNzG)x`sNon0fSvpLa%A?W+o!0_$)Lv5lo`@W`WG&N*wXb*g^7e#Yls>Rw? zTSt}b?S-acPUn7aE#PPWX_WHbN`TH*jeXj9-tqA~iRIvi_p0}J%c0?U|D7y{wn|Rs zZD^Y0$?b-As=w`l({A9Ycm0gAZVHJXe=|Dbbm)p#8fxv8GMTe^7KV9S+GOss6NY&! zWin^85{7wO+GOrFNBg;Sl%_pyA+XB-xt2p)8OPfV(1MDeIjT293jq#LdU`+Rqns+8 zyX2*QH!s&PeX_(*?U$$ZK*%8rtyML{nWq4w36;Vv=R#&|i1MJqS@ zZnW&s)8I5#t&3smWd3%)Qd@f`wIZ7T>#wvT=6_ic;lQsLrC%{hWX!J^rN1ghsYk$j zeSTchwtWL8R668QyT)*DXgJVOdtd3@L&R*DGEPI^qTNK!M%84_;oE=`8z#S7c+@@+Dc)Ad=$r9bF#3HOHFv7S^jSS_AJ7$@!nPL1 z-;K7_+YbFX-ac(IZ?hEoyGP}2sgwE3S{TiJoCUEM{jS-fC-FXzJH;ckOy`g{L;r(2 z$8cvneX<9`n^+&F7Iya^xvlkFbk^$C@pgp%RF978&(Myrx|_a!lr$~fdMHhYDWkpi z#&6@~kebmqljT~Orqj32lR0}z8&{5&i;beb%&^Zt;(z!t%b`C(b5h%(*|UG8?Xd96 zcKBsG{EA%q6}glh?%(6P9r{ye)Ax(v&QPBAVan* zy>hbte$T3X?tA)wtF157dRuS$^wD;Hmfg_nZO3~Xek4w*kj$pzP4|rS-i785>QhF0 zKa5MNI)^Efd50tZS4Ao{U)xFi4e;28LH}&Kp+$C|)N1H4X`1wLJ_jgq8};L@1~aP9 zeVo-W^kALTYUpckb7FM1j9Ulo`?SZ?rVTc}u!Z<{h^h8a4kaR>QE*KVmhQd$m8DBxbd_M|pL|D6`S9WmNQAD0Ac)rUT1G-q!oxX-@nE`92F?#6>3vmR)~#hK&1 z4m~#9+8U>!pKDd;zrOX*xOEcifq$m?Xnw?cC|*>F>6{z45yW5D+@SXywbpt&q4yW| zX`^E!z4;b;8)%q1nZN7=G4pMP9DmxO*9+BseAJS8-Pb;yJ8ByBIQ+A3W<_ONCnvEU z`uk9)_h{65Xy1rFOdTDKf6RL5srlEj9{N82JnNx(eopFfXz0jaX+50%Wj*||9)4L5 zzpRJ9*m`IvX|K_Z?nu4P-FBBgWjtrEzchWiPZ`hKw^v%h(4Lsg+jiGx3$)LZIfqul zA35VNq-Hw8_h(oSy&iYG{m>$dPi8+fz4dtep~dW;*0_39*S!}Vm*kD`4Q`(*+BH{OW>V^wj*TSPsKJ|A^(#`^8V< zcNoStwX+YSGh}EZI9t?K>0fml>yyy%>$LQ*a}K}08P0jYU*{bDx?7f-HqmSHqmr|? z6Mn?+Q1VrsM{D2Bn?BUlr}@{1w!n{B4((fonyx=x=kT_tb4bn6w2zi)y{&fox<)zK z+Xz4JekI=zTRk}5a%dxe63fAzNmcJjEQgkJI=_crhDPgAvu_xsWbB8ZN4fiR?_~Y4 z`;~e->*x9%&K}0{kNYFWIn(Tfq5gfG*lY{uEn#(7%8p`53iPgX+``K1Qqvl`5Y8dwUN34c+ThvKUN7sm*)Zfq~ z;Lw)nR|M&F(%V^&&%5*c_s`2a{kGR(p1OzdCnd5p^b-fG~&M|!njk|}KwQtuQj^g(?dDJ+Z>hy>0 znRhb>BffyENncN!bqf?NxA-!8s&|-cNQ*wbOIi9voxU@6(!gmq??eU!^B)rN2dOvW}yBvzxi} zBP~>Ct&J8tKUvFoKi+3|na!O2qpdZ+!%_8& zx3~Kbw#Tzy(F8};G~Qy(w?E#)wyz&m&v<(z%pY&fU5#e?^jgN-`bS!7BR8#%@pd*N zhdyVHyr22@!}GEAXj&cP?bIy#<88IuD37XVyuF%3f4sfFWfy9?nRPT-(|C(Dizf4( ze08(%%#fpM8gJ1|`s3}j$i3;cjJNfVwA4-*Osiwqj=ukqJ$kf`PuW9hBx{keG@e4C z*1MYDL>}MG6D{gga=eLzFIh}V((!0dtNBY`qT#6JbGOgeF7^GohuQ|+z+H%?F&(5v zZK<1{v=TaKIe*Jj%Y_~~-Kp-5nC)m{FY~jW&sSzH&0I^~k{_e>j`rSYmY!!Hvdf%w z{`IumrzY!Z)c-c~aOOd3t)HT3yv;uEXstN>HZ)Dvu2y3YEjx9{Gd)oM_ezb{kJoEi z6VqETlEqauo|?IrUwY&JmH$t|U9$a6R^NZ-^Qq2P^tb$9K8$eve%(DC(>e0bAEgU3 z&wd}L=`{V3QMw%tzwS7UcW-C*^7%u)m!_E*-U zTl$~fh|Ok9>z0@QvztNxZew>PeY%qQxiWM6aLxZYE9_CYXZjUV za>rX)RKW&Sz)MW2uC zto?Si+i#v_Cf(?AHhbBMEeW8sA?@tuEyL5_^$fxZhgPZC*Rt>eux!R z^zdv~YGdYAxJU+9{)Q`?cZDoK8-7bo_tWl$?&r$kf1fA}p!d^7sB zJgsIQyfSk$Pn&s~ow<{zx#annwIbJ*giyO&vdH57b| z=KLsi-A%svJgsKcUP+!up>ZYomhvor|GnKX0Cg(%0eL-8`)wj^y+3 z&Dbuc#Kp||Poe)xcyzBT@ho{i=DoJhrg!t1Z_mOXYv5k;-OSk4TeQrF!)SY++E9jy zi)jhM^&%YDOpXV6yPnl#mc7i|Pig03YM%>F*VCiRDSIz89HgB)d72N!FVgl#a-L7x zekAIrl)jw$Hd1OoPdlmWN!oas+BZ{nF(sDrd@aw~K=*oPB-&o2zJ>5c`hMO&Ncw7O znonO|XT0#|Ab<7yYMx#t-{;KZo1q&W&r(K-56Nd;Kj|oYl&7=F{Uq(aO1+wfaz z4TaZJ)2oig^-#8&elF(iQc64szi(t*-X<5?K83QCq;I9oYw7#jaQi~nZ*_h;q|rRw z$cU_k1FIb;-gLd%$PANqI&W#XH$$U-nXhgvT1stqJMPgeUW6+Aejlo@B_EESP5QOu z(bL^f_9S%k$D!>;M)Pf+-=|dZXDPkZ1AV?8YG0LpQXi}9ozqbTd-&SyHyr>ieYW!NcUbo)$Ng?_+32HNMSdygujcPWa=j_+IMV&C^C|As6nY zMzZZ;K56lJYF*8{y_7mgZRbO&o$EsAz_oK7eb(IRw7wWl?WDi&)AptCW-I-+UzzRr zb0a<4&(F=gdz&_1W?Xkeam}~)c@MR_oBn(bfA#5BMrA&2ybfigiaqOIS|~}d)$#F7 z{(cH2uezSSN;&+#mU(D@dC|?*`8;oB{GFD#l{PM=A5W8iGqil_+BF87p@)V&mtJh8 z&tl^)c6{4N-^eYzz=xZm`&_t&m-AVLACi|evHCuy41Ml;Qtzf7)U2iU+udCIoOjg)9bEIE8C5BYpMTMa&L8W z{AFsnlQ+(7-O69wdYCc0m44zNl>c;ouP1dkeR&(MX^Wha=X7{|C0u@=)NARfp3jB1 zwHIDU%Vx~oP;omn9VGXs)VbQxX6|mL#C~eR@pozWeA*!Kj0cXI+4s`R?e6`j)TUjM zdA)0YHMzI)Yt7jMuBDE}d|paT5A**ZeIrjcQ~p-o&Zk$#YPXx$_EVCVuDO)<>1R(n z+MZ@6-AOu+&8zU-YPryHgdX)SJ)rTeXRcih$2Zf;*Yxmf+QwtMBRRgDc0Qymz3fc- zZq;2)+L`?Slv-b;ta-nkR_0UUL&}`#p7e>1c_uWkq{h9p_%d_HnBGX=>`WxY+0-mH zel;uYLw*+Wb2n7jd#x4A9+;Mren@>+Wo-b#d?3!QFm!kAlDAeX``gAXEjLGNJ z!1AD>ucTizA++Iy74j^(FQpEejk`_^_R~r0|o_x1D@siNEKQZz*+MOq(~7<74Wp9=z{pyBca=rzfvM zvDsmtdXTo@rF>y@v*nDpUG;NHZe8FQ@*y z;la63x14r%!t=BFJ(F^ulM4H~o)O+jA9li@XL&>CxRt)`hw_Vgx|5l-oxFFG^K>}) zCbMEQPv6458)DN+@6=$bF+p~oVq-aSw4=!d&q3+-rp6$%dW z25m||Nu8fk-&W?u$F#JWvh$(zS@?xoGS@tOAFk5=?2KnaFZ~*Xz8!kal0C-uL0?i@duLK0qYc#UIj!?}z#tPMt|l%*qep!?ke2%!9u` z5MG5!8aciBbm)-(T{eQMp4@Bc7yXVNrv+L#MDRh<-lX5FsdFhKFqgMq(xM2B zd--oYzv<+H8A^kBnA97|OUs$>IQ%qa?xlyM##-8XlHRN&A7A`l>b)MCmcxews2LlK)G3hPE@I?sMoe zgJ2-<^BEV<=a+qbC4KxB`pgIO?M0})lKN@t8%d!(pazB{*+I* zlJiFTLITtM?{>72)bx_C>CfqK3uj*?$Ggmr#r(HMXb*d-ku_Eb6ut67$A!zO-Fz~e zV4$?#rL^`Y?ZN}z=JV;$|2gfl*-4St$@MxpHq)xz>S^d=h3$qW(&a*E!8h2`tJKL7 z!pp7n)-Llj)Z6jCs_ZPgIt~7GXlB{k%^#+(m-9m(G5)1Nt%a*r zI9o*&!@c~xOa8N|^>Rjvtw6GFC+#4$eF+t-d8TtMhT4U^UrfLKKS-{fw0R~q&ipD=I=-om)W4tHcf&n<^=d{1s=-Ep8l6w->GWkTWzAoA!Qim{(F&luJV;yf zp~Maj*P!Loqn5jw_#ySpr}Xud{*rXRB*}wr{J(|*TF7E%hB>-+$hQYw`kCZ37uY#F z-AuZi6}Ft(pn5k_?^;@gJg^>c(mo2~X;1Hx>rFS>ecDN$?x!4_V7xwjgCOnY=R$a7 zem~7Gd%ofLXF|_X-pTRL#PrcNj_d!cVESkq$Myd>rVl%M({cGip4jI+Cs#68p;5+R zDWB*L_cI@%($bfcav}51xLrw()jYq=TeN+QG~LS#q}RgBujc7<(hA$MV_LHfFQpT+ zddR|RXFe?y;?FzaNi9l{M0;uNMOUJ*R;90{2axmCj{fIqo8JLW&u;*2c^=x)X6N{j zbp3&ELg+try@0o{GS-u}pH*qUfVZQKH1RYazSCUocAq1OApYfx;5#TU3h&24YUGt! z58c)>E04bUB0C#91|D)VZ^=)3$aY8D)8wMPZYB>4`f5tp6X_kiWv~o$5RzYh2byD{ zX)F_Z_d@cqy6%Pt3#n%{X*)^#*1hG!V#n^L4gBE+U^~I|c^W7`F}3|S$A|!S})uH&U!ud(La__f^Fs8)7g}G6$}^HfxkZ+N(yF+QC%mMv`-=1t${3F4`+tC^$hF?-XslzkDN)0b}N6Hfxmo8I;! zweSy+8%i#uY}syT`xL6tZk+CfPI%jVXr~R_&s)?yO!;&9{SYe7hAR5b)ztnnsnBAc zM^RX?8k*Hk-p*%b?}sW{{n>nekrZQlCA@=pJx@6+oIcJsZe5=Z6)4|MTWI4gfP?U+ zd<<9bh8LnzL=(J9&&di_2!FA)054%Z@y3V+V{zY3&GfRXX_K^}XKkldSJuQDei@)%CQzM zJV{%;cklB4d1mX~q|xs8^0by(%Lh&ez$;!zxGQ|Xx)%9%H?%>;SllosR>+yWrOTjg zH#PD{yw5wDIh$@heW6*dg_f`Blc;ex&Zp#lpEmBLFQ?N>b({5&Ea=sv^!Y*hwUBql z?|#QGcE)<%n@4x^G@tf)0{O-cQZLWhvy}akevuS(;@!hB<>7-Su`y`-B<-ubrB!~) z4_oeXYBdYzLNS^|>!XZ4&N_$izD|EHCHIT)>1B9vH*MQjp~$>XM#JpCowuLT#@V#_ zA*Eq2*TbEP4>(AQnSpPR2Ds|=tbF^4ed2jWpUgHB9_1a%$zb;S>2O7F-h@)P9S;;+ z(@yd!B^J^?U6p@sC$v9FOC2WHE2FuP)yI=(tPfHb1aUvKKgtu@&Zl;s zpqu&SNB!Ehvy+-WCdb#%GnW>OBfN%{OhTMXUNUkmb-qrU5R#X9;@RNUfKx#F7L!U! zlYn=^`SW>uA$@^7(Fg3ctWBc;orOozASk{;oJG-WW)0i9pv4&P;fqF zNib1vG#Gq?Xuts=;9oPEbaOsO^I|!4@R!cz2Z95WBW=ItzdKjNo!e^`L&;YDUrEi6 z!mX#FZ6RaH_7Zb)E;)EH%tHIw^^6fTfktOe(SS%jt9CK9uZKFcZKVY~q^I5P$`?Mq zmhojX!QAQc@JahJo7~ENmsTHiy+Rpm077go-AUUUp$qn1nEAVuV#_?sTx6vgjn%BM z#qi;2O4CW$PoxV=nT$sp9fke;I$XYxr!#5MZI-k^mi~Iu*q|#JQ^?4>P)P&Y&8#Kw zc?(I^+4SIka;>Gt7op*7+N57X3ZXo9WLoUml)saFS5x2Rj0C^><_Z#6Q9`T!bXYsRkfv_;rt^`Y*5YPrUF*hhH5_2YvsZ7V?XA?tnijqBDXrPZchlyZ zl$gz5S`1|DVrYRNtfd7g8!UpXEq_0(O=&SuXoFUePWwrR-|~&FB**8>7Iu?8$ZQht z!Qz4F@))sw#0eavE~^5XbT0kAkpCaL*+%E$H-+gSHy(_MWuJh&fC{%vZ+H+$^GJhO^Eq(w62c5)dZ zdiCq%z#;3Iwa4Q?d$W@rgd+ZAzWLSUvo{z=v!6b--PQCp`RRbH0l4XY_zw$#ed|3O zUWDD*%p9nVb<<=o4Yjz&j{<+>*L#uCSx!CVJTEK`drb1 z$Xh-Ih#C7yw9Dmu62){kPv0^MEH#*%xEK~M+xcBSvBw~IyUB-d_Iw_`^5|bky?8*{ zTu+~1Onh*50}&B^%s4tf=}h*K@^;qk^nmvMsha`(E_6v22P=qQN{ksh|8aOjkK_;f zl3wq146zidILn$Ts@mH;lbpu;!~i5h)X$>I^mLbn0ra( z-Pub@i!h@lyhxvD#^j(~qhzn0PTakIe)P)iYiR@@OG52H(WF(NV-v ziRQo!lwC{>G?{yOzmq2jHrs(dg)_WSG;10N->Lae7Qar}kExqw0z;Q(ZSvAAhXObN zNjIC`&8C)}t~C-3?IZ~wW5p8CC^tgwYVysd22pBc3G3)(>XIgYO{9nv(MDu|zG(GT zKJ)t-SCP-KWzwZ~6;_Zqow?A+m%ftOyOXppX#p}L>V-6Zo;=p|TI!{H)Sg8P+DT6# z1yBz-`sdKj_R|{{2I)(Cc$~b}-$HVr8^8I9tOxT_#K5bJ=k?@+$3R)kIXIe8rv=)L zMS{_qcajISkYqH@ru4(q^)PRZsTjkploxBps;bB%a&#{(-Od=>omTR0BTphq_5WI^ zyWh>Jl0Aj-(W)+_9BmUaLQ7&Ru&uwP9U2B(oXxzO&up>1v`&wLBRvgurC}_0v_Z4c z2|W?lBd*M;9sUrSHH}-;$Gg-C852vi8Y-_QU7VyS0ddvuleU`Nw^EYyp<|MRtTNL6 zVfgbk&*g{V!6u)~0QkVQ%mPsqw8-_;+~RweJBrzjqCjAQyc&G=;)Hm~t>eY~K1u0E zp_r8~?#jHP-SA>RN()Abbb^<_NJT3_*R3@3crH(N1M$C`9WDA|^;nw^lcFBc1VtNp zNG`TnV+W=G(XR0FbZUnl+LP?cW;OJKP0CWIv-3h;OpQj31%5L}JYe2z`ZB)qH~r(UFudEeLubNBP?-0{lbTWh2wJMLdy!v<|50 zhfrkxi$~!7Vqe)w`1i?$dl?b2nY0)FDShFWyPZ6{se|X%zKs&v3%P!}n{Re8+Np8m zucp(kr1kCO=KWmGOyWo5OJ7U>>>7MI_DC~?R`n$9h?b-E(%!B5i)l-w%a^2*Ek@j! zvV%o-;=R=k%Yh16*Kd+zJvGo`ty3B*`)4zGj5(d}a#}PtFO%OMjz91-au!aE7v!C> z6BTqXqYu}iQ#-jP0&_Rx`98JsVa+D(W;fnYGjYt(euG=bhN>& z$xgbW*bDLx->>Eqe9+z^YM)Q+LAZB6b>7S`-GRj7Wm@Xy>q_2{{UW94HZT}E^3C*| zOo55o#qOm9tW&Lf8Ebu_-|~iOue{>;M#Cwj+T68{zJ|)jsf`2@hx$BYW(O5Xx0hbQ z?%sq7Rs!9Xc$|@a6dKu8;;PQ(X)b+o4(NXBy__dh zJ_${cJ*qIfOfRpZ(>gqW&+@rW!q{V)r?Aq@VCW@}H=UD} zBg$0l56_$^ShCJ3A^9Li_{LlKIw|~OQ2cA*u}Bp52;JTqw=yC3V$f-{>zVZxyCgz% zKIsq!WiRFJlWw$G1&|cpe|t4_>_H^Ke(JGbyvPr$hK48heLkg)xd;n*A=+5x?F7$< zI+k_y$C-0|6ovaVH5m!#0TWVRYq!n;!5q?`b2>`_T@RSqcvyWDM*CqP(qa9@oNLcy_l^ zpOaa1OS1`WbWF2|&S}Sj8H4e07VXLJ%U4#ru$bhpUg)?cFM#q0bw-Pz-MAnnETQO!d4q7B%fODb{ zQL$!jO?Z;O>;zsA`owlxK9}}j3w&eFE?h{fUs8evyB!`uRji?vl;h*)yRqL}3r5Fo zPnUHLpm5xmdF!++uN2P?bgIrT&_S$!Yl*h(3?wR?$0Bc7sH`zT8U@?-8mV84a~*E-tv!~N4~PmAIYo!wc_XnqSdyoIzY>xH#J^4T$+crdDV zZEKWN|CAO)%CI8f<+N!S7cFo$wCTN(C+Xm@c2WKXetnuaY2throEjR0Z(`!_CNKF! zC*V;oujQF=k%hoof>GFYU}Y zyLpBS(LHa5OHVRG`1?L2KVKkzlwHpz;8o{+h6wTXDlbmWh|-nJ#Ydsr+!JFiD&<|? zu{xgRubqgdZhx=}_>bPC|6ekv?48aAK~jx|)$lx@MAnHnv{zeiqV3q~FT%Z*JmDKG z%-tOPNoFi9x%^%5Ks!B@Qluvx0Z&-LJ9*-L5-%$TdONh!(BP3~H_R52IhS($?U1=k zT{)4nGz3}^)W<3BLMGvIVj&;pf7z!-%ni@DeGn{PcQQe8GMnlH&QDUgFi*g!fsmN6SM!(g9|OXc}SaB2-5g| z_-cmmBa5VX)0N_DB1s?^;v!-1u(d*|=-5z7{(W&(B4^BTmN;M6!%)N?6@$X_1H&XA z&BAke3(?{EhYC4ahU-hIhnLcrI?ZAn&0%fZSK($N7I20Qcp-V6cjN(L1&L1O0byBM zduIB#&}F~1=Bz!ZRK$R?<4F)Q)d@v=_ews)PIw+k6IkJyl>Qb9moq{<7HE4OTJhQW z9q}!D`RnW^?TQ8>K7wt{!sLyIe!z>qrq*|v8KU|{q4R(6W;wrQroB(flRP_V1d-Ki zJC;Z(K8Po&S5%7iBD%uaNP5rJ?&)nu8%&*^3<=}MX33okMdl%Vw!BPqb$B_G+R9tWAH#;f8Lo(wus6}A&2IQEw1?m8O6pWUv{_13j18>pWw5lkL{LEmnXT3!gVH?Kk`w z)*_Fs8TURjfvj+{i5>eobnp*418^nzA^P+YqlPw!^Lp|X2M#)VoSkth-`LQUVH6^+ z;3B+aZ!$(Sm8H}MqY$?NYj=u;4#=ZHUvPrZx}v*^3|r{tF@GG46MjpMuB1Gl)k?~W z10+lKI@+AkvAgj0EvLM7skLVvzZdgYEW%n^A?Y5av@_!LZZosu!62qi64HyvX7(tb z|F^U*zKRYl0_IV2iHd~4;yMiHc530%#~V_gH4Q1iH`=3p)66Dywo?;{NsEJP83+2o z!=$i-tW;P5ZHNaS#zWTfznbGtWgKMWpjOtQsH{h!OsoPK;WWGxMOL$wdp-5??AcMt z0&^IGiZ)Lqv3YM6J9lH|>?EDuzSVJ_9JZ%GUD*xniii0GNp;o`E@?z>=bbqEm!YFh zC$o9jk7Tj&r|t1GlGW$KK{1v*0+2EBOE_&;M;re%4*-wF&D4G^xnQ(7>1G1_^8Qi& zicFzL%;qmkkE~&hkmy&Ee=DPeYFvi2S6|3sw;k9OpQT0!rtufS0_B@eFPy8Op}}BC z%!&my%J34A#^XWnBF+Tq@ za?ws)$d$d7`o^&I+o7wRFyK^82WWw`qrNP0R8FB^%3b~&dz#E7A zR-5QTns~*k)9=k_NUeM@b0`^9ioA#5u(bGpSQco5#;J+?cB)@|ljz19NrPq3>0ne1 zrF5f=n?vXaB;WnK5H#@n7Z=%cK0iqG1OLo77q!|&hX>R|) z<;S6tZf>837{c|S1)FIH%CVXj?E5f`-AEbILjRxx{29hll(D!MoToAGcTY=cleR3* z%$`DC*WFEgakK*X0kljz?(MPfu$E|P@D#cjz0VmlF&oZX!ZJkL*$>(Lc3d%=&>hsW z_(&kJGGYtx2aZac5&0$R6e38sgC?>cj0s&7-^438F(saipOX*FsW(yDAJg)kP(*se zfFYBj5&6Q{XHJUnl|nF2=h;~h@{s>nOa`5tb|PX$S5qhK!$)c2+lih`@Ay((OU;YAEeq-byLIyH&=w23_K9=P$Fv)u}jM zLiZ9t5#0E7KXmVaAno;xs`;{?q z=gi0a((Cq9pIa_O@v_Eg>7vW)E+0DD-Ly^fl^@2y;&TeoIeus8aE-PP5jS6)qHxk0 zo&5K;pYEqu)~A~IzsM7_^I_`Xce3i~Ut%pUr9LquyWwi#z8hW6bK#oyp$mMjkTP`G zaq-$sD$pcr9`fbeAYs5GXK&AsHHTOD-#Ii07u)T%$c|NL|8 zuydiA#!(j0PWa9W;{jydvDWy?#4m~ETuUD>r374&{6|&$&3mY6?MJ_mrE0%{RTVyS}j#t*YcfZ13TA~5s zzldm31_oFDH@dp>BhK(TFLftRtPnAzPWrscJ2RTLj5Y|?Y3m^@$WWx6XzJK3^V9bK`U!?}r#y{2_ah)+pk#^fwY_BlWN*VcD!;*b`3( z55M*1mJ=Q~{pZc+9e|UP_;eWO19n4+=ppep@Na$jlK&4vgPSj`Zy3W;C^BQjA*`f_ zPH?B&u`NXE87V^SeBEZ^iKR_ah0rO<&ynkX80h!q%}8P z80Wf6!Oc-5gcC}}?rHuS`K|O_%%8ml!ul$uMe>U&C$D%xFJ^X#JT<0}zKSHU63*n4 zcv&Z9Afq(rGhO@8b8~Gme1ovS!0eg)HRKuu?{w&4zig#ftSNIC>aiV~cS5ZgT=sQ9IgBEV0|zETFb}u5sFaf!&%TgaWoT1KFQ2t ze3nmc`CxOV@;dBp^0uBSWpvvne53 z)v918u|;6%dhM*4{Z-5|Dp>CBs}M~nhG8#!Fn`2$IWK9)7Z0?P(iQJ8o4g{gR?{K0EBJj(( zv_tA&N{aIjW)?3uy^JiolQJUp*vnSX!;Tj;Jhif|3+3w*i z%y#nBNi5M=^ufz{WAsE0SjiPb>)Z=}j2ZGUIpJdEJ+}jhW)+WqkTmxf6ih zZdJRv&b`TYMP5O^KCySV(*Jv@b1^*QO=7Lmvfwi!K%8xJ9!n(iN@_lvRm|I>-LHr9 zjVxu><(sW{<3|E|_?d-LSBrU;GNPic8#EG~8{nEih- z^Oetp%}B?F9k3o*lyxtKH07KuYIZ3b(wt#Kn#1H9pJGKK7-^WSnP}#gg-YJBP*`ew zal9*V9Va{S4aSZNNd5iHAfAyY$s^YBS!NMz&`CKqA6twy>efCOuGj!`&Mv%}zB+qF zBDv*-fVuwp;CoE3h#( ztUEbaN2KAC@RS8+Prw!aHF~CffPHtaD*^lCC3Z>yj;IHA-0R8h%o+c<{m*$FlFr)Z z4Px0Dce3+tT1Ok5kUsYzdC6_4Br6))Pn)yD@v)xJ@Se*AqDK8mDf^+No_X7SbVe%;95wd8|A*2yR_UE*9=s!kt? zwygUP%@)$&aZ0RYcG%BZ)aIx4;-(HBFt)F_r^|W5H)t#?iGC^WfTnSf8bk(F`~nRe z_gILmCVL)Fs5Mh(Jls=>1ELq4b`n*^E?r708%JD$^TB+sY%Lsxs=!6*Z(@FF9K7POZM!}lopQjO;tI%iu zVo~BOU_RNs%pfNfpiXtWp1WK`(1e9Nf1fl$Qn^H4%kx%JR$WVbjEYM-OKYZou< ztn?Xc6K&dLXOm!}!J*jpb3SZ7K9M6N8Z?9L0-X}AY{o=ChLv zr3ugp&!i?^h>h@MJ8d}&;_e7KwY$W`9XN@1Cut9ot1K3gBdkX;(!4Q{ZT85yd?F8c zo7gg9R>YOCmS#J?IR{5Cv47w%UkX3Pc50hTc_Z{SX_qo;JZSj%Iy_?muvJPn-%4Iy zW3mi|m(td?&{AVg_FKbWk_){bQxCl9Zr<}#u#9$7tB7GYb}VEBjOmk5M!Jc_WoMYL zZg+M1lEl8#^^;Y1HhdG`S(>|AzMt+KF6)ou$!}ENG7}O2CtVTO)-N&_;(&pxcv~K0_{@PJV4RI%8OW*@e z-M|lx8RUs>NNgq}X%#rphmgz~-(a3s(M`_P~<*o=%PR~N$pgST-S^r``o$1|7 zU-9j0(kfEb?k2{=NZ>h3&+U<-W8t4)k_KmjEc4f~lVMAXX~SKb&M1i&V>3G!Zthle z!`I}3!q^{SdiYS*5vzr%=dyv^TVr`&* ztf=#O79T@vyOca|Rvu}{FBC*P8O;7#-a(YaH9&;KBicjxPstte70yr@S$M2*P`4cb z-|%xGpU6)qY{hu;EzgFFVuZ|C@lM9+OsKO?*+DSA&8&{k;lCLLpE#2`*i7e=2hzu? zg9(s&v=zt%ltQf1)qJL7?4%Vs?^dW^PHoCUztHAnZuO(7K~1;912P&{>U3rK&Uqi4TY~R62Ye>=@yUvEv>wFIT9L3SYu!FZr*Zbd z2%_zM+Q9>u0!+!he{5BpD!bO0`_2NM6uOtSV3#G~FQtrV2E7wGv6(cx{#J6kaqvUZ zSfln1GmzE917?lhPRp-T1Dy`)XFNXSofGoq6BiNkC22G`9tJ25oWSX)^GTmeAB~T@ zO`y!IR%@Pj0lLA?IFmQxb@@tZI{Y8-%#WdfW+oQMN^!2@b8?e8e84;x5IDXZ`_+CZ zSq>lQ)ivMh1WyY+c?pv^~kZU>Ec9*$;T+SiU@e z&LfbNua*gKxd_O`4rUK&~mZJ2EE7GhdAYx5S@jWl)g(p&MC&>S|4yIvn>#@H)( zZRwHkQw!SoA9-Kg-B}j4Th3TB;tpq%m(-lg>eRLs#O=Jo* zQ$)4(1PK>M4S%HDxSz6lZpojQsn05dbL#0_N{H%V&5E$)YY_VbIi@wcf5{qW(~3N- zG39-`o!sTmMj6>qH|8&A6!jFf&=8gjOb+tl8!y;9WHY&s9^PSR(UwyOUXU!_k__ac zab{IOjG_H>awkUSQ#bASQrYT}Ed?~L#U-J8ufIP66SoSP6Gm0Imrw5^sZQ1oriJ@dg@>a8V*_1p+YFSDvym8`^SiK?{=uhtKgHDx1xRqRJqpK|^ z2V_IkHDrP1?yf1Q3EbM9N_^6+|HYJWM~yQCY%h`bMwxEnEJmH?L=78Oq_dT{65e0$ z_>JfGboYOWg@7s1NLkUeZayNm4%*lPZn1?&ZRAbGKktS+cT$$U1%3bOX&qPgr|zO=Pbn4v}0Vh^O?pfrWf*I{qwfbyU^w= z{Z_{RAZ=}?HZj+%MB`;-dwyA_H=z?4tFo423!&SQKfb-E{( z4I~Tpk<7-+lrm)_J>EEmLL`1st7;JTsYV3ZfDBbXRctIXJ+3Y4W zrx`9JWk30OS!q3dRPJqaBa&}PV^^4c^eLEyRWAC%I^oq48{qp`YE0dBvXmb_N2>*= z_<(Mw4j9pF_{C=m(Lyg&4Vp5WI(b=mkHtmMnw_q{oiZ=eq6ld#MUVOF+5WshY*04} zvFBFu$vh?jp@-}#_YPDnsE7t7_+HA#<^&GfFN9LGIlWO9inV5TE~Z8+RtyUpiYD(w z8qHn&q?_}HI)-Lwj^SV~?Jl}|@J0DS%VVSeZ>J6{|ow3ZDD zA-0F|36gVmAf9~Kg*96^5}6=w2O^0sHVCWCeIGpb_B8Vjo+6_5b7nZZL|h3CLToKQ z!vI9Z(yqTH2fNRCcQeQe)dSJX{QAx-uvhU*yf*x7KBZq}tjf+SA0_@=PTg)35IbP! zcoIH{xPo3>Nm;Qh;?C?@Rs@U!7Hq6Z$BNp9eY+K%B|Dp6*o!-x_26{!`gMPun564@ z7H8^a9hjV1XxFJo8@D|e)5WeeHy(aw>w}_$V})={(J1kmvG$FTK5=vS=$zmM`E_ zdMT=XEj8Mg#q-%`?406p_tTE}c2QY8v=&+wYh#f~Wi(9N1 zeUh&P?nw`rO)XFsQk(r`{<6f&cDB}>u;atVJ5egTnTyamF*Y|-pVj!e%g5ggH|BSz z)k1bybaqV~#6717Yd%{a`dr+zbMVc>XPu~U|JQ!{M{}|YA&u4o-+t+D_rgD)>`Jsw zyNJG#H82nR2Vdw?-YunVr`$x{;+fMSv#FPkiH_amST@R7TECU{jVS~HYFUwu)1I6hWqVc}Fz@+V_nCz%y*`!2#9sZr&-SGL zTD0*3*-=mW{hI%%&-QFqz)AeIX#3Ic*Zku?TUrS`06GK-xR>!KjZ22IG5Krngj1f; z1~0#t99EjqD?9d1x5C^&wwsx{pVcBCZs(dfQoh?A1DZU0zHU+1aEy`$+F~)&+_U|Hm`l34CMu@L#xf z#5qltH2(#U1boJ6FA;?ILoHj!uE$@)mgKX8u-ZM#b4p+1dn8Bb1NH$jPrM>Tfc;O4 zg3vl;0GV#c|IT*rkF!%b|3hlz<)n@8M&YezSwdjx>SE!YW#w6iwk{+^ z6gLe4QY`MmPQqVHH-)oU3;b4g8F|?{b+3Y%$pgTyp8={> zK&kE|AE{t{@zlNVYN;~c+UzWC+K#(*|en65Jc+n3BiYHG)@bj zOHFhNapJUTcZb%P^5xSvdD2K6-T)T82#*?j=o<_SN+`mBq-2}9iQ23YJ0S+IqA2J) zWT6#G9yqhai_LyyHEBb%t6kj;bMG45*f(Xu(&kcv-x}Y{0`>#D=t=5#GKqb8Gilpt zk^DsOx0Hg7@y%$PRwLeyT`q2q58izZ?pZI$f`2Xz(&?ntxYb#T%UUP&78 z5gCQcp_gS%YS?q!N9By@{X9#v$K6aD&Xzz4ML@f8Ukt_k;e2E7iiTtHe-4+N;JTMt z1r4D!i}vJ8dl8zygd66RJAX-YvP$grO6nAav>i%m_F`e~hJ*7-Wna3*L>vJ$mhA`q zVRJyd#4OSEzJ*pgGtb4_v};Uxf}JPf5B1JYuF*w=X+;@;($htuL-zG%du^jmLJ>d#MixL`;e6cvvCOA2Q!X>(DRUj%B|)pS1ho>0augiHHF+ z>a-X)QW#gU##Xl5676O3(P!Ej0oGluPGcn=gU8W#PSkfb6#nW|pA$_G4s&TUoP$kV z$`d;UmgLS_blVZxqR=S!*5Nh;#$BmSg^<-wW<1I-`^as+&gi|!8-3nS>&Dd1!e?k@ z?x&}BQx{v&p1hkri0;(RLdvtoL~*hUuBBypSJM{11Z{*z@_h0^MVuvNCBh?6eS z)H=j)+dbE^&gcMi0pA>8MM7o2Tc z)SU@pubuCq3Gy+~_aG#`P0yJMr;kM2z{Xe73Jll!gV`BFrxs{;zKz6=?9`n2bMav` zdT4b?JZMRdP=PlzuyDW^3VZJZGYZ`EK0u11qib;C2Zy;!eZB z80czFs?ifkCnrfD_`DFWQXAPW#tlxrk$GDuk?6B4;Y*!^w~w<4>`T^x+c@Yq@G-F` zqC;o~PrCWWS{H>ue|EwSjsfYj?>coT3Q!EeQrh~KU$cjvP>6^7zsrj*io$$k8Mvd; zjZE|cQiFc6oj#C&A|#w065;6PHW59dLSfp*f~OIZW-T}`O6Jp^pqX%xTj{CzeDj>Y zpGM5CsPVGLk{fhv+P1k#!uu8{x5Mt_NxQX!LXIw`Mv|69{ub)2=9@{k2U&gZJBr1= z*7q{_u57f4btE6$K?irzk{dVPq%JWWOX<7wS2PC*;!BS`K#a2E! zgDGaj9nm~$;?3lOAexzcNNz=w6P9QnCUaSxAM+&Y_jF31PCfip^iL-e?qr3*x9qfh zK=^$+b&7hP?P$}B;;}P(TIE3%`vHZ1nv!maMkD_Uy;n>Y>&x2alUPX!y01AS%9L;A zUEY#M-dxUD+Dj{D`$FEit=P$zt-P`7#c#3u?MK$u{mcw}qiZy@R+*I$UJeUChIss=j$C>#=p0Fkz{K@9kM>@M_}(`oT> zewS0;8AH}8dMZ}RuEA?5whTAvv2T-$CyPDGE`@&6Uc|4_Euj;9RnQ2Mc|Q~$WLzM* z(KsOe!sgE_pXSBk#U;GPit9wC2_D$%>=#^MgJMC#+$7BLnS0c*5c`U(86> zn?Aa8f&asuh$2X>NVlxsP4CCY{Ah_v||=zown# zP;5`2EgE;$JI##`o{V-|6dls~;58rz_#N;JYVfYB9YRijf<@sQxk6v1T|m`IN|MuB z5Hl_w!HFg7okWH=&ZRsQVb(NW-w0$+Lfezj00W_$k}s1_zL$#j!K*m=c3O#}(mtgJ71wD#PH#Dm4QJ{oY z5Pg)6YD6G@PU$^PE_UAx4u13YFz4vEuFSFkQWG|Su*+@;Pt(TFMzOPquo2iO?iLb++XkQ!D$q>5k8tr)Z)9xSLM zT)A%USxZ{oSt`a&-yS3fq*#x>gj(1W&5tZpem+tQk|BnJCR#Dj&(adCTV#?uuXuCa zB;uY4^oYNNM$_?VU~DMoQ)zxqIE(AzwOh{W6iIErgDVwnbq3~Y=q@|ex2C&Csp9x* z*M}3i_enIn^~s zLw<{UVb59%?i1O|Jb`4ehwKitwEB)mcMCx>o~A8PQfd-E?j|kY_Nj#V$TFS{_2r|v zpEiAG3Ezu7?rUf?7ChQcNQvBn>c2@H>?hjWTxO^9N_uQJK$|#7kv-z0o}?vb9mJ1` zNU%@Xqs7MXvx~Cl_b%i}e4yRUDOhMbeH!*;j=P;?J^bOdz&&x|q6;B+Y^?qKwF8SP z79UIRrE7>|=R+uLu)g)wj58?6W*sN4^iwxWW|485+4Ll*j1}bjw)`sLes%-bpIIjWZ3- zF4HHjq%3^pd49@ra{{mY&isCKWq5}>fb76zG48YYzomE1X+t8cQ#3<*dFI@70U=*V zpWrznM&QzQmkUpZvQ{n>8miAbwwD%JF{~VZEOw4tVc9YK2>4KIfmP0eypi;ZrVvj{ z+L)tIbR&TRTowQ1%*jgXwX&>8DEdmMrui+US2SUk65YZa|D5-AqX5ahpEtDM>lqFC zAW$^-!l|J$XF_q&2LE8&i$#L_p$v)&6`|=kTVQW+a*kIJnk0sBIb%|1*OyYRG+Spd zS)F7!E7>;|iV-nJEGp94TDN!6K(%O8-5JY@D2uEta_ba=QQi!@8{MD&btmcO&sx&f zQkHkfO&RW#Vk;C%O3$PyA8VhJAIjx;rp&aUM{fi2MD_S9t zwp-ntaQ9xFDTd@iNS5;s^22LN@BErlz8{`%R6Hzy6|W+U(a6?~6}OYhBLhivn&(N{ zrTM#GhaJy`ryt%5AI1Cdl-SEj9I>uq)^3E;baqIBnMbbII)$0JixHxJv0LZn2dhRM z{*vi8@+4x8t?9lOexP@GXnGI_hxd*ACB!uVy6%VHDV(kUF#ZW^%&G?0s4w5#Vt2 zCJ}11C1=|%B##&%<$`HYCnUhvCM9-})ur#qE z%W2t+Tg|)LNkuF2qLglFZbEZK9kH)@OvDtjmdWapJYwA*g+9JJC$HG$ZZ(APLf4i< z$N7$UElxf6-Y`w^7|rO%R`heEOC=;&|;K_HJjN@r|8GYVci? z85L>ChfX_lx|zo7q#&f9r&bgKdg@%Im@r-#5t$G|w>$Y}JP~c~fZ|oO&)F^M9*_!N zPxz47VfqK3HLTyM3bPp6hqm$#H9YM>>bAmJ1P}7}O7iomiD(ehc|Y_*tF29*E3vh; zHr?9ewhZxnJUZmA*ant^({>N?_jSsUko-|Ju=~k(FVw?>tf)eo=%96uQtThiM!fy` zloPcIH@24e;1<*RN@@~SVFlnWy&Y;yUnEC(KymqDYF`KybTS&ihvYKW5J%C-EP@&# znmJS!j#~FwI!DDiAnlzm$G696TQnPgCrk}iLHBmHk9Fg%*-TbKU0{w&;R^Z43rAD) z&BD*Z12f_1r)-nyoh~u04oB6kHFytVv%iW`AZtW%EvNiJN{I+)`zxQvleA^_)3MxR4M#9H?Tk(b z@Q;c?q>H<~uZ=7HigbIIcGOeRR8@1;VhxF!w==Up_2yki8|h4c#|djl6t4&r=REJ_ z|9tuajTJFW&drC0T3=gvLkAWKKo7HGrOiAbdZ{#zL zSL~QMXqJ~w%d2c%!)<6c_ENrNwll4pMJGO*|KWb>l}4(vti&>shE{3K1d_?!0gI{i zL8vFUM2FL7#p0Y#`_8$b4IN^-N|y4N&!&}cDIspc30O!txnsrgCW#K1OWk~tuu^sp z43cJKKif{v#RWoEc_tyQkCNZqai_4owBo+@)5puHnbh6tR)_UBAL=VMPeh;qQn9RZ)`A%>u8O6= zlBK`Q=D&H3Hu^0+-OA)mx*NVN<};k$JS7*z9J+VC#*-$plNnOC$vDX;hC!@zd%BZW zFN6cbwEpe)pR8nM(dLH5R_A1?hN9CFN8`xFuG1c^#h-zr*O-c1g~r+S%VW>0^DZ;z zX6XN`aCEf6 zGWUEz+AF4w_M()zCGy{y4PLjhHeqOD_GrGWSNms0|FT83Q?{t+@4`2=QhPKDrsBvq z^8|x+GL`QM%I+;M9NJ*Yuypt^>`6^x1LfcitWr>Q{dt;pNpDCyOO*$m#t%J*QM31G zfZ{0CQhq&n5Uo-KtGJX}t!BL*6fO_zCOc^O&r%QCHj@KdBBqK@9hOC!)h$kJ5n3li zPZEgaaArzh_EY9g(s)v7t$Q*uG_nOdN z#oF?r8%=1ncwT-^RKlKNZ=xRfX6#37eet4v`!ED!3Vr{Wn(ZuTq>0d(;L)Nw_?Xcu zMohGs6G;`XZs!w^@jU4~1j{KQ_TTp&>lq(66u3}rD}(J;UXgq0E3P{A3Im1p`~Edj z;d$2v+92)lpAVse?pv0`z0}RiLkn}`0DYI9$~G4X2(x9qu=1Bf?YZRSp^#$SoVuqi zL;cM>dL0?X2Uz}*$KA-%6c)pSLen5#6~%O=sTN@7w(?cJ(b69FhR3dRJF*PC|~H={pi~PC7s!KtBDepa1xg=a^%Lbb77Y ztDc%LJZ#IdEX%Sad)%tt&{o7bk$cw)H~wwfhIvS5aZXXZ8yv0C=j+MJE}q6+2;SJ2 zvX@x3@qOYNQG{k8(!=SB>;XmVi7e&abN-Moz<$h(^bK+TE2H#fVPh8vKCZ)MM5#?3eKri;^#ghdDj3PIIbC+xzjuiFUxPd^nN4pH%8>wLsED zbHkZN3Aek=f&WRwr@i>~`lA){#Mqaa4LQS*Qw@ALyhc2Cd`Hf5`=$#Wh}KPN@|Uss zeOYy#@+AwzCETn$_o9g!%YK1f-FMENAo#TE&scDCo3)T-E&k#!svcW-?5L3tMm-wo znWB*BHS_#N)nTO|(>+hStmszXd&`-2@zS{c+ro}k|3f|9Ea>iA$Xz<@{}&6_Un<`T zMfW(c<~ole28ZW_G_=!T136p$c9R7O!U|DIU}=+&pC`v&Yj*@L1njn~fTKv~ynKowV_!Fk{t*)i=cz ztY04&-JNk1sm0=w8|7JhSl8V&C@Ry+%CbtzIAtS_kH^QJ?!Bt3clhjn;fz|b;X8Zt ztlqjOgKdjHi=OX%kJiXsCsXmC`<`A`O8j%Y&+Jb2P`?x&XRDU@uG0lW+%(zGR_hi& zoZt=+oNx8zrDDrtQw^WcmR?mGS#jbsA`R?H$xG`mF9l1WsL`{7_FT$DK20 zD(~~ckW?@ijFnX&-f+7pJ?EpL57vAU+MF}x&AeSD zamD>XX+9WxRr_52dQq^i3W8OeedTshTGSM&@_ykG9f>7ZY=rOA{Z#zHm+H34cd8D( zPUJRA;^oTcJN~7hh)v2_6EnmfQ&iC}1=()ftVbC;QZadU{37T?)?F?LZY*H&$>{;> z0xNg+{(R}56!wvCJoDMj+^^D~6i)g~@{5yl2Nk=G*%f_)-<)NZeNE5d%DQIFaE{9w=P zDWuZ*DsM*s3#W?AQV}ZVksSvu&pw~##{&`>&dzbIu(69`m$z?r@(^zJ2;$VmSb$B_ zb7O#eFqEa0S@C?4jYUXgi8Yl6#0q+<@>u%r)W1&NIL|KrSEMD&jk)@`N|QvH*R&uv zr9{qN9F(zt;=3ckoODS{BhRuJ8WztFt2g2y#BlH!yStHf_uXoNg%Br-6L3Pu3eT^> zGxC15&ra&3p6`I2uF=-o*?P-%#C~zV`eeTI)U!vhc(dT)SK1z}|F`N9PWFumbi)Ds z=f+E{zL*cIiG4gvg}uZNg_9UxlGhENc$Za^y_#J>M2Y@cb(9kUN!N+=|n_cV!jh_AFy=t3&p8L37RyoqpZ5r+>=3ldq6L(I7H?DS#v_BMeM}Qbj z+{i2Px-fHlfIAyR5xY^7rHiY)<3IKyuxlHb=vD?{pcxp9lf8` z6T00QWu4RE9b%pFY!vKb-YM+(P9E1!1hRW4==CgxO68s#GTNyf5k{XB6gnGgleLDY zn6B_n<+#(DJ)1w^X2Gyu*2ej&&EqV3R|KxR^5ABDU@I3dX1#WAfXD@2SNl>udphc~ z^*t+U+n<_^_|B-Z_ld2#Q1$GqX;tx$eOHiQ4T`(l(a!4K!q-0PY(0yDvU{}4x-)ty z!T}XUKfsO8Gx`~+Dr$v=%L&PA1pyu0w(@QD%5L;U+LHSKoWzWdWFGULI~kXgI3fq$ul9Vq$2kt` zIvK~lDlUcf-FXfxn;qz-%I90ae;*ViYo1dcbSLlK=0xKr19)5QCioPLp|ffB?C%sj z5eYm>z6l*YL>vQ2ZSVA~+97e>i)QxQ<*;G1$$VdRURQn6fJCP0yW!|={ePw)(@0TX z?69v^UmSSz+tG&Ye4R$pd;2C>xEWMrrmwBC?A|MS+x75b<_wh8l9s^Z#6wJaB_iC) zWW5l1ZS}reZHv7S_4Rf2*`An&Dbj_7*;>kiXS{f9-Y+aaEf`bJH6PhY?1#x=RyvX4 zzg8*Qhn=q*ufDCPoHMdx7G*%Hvd+_sKCJ%O_o99D7uqzv()^}PiX3%%{9=_6$$hu* zcUsksmZ$b&J>kC}>+Sh5x-2eE7};Z^f=CYY_)h)Lzd~c>v8VmFj`Ty7up6;gqAUGa zv~%K^UCDg6+F4KB$Mbt(EP{uX!;N`XT5(LdQ;(m32h*r4^C7W`m5?qbuw7`b#_ z@rFv9r%vLtgYkexYohgKzra&s?pl9Ycs<`Oia0@N-L(&6A+(3TRdd7lUY!9UE8umz z%A4z~+3d5tVPq8g^Cab7Wdaapfs~vW6e!#?cvyj`D z^4F0kcMC_ma#53K>%B3;Exe*upHJ)Wdi}8t->IkEej#dy-Sky)#=RPI9PJD`4qERC zwQh)+{bz9=DFZh)4|bSDje+6@i0efqD>|B4L3pHD4#gfBrAt+gp zonrPdb~A}1Fax|3<3%6)sh&jO+$tPdBz(t1)DF!ivB+>E2j~i{pLVb0fYFPso>t8A zL}Q8#p8dqThlK@C89OK|GCQ^i?O;Lo=A(rrJx+9(^&}ek>3VX8lyYq7FIrMniWSZ6MMyjs!Pvjv2(iZO68)Do7|nu z=7(WRCI^44Jkbo!JDja2dXAp5Kv{=)P}xu5CSHt%-r2+G^Z41W`&B{V!FMLlik8?5 zu&qlhA!2E1VEB$!&-%h9^Q>rqN@kK(2e;oU%vdFTNr7hWM3b0a)^@#Tx3L@67dsEQ z>0x#U_X?7@0jI`Tu&v&10dj^}loQMP`}IyKbIB?Ly8RVPzFnG_OBk}D(^_&`!`{KX zurJG(0N7?dX`3yK^^S*}KRG9m;r68ZAl{2U#77OQ59;r1^-vtblYs?W&dtjIvEI8I zoNe4WO%YNo4YW(~x1ykasdnA!LsNNC?{5|#i_Fhm9OtVI9`M_Ri|<_V2f6>yzJ?{= ztwmyg;r5`$=jq^GUN(LXGDkNwZ-da|OKA0p|TFM=D}o&CYLRgd?Hy~|EU zMA(Ze&Hi@2-m+kmg~pS=Mm#jTH~SJxBJG+_K@Wc|nxXrr1yR%}dxKpjx%v61tH<$2Ha5kW{LU0C zba1lS7jxZaL$4tj+`CQc{7~4_h(0TPzpgwdIoNrv58CG6;wyVm`J`RW#?l^m_((D%htbDc!r&een(^n;O&~C;_4J#&J2&>Px^>m^5kx#&!AW1$cNUTIoq17P*KDD zJ8X>Nws`<(9Pa$d-kCHOH%0@D?kj$s44~mUDP%prRV~w^Pgft}VG$ARwgTUxiP1kXglXtc(>er;4Wl#Cu3^G__6YTFD|2J z@N3edaJX}kcD|6|_p_;7j_Qz52J6bGJ&eNQj`dKh+OoOvmH3 zc(+PgMR;rZ4RMX=8+x1=a}lI`*lucO#iY^Gk;ROOBjCrUZ#k8Yqs?pDE!;k<8sflF zB2gap7AzVpaP}&!AiRy%DBoTp`RN7jI&f!~{SMl(;+r?oCf(*wuees&-6?v|UqoBt zeYQ|q8M`*y8Q!oST`fAgE5Nrw;U=!$m^-Ux28sdDy4#$2##u0}W>!$%RDE$j3r={q zFcUxFjv8O=x>G$e)7XpHVSRJ;T=mOIMBL6dNWQo;hTmRXty^+_uavVZxXm3+W;5JK z#tW5p7Qm?pH%zj#(-=q&yI0&U`o{NKtc&h?;t3J?z%Gb(Mv`9iP5tYXO{|?P9PHQc zRR3b*-b*?bc*FUW8jkteYwv=6s!`xXIB0`DZ2hiyB%Ww`Nro~yJI zGve5J^+dU{or|M!suRs=D36P)__XP9FAGEd>r>T2?lLjAc{TYx?iOZNLNiK4j&G8g zap$Ydg{m*slx)s-FU(n5oHM>=zFjoj=vjQ};!toKSwQaoP?)*9kuBD37a!OE^gDM@ zS$~|5`J!NoZlHaN?h%bm+S?<(s9uvfP6(Jwb~bm44kAcN1CsvZD#7z$mrGu}th(ZY z*v{b=dx)Fr%yhdPz8v$~PL*a45BeexH4kU}s$_&)en=NyCVo*CNWKH#d$Kb%OZop| zmu6%Bt}ry$dHw8GMcvTka0WY(o9FEvvtPh}b^*MnWPx~j5dw5tds#dd4axlAo3V3w zQT=1PV6)<{ZpII)msU{g^4DX8Bk#P|d)l8UKD#`zL9}}(6w!@t zKy!3&fb+pLC6Mj1oRtz0W~|wd>^HAg&Z!zBD~Y?TS<#I@-<-%~^Uz#%`p%PmvR=f0 zMfN-`__qt5m~*qhi9EJpUQdu87EN+a+>InGA#}@Ug*|SutD|MW(M>lZL4GJG^bvb@ zrw7=w=oueYpU+gE&7@zdu05GkicZtfQ&?W;$zlaXW1khe2t+bQ@91<@{(MnKDZH2R3w-6wRa zaJW!4?K)o88)a@@=ng+=#e1Lo5fUqi2=dy-V7 zs{I-riH6B;O7As(bU2caq~J*f+1ZB|^?O<^uqKg?=!WLzJ1NI%$}2_}r@>vXQqctI z{7(l@IXmsoPMFW1<%D)^#aN$cZgxQHyS;LI?`UUmvuhL&a2)!qHO~p~GTHaEZ^Pd1 zB;Urr`wg_MUjuF@`!>Yqi(#;z{BynyaR;x8Cw&L#k9-@SS2=g#y;nW6zdY{O$epG1 zg!oqO*6dk*8$VUedo^}<>))+!gLOOK&))hrMCSN{9Y2P(*R3mj9qjyH4=VFb@ZH%Z z-5vAllj0o_@UiN;u`_$;_z3KO<3F(0lBkypdi+Q%b84~E(cbwda?cL!P|Ucxw0E`_ zD|Oa(vLbe0}32CzS=A9_;Quw(-d)`u1Jno z1;=QIK4q(QjI$ zXbLy`h*#zr5EaN)#gYz^JsUfj{R=x6OHU$%oOefM)+n)T_N_VNVT62F#BPYK^K7*u zszW^U2L&%O#LmI4g@@NJQE$l=-eI(GiUW7qQ;M>{u~tO8L|-K1ea2-MN2}k~la=Ih zVQa;~?_@L^pc8KNPh5DlN~1U*hMS%A#j5OhtN!r=?qa@ryH)Y&G`aqFO}%@`kt_ zkKMuuvZ(Ne8B%L99LpL$-pTq2Sm3OL{<(h@ZxjTJxvjcC_g@K!0F@5f3^-4^fnIIxI zXL9J*`a=ic@gpsMDQujOh!>03o|X4@wX6)Cghs>Thi9ENv?t)R{JLthONe$c&$9cY zHHdk7S>;I~{2CiR{{kuMz9GJ1($H;}_D1}gIsJRCN{JzSSuL_cIotH8o_M{l7JcXr z=03S#UjJTiNDAs@cy~xr5ldo~5(`QmiOezTR(&g?-rp}MV)xnU>DbxtUMXrgKS9HM zT_a-`LysX_ar?8X!NU2tuoc5^yq}J~IRC`PhHKe6f2&b>SS>oI&mO@S;G6|-DvZ$W zPUX5sfCYsm%07xU*qJrwl*N>?8S-w6hqBM+K@h(tF5+%IkvaHVjEwb+^-=upNA>6a z=uZo-eHP4&r@NV*^>>q?8#iwj9mTlN-|P_V3*g3b#*Zi3#0hJWTVyr+tFh7_J2P<( zPEDZM)#@AFlRc03$X$uv*|l0Hc@XT)#Z-zsr*Df5=3n$RXlLG8IBCJ`ZTQP>cEPt%_t74am}h&JT+h(9bIU zc|G9^)^Ixe?ZTYZfnQCGhW(}1zOPy&`ET_n+RhG5teHDdMJ1q{=qf9y*=t%)TQ~%=N4-1lgCFt3^ zI{iaZh^9dMuZnAOmyQ)z+_ijTNh2{Q-OQn+_4#rA*fPm4)*xqS?8wE(&~ii=ImyB* zDC&VO>82;r!d{JjmXkvNtp1qGe2wlcu+o{eG@mO~o7VF~mB@NZ4}mfNBo8w=z_-Zu z<@Awq=)s!8?kgJ1$sRF^=ArfTtHPXy5KDx}@$ZVl`1SMRb9%#>!o!X9;xlm|pS`b8 zyAMy?0gkcW*~8mo=S~=3bl?djx#JJ}uBc%x6cxcE`J{5)NQGC}-r0Y7z0OvjtV?bg zz#;5_rwf19X?L9ki+8J~eCM8C#$w}!2{$)bMd^#q9k6SoIPFDjVfc;r;o~YNlHT5f zzU?#wPli=nTpd{|W|w^l$6HUWw4za+GO{9*!(wLP;v|SDH4p25665>I6N@Q6z`F8&(TzlRnu`^V zUG#&>!@Bd3TJCxI0n8;tlxTL>ZEv zSr^>F=47ecqMh31zZ37tCc#(0D<{(9V*T$Pn@d%S#hB+-+}@>Xhh8a4$=M3GKG|=&W_u@lO}Vj zXi5tq!O1x@=;KQB-PlnXd*6C|P<2H$h^OY=GXun+^RnHk(xif&FiNxFO3`ne4id8^ zBEV@Wbo;X4(b=72`>rU!(=B$D_ z#2)<4pq&vWi>&zg%gV+cLz2H=(61J5<~KPhddaPtks(e+o3;ERcdFMc7N1m_Jtupj zpQ}9ji+^{TjfaO1h)+o0Sjxo=k{9n)Z91NqYCbU@YnlZ6=#Mof{QWqaP01Ix_+a(U ztvTeZb=!Ikw?{>#PYN%5{ZZldX;GT*MN9%KxARpbm*O*)xj~MbM6-$K5To-GgbTd!tYl7 zOQ*3vao*HP3@4?`P_fA5teIdRVwd2)4gAIv^;^AvRz2o#w38w4@q9)dZm4Z^M2N9- z@O;q}#PW!d%NX(w86Tb=`oM$w_g_^mb;;4^V?><;Wt-!_zF2ti5Rpm7fZhB>!Lgc& z7^ZRlaO}wqJ8al++b^+KtKYGcilk!0J`R1Bn>K7W_5b@eY`BpJdolWFYDE58eExrr z4I6H>F;Wp9->tE@Q={`|?AZU)Hf*@P-HvUi_FhquXW4E&Ha>c4BIbEl=ur0eyo&S` z-e&u09LhsvwY1hcx#OKNVZ&xyHgfov%`kVxvsc4SbU*vD)zV2=XENC5?Rm~silv!F zQ1mhDW3V6z?-#eR9kEyQGsg1Gy2|_SToK=e)1BrU?LB>og`2NEw!mlg|Glcg@+vZw zJWA{e8!yYbU7a)Rtb-)dk5%ULdgpFVdO9lzOPalblc3HTrv{ItxL^{Jt&YdlN+R-_ z#r?a=C6DY$$Ov|Aar~mJtbF-i>4TbCyb-S}mqbN3QDe^X>!Z_*bbKCQduNf%BFtF6 zNvQ{whXVR|rg}+++POL#L04e0`mS>62ugyYFRZ54Q5GS73pW9{WzESV5gN4YI|UD9 zv!7)SZfMAt@VKybW{&QRdTjfAsIlym%`EoLsEV2Z>Aj*5o-&$lW5AD*{O5}*mx^0x z?Ys)?)wqjalD`J;*aJJWqn!JWQ&*%z&RqmIdK#@S5$b%t=PD)M_d-Fj$90~{x6%0j z*-O|MUl)G4b;f?c8idLsyzJlE^621+E5BFysN&QzFK2G8Fh+dtZerx)Co%6~McmB3&(`lV15Y6$V>N+LDj$pTH<~*o!c-a2lKJ1605j!Hy*KS8U;+5UL%r5~q z=PmCSt@y!}6(3dHKqG!69!91c@T`bsU zH0_*bnX|}NsO+!UUebK19Wj6OK*%iN6__F}hiOAh|3krXoeTkdH>AQBuPR6_(bmPr(QxF+*wP4zn z^ChrDiezyg6q}}Z?Hi>liz4@ZBe(d|tj#r6ut-lHO}9Kb-S$q^r&+VB(4_Ac6-jt} zXx@ke5{)nZ+}Re5aC5l+_3TlL220R!5Y&~ z3tQGerxDH;ELt<}7qiR4@l(}z7TM^&tiFmaB1=Sl`I@tx@1uHS53CnfNK)Z(QHLLe zMTG4S|FeHTuQzOByn5!0odb)d6L{=>d=6wW+?)VssrLR%mBXEORQC!B86jHEeu{^S z1>Nq({!paUk3~g$GOMK1E4+sn3JUHf!_>FheO7JT{gZz709FzfW?%cFHyIZi65Wo5 zNNa+d*=+YfH^lX~sx>}9x}h@&bVIaf2_c!(cLs&brX#&5EbKdT3fb+)xPr%khmA#t z&4zuNogkKJo<6>NtHHA>Zx3y}W3N&p`+74cvGXG1c<9_Gh2PvXhxhoZw0*03h%c7jH7Eu;SA)FIGAFjJ>@0$ft#$FIxKU@wKWi7FA>spYN6W-&!D6iu~ti zLN|6-`#U>LQ4H)EV)?Rv7I&f-q>gxb8fH$P(tY&X-SN4ZPB?-#QFj#3(peGC)U&fcKMvgBF5XSlwiB|VRoJ4$JUBOi19)m^RZf+# zl+)B%IN8sg6l6JYI_mSn${hkcgLGQ@`12~ynt&sHIfaFZ?BSDTNB+8=SiGaD>$iJL z<{5T={R;&FC(wUb1K%lVte~PJ>ALP4bL$I#yZr%AAl(7iu>Tly{FFV0Xg)nTU*)YJ zY*W5G^HWhDJerbQaA>FW25T5UwH1n_(!Md}zoNf5Wq>oR$9x~B3bH(NfhH@ikpJIq z$^E6|KHhPf=~=ZRR+Y7i^;iV0^P0{alQs6_iNX+b%U>Zv#u)m2QLT#_v=1b^#1nk~ z1~>B78Y-g2uFBm7yg@W7XAnqlHeIsAseZd7e(zs~q%lhNvDOg#8d@fd$VbuDiPUC0 z#fxSU`~T#^EHoj50jIr>jL0{kLlINj+bzn(qGo zYVfB!n-a^-H~VoxAiG#O6QP0sZdM(z?9S~lt$5ZwUKcu%ovDaiR>~LE3pPjbAMB$! zQ%s+sZ{)PG)#%HCLfaW&)`|L$O>s6eX%gh&dTX6Yn(lCtmco4 z2I58T*Z5;ryMju~;GMVHxfx7cjQQx4hA2o}!}7-uO?HtuV2BQNCyp<1TSrJc-Z8#C zUK+d{`Sze{lYNgWpRLyVLqhQ1*lp5o;G_rdR5_O4(^c+5rRlYaQAS7Sxb5xl4~#@H z@Tbu$e8-ul4iZkoC)et|`Qp^E)x(V=Jb1MHud64Kz1DeFfb7~>X^lQlINz1k`&RYG zX>9Ud^o3orFZ;b$c-VRHfP7fF+86WV)DPc=y9%CEo3t8tYx1G!zy0icgBzT6@pWN5 z#+%2wWIZ}JaAO5_o3dy(R(w+2EvKi8K9_3T6F1FcMz-*kvb*yJ_(Cj+DTbeAJvRl2 z*Q2A^2lIO4WAj!oVZ@@qdwrpxvFJMsDI(GCOtg(Tb-zX(-R#@#EAG~xv#uAajQdQ_ z6eY|C>$AO@yQtVQ?7QhTrz}7TEDHb+oLx5w&5!BC6uD|% zJ0}@m1z(8$9$zNhShGaZT(1#HbR6r(@h3J!vtJ~|@!Y){C%wC0E%EOsT57+wj42<2 zvPRL(Euu?U3;pK*^Z9?`j&$of&)fEXbaeZFeMkD);+?(w(cyNtIDu`1E-oJGzxP|C z;*&1b$gqI1UC_<#F<#dbsV!Q9{mvO|^M(ANS3DT}Wi6=Cx z?Au8*bJXole5VhK%UP>f7Rj9cN~nli?U}7CSyq);wXE<~Z_&rJThdarmMAJa7po&X zO!m&Kw030l3f@-xA-)}+l-T9Y)RSEoN$m6odyDz#oX?FaEh>p6h|iUULeyhoqu8}r z7T8>RP1Wc1b6?@&i&^9d1hbdfu^(DfsuuF z4`dC!&;3G9YriVYSk^>yObdz?>`cAIHz;g3M^fG`O5CbGidKAFPu3OZZp7Zh?ZYbT zuESe}``w}q*>2So`$%JU!<9G}r$XGL$hUg8`hTZzbTg&fh*-MM6u;al9G!V}F7s7U zBJzvp0l&K22w#fzzhBVsTgU%@TNJ)l66s9gcdg3d2zCji!Qid?X%&qqOk-xIp@9;wtcdP*rEQ8)XHlh>*eO3KuHzXYN7;E`Wbf@{wB4bv-dg)a z6j>qJIBwO`kA*Y8q*GqG`ztnwU+Zn|`f@r4$NSCy=d-ande_%~dLD)*Om?t_(gORQ zulNzs?RNF^|HXNjxA_s__TO(ljN8kfC{#f+*Ku8haGN!ZG zr?a>|C_0L)ab7I(Z~P@ZfX*J@uhAAGMfUiTD_g#E-Vdt`eO+Y0tC|ID-4BajoOroa zrQ+FRd89+~C8%kK5nms#25$^)iQkC^#j3(*ZDjA)GtbJ?Dkq|sK8S8kA~=acr)G6w z8RQj;SIJ#O(TJQ;vnGn_e;nwR^ozbHD;tlgdfw@XDecc%Ss(T%2F1UGwGlG(WYtDe~P?iNjNS3jMT ze_l`a`)8^z*=FRWp%~=KFg3_HY07x4#$9Id8(|^=_s9 zajgFTt@#g zYy1D!OgdWL>FtYea@O+poXY3qbi?QGOv}%!%?Y2y5|n?GE<(c7LfL_7pPs~u@W4pZ zg_0(NSo^KaU0yo*sZUqk!t>1zXOt&=-8^KY@z&IIZ z+GMdyn@KlL+xon8D~??sAG%?{>1$;IQ+n-}bnYnqv7U~XS93pqTOOp;Px++PPmEQU zj}1qTGW4=pCUwv)b%L{!Z1ySdF1nfD_4o6|?+1S8uW51nD?H`VZ7s8fku)4{)Svy; z(KhUe=nfO->6mnQrTMe@ z>G&J~#T;YD4&AK%cI4g}Z;=+0LgqlQ`@Wvin*H|5nQ8sW$X7r4KaVuJCjHY$n+d#T zv=Q*wVFF*=svC?^R3CFUk$3v#bn&DhItJ%E^(5NW+?Stz!y$A_sf?}sq&-Dqq*P{S z-pV=pvr{yh^M{z&V$-S$j}A7Pdmj{m~1=oX5vY4XuofjP(E z7@h~yO~dAl_I@5|Z{gE%8ds66(Z#1dlDOMMucuW8mvk7b~oxN{1GbSH)l~$8AU!DY5c_I?k*`5 z)#kmCzCY5TaPyx&@Dqt8oD_CX0o$Ckf4>~{^@+79xP3M1;AxgICsEYVIy;p69-ZXH z8DhY!S0X|5!Jd)D+G!enaR1+>+V4s0!@9=mgPSRw>oEc-#_}Q!zCNw#+&AT&lBolR zyGyhI28!B?zzNRp*Av_OrPAfl4MoFA{Arg9Q*>1S{>Vpd(J#1N`HTx3#Yu^@HI{JX zI}9&e88ivMc^AyoiQJBy?v}&j;dwL!%}#aBnam+?BYkg;d?mw0AWvzmJ$+tvjMf1% z@8i2vM!zz5QE1LnIpH$goP1BQ@1)I^6{{@Khjl&G$5n^jrt!|I!t<+HXm&VQ8N!uz!#O&uWfbk#f4Mwh|kQ^FXF;E3O*M3LWg>akjN$o+gZ zQ$G39J%8XfwTq)|1gD0XI{0hV_vFv{pnm74&7_;ZI{!wMUduPXO?Z=TYWFW|vbB2Z z0HQ8Vmo%|1^Eu@wKfmN>jh7!CL4LFc`R(- z4jCN9oP}R_{U;svap->bSg(ET`iBR`QW ztM8?y?9|^{=H_YE1S6b&l-BE52OIg3TEU@l3}*7PkK5wd@S6s6oF>0@KfBC64yn0q zBh-UKu#x{ZURm=S$L>Ss>0Uoq9Gd5wpSlmTpGVh`#&I3X#$kouvZ==*ckCF$ll$2? ztaNNTbw4M6!!eklV~=%8o;)vC`1%mKfw8s`jyu{$-fhQnkB;kDb$;Wx--osRP;c^E z(|V;-)4JO@U;PN3=PGo$5U_F*)g(sFnqeTHMGrw{AA>prHW{PPDK zC-v0tIhivTlh%9Ox&JPG3D2)GwENg??DfIU?~i}$dJ5->BY)RXFV>&;OZ`>PlrtoM zA3m%09Pxio|I=~LRD4j*X-rR(b7b*k9rsL4NJl+W&T8^Zt-F4^-|VQf8@7vI)5%BK zb;oW;zul3qyJh*k^UTh6tq)$>V?~&|Yg{d-+w2|sYKaJrG^ONchpx@+j(f+Re7uo1 zlCS2K`eRM=(?2USwb|r6vbJx#T zT9nB|;rT zx$Q&R*p^pw^;~H^{MP)J{H(btpY|rdff<}q2aJ^t=~v^}ZDg!s36sCauhH&fb&vH= zE5YWodYTp~PwAs^3*Ed+8z_=_sm=p8gJE!gtzKML(Qs_6~Nn+ z57d;>jx@RjX6kfqV5SW%=t2LSk_Dr22ybtoTps$%zx~IN#uQ2zQ{e?~C12%86o9K}4&_UlBg? z)%vOaB41)TMmKSXrv?tb)*^o1Epzm=+_)J1#lOBiGp)<_2PAVSUZKp;Z~@-v{BZZ9 zQC|H&;zyXy@|mZZk<&X0`@qmr+Qj3l)UZyt8&jW^Pg?m{@y*-7la9Y3+>Sb;F3mn8 z_++HD7q8Nbk;X%Ci|6QdrQ$jAZHY@o%{gP^U3fLp=0wuThxupqH$6+*_-x?(em%K^ zA>N8P<4G7Ntc~lG{YSue38lmnyDra@y*vi`3B1 zuL>t|(34`1M>-UR^EcJ!aQyTd@gjX*IUf!9p(rfk4@Wmqc)n$Xs<3ybz?F*fu@1xO zdHr1(bQI%ysd9Ld&?R!#&4|tlOT)xXHon%yZ_DNJt|9 zUZUBR0pq<<$GmcqpIlT1&hZC|*1S6AnX^e|x;~*;Zdi10fb(hks1M4-8}?z9qtOjR?^jA`GyH#j zaQQ^Ijw^NsbYa zbsOF9^eH%^TgG-DNANndq+>>$&SDC;ntQ_y!uDK!1^PrLAR0KrjLz7_wnt#61oMSl#T_cVRS!Mi(~W4 z9v#;{G!AcrA4q9mA44~^Ui*2RUnbnpA*soOTRLvrNdEb1!-%rdhq~(T^>MZZx1((& zCphfESlj46(3ZFS(!4Tzjs`3IJZnFck>7LbD8H>`8pdk5jpW1wk%Hj{^6Ti&NoWv4 zr|v_Z;ILZiIzQYX|Mxdz8W^j$^ud6d(Yn1&sPT=FN`NRPR`TE;06AL1HbL(D}&~f-?|?w4&BeTymlX^^%uYF)2aEX z>$e3xqaHf9<+eQ)a9cehU8b$OD~zUNq>Mi9&%2CpXpo-kLwbvj=j(6sW9N7KxlLlP zOv7lNo{*2utBgxDc*eAMzG_zvj23(?-K+8N9a9FuIM-Uu8!iZP(K| zr}x*&IS!NG9t=#;I<3LcExusm=^o2p#=GQC94EA+_18HS%;DHlC=p)pOf+#YreWs? zH&KO2B`VPKmD)wjGA|BKPLa;Hw7%36yBK}K*`egS#bB2FY3vuIoF~m&-#ec9b}#u& z?MN!85ob>Gd@K%;^S<{So^{eQbnM8W*hePh2`Mp~Nj05fgUQ?0jaC`nx`tk(TS`YS z^&IbYergT5H|5?izNyIMNQ209@-gd5|PE4u5BS*5%MDi-1e5EJ1 z%>M(Sy_!jbaTF&OAA70^W3F3`b804?Xa8<-+V-LAH;(G1yb`?U9e z${%eb?^1uRY2F2=Ee$44O#|%&w-u-D*fgg7G~4Vq{d5$^E#3F}Hpc~wlj$~XQY1~c zwtWIW`Ayf8%A?a>`QSKd()`?Xo%+sf-FI@jXL-Bw-z+zAB2gj*BOkqw?24?Cj!bXc zTI5b-J{xCXW{w%_a4H?gm}Wl^Zgq+!(VnkHEqZhGvzMFni%JLY{rr^Ic4)CpKOgl` z?0o&XQ4c)WMZ?aQ2EF5JN||k&!Li%e&!^ibqA+^-)^|m3P9#cN$==kMuCfb`=`ZSK zZG`Pw=IGe=C~u#R&a0!j8S7p-j^-Xs;ehZ$cq1G!=PB$i42pg?@HF0M>hE-U5a5jt zp@>n4UKqd6(}L?38mCa$z^!kwyE|p&&S}ngPqvGvC8ntbg=_X~wm z%G;hZTVJS>8HLp8dDinV`ShOXL1`mt(0g7+$5_k5VQc&CK1QcWzCNSd`Yt{2Z|cxX zl7FL~rtP-#Q(jL#8u_7%KCL!!rIIG2g6-<(mT&atX*2cn6~sAK>nRqkg(C4wqsw~Q zENL+GaGuzd{&J)}#i#dplm5EWlkedaOEf6!iOoqjH%&|*ihhSPeygY4%D;a)%)ZNA zt<%%-{z#*X+oRpNjzanv3MH*i@#z_t%nWzjg_GSX#K*_y_t~5EG`^ra116n*@{l&r z`uZ4$@RaD1}8 z7fkda?WGUkbo6NIbnn-;yAAml>u>7fCzZzu(`OSL0)OJ((2w$hKAj)%(Vcu-$0~St zo9Wk|rQ4+6(f=EhIf9cP&6=ZSXNqnCw^?_8Kf2ltLJ#%L%lsm%JWn{_hE6Z*DZQgd z?b{Qh5hXu#Re#d$xGf)@Vz*Q#`THES`cS;*8j$OaoXgaNa zqaN$b5jf6$7#an0eQfy_T6PIft0mOdX;~jb{6KNZMYkms0@|&WG?MUCgKF~g~NZuxv$W!7^Qu4c@$9wi& zhP=Ca(BG1FKUbb;v~!G&YP4XnXUR_tjOWHHF)zt?L-2$Y9YHF(SKiN2y;}Aoz0^lv zJMzrNey9FNx6HeyQ_m}3)d{Q_<02LPKkqw#j@r@LLHEfodY9+fYtOT{Q!h*YQGV+- zZXBSkcF~5hQYx*U{O_dB+Ow7C=Q!=>XD)QhC%2QFp11pSYDg;%jbqn;TTA&e(k%6M zTF;VeKi68FzyH)Yb|2QU?tJ6eGNkFS+K0QJ>sU67mQQON-E#BFsxx$c*I(ghtS4?= z`o@9Z*3$I-{CeJHkDRw(9rE{a>^ZRy-ySNzp3QJu=Utb{epC6xb){zGxaKz{JSMT^ayUbUnFhJcI_7@%@S*y z{2vZ5a_ft?Zm>*l_TYJ5IkWlkr$fn=D`rcHbWVM^tuUJ3o*rN%b}~3LzuEKVmpyOt zd)}>dm?c+#?DtFkNsl%En?;69`vo}J9S7q51B{hl8i(em?DkW?$E_){&+}b!Z50KGuaI3U?LFzVC%v{Ge2kBp+6c_xaB?~@ z#3RJUy|$s{q>~SFb|TyIjpK@wx1EMt+6auUv$oOw+_sT^!{OcfJMJCa;z$RMT|VvE zqpcnS?I*u)n%I`vPos7A!`;T32KjvbO`B4e54`R}>g)4bUj2rLZoxZc8mFYyj!t`F zJUy#_Q+`b=v$i1}E>u6espL2O;1GDqABQ*jEinAsc(1hXHn#a0%k9`TZ-jsFZ{o3f zj;;J1-cYN{!!31Q)%)}?{*3gD?>IH)t#5RP(|q{_=jln0`kIDA zdiP5`t$wHHBaM2Y;Hx+LlI+#&TTa)_aVYF5{W>?&X-N+J=elg&hz^_ex8?aHRvvVcUjUY4c(?QTJx3Hb7RN|i=4coo-I4f<=U!bzD#Y~=lQBUE8@CTeHzbfT#rnS8C zQ|C8kzmD?y=qqWYQ0D36Np+r#GUj^X(vrq+nG=x$=#nqjXO1Kdho9;%acs%|aipzv znKQmH6T15rjuT|k=G?h~)5DQQeYm-c`sk{q&KIK$m}lzmbon#DNLn9m)!)VXoA$3y zM_RvMkGD$tijXw;@kZ;ztAUdleQ~_~t!R9zV56A&zU||Sd6<@rd04P!c)a5(&*sZ1HRuO?cW~<4)F9Hc(_SrWBF**F?MbNcQ3s1&KCMw22bvs1HRbcF7V$fA6-N7 zJ0tzcNW=N|sQ=+eqsgt2&Q~1Z_{AunFQtLu-L27ve)s|!7}_vaZvH=AIv|`L)zi6= z_TA+4!B?7c_R!7CQ};m8Q|13cH#medzptlovJuJb&A4TDkq2%)58cRu@J}Rw^Ny%B zXSlg^dW>B(gv1=CrOXlaQDk}@^c0NAW%5HqIL5x0)gh&n&uj-J`T1H87;!OcIZtPsT0ghopiV~A*oD?>T7JrhF6xI)%CB@Z&-c^mbIOC#V~cK~{rP$yzsm|^ z+eUL$%5T$+L)uJQn`?RL^da@7*Yf(DuWG?bnRuhKSDczgPNdHj*&6Q`FMLY26~wp7 zlmE$^6N6U0r*GcT24?Iq|Nqn|o*eS0O__CIwWawceBknl%{EpXqGu@6`~J2T_&%LJ znlD+aVjsp|u?>^#$q#SHZwk!wYw2$=F{Trz6=2?o!4g3(DBQv4pjQq9r#dF!ozpYc(G=SG4V9YhMYx<2Le%TjOxNjJln_w$V5==k%zq zR=&n@AAaZGIPeJER*JN(Y_+g;&94qM8^%5zI{)qPyN_+l`)C(8F8wqJXg{Bonj z#4WKr$yv+H(ktims3zu0nUie4llr;gJJ8zpo7JRz-Y`? z&X{yq?aN(%-?rO0_BxaMt<#5}moc5OWWk|FsQZzzeC~pZ#3dyM{FNZo9c? zUDmR!fi?5twytMcwX_jv+K7Ia^{(?*90G5`&3f2vu>2NT|8y}N%VqjG!{Jp8xmx@pv0+os}P3w_53Ve4N%k&bhF{+&-`TGRI=RTl=~8 zacyG@@8ooF-Phl`AKlND=cj%*G28OX@m5dLQQyXocqQ}n<(LCnM2G*(H}&yf^iAcP zR=z{E`kLlxr$2vgYJOAd=pBIX)IM(JH2imKZ<8-+t@odhoROrNE!(tpC3;U}x)pF+ zKdbx)l{2ICJ?*EhURjN9jPglaYx~Sya4?4&r?j!wQ7Ua%R{}HX6(&rQuZ@P6J~xgl z{Dzm=4HLYx#^9%noUEeO?=}DAbo$V3to8LN`KjOOKWcBv1K4C|5tv!e{ zjnjIrK+QEB9KGAt?{w(4Ez{}P={wzhh-Q)fim_{$>0{E3Lzmyr?>@~wAE#SjG!CI# zrvszYDZk~a#<_6{-8vl{!he}l`j}Xhsr#pgx9fdkMbdiW%7n25Wo1XPUx6HVF6)8CBcj8-eVnOTMnEu4@M3&(0b>8(@u5?E2 zrduS;I>J2~=rzZ5&ICC8Z~0B!^fNuWQ&0H<%<-Gl^h?Ryi4_@)F1afw9;S!2id`65 zCf~vP!$%mK`i-*a#&h92lC(qld<(ff@X<)KYqhW7mr9);cJp|_qH9I(VMENy9os5R zFLaG04X^4K7_sAJl-9A+r~EQ!dR}MjrF%9_-k5Z2eo2|k8}PzUC$Cl6jio#&Z!5p% z!znZROg+U*XMdF5!7X;t^oXHN7yUgt>imCc+vIi32Qzry$2@aNs0q1(K- zO+T_CphNgAvIE`Lxvu0Y8}vJ}C9))Gbo{#hvWL%zd{^o0$+Q3dex&7PzifY;Jw4nK z!zCswd+hDms^n+X@W=7;`kng8#|vv3jz8Dmgs=QI9r#8#c7-3_$dKR}y!C6|yaz^P zWay~P2O}SKL;K8Y{Wf0n?mBWkv*G4=OU6bXhQH7~^L*u3^)niJgKn8|{VwT@fHM2( zw3#`grR?F~)@DW=)Eo6TIjGa}(_Y)sx()MWeisehw&~yyI>=8SG9qg3r-KvBw|x%X z(mr@i$EMr1PSOpt=^FWybn^AP)9H7YU-e>rnDT4V?Rfe0G4ph;)ZNBbe@l9s-(%7F zH>&k{MiU*@wDQ~aHR;G;`Q68+TfbX%ZP4GY_rfMK0jKY;-i^bmD+Rv#y^hTKlWy={ z<7zXa>ZqMxTKAmVc}wQbeEj5>J8tugqWMK$Cg0fR*ZI+dl8;v=ZjlWsy~4or`8_^7 zwY@K#l6>QlU+3p`)#LSN+10N4-J$-pSq8V&+D&HWx5m{*DtZ6?A%C^KHl4}!T^`)90-ibZ&QkSyYgn&YC5m^6O;Tu`R%BEr0p+lbBxuD?PIk`w*6$a z&vgCHU+cHMkB>Swpjdjq52V;#=!IS8{3v}g4*Rw+dTiQ=-+FBWeE$FBpBqoxd^&9M zyM1&^gvN2(snS~*f2EC;&fSN`A#sptziHGlr&}DlOv701zx%ef9;@FDbZ9yz-e8ME zkL8M^`sfx~u4C10G!C7=(z(YXF$em%;?Vis$CZxFkH_J|4L>xD{WktQ9lMQ{&OMfI zqhq(f<+uHQ;JlOhaUF~9<4UIj@XIlF-OnD2Ze#63=Qo|#vFiMWpV2XA zR)0v-vHP&)w{By_q5Ii%+Ha%tdrs`n>lJ>F!%D}M-&UW;14z>lKIQx2D7E0d0$8_d!20mh0WHfpnD4D;?q3{MK~(&wNwY z|FUl?=bDcCrrs^P;ona;<#C`!nTx z?|IyQOwVq3$M>>k*tNrcu5nuHD3kqb_TWk-y;^pZ%Kle=_bGkO9M0RuX}e#}9v!3` z^_M+9-pQVP?I*gdIDwgT`p`In`A2*1lvgHwPM^TbK6Q(8!*9B6>ts)(Z(8O-|#T zer)NuPkS{p*7o4BLj{s_AjLM;wzAj<+isQmfse|OxnyNzRb-|0L2K)8)|vh4K5WNo zo2QI*1puSZmjX^WN^~$-^hBO`gDr4 znKV6W&DT#^-!!^Bd@45vR;)c&$9HJp6?@u^VIzNB`MyT< zMe+6fmG^CVB(BuC7I*xq^>}zI|20az8c^8DGN$O}9Lf1{j^$sqhUctJ&il|A_`9^H zU#m|hc6apJ`XytJj?czCy*=vV->u&=oEdvHn^OEh((l^ z<2>a7>c*GgX}#OdJibwX)As=T)u%J*7OU;!%02o;CTV3dVqcDYvLNNZ9%+3DkFX); z9DZzwq(tn8@!3R*c$;rtJsnm+}D%WZ`RZK4J_Dal)(6GaM6WP$EbZi zxD3DK8&@D)9z1+)cu3c8TxAp|KhAGnNr!^|y*K#lQ9Z?K`(W^|KIeN^`0ZigoqNe| z44w>yVDrJC$yWo$*^##9hhlL4VD#kMs()q3;15Ur@2ia~V~$Kum^6D~xE+1Rhd0X@l?MkH=GB$qbNO(<$SC5OSdzaUeSBx6jdS|= zb3KI)_v`8Mm^160fMoW(0}wScZl2)wap5_AY+#0e!hfh2KO-FHjfF-mb0+f&emCoH z-lzy(py2sAj`HQ?U-Kne_S{F1kLGdK=dB(BljH`5bY!A5Xw9!{8=muBE|j0+ZrX53%2xqvC%prA~0(qx}j~{@SOe0wzd-ApmObthV^q&3p;dZo*V56UFKf0f58;!%;Y(U+Irt^wp!*4pm z?d^8Y9?PajE5CIg@?6Y#=*8+m(_SJwK?3k|>NJney#-)0*}Wyva6@;vcLKbuZH z7W+8-S@>&)5I-wm^@G3|GD4W>DYakV>RoL zUG4_&mdM=v$Y{7FwU&u=p5^?1)K}VL*>ujR>El{2>wq^|N0Qg@JAZ9Ir6z7!LAEfO zep!3ucgfgz0*7XpU*}JasC6N{veL16rTMk%MnOt8AIA=1f%c+xamX;g`mt{T0s-`RCto z0K9uFIzQu^dDr~dYkp(1-dp(1fd}$k>nVG$jc+r+`tpd!4F2Di+|EytCF>9#HvpHKOh z`<}v2PY!hKdD*q+{uI>pjBxDgX?ySAmfXER-C{QTv9_^BE$#D5zujwh(oFvv1Bi?VXx(-s$*_e)F4B+f!3#iUXBD z>Y2JQJYWBKv)0Ex_SN6;3=YVA?sW3;acC9mPN!2|`gn9HcsJ^Ajk3*--fExKf1BT@ zreXyEd21C2pW%tjsXv$A+ud&KuO6Ckl0Ky8%{ktMyShx$O^wt^8m4PnpBm=c=6+9< z52k^q{T1`%Pp%G(ZsTN}R+w9AZs*xv{))q1`F=NX>o=aj-2MV{`}Th_y^q^meQ9WW zttY>8_S06+)Ngom1wZ=#wC&`&5C|KX&M^>nUHENxbdZO6N;E z@ji%Vj&wD)SI4QS+~W0Xjp?ac^Nb%l-WgsabpCxrihNx87l-}o_p0aqufB=QID9$M zuj=Vs)r{u<&#E(TEv2dFjxeK~+stxf8h$umcK3PnoSVX8DT|epXDPStr;lyZO`2z5 zwSC_oY5cq8^rYt(Q|DKY%#NJ)p;5$B)U)Gw+88H)uZ{RkI)6=nTQ!qTd(x|CimwR2 z{kb+DROy_MTfJYXlNlYlklDviRp~=^DP+p(jl)Zk8sQ+?WHh&r586(ATIkkmc-G*w zEGKJGB*>f`Dmo!6P#|<)B9r{#^c<#?d7Wt-&KC@L(C17Pe)q+gXyb! z%ARvZ14xsnaEnY0#piD4=vrk&*EOCTjCRnvRqKBl^{u|w+QU}AJ6>LUH#hudw#3UE zo`l0Tz3&}U^N-pz?}J0*xTcd2O88wG-PST+9oo22Pg6pulXUVs9SNbID;?jK26LIXOanQ!918&m|bK8?ngSq}z zc-`~0#P)g8ZTmiLcpIEO1$s)F1NmhvlCRDD`YCkTz75xT+xc7gjoXa_-0*aup;&$m zZQm;Tw))|5uvYlp$EHEn=XDnx3|0$JO|H=Hbnx?wc)rGYWA!DKgkMD z^2aI>$qzodO}maZk^_fe797-rWAwXjY5QdTm~BK-s=r!I8;5sC$!&hqV6F?1(JPK` zvkrG3qSvMm!R_QeHl6qDTSYTY^3g4{T-%s1RyytTZ1eoe$y<7!oNg}e**C2_b1smf z`DLx~yz+eHQ{K*!>t6AX+E9KUe)qlSMB^CTx=gpx^Jb;U+uG>-mMzh((xZmo<1pu? z5|Jfca-+L@xYu3_u{wnl?uPmaORviH=g7-y>rSrX?kyd>uE{4#vIf2 z`&y!pQu>2~)$+=S8OqyN2dn63Bi1HwZ&#hv)5aW`zBRSwpWV=eKY8Wya-#Fz8~DNP z+5uL+xtW?x_0OxBel2PAmMb-#j|!^ieHrMx3U#^~TUM2OK6Y z|IYs(6<>VuMy{!MwX_$pdbi%(L9^b*7nzv#IL}kBLAR`@t#|C}Mv<&wtU5vVfn;#Y zjZI-PK?7gJZ^YjZRu|=zi?C(fQp*uLJuyth!Ol$JU*?KHS=~H2tRf z@w)z^JFQ;l&|7}?yy&o>ugt7Jaah-~Uk~}K=PN6qx=-KeNP)4ghrf-Q$~-y1SiOuH z0r~71$Llwpe_8Sy$Ifr~S-I(N`BFvm8(Toy_)k1jIpg%-ANBQdwUUzSNuL~Bzm3h0G=Oci zxL5@BITAi;EyY5ppOM%}tC{rMtTS0v&>$AZq|qR&P*x=^&vfXPl`kt{R>rlAak6rz zPV%MK@}0g>IrDy*jF2=sN25so$?0h2^5HfuFkl#)z(|>-(QTW~dL}3J*EC2eZ~e^9 zA=K^kw*2w*q+8bD9-&aU(+x9i1SdEIX6kRLeYF1Sh3xja&l#7DHQs?+&Uf4yJq%BS z8LHE0GtV+lja@kFMLk^^^DeRV&qf;m9{qp-b zti8zdQOmGiXGGB?{600Y$hX{UbD?stk2&$r+ULxl>>$LjpBJXgL<^;^}kn*LlC_frM=n>Y6PABWG&_lDv*$R0TI>QUjCr+oi8k`cc~ za=u?r^IVQTl0{QGqXB-rK4jJXdXmmOy*}23aI3j?W6(`&m&Z3jZjAFuj|SbIjC^f= zIr5*6v@!Z}(D_w8eK0utt5N>-NaNhc^>?{?F5jHVnHM;JP*jSHy;3Daa*z{n6Q^|a z><$W;jq~h|b2ZkQk4Bq6)zg*oxJa9~KNp1T;6EDk_LsuxN>SKu)jWJU(oaVkFFYIV z>BGl^2AT1AX-bxtMd2Cgkx_VEZ6tQ;lhKbeBMpa72VM2}>Nu4&*E8i|`dO8{RF(~C z6#Z<}7khQJILxS`)9Ly%&v8Bqk_*>{jQ*lZI(^0JU@iQj>L*@~2X3Cox?Asf0k4f7 z-zu1whYoP9INLeAoC8$e2;CYm$iHg?=QR!6+x6#M-xrnt{YYOMY4ww4`7nOd3;1rO zoip_1weVYT2u}2hTa|aY`lt?`btdt0%?h+ehtTDGy}vrz_;gU~%*ZEGGd3BkmzB=f zU^CV^lZA4yi{yybgg-9V9Gn^u+#U>Ss1w;iUgSJws27TZ=1Vnm1m7EJ@IEaZovD*g zy64QDIg-78yyE!HSxcBI4~JDF*=i`iyrJ7H({)aU@vi|Bj~~Cg5&mk%e(+H}t?4iO%DHbS|>G7<#mXT5wh^7Ve-BW+I2J2cTCqvI*7 zeb#e0O{o`tJIaq>7@MrVpV!lRCiJtBj${RSt8<3e^dTdfv_2#qO(AK0#-H>2+|e}L z=7=h@9TBA`zsi@M>)2k}SSSBRJxy&!t)#>6p}zcWI`vaNbPJ4}#g3)^LCK+572+4p zZa3>R8I?Wb%X;ekHMY5Tv->;#-pNKg0DnRSzx5DpM0ZJ<#vxDJ{9p#g%>Scv3+Q7G z=YMp?3;Cf_exa-9X$_oo>(b%Ol$rIW#FBnn8{}br;e|XKrTjX7;^2Mb*zLn@zYJ-e z-@ZjLGhT@m2mF&?x3R+S{1r$1m*3ilNjEwBFdD}-p9IM7Z8)rb=+Rkmn2^@72ETFJ zZ=+$XZFE1a6Zv(!*?;6M-6y}UpV{v1=Wil1@bj6$yZAlPDACDzCo@}=xpOG<>dkDt zTDjr-mo;NzGXo>mFZ24{lE-Gn%YxLFFfku~SKmZf$v;&Xd8fW_Y9>GWe&j-1f0}Ok zu~LiX9}o32BFVo~Z=2tK+AT9>!<+}&hCu-9wqgbf%5QQIA6BGvg`w%?r1d{5cL67x^g~FZEx)kr@0h&CfRu`RMlQO^!0n z)7KAWUKK6ClRt5o@&KJg=OzEbVXRNR@pa38alqli8+lCzhx+ovncyGI&zPnk&ks0G z?gXRf&98_2$^G*2Wa^954UTJmxEl^^7c+nIe7>!m`cFnK9M6wFOny5x>>nxf^w7`g zw}8X1qh{J@9HxvtwRkhaW1$22fgjgCK0ov!-x*GR`UAdiN~;AoW7Yg5`Z74KW8M6a zQ3d1oLm%E>>Nmemo;GKCPKXu_{6tpj!>OfyW;pn8TjzGqiC+#d(xbotH}kT`dX=G> zDaQHCq5hiRH0b>Ob!Pi*v&j#^01mC=tgGxv&#RtvQkj$A&sOol(fvZCH(LHDo~d{K z@|mfefjW9-YMylZ&plJ~UcjwqDqot4<>5(bJ6DFLwQqTd)qv(6E9#o2=f=Kfd{(Q# zHf>Lwc$?Tb45e`dT@2W1Bn%C-iV~l#IDmBPHh2*G=Rfu1yDX^l#X7ywE}F@t5ra)X!`narT$Jz zYdQJZLFr?5Khpv^dk^M~`a5Y?-}#}|Hm#+#ey2k{=}TO79ep=0;4aa`dwT{E_L0dBD( zh2L1AR!)u)AMRIXxVn4}Tif)q>Q0=-8@$ zmwttADC(D0`nZ?K`$*rcv(i~>w(00LouAd-iqhqyK?RXU75Pu={NnI{r3Ns>rk`l#v&MtxKWDT?~@^KVr#_BU(_$Q%1AOEl4*n0!ow0#nLXsqR=qjEzRuw*jfBs+UKdNE3MzROIyt@*h!Ex^>@1D ztnX5ZpE+CdPAtiVs-yh7LsL69U}k^+ZRNilGCk1%kz`i+Sis+_r&!2C6}%D)`t5qU zT-Zn}e|PlhK|RF_b$_HEzgZV@`&nd;wdBT-_Kyagcwghe`?BbCx$wsA=(KvC@aN+J z6HXtDweRbZet)FlV5F|p&nkt#wKQ*tGdk%V%wtQ(Z$A|d)6-;LWu^S4o^B4S`IC_^ z=jLehX|;K!G*)SC#zM?C^zpF7z8LwZD*Z`O=2DFy3hK`%qyFy&FKf-G1OC}6e|30p zJ{|Dh9qIX1a(R>ulGik*Xedaxjxp;dsQ!^eg5Z^C+_)X!2Q|{I{&Xo=wZjUyN+Ppy$ z9Yc40`mFvg4WHK4F?&89Jqs`VTsf=szFFxH3r^OBudB@|oAG0`B69tDwK?Yz__^^R zBba#yMs8cc^Rcw8n3yB6#F0W*25)>^G>BJxMm(4$FGha2*35qXW}aRd{fM_KWz3uX zv^j9xSAqu7QPFAYsBn0?q~Y+(NP9w|ZtGE@Rqls7G4P@w&~VMqlf5s-s#t*4wxiD(&?>!t<*_ct$qE@%t_Bvf1B?5 z+x%Wn)tNS3JH2QFFY75kySz0&Yr6cb;mJ?gxl_z;IgpYMhTZgxVpTsn!WO<-=oT1j z8@(HzmWzok82gsl_X`Jv9V?5BR- zfj@6jmcQ1|n1)W%ex^*1<*$b}&X1?y&|}g0YyGwWMWcelYWaPeWfvWr-&X7IeR1e;iNR$fyQKv`&6oq28%7-m+449|B4JHNR=#M(WUL=7--_7!MC+&Mua+9_xEc ze&f*m(w4MvMR1%})#)>UY(GPMKEBV>;J?&{CP6+b6Gg z!67Z9Lsq@alCIxtA>CpA*e3Few&OWELEh2<&@HLx5h;^5{-wX=7t6{_{ki`mW73E8 zTOab2K7?D)d8I+92e;Tx_FAJm<=6d;R_5)BEj=c`ro+_zX3p{d8-CYn_@Nt}FTciN zZMk90awq-YZA9x!Ir?3Go!>aDW7#eBE!L^oISpe%J^Fv=uQ=@0U;8*=%yBiAJ=QbV z|KK;jt!;Ean~rOK<1pcwKYsXWzB~Ex^h zPuyn7{juscdfu)$G#$GBgn0D-&R=QJ@YgxD;X|xQy5ir*oqb1d=Q~%si+P&r=y#^(oqb2kzf)^pAZMr}lU3Xq36DCeE4GAUWAFYk#}rzESU3hxA^}PRj-U&y6vYM=f)vzY};%)r_CPQ{WN%M zZ>A;|io|LZo<&F2;#h(+?;ee`{6yI+Gh@JE@_3|UIg@@c(r}6=A=v3du*)3Di1@dy zRMX-#rRY}!k}@~yFFYUG>dn*u>~o@#M!S=ab{7qub{CDdOC}wSR({H7jaO=$pEP)I zi@v>mpS9OG28TciCi7o?&u{h_hVxzir=bM5Sk2X zb;y#hN|wat``Lia>vO&6;uH|8{pm_yt38AhIKNg&Hr)i# zQq|Pnz54sUc8RA3ZZ|6Ly;16yda~zZrD56np(j3_lrZR?*e^jEiCce^pPh)yK1S?u~rAI;^1K&i6(ca{Kf8yHr?B?u|!J z``3oN%51^ePQzGbSoPx#Lx(#>m&*gnl(X_#hSM82gj^nLB{iK+#I}; zGgi}6Fs;&HX!GOYz4)!_Tpe;eXR6}uLak2+jB_LZ>q>t%==ffZ@zv3%@E^`wJzHk{ zwPEoFgD1=Rq%Z6FcKy$Xia(!K`p!tB+ouKd+Th{4)yDK*8Bso~%cVi^0-^Q&k>-Vr zSLneg54-8F)W&y}AJ5Z2M;knbH^$igvv_{$I{5KXjoCbD2d76P|5>$nqwGX*o9~{E zcR!7^e*IieH^x{z960e3T_0Y?`=u>hF3jO<9PbprILV}sIPZ(m#_7s;D<`^|6Y(nE ztf!A_9`ha;Tdiblf2jI7kN3ftw{Ux0WiF34<5$Z!yqxQbhu2(p;!GMQ@kCvyr>kS^ z(LMKiUWq+!xtr0HD_-R6jZoH_eTJ*_@8{U+Ha_4IqL$=-JF)04(5J=e#rE)*R# z<&zJ`lm`!P$IF0h6sMl+X>GIf(eaP0E9e^P1zvFO`bmQkT`Tb5*m|!rt0liZCV65N z$jza#22RVawa+RnKP#{N^=wBhPbcS#%Gj@uZn1Q=rGAak&Kl1;a{mBhwbG|$`44vU zyAQVx`O%m3;o_VAsK3TnNB4l6GSm9IT3&M_YG5=D9fQ5bgz@8{%sMZd-<}-uCuZ7jo}%tMZGy^c)$U zw`6>Nef#&e3^|=&WMZDXjhXvD^*>3CZd)8yYn-(szpV706N8txjqQy?$+dpdDeFRN z(OdG%I^enUXZ?v=)2Yj3e;OF;+X;7FtM=RIk_~?y%f`H)vTCb2ahp&Yhc1)#FeMs? z&Yu=)C7QZxtqFal&RW0e*f{oGC~B|J)-nybVKk22n|&NRKRQLAHLvXR0y;O{Rv3-V z9*&bAl-h5jxp2RJ!|(dB=gFBAow)VfjsB)g?2v&&zt68J7X2=7zdGcv{M0x$4lAAZ z^1D9V*0Ee$p4jY<)$E;8J=S}4TJ!hecl|Yg(k*y&Ke|lIx3`aFW7hT8J~aHEGb=B3 zeNT;B({i6@8^%5zI)5F99?RyZ75*Q|mWf+q+-daN3UhQIcq;Wv%K zZw+IQ>g#&fZ8VI1I;=Q!%MJgd!|Yl6_|@U<2g{g}Z(Z}x*>R)Bk__}oZ|0;~$DgEipz-;T8Qr>r_ zj7mn*Q${k}DZTD?jqEnPmQTJ~H|lTQ9q*@&Qn(`dYkH23k%}Y=C!`GMYZ`a1=`9Z1 z{JnIzJ)DD+A_*h8l+Qd=D!6%<-#SmcNxJh>N_vF}$55}^Sm7OQGdYbzw5Bzk5|eJ- z=2`~Kv>6=Xko?ABEf30?-s05oQhyI#x7WC>{oc|6?brNmTKPYs;~u<}&ng98k5GEo zmW}R5aOgT)oVGBN-lNdUzs=8E9Fo>va0)+zhi;j7!7f%Q{S0;&M~{@u?C@_+*Q7Ni zla3|st3x{F)m&!}sIk1ovWyF2d5bS#_4dv&%{!2SQ!Hs}-l)H+%=VZJ60D+XJtjrp}+W(6_y7^KJg0c>LM_v$M^O zc_6S##WTcGk#Fq$|E--{cNNDGMxXOH^2&=HvLJaCR%DjQ5&_~1Z$g0WaB*UYh4bsv zySM6mbw+&DA%?x+!mZPBAU>C7x}cXK?m6;Fl_ z9L8rx@P&M(({Sq{cHngWIB&#rpmoz>^CC6i3ZW3 z8e~mye`defUsP`-M5AwJ8JefFz5BxOuhW@9c{lLi8@`1G(dOl7&l?7rE6_7~`_HKT zV#J$>)??M%9{+B=?4#5@`_c{?9v zZ2x#>qSzaLJh^#1$Bc6xW9G@=>S%BQ+-H@kW3Lx^gyWe>dOS7AzEs|X$rA!(x482> zo^n;j7desmZ0aSMC+EobgT}qN_eZ_yiD>lxyn8lFNrw4k>dCC9vv>KMGdSxvv#6WjOVjuIpgq^9-r=X*M=O%{GCWweJ@nw-y+Zg~r-5Fi(Q$y&b+Pc2!QNK`SfrPQ z)Be-f(RF=?H~0i+Uu$FUzE-vjjg#?LSANc%gMr+%a`Vo0yN>b7Y=3^mSN_&#Ykd!z zy$@w^I{%{kP6O?9&bHd5z4#8}4?Sf_Bn^%~A9DoPRx(S8a6g@OM7ND)3wI4bbUB$N zW7)v_{t|Nz^zYB9yZ)emG6l6G0~ptDY|6E}@AWCpXv6hWc%tO4dW>)*vq7lcF)!4V$xQCo&b%iG_;W2;&{(>Cz%xNRA|rA^1N zrMWG4IRjhC7;d_ZYaOV^;%(g~G-B10o&MJmr0}rSgS@Zd@rB@rH|Jb?#^=+f`%8H2 z{-m5>Si!qRUhO3FIzgWaw<>z;$r!9|V)4JX%M{F4y z;i2m}@Ge7mSjo`)2OiHY8H=~jxJk|qj~>_kSMV-lJRm$qM*VGtxm;k7P_zKZ|-|Kf37(rrqs=wWS(eN5L& z(Qd9YCs$hB_m$Ww8AR^|#LC*gY+CmeKzf_t2)E@Av;~JprxE>dk8&Lz9i;#1u4QF0 zi??-~;0QJEv!Lf4qLc&gJf?qS>^uY>`sojE-e*Z8a&{cT_+5?LuE+3@xuM%3Jal+` zA>7_?Hr@A!@X&EYJH&xJ&UR-Rt9`x*yz3zNGwy37F($tme~weeUG^#eFPSMbL%)8{ zRAr8~d!`O&rV6sZXUf{^nW;NtUitmleYMU^ISZ&I#}$@T!|O8k)n9~f%jvJheoOiA z9+u$jK6?|5EsvCy*_jK^+sf3vth~|xH5=^LUN7NkbzF!3+M2^Mc1+iK+uE|rc^GH( zyw*eDQcw9XetG+Jn&QM(orm<_`e%5seafAul`pLPt?O;u2Y=~fX5~-9!>ub`S2gLs z_CI=sXZ4mo;^fy=kKFO=RflL_WLJ*gE4nSqb8D5tXmKUw%8OM_&rH>5^1pm~es_*ES4GrNMsGqZ&O<3Ug|V9JGy)f= zt@681BlS5W`dUY7v0uGuDDSz2y6d`klMgdd)P6PoDmO%#9F|cmckmE>KACoYJYP+#D#ei8uZLmeKziqzZ}ocvPTN|`?2!#U0;u8RR7-t;``FvKY-ru&gdSQC*Nvv zIb(dh1oknZ&ogEi zk;WU;>({ePtx@@JW|@{JFx+?s9B zlNzFbf3qShGjlgjMvMKuWMs0`5YoGgiL=rWaAZ1}tIhM_Z|>{SKQ0Cr_5CjNh~8d~ zy831p{QNNf>ib;q_-gQQT|?;Atj>?K|C?Dx1MF|AoGi9hW4FiIgL$Wb#_kPYri>o- zCv5cBnZvjoHD3%5fH&%p_QT+za+2U=ui3phuKbFheriUJ_HQRo=i^K(Yjx&B_dGqH zdVv!&Pfw?w@f|(y@3V}>{Q{T!of!A-8H6{pqe=sP_aZ{6_R8Y3&t{o9SqsI-&42bM z5YS#9x0LY(SBiSNScnoha?nQk5oi0E0%v@$1L(y&bbTQ>gk$@%24}f$(O5qcu` zrIcMtuG zb7eRTU-yTf;;n2Y4&?OEzc>#!>j-$~A^nw^{+)-wKPE%*mNp$nao9QQ@X$!heinFS zbR5!3FR*>+M@D%Ij>wrd9Y<(%J%%5A*duVqYjuMk;gV8yowI@Jy)*S>2FK=dv{~Tm~}Ie+5QI24kt<_{IfZSP!dO? z!^vuAAEEaX(#YPj@X+^`g~vOS8u+^m*?Z>QkUEfa>;P8uCZCCd*Sq0plgxU@5gDxA z+A8BdR_k*|;Oj9VylnchHrV@OH=10RP`94x`j`k0tNuL`5qLZw-YUWjJ=SL)uD9eN z(uZ1j>=~K0jF~%v|8z&G(+~dr$Zgj{;RH=mrO%uZ?R`z(DnXj>bCP6nB)yPDu1ro933c){iTEqzwCH~xBB84a^`KLv{Q~e<<-BV_hARWiAH}4 z3>sdC)F?dOoptco@%s*$@KClYt-@c&;W;?s(|J;D{f>qoCuMl>c{6#4o_P{n9rV58 z=sEuOYS(6+nc}^!FUB+G&&Kchh;h6ddyVM*ySc~ea@74iATLM6 - - - snoop - SnoopServlet - - - file - ViewFile - - initial - - 1000 - - - The initial value for the counter - - - - - - mv - - - *.wm - - - - - - - - manager - - - director - - - president - - - diff --git a/test/rexml/data/web2.xml b/test/rexml/data/web2.xml deleted file mode 100644 index 7d479d37e9bbd1..00000000000000 --- a/test/rexml/data/web2.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/test/rexml/data/working.rss b/test/rexml/data/working.rss deleted file mode 100644 index b38c45f5d83098..00000000000000 --- a/test/rexml/data/working.rss +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Paul Duncan - http://www.paulduncan.org/ - Paul Duncan's personal blog. - - - - Fun With Tense - - Wed Sep 3 19:37:18 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=23 - -<pre> -&lt;richlowe&gt; blah. -&lt;richlowe&gt; that's what I say. -&lt;pabs&gt; if i say it too then what happens? -&lt;richlowe&gt; then "that's what we say" -&lt;richlowe&gt; duh. -&lt;pabs&gt; what if i say it, then retract it? -&lt;richlowe&gt; Did they teach you nothing in school! -&lt;richlowe&gt; "that's what I say, and he said" -&lt;pabs&gt; :( -&lt;pabs&gt; okay what if i say it, retract it, but then plan on saying it - again at some point in the indeterminite future? -&lt;richlowe&gt; "that's what I say, and he has said, and will possibly say - again"? -&lt;pabs&gt; see now that's not concise at all -</pre> - - - - - - We'll Miss You, Michael - - Mon Aug 25 09:52:41 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=22 - -<p> -Perhaps <a href='http://www.dash-dash.org/pix/death.jpg'>the image</a> -on <a href='http://www.dash-dash.org/'>his site</a> was a bit more -fitting than we realized. I'm frustrated that nothing and noone around -him could help ease the pain that he was going through. We can take -comfort in knowing that he felt the decision he made was best for him. -We'll miss you, Michael. -</p> - - - - - - Horis, Isis, Osiris, Oh My! - - Fri Aug 22 22:39:23 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=21 - -<p> -I started reading one of the several mythology books I checked out -earlier this week (as part of a personal research project, the results -of which will be available here eventually). I've only made it through -about 60 pages of Egyptian mythology so far, but it's interesting stuff. -One thing that's impressive to me is how the sexes appear to be on much -more equal footing (as compared to the Judeo/Christian mythology we've -been innundated with for most of our lives). For example, Isis revives -her husband Osiris by collecting his body parts, which are scattered -throughout Egypt. She also saves her son Horus from death and nurtures -him until he can fend for himself. Really interesting stuff. Anyway, -I'll have more about the project as I get farther along. -</p> - - - - - - Nature Sucks - - Fri Aug 22 08:33:41 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=20 - -<p> -<a href='http://www.linuxbrit.co.uk/'>Tom</a> has been having a rough -couple of weeks. Apparently he's got <a -href='http://www.ninds.nih.gov/health_and_medical/disorders/bells_doc.htm'>Bell's -Palsy</a> (link from ljlane), which, while treatable and rarely -permanent, still leaves his face partially paralyzed. If you have a few -minutes, you might consider sending him an <abbr title='Electronic -Card'>E-Card</abbr> or an <a -href='mailto:dr_spock@linuxbrit.co.uk'>email</a>. -</p> - - - - - - Or Maybe He Does - - Thu Aug 21 23:45:40 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=19 - -<p> -Okay, apparently Ed <em>does</em> read this page. :-D -</p> - - - - - - Ed Got Married!! - - Thu Aug 21 15:52:34 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=18 - -<p> -Ed got married in the Bahamas! Here's a picture from the honeymoon: -</p> - -<img src='/files/ed_dolphin.jpg' width='252' height='288' - title='Ed on his honeymoon!' alt='Ed on his honeymoon!' /> - -<p> -(Fortunately he doesn't read this site). -</p> - -<p> -One other thing. I weigh 186<abbr title='Pounds'>lbs</abbr> now. -The <a href='http://www.pablotron.org/weight/'>weight page</a> has been -updated. -</p> - - - - - - Gratuitous Douglas Adams Reference, #32427! - - Tue Aug 19 08:25:42 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=17 - -<p> -Just saw this <acronym title='Uniform Resource Locator'>URL</acronym> -on <a href='http://www.diveintomark.org/'>Dive Into -Mark</a>: -</p> - -<p> -<a -href='http://www.google.com/search?q=answer+to+life+the+universe+and+everything'>http://www.google.com/search?q=answer+to+life+the+universe+and+everything</a> -</p> - -<p> -<a href='http://www.bbc.co.uk/h2g2/guide/'><acronym title='Hitchhikers -Guide to the Galaxy'>H2G2</acronym></a> references never get old for me. -</p> - - - - - - Weekend Update, sans Norm McDonald - - Tue Aug 19 08:18:32 2003 - paul@paulduncan.org - http://www.paulduncan.org/?id=16 - -<p> -What a nutty weekend. A friend of mine went to the <acronym -title='Emergency Room'>ER</acronym> on Friday night, so I spent 4 hours -down there. It's really frustrating to see that many sick and injured -people in once place, and not really be able to do anything about it. -Also, for that much chaos, both the atmosphere and the staff are -disturbingly calm. -</p> - -<p> -I finally got <a href='http://www.raggle.org/'>Raggle</a> to a point -worthy of a new release. I'm not going to blather on about the new -stuff; if you're interested you can <a -href='http://www.raggle.org/'>check it out</a> on your own. -</p> - -<p> -<a href='http://www.pablotron.org/weight/'>The war against obesity</a> -continues! I'm down to 188 pounds now, a total of 75 pounds lost since -the beginning of March. I've been having trouble losing these last 10 -pounds, so this week is officially "Go to the Gym Every Night or Else" -week. 2 days down, 5 to go. -</p> - - - - - diff --git a/test/rexml/data/xmlfile-bug.xml b/test/rexml/data/xmlfile-bug.xml deleted file mode 100644 index d4396682f7157e..00000000000000 --- a/test/rexml/data/xmlfile-bug.xml +++ /dev/null @@ -1,15 +0,0 @@ - - -Technik - -Technik -Die Technik ist das Rckgrat der meisten Geschftsprozesse bei Home of the Brave. Deshalb sollen hier alle relevanten technischen Ablufe, Daten und Einrichtungen beschrieben werden, damit jeder im Bedarfsfall die ntigen Informationen, Anweisungen und Verhaltensempfehlungen nachlesen und/oder abrufen kann. - - - Flash - Ntzliches von Flashern fr Flasher. - CVS-FAQ - FAQ zur Benutzung von CVS bei HOB - - - diff --git a/test/rexml/data/xp.tst b/test/rexml/data/xp.tst deleted file mode 100644 index 6551372575df94..00000000000000 --- a/test/rexml/data/xp.tst +++ /dev/null @@ -1,27 +0,0 @@ -/ -/rss -//rss -/rss/channel -//link -//image/* -//link[2] -//link[last()] -rss/channel/link[last()] -rss/channel/item/link[last()] -rss/channel/item/link[1] -rss/channel/item[@x='1'] -rss/channel/item[@x] -//item[@x] -//item[normalize-space(@name)='x'] -//*[count(title)=1] -//*[name()='link'] -//*[starts-with(name(),'li')] -//*[contains(name(),'y')] -//*[string-length(name()) = 4] -//copyright | //title -/child::rss -/descendant::* -//language/parent::* -/rss/channel/ancestor::* -//item[position() mod 2 = 0 ] -//item/ancestor::* \ No newline at end of file diff --git a/test/rexml/data/yahoo.xml b/test/rexml/data/yahoo.xml deleted file mode 100644 index b63a9440bc4129..00000000000000 --- a/test/rexml/data/yahoo.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - -<![CDATA[Yahoo! News Search Results for market]]> -http://news.search.yahoo.com/search/news?p=market&ei=UTF-8 - -en-us -Copyright (c) 2004 Yahoo! Inc. All rights reserved. -Sun, 03 Sep 2006 16:34:54 GMT -5 - -Yahoo! News -142 -18 -http://news.search.yahoo.com/news -http://us.i1.yimg.com/us.yimg.com/i/us/nws/th/main_142.gif - -false -<![CDATA[Toyota increases share in US auto market (Manila Bulletin)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=13ck33lrk/*http%3A//www.mb.com.ph/archive_pages.php?url=http://www.mb.com.ph/issues/2006/09/04/BSNS2006090473427.html -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=13ck33lrk/*http%3A//www.mb.com.ph/archive_pages.php?url=http://www.mb.com.ph/issues/2006/09/04/BSNS2006090473427.html -Sun, 03 Sep 2006 16:21:30 GMT - - -<![CDATA[ANALYSIS - North Korea finds market for missiles shrinking (Reuters via Yahoo! Asia News)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=11ibfq78e/*http%3A//asia.news.yahoo.com/060903/3/2pd1j.html -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=11ibfq78e/*http%3A//asia.news.yahoo.com/060903/3/2pd1j.html -Sun, 03 Sep 2006 08:37:33 GMT - - -<![CDATA[Broward labor market's a solid performer (Miami Herald)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=13671c2t8/*http%3A//www.miami.com/mld/miamiherald/business/15427113.htm?source=rss&channel=miamiherald_business -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=13671c2t8/*http%3A//www.miami.com/mld/miamiherald/business/15427113.htm?source=rss&channel=miamiherald_business -Sun, 03 Sep 2006 07:39:53 GMT - - -<![CDATA[NID to help Jharkhand e-market crafts (Yahoo! India News)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=11hg1j19f/*http%3A//in.news.yahoo.com/060903/43/6780a.html -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=11hg1j19f/*http%3A//in.news.yahoo.com/060903/43/6780a.html -Sun, 03 Sep 2006 10:02:54 GMT - - -<![CDATA[Reinsurance market goes high-tech to predict disasters (The Herald-Tribune)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12j43rdgp/*http%3A//www.heraldtribune.com/apps/pbcs.dll/article?AID=/20060903/NEWS/609030458 -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12j43rdgp/*http%3A//www.heraldtribune.com/apps/pbcs.dll/article?AID=/20060903/NEWS/609030458 -Sun, 03 Sep 2006 10:34:36 GMT - - -<![CDATA[Government warned against going into property market (Sunday Business Post)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12pru5k6v/*http%3A//www.sbpost.ie/breakingnews/breaking_story.asp?j=4126020&p=4yz6x35&n=4126112&x= -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12pru5k6v/*http%3A//www.sbpost.ie/breakingnews/breaking_story.asp?j=4126020&p=4yz6x35&n=4126112&x= -Sun, 03 Sep 2006 09:31:34 GMT - - -<![CDATA[Farmers Market gets shoulder-to-shoulder crowds on Saturdays (Great Falls Tribune)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12pfls0n1/*http%3A//www.greatfallstribune.com/apps/pbcs.dll/article?AID=/20060903/NEWS01/609030306 -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12pfls0n1/*http%3A//www.greatfallstribune.com/apps/pbcs.dll/article?AID=/20060903/NEWS01/609030306 -Sun, 03 Sep 2006 11:12:36 GMT - - -<![CDATA[City Hall takes Plan B for SF market rehab (Sun Star)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=138rfnhvi/*http%3A//www.sunstar.com.ph/static/pam/2006/09/03/news/city.hall.takes.plan.b.for.sf.market.rehab.html -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=138rfnhvi/*http%3A//www.sunstar.com.ph/static/pam/2006/09/03/news/city.hall.takes.plan.b.for.sf.market.rehab.html -Sun, 03 Sep 2006 08:18:46 GMT - - -<![CDATA[Market watch (AG Weekly)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12ahobgi6/*http%3A//www.agweekly.com/articles/2006/09/02/news/markets/markets01.txt -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=12ahobgi6/*http%3A//www.agweekly.com/articles/2006/09/02/news/markets/markets01.txt -Sun, 03 Sep 2006 04:20:37 GMT - - -<![CDATA[Catholic War Vets Ladies Club sets flea market (Times Leader)]]> -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=1383flil1/*http%3A//www.timesleader.com/mld/timesleader/living/15431391.htm?source=rss&channel=timesleader_living -http://us.rd.yahoo.com/dailynews/rss/search/market/SIG=1383flil1/*http%3A//www.timesleader.com/mld/timesleader/living/15431391.htm?source=rss&channel=timesleader_living -Sun, 03 Sep 2006 07:07:50 GMT - - - - diff --git a/test/rexml/formatter/test_default.rb b/test/rexml/formatter/test_default.rb deleted file mode 100644 index b5b131724b8a46..00000000000000 --- a/test/rexml/formatter/test_default.rb +++ /dev/null @@ -1,19 +0,0 @@ -require_relative "../rexml_test_utils" - -module REXMLTests - class DefaultFormatterTest < Test::Unit::TestCase - def format(node) - formatter = REXML::Formatters::Default.new - output = "" - formatter.write(node, output) - output - end - - class InstructionTest < self - def test_content_nil - instruction = REXML::Instruction.new("target") - assert_equal("", format(instruction)) - end - end - end -end diff --git a/test/rexml/functions/test_base.rb b/test/rexml/functions/test_base.rb deleted file mode 100644 index 74dc1a31de45b8..00000000000000 --- a/test/rexml/functions/test_base.rb +++ /dev/null @@ -1,261 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" - -require "rexml/document" - -# TODO: Split me -module REXMLTests - class FunctionsTester < Test::Unit::TestCase - include REXML - - def setup - super - REXML::Functions.context = nil - end - - def test_functions - # trivial text() test - # confuse-a-function - source = "more dumb text" - doc = Document.new source - res = "" - XPath::each(doc.root, "text()") {|val| res << val.to_s} - assert_equal "more text", res - - res = XPath::first(doc.root, "b[last()]") - assert_equal '3', res.attributes['id'] - res = XPath::first(doc.root, "b[position()=2]") - assert_equal '2', res.attributes['id'] - res = XPath::first(doc.root, "*[name()='c']") - assert_equal "c", res.name - end - - # Contributed by Mike Stok - def test_starts_with - source = <<-EOF - - a@b.c - http://www.foo.com - - EOF - doc = Document.new source - mailtos = doc.elements.to_a("//a[starts-with(@href, 'mailto:')]") - assert_equal 1, mailtos.size - assert_equal "mailto:a@b.c", mailtos[0].attributes['href'] - - ailtos = doc.elements.to_a("//a[starts-with(@href, 'ailto:')]") - assert_equal 0, ailtos.size - end - - def test_string_length - doc = Document.new <<-EOF - - - - - - - - - EOF - assert doc, "create doc" - - set = doc.elements.to_a("//*[string-length(name()) = 3]") - assert_equal 2, set.size, "nodes with names length = 3" - - set = doc.elements.to_a("//*[string-length(name()) < 3]") - assert_equal 2, set.size, "nodes with names length < 3" - - set = doc.elements.to_a("//*[string-length(name()) > 3]") - assert_equal 3, set.size, "nodes with names length > 3" - end - - # Test provided by Mike Stok - def test_contains - source = <<-EOF - - a@b.c - http://www.foo.com - - EOF - doc = Document.new source - - [['o', 2], ['foo', 1], ['bar', 0]].each { |test| - search, expected = test - set = doc.elements.to_a("//a[contains(@href, '#{search}')]") - assert_equal expected, set.size - } - end - - # Mike Stok and Sean Russell - def test_substring - # examples from http://www.w3.org/TR/xpath#function-substring - doc = Document.new('') - - #puts XPath.first(d, 'node()[0 + 1]') - #d = Document.new("") - #puts XPath.first(d, 'a[0 mod 0]') - [ [1.5, 2.6, '234'], - [0, 3, '12'], - [0, '0 div 0', ''], - [1, '0 div 0', ''], - ['-42', '1 div 0', '12345'], - ['-1 div 0', '1 div 0', ''] - ].each { |start, length, expected| - set = doc.elements.to_a("//test[substring(@string, #{start}, #{length}) = '#{expected}']") - assert_equal 1, set.size, "#{start}, #{length}, '#{expected}'" - } - end - - def test_substring_angrez - testString = REXML::Functions::substring_after("helloworld","hello") - assert_equal( 'world', testString ) - end - - def test_translate - source = <<-EOF - - - - - - - - EOF - - doc = Document.new(source) - - [ ['bar', 'abc', 'ABC', 'w3c one'], - ['--aaa--','abc-','ABC', 'w3c two'], - ['lead', 'dear language', 'doll groover', 'alchemy'], - ['A Space Odissei', 'i', 'y', 'vbxml one'], - ['abcdefg', 'aceg', 'ACE', 'vbxml two'], - ].each { |arg1, arg2, arg3, name| - translate = "translate('#{arg1}', '#{arg2}', '#{arg3}')" - set = doc.elements.to_a("//case[@result = #{translate}]") - assert_equal 1, set.size, translate - assert_equal name, set[0].attributes['name'] - } - end - - def test_name - d = REXML::Document.new("") - assert_equal 1, d.root.elements.to_a('*[name() = "b"]').size - assert_equal 1, d.elements.to_a('//*[name() = "x:b"]').size - end - - def test_local_name - d = REXML::Document.new("") - assert_equal 2, d.root.elements.to_a('*[local_name() = "b"]').size - assert_equal 2, d.elements.to_a('//*[local_name() = "b"]').size - end - - def test_substring2 - doc = Document.new('') - assert_equal(1,doc.elements.to_a("//test[substring(@string,2)='2345']").size) - end - - # Submitted by Kouhei - def test_floor_ceiling_round - source = "" - doc = REXML::Document.new(source) - - id_1 = doc.elements["/a/b[@id='1']"] - id_2 = doc.elements["/a/b[@id='2']"] - id_3 = doc.elements["/a/b[@id='3']"] - - good = { - "floor" => [[], [id_1], [id_2], [id_3]], - "ceiling" => [[id_1], [id_2], [id_3], []], - "round" => [[id_1], [id_2], [id_3], []] - } - good.each do |key, value| - (0..3).each do |i| - xpath = "//b[number(@id) = #{key}(#{i+0.5})]" - assert_equal(value[i], REXML::XPath.match(doc, xpath)) - end - end - - good["round"] = [[], [id_1], [id_2], [id_3]] - good.each do |key, value| - (0..3).each do |i| - xpath = "//b[number(@id) = #{key}(#{i+0.4})]" - assert_equal(value[i], REXML::XPath.match(doc, xpath)) - end - end - end - - # Submitted by Kou - def test_lang - d = Document.new(<<-XML) - - - - - - - - - XML - - assert_equal(1, d.elements.to_a("//*[lang('fr')]").size) - assert_equal(3, d.elements.to_a("//*[lang('ja')]").size) - assert_equal(2, d.elements.to_a("//*[lang('en')]").size) - assert_equal(1, d.elements.to_a("//*[lang('en-us')]").size) - - d = Document.new(<<-XML) - - -
- - - - XML - - assert_equal(5, d.elements.to_a("//*[lang('en')]").size) - end - - def test_ticket_60 - document = REXML::Document.new("A1") - assert_equal( "A", REXML::XPath.first(document, '//b[.="A"]').text ) - assert_equal( "1", REXML::XPath.first(document, '//b[.="1"]').text ) - end - - def test_normalize_space - source = "" - doc = REXML::Document.new(source) - predicate = "string(.)=normalize_space('\nCOMMENT \n A \n\n ')" - m = REXML::XPath.match(doc, "//comment()[#{predicate}]") - assert_equal( [REXML::Comment.new("COMMENT A")], m ) - end - - def test_string_nil_without_context - doc = REXML::Document.new(<<-XML) - - - - - - XML - - assert_equal([doc.root.elements[2]], - REXML::XPath.match(doc, - "//foo[@bar=$n]", - nil, - {"n" => nil})) - end - - def test_unregistered_method - doc = Document.new("") - assert_nil(XPath::first(doc.root, "to_s()")) - end - - def test_nonexistent_function - doc = Document.new("") - # TODO: Maybe, this is not XPath spec behavior. - # This behavior must be reconsidered. - assert_equal(doc.root.elements[1], - XPath::first(doc.root, "nonexistent()")) - end - end -end diff --git a/test/rexml/functions/test_boolean.rb b/test/rexml/functions/test_boolean.rb deleted file mode 100644 index b3e2117c10f45a..00000000000000 --- a/test/rexml/functions/test_boolean.rb +++ /dev/null @@ -1,75 +0,0 @@ -# frozen_string_literal: false - -require "test/unit" -require "rexml/document" -require "rexml/functions" - -module REXMLTests - class TestFunctionsBoolean < Test::Unit::TestCase - def setup - REXML::Functions.context = nil - end - - def test_true - assert_equal(true, REXML::Functions.boolean(true)) - end - - def test_false - assert_equal(false, REXML::Functions.boolean(false)) - end - - def test_integer_true - assert_equal(true, REXML::Functions.boolean(1)) - end - - def test_integer_positive_zero - assert_equal(false, REXML::Functions.boolean(0)) - end - - def test_integer_negative_zero - assert_equal(false, REXML::Functions.boolean(-0)) - end - - def test_float_true - assert_equal(true, REXML::Functions.boolean(1.1)) - end - - def test_float_positive_zero - assert_equal(false, REXML::Functions.boolean(-0.0)) - end - - def test_float_negative_zero - assert_equal(false, REXML::Functions.boolean(-0.0)) - end - - def test_float_nan - assert_equal(false, REXML::Functions.boolean(Float::NAN)) - end - - def test_string_true - assert_equal(true, REXML::Functions.boolean("content")) - end - - def test_string_empty - assert_equal(false, REXML::Functions.boolean("")) - end - - def test_node_set_true - root = REXML::Document.new("").root - assert_equal(true, REXML::Functions.boolean([root])) - end - - def test_node_set_empty - assert_equal(false, REXML::Functions.boolean([])) - end - - def test_nil - assert_equal(false, REXML::Functions.boolean(nil)) - end - - def test_context - REXML::Functions.context = {node: true} - assert_equal(true, REXML::Functions.boolean()) - end - end -end diff --git a/test/rexml/functions/test_local_name.rb b/test/rexml/functions/test_local_name.rb deleted file mode 100644 index 97c9e74852424e..00000000000000 --- a/test/rexml/functions/test_local_name.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: false - -require "test/unit" -require "rexml/document" -require "rexml/functions" - -module REXMLTests - class TestFunctionsLocalName < Test::Unit::TestCase - def setup - REXML::Functions.context = nil - end - - def test_one - document = REXML::Document.new(<<-XML) - - - - XML - node_set = document.root.children - assert_equal("child", REXML::Functions.local_name(node_set)) - end - - def test_multiple - document = REXML::Document.new(<<-XML) - - - - - XML - node_set = document.root.children - assert_equal("child1", REXML::Functions.local_name(node_set)) - end - - def test_nonexistent - assert_equal("", REXML::Functions.local_name([])) - end - - def test_context - document = REXML::Document.new("") - REXML::Functions.context = {node: document.root} - assert_equal("root", REXML::Functions.local_name()) - end - end -end diff --git a/test/rexml/functions/test_number.rb b/test/rexml/functions/test_number.rb deleted file mode 100644 index 16e635701c7db0..00000000000000 --- a/test/rexml/functions/test_number.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: false - -require "test/unit" -require "rexml/document" -require "rexml/functions" - -module REXMLTests - class TestFunctionsNumber < Test::Unit::TestCase - def setup - REXML::Functions.context = nil - end - - def test_true - assert_equal(1, REXML::Functions.number(true)) - end - - def test_false - assert_equal(0, REXML::Functions.number(false)) - end - - def test_numeric - assert_equal(29, REXML::Functions.number(29)) - end - - def test_string_integer - assert_equal(100, REXML::Functions.number("100")) - end - - def test_string_float - assert_equal(-9.13, REXML::Functions.number("-9.13")) - end - - def test_node_set - root = REXML::Document.new("100").root - assert_equal(100, REXML::Functions.number([root])) - end - end -end diff --git a/test/rexml/listener.rb b/test/rexml/listener.rb deleted file mode 100644 index 6bede03c599ef4..00000000000000 --- a/test/rexml/listener.rb +++ /dev/null @@ -1,51 +0,0 @@ -# frozen_string_literal: false -class Listener - attr_reader :ts, :te - attr_reader :normalize - def initialize - @ts = false - @te = false - end - def tag_start name, attrs - @ts = true if name=="subsection" and attrs["title"]=="Namespaces" - end - def tag_end name - @te = true if name=="documentation" - end - def text text - @normalize = text - #text.tr! "\n", ' ' - #puts "text #{text[0..10]}..." - end - def instruction name, instruction - #puts "instruction" - end - def comment comment - #puts "comment #{comment[0..10]}..." - end - def doctype name, pub_sys, long_name, uri - #puts "doctype #{name}" - end - def attlistdecl content - #puts "attlistdecl" - end - def elementdecl content - #puts "elementdecl" - end - def entitydecl content - #puts "entitydecl" - end - def notationdecl content - #puts "notationdecl" - end - def entity content - #puts "entity" - end - def cdata content - #puts "cdata" - end - def xmldecl version, encoding, standalone - #puts "xmldecl #{version}" - end -end - diff --git a/test/rexml/parse/test_document_type_declaration.rb b/test/rexml/parse/test_document_type_declaration.rb deleted file mode 100644 index 80f70888fb5605..00000000000000 --- a/test/rexml/parse/test_document_type_declaration.rb +++ /dev/null @@ -1,50 +0,0 @@ -# frozen_string_literal: false -require "test/unit" -require "rexml/document" - -module REXMLTests - class TestParseDocumentTypeDeclaration < Test::Unit::TestCase - private - def xml(internal_subset) - <<-XML - - - XML - end - - def parse(internal_subset) - REXML::Document.new(xml(internal_subset)).doctype - end - - class TestMixed < self - def test_entity_element - doctype = parse(<<-INTERNAL_SUBSET) - - - INTERNAL_SUBSET - assert_equal([REXML::Entity, REXML::ElementDecl], - doctype.children.collect(&:class)) - end - - def test_attlist_entity - doctype = parse(<<-INTERNAL_SUBSET) - - - INTERNAL_SUBSET - assert_equal([REXML::AttlistDecl, REXML::Entity], - doctype.children.collect(&:class)) - end - - def test_notation_attlist - doctype = parse(<<-INTERNAL_SUBSET) - - - INTERNAL_SUBSET - assert_equal([REXML::NotationDecl, REXML::AttlistDecl], - doctype.children.collect(&:class)) - end - end - end -end diff --git a/test/rexml/parse/test_element.rb b/test/rexml/parse/test_element.rb deleted file mode 100644 index 7322e0eb4ebccb..00000000000000 --- a/test/rexml/parse/test_element.rb +++ /dev/null @@ -1,51 +0,0 @@ -require "test/unit" -require "rexml/document" - -module REXMLTests - class TestParseElement < Test::Unit::TestCase - def parse(xml) - REXML::Document.new(xml) - end - - class TestInvalid < self - def test_top_level_end_tag - exception = assert_raise(REXML::ParseException) do - parse("") - end - assert_equal(<<-DETAIL.chomp, exception.to_s) -Unexpected top-level end tag (got 'a') -Line: 1 -Position: 4 -Last 80 unconsumed characters: - - DETAIL - end - - def test_no_end_tag - exception = assert_raise(REXML::ParseException) do - parse("") - end - assert_equal(<<-DETAIL.chomp, exception.to_s) -Invalid attribute name: <:a=""> -Line: 1 -Position: 9 -Last 80 unconsumed characters: - - DETAIL - end - end - end -end diff --git a/test/rexml/parse/test_notation_declaration.rb b/test/rexml/parse/test_notation_declaration.rb deleted file mode 100644 index 0d29f0d81f179f..00000000000000 --- a/test/rexml/parse/test_notation_declaration.rb +++ /dev/null @@ -1,100 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'rexml/document' - -module REXMLTests - class TestParseNotationDeclaration < Test::Unit::TestCase - private - def xml(internal_subset) - <<-XML - - - XML - end - - def parse(internal_subset) - REXML::Document.new(xml(internal_subset)).doctype - end - - class TestCommon < self - def test_name - doctype = parse("") - assert_equal("name", doctype.notation("name").name) - end - end - - class TestExternalID < self - class TestSystem < self - def test_single_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("system-literal", doctype.notation("name").system) - end - - def test_double_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("system-literal", doctype.notation("name").system) - end - end - - class TestPublic < self - class TestPublicIDLiteral < self - def test_single_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("public-id-literal", doctype.notation("name").public) - end - - def test_double_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("public-id-literal", doctype.notation("name").public) - end - end - - class TestSystemLiteral < self - def test_single_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("system-literal", doctype.notation("name").system) - end - - def test_double_quote - doctype = parse(<<-INTERNAL_SUBSET) - - INTERNAL_SUBSET - assert_equal("system-literal", doctype.notation("name").system) - end - end - end - - class TestMixed < self - def test_system_public - doctype = parse(<<-INTERNAL_SUBSET) - - - INTERNAL_SUBSET - assert_equal(["system-name", "public-name"], - doctype.notations.collect(&:name)) - end - - def test_public_system - doctype = parse(<<-INTERNAL_SUBSET) - - - INTERNAL_SUBSET - assert_equal(["public-name", "system-name"], - doctype.notations.collect(&:name)) - end - end - end - end -end diff --git a/test/rexml/parse/test_processing_instruction.rb b/test/rexml/parse/test_processing_instruction.rb deleted file mode 100644 index a23513fc6e2770..00000000000000 --- a/test/rexml/parse/test_processing_instruction.rb +++ /dev/null @@ -1,25 +0,0 @@ -require "test/unit" -require "rexml/document" - -module REXMLTests - class TestParseProcessinInstruction < Test::Unit::TestCase - def parse(xml) - REXML::Document.new(xml) - end - - class TestInvalid < self - def test_no_name - exception = assert_raise(REXML::ParseException) do - parse("") - end - assert_equal(<<-DETAIL.chomp, exception.to_s) -Invalid processing instruction node -Line: 1 -Position: 4 -Last 80 unconsumed characters: - - DETAIL - end - end - end -end diff --git a/test/rexml/parser/test_sax2.rb b/test/rexml/parser/test_sax2.rb deleted file mode 100644 index 91d135f5f73b63..00000000000000 --- a/test/rexml/parser/test_sax2.rb +++ /dev/null @@ -1,203 +0,0 @@ -# frozen_string_literal: false -require "test/unit" -require "rexml/parsers/sax2parser" -require "rexml/sax2listener" - -module REXMLTests -class TestSAX2Parser < Test::Unit::TestCase - class TestDocumentTypeDeclaration < self - private - def xml(internal_subset) - <<-XML - - - XML - end - - class TestEntityDeclaration < self - class Listener - include REXML::SAX2Listener - attr_reader :entity_declarations - def initialize - @entity_declarations = [] - end - - def entitydecl(declaration) - super - @entity_declarations << declaration - end - end - - private - def parse(internal_subset) - listener = Listener.new - parser = REXML::Parsers::SAX2Parser.new(xml(internal_subset)) - parser.listen(listener) - parser.parse - listener.entity_declarations - end - - class TestGeneralEntity < self - class TestValue < self - def test_double_quote - assert_equal([["name", "value"]], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_single_quote - assert_equal([["name", "value"]], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - - class TestExternlID < self - class TestSystem < self - def test_with_ndata - declaration = [ - "name", - "SYSTEM", "system-literal", - "NDATA", "ndata-name", - ] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_without_ndata - declaration = [ - "name", - "SYSTEM", "system-literal", - ] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - - class TestPublic < self - def test_with_ndata - declaration = [ - "name", - "PUBLIC", "public-literal", "system-literal", - "NDATA", "ndata-name", - ] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_without_ndata - declaration = [ - "name", - "PUBLIC", "public-literal", "system-literal", - ] - assert_equal([declaration], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - end - end - - class TestParameterEntity < self - class TestValue < self - def test_double_quote - assert_equal([["%", "name", "value"]], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_single_quote - assert_equal([["%", "name", "value"]], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - - class TestExternlID < self - def test_system - declaration = [ - "%", - "name", - "SYSTEM", "system-literal", - ] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_public - declaration = [ - "%", - "name", - "PUBLIC", "public-literal", "system-literal", - ] - assert_equal([declaration], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - end - end - - class TestNotationDeclaration < self - class Listener - include REXML::SAX2Listener - attr_reader :notation_declarations - def initialize - @notation_declarations = [] - end - - def notationdecl(*declaration) - super - @notation_declarations << declaration - end - end - - private - def parse(internal_subset) - listener = Listener.new - parser = REXML::Parsers::SAX2Parser.new(xml(internal_subset)) - parser.listen(listener) - parser.parse - listener.notation_declarations - end - - class TestExternlID < self - def test_system - declaration = ["name", "SYSTEM", nil, "system-literal"] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - def test_public - declaration = ["name", "PUBLIC", "public-literal", "system-literal"] - assert_equal([declaration], parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - - class TestPublicID < self - def test_literal - declaration = ["name", "PUBLIC", "public-literal", nil] - assert_equal([declaration], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - end - end - end -end -end diff --git a/test/rexml/parser/test_stream.rb b/test/rexml/parser/test_stream.rb deleted file mode 100644 index c315833e4b6fe3..00000000000000 --- a/test/rexml/parser/test_stream.rb +++ /dev/null @@ -1,32 +0,0 @@ -require "test/unit" -require "rexml/document" -require "rexml/streamlistener" - -module REXMLTests - class TestStreamParser < Test::Unit::TestCase - class NullListener - include REXML::StreamListener - end - - class TestInvalid < self - def test_no_end_tag - xml = "" - exception = assert_raise(REXML::ParseException) do - parse(xml) - end - assert_equal(<<-MESSAGE, exception.to_s) -Missing end tag for '/root/sub' -Line: 1 -Position: #{xml.bytesize} -Last 80 unconsumed characters: - MESSAGE - end - - private - def parse(xml, listener=nil) - listener ||= NullListener.new - REXML::Document.parse_stream(xml, listener) - end - end - end -end diff --git a/test/rexml/parser/test_tree.rb b/test/rexml/parser/test_tree.rb deleted file mode 100644 index 8a5d9d1223fc2f..00000000000000 --- a/test/rexml/parser/test_tree.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: false -require "test/unit" -require "rexml/document" -require "rexml/parsers/treeparser" - -module REXMLTests -class TestTreeParser < Test::Unit::TestCase - class TestInvalid < self - def test_unmatched_close_tag - xml = "" - exception = assert_raise(REXML::ParseException) do - parse(xml) - end - assert_equal(<<-MESSAGE, exception.to_s) -Missing end tag for 'root' (got 'not-root') -Line: 1 -Position: #{xml.bytesize} -Last 80 unconsumed characters: - MESSAGE - end - - def test_no_close_tag - xml = "" - exception = assert_raise(REXML::ParseException) do - parse(xml) - end - assert_equal(<<-MESSAGE, exception.to_s) -No close tag for /root -Line: 1 -Position: #{xml.bytesize} -Last 80 unconsumed characters: - MESSAGE - end - - private - def parse(xml) - document = REXML::Document.new - parser = REXML::Parsers::TreeParser.new(xml, document) - parser.parse - end - end -end -end diff --git a/test/rexml/parser/test_ultra_light.rb b/test/rexml/parser/test_ultra_light.rb deleted file mode 100644 index 8f4a3980d58bb0..00000000000000 --- a/test/rexml/parser/test_ultra_light.rb +++ /dev/null @@ -1,70 +0,0 @@ -# frozen_string_literal: false -require "test/unit" -require "rexml/parsers/ultralightparser" - -module REXMLTests -class TestUltraLightParser < Test::Unit::TestCase - class TestDocumentTypeDeclaration < self - def test_entity_declaration - assert_equal([ - [ - :start_doctype, - :parent, - "root", - "SYSTEM", - "urn:x-test", - nil, - [:entitydecl, "name", "value"] - ], - [:text, "\n"], - [:start_element, :parent, "root", {}], - [:text, "\n"], - ], - parse(<<-INTERNAL_SUBSET)) - - INTERNAL_SUBSET - end - - private - def xml(internal_subset) - <<-XML - - - XML - end - - def parse(internal_subset) - parser = REXML::Parsers::UltraLightParser.new(xml(internal_subset)) - normalize(parser.parse) - end - - def normalize(root) - root.collect do |child| - normalize_child(child) - end - end - - def normalize_child(child) - tag = child.first - case tag - when :start_doctype - normalized_parent = :parent - normalized_doctype = child.dup - normalized_doctype[1] = normalized_parent - normalized_doctype - when :start_element - tag, _parent, name, attributes, *children = child - normalized_parent = :parent - normalized_children = children.collect do |sub_child| - normalize_child(sub_child) - end - [tag, normalized_parent, name, attributes, *normalized_children] - else - child - end - end - end -end -end diff --git a/test/rexml/rexml_test_utils.rb b/test/rexml/rexml_test_utils.rb deleted file mode 100644 index 8bb002cee23dc5..00000000000000 --- a/test/rexml/rexml_test_utils.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: false - -require "test/unit" -require "rexml/document" - -module REXMLTestUtils - def fixture_path(*components) - File.join(File.dirname(__FILE__), "data", *components) - end -end diff --git a/test/rexml/test_attribute.rb b/test/rexml/test_attribute.rb deleted file mode 100644 index 5175bd44548af5..00000000000000 --- a/test/rexml/test_attribute.rb +++ /dev/null @@ -1,14 +0,0 @@ -require_relative "rexml_test_utils" - -module REXMLTests - class AttributeTest < Test::Unit::TestCase - def test_empty_prefix - error = assert_raise(ArgumentError) do - REXML::Attribute.new(":x") - end - assert_equal("name must be " + - "\#{PREFIX}:\#{LOCAL_NAME} or \#{LOCAL_NAME}: <\":x\">", - error.message) - end - end -end diff --git a/test/rexml/test_attributes.rb b/test/rexml/test_attributes.rb deleted file mode 100644 index d6f566bdf84c46..00000000000000 --- a/test/rexml/test_attributes.rb +++ /dev/null @@ -1,223 +0,0 @@ -# frozen_string_literal: false -require 'test/unit/testcase' -require 'rexml/document' - -module REXMLTests - class AttributesTester < Test::Unit::TestCase - include REXML - def test_accessor - doc = Document.new("") - assert_equal '3', doc.root.attributes['att'] - assert_equal '2', doc.root.attributes['bar:att'] - doc.root.attributes['att'] = 5 - assert_equal '5', doc.root.attributes['att'] - end - - def test_each_attribute - doc = Document.new('') - doc.root.attributes.each_attribute {|attr| - if attr.expanded_name == 'x' - assert_equal '1', attr.value - elsif attr.expanded_name == 'y' - assert_equal '2', attr.value - else - assert_fail "No such attribute!!" - end - } - end - - def test_each - doc = Document.new('') - doc.root.attributes.each {|name, value| - if name == 'x' - assert_equal '1', value - elsif name == 'y' - assert_equal '2', value - else - assert_fail "No such attribute!!" - end - } - end - - def test_get_attribute - doc = Document.new('') - assert_equal '2', doc.root.attributes.get_attribute("foo").value - assert_equal '1', doc.root.attributes.get_attribute("x:foo").value - end - - def test_size - doc = Document.new("") - assert_equal 4, doc.root.attributes.length - end - - def test_setter - doc = Document.new("") - doc.root.attributes['y:foo'] = '2' - assert_equal '2', doc.root.attributes['y:foo'] - doc.root.attributes['foo'] = '4' - assert_equal '4', doc.root.attributes['foo'] - doc.root.attributes['x:foo'] = nil - assert_equal 3, doc.root.attributes.size - end - - def test_delete - doc = Document.new("") - doc.root.attributes.delete 'foo' - assert_equal 6, doc.root.attributes.size - assert_equal '1', doc.root.attributes['x:foo'] - - doc.root.attributes.delete 'x:foo' - assert_equal 5, doc.root.attributes.size - - attr = doc.root.attributes.get_attribute('y:foo') - doc.root.attributes.delete attr - assert_equal 4, doc.root.attributes.size - - assert_equal '4', doc.root.attributes['z:foo'] - end - - def test_prefixes - doc = Document.new("") - prefixes = doc.root.attributes.prefixes - assert_equal 2, prefixes.size - assert_equal 0, (prefixes - ['x', 'y']).size - end - - # Contributed by Mike Stok - def test_values_with_apostrophes - doc = Document.new(%q##) - s = doc.to_s - assert(s =~ /h1='1'2''/) - assert(s =~ /h2='1"2'/) - end - - # Submitted by Kou - def test_namespace_conflict - assert_raise( ParseException, - "Declaring two attributes with the same namespace should be an error" ) do - REXML::Document.new <<-XML - - - - XML - end - - REXML::Document.new("") - end - - # Submitted by Kou - def test_attribute_deletion - e = REXML::Element.new - e.add_namespace("a", "http://a/") - e.add_namespace("b", "http://b/") - e.add_attributes({"c" => "cc", "a:c" => "cC", "b:c" => "CC"}) - - e.attributes.delete("c") - assert_nil(e.attributes.get_attribute("c")) - - before_size = e.attributes.size - e.attributes.delete("c") - assert_nil(e.attributes.get_attribute("c")) - assert_equal(before_size, e.attributes.size) - - e.attributes.delete(e.attributes.get_attribute("a:c")) - assert_nil(e.attributes.get_attribute("a:c")) - - e.attributes.delete("b:c") - assert_nil(e.attributes.get_attribute("b:c")) - - before_size = e.attributes.size - e.attributes.delete(e.attributes.get_attribute("b:c")) - assert_nil(e.attributes.get_attribute("b:c")) - assert_equal(before_size, e.attributes.size) - - before_size = e.attributes.size - e.attributes.delete("c") - assert_nil(e.attributes.get_attribute("c")) - assert_equal(before_size, e.attributes.size) - - e.add_attribute("c", "cc") - - e.attributes.delete(e.attributes.get_attribute("c")) - assert_nil(e.attributes.get_attribute("c")) - end - - # Submitted by Kou - def test_element_usage - attr = Attribute.new("name", "value") - elem = Element.new("elem") - a = Attribute.new(attr, elem) - assert_equal(elem, a.element) - end - - def attr_test(attr_name,attr_value) - a1 = REXML::Attribute.new(attr_name,attr_value) - - s1 = a1.value - s2 = a1.value - - #p s1 - #p s2 - assert_equal(s1,s2) - - a2 = REXML::Attribute.new(attr_name,attr_value) - - a2.to_s # NB invocation of to_s - s1 = a2.value - s2 = a2.value - - #p s1 - #p s2 - assert_equal(s1,s2) - end - - def test_amp_attributes - attr_test('name','value with & ampersand only') - end - - def test_amp_and_lf_attributes - attr_test('name','value with LF & ampersand') - end - - def test_quoting - d = Document.new(%q{}) - assert_equal( %q{}, d.to_s ) - d.root.context[:attribute_quote] = :quote - assert_equal( %q{}, d.to_s ) - - d = Document.new(%q{}) - assert_equal( %q{}, d.to_s ) - d.root.context[:attribute_quote] = :quote - assert_equal( %q{}, d.to_s ) - end - - def test_ticket_127 - doc = Document.new - doc.add_element 'a', { 'v' => 'x & y' } - assert doc.to_s.index(';') - end - - def test_to_a_with_namespaces - document = Document.new(<<-XML) - - - -XML - child = document.root.elements["child"] - assert_equal([ - "attribute='no-ns'", - "ns1:attribute='ns1'", - "ns2:attribute='ns2'", - "other-attribute='other-value'", - ], - child.attributes.to_a.collect(&:to_string).sort) - end - end -end diff --git a/test/rexml/test_attributes_mixin.rb b/test/rexml/test_attributes_mixin.rb deleted file mode 100644 index 3a9f54eefd7e42..00000000000000 --- a/test/rexml/test_attributes_mixin.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'rexml/document' - -module REXMLTests - class TestAttributes < Test::Unit::TestCase - def setup - @ns_a = "urn:x-test:a" - @ns_b = "urn:x-test:b" - element_string = <<-"XMLEND" - - XMLEND - @attributes = REXML::Document.new(element_string).root.attributes - end - - def test_get_attribute_ns - assert_equal("1", @attributes.get_attribute_ns("", "a").value) - assert_equal("2", @attributes.get_attribute_ns("", "b").value) - assert_equal("3", @attributes.get_attribute_ns(@ns_a, "c").value) - assert_equal("4", @attributes.get_attribute_ns(@ns_a, "d").value) - assert_equal("5", @attributes.get_attribute_ns(@ns_a, "e").value) - assert_equal("6", @attributes.get_attribute_ns(@ns_b, "f").value) - end - end -end diff --git a/test/rexml/test_changing_encoding.rb b/test/rexml/test_changing_encoding.rb deleted file mode 100644 index a2dc07254a9197..00000000000000 --- a/test/rexml/test_changing_encoding.rb +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# frozen_string_literal: false - -require 'rexml/encoding' - -module REXMLTests - class ChangingEncodings < Test::Unit::TestCase - def initialize a - @u = 'テスト ほげ ふが 美しい' - @e = @u.encode("EUC-JP") - @f = Foo.new - super - end - - class Foo - include REXML::Encoding - end - - # Note that these tests must be executed in order for the third one to - # actually test anything. - def test_0_euc - @f.encoding = 'EUC-JP' - assert_equal( @u, @f.decode(@e) ) - # This doesn't happen anymore, for some reason - #assert_raise( Iconv::IllegalSequence, "Decoding unicode should fail" ) { - # @f.decode(@u) == @u - #} - end - - def test_1_utf - @f.encoding = 'UTF-8' - assert_not_equal( @u, @f.decode( @e ) ) - assert_equal( @u, @f.decode( @u ) ) - end - - def test_2_euc - @f.encoding = 'EUC-JP' - assert_equal( @u, @f.decode(@e) ) - # This doesn't happen anymore, for some reason - #assert_raise( Iconv::IllegalSequence, "Decoding unicode should fail" ) { - # @f.decode(@u) == @u - #} - end - end -end diff --git a/test/rexml/test_comment.rb b/test/rexml/test_comment.rb deleted file mode 100644 index 0af2f5ca76c8e2..00000000000000 --- a/test/rexml/test_comment.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" - -require 'rexml/document' - -module REXMLTests - class CommentTester < Test::Unit::TestCase - # Bug #5278 - def test_hyphen_end_line_in_doctype - xml = <<-XML - - -]> - - XML - document = REXML::Document.new(xml) - comments = document.doctype.children.find_all do |child| - child.is_a?(REXML::Comment) - end - assert_equal([" comment end with hyphen -\n here "], - comments.collect(&:to_s)) - end - end -end diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb deleted file mode 100644 index 8462b3c23fc839..00000000000000 --- a/test/rexml/test_contrib.rb +++ /dev/null @@ -1,585 +0,0 @@ -# coding: binary -# frozen_string_literal: false - -require_relative "rexml_test_utils" - -require "rexml/document" -require "rexml/parseexception" -require "rexml/formatters/default" - -module REXMLTests - class ContribTester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - - XML_STRING_01 = < - - - Thomas, David; Hunt, Andrew - english - Addison-Wesley - Programming Ruby. The Pragmatic Programmer's Guide - 2000 - - - Blammo, Blah - english - Hubbabubba - Foozboozer's Life - Book - 2002 - - -DELIMITER - - XML_STRING_02 = < - - english - Addison-Wesley - Programming Ruby. The Pragmatic Programmer's Guide - Book - 2000 - - - Blammo, Blah - english - Hubbabubba - Foozboozer's Life - Book - 2002 - - -DELIMITER - - # Tobias Reif - def test_bad_doctype_Tobias - source = <<-EOF - --> - - - ' - > - ] - > - EOF - doc = REXML::Document.new source - doc.write(out="") - assert(out[/>\'>/] != nil, "Couldn't find >'>") - assert(out[/\]>/] != nil, "Couldn't find ]>") - end - - # Peter Verhage - def test_namespace_Peter - source = <<-EOF - - - - - - - - EOF - doc = REXML::Document.new source - assert_equal "myprog-config", doc.root.name - count = 0 - REXML::XPath.each(doc, "x:myprog-config/x:main/x:parameter", - {"x"=>"http://someurl/program/version"}) { |element| - assert_equal "name", element.attributes["name"] - count += 1; - } - assert_equal 1, count - assert_equal "myprog-config", doc.elements["config:myprog-config"].name - end - - # Tobias Reif - def test_complex_xpath_Tobias - source = <<-EOF - - - - - - - - - - - - - EOF - # elements that have child elements - # but not grandchildren - # and not children that don't have a style attribute - # and not children that have a unique style attribute - complex_path = "*[* "+ - "and not(*/node()) "+ - "and not(*[not(@style)]) "+ - "and not(*/@style != */@style)]" - doc = REXML::Document.new source - results = REXML::XPath.match( doc.root, complex_path ) - assert(results) - assert_equal 1, results.size - assert_equal "foo", results[0].name - end - - # "Chris Morris" - def test_extra_newline_on_read_Chris - text = 'test text' - e = REXML::Element.new('Test') - e.add_text(text) - REXML::Formatters::Default.new.write(e,out="") - - doc = REXML::Document.new(out) - outtext = doc.root.text - - assert_equal(text, outtext) - end - - # Tobias Reif - def test_other_xpath_Tobias - schema = <<-DELIM - - - - - - - - - - - - - - - - DELIM - - doc = REXML::Document.new schema - - result = REXML::XPath.first(doc.root, 'xs:element[descendant::xs:element[@ref]]') - assert result - assert_equal "svg", result.attributes['name'] - result = REXML::XPath.first(doc, 'element[descendant::element[@ref]]') - assert_nil result - end - - #this first test succeeds, to check if stuff is set up correctly - def test_xpath_01_TobiasReif - doc = Document.new XML_STRING_01.dup - desired_result = Document.new 'Thomas, David; Hunt, Andrew' - xpath = '//author' - result = XPath.first(doc, xpath) - assert_equal desired_result.to_s, result.to_s - end - - def test_xpath_whitespace_TobiasReif - # same as above, with whitespace in XPath - doc = Document.new(XML_STRING_01.dup) - desired_result = Document.new('Thomas, David; Hunt, Andrew') - xpath = "\/\/author\n \n" - result = XPath.first(doc, xpath) - failure_message = "\n[[[TR: AFAIK, whitespace should be allowed]]]\n" - assert_equal(desired_result.to_s, result.to_s, failure_message) - end - - def test_xpath_02_TobiasReif - doc = Document.new XML_STRING_01.dup - desired_result = Document.new 'Thomas, David; Hunt, Andrew' - # Could that quirky - # Programmer',"'",'s - # be handled automatically, somehow? - # Or is there a simpler way? (the below XPath should match the author element above, - # AFAIK; I tested it inside an XSLT) - xpath = %q{/biblio/entry[ - title/text()=concat('Programming Ruby. The Pragmatic Programmer',"'",'s Guide') - and - year='2000' - ]/author} - result = XPath.first(doc, xpath) - failure_message = "\nHow to handle the apos inside the string inside the XPath?\nXPath = #{xpath}\n" - assert_equal desired_result.to_s, result.to_s, failure_message - end - - def test_xpath_03_TobiasReif - doc = Document.new XML_STRING_02.dup - desired_result_string = " - english - Addison-Wesley - Programming Ruby. The Pragmatic Programmer's Guide - Book - 2000 - " - Document.new desired_result_string - xpath = "/biblio/entry[not(author)]" - result = XPath.first(doc, xpath) - assert_equal desired_result_string, result.to_s - end - - def test_umlaut - koln_iso = "K\xf6ln" - koln_utf = "K\xc3\xb6ln" - source_iso = "#{koln_iso}" - source_utf = "#{koln_utf}" - - if String.method_defined? :encode - koln_iso.force_encoding('iso-8859-1') - koln_utf.force_encoding('utf-8') - source_iso.force_encoding('iso-8859-1') - source_utf.force_encoding('utf-8') - end - - doc = REXML::Document.new(source_iso) - assert_equal('ISO-8859-1', doc.xml_decl.encoding) - assert_equal(koln_utf, doc.root.text) - doc.write(out="") - assert_equal(source_iso, out ) - doc.xml_decl.encoding = 'UTF-8' - doc.write(out="") - assert_equal(source_utf, out) - - doc = Document.new <<-EOF - - -Technik - -Technik -Die Technik ist das R\xFCckgrat der meisten Gesch\xFCftsprozesse bei Home of the Brave. Deshalb sollen hier alle relevanten technischen Abl\xFCufe, Daten und Einrichtungen beschrieben werden, damit jeder im Bedarfsfall die n\xFCtigen Informationen, Anweisungen und Verhaltensempfehlungen nachlesen und/oder abrufen kann. - - - Flash - N\xFCtzliches von Flashern f\xFCr Flasher. - CVS-FAQ - FAQ zur Benutzung von CVS bei HOB - - -EOF - tn = XPath.first(doc, "//nebenspalte/text()[2]") - expected_iso = "N\xFCtzliches von Flashern f\xFCr Flasher." - expected_utf = expected_iso.unpack('C*').pack('U*') - expected_iso.force_encoding(::Encoding::ISO_8859_1) - expected_utf.force_encoding(::Encoding::UTF_8) - assert_equal(expected_utf, tn.to_s.strip) - f = REXML::Formatters::Default.new - f.write( tn, Output.new(o = "", "ISO-8859-1") ) - assert_equal(expected_iso, o.strip) - - doc = File.open(fixture_path('xmlfile-bug.xml')) {|file| Document.new file } - tn = XPath.first(doc, "//nebenspalte/text()[2]") - assert_equal(expected_utf, tn.to_s.strip) - f.write( tn, Output.new(o = "", "ISO-8859-1") ) - assert_equal(expected_iso, o.strip) - end - - def test_element_cloning_namespace_Chris - aDoc = REXML::Document.new '

Dummy title

' - - anElement = anElement = aDoc.elements[1] - elementAttrPrefix = anElement.attributes.get_attribute('content').prefix - - aClone = anElement.clone - cloneAttrPrefix = aClone.attributes.get_attribute('content').prefix - - assert_equal( elementAttrPrefix , cloneAttrPrefix ) - end - - def test_namespaces_in_attlist_tobias - in_string = File.open(fixture_path('foo.xml'), 'r') do |file| - file.read - end - - doc = Document.new in_string - - assert_nil XPath.first(doc,'//leg') - assert_equal 'http://www.foo.com/human', doc.root.elements[1].namespace - assert_equal 'human leg', - XPath.first(doc, '//x:leg/text()', {'x'=>'http://www.foo.com/human'}).to_s - end - - # Alun ap Rhisiart - def test_less_than_in_element_content - doc = File.open(fixture_path('ProductionSupport.xml')) do |source| - REXML::Document.new source - end - h = Hash.new - doc.elements.each("//CommonError") { |el| - h[el.elements['Key'].text] = 'okay' - } - assert(h.include?('MotorInsuranceContract(Object)>>#error:')) - end - - # XPaths provided by Thomas Sawyer - def test_various_xpath - #@doc = REXML::Document.new('

') - doc = REXML::Document.new('

3

') - - [['/r', REXML::Element], - ['/r/p/c', REXML::Element], - ['/r/attribute::a', Attribute], - ['/r/@a', Attribute], - ['/r/attribute::*', Attribute], - ['/r/@*', Attribute], - ['/r/p/c/attribute::b', Attribute], - ['/r/p/c/@b', Attribute], - ['/r/p/c/attribute::*', Attribute], - ['/r/p/c/@*', Attribute], - ['//c/attribute::b', Attribute], - ['//c/@b', Attribute], - ['//c/attribute::*', Attribute], - ['//c/@*', Attribute], - ['.//node()', REXML::Node ], - ['.//node()[@a]', REXML::Element ], - ['.//node()[@a="1"]', REXML::Element ], - ['.//node()[@b]', REXML::Element ], # no show, why? - ['.//node()[@b="2"]', REXML::Element ] - ].each do |xpath,kind| - begin - REXML::XPath.each( doc, xpath ) do |what| - assert_kind_of( kind, what, "\n\nWrong type (#{what.class}) returned for #{xpath} (expected #{kind.name})\n\n" ) - end - rescue Exception - puts "PATH WAS: #{xpath}" - raise - end - end - - [ - ['/r', 'attribute::a', Attribute ], - ['/r', '@a', Attribute ], - ['/r', 'attribute::*', Attribute ], - ['/r', '@*', Attribute ], - ['/r/p/c', 'attribute::b', Attribute ], - ['/r/p/c', '@b', Attribute ], - ['/r/p/c', 'attribute::*', Attribute ], - ['/r/p/c', '@*', Attribute ] - ].each do |nodepath, xpath, kind| - begin - context = REXML::XPath.first(doc, nodepath) - REXML::XPath.each( context, xpath ) do |what| - assert_kind_of kind, what, "Wrong type (#{what.class}) returned for #{xpath} (expected #{kind.name})\n" - end - rescue Exception - puts "PATH WAS: #{xpath}" - raise - end - end - end - - def test_entities_Holden_Glova - document = <<-EOL - - - - - - - - - - - - - ]> - - - - - uga.rb - 0444 - &rbconfig.libdir;/rexml - ... the file here - - - booga.h - 0444 - &rbconfig.includedir; - ... the file here - - - foo.so - 0555 - &rbconfig.sitearchdir;/rexml - Li4uIHRoZSBmaWxlIGhlcmU=\n - - - - - EOL - - file_xpath = '/rubynet/pkg/files/file' - - root = REXML::Document.new(document) - - root.elements.each(file_xpath) do |metadata| - text = metadata.elements['path'].get_text.value - assert text !~ /&rbconfig/, "'#{text}' failed" - end - - #Error occurred in test_package_file_opens(TC_PackageInstall): - # ArgumentError: - #illegal access mode &rbconfig.prefix;/lib/rexml - # - #[synack@Evergreen] src $ ruby --version - #ruby 1.6.7 (2002-03-01) [i686-linux-gnu] - # - #It looks like it expanded the first entity, but didn't reparse it for more - #entities. possible bug - or have I mucked this up? - end - - def test_whitespace_after_xml_decl - Document.new < - - - - -EOL - end - - def test_external_entity - xp = '//channel/title' - - %w{working.rss broken.rss}.each do |path| - File.open(File.join(fixture_path(path))) do |file| - doc = REXML::Document.new file.readlines.join('') - - # check to make sure everything is kosher - assert_equal( doc.root.class, REXML::Element ) - assert_equal( doc.root.elements.class, REXML::Elements ) - - # get the title of the feed - assert( doc.root.elements[xp].kind_of?( REXML::Element ) ) - end - end - end - - def test_maintain_dtd - src = %q{ - - -%extern-packages; -%extern-common; -]>} - doc = Document.new( src ) - doc.write( out="" ) - src = src.tr('"', "'") - out = out.tr('"', "'") - assert_equal( src, out ) - end - - def test_text_nodes_nomatch - source = "test" - d = REXML::Document.new( source ) - r = REXML::XPath.match( d, %q{/root/child[text()="no-test"]} ) - assert_equal( 0, r.size ) - end - - def test_raw_Terje_Elde - f = REXML::Formatters::Default.new - txt = 'abcødef' - a = Text.new( txt,false,nil,true ) - f.write(a,out="") - assert_equal( txt, out ) - - txt = 'abcødef' - a = Document.new( txt, { :raw => ["russell"] } ) - f.write(a,out="") - assert_equal( txt, out ) - end - - def test_indenting_error - a=Element.new("test1") - b=Element.new("test2") - c=Element.new("test3") - b << c - a << b - - REXML::Formatters::Pretty.new.write(a,"") - end - - def test_pos - require 'tempfile' - Tempfile.create("tidal") {|testfile| - testdata = %Q{ -
-760 -50 -
- -} - - testfile.puts testdata - testfile.rewind - assert_nothing_raised do - REXML::Document.new(testfile) - end - } - end - - def test_deep_clone - a = Document.new( '' ) - b = a.deep_clone - assert_equal a.to_s, b.to_s - end - - def test_double_escaping - data = 'AT&T' - xml = "" - - doc = REXML::Document.new(xml) - description = doc.find {|e| e.name=="description"} - assert_equal data, description.text - end - - def test_ticket_12 - cfg = "ab" - - config = REXML::Document.new( cfg ) - - assert_equal( "a", config.elements[ "//child1" ].text ) - end - -=begin - # This is a silly test, and is low priority - def test_namespace_serialization_tobi_reif - doc = Document.new ' - - ' - ns = 'http://www.foo.foo' - ns_declaration={'f'=>ns} - returned = XPath.match(doc,'//f:p',ns_declaration) - # passes: - assert( (returned[0].namespace==ns), 'namespace should be '+ns) - serialized = returned.to_s - serialized_and_parsed = Document.new(serialized) - puts 'serialized: '+serialized - # ... currently brings - # prefix b is undeclared (!) - assert( (serialized_and_parsed.namespace==ns), - 'namespace should still be '+ns.inspect+ - ' and not '+serialized_and_parsed.namespace.inspect) - # ... currently results in a failure: - # 'namespace should still be "http://www.foo.foo" and not ""' - end -=end - end -end diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb deleted file mode 100644 index 41e6e43540f88d..00000000000000 --- a/test/rexml/test_core.rb +++ /dev/null @@ -1,1517 +0,0 @@ -# -*- coding: utf-8 -*- -# frozen_string_literal: false - -require_relative "rexml_test_utils" - -require "rexml/document" -require "rexml/parseexception" -require "rexml/output" -require "rexml/source" -require "rexml/formatters/pretty" -require "rexml/undefinednamespaceexception" - -require_relative "listener" - -module REXMLTests - class Tester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - def setup - @xsa_source = <<-EOL - - - - - - - - Lars Marius Garshol - larsga@garshol.priv.no - http://www.stud.ifi.uio.no/~lmariusg/ - - - EOL - end - - def test_bad_markup - [ - " foo ", - '<0/>', - '&', - '&a', -# '&a;', # FIXME - '', - '', - '', - '', - '', - '�', - '�', - "", - "\f", - "", - "\000", -# FIXME '', - '￾', - '￿', -# FIXME '', -# FIXME '', - ].each do |src| - assert_raise( ParseException, %Q{Parse #{src.inspect} should have failed!} ) do - Document.new(src) - end - end - end - - def test_attribute - # Testing constructors - #a = Attribute.new "hello", "dolly" - #b = Attribute.new a - #d = Document.new( "" ) - #c = d[0].attributes.get_attribute( "hello" ) - - #assert_equal a, b - #for attr in [ a, b, c] - # assert_equal "hello", attr.name - # assert_equal "dolly", attr.value - #end - - # This because of a reported bug in attribute handling in 1.0a8 - source = 'blah' - doc = Document.new source - doc.elements.each do |a| - a.attributes['att'] << 'B' - assert_equal "AB", a.attributes['att'] - a.attributes['att'] = 'C' - assert_equal "C", a.attributes['att'] - end - - # Bryan Murphy - text = "this is a {target[@name='test']/@value} test" - source = <<-EOL - - - EOL - - xml = Document.new source - value = xml.root.attributes["search"] - assert_equal text, value.to_s - - e = Element.new "test" - e.add_attributes({ "name1" => "test1", "name4" => "test4" }) - e.add_attributes([["name3","test3"], ["name2","test2"]]) - assert_equal "test1", e.attributes["name1"] - assert_equal "test2", e.attributes["name2"] - assert_equal "test3", e.attributes["name3"] - assert_equal "test4", e.attributes["name4"] - - # ensure that the attributes come out in sorted order - assert_equal %w().join(' '), e.to_s - end - - def test_attribute_namespace_conflict - # https://www.w3.org/TR/xml-names/#uniqAttrs - message = <<-MESSAGE -Duplicate attribute "a" -Line: 4 -Position: 140 -Last 80 unconsumed characters: - MESSAGE - assert_raise_with_message(REXML::ParseException, message) do - Document.new(<<-XML) - - - - - - XML - end - end - - def test_attribute_default_namespace - # https://www.w3.org/TR/xml-names/#uniqAttrs - document = Document.new(<<-XML) - - - - - - XML - attributes = document.root.elements.collect do |element| - element.attributes.each_attribute.collect do |attribute| - [attribute.prefix, attribute.namespace, attribute.name] - end - end - assert_equal([ - [ - ["", "", "a"], - ["", "", "b"], - ], - [ - ["", "", "a"], - ["n1", "http://www.w3.org", "a"], - ], - ], - attributes) - end - - def test_cdata - test = "The quick brown fox jumped - & < & < \" ' - over the lazy dog." - - source = "" - d = REXML::Document.new( source ) - - # Test constructors - cdata = d[0][0] - assert_equal test, cdata.value - end - - def test_comment - string = "This is a new comment!" - source = "" - comment = Comment.new string - REXML::Formatters::Default.new.write( comment, out = "" ) - assert_equal(source, out) - - comment2 = Comment.new comment - assert_equal(comment, comment2) - - assert_raise(ParseException) { - REXML::Document.new("") - } - assert_raise(ParseException) { - REXML::Document.new(" - - - - - - - - - - - - - - - - - - EOF - doc = Document.new source - assert_equal "someuri", doc.root.namespace - assert_equal "default", doc.root.elements[1].namespace - assert_equal "someuri", doc.root.elements[2].namespace - assert_equal "notdefault", doc.root.elements[ 3 ].namespace - - # Testing namespaces in attributes - source = <<-EOF - - - - - - EOF - doc = Document.new source - b = doc.root.elements["b"] - assert_equal "x", b.attributes["b:a"] - assert_equal "y", b.attributes["a"] - - doc = Document.new - doc.add_element "sean:blah" - doc.root.text = "Some text" - out = "" - doc.write(out) - assert_equal "Some text", out - end - - - def test_add_namespace - e = Element.new 'a' - e.add_namespace 'someuri' - e.add_namespace 'foo', 'otheruri' - e.add_namespace 'xmlns:bar', 'thirduri' - assert_equal 'someuri', e.attributes['xmlns'] - assert_equal 'otheruri', e.attributes['xmlns:foo'] - assert_equal 'thirduri', e.attributes['xmlns:bar'] - end - - - def test_big_documentation - d = File.open(fixture_path("documentation.xml")) {|f| Document.new f } - assert_equal "Sean Russell", d.elements["documentation/head/author"].text.tr("\n\t", " ").squeeze(" ") - out = "" - d.write out - end - - def test_tutorial - doc = File.open(fixture_path("tutorial.xml")) {|f| Document.new f } - out = "" - doc.write out - end - - def test_stream - c = Listener.new - File.open(fixture_path("documentation.xml")) do |f| - Document.parse_stream( f, c ) - end - assert(c.ts, "Stream parsing apparently didn't parse the whole file") - assert(c.te, "Stream parsing dropped end tag for documentation") - - Document.parse_stream(" ", c) - - Document.parse_stream("<>&", c) - assert_equal('<>&', c.normalize) - end - - def test_line - f = File.new(fixture_path("bad.xml")) - Document.new f - assert_fail "There should have been an error" - rescue Exception - # We should get here - assert($!.line == 5, "Should have been an error on line 5, "+ - "but was reported as being on line #{$!.line}" ) - ensure - f.close if f - end - - def test_substitution - val = "a'b\"c" - el = Element.new("a") - el.attributes["x"] = val - REXML::Formatters::Default.new.write(el, out="") - - nel = Document.new( out) - assert_equal( val, nel.root.attributes["x"] ) - end - - def test_exception - source = SourceFactory.create_from "" - p = ParseException.new( "dummy message", source ) - begin - raise "dummy" - rescue Exception - p.continued_exception = $! - end - end - - def test_bad_content - in_gt = 'content>content' - in_lt = 'content' - - # This is OK - tree_gt = Document.new in_gt - assert_equal "content>content", tree_gt.elements[1].text - # This isn't - begin - Document.new in_lt - assert_fail "Should have gotten a parse error" - rescue ParseException - end - end - - def test_iso_8859_1_output_function - out = "" - output = Output.new( out ) - koln_iso_8859_1 = "K\xF6ln" - koln_utf8 = "K\xc3\xb6ln" - source = Source.new( koln_iso_8859_1, 'iso-8859-1' ) - results = source.scan(/.*/)[0] - koln_utf8.force_encoding('UTF-8') if koln_utf8.respond_to?(:force_encoding) - assert_equal koln_utf8, results - output << results - if koln_iso_8859_1.respond_to?(:force_encoding) - koln_iso_8859_1.force_encoding('ISO-8859-1') - end - assert_equal koln_iso_8859_1, out - end - - def test_attributes_each - doc = Document.new("") - count = 0 - doc.root.elements[1].attributes.each {|k,v| count += 1 } - assert_equal 4, count - end - - def test_delete_namespace - doc = Document.new "" - doc.root.delete_namespace - doc.root.delete_namespace 'x' - assert_equal "", doc.to_s - end - - def test_each_element_with_attribute - doc = Document.new "" - arry = [] - block = proc { |e| - assert arry.include?(e.name) - arry.delete e.name - } - # Yields b, c, d - arry = %w{b c d} - doc.root.each_element_with_attribute( 'id', &block ) - assert_equal 0, arry.size - # Yields b, d - arry = %w{b d} - doc.root.each_element_with_attribute( 'id', '1', &block ) - assert_equal 0, arry.size - # Yields b - arry = ['b'] - doc.root.each_element_with_attribute( 'id', '1', 1, &block ) - assert_equal 0, arry.size - # Yields d - arry = ['d'] - doc.root.each_element_with_attribute( 'id', '1', 0, 'd', &block ) - assert_equal 0, arry.size - end - def test_each_element_with_text - doc = Document.new 'bbd' - arry = [] - block = proc { |e| - assert arry.include?(e.name) - arry.delete e.name - } - # Yields b, c, d - arry = %w{b c d} - doc.root.each_element_with_text(&block) - assert_equal 0, arry.size - # Yields b, d - arry = %w{b c} - doc.root.each_element_with_text( 'b', &block ) - assert_equal 0, arry.size - # Yields b - arry = ['b'] - doc.root.each_element_with_text( 'b', 1, &block ) - assert_equal 0, arry.size - # Yields d - arry = ['d'] - doc.root.each_element_with_text( nil, 0, 'd', &block ) - assert_equal 0, arry.size - end - - def test_element_parse_stream - s = Source.new( "some text" ) - l = Listener.new - class << l - def tag_start name, attributes - raise "Didn't find proper tag name" unless 'a'==name - end - end - - Document::parse_stream(s, l) - end - - def test_deep_clone - a = Document.new( 'texttexttext' ) - b = a.deep_clone - assert_equal a.to_s, b.to_s - - a = Document.new( 'some < text more > text > ' ) - b = a.deep_clone - assert_equal a.to_s, b.to_s - c = Document.new( b.to_s ) - assert_equal a.to_s, c.to_s - end - - def test_whitespace_before_root - a = < - - - - -EOL - d = Document.new(a) - b = "" - d.write( b ) - assert_equal a,b - end - - def test_entities - a = Document.new( 'eeü' ) - assert_equal('eeü'.force_encoding("UTF-8"), a.root.text) - end - - def test_element_decl - element_decl = Source.new(" -]>") - doc = Document.new( element_decl ) - d = doc[0] - assert_equal("", d.to_s.split(/\n/)[1].strip) - end - - def test_attlist_decl - doc = Document.new <<-EOL - - - ]> - - EOL - assert_equal 'gobble', doc.root.attributes['bar'] - assert_equal 'xxx', doc.root.elements[2].namespace - assert_equal 'two', doc.root.elements[1].namespace - assert_equal 'foo', doc.root.namespace - - doc = Document.new <<-EOL - - - - ]> - - EOL - prefixes = doc.root.prefixes.sort - correct = ['svg', 'xlink', 'xml'] - assert_equal correct, prefixes - end - - def test_attlist_write - doc = File.open(fixture_path("foo.xml")) {|file| Document.new file } - out = '' - doc.write(out) - end - - def test_more_namespaces - assert_raise( REXML::UndefinedNamespaceException, - %Q{Should have gotten an Undefined Namespace error} ) { - Document.new("

") - } - doc2 = Document.new("

") - es = XPath.match(doc2, '//c') - assert_equal 0, es.size - es = XPath.match(doc2, '//n:c') - assert_equal 1, es.size - doc2.root.add_namespace('m', '2') - doc2.root.add_element("m:o") - es = XPath.match(doc2, './/o') - assert_equal 0, es.size - es = XPath.match(doc2, '//n:c') - assert_equal 1, es.size - end - - def test_ticket_51 - doc = REXML::Document.new <<-EOL - - X - Y - - - Z - - - EOL - - # The most common case. People not caring about the namespaces much. - assert_equal( "XY", XPath.match( doc, "/*:test/*:a/text()" ).join ) - assert_equal( "XY", XPath.match( doc, "/*:test/x:a/text()" ).join ) - # Surprising? I don't think so, if you believe my definition of the "common case" - assert_equal( "XYZ", XPath.match( doc, "//*:a/text()" ).join ) - - # These are the uncommon cases. Namespaces are actually important, so we define our own - # mappings, and pass them in. - assert_equal( "XY", XPath.match( doc, "/f:test/f:a/text()", { "f" => "1" } ).join ) - # The namespaces are defined, and override the original mappings - assert_equal( "XY", XPath.match( doc, "/*:test/*:a/text()", { "f" => "1" } ).join ) - assert_equal( "", XPath.match( doc, "/x:test/x:a/text()", { "f" => "1" } ).join ) - assert_equal( "XYZ", XPath.match( doc, "//*:a/text()", { "f" => "1" } ).join ) - end - - def test_processing_instruction - d = Document.new("") - assert_equal 4, XPath.match(d, '//processing-instruction()' ).size - match = XPath.match(d, "//processing-instruction('foo3')" ) - assert_equal 1, match.size - assert_equal 'bar3', match[0].content - end - - def test_oses_with_bad_EOLs - Document.new("\n\n\n\n\n\n\n\n") - end - - # Contributed (with patch to fix bug) by Kouhei - def test_ignore_whitespace - source = " abc " - - context_all = {:ignore_whitespace_nodes => :all} - context_a = {:ignore_whitespace_nodes => %(a)} - context_b = {:ignore_whitespace_nodes => %(b)} - - tests = [[[" abc ", "def"], context_all], - [[" abc ", "def"], context_a], - [[" ", " abc ", "def", " "], context_b]] - - tests.each do |test| - assert_equal(test[0], Document.new(source, test[1]).root.texts.collect{|x| - x.to_s}) - end - end - - def test_0xD_in_preface - doc = "\x0D\x0D" - doc = Document.new doc - end - - def test_hyphens_in_doctype - doc = REXML::Document.new <<-EOQ - - - - - - EOQ - - assert_equal('a-b-c', doc.doctype.name) - end - - def test_accents - docs = [ - %Q{ - - - - -}, - ' - - - - -', - %Q{ - - - - -}, - %Q{ - - - - -} ] - docs.each_with_index { |d,i| - begin - REXML::Document.new(d) - rescue - puts "#{i} => #{docs[i]}" - raise - end - } - end - - def test_replace_text - e = REXML::Element.new( "a" ) - e.add_text( "foo" ) - assert_equal( "foo", e.to_s ) - e[0].value = "bar" - assert_equal( "bar", e.to_s ) - e[0].value = "<" - assert_equal( "<", e.to_s ) - assert_equal( "<", e[0].value ) - end - - - def test_write_doctype - ## XML Document and Declaration - document = REXML::Document.new - xmldecl = REXML::XMLDecl.new("1.0", "UTF-8") - document.add(xmldecl) - s = "" - document.write(s) - - ## XML Doctype - str = '' - source = REXML::Source.new(str) - doctype = REXML::DocType.new(source) - document.add(doctype) - document.write(s) - - ## Element - element = REXML::Element.new("hoge") - document.add(element) - - document.write(s) - end - - def test_write_cdata - src = "A" - doc = REXML::Document.new( src ) - out = "" - doc.write( out ) - assert_equal( src, out ) - - src = "" - doc = REXML::Document.new( src ) - out = "" - doc.write( out ) - assert_equal( src, out ) - end - - def test_namespace_attributes - source = <<-EOL - - - - EOL - d = Document.new( source ) - assert_equal( 'foo', REXML::XPath.first(d.root, "//x:b/@x:n").value ) - assert_equal( nil, REXML::XPath.first(d.root, "//x:b/@x:n", {})) - end - - def test_null_element_name - a = REXML::Document.new - assert_raise( RuntimeError ) { - a.add_element( nil ) - } - end - - def test_text_raw - # From the REXML tutorial - # (http://www.germane-software.com/software/rexml/test/data/tutorial.html) - doc = Document.new <<-EOL - - - ]> - - EOL - a = doc.root - - # This makes sure that RAW text nodes don't have their entity strings - # replaced - t = Text.new "Sean", false, nil, true - a.text = t - assert_equal( "Sean", t.to_s ) - assert_equal( "Sean", t.value ) - - # This makes sure that they do - t = Text.new "Sean", false, nil, false - a.text = t - assert_equal( "&s;", t.to_s ) - assert_equal( "Sean", t.value ) - - t = Text.new "&s;", false, nil, true - a.text = t - assert_equal( "&s;", t.to_s ) - assert_equal( "Sean", t.value ) - - t = Text.new "&s;", false, nil, true - a.text = t - assert_equal( "&s;", t.to_s ) - assert_equal( "Sean", t.value ) - - # Ticket #44 - t = REXML::Text.new( "&", false, nil, true ) - assert_equal( "&", t.to_s ) - - t = REXML::Text.new("&", false, false) - assert_equal( "&amp;", t.to_s ) - end - - def test_to_xpath - doc = REXML::Document.new( %q{ - - - }) - names = %w{ /tag1/tag2[1] /tag1/tag2[2] } - doc.root.elements.each_with_index {|el, i| - assert_equal( names[i], el.xpath ) - } - end - - def test_transitive - doc = REXML::Document.new( "") - s = "" - doc.write( s, 0, true ) - end - - # This is issue #40 - def test_replace_with - old = 'oldold' - d = REXML::Document.new(old).root - new = REXML::Text.new('new',true,nil,true) - child = d.children[2] - child.replace_with(new) - assert_equal( new, d.children[2] ) - end - - def test_repeated_writes - a = IO.read(fixture_path("iso8859-1.xml")) - f = REXML::Formatters::Pretty.new - - xmldoc = REXML::Document.new( a ) - a_andre = xmldoc.elements['//image'].attributes['caption'] - - f.write(xmldoc,b="") - - xmldoc = REXML::Document.new(b) - b_andre = xmldoc.elements['//image'].attributes['caption'] - assert_equal( a_andre, b_andre ) - - f.write(xmldoc,c="") - - xmldoc = REXML::Document.new(c) - c_andre = xmldoc.elements['//image'].attributes['caption'] - assert_equal( b_andre, c_andre ) - - o = Output.new(d="","UTF-8") - f.write(xmldoc,o) - assert_not_equal( c, d ) - end - - def test_pretty_format_long_text_finite - n = 1_000_000 - long_text = 'aaaa ' * n - xml = "#{long_text}" - formatter = REXML::Formatters::Pretty.new - document = nil - begin - document = REXML::Document.new(xml) - rescue REXML::ParseException - skip_message = "skip this test because we can't check Pretty#wrap " + - "works without # on " + - "small memory system. # " + - "will be raised on the system. See also [ruby-dev:42599]." - return skip_message - end - output = "" - formatter.write(document, output) - assert_equal("\n" + - ((" " + (" aaaa" * 15) + "\n") * (n / 15)) + - " " + ("aaaa " * (n % 15)) + "\n" + - "", - output) - end - - def test_pretty_format_deep_indent - n = 6 - elements = "" - n.times do |i| - elements << "" - elements << "element#{i} " * 5 - end - (n - 1).downto(0) do |i| - elements << "" - end - xml = "#{elements}" - document = REXML::Document.new(xml) - formatter = REXML::Formatters::Pretty.new - formatter.width = 20 - output = "" - formatter.write(document, output) - assert_equal(<<-XML.strip, output) - - - element0 - element0 - element0 - element0 - element0\s - - element1 - element1 - element1 - element1 - element1\s - - element2 - element2 - element2 - element2 - element2\s - - element3 - element3 - element3 - element3 - element3\s - - element4 - element4 - element4 - element4 - element4 - \s - - element5 element5 element5 element5 element5\s - - - - - - - - XML - end - - def test_ticket_58 - doc = REXML::Document.new - doc << REXML::XMLDecl.default - doc << REXML::Element.new("a") - - str = "" - doc.write(str) - - assert_equal("", str) - - doc = REXML::Document.new - doc << REXML::XMLDecl.new("1.0", "UTF-8") - doc << REXML::Element.new("a") - - str = "" - doc.write(str) - - assert_equal("", str) - end - - # Incomplete tags should generate an error - def test_ticket_53 - assert_raise( REXML::ParseException ) { - REXML::Document.new( "" ) - } - assert_raise( REXML::ParseException ) { - REXML::Document.new( "" ) - } - assert_raise( REXML::ParseException ) { - REXML::Document.new( "" ) - } - end - - def test_ticket_52 - source = "" - d = REXML::Document.new(source) - d.write(k="") - assert_equal( source, k ) - - source = "" - target = "\n \n" - d = REXML::Document.new(source) - REXML::Formatters::Pretty.new(4).write(d,k="") - assert_equal( target, k ) - end - - def test_ticket_76 - src = "
at&t" - assert_raise( ParseException, %Q{"#{src}" is invalid XML} ) { - REXML::Document.new(src) - } - end - - def test_ticket_21 - src = "" - exception = assert_raise(ParseException) do - Document.new(src) - end - assert_equal(<<-DETAIL, exception.to_s) -Missing attribute value start quote: -Line: 1 -Position: 16 -Last 80 unconsumed characters: - DETAIL - end - - def test_ticket_63 - File.open(fixture_path("t63-1.xml")) {|f| Document.new(f) } - end - - def test_ticket_75 - d = File.open(fixture_path("t75.xml")) {|f| REXML::Document.new(f) } - assert_equal("tree", d.root.name) - end - - def test_ticket_48_part_II - f = REXML::Formatters::Pretty.new - #- rexml sanity check (bugs in ruby 1.8.4, ruby 1.8.6) - xmldoc = Document.new("") - xmldoc << XMLDecl.new(XMLDecl::DEFAULT_VERSION, "UTF-8") - content = ['61c3a927223c3e26'].pack("H*") - content.force_encoding('UTF-8') if content.respond_to?(:force_encoding) - #- is some UTF-8 text but just to make sure my editor won't magically convert.. - xmldoc.root.add_attribute('attr', content) - f.write(xmldoc,out=[]) - - xmldoc = REXML::Document.new(out.join) - sanity1 = xmldoc.root.attributes['attr'] - f.write(xmldoc,out=[]) - - xmldoc = REXML::Document.new(out.join) - sanity2 = xmldoc.root.attributes['attr'] - f.write(xmldoc,out=[]) - - assert_equal( sanity1, sanity2 ) - end - - def test_ticket_88 - doc = REXML::Document.new("") - assert_equal("", doc.to_s) - doc = REXML::Document.new("") - assert_equal("", doc.to_s) - end - - def test_ticket_85 - xml = < - - - - -ENDXML - - yml = " - - - -" - - # The pretty printer ignores all whitespace, anyway so output1 == output2 - f = REXML::Formatters::Pretty.new( 2 ) - d = Document.new( xml, :ignore_whitespace_nodes=>:all ) - f.write( d, output1="" ) - - d = Document.new( xml ) - f.write( d, output2="" ) - - # Output directives should override whitespace directives. - assert_equal( output1, output2 ) - - # The base case. - d = Document.new(yml) - f.write( d, output3="" ) - - assert_equal( output3.strip, output2.strip ) - - d = Document.new(yml) - f.write( d, output4="" ) - - assert_equal( output3.strip, output4.strip ) - end - - def test_ticket_91 - source=" - - great - - " - expected=" - - great - - -" - d = Document.new( source ) - d.root.add_element( "bah" ) - p=REXML::Formatters::Pretty.new(2) - p.compact = true # Don't add whitespace to text nodes unless necessary - p.write(d,out="") - assert_equal( expected, out ) - end - - def test_ticket_95 - testd = REXML::Document.new "" - testd.write(out1="") - testd.elements["//c[2]"].xpath - testd.write(out2="") - assert_equal(out1,out2) - end - - def test_ticket_102 - doc = REXML::Document.new '' - assert_equal( "foo", doc.root.elements["*:item"].attribute("name","ns").to_s ) - assert_equal( "item", doc.root.elements["*:item[@name='foo']"].name ) - end - - def test_ticket_14 - # Per .2.5 Node Tests of XPath spec - assert_raise( REXML::UndefinedNamespaceException, - %Q{Should have gotten an Undefined Namespace error} ) { - Document.new("") - } - end - - # 5.7 Text Nodes - # Character data is grouped into text nodes. As much character data as - # possible is grouped into each text node: a text node never has an - # immediately following or preceding sibling that is a text node. The - # string-value of a text node is the character data. A text node always has - # at least one character of data. - def test_ticket_105 - d = Document.new("") - d.root.add_text( "a" ) - d.root.add_text( "b" ) - assert_equal( 1, d.root.children.size ) - end - - # phantom namespace same as default namespace - def test_ticket_121 - doc = REXML::Document.new( - 'text' - ) - assert_equal 'text', doc.text( "/*:doc/*:item[@name='foo']" ) - assert_equal "name='foo'", - doc.root.elements["*:item"].attribute("name", "ns").inspect - assert_equal "text", - doc.root.elements["*:item[@name='foo']"].to_s - end - - def test_ticket_135 - bean_element = REXML::Element.new("bean") - textToAdd = "(&(|(memberof=CN=somegroupabcdefgh,OU=OUsucks,DC=hookemhorns,DC=com)(mail=*someco.com))(acct=%u)(!(extraparameter:2.2.222.222222.2.2.222:=2)))" - bean_element.add_element("prop", {"key"=> "filter"}).add_text(textToAdd) - doc = REXML::Document.new - doc.add_element(bean_element) - - REXML::Formatters::Pretty.new(3).write( doc, out = "" ) - - assert_equal "\n \n (&#38;(|(memberof=CN=somegroupabcdefgh,OU=OUsucks,DC=hookemhorns,DC=com)(mail=*someco.com))(acct=%u)(!(extraparameter:2.2.222.222222.2.2.222:=2)))\n \n", out - end - - def test_ticket_138 - doc = REXML::Document.new( - '' - ) - expected = { - "inkscape" => attribute("xmlns:inkscape", - "http://www.inkscape.org/namespaces/inkscape"), - "version" => { - "inkscape" => attribute("inkscape:version", "0.44"), - "" => attribute("version", "1.0"), - }, - } - assert_equal(expected, doc.root.attributes) - assert_equal(expected, REXML::Document.new(doc.root.to_s).root.attributes) - end - - def test_empty_doc - assert(REXML::Document.new('').children.empty?) - end - - private - def attribute(name, value) - REXML::Attribute.new(name, value) - end - end -end diff --git a/test/rexml/test_doctype.rb b/test/rexml/test_doctype.rb deleted file mode 100644 index 7f426691707ca7..00000000000000 --- a/test/rexml/test_doctype.rb +++ /dev/null @@ -1,157 +0,0 @@ -# frozen_string_literal: false - -require_relative "rexml_test_utils" - -module REXMLTests - class TestDocTypeAccessor < Test::Unit::TestCase - def setup - @sysid = "urn:x-test:sysid1" - @notation_id1 = "urn:x-test:notation1" - @notation_id2 = "urn:x-test:notation2" - xml_system = <<-XML - - - ]> - - XML - @doc_type_system = REXML::Document.new(xml_system).doctype - - @pubid = "TEST_ID" - xml_public = <<-XML - - - XML - @doc_type_public = REXML::Document.new(xml_public).doctype - - xml_public_system = <<-XML - - - XML - @doc_type_public_system = REXML::Document.new(xml_public_system).doctype - end - - def test_public - assert_equal([ - nil, - @pubid, - @pubid, - ], - [ - @doc_type_system.public, - @doc_type_public.public, - @doc_type_public_system.public, - ]) - end - - def test_to_s - assert_equal("", - @doc_type_public_system.to_s) - end - - def test_to_s_apostrophe - @doc_type_public_system.parent.context[:prologue_quote] = :apostrophe - assert_equal("", - @doc_type_public_system.to_s) - end - - def test_system - assert_equal([ - @sysid, - nil, - @sysid, - ], - [ - @doc_type_system.system, - @doc_type_public.system, - @doc_type_public_system.system, - ]) - end - - def test_notation - assert_equal([ - @notation_id1, - @notation_id2, - ], - [ - @doc_type_system.notation("n1").system, - @doc_type_system.notation("n2").system, - ]) - end - - def test_notations - notations = @doc_type_system.notations - assert_equal([ - @notation_id1, - @notation_id2, - ], - notations.collect(&:system)) - end - end - - class TestNotationDeclPublic < Test::Unit::TestCase - def setup - @name = "vrml" - @id = "VRML 1.0" - @uri = "http://www.web3d.org/" - end - - def test_to_s - assert_equal("", - decl(@id, nil).to_s) - end - - def test_to_s_with_uri - assert_equal("", - decl(@id, @uri).to_s) - end - - def test_to_s_apostrophe - document = REXML::Document.new(<<-XML) - - - XML - document.context[:prologue_quote] = :apostrophe - notation = document.doctype.notations[0] - assert_equal("", - notation.to_s) - end - - private - def decl(id, uri) - REXML::NotationDecl.new(@name, "PUBLIC", id, uri) - end - end - - class TestNotationDeclSystem < Test::Unit::TestCase - def setup - @name = "gif" - @id = "gif viewer" - end - - def test_to_s - assert_equal("", - decl(@id).to_s) - end - - def test_to_s_apostrophe - document = REXML::Document.new(<<-XML) - - - XML - document.context[:prologue_quote] = :apostrophe - notation = document.doctype.notations[0] - assert_equal("", - notation.to_s) - end - - private - def decl(id) - REXML::NotationDecl.new(@name, "SYSTEM", id, nil) - end - end -end diff --git a/test/rexml/test_document.rb b/test/rexml/test_document.rb deleted file mode 100644 index c0faae4ae0fc4a..00000000000000 --- a/test/rexml/test_document.rb +++ /dev/null @@ -1,416 +0,0 @@ -# -*- coding: utf-8 -*- -# frozen_string_literal: false - -require "rexml/document" -require "test/unit" - -module REXMLTests - class TestDocument < Test::Unit::TestCase - def test_version_attributes_to_s - doc = REXML::Document.new(<<-eoxml) - - - - eoxml - - string = doc.to_s - assert_match('xmlns:sodipodi', string) - assert_match('xmlns:inkscape', string) - assert_match('sodipodi:version', string) - assert_match('inkscape:version', string) - end - - def test_new - doc = REXML::Document.new(< -Hello world! -EOF - assert_equal("Hello world!", doc.root.children.first.value) - end - - class EntityExpansionLimitTest < Test::Unit::TestCase - def setup - @default_entity_expansion_limit = REXML::Security.entity_expansion_limit - end - - def teardown - REXML::Security.entity_expansion_limit = @default_entity_expansion_limit - end - - class GeneralEntityTest < self - def test_have_value - xml = < - - - - - - - -]> - -&a; - -EOF - - doc = REXML::Document.new(xml) - assert_raise(RuntimeError) do - doc.root.children.first.value - end - REXML::Security.entity_expansion_limit = 100 - assert_equal(100, REXML::Security.entity_expansion_limit) - doc = REXML::Document.new(xml) - assert_raise(RuntimeError) do - doc.root.children.first.value - end - assert_equal(101, doc.entity_expansion_count) - end - - def test_empty_value - xml = < - - - - - - - -]> - -&a; - -EOF - - doc = REXML::Document.new(xml) - assert_raise(RuntimeError) do - doc.root.children.first.value - end - REXML::Security.entity_expansion_limit = 100 - assert_equal(100, REXML::Security.entity_expansion_limit) - doc = REXML::Document.new(xml) - assert_raise(RuntimeError) do - doc.root.children.first.value - end - assert_equal(101, doc.entity_expansion_count) - end - - def test_with_default_entity - xml = < - - -]> - -&a; -&a2; -< - -EOF - - REXML::Security.entity_expansion_limit = 4 - doc = REXML::Document.new(xml) - assert_equal("\na\na a\n<\n", doc.root.children.first.value) - REXML::Security.entity_expansion_limit = 3 - doc = REXML::Document.new(xml) - assert_raise(RuntimeError) do - doc.root.children.first.value - end - end - end - - class ParameterEntityTest < self - def test_have_value - xml = < - - - - - - - -]> - -EOF - - assert_raise(REXML::ParseException) do - REXML::Document.new(xml) - end - REXML::Security.entity_expansion_limit = 100 - assert_equal(100, REXML::Security.entity_expansion_limit) - assert_raise(REXML::ParseException) do - REXML::Document.new(xml) - end - end - - def test_empty_value - xml = < - - - - - - - -]> - -EOF - - assert_raise(REXML::ParseException) do - REXML::Document.new(xml) - end - REXML::Security.entity_expansion_limit = 100 - assert_equal(100, REXML::Security.entity_expansion_limit) - assert_raise(REXML::ParseException) do - REXML::Document.new(xml) - end - end - end - end - - def test_tag_in_cdata_with_not_ascii_only_but_ascii8bit_encoding_source - tag = "..." - message = "こんにちは、世界！" # Hello world! in Japanese - xml = < - -EOX - xml.force_encoding(Encoding::ASCII_8BIT) - doc = REXML::Document.new(xml) - assert_equal("#{tag}#{message}", doc.root.children.first.value) - end - - def test_xml_declaration_standalone - bug2539 = '[ruby-core:27345]' - doc = REXML::Document.new('') - assert_equal('no', doc.stand_alone?, bug2539) - doc = REXML::Document.new('') - assert_equal('no', doc.stand_alone?, bug2539) - doc = REXML::Document.new('') - assert_equal('no', doc.stand_alone?, bug2539) - end - - class WriteTest < Test::Unit::TestCase - def setup - @document = REXML::Document.new(<<-EOX) - -Hello world! -EOX - end - - class ArgumentsTest < self - def test_output - output = "" - @document.write(output) - assert_equal(<<-EOX, output) - -Hello world! -EOX - end - - def test_indent - output = "" - indent = 2 - @document.write(output, indent) - assert_equal(<<-EOX.chomp, output) - - - Hello world! - -EOX - end - - def test_transitive - output = "" - indent = 2 - transitive = true - @document.write(output, indent, transitive) - assert_equal(<<-EOX, output) - -Hello world! -EOX - end - - def test_ie_hack - output = "" - indent = -1 - transitive = false - ie_hack = true - document = REXML::Document.new("") - document.write(output, indent, transitive, ie_hack) - assert_equal("", output) - end - - def test_encoding - output = "" - indent = -1 - transitive = false - ie_hack = false - encoding = "Windows-31J" - - @document.xml_decl.encoding = "Shift_JIS" - japanese_text = "こんにちは" - @document.root.text = japanese_text - @document.write(output, indent, transitive, ie_hack, encoding) - assert_equal(<<-EOX.encode(encoding), output) - -#{japanese_text} -EOX - end - end - - class OptionsTest < self - def test_output - output = "" - @document.write(:output => output) - assert_equal(<<-EOX, output) - -Hello world! -EOX - end - - def test_indent - output = "" - @document.write(:output => output, :indent => 2) - assert_equal(<<-EOX.chomp, output) - - - Hello world! - -EOX - end - - def test_transitive - output = "" - @document.write(:output => output, :indent => 2, :transitive => true) - assert_equal(<<-EOX, output) - -Hello world! -EOX - end - - def test_ie_hack - output = "" - document = REXML::Document.new("") - document.write(:output => output, :ie_hack => true) - assert_equal("", output) - end - - def test_encoding - output = "" - encoding = "Windows-31J" - @document.xml_decl.encoding = "Shift_JIS" - japanese_text = "こんにちは" - @document.root.text = japanese_text - @document.write(:output => output, :encoding => encoding) - assert_equal(<<-EOX.encode(encoding), output) - -#{japanese_text} -EOX - end - end - end - - class BomTest < Test::Unit::TestCase - class HaveEncodingTest < self - def test_utf_8 - xml = <<-EOX.force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-8", document.encoding) - end - - def test_utf_16le - xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-16", document.encoding) - end - - def test_utf_16be - xml = <<-EOX.encode("UTF-16BE").force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".encode("UTF-16BE").force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-16", document.encoding) - end - end - - class NoEncodingTest < self - def test_utf_8 - xml = <<-EOX.force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-8", document.encoding) - end - - def test_utf_16le - xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-16", document.encoding) - end - - def test_utf_16be - xml = <<-EOX.encode("UTF-16BE").force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".encode("UTF-16BE").force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - assert_equal("UTF-16", document.encoding) - end - end - - class WriteTest < self - def test_utf_16 - xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT") - -Hello world! -EOX - bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT") - document = REXML::Document.new(bom + xml) - - actual_xml = "" - document.write(actual_xml) - expected_xml = <<-EOX.encode("UTF-16BE") -\ufeff -Hello world! -EOX - assert_equal(expected_xml, actual_xml) - end - end - end - end -end diff --git a/test/rexml/test_element.rb b/test/rexml/test_element.rb deleted file mode 100644 index 82830b44e6ae2c..00000000000000 --- a/test/rexml/test_element.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: false - -require "test/unit/testcase" -require "rexml/document" - -module REXMLTests - class ElementTester < Test::Unit::TestCase - def test_array_reference_string - doc = REXML::Document.new("") - assert_equal("Ruby", doc.root["name"]) - end - - def test_array_reference_symbol - doc = REXML::Document.new("") - assert_equal("Ruby", doc.root[:name]) - end - end -end diff --git a/test/rexml/test_elements.rb b/test/rexml/test_elements.rb deleted file mode 100644 index a850e622092c4e..00000000000000 --- a/test/rexml/test_elements.rb +++ /dev/null @@ -1,119 +0,0 @@ -# frozen_string_literal: false -require 'test/unit/testcase' -require 'rexml/document' - -module REXMLTests - class ElementsTester < Test::Unit::TestCase - include REXML - def test_accessor - doc = Document.new '' - assert_equal 'b', doc.root.elements[1].name - assert_equal '1', doc.root.elements['c'].attributes['id'] - assert_equal '2', doc.root.elements[2,'c'].attributes['id'] - end - - def test_indexing - doc = Document.new '' - doc.root.elements[10] = Element.new('b') - assert_equal 'b', doc.root.elements[1].name - doc.root.elements[1] = Element.new('c') - assert_equal 'c', doc.root.elements[1].name - doc.root.elements['c'] = Element.new('d') - assert_equal 'd', doc.root.elements[1].name - end - - def test_delete - doc = Document.new '' - block = proc { |str| - out = '' - doc.write out - assert_equal str, out - } - b = doc.root.elements[1] - doc.root.elements.delete b - block.call( "" ) - doc.elements.delete("a/c[@id='1']") - block.call( '' ) - doc.root.elements.delete 1 - block.call( '' ) - end - - def test_delete_all - doc = Document.new '' - deleted = doc.elements.delete_all 'a/c' - assert_equal 4, deleted.size - end - - def test_ticket_36 - doc = Document.new( "" ) - - deleted = doc.root.elements.delete_all( "xi:c" ) - assert_equal( 1, deleted.size ) - - doc = Document.new( "" ) - deleted = doc.root.elements.delete_all( "//xi:c" ) - assert_equal( 2, deleted.size ) - end - - def test_add - a = Element.new 'a' - a.elements.add Element.new('b') - assert_equal 'b', a.elements[1].name - a.elements.add 'c' - assert_equal 'c', a.elements[2].name - end - - def test_size - doc = Document.new 'seanelliottrussell' - assert_equal 6, doc.root.size - assert_equal 3, doc.root.elements.size - end - - def test_each - doc = Document.new 'sean' - count = 0 - block = proc {|e| count += 1} - doc.root.elements.each(&block) - assert_equal 6, count - count = 0 - doc.root.elements.each('b', &block) - assert_equal 2, count - count = 0 - doc.root.elements.each('child::node()', &block) - assert_equal 6, count - count = 0 - XPath.each(doc.root, 'child::node()', &block) - assert_equal 7, count - end - - def test_each_with_frozen_condition - doc = Document.new('') - names = [] - doc.root.elements.each('book'.freeze) do |element| - names << element.attributes["name"] - end - assert_equal(["Ruby", "XML"], names) - end - - def test_to_a - doc = Document.new 'seanelliott' - assert_equal 2, doc.root.elements.to_a.size - assert_equal 2, doc.root.elements.to_a("child::node()").size - assert_equal 4, XPath.match(doc.root, "child::node()").size - end - - def test_collect - doc = Document.new( "" ) - r = doc.elements.collect( "/a/b" ) { |e| e.attributes["id"].to_i } - assert_equal( [1,2], r ) - end - - def test_inject - doc = Document.new( "" ) - r = doc.elements.inject( "/a/b", 3 ) { |s, e| - s + e.attributes["id"].to_i - } - assert_equal 6, r - end - end -end diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb deleted file mode 100644 index 919db131f06f01..00000000000000 --- a/test/rexml/test_encoding.rb +++ /dev/null @@ -1,108 +0,0 @@ -# coding: binary -# frozen_string_literal: false - -require_relative "rexml_test_utils" - -require 'rexml/source' -require 'rexml/document' - -module REXMLTests - class EncodingTester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - - def setup - @encoded_root = "\346" - @encoded = ""+ - @encoded_root - @not_encoded = "ĉ" - end - - # Given an encoded document, try to write out to that encoding - def test_encoded_in_encoded_out - doc = Document.new( @encoded ) - doc.write( out="" ) - out.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( @encoded, out ) - end - - # Given an encoded document, try to change the encoding and write it out - def test_encoded_in_change_out - doc = Document.new( @encoded ) - doc.xml_decl.encoding = "UTF-8" - assert_equal("UTF-8", doc.encoding) - REXML::Formatters::Default.new.write( doc.root, out="" ) - out.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( @not_encoded, out ) - char = XPath.first( doc, "/a/b/text()" ).to_s - char.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( "ĉ", char ) - end - - # * Given an encoded document, try to write it to a different encoding - def test_encoded_in_different_out - doc = Document.new( @encoded ) - REXML::Formatters::Default.new.write( doc.root, Output.new( out="", "UTF-8" ) ) - out.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( @not_encoded, out ) - end - - # * Given a non-encoded document, change the encoding - def test_in_change_out - doc = Document.new( @not_encoded ) - doc.xml_decl.encoding = "ISO-8859-3" - assert_equal("ISO-8859-3", doc.encoding) - doc.write( out="" ) - out.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( @encoded, out ) - end - - # * Given a non-encoded document, write to a different encoding - def test_in_different_out - doc = Document.new( @not_encoded ) - doc.write( Output.new( out="", "ISO-8859-3" ) ) - out.force_encoding(::Encoding::ASCII_8BIT) - assert_equal( "#{@encoded_root}", out ) - end - - # * Given an encoded document, accessing text and attribute nodes - # should provide UTF-8 text. - def test_in_different_access - doc = Document.new <<-EOL - - \xFF - EOL - expect = "\303\277" - expect.force_encoding(::Encoding::UTF_8) - assert_equal( expect, doc.elements['a'].attributes['a'] ) - assert_equal( expect, doc.elements['a'].text ) - end - - - def test_ticket_89 - doc = Document.new <<-EOL - - - EOL - - REXML::Document.new doc - end - - def test_parse_utf16 - utf16 = File.open(fixture_path("utf16.xml")) do |f| - REXML::Document.new(f) - end - assert_equal("UTF-16", utf16.encoding) - assert( utf16[0].kind_of?(REXML::XMLDecl)) - end - - def test_parse_utf16_with_utf8_default_internal - EnvUtil.with_default_internal("UTF-8") do - utf16 = File.open(fixture_path("utf16.xml")) do |f| - REXML::Document.new(f) - end - assert_equal("UTF-16", utf16.encoding) - end - end - end -end diff --git a/test/rexml/test_entity.rb b/test/rexml/test_entity.rb deleted file mode 100644 index 6dc6637074e503..00000000000000 --- a/test/rexml/test_entity.rb +++ /dev/null @@ -1,206 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" - -require 'rexml/document' -require 'rexml/entity' -require 'rexml/source' - -module REXMLTests - class EntityTester < Test::Unit::TestCase - def test_parse_general_decl - simple = "" - simple =~ /#{REXML::Entity::GEDECL}/ - assert $& - assert_equal simple, $& - - REXML::Entity::ENTITYDECL =~ simple - assert REXML::Entity::matches?(simple) - match = REXML::Entity::ENTITYDECL.match(simple) - assert_equal 'foo', match[1] - assert_equal "'bar'", match[2] - - simple = '' - assert REXML::Entity::matches?(simple) - match = REXML::Entity::ENTITYDECL.match(simple) - assert_equal 'Pub-Status', match[1] - assert_equal '"This is a pre-release of the specification."', match[2] - - txt = '"This is a - pre-release of specification."' - simple = "" - assert REXML::Entity::matches?(simple) - match = REXML::Entity::ENTITYDECL.match(simple) - assert_equal 'Pub-Status', match[1] - assert_equal txt, match[2] - end - - def test_parse_external_decl - zero = '' - one = '' - two = '' - three = '' - assert REXML::Entity::matches?(zero) - assert REXML::Entity::matches?(one) - assert REXML::Entity::matches?(two) - assert REXML::Entity::matches?(three) - end - - def test_parse_entity - one = %q{} - two = %q{} - assert REXML::Entity::matches?(one) - assert REXML::Entity::matches?(two) - end - - def test_constructor - one = [ %q{}, - %q{}, - %q{}, - '', - '', - '' ] - source = %q{ - - - - - - ]>} - - d = REXML::Document.new( source ) - dt = d.doctype - c = 0 - dt.each do |child| - if child.kind_of? REXML::Entity - str = one[c].tr("\r\n\t", ' ').squeeze(" ") - assert_equal str, child.to_s - c+=1 - end - end - end - - def test_replace_entities - source = "\n]>&foo;" - doc = REXML::Document.new(source) - assert_equal 'bar', doc.root.text - out = '' - doc.write out - assert_equal source, out - end - - def test_entity_string_limit - template = ' ]> $' - len = 5120 # 5k per entity - template.sub!(/\^/, "B" * len) - - # 10k is OK - entities = '&a;' * 2 # 5k entity * 2 = 10k - xmldoc = REXML::Document.new(template.sub(/\$/, entities)) - assert_equal(len * 2, xmldoc.root.text.bytesize) - - # above 10k explodes - entities = '&a;' * 3 # 5k entity * 2 = 15k - xmldoc = REXML::Document.new(template.sub(/\$/, entities)) - assert_raise(RuntimeError) do - xmldoc.root.text - end - end - - def test_entity_string_limit_for_parameter_entity - template = ' ]>' - len = 5120 # 5k per entity - template.sub!(/\^/, "B" * len) - - # 10k is OK - entities = '%a;' * 2 # 5k entity * 2 = 10k - REXML::Document.new(template.sub(/\$/, entities)) - - # above 10k explodes - entities = '%a;' * 3 # 5k entity * 2 = 15k - assert_raise(REXML::ParseException) do - REXML::Document.new(template.sub(/\$/, entities)) - end - end - - def test_raw - source = ' -]>replace &ent;' - doc = REXML::Document.new( source, {:raw=>:all}) - assert_equal('replace &ent;', doc.root.get_text.to_s) - assert_equal(source, doc.to_s) - end - - def test_lazy_evaluation - source = ' -]>replace &ent;' - doc = REXML::Document.new( source ) - assert_equal(source, doc.to_s) - assert_equal("replace replace", doc.root.text) - assert_equal(source, doc.to_s) - end - - # Contributed (not only test, but bug fix!!) by Kouhei Sutou - def test_entity_replacement - source = %q{ - ]> - &WhatHeSaid;} - - d = REXML::Document.new( source ) - dt = d.doctype - assert_equal( '"Yes"', dt.entities[ "YN" ].value ) - assert_equal( 'He said "Yes"', dt.entities[ "WhatHeSaid" ].value ) - assert_equal( 'He said "Yes"', d.elements[1].text ) - end - - # More unit tests from Kouhei. I looove users who give me unit tests. - def test_entity_insertions - assert_equal("&", REXML::Text.new("&", false, nil, true).to_s) - #assert_equal("&", REXML::Text.new("&", false, false).to_s) - end - - def test_single_pass_unnormalization # ticket 123 - assert_equal '&&', REXML::Text::unnormalize('&amp;&') - end - - def test_entity_filter - document = REXML::Document.new(<<-XML) - - -]> - -XML - respect_whitespace = false - parent = document.root - raw = false - entity_filter = ["copy"] - assert_equal("(c) &release-year;", - REXML::Text.new("(c) 2013", - respect_whitespace, - parent, - raw, - entity_filter).to_s) - end - end -end diff --git a/test/rexml/test_instruction.rb b/test/rexml/test_instruction.rb deleted file mode 100644 index 96fa909e17d021..00000000000000 --- a/test/rexml/test_instruction.rb +++ /dev/null @@ -1,14 +0,0 @@ -require_relative "rexml_test_utils" - -module REXMLTests - class InstructionTest < Test::Unit::TestCase - def test_target_nil - error = assert_raise(ArgumentError) do - REXML::Instruction.new(nil) - end - assert_equal("processing instruction target must be String or " + - "REXML::Instruction: ", - error.message) - end - end -end diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb deleted file mode 100644 index 9640b8290b8513..00000000000000 --- a/test/rexml/test_jaxen.rb +++ /dev/null @@ -1,131 +0,0 @@ -# frozen_string_literal: false -require_relative 'rexml_test_utils' - -require "rexml/document" -require "rexml/xpath" - -# Harness to test REXML's capabilities against the test suite from Jaxen -# ryan.a.cox@gmail.com - -module REXMLTests - class JaxenTester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - - def test_axis ; process_test_case("axis") ; end - def test_basic ; process_test_case("basic") ; end - def test_basicupdate ; process_test_case("basicupdate") ; end - def test_contents ; process_test_case("contents") ; end - def test_defaultNamespace ; process_test_case("defaultNamespace") ; end - def test_fibo ; process_test_case("fibo") ; end - def test_id ; process_test_case("id") ; end - def test_jaxen24 ; process_test_case("jaxen24") ; end - def test_lang ; process_test_case("lang") ; end - # document() function for XSLT isn't supported - def _test_message ; process_test_case("message") ; end - def test_moreover ; process_test_case("moreover") ; end - def test_much_ado ; process_test_case("much_ado") ; end - def test_namespaces ; process_test_case("namespaces") ; end - def test_nitf ; process_test_case("nitf") ; end - # Exception should be considered - def _test_numbers ; process_test_case("numbers") ; end - def test_pi ; process_test_case("pi") ; end - def test_pi2 ; process_test_case("pi2") ; end - def test_simple ; process_test_case("simple") ; end - # TODO: namespace node is needed - def _test_testNamespaces ; process_test_case("testNamespaces") ; end - # document() function for XSLT isn't supported - def _test_text ; process_test_case("text") ; end - def test_underscore ; process_test_case("underscore") ; end - def _test_web ; process_test_case("web") ; end - def test_web2 ; process_test_case("web2") ; end - - private - def process_test_case(name) - xml_path = "#{name}.xml" - doc = File.open(fixture_path(xml_path)) do |file| - Document.new(file) - end - test_doc = File.open(fixture_path("test/tests.xml")) do |file| - Document.new(file) - end - XPath.each(test_doc, - "/tests/document[@url='xml/#{xml_path}']/context") do |context| - process_context(doc, context) - end - end - - # processes a tests/document/context node - def process_context(doc, context) - test_context = XPath.match(doc, context.attributes["select"]) - namespaces = context.namespaces - namespaces.delete("var") - namespaces = nil if namespaces.empty? - variables = {} - var_namespace = "http://jaxen.org/test-harness/var" - XPath.each(context, - "@*[namespace-uri() = '#{var_namespace}']") do |attribute| - variables[attribute.name] = attribute.value - end - XPath.each(context, "valueOf") do |value| - process_value_of(test_context, variables, namespaces, value) - end - XPath.each(context, - "test[not(@exception) or (@exception != 'true')]") do |test| - process_nominal_test(test_context, variables, namespaces, test) - end - XPath.each(context, - "test[@exception = 'true']") do |test| - process_exceptional_test(test_context, variables, namespaces, test) - end - end - - # processes a tests/document/context/valueOf or tests/document/context/test/valueOf node - def process_value_of(context, variables, namespaces, value_of) - expected = value_of.text - xpath = value_of.attributes["select"] - matched = XPath.match(context, xpath, namespaces, variables, strict: true) - - message = user_message(context, xpath, matched) - assert_equal(expected || "", - REXML::Functions.string(matched), - message) - end - - # processes a tests/document/context/test node ( where @exception is false or doesn't exist ) - def process_nominal_test(context, variables, namespaces, test) - xpath = test.attributes["select"] - matched = XPath.match(context, xpath, namespaces, variables, strict: true) - # might be a test with no count attribute, but nested valueOf elements - expected = test.attributes["count"] - if expected - assert_equal(Integer(expected, 10), - matched.size, - user_message(context, xpath, matched)) - end - - XPath.each(test, "valueOf") do |value_of| - process_value_of(matched, variables, namespaces, value_of) - end - end - - # processes a tests/document/context/test node ( where @exception is true ) - def process_exceptional_test(context, variables, namespaces, test) - xpath = test.attributes["select"] - assert_raise(REXML::ParseException) do - XPath.match(context, xpath, namespaces, variables, strict: true) - end - end - - def user_message(context, xpath, matched) - message = "" - context.each_with_index do |node, i| - message << "Node#{i}:\n" - message << "#{node}\n" - end - message << "XPath: <#{xpath}>\n" - message << "Matched <#{matched}>" - message - end - end -end diff --git a/test/rexml/test_light.rb b/test/rexml/test_light.rb deleted file mode 100644 index 99bd9cac3f55a3..00000000000000 --- a/test/rexml/test_light.rb +++ /dev/null @@ -1,107 +0,0 @@ -# frozen_string_literal: false -require_relative "rexml_test_utils" -require "rexml/light/node" -require "rexml/parsers/lightparser" - -module REXMLTests - class LightTester < Test::Unit::TestCase - include REXMLTestUtils - include REXML::Light - - def test_parse_large - xml_string = fixture_path("documentation.xml") - parser = REXML::Parsers::LightParser.new(xml_string) - tag, content = parser.parse - assert_equal([:document, :text], [tag, content.first]) - end - - # FIXME INCOMPLETE - # This is because the light API is not yet ready to be used to produce - # trees. -=begin - def test_add_element - doc = Node.new - foo = doc.add_element( 'foo' ) - assert_equal( "foo", foo.name ) - end - - def test_add_attribute - foo = Node.new( "a" ) - foo["attr"] = "bar" - assert_equal( "bar", foo["attr"] ) - end - - def test_write_document - r = make_small_document - assert_equal( "", r.to_s ) - end - - def test_add_attribute_under_namespace - foo = Node.new("a") - foo["attr", "a"] = "1" - foo["attr", "b"] = "2" - foo["attr"] = "3" - assert_equal( '1', foo['attr', 'a'] ) - assert_equal( '2', foo['attr', 'b'] ) - assert_equal( '3', foo['attr'] ) - end - - def test_change_namespace_of_element - foo = Node.new - assert_equal( '', foo.namespace ) - foo.namespace = 'a' - assert_equal( 'a', foo.namespace ) - end - - def test_access_child_elements - foo = make_small_document - assert_equal( 1, foo.size ) - a = foo[0] - assert_equal( 2, a.size ) - assert_equal( 'b', a[0].name ) - assert_equal( 'c', a[1].name ) - end - - def test_itterate_over_children - foo = make_small_document - ctr = 0 - foo[0].each { ctr += 1 } - assert_equal( 2, ctr ) - end - - def test_add_text - foo = Node.new( "a" ) - foo.add_text( "Sean" ) - sean = foo[0] - assert( sean.node_type == :text ) - end - - def test_add_instruction - foo = Node.new( "a" ) - foo.add_instruction( "target", "value" ) - assert( foo[0].node_type == :processing_instruction ) - end - - def test_add_comment - foo = Node.new( "a" ) - foo.add_comment( "target", "value" ) - assert( foo[0].node_type == :comment ) - end - - def test_get_root - foo = Node.new( 'a' ) - 10.times { foo = foo.add_element('b') } - assert_equals( 'b', foo.name ) - assert_equals( 'a', foo.root.name ) - end - - def make_small_document - r = Node.new - a = r.add_element( "a" ) - a.add_element( 'b' ) - a.add_element( 'c' ) - r - end -=end - end -end diff --git a/test/rexml/test_lightparser.rb b/test/rexml/test_lightparser.rb deleted file mode 100644 index 1aeac072dd50e0..00000000000000 --- a/test/rexml/test_lightparser.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: false -require_relative 'rexml_test_utils' -require 'rexml/parsers/lightparser' - -module REXMLTests - class LightParserTester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - def test_parsing - File.open(fixture_path("documentation.xml")) do |f| - parser = REXML::Parsers::LightParser.new( f ) - parser.parse - end - end - end -end diff --git a/test/rexml/test_listener.rb b/test/rexml/test_listener.rb deleted file mode 100644 index 322d368be8c23b..00000000000000 --- a/test/rexml/test_listener.rb +++ /dev/null @@ -1,131 +0,0 @@ -# coding: binary -# frozen_string_literal: false - -require_relative 'rexml_test_utils' - -require 'rexml/document' -require 'rexml/streamlistener' - -module REXMLTests - class BaseTester < Test::Unit::TestCase - include REXMLTestUtils - def test_empty - return unless defined? @listener - # Empty. - t1 = %Q{} - assert_equal( "", @listener.parse( t1 ), - "Empty" ) - end - - def test_space - return unless defined? @listener - # Space. - t2 = %Q{ } - assert_equal( " ", @listener.parse( t2 ), - "Space" ) - end - - def test_whitespace - return unless defined? @listener - # Whitespaces. - t3 = %Q{RE\n \t \n \t XML} - assert_equal( "RE\n \t \n \t XML", @listener.parse( t3 ), - "Whitespaces" ) - end - - def test_leading_trailing_whitespace - return unless defined? @listener - # Leading and trailing whitespaces. - t4 = %Q{ REXML } - assert_equal( " REXML ", @listener.parse( t4 ), - "Leading and trailing whitespaces" ) - end - - def test_entity_reference - return unless defined? @listener - # Entity reference. - t5 = %Q{<>&lt;&gt;} - assert_equal( "<><>", @listener.parse( t5 ), - "Entity reference" ) - end - - def test_character_reference - return unless defined? @listener - # Character reference. - t6 = %Q{ } - assert_equal( "\r", @listener.parse( t6 ), - "Character reference." ) - end - - def test_cr - return unless defined? @listener - # CR. - t7 = %Q{ \r\n \r \n } - assert_equal( " \n \n \n ".unpack("C*").inspect, - @listener.parse( t7 ).unpack("C*").inspect, "CR" ) - end - - # The accent bug, and the code that exhibits the bug, was contributed by - # Guilhem Vellut - class AccentListener - def tag_start(name,attributes) - #p name - #p attributes - end - def tag_end(name) - #p "/"+name - end - def xmldecl(a,b,c) - #puts "#{a} #{b} #{c}" - end - def text(tx) - #p tx - end - end - - def test_accents - source = %[ - - -] - doc = REXML::Document.new( source ) - a = doc.elements['/g/f'].attribute('a') - if a.value.respond_to? :force_encoding - a.value.force_encoding('binary') - end - assert_equal( "\xC3\xA9", a.value) - doc = File::open(fixture_path("stream_accents.xml")) do |f| - REXML::Document.parse_stream(f, AccentListener::new) - end - end - end - - class MyREXMLListener - include REXML::StreamListener - - def initialize - @text = nil - end - - def parse( stringOrReadable ) - @text = "" - REXML::Document.parse_stream( stringOrReadable, self ) - @text - end - - def text( text ) - @text << text - end - end - - class REXMLTester < BaseTester - def setup - @listener = MyREXMLListener.new - end - - def test_character_reference_2 - t6 = %Q{ } - assert_equal( t6.strip, REXML::Document.new(t6).to_s ) - end - end -end diff --git a/test/rexml/test_martin_fowler.rb b/test/rexml/test_martin_fowler.rb deleted file mode 100644 index add3c82723334a..00000000000000 --- a/test/rexml/test_martin_fowler.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'rexml/document' - -module REXMLTests - class OrderTesterMF < Test::Unit::TestCase - DOC = < -Remove this element and figs order differently -
-
-

Para of text

-

Remove this and figs order differently

-
-
-
-
- -END - - def initialize n - @doc = REXML::Document.new(DOC) - @figs = REXML::XPath.match(@doc,'//figure') - @names = @figs.collect {|f| f.attributes['src']} - super - end - def test_fig1 - assert_equal 'fig1', @figs[0].attributes['src'] - end - def test_fig2 - assert_equal 'fig2', @figs[1].attributes['src'] - end - def test_fig3 - assert_equal 'fig3', @figs[2].attributes['src'] - end - def test_fig4 - assert_equal 'fig4', @figs[3].attributes['src'] - end - end -end diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb deleted file mode 100644 index 90e1d369458965..00000000000000 --- a/test/rexml/test_namespace.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: false -require_relative "rexml_test_utils" - -require "rexml/document" - -module REXMLTests - class TestNamespace < Test::Unit::TestCase - include REXMLTestUtils - include REXML - - def setup - @xsa_source = <<-EOL - - - - - - - - Lars Marius Garshol - larsga@garshol.priv.no - http://www.stud.ifi.uio.no/~lmariusg/ - - - EOL - end - - def test_xml_namespace - xml = <<-XML - - -XML - document = Document.new(xml) - assert_equal("http://www.w3.org/XML/1998/namespace", - document.root.namespace("xml")) - end - end -end diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb deleted file mode 100644 index 807d9faa960ba9..00000000000000 --- a/test/rexml/test_order.rb +++ /dev/null @@ -1,110 +0,0 @@ -# frozen_string_literal: false -require_relative 'rexml_test_utils' -require 'rexml/document' -begin - require 'zlib' -rescue LoadError -end - -module REXMLTests - class OrderTester < Test::Unit::TestCase - include REXMLTestUtils - - TESTDOC = < - - - - - - - - -END - - def setup - @doc = REXML::Document.new(TESTDOC) - @items = REXML::XPath.match(@doc,'//x') - end - def test_first_element - assert_equal '1', @items[0].attributes['id'] - end - def test_second_element - assert_equal '2', @items[1].attributes['id'] - end - def test_third_element - assert_equal '3', @items[2].attributes['id'] - end - def test_order - d = REXML::Document.new( " - " ) - items = REXML::XPath.match( d, '//x' ) - assert_equal( %w{1 2 3 4 5}, items.collect{|e| e.attributes['id']} ) - d = REXML::Document.new( " - - " ) - items = REXML::XPath.match( d, '//y' ) - assert_equal( %w{1 2 3 4}, items.collect{|e| e.attributes['id']} ) - end - # Provided by Tom Talbott - def test_more_ordering - doc = Zlib::GzipReader.open(fixture_path('LostineRiver.kml.gz'), encoding: 'utf-8') do |f| - REXML::Document.new(f) - end - actual = [ - "Head south from Phinney Ave N", - "Turn left at N 36th St", - "Turn right at Fremont Ave N", - "Continue on 4th Ave N", - "Turn left at Westlake Ave N", - "Bear right at 9th Ave N", - "Turn left at Mercer St", - "Take the I-5 ramp", - "Take the I-5 S ramp", - "Take the I-90 E exit #164 to Bellevue/Spokane/4th Ave S.", - "Take the I-90 E ramp to Bellevue/Spokane", - "Take exit #137 to Wanapum Dam/Richland", - "Bear right at WA-26", - "Bear right and head toward WA-243", - "Continue on WA-243", - "Bear right at WA-24", - "Continue on WA-240", - "Turn right at WA-240 E", - "Take the I-182 W ramp to Yakima (I-82)/Pendleton", - "Take the I-82 E ramp to Umatilla/Pendleton", - "Take the I-84 E ramp to Pendleton", - "Take the OR-82 exit #261 to La Grande/Elgin", - "Turn right at Island Ave", - "Continue on W 1st St", - "Turn left at N McAlister Rd", - "Bear right at OR-82", - "Continue on Wallowa Lake Hwy", - "Continue on OR-82", - "Continue on Ruckman Ave", - "Continue on OR-82", - "Continue on S 8th Ave", - "Turn right at Albany St", - "Continue on OR-82", - "Continue on Wallowa Lake Hwy", - "Continue on N Madison St", - "Bear left at W 1st St", - "Continue on Wallowa Lake Hwy", - "Continue on Water St", - "Bear right at Lostine River Rd", - "Bear right and head toward Lostine River Rd", - "Turn right at Lostine River Rd", - "Continue on NF-8210", - "Turn right and head toward NF-8210", - "Turn right at NF-8210", - "", - "Route" - ] - count = 0 - REXML::XPath.each( doc, "//Placemark") { |element| - n = element.elements["name"].text.squeeze(" ") - assert_equal( actual[count], n ) unless n =~ /Arrive at/ - count += 1 - } - end if defined?(Zlib::GzipReader) - end -end diff --git a/test/rexml/test_preceding_sibling.rb b/test/rexml/test_preceding_sibling.rb deleted file mode 100644 index d89a1e1c90ef4e..00000000000000 --- a/test/rexml/test_preceding_sibling.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: false -# ISSUE 32 -require 'test/unit' -require 'rexml/document' - -module REXMLTests - # daz - for report by Dan Kohn in: - # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/156328 - class XPathTesterDd < Test::Unit::TestCase - include REXML - - def setup - @@docDd = Document.new(<<-EOS, :ignore_whitespace_nodes => :all) - - - Success - - - abc02C - - - EOS - end - - def test_Dd_preceding_sibling_children - arr = [] - XPath.each(@@docDd, "//b[@x='ab02A']/preceding-sibling::b/child::*") do |cell| - arr << cell.texts.join - end - assert_equal( 'Success', arr.join ) - end - - def test_Dd_preceding_sibling_all - arr = [] - XPath.each(@@docDd, "//b[@x='ab02A']/preceding-sibling::*") do |cell| - arr << cell.to_s - end - assert_equal( "Success", arr.join ) - end - end -end diff --git a/test/rexml/test_pullparser.rb b/test/rexml/test_pullparser.rb deleted file mode 100644 index 31b5b74bd673c4..00000000000000 --- a/test/rexml/test_pullparser.rb +++ /dev/null @@ -1,103 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" - -require 'rexml/parsers/pullparser' - -module REXMLTests - class PullParserTester < Test::Unit::TestCase - include REXML - def test_basics - source = ' - - foo <bar nooo' - parser = REXML::Parsers::PullParser.new(source) - res = { :text=>0 } - until parser.empty? - results = parser.pull - res[ :xmldecl ] = true if results.xmldecl? - res[ :doctype ] = true if results.doctype? - res[ :a ] = true if results.start_element? and results[0] == 'a' - if results.start_element? and results[0] == 'b' - res[ :b ] = true - assert_equal 'value', results[1]['attribute'] - end - res[ :text ] += 1 if results.text? - end - [ :xmldecl, :doctype, :a, :b ].each { |tag| - assert res[tag] , "#{tag} wasn't processed" - } - assert_equal 4, res[ :text ] - rescue ParseException - puts $! - end - - def test_bad_document - source = "" - parser = REXML::Parsers::PullParser.new(source) - assert_raise(ParseException, "Parsing should have failed") { - parser.pull while parser.has_next? - } - end - - def test_entity_replacement - source = ' - - - ]>&la;&lala;' - pp = REXML::Parsers::PullParser.new( source ) - el_name = '' - while pp.has_next? - event = pp.pull - case event.event_type - when :start_element - el_name = event[0] - when :text - case el_name - when 'la' - assert_equal('1234', event[1]) - when 'lala' - assert_equal('--1234--', event[1]) - end - end - end - end - - def test_peek_unshift - source = "" - REXML::Parsers::PullParser.new(source) - # FINISH ME! - end - - def test_inspect - xml = 'Hey' - parser = Parsers::PullParser.new( xml ) - while parser.has_next? - pull_event = parser.pull - if pull_event.start_element? - peek = parser.peek() - peek.inspect - end - end - end - - def test_peek - xml = 'Hey' - parser = Parsers::PullParser.new( xml ) - names = %w{ a b } - while parser.has_next? - pull_event = parser.pull - if pull_event.start_element? - assert_equal( :start_element, pull_event.event_type ) - assert_equal( names.shift, pull_event[0] ) - if names[0] == 'b' - peek = parser.peek() - assert_equal( :start_element, peek.event_type ) - assert_equal( names[0], peek[0] ) - end - end - end - assert_equal( 0, names.length ) - end - end -end diff --git a/test/rexml/test_rexml_issuezilla.rb b/test/rexml/test_rexml_issuezilla.rb deleted file mode 100644 index 1c54c9d53d666c..00000000000000 --- a/test/rexml/test_rexml_issuezilla.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: false -require_relative 'rexml_test_utils' -require 'rexml/document' - -module REXMLTests - class TestIssuezillaParsing < Test::Unit::TestCase - include REXMLTestUtils - def test_rexml - doc = File.open(fixture_path("ofbiz-issues-full-177.xml")) do |f| - REXML::Document.new(f) - end - ctr = 1 - doc.root.each_element('//issue') do |issue| - assert_equal( ctr, issue.elements['issue_id'].text.to_i ) - ctr += 1 - end - end - end -end diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb deleted file mode 100644 index 00539f0d4c6306..00000000000000 --- a/test/rexml/test_sax.rb +++ /dev/null @@ -1,287 +0,0 @@ -# frozen_string_literal: false -require_relative "rexml_test_utils" -require 'rexml/sax2listener' -require 'rexml/parsers/sax2parser' -require 'rexml/document' - -module REXMLTests - class SAX2Tester < Test::Unit::TestCase - include REXMLTestUtils - include REXML - def test_characters - d = Document.new( "@blah@" ) - txt = d.root.text - p = Parsers::SAX2Parser.new "@blah@" - p.listen(:characters) {|x| assert_equal txt, x} - p.listen(:characters, ["A"]) {|x| assert_equal txt,x} - p.parse - end - - def test_entity_replacement - source = ' - - - ]>&la;&lala;' - sax = Parsers::SAX2Parser.new( source ) - results = [] - sax.listen(:characters) {|x| results << x } - sax.parse - assert_equal 2, results.size - assert_equal '1234', results[0] - assert_equal '--1234--', results[1] - end - - def test_sax2 - File.open(fixture_path("documentation.xml")) do |f| - parser = Parsers::SAX2Parser.new( f ) - # Listen to all events on the following elements - count = 0 - blok = proc { |uri,localname,qname,attributes| - assert %w{ bugs todo }.include?(localname), - "Mismatched name; we got '#{qname}'\nArgs were:\n\tURI: #{uri}\n\tLOCALNAME: #{localname}\n\tQNAME: #{qname}\n\tATTRIBUTES: #{attributes.inspect}\n\tSELF=#{blok}" - count += 1 - } - - start_document = 0 - end_document = 0 - parser.listen( :start_document ) { start_document += 1 } - parser.listen( :end_document ) { end_document += 1 } - parser.listen( :start_element, %w{ changelog bugs todo }, &blok ) - # Listen to all events on the following elements. Synonymous with - # listen( :start_element, %w{ ... } ) - parser.listen( %w{ changelog bugs todo }, &blok ) - # Listen for all start element events - parser.listen( :start_element ) { |uri,localname,qname,attributes| - } - listener = MySAX2Listener.new - # Listen for all events - parser.listen( listener ) - # Listen for all events on the given elements. Does not include children - # events. Regular expressions work as well! - parser.listen( %w{ /change/ bugs todo }, listener ) - # Test the deafening method - blok = proc { |uri,localname,qname,attributes| - assert_fail "This listener should have been deafened!" - } - parser.listen( %w{ changelog }, &blok ) - parser.deafen( &blok ) - - tc = 0 - parser.listen( :characters, %w{version} ) {|text| - assert(text=~/@ANT_VERSION@/, "version was '#{text}'") - tc += 1 - } - - begin - parser.parse - rescue => exception - if exception.kind_of? Test::Unit::AssertionFailedError - raise exception - end - puts $! - puts exception.backtrace - end - assert_equal 2, count - assert_equal 1, tc - assert_equal 1, start_document - assert_equal 1, end_document - end - end - - # used by test_simple_doctype_listener - # submitted by Jeff Barczewski - class SimpleDoctypeListener - include REXML::SAX2Listener - attr_reader :name, :pub_sys, :long_name, :uri - - def initialize - @name = @pub_sys = @long_name = @uri = nil - end - - def doctype(name, pub_sys, long_name, uri) - @name = name - @pub_sys = pub_sys - @long_name = long_name - @uri = uri - end - end - - # test simple non-entity doctype in sax listener - # submitted by Jeff Barczewski - def test_simple_doctype_listener - xml = <<-END - - - Hello, world! - END - parser = Parsers::SAX2Parser.new(xml) - dtl = SimpleDoctypeListener.new - parser.listen(dtl) - tname = nil - tpub_sys = nil - tlong_name = nil - turi = nil - parser.listen(:doctype) do |name, pub_sys, long_name, uri| - tname = name - tpub_sys = pub_sys - tlong_name = long_name - turi = uri - end - parser.parse - assert_equal 'greeting', tname, 'simple doctype block listener failed - incorrect name' - assert_equal 'PUBLIC', tpub_sys, 'simple doctype block listener failed - incorrect pub_sys' - assert_equal 'Hello Greeting DTD', tlong_name, 'simple doctype block listener failed - incorrect long_name' - assert_equal 'http://foo/hello.dtd', turi, 'simple doctype block listener failed - incorrect uri' - assert_equal 'greeting', dtl.name, 'simple doctype listener failed - incorrect name' - assert_equal 'PUBLIC', dtl.pub_sys, 'simple doctype listener failed - incorrect pub_sys' - assert_equal 'Hello Greeting DTD', dtl.long_name, 'simple doctype listener failed - incorrect long_name' - assert_equal 'http://foo/hello.dtd', dtl.uri, 'simple doctype listener failed - incorrect uri' - end - - # test doctype with missing name, should throw ParseException - # submitted by Jeff Barczewseki - def test_doctype_with_mising_name_throws_exception - xml = <<-END - - - Hello, world! - END - parser = Parsers::SAX2Parser.new(xml) - assert_raise(REXML::ParseException, 'doctype missing name did not throw ParseException') do - parser.parse - end - end - - - class KouListener - include REXML::SAX2Listener - attr_accessor :sdoc, :edoc - attr_reader :selem, :decl, :pi - def initialize - @sdoc = @edoc = @selem = false - @decl = 0 - @pi = 0 - end - def start_document - @sdoc = true - end - def end_document - @edoc = true - end - def xmldecl( *arg ) - @decl += 1 - end - def processing_instruction( *arg ) - @pi += 1 - end - def start_element( *arg ) - @selem = true - end - end - - # Submitted by Kou - def test_begin_end_document - parser = Parsers::SAX2Parser.new("") - - kl = KouListener.new - parser.listen(kl) - sd = false - ed = false - parser.listen(:start_document) { sd = true } - parser.listen(:end_document) { ed = true } - - parser.parse - assert( sd, ':start_document block failed' ) - assert( ed, ':end_document block failed' ) - assert( kl.sdoc, ':start_document listener failed' ) - assert( kl.edoc, ':end_document listener failed' ) - end - - # Submitted by Kou - def test_listen_before_start - # FIXME: the following comment should be a test for validity. (The xml declaration - # is invalid). - #parser = Parsers::SAX2Parser.new( "") - parser = Parsers::SAX2Parser.new( "") - k1 = KouListener.new - parser.listen( k1 ) - xmldecl = false - pi = 0 - parser.listen( :xmldecl ) { xmldecl = true } - parser.listen( :processing_instruction ) { pi += 1 } - - parser.parse - - assert( xmldecl, ':xmldecl failed' ) - assert_equal( 2, pi, ':processing_instruction failed' ) - assert( k1.decl, 'Listener for xmldecl failed' ) - assert_equal( 2, k1.pi, 'Listener for processing instruction failed' ) - end - - - def test_socket - require 'socket' - - TCPServer.open('127.0.0.1', 0) do |server| - TCPSocket.open('127.0.0.1', server.addr[1]) do |socket| - ok = false - session = server.accept - begin - session << '' - parser = REXML::Parsers::SAX2Parser.new(socket) - Fiber.new do - parser.listen(:start_element) do - ok = true - Fiber.yield - end - parser.parse - end.resume - assert(ok) - ensure - session.close - end - end - end - end - - def test_char_ref_sax2() - parser = REXML::Parsers::SAX2Parser.new('ü') - result = nil - parser.listen(:characters) {|text| result = text.unpack('U*')} - parser.parse() - assert_equal(1, result.size) - assert_equal(252, result[0]) - end - - - def test_char_ref_dom() - doc = REXML::Document.new('ü') - result = doc.root.text.unpack('U*') - assert_equal(1, result.size) - assert_equal(252, result[0]) - end - - class Ticket68 - include REXML::SAX2Listener - end - def test_ticket_68 - File.open(fixture_path('ticket_68.xml')) do |f| - parser = REXML::Parsers::SAX2Parser.new(f) - parser.listen( Ticket68.new ) - begin - parser.parse - rescue - p parser.source.position - p parser.source.current_line - puts $!.backtrace.join("\n") - flunk $!.message - end - end - end - end - - class MySAX2Listener - include REXML::SAX2Listener - end -end diff --git a/test/rexml/test_stream.rb b/test/rexml/test_stream.rb deleted file mode 100644 index 08d4462ef93add..00000000000000 --- a/test/rexml/test_stream.rb +++ /dev/null @@ -1,130 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" -require "rexml/document" -require 'rexml/streamlistener' -require 'stringio' - -module REXMLTests - class MyListener - include REXML::StreamListener - end - - - class StreamTester < Test::Unit::TestCase - # Submitted by Han Holl - def test_listener - data = %Q{\n} - - RequestReader.new( data ) - RequestReader.new( data ) - end - - def test_ticket_49 - source = StringIO.new( <<-EOL ) - - ]> - &ent; - EOL - REXML::Document.parse_stream(source, MyListener.new) - end - - def test_ticket_10 - source = StringIO.new( <<-EOL ) - - - - - ]> - - EOL - listener = MyListener.new - class << listener - attr_accessor :events - def entitydecl( content ) - @events[ :entitydecl ] = true - end - def attlistdecl( element_name, attributes, raw_content ) - @events[ :attlistdecl ] = true - end - def elementdecl( content ) - @events[ :elementdecl ] = true - end - def notationdecl( content ) - @events[ :notationdecl ] = true - end - end - listener.events = {} - - REXML::Document.parse_stream( source, listener ) - - assert( listener.events[:entitydecl] ) - assert( listener.events[:attlistdecl] ) - assert( listener.events[:elementdecl] ) - assert( listener.events[:notationdecl] ) - end - - def test_entity - listener = MyListener.new - class << listener - attr_accessor :entities - def entity(content) - @entities << content - end - end - listener.entities = [] - - source = StringIO.new(<<-XML) - -%ISOLat2; -]> - - XML - REXML::Document.parse_stream(source, listener) - - assert_equal(["ISOLat2"], listener.entities) - end - end - - - # For test_listener - class RequestReader - attr_reader :doc - def initialize(io) - @stack = [] - @doc = nil - catch(:fini) do - REXML::Document.parse_stream(io, self) - raise IOError - end - end - def tag_start(name, args) - if @doc - @stack.push(REXML::Element.new(name, @stack.last)) - else - @doc = REXML::Document.new("<#{name}/>") - @stack.push(@doc.root) - end - args.each do |attr,val| - @stack.last.add_attribute(attr, val) - end - end - def tag_end(name, *args) - @stack.pop - throw(:fini) if @stack.empty? - end - def text(str) - @stack.last.text = str - end - def comment(str) - end - def doctype( name, pub_sys, long_name, uri ) - end - def doctype_end - end - end -end diff --git a/test/rexml/test_text.rb b/test/rexml/test_text.rb deleted file mode 100644 index e9a246e27f87ca..00000000000000 --- a/test/rexml/test_text.rb +++ /dev/null @@ -1,75 +0,0 @@ -# frozen_string_literal: false - -require_relative "rexml_test_utils" - -module REXMLTests - class TextTester < Test::Unit::TestCase - include REXML - - def test_new_text_response_whitespace_default - text = Text.new("a b\t\tc", true) - assert_equal("a b\tc", Text.new(text).to_s) - end - - def test_new_text_response_whitespace_true - text = Text.new("a b\t\tc", true) - assert_equal("a b\t\tc", Text.new(text, true).to_s) - end - - def test_new_text_raw_default - text = Text.new("&lt;", false, nil, true) - assert_equal("&lt;", Text.new(text).to_s) - end - - def test_new_text_raw_false - text = Text.new("&lt;", false, nil, true) - assert_equal("&amp;lt;", Text.new(text, false, nil, false).to_s) - end - - def test_new_text_entity_filter_default - document = REXML::Document.new(<<-XML) - - -]> - - XML - text = Text.new("aaa bbb", false, document.root, nil, ["a"]) - assert_equal("aaa &b;", - Text.new(text, false, document.root).to_s) - end - - def test_new_text_entity_filter_custom - document = REXML::Document.new(<<-XML) - - -]> - - XML - text = Text.new("aaa bbb", false, document.root, nil, ["a"]) - assert_equal("&a; bbb", - Text.new(text, false, document.root, nil, ["b"]).to_s) - end - - def test_shift_operator_chain - text = Text.new("original\r\n") - text << "append1\r\n" << "append2\r\n" - assert_equal("original\nappend1\nappend2\n", text.to_s) - end - - def test_shift_operator_cache - text = Text.new("original\r\n") - text << "append1\r\n" << "append2\r\n" - assert_equal("original\nappend1\nappend2\n", text.to_s) - text << "append3\r\n" << "append4\r\n" - assert_equal("original\nappend1\nappend2\nappend3\nappend4\n", text.to_s) - end - - def test_clone - text = Text.new("&lt; <") - assert_equal(text.to_s, - text.clone.to_s) - end - end -end diff --git a/test/rexml/test_ticket_80.rb b/test/rexml/test_ticket_80.rb deleted file mode 100644 index ab6a57efaf283d..00000000000000 --- a/test/rexml/test_ticket_80.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: false -#------------------------------------------------------------------------------ -# file: rexml_test.rb -# desc: test's REXML's XML/XPath implementation -# auth: Philip J Grabner atdot -# date: 2006/08/17 -# copy: (C) CopyLoose 2006 Bib Development Team atdot -#------------------------------------------------------------------------------ - -require 'test/unit' -require 'rexml/document' - -module REXMLTests - class Ticket80 < Test::Unit::TestCase - - @@xmlstr = ' - - - - - - - - - - - - - -' - - #---------------------------------------------------------------------------- - def test_xpathNamespacedChildWildcard - # tests the "prefix:*" node test syntax - out = Array.new - REXML::XPath.each( REXML::Document.new(@@xmlstr), - '/ns:root/ns:*/ns:l2/@value', - { 'ns' => 'urn:some-xml-ns' } ) do |node| out.push node.value ; end - chk = [ 'foo-01', 'foo-02', 'foo-03', 'bar-01', 'bar-02' ] - assert_equal chk, out - end - - #---------------------------------------------------------------------------- - def test_xpathNamespacedChildWildcardWorkaround - # tests a workaround for the "prefix:*" node test syntax - out = Array.new - REXML::XPath.each( REXML::Document.new(@@xmlstr), - '/ns:root/*[namespace-uri()="urn:some-xml-ns"]/ns:l2/@value', - { 'ns' => 'urn:some-xml-ns' } ) do |node| out.push node.value ; end - chk = [ 'foo-01', 'foo-02', 'foo-03', 'bar-01', 'bar-02' ] - assert_equal chk, out - end - - end -end - -#------------------------------------------------------------------------------ -# end of rexml_test.rb -#------------------------------------------------------------------------------ diff --git a/test/rexml/test_validation_rng.rb b/test/rexml/test_validation_rng.rb deleted file mode 100644 index b5b50450e0bc42..00000000000000 --- a/test/rexml/test_validation_rng.rb +++ /dev/null @@ -1,793 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" - -require "rexml/document" -require "rexml/validation/relaxng" - -module REXMLTests - class RNGValidation < Test::Unit::TestCase - include REXML - - def test_validate - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - error( validator, %q{} ) - end - - - def test_sequence - rng = %q{ - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - end - - - def test_choice - rng = %q{ - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_optional - rng = %q{ - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - end - - def test_zero_or_more - rng = %q{ - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - end - - def test_one_or_more - rng = %q{ - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - end - - def test_attribute - rng = %q{ - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_choice_attributes - rng = %q{ - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{}) - no_error( validator, %q{} ) - end - - def test_choice_attribute_element - rng = %q{ - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{}) - no_error( validator, %q{} ) - end - - def test_empty - rng = %q{ - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{Text} ) - no_error( validator, %q{}) - end - - def test_text_val - rng = %q{ - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{Text} ) - error( validator, %q{}) - end - - def test_choice_text - rng = %q{ - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{Text} ) - error( validator, %q{Text} ) - no_error( validator, %q{Text} ) - no_error( validator, %q{} ) - end - - def test_group - rng = %q{ - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_value - # Values as text nodes - rng = %q{ - - - - VaLuE - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{X} ) - error( validator, %q{} ) - no_error( validator, %q{VaLuE} ) - - # Values as text nodes, via choice - rng = %q{ - - - - - Option 1 - Option 2 - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{XYZ} ) - no_error( validator, %q{Option 1} ) - no_error( validator, %q{Option 2} ) - - # Attribute values - rng = %q{ - - - - VaLuE - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - - # Attribute values via choice - rng = %q{ - - - - - Option 1 - Option 2 - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_interleave - rng = %q{ - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - end - - def test_mixed - rng = %q{ - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{Text} ) - no_error( validator, %q{Text} ) - end - - def test_ref_sequence - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - error( validator, %q{} ) - end - - def test_ref_choice - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - - def test_ref_zero_plus - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - - def test_ref_one_plus - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_ref_interleave - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_ref_recurse - rng = %q{ - - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - error( validator, %q{} ) - no_error( validator, %q{} ) - no_error( validator, %q{} ) - end - - def test_ref_optional - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - - rng = %q{ - - - - - - - - - - - - - - - - } - validator = REXML::Validation::RelaxNG.new( rng ) - - no_error( validator, %q{} ) - no_error( validator, %q{} ) - error( validator, %q{} ) - error( validator, %q{} ) - end - - - - def error( validator, source ) - parser = REXML::Parsers::TreeParser.new( source ) - parser.add_listener( validator.reset ) - assert_raise( REXML::Validation::ValidationException, - "Expected a validation error" ) { parser.parse } - end - - def no_error( validator, source ) - parser = REXML::Parsers::TreeParser.new( source ) - parser.add_listener( validator.reset ) - assert_nothing_raised { parser.parse } - end - end -end diff --git a/test/rexml/test_xml_declaration.rb b/test/rexml/test_xml_declaration.rb deleted file mode 100644 index da7076126e5135..00000000000000 --- a/test/rexml/test_xml_declaration.rb +++ /dev/null @@ -1,48 +0,0 @@ -# frozen_string_literal: false -# -# Created by Henrik Mårtensson on 2007-02-18. -# Copyright (c) 2007. All rights reserved. - -require "rexml/document" -require "test/unit" - -module REXMLTests - class TestXmlDeclaration < Test::Unit::TestCase - def setup - xml = <<-XML - - - - XML - @doc = REXML::Document.new xml - @root = @doc.root - @xml_declaration = @doc.children[0] - end - - def test_is_first_child - assert_kind_of(REXML::XMLDecl, @xml_declaration) - end - - def test_has_document_as_parent - assert_kind_of(REXML::Document, @xml_declaration.parent) - end - - def test_has_sibling - assert_kind_of(REXML::XMLDecl, @root.previous_sibling.previous_sibling) - assert_kind_of(REXML::Element, @xml_declaration.next_sibling.next_sibling) - end - - def test_write_prologue_quote - @doc.context[:prologue_quote] = :quote - assert_equal("", - @xml_declaration.to_s) - end - - def test_is_writethis_attribute_copied_by_clone - assert_equal(true, @xml_declaration.clone.writethis) - @xml_declaration.nowrite - assert_equal(false, @xml_declaration.clone.writethis) - end - end -end diff --git a/test/rexml/xpath/test_attribute.rb b/test/rexml/xpath/test_attribute.rb deleted file mode 100644 index 713d77b22f28c3..00000000000000 --- a/test/rexml/xpath/test_attribute.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'rexml/document' - -module REXMLTests - class TestXPathAttribute < Test::Unit::TestCase - def setup - @xml = <<-XML - - - child1 - child2 - child3 - - XML - @document = REXML::Document.new(@xml) - end - - def test_elements - root = @document.elements["root"] - second_child = root.elements["child[@name='two']"] - assert_equal("child2", second_child.text) - end - - def test_xpath_each - children = REXML::XPath.each(@document, "/root/child[@name='two']") - assert_equal(["child2"], children.collect(&:text)) - end - - def test_no_namespace - children = REXML::XPath.match(@document, - "/root/child[@nothing:name='two']", - "" => "http://example.com/", - "nothing" => "") - assert_equal(["child2"], children.collect(&:text)) - end - end -end diff --git a/test/rexml/xpath/test_axis_preceding_sibling.rb b/test/rexml/xpath/test_axis_preceding_sibling.rb deleted file mode 100644 index 5842c6bc50e585..00000000000000 --- a/test/rexml/xpath/test_axis_preceding_sibling.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" -require "rexml/document" - -module REXMLTests - class TestXPathAxisPredcedingSibling < Test::Unit::TestCase - include REXML - SOURCE = <<-EOF - - - - - - - - - EOF - - def setup - @@doc = Document.new(SOURCE) unless defined? @@doc - end - - def test_preceding_sibling_axis - context = XPath.first(@@doc,"/a/e/f[last()]") - assert_equal "6", context.attributes["id"] - - prev = XPath.first(context, "preceding-sibling::f") - assert_equal "5", prev.attributes["id"] - - prev = XPath.first(context, "preceding-sibling::f[1]") - assert_equal "5", prev.attributes["id"] - - prev = XPath.first(context, "preceding-sibling::f[2]") - assert_equal "4", prev.attributes["id"] - - prev = XPath.first(context, "preceding-sibling::f[3]") - assert_equal "3", prev.attributes["id"] - end - end -end diff --git a/test/rexml/xpath/test_base.rb b/test/rexml/xpath/test_base.rb deleted file mode 100644 index 210d6c7c81a0bb..00000000000000 --- a/test/rexml/xpath/test_base.rb +++ /dev/null @@ -1,1125 +0,0 @@ -# frozen_string_literal: false -require_relative "../rexml_test_utils" - -require "rexml/document" - -module REXMLTests - class TestXPathBase < Test::Unit::TestCase - include REXMLTestUtils - include REXML - SOURCE = <<-EOF - - - - - - - - - - - - - - - - - - - - - - -

- - - - - EOF - JENI_TENNISON = <<-EOJT - - - - - - - - - - - - - - - - - - - - - - - - EOJT - - def setup - @@doc = Document.new(SOURCE) unless defined? @@doc - @@jeni = Document.new( JENI_TENNISON ) unless defined? @@jeni - end - - def each_test( element, xpath ) - count = 0 - XPath::each( element, xpath ) { |child| - count += 1 - yield child if block_given? - } - count - end - - def test_descendant - doc = Document.new("") - p = XPath.match( doc, "//c" ) - assert_equal( 2, p.size ) - p = XPath.first( @@doc, "//p" ) - assert_equal "p", p.name - c = each_test( @@doc, "//c" ) { |child| assert_equal "c", child.name } - assert_equal 5, c - c = each_test( @@doc.root, "b//c" ) { |child| - assert_equal "c", child.name - } - assert_equal 2, c - - doc = Document.new( "" ) - # //para[1] : all descendants which are the first para child of their parent - assert_equal( 4, XPath.match( doc, "//z[1]" ).size ) - # /descendant::para[1] : the first descendant para element - assert_equal( 1, XPath.match( doc, "/descendant::z[1]" ).size ) - end - - def test_root - source = "" - doc = Document.new( source ) - assert_equal doc, doc.root_node - assert_equal "a", XPath::first( doc, "/" ).elements[1].name - end - - def test_abbreviated_simple_child - assert_equal "a", XPath::first(@@doc, "a").name - end - - def test_child - c = XPath::first( @@doc, "a/b/c" ) - assert_equal "c", c.name - assert_equal "3", XPath::first(@@doc, "a/b/c").attributes["id"] - end - - def test_root_child - assert_equal "a", XPath::first(@@doc, "/a").name - c = XPath::first( @@doc, "a/b/c" ) - assert_equal "a", XPath::first(c, "/a").name - end - - def test_root_children - c = XPath::first( @@doc, "a/b/c" ) - assert_equal "2", XPath::first(c, "/a/b").attributes["id"] - end - - def test_abbreviated_step - c = XPath::first( @@doc, "a/b/c" ) - assert_equal("c", c.name) - assert_equal("a", XPath::first(@@doc.root, ".").name) - assert_equal("b", XPath::first(c, "..").name) - assert_equal("a", XPath::first(@@doc, "a/b/..").name) - - doc = File.open(fixture_path("project.xml")) do |f| - REXML::Document.new(f) - end - c = each_test(doc.root, "./Description" ) { |child| - assert_equal("Description",child.name) - } - assert_equal 1, c - end - - # Things that aren't tested elsewhere - def test_predicates - assert_equal "12", XPath::first(@@doc, "a/e/f[3]").attributes["id"] - assert_equal "13", XPath::first(@@doc, "a/e/f[3]/g").attributes["id"] - assert_equal "14", XPath::first(@@doc, "a/e/f[@a='d'][2]").attributes["id"] - assert_equal "14", XPath::first(@@doc, "a/e/f[@a='d'][@id='14']").attributes["id"] - assert_equal "a", XPath::first( @@doc, "*[name()='a' and @id='1']" ).name - c=each_test( @@doc, "//*[name()='f' and @a='d']") { |i| - assert_equal "f", i.name - } - assert_equal 2, c - c=each_test( @@doc, "//*[name()='m' or @a='d']") { |i| - assert ["m","f"].include?(i.name) - } - assert_equal 3, c - - assert_equal "b", XPath::first( @@doc, "//b[@x]" ).name - end - - def test_node_type - doc = Document.new "text" - #res = XPath::first(doc.root, "text()") - #assert_equal "text", res.to_s - - #res = XPath::first(doc, "*") - #assert_equal "a", res.name - - assert_equal( :processing_instruction, - XPath::first(doc.root, "processing-instruction()").node_type) - assert_equal( :comment, XPath::first(doc.root, "comment()").node_type) - end - - def test_functions - # trivial text() test - # confuse-a-function - source = "more dumb text" - doc = Document.new source - res = "" - #XPath::each(doc.root, "text()") {|val| res << val.to_s} - #assert_equal "more text", res - - #res = XPath::first(doc.root, "b[last()]") - #assert_equal '3', res.attributes['id'] - res = XPath::first(doc.root, "b[position()=2]") - assert_equal '2', res.attributes['id'] - res = XPath::first(doc.root, "*[name()='c']") - assert_equal "c", res.name - end - - def no_test_ancestor - doc = REXML::Document.new(File.new(fixture_path("testsrc.xml"))) - doc.elements.each("//item") { |el| print el.name - if el.attributes['x'] - puts " -- "+el.attributes['x'] - else - puts - end - } - doc.elements.each("//item/ancestor::") { |el| print el.name - if el.attributes['x'] - puts " -- "+el.attributes['x'] - else - puts - end - } - end - - # Here are some XPath tests that were originally submitted by ... - # The code has changed some, but the logic and the source documents are the - # same. - # This method reads a document from a file, and then a series of xpaths, - # also from a file. It then checks each xpath against the source file. - def test_more - xmlsource = fixture_path("testsrc.xml") - xpathtests = fixture_path("xp.tst") - - doc = File.open(xmlsource) {|f| REXML::Document.new(f) } - #results = "" - results = REXML::Document.new - results.add_element "test-results" - File.foreach(xpathtests) do |line| - line.strip! - begin - doc.root - #puts "#"*80 - #print "\nDoing #{line} " ; $stdout.flush - doc.elements.each(line) do |el| - #print "." ; $stdout.flush - results.root << el.clone - #results << el.to_s - end - #ObjectSpace.garbage_collect - GC::start - rescue Exception => z - #puts "\n'#{line}' failed" - fail("Error on line #{line}:\n#{z.message}\n"+z.backtrace[0,10].join("\n")) - #results.root.add_element( "error", {"path"=>line}).text = z.message+"\n"+z.backtrace[0,10].join("\n") - #results << ""+z.message+"" - end - end - end - - def test_axe_descendant - assert_equal "f", XPath::first( @@doc, "descendant::f").name - end - - def test_axe_parent - q = XPath.first( @@doc, "a/d/c/parent::*/q" ) - assert_equal 19, q.attributes["id"].to_i - end - - def test_abbreviated_attribute - assert_equal 'a', XPath::first( @@doc, "a[@id='1']" ).name - c = XPath::first( @@doc, "a/b/c[@id='4']" ) - assert_equal 'c', c.name - assert_equal '4', c.attributes['id'] - - result = XPath::first( @@doc, "descendant::f[@a='c']") - assert_equal "11", result.attributes['id'] - - assert_equal "11", XPath::first(@@doc, "a/e/f[@a='c']").attributes["id"] - assert_equal "11", XPath::first(@@doc, "a/e/*[@a='c']").attributes["id"] - end - - def test_axe_self - c = XPath::first( @@doc, "a/b/c" ) - assert c - assert_equal "c", c.name - assert_equal "c", XPath::first( c, "self::node()" ).name - end - - def test_axe_ancestor - doc = REXML::Document.new " - - - - - - - - - " - - d = XPath.first( doc, "//d" ) - assert_equal "d", d.name - b = each_test( d, "ancestor::b" ) { |el| - assert((1..2) === el.attributes['id'].to_i, - "Expected #{el.attributes['id']} to be either 1 or 2" - ) - } - assert_equal 2, b - end - - def test_axe_child - m = XPath.first( @@doc, "a/child::m" ) - assert_equal 15, m.attributes['id'].to_i - end - - def test_axe_attribute - a = XPath.first( @@doc, "a/attribute::id" ) - assert_equal "1", a.value - a = XPath.first( @@doc, "a/e/f[@id='14']/attribute::a" ) - assert_equal "d", a.value - end - - def test_axe_sibling - doc = Document.new "" - first_f = XPath.first( doc, "a/e/f" ) - assert first_f - assert_equal '10', first_f.attributes['id'] - next_f = XPath.first( doc, "a/e/f/following-sibling::node()" ) - assert_equal '11', next_f.attributes['id'] - - b = XPath.first( doc, "a/e/preceding-sibling::node()" ) - assert_equal 'b', b.name - end - - def test_lang - doc = File.open(fixture_path("lang0.xml")) {|f| Document.new(f) } - #puts IO.read( "test/lang.xml" ) - - #puts XPath.match( doc, "//language/*" ).size - c = each_test( doc, "//language/*" ) { |element| - #puts "#{element.name}: #{element.text}" - } - assert_equal 4, c - end - - def test_namespaces_1 - source = <<-EOF - - this bar - that bar - - EOF - doc = Document.new source - XPath.each( doc, "//bar" ) { - fail "'bar' should match nothing in this case" - } - - namespace = {"t"=>"this"} - results = XPath.first( doc, "//t:bar", namespace ) - assert_equal "this bar", results.text - end - - def test_namespaces_2 - source = <<-EOF - - this bar - that bar - - EOF - doc = Document.new source - res = XPath::first(doc, "//*[local_name()='bar']") - assert res, "looking for //*[name()='bar']" - assert_equal 'this', res.namespace - res = XPath::first(doc.root, "*[namespace_uri()='that']") - assert_equal 'that bar', res.text - end - - def test_complex - next_f = XPath.first( @@doc, "a/e/f[@id='11']/following-sibling::*" ) - assert_equal 12, next_f.attributes['id'].to_i - prev_f = XPath.first( @@doc, "a/e/f[@id='11']/preceding-sibling::*" ) - assert_equal 10, prev_f.attributes['id'].to_i - c = each_test( @@doc, "descendant-or-self::*[@x='y']" ) - assert_equal 2, c - end - - def match(xpath) - XPath.match(@@doc, xpath).collect(&:to_s) - end - - def test_grouping - assert_equal([], - match("a/d/*[name()='d' and (name()='f' or name()='q')]")) - assert_equal([""], - match("a/d/*[(name()='d' and name()='f') or name()='q']")) - end - - def test_preceding - d = Document.new "" - start = XPath.first( d, "/a/b[@id='1']" ) - assert_equal 'b', start.name - c = XPath.first( start, "preceding::c" ) - assert_equal '2', c.attributes['id'] - - c1, c0 = XPath.match( d, "/a/b/c[@id='2']/preceding::node()" ) - assert_equal '1', c1.attributes['id'] - assert_equal '0', c0.attributes['id'] - - c2, c1, c0, b, b2, b0 = XPath.match( start, "preceding::node()" ) - - assert_equal 'c', c2.name - assert_equal 'c', c1.name - assert_equal 'c', c0.name - assert_equal 'b', b.name - assert_equal 'b', b2.name - assert_equal 'b', b0.name - - assert_equal '2', c2.attributes['id'] - assert_equal '1', c1.attributes['id'] - assert_equal '0', c0.attributes['id'] - assert b.attributes.empty? - assert_equal '2', b2.attributes['id'] - assert_equal '0', b0.attributes['id'] - - d = REXML::Document.new("") - matches = REXML::XPath.match(d, "/a/d/preceding::node()") - assert_equal("c", matches[0].name) - assert_equal("b", matches[1].name) - - s = "" - d = REXML::Document.new(s) - c = REXML::XPath.match( d, "//c[@id = '5']") - cs = REXML::XPath.match( c, "preceding::c" ) - assert_equal( 4, cs.length ) - end - - def test_following - d = Document.new "" - start = XPath.first( d, "/a/b[@id='0']" ) - assert_equal 'b', start.name - c = XPath.first( start, "following::c" ) - assert_equal '1', c.attributes['id'] - - s = "" - d = Document.new(s) - c = XPath.first(d, '/a/b/c') - assert_equal 'c', c.name - res = XPath.match( c, 'following::*' ) - assert_equal 6, res.size - res = XPath.match( c, 'following::i' ) - assert_equal 2, res.size - end - - # The following three paths were provided by - # Jeni Tennison - # a consultant who is also an XSL and XPath expert - #def test_child_cubed - # els = @@jeni.elements.to_a("*****") - # assert_equal 3, els.size - #end - - #def test_div_2 - # results = doc.elements.to_a("/ div 2") - #end - - #def test_nested_predicates - # puts @@jeni.root.elements[1].elements[1].name - # results = @@jeni.root.elements[1].elements[1].elements.to_a("../following-sibling::*[*[name() = name(current())]]") - # puts results - #end - - # Contributed by Mike Stok - def test_starts_with - source = <<-EOF - - a@b.c - http://www.foo.com - - EOF - doc = Document.new source - mailtos = doc.elements.to_a("//a[starts-with(@href, 'mailto:')]") - assert_equal 1, mailtos.size - assert_equal "mailto:a@b.c", mailtos[0].attributes['href'] - - ailtos = doc.elements.to_a("//a[starts-with(@href, 'ailto:')]") - assert_equal 0, ailtos.size - end - - def test_toms_text_node - file = "ABCDEF" - doc = Document.new(file) - assert_equal 'A', XPath.first(doc[0], 'text()').to_s - assert_equal 'AF', XPath.match(doc[0], 'text()').collect { |n| - n.to_s - }.join('') - assert_equal 'B', XPath.first(doc[0], 'b/text()').to_s - assert_equal 'D', XPath.first(doc[0], '//d/text()').to_s - assert_equal 'ABCDEF', XPath.match(doc[0], '//text()').collect {|n| - n.to_s - }.join('') - end - - def test_string_length - doc = Document.new <<-EOF - - - - - - - - - EOF - assert doc, "create doc" - - set = doc.elements.to_a("//*[string-length(name()) = 3]") - assert_equal 2, set.size, "nodes with names length = 3" - - set = doc.elements.to_a("//*[string-length(name()) < 3]") - assert_equal 2, set.size, "nodes with names length < 3" - - set = doc.elements.to_a("//*[string-length(name()) > 3]") - assert_equal 3, set.size, "nodes with names length > 3" - end - - # Test provided by Mike Stok - def test_contains - source = <<-EOF - - a@b.c - http://www.foo.com - - EOF - doc = Document.new source - - [ - #['o', 2], - ['foo', 1], ['bar', 0]].each { |search, expected| - set = doc.elements.to_a("//a[contains(@href, '#{search}')]") - assert_equal expected, set.size - } - end - - # Mike Stok and Sean Russell - def test_substring - # examples from http://www.w3.org/TR/xpath#function-substring - doc = Document.new('') - - Document.new("") - #puts XPath.first(d, 'node()[0 + 1]') - #d = Document.new("") - #puts XPath.first(d, 'a[0 mod 0]') - [ [1.5, 2.6, '234'], - [0, 3, '12'], - [0, '0 div 0', ''], - [1, '0 div 0', ''], - ['-42', '1 div 0', '12345'], - ['-1 div 0', '1 div 0', ''] - ].each { |start, length, expected| - set = doc.elements.to_a("//test[substring(@string, #{start}, #{length}) = '#{expected}']") - assert_equal 1, set.size, "#{start}, #{length}, '#{expected}'" - } - end - - def test_translate - source = <<-EOF - - - - - - - - EOF - - doc = Document.new(source) - - [ ['bar', 'abc', 'ABC', 'w3c one'], - ['--aaa--','abc-','ABC', 'w3c two'], - ['lead', 'dear language', 'doll groover', 'alchemy'], - ['A Space Odissei', 'i', 'y', 'vbxml one'], - ['abcdefg', 'aceg', 'ACE', 'vbxml two'], - ].each { |arg1, arg2, arg3, name| - translate = "translate('#{arg1}', '#{arg2}', '#{arg3}')" - set = doc.elements.to_a("//case[@result = #{translate}]") - assert_equal 1, set.size, translate - assert_equal name, set[0].attributes['name'] - } - end - - def test_math - d = Document.new( '' ) - assert XPath.first( d.root, 'node()[1]' ) - assert_equal 'b', XPath.first( d.root, 'node()[1]' ).name - assert XPath.first( d.root, 'node()[0 + 1]' ) - assert_equal 'b', XPath.first( d.root, './node()[0 + 1]' ).name - assert XPath.first( d.root, 'node()[1 + 1]' ) - assert_equal 'c', XPath.first( d.root, './node()[1 + 1]' ).name - assert XPath.first( d.root, 'node()[4 div 2]' ) - assert_equal 'c', XPath.first( d.root, './node()[4 div 2]' ).name - assert XPath.first( d.root, 'node()[2 - 1]' ) - assert_equal 'b', XPath.first( d.root, './node()[2 - 1]' ).name - assert XPath.first( d.root, 'node()[5 mod 2]' ) - assert_equal 'b', XPath.first( d.root, './node()[5 mod 2]' ).name - assert XPath.first( d.root, 'node()[8 mod 3]' ) - assert_equal 'c', XPath.first( d.root, './node()[8 mod 3]' ).name - assert XPath.first( d.root, 'node()[1 * 2]' ) - assert_equal 'c', XPath.first( d.root, './node()[1 * 2]' ).name - assert XPath.first( d.root, 'node()[2 + -1]' ) - assert_equal 'b', XPath.first( d.root, './node()[2 + -1]' ).name - end - - def test_name - assert_raise( UndefinedNamespaceException, "x should be undefined" ) { - REXML::Document.new("") - } - d = REXML::Document.new("") - assert_equal 1, d.root.elements.to_a('*[name() = "b"]').size - assert_equal 1, d.elements.to_a('//*[name() = "x:b"]').size - end - - def test_local_name - d = REXML::Document.new("") - assert_equal 2, d.root.elements.to_a('*[local_name() = "b"]').size - assert_equal 2, d.elements.to_a('//*[local_name() = "b"]').size - end - - def test_comparisons - source = "" - doc = REXML::Document.new(source) - - # NOTE TO SER: check that number() is required - assert_equal 2, REXML::XPath.match(doc, "//b[number(@id) > 1]").size - assert_equal 3, REXML::XPath.match(doc, "//b[number(@id) >= 1]").size - assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) <= 1]").size - assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) = (1 * 1)]").size - assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) = (1 mod 2)]").size - assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) = (4 div 2)]").size - end - - # Contributed by Kouhei - def test_substring_before - doc = Document.new("") - assert_equal("a", doc.root.elements.to_a("*[name()=substring-before('abc', 'b')]")[0].name) - assert_equal("c", doc.root.elements.to_a("*[name()=substring-after('abc', 'b')]")[0].name) - end - - def test_spaces - doc = Document.new(" - - - - - - - ") - match = lambda do |xpath| - REXML::XPath.match(doc, xpath).collect(&:to_s) - end - assert_equal([""], - match.call("//*[local-name()='c' and @id='b']")) - assert_equal([""], - match.call("//*[ local-name()='c' and @id='b' ]")) - assert_equal([""], - match.call("//*[ local-name() = 'c' and @id = 'b' ]")) - assert_equal(["", ""], - match.call('/a/c[@id]')) - assert_equal(["", ""], - match.call('/a/c[(@id)]')) - assert_equal(["", ""], - match.call('/a/c[ @id ]')) - assert_equal(["", ""], - match.call('/a/c[ (@id) ]')) - assert_equal(["", ""], - match.call('/a/c[( @id )]')) - assert_equal(["", ""], - match.call('/a/c[ ( @id ) ]')) - assert_equal(["", ""], - match.call('/a/c [ ( @id ) ] ')) - assert_equal(["", ""], - match.call(' / a / c [ ( @id ) ] ')) - assert_equal(["", ""], - match.call('/ a / child:: c [( @id )] /')) - end - - def test_text_nodes - # source = " - # - #test - #" - source = "test" - d = REXML::Document.new( source ) - r = REXML::XPath.match( d, %q{/root/child[text()="test"]} ) - assert_equal( 1, r.size ) - assert_equal( "child", r[0].name ) - assert_equal( "test", r[0].text ) - end - - def test_auto_string_value - source = "Introduction" - d = REXML::Document.new( source ) - #r = REXML::XPath.match( d, %q{/root[title="Introduction"]} ) - #assert_equal( 1, r.size ) - source = "test" - d = REXML::Document.new( source ) - r = REXML::XPath.match( d, %q{/a[c='test']} ) - assert_equal( 1, r.size ) - r = REXML::XPath.match( d, %q{a[c='test']} ) - assert_equal( 1, r.size ) - r = d.elements["/a[c='test']"] - assert_not_nil( r ) - r = d.elements["a[c='test']"] - assert_not_nil( r ) - r = d.elements["a[c='xtest']"] - assert_nil( r ) - r = REXML::XPath.match( d, %q{a[c='xtest']} ) - assert_equal( 0, r.size ) - end - - def test_ordering - source = <<-XML - - - - - - - - - - - XML - d = REXML::Document.new( source ) - r = REXML::XPath.match( d, %q{/a/*/*[1]} ) - assert_equal(["1", "3"], - r.collect {|element| element.attribute("id").value}) - end - - def test_descendant_or_self_ordering - source = " - - - - - - - - - - - - - - - " - d = REXML::Document.new( source ) - cs = XPath.match( d, "/descendant-or-self::c" ) - assert_equal( 4, cs.length ) - 1.upto(4) {|x| assert_equal( x.to_s, cs[x-1].attributes['id'] ) } - end - - def test_and - d = Document.new %q{} - assert_equal( nil, d.root.elements["route[@run='0']"] ) - assert_equal( nil, d.root.elements["route[@run='0' and @title='HNO']"] ) - end - - - def test_numbers - d = Document.new %q{} - - xp1 = "/a[ @x = 0 ]" - xp2 = "/a[ @x = '0' ]" - xp3 = "/a[ (@x + 1) = 1 ]" - xp4 = "/a[ @y = 0 ]" - xp5 = "/a[ (@z + 1) = 5 ]" - xp6 = "/a[ (@w + 1) = 5 ]" - xp7 = "/a[ (@v + 1) = 1 ]" - xp8 = "/a[ @n = 0 ]" - - assert_equal( 1, XPath.match( d, xp1 ).length ) - assert_equal( 1, XPath.match( d, xp2 ).length ) - assert_equal( 1, XPath.match( d, xp3 ).length ) - assert_equal( 0, XPath.match( d, xp4 ).length ) - assert_equal( 0, XPath.match( d, xp5 ).length ) - assert_equal( 0, XPath.match( d, xp6 ).length ) - assert_equal( 0, XPath.match( d, xp7 ).length ) - assert_equal( 0, XPath.match( d, xp8 ).length ) - end - - def test_tobis_preceding - doc_string = ' - - - - - -' - - doc = Document.new(doc_string) - - # e = REXML::XPath.first(doc,'/a/c/e') - e = doc.root.get_elements('/a/c/e')[0] - assert_equal( 1, e.get_elements('preceding-sibling::*').length ) - assert_equal( 2, XPath.match(e, 'preceding::*').length ) - end - - - def test_filtering - #doc=Document.new("") - #assert_equal( 3, XPath.match( doc, '/a/b/*[1]' ).length ) - #assert_equal( 2, XPath.match( doc, '/a/b/following-sibling::*[1]' ).length ) - end - - # Submitted by Alex - def test_union - data = %Q{

- - a - - b -
} - rd = REXML::Document.new( data ) - #union = rd.get_elements("/div/span | /div/em") - #assert_equal(2, union.length, "/div/span | /div/em" ) - union = rd.get_elements('//*[name()="em" or name()="strong"]') - assert_equal(2, union.length, 'name() and "or" failed') - union = rd.get_elements('//em|//strong') - assert_equal(2, union.length, - 'Both tag types are returned by XPath union operator') - end - - - def test_union2 - src = <<-EOL -
- -a - -b -
- EOL - rd = REXML::Document.new( src ) - union = rd.get_elements('//em|//strong') - assert_equal(2, union.length, - 'Both tag types are returned by XPath union operator') - end - - - def test_a_star_star_one - string = <<-EOL - - - - - - - - - - - - - - - EOL - d = REXML::Document.new( string ) - cs = XPath.match( d, '/a/*/*[1]' ) - assert_equal(["c1", "c2"], cs.collect(&:name)) - end - - def test_sum - d = Document.new(<<-XML) - - 1 - 2 - 3 - - 1 - 2 - - - - - XML - - assert_equal([6], XPath::match(d, "sum(/a/b)")) - assert_equal([9], XPath::match(d, "sum(//b | //d)")) - assert_equal([3], XPath::match(d, "sum(/a/e/@*)")) - end - - def test_xpath_namespace - d = REXML::Document.new(<<-XML) - - - xa - xb - - XML - actual = [] - d.root.each_element('tada') do |element| - actual << element.to_s - end - assert_equal(["xa", "xb"], - actual) - end - - def test_ticket_39 - doc = REXML::Document.new( <<-EOL ) - - - - true - - Item 1 - - - Item 2 - Thu, 13 Oct 2005 19:59:00 +0000 - - - Item 3 - - - - EOL - root_node = XPath.first(doc, "rss") - assert_not_nil root_node - channel_node = XPath.first(root_node, "channel") - assert_not_nil channel_node - items = XPath.match(channel_node, "*") - assert_equal 4, items.size - items = XPath.match(channel_node, "item") - assert_equal 3, items.size # fails - end - - - def test_ticket_42 - source = "" - doc = Document.new(source) - bElem = Element.new('b') - doc.root.add_element(bElem) - doc.elements.each('//b[name(..) = "a"]') { |x| - assert_equal x,bElem - } - end - - def test_ticket_56 - namespaces = {'h' => 'http://www.w3.org/1999/xhtml'} - - finaldoc = REXML::Document.new(File.read(fixture_path('google.2.xml'))) - - column_headers = [] - - REXML::XPath.each(finaldoc, '//h:form[@action="ModifyCampaign"]//h:th', - namespaces) do |el| - node = REXML::XPath.first(el, 'h:a/text()', namespaces) - column_headers << (node ? node.value : nil) - end - column_headers.map! { |h| h.to_s.strip.chomp } - expected = ["", "", "Current Status", "Current Budget", - "Clicks", "Impr.", "CTR", "Avg. CPC", "Cost", "Conv. Rate", - "Cost/Conv."] - assert_equal( expected, column_headers ) - end - - - def test_ticket_70 - string = < - - Text1, text, -text - - Text2, text, -text - - - - -EOF - doc = Document.new string - assert_equal( 1, XPath.match( doc, "//someelement[contains(@attribute,'1.10')]" ).length ) - end - - def test_ticket_43 - #url = http://news.search.yahoo.com/news/rss?p=market&ei=UTF-8&fl=0&x=wrt - - sum = File.open(fixture_path("yahoo.xml")) do |f| - Document.new(f).elements.to_a("//item").size - end - assert_equal( 10, sum ) - - text = File.open(fixture_path("yahoo.xml")) do |f| - Document.new(f).elements.to_a(%Q{//title[contains(text(), "'")]}).collect{|e| e.text}.join - end - assert_equal( "Broward labor market's a solid performer (Miami Herald)", text ) - end - - def test_ticket_57 - data = "zzz" - - r = Document.new(data) - - assert_equal(Text, REXML::XPath.first(r,"a:x/a:y[@p='p' and @q='q']/a:z/text()").class) - assert_equal("zzz", REXML::XPath.first(r,"a:x/a:y[@p='p' and @q='q']/a:z/text()").to_s) - end - - def test_ticket_59 - data = " - - - - - - - - - - - - - - - - - - - - - - - - - - - " - d = Document.new(data) - res = d.elements.to_a( "//c" ).collect {|e| e.attributes['id'].to_i} - assert_equal((1..12).to_a, res) - end - - def ticket_61_fixture(doc, xpath) - matches = [] - doc.elements.each(xpath) do |element| - matches << element - assert_equal('Add', element.text) - assert_equal('ButtonText', element.attributes['class']) - end - assert_equal(1, matches.length) - end - - def test_ticket_61_text - doc = File.open(fixture_path("ticket_61.xml")) do |file| - REXML::Document.new file - end - ticket_61_fixture( doc, "//div[text()='Add' and @class='ButtonText']" ) - end - - def test_ticket_61_contains - doc = File.open(fixture_path("ticket_61.xml")) do |file| - REXML::Document.new file - end - ticket_61_fixture( doc, "//div[contains(.,'Add') and @class='ButtonText']" ) - end - - def test_namespaces_0 - d = Document.new(%q{}) - assert_equal( 1, XPath.match( d, "//x:a" ).size ) - assert_equal( 1, XPath.match( d, "//x:*" ).size ) - end - - def test_ticket_71 - doc = Document.new(%Q{}) - el = doc.root.elements[1] - assert_equal( "element", el.name ) - el2 = XPath.first( doc.root, "element[@ns:attrname='foo']", { 'ns' => "xyz" } ) - assert_equal( el, el2 ) - end - - def test_ticket_78 - doc = <<-EOT - - - 123 - - - 123a - - - EOT - seq = %w{BEGIN 123 END BEGIN 123a END} - - xmlDoc = Document.new(doc) - - ["//element[tag='123']/tag", "//element[tag='123a']/tag"].each do |query| - assert_equal( "BEGIN", seq.shift ) - XPath.each(xmlDoc, query) { |element| - assert_equal( seq.shift, element.text ) - } - assert_equal( "END", seq.shift ) - end - end - - def test_ticket_79 - source = "test3" - d = REXML::Document.new( source ) - r = REXML::XPath.match( d, %q{/a/b[c='test']} ) - assert_equal(1, r.size()) - r = REXML::XPath.match( d, %q{/a/b[c='3']} ) - assert_equal(1, r.size()) - end - - def test_or_and - doc = " - - - test - - -

- A link. -

- - -" - - xmldoc = REXML::Document.new(doc) - xpath = "descendant::node()[(local-name()='link' or local-name()='a') and @rel='sub']" - hrefs = [] - xmldoc.elements.each(xpath) do |element| - hrefs << element.attributes["href"] - end - assert_equal(["/"], hrefs, "Bug #3842 [ruby-core:32447]") - end - end -end diff --git a/test/rexml/xpath/test_compare.rb b/test/rexml/xpath/test_compare.rb deleted file mode 100644 index bb666c9b12c328..00000000000000 --- a/test/rexml/xpath/test_compare.rb +++ /dev/null @@ -1,256 +0,0 @@ -# frozen_string_literal: false - -require_relative "../rexml_test_utils" - -require "rexml/document" - -module REXMLTests - class TestXPathCompare < Test::Unit::TestCase - def match(xml, xpath) - document = REXML::Document.new(xml) - REXML::XPath.match(document, xpath) - end - - class TestEqual < self - class TestNodeSet < self - def test_boolean_true - xml = <<-XML - - - - - - XML - assert_equal([true], - match(xml, "/root/child=true()")) - end - - def test_boolean_false - xml = <<-XML - - - - XML - assert_equal([false], - match(xml, "/root/child=true()")) - end - - def test_number_true - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([true], - match(xml, "/root/child=100")) - end - - def test_number_false - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([false], - match(xml, "/root/child=300")) - end - - def test_string_true - xml = <<-XML - - - text - string - - XML - assert_equal([true], - match(xml, "/root/child='string'")) - end - - def test_string_false - xml = <<-XML - - - text - string - - XML - assert_equal([false], - match(xml, "/root/child='nonexistent'")) - end - end - - class TestBoolean < self - def test_number_true - xml = "" - assert_equal([true], - match(xml, "true()=1")) - end - - def test_number_false - xml = "" - assert_equal([false], - match(xml, "true()=0")) - end - - def test_string_true - xml = "" - assert_equal([true], - match(xml, "true()='string'")) - end - - def test_string_false - xml = "" - assert_equal([false], - match(xml, "true()=''")) - end - end - - class TestNumber < self - def test_string_true - xml = "" - assert_equal([true], - match(xml, "1='1'")) - end - - def test_string_false - xml = "" - assert_equal([false], - match(xml, "1='2'")) - end - end - end - - class TestGreaterThan < self - class TestNodeSet < self - def test_boolean_truex - xml = <<-XML - - - - - XML - assert_equal([true], - match(xml, "/root/child>false()")) - end - - def test_boolean_false - xml = <<-XML - - - - - XML - assert_equal([false], - match(xml, "/root/child>true()")) - end - - def test_number_true - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([true], - match(xml, "/root/child>199")) - end - - def test_number_false - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([false], - match(xml, "/root/child>200")) - end - - def test_string_true - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([true], - match(xml, "/root/child>'199'")) - end - - def test_string_false - xml = <<-XML - - - 100 - 200 - - XML - assert_equal([false], - match(xml, "/root/child>'200'")) - end - end - - class TestBoolean < self - def test_string_true - xml = "" - assert_equal([true], - match(xml, "true()>'0'")) - end - - def test_string_false - xml = "" - assert_equal([false], - match(xml, "true()>'1'")) - end - end - - class TestNumber < self - def test_boolean_true - xml = "" - assert_equal([true], - match(xml, "true()>0")) - end - - def test_number_false - xml = "" - assert_equal([false], - match(xml, "true()>1")) - end - - def test_string_true - xml = "" - assert_equal([true], - match(xml, "1>'0'")) - end - - def test_string_false - xml = "" - assert_equal([false], - match(xml, "1>'1'")) - end - end - - class TestString < self - def test_string_true - xml = "" - assert_equal([true], - match(xml, "'1'>'0'")) - end - - def test_string_false - xml = "" - assert_equal([false], - match(xml, "'1'>'1'")) - end - end - end - end -end diff --git a/test/rexml/xpath/test_node.rb b/test/rexml/xpath/test_node.rb deleted file mode 100644 index e0e958e70fa159..00000000000000 --- a/test/rexml/xpath/test_node.rb +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -# frozen_string_literal: false - -require_relative "../rexml_test_utils" - -require "rexml/document" - -module REXMLTests - class TestXPathNode < Test::Unit::TestCase - def matches(xml, xpath) - document = REXML::Document.new(xml) - REXML::XPath.each(document, xpath).collect(&:to_s) - end - - class TestQName < self - def test_ascii - xml = <<-XML - - - - child - - - XML - assert_equal(["child"], - matches(xml, "/root/ascii/child")) - end - - def test_non_ascii - xml = <<-XML - - - - child - - - XML - assert_equal(["child"], - matches(xml, "/root/non-àscii/child")) - end - end - end -end diff --git a/test/rexml/xpath/test_predicate.rb b/test/rexml/xpath/test_predicate.rb deleted file mode 100644 index ce1aaa324bcd05..00000000000000 --- a/test/rexml/xpath/test_predicate.rb +++ /dev/null @@ -1,83 +0,0 @@ -# frozen_string_literal: false -require "test/unit/testcase" -require "rexml/document" -require "rexml/xpath" -require "rexml/parsers/xpathparser" - -module REXMLTests - class TestXPathPredicate < Test::Unit::TestCase - include REXML - SRC=<<-EOL -
-
- free flowing text. -
-
-
- free flowing text. -
-
- free flowing text. -
-
-
- EOL - - def setup - @doc = REXML::Document.new( SRC ) - @parser = REXML::Parsers::XPathParser.new - - end - - def test_predicates_parent - path = '//section[../self::section[@role="division"]]' - m = do_path( path ) - assert_equal( 2, m.size ) - assert_equal( "2", m[0].attributes["id"] ) - assert_nil( m[1].attributes["id"] ) - end - - def test_predicates_single - path = '//section[@role="subdivision" and not(../self::section[@role="division"])]' - m = do_path( path ) - assert_equal( 1, m.size ) - assert_equal( "1", m[0].attributes["id"] ) - end - - def test_predicates_multi - path = '//section[@role="subdivision"][not(../self::section[@role="division"])]' - m = do_path( path ) - assert_equal( 1, m.size ) - assert_equal( "1", m[0].attributes["id"] ) - end - - def do_path( path ) - m = REXML::XPath.match( @doc, path ) - #puts path, @parser.parse( path ).inspect - return m - end - - def test_get_no_siblings_terminal_nodes - source = <<-XML - - TEXT1 - - - - TEXT2 - - - -XML - doc = REXML::Document.new(source) - predicate = "count(child::node()|" + - "following-sibling::node()|" + - "preceding-sibling::node())=0" - m = REXML::XPath.match(doc, "/descendant-or-self::node()[#{predicate}]") - assert_equal( [REXML::Text.new("TEXT1"), - REXML::Text.new("TEXT2"), - REXML::Comment.new("COMMENT")], - m ) - end - end -end diff --git a/test/rexml/xpath/test_text.rb b/test/rexml/xpath/test_text.rb deleted file mode 100644 index 7222388e1bb74d..00000000000000 --- a/test/rexml/xpath/test_text.rb +++ /dev/null @@ -1,77 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'rexml/document' -require 'rexml/element' -require 'rexml/xpath' - -module REXMLTests - class TestXPathText < Test::Unit::TestCase - def setup - @doc = REXML::Document.new - end - - def tear_down - end - - def test_text_as_element - node1 = REXML::Element.new('a', @doc) - node2 = REXML::Element.new('b', node1) - REXML::Text.new('test', false, node2) - assert_equal(1, @doc.elements.size, "doc owns 1 element node1") - assert_same(node1, @doc.elements[1], "doc owns 1 element node1") - assert_equal(1, node1.elements.size, "node1 owns 1 element node2") - assert_same(node2, node1.elements[1], "node1 owns 1 element node2") - assert_equal(1, node2.size, "node2 owns 1 text element") - end - - def test_text_in_xpath_query - node1 = REXML::Element.new('a', @doc) - node2 = REXML::Element.new('b', node1) - textnode = REXML::Text.new('test', false, node2) - textnode.parent = node2 # should be unnecessary - nodes = @doc.get_elements('//b') - assert_equal(1, nodes.size, "document has one element") - # why doesn't this query work right? - nodes = REXML::XPath.match(@doc, '//text()') - assert_equal(1, nodes.size, "//text() should yield one Text element") - assert_equal(REXML::Text, nodes[0].class) - end - - def test_comment_in_xpath_query - node1 = REXML::Element.new('a', @doc) - node2 = REXML::Element.new('b', node1) - commentnode = REXML::Comment.new('test', node2) - nodes = REXML::XPath.match(@doc, '//comment()') - assert_equal(1, nodes.size, "//comment() should yield one Comment element") - assert_same commentnode, nodes[0] - end - - def test_parentage - node1 = REXML::Element.new('a', @doc) - assert_same(@doc, node1.parent, "node1 parent is document") - node2 = REXML::Element.new('b', node1) - assert_same(node1, node2.parent, "node2 parent is node1") - textnode = REXML::Text.new('test', false, node2) - # why isn't the text's parent node2? - # Also look at Comment, etc. - assert_same(node2, textnode.parent) - comment = REXML::Comment.new('Test comment', node2) - assert_same(node2, comment.parent) - end - - def test_ancestors - node1 = REXML::Element.new('a', @doc) - node2 = REXML::Element.new('b', node1) - textnode = REXML::Text.new('test', false, node2) - #textnode.parent = node2 # should be unnecessary - assert_same node2, textnode.parent - nodes = @doc.get_elements('//b/ancestor::*') - assert_equal(1, nodes.size, " has one element ancestor") - nodes = @doc.get_elements('//b/ancestor::node()') - assert_equal(2, nodes.size, " has two node ancestors") - nodes.sort_by!(&:name) - assert_kind_of REXML::Document, nodes[0] - assert_kind_of REXML::Element, nodes[1] - end - end -end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index c206017ae24ac8..a4725671942645 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -25,7 +25,6 @@ # * https://github.com/ruby/prime # * https://github.com/ruby/matrix # * https://github.com/ruby/ostruct -# * https://github.com/ruby/rexml # * https://github.com/ruby/rss # * https://github.com/ruby/irb # * https://github.com/ruby/tracer @@ -80,7 +79,6 @@ prime: 'ruby/prime', matrix: 'ruby/matrix', ostruct: 'ruby/ostruct', - rexml: 'ruby/rexml', rss: 'ruby/rss', irb: 'ruby/irb', tracer: 'ruby/tracer', From 83240f315a10b42b53c3b62c1fbc428f97912665 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 11 Jan 2020 21:48:06 +0900 Subject: [PATCH 363/878] Make rss library to the bundle gems [Feature #16485][ruby-core:96683] --- doc/maintainers.rdoc | 6 +- doc/standard_library.rdoc | 2 +- gems/bundled_gems | 1 + lib/rss/0.9.rb | 462 ----- lib/rss/1.0.rb | 485 ------ lib/rss/2.0.rb | 143 -- lib/rss/atom.rb | 1025 ----------- lib/rss/content.rb | 34 - lib/rss/content/1.0.rb | 10 - lib/rss/content/2.0.rb | 12 - lib/rss/converter.rb | 171 -- lib/rss/dublincore.rb | 164 -- lib/rss/dublincore/1.0.rb | 13 - lib/rss/dublincore/2.0.rb | 13 - lib/rss/dublincore/atom.rb | 17 - lib/rss/image.rb | 198 --- lib/rss/itunes.rb | 425 ----- lib/rss/maker.rb | 79 - lib/rss/maker/0.9.rb | 509 ------ lib/rss/maker/1.0.rb | 436 ----- lib/rss/maker/2.0.rb | 224 --- lib/rss/maker/atom.rb | 173 -- lib/rss/maker/base.rb | 945 ---------- lib/rss/maker/content.rb | 22 - lib/rss/maker/dublincore.rb | 122 -- lib/rss/maker/entry.rb | 164 -- lib/rss/maker/feed.rb | 427 ----- lib/rss/maker/image.rb | 112 -- lib/rss/maker/itunes.rb | 243 --- lib/rss/maker/slash.rb | 34 - lib/rss/maker/syndication.rb | 19 - lib/rss/maker/taxonomy.rb | 119 -- lib/rss/maker/trackback.rb | 62 - lib/rss/parser.rb | 589 ------- lib/rss/rexmlparser.rb | 50 - lib/rss/rss.gemspec | 80 - lib/rss/rss.rb | 1342 -------------- lib/rss/slash.rb | 52 - lib/rss/syndication.rb | 69 - lib/rss/taxonomy.rb | 148 -- lib/rss/trackback.rb | 291 ---- lib/rss/utils.rb | 200 --- lib/rss/version.rb | 4 - lib/rss/xml-stylesheet.rb | 106 -- lib/rss/xml.rb | 72 - lib/rss/xmlparser.rb | 95 - lib/rss/xmlscanner.rb | 122 -- test/rss/dot.png | Bin 111 -> 0 bytes test/rss/rss-assertions.rb | 2120 ----------------------- test/rss/rss-testcase.rb | 479 ----- test/rss/test_1.0.rb | 308 ---- test/rss/test_2.0.rb | 412 ----- test/rss/test_accessor.rb | 104 -- test/rss/test_atom.rb | 684 -------- test/rss/test_content.rb | 105 -- test/rss/test_dublincore.rb | 270 --- test/rss/test_image.rb | 215 --- test/rss/test_inherit.rb | 41 - test/rss/test_itunes.rb | 356 ---- test/rss/test_maker_0.9.rb | 477 ----- test/rss/test_maker_1.0.rb | 519 ------ test/rss/test_maker_2.0.rb | 758 -------- test/rss/test_maker_atom_entry.rb | 394 ----- test/rss/test_maker_atom_feed.rb | 455 ----- test/rss/test_maker_content.rb | 48 - test/rss/test_maker_dc.rb | 150 -- test/rss/test_maker_image.rb | 63 - test/rss/test_maker_itunes.rb | 487 ------ test/rss/test_maker_slash.rb | 38 - test/rss/test_maker_sy.rb | 45 - test/rss/test_maker_taxo.rb | 82 - test/rss/test_maker_trackback.rb | 42 - test/rss/test_maker_xml-stylesheet.rb | 84 - test/rss/test_parser.rb | 121 -- test/rss/test_parser_1.0.rb | 529 ------ test/rss/test_parser_2.0.rb | 123 -- test/rss/test_parser_atom_entry.rb | 164 -- test/rss/test_parser_atom_feed.rb | 277 --- test/rss/test_setup_maker_0.9.rb | 247 --- test/rss/test_setup_maker_1.0.rb | 551 ------ test/rss/test_setup_maker_2.0.rb | 309 ---- test/rss/test_setup_maker_atom_entry.rb | 410 ----- test/rss/test_setup_maker_atom_feed.rb | 446 ----- test/rss/test_setup_maker_itunes.rb | 144 -- test/rss/test_setup_maker_slash.rb | 39 - test/rss/test_slash.rb | 65 - test/rss/test_syndication.rb | 126 -- test/rss/test_taxonomy.rb | 173 -- test/rss/test_to_s.rb | 701 -------- test/rss/test_trackback.rb | 136 -- test/rss/test_xml-stylesheet.rb | 109 -- tool/sync_default_gems.rb | 4 +- 92 files changed, 5 insertions(+), 23496 deletions(-) delete mode 100644 lib/rss/0.9.rb delete mode 100644 lib/rss/1.0.rb delete mode 100644 lib/rss/2.0.rb delete mode 100644 lib/rss/atom.rb delete mode 100644 lib/rss/content.rb delete mode 100644 lib/rss/content/1.0.rb delete mode 100644 lib/rss/content/2.0.rb delete mode 100644 lib/rss/converter.rb delete mode 100644 lib/rss/dublincore.rb delete mode 100644 lib/rss/dublincore/1.0.rb delete mode 100644 lib/rss/dublincore/2.0.rb delete mode 100644 lib/rss/dublincore/atom.rb delete mode 100644 lib/rss/image.rb delete mode 100644 lib/rss/itunes.rb delete mode 100644 lib/rss/maker.rb delete mode 100644 lib/rss/maker/0.9.rb delete mode 100644 lib/rss/maker/1.0.rb delete mode 100644 lib/rss/maker/2.0.rb delete mode 100644 lib/rss/maker/atom.rb delete mode 100644 lib/rss/maker/base.rb delete mode 100644 lib/rss/maker/content.rb delete mode 100644 lib/rss/maker/dublincore.rb delete mode 100644 lib/rss/maker/entry.rb delete mode 100644 lib/rss/maker/feed.rb delete mode 100644 lib/rss/maker/image.rb delete mode 100644 lib/rss/maker/itunes.rb delete mode 100644 lib/rss/maker/slash.rb delete mode 100644 lib/rss/maker/syndication.rb delete mode 100644 lib/rss/maker/taxonomy.rb delete mode 100644 lib/rss/maker/trackback.rb delete mode 100644 lib/rss/parser.rb delete mode 100644 lib/rss/rexmlparser.rb delete mode 100644 lib/rss/rss.gemspec delete mode 100644 lib/rss/rss.rb delete mode 100644 lib/rss/slash.rb delete mode 100644 lib/rss/syndication.rb delete mode 100644 lib/rss/taxonomy.rb delete mode 100644 lib/rss/trackback.rb delete mode 100644 lib/rss/utils.rb delete mode 100644 lib/rss/version.rb delete mode 100644 lib/rss/xml-stylesheet.rb delete mode 100644 lib/rss/xml.rb delete mode 100644 lib/rss/xmlparser.rb delete mode 100644 lib/rss/xmlscanner.rb delete mode 100644 test/rss/dot.png delete mode 100644 test/rss/rss-assertions.rb delete mode 100644 test/rss/rss-testcase.rb delete mode 100644 test/rss/test_1.0.rb delete mode 100644 test/rss/test_2.0.rb delete mode 100644 test/rss/test_accessor.rb delete mode 100644 test/rss/test_atom.rb delete mode 100644 test/rss/test_content.rb delete mode 100644 test/rss/test_dublincore.rb delete mode 100644 test/rss/test_image.rb delete mode 100644 test/rss/test_inherit.rb delete mode 100644 test/rss/test_itunes.rb delete mode 100644 test/rss/test_maker_0.9.rb delete mode 100644 test/rss/test_maker_1.0.rb delete mode 100644 test/rss/test_maker_2.0.rb delete mode 100644 test/rss/test_maker_atom_entry.rb delete mode 100644 test/rss/test_maker_atom_feed.rb delete mode 100644 test/rss/test_maker_content.rb delete mode 100644 test/rss/test_maker_dc.rb delete mode 100644 test/rss/test_maker_image.rb delete mode 100644 test/rss/test_maker_itunes.rb delete mode 100644 test/rss/test_maker_slash.rb delete mode 100644 test/rss/test_maker_sy.rb delete mode 100644 test/rss/test_maker_taxo.rb delete mode 100644 test/rss/test_maker_trackback.rb delete mode 100644 test/rss/test_maker_xml-stylesheet.rb delete mode 100644 test/rss/test_parser.rb delete mode 100644 test/rss/test_parser_1.0.rb delete mode 100644 test/rss/test_parser_2.0.rb delete mode 100644 test/rss/test_parser_atom_entry.rb delete mode 100644 test/rss/test_parser_atom_feed.rb delete mode 100644 test/rss/test_setup_maker_0.9.rb delete mode 100644 test/rss/test_setup_maker_1.0.rb delete mode 100644 test/rss/test_setup_maker_2.0.rb delete mode 100644 test/rss/test_setup_maker_atom_entry.rb delete mode 100644 test/rss/test_setup_maker_atom_feed.rb delete mode 100644 test/rss/test_setup_maker_itunes.rb delete mode 100644 test/rss/test_setup_maker_slash.rb delete mode 100644 test/rss/test_slash.rb delete mode 100644 test/rss/test_syndication.rb delete mode 100644 test/rss/test_taxonomy.rb delete mode 100644 test/rss/test_to_s.rb delete mode 100644 test/rss/test_trackback.rb delete mode 100644 test/rss/test_xml-stylesheet.rb diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index c8b4f9af20b99f..87221bb8f9f754 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -239,10 +239,6 @@ Zachary Scott (zzak) aycabta https://github.com/ruby/reline https://rubygems.org/gems/reline -[lib/rss.rb, lib/rss/*] - Kouhei Sutou (kou) - https://github.com/ruby/rss - https://rubygems.org/gems/rss [lib/singleton.rb] Yukihiro Matsumoto (matz) https://github.com/ruby/singleton @@ -355,3 +351,5 @@ Zachary Scott (zzak) https://github.com/ruby/xmlrpc [rexml] https://github.com/ruby/rexml +[rss] + https://github.com/ruby/rss diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 82dda4b532f814..c9f72a13c56ed1 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -80,7 +80,6 @@ Prime:: Prime numbers and factorization library PStore:: Implements a file based persistence mechanism based on a Hash Racc:: A LALR(1) parser generator written in Ruby. RDoc:: Produces HTML and command-line documentation for Ruby -RSS:: Family of libraries that support various formats of XML "feeds" Singleton:: Implementation of the Singleton pattern for Ruby Timeout:: Auto-terminate potentially long-running operations in Ruby Tracer:: Outputs a source level execution trace of a Ruby program @@ -119,3 +118,4 @@ Rake:: Ruby build program with capabilities similar to make Test::Unit:: A compatibility layer for MiniTest XMLRPC:: Remote Procedure Call over HTTP support for Ruby REXML:: An XML toolkit for Ruby +RSS:: Family of libraries that support various formats of XML "feeds" diff --git a/gems/bundled_gems b/gems/bundled_gems index 635ff1d1c6dfc1..065a6241d29baf 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -5,3 +5,4 @@ rake 13.0.1 https://github.com/ruby/rake test-unit 3.3.4 https://github.com/test-unit/test-unit xmlrpc 0.3.0 https://github.com/ruby/xmlrpc rexml 3.2.3 https://github.com/ruby/rexml +rss 0.2.8 https://github.com/ruby/rss diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb deleted file mode 100644 index 219ccefcdbc28b..00000000000000 --- a/lib/rss/0.9.rb +++ /dev/null @@ -1,462 +0,0 @@ -# frozen_string_literal: false -require_relative "parser" - -module RSS - - ## - # = RSS 0.9 support - # - # RSS has three different versions. This module contains support for version - # 0.9.1[http://www.rssboard.org/rss-0-9-1-netscape]. - # - # == Producing RSS 0.9 - # - # Producing our own RSS feeds is easy as well. Let's make a very basic feed: - # - # require "rss" - # - # rss = RSS::Maker.make("0.91") do |maker| - # maker.channel.language = "en" - # maker.channel.author = "matz" - # maker.channel.updated = Time.now.to_s - # maker.channel.link = "http://www.ruby-lang.org/en/feeds/news.rss" - # maker.channel.title = "Example Feed" - # maker.channel.description = "A longer description of my feed." - # maker.image.url = "http://www.ruby-lang.org/images/logo.gif" - # maker.image.title = "An image" - # maker.items.new_item do |item| - # item.link = "http://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/" - # item.title = "Ruby 1.9.2-p136 is released" - # item.updated = Time.now.to_s - # end - # end - # - # puts rss - # - # As you can see, this is a very Builder-like DSL. This code will spit out an - # RSS 0.9 feed with one item. If we needed a second item, we'd make another - # block with maker.items.new_item and build a second one. - module RSS09 - NSPOOL = {} - ELEMENTS = [] - - def self.append_features(klass) - super - - klass.install_must_call_validator('', "") - end - end - - class Rss < Element - - include RSS09 - include RootElementMixin - - %w(channel).each do |name| - install_have_child_element(name, "", nil) - end - - attr_writer :feed_version - alias_method(:rss_version, :feed_version) - alias_method(:rss_version=, :feed_version=) - - def initialize(feed_version, version=nil, encoding=nil, standalone=nil) - super - @feed_type = "rss" - end - - def items - if @channel - @channel.items - else - [] - end - end - - def image - if @channel - @channel.image - else - nil - end - end - - def textinput - if @channel - @channel.textInput - else - nil - end - end - - def setup_maker_elements(maker) - super - items.each do |item| - item.setup_maker(maker.items) - end - image.setup_maker(maker) if image - textinput.setup_maker(maker) if textinput - end - - private - def _attrs - [ - ["version", true, "feed_version"], - ] - end - - class Channel < Element - - include RSS09 - - [ - ["title", nil, :text], - ["link", nil, :text], - ["description", nil, :text], - ["language", nil, :text], - ["copyright", "?", :text], - ["managingEditor", "?", :text], - ["webMaster", "?", :text], - ["rating", "?", :text], - ["pubDate", "?", :date, :rfc822], - ["lastBuildDate", "?", :date, :rfc822], - ["docs", "?", :text], - ["cloud", "?", :have_attribute], - ["skipDays", "?", :have_child], - ["skipHours", "?", :have_child], - ["image", nil, :have_child], - ["item", "*", :have_children], - ["textInput", "?", :have_child], - ].each do |name, occurs, type, *args| - __send__("install_#{type}_element", name, "", occurs, name, *args) - end - alias date pubDate - alias date= pubDate= - - private - def maker_target(maker) - maker.channel - end - - def setup_maker_elements(channel) - super - [ - [skipDays, "day"], - [skipHours, "hour"], - ].each do |skip, key| - if skip - skip.__send__("#{key}s").each do |val| - target_skips = channel.__send__("skip#{key.capitalize}s") - new_target = target_skips.__send__("new_#{key}") - new_target.content = val.content - end - end - end - end - - def not_need_to_call_setup_maker_variables - %w(image textInput) - end - - class SkipDays < Element - include RSS09 - - [ - ["day", "*"] - ].each do |name, occurs| - install_have_children_element(name, "", occurs) - end - - class Day < Element - include RSS09 - - content_setup - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.content = args[0] - end - end - - end - - end - - class SkipHours < Element - include RSS09 - - [ - ["hour", "*"] - ].each do |name, occurs| - install_have_children_element(name, "", occurs) - end - - class Hour < Element - include RSS09 - - content_setup(:integer) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.content = args[0] - end - end - end - - end - - class Image < Element - - include RSS09 - - %w(url title link).each do |name| - install_text_element(name, "", nil) - end - [ - ["width", :integer], - ["height", :integer], - ["description"], - ].each do |name, type| - install_text_element(name, "", "?", name, type) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.url = args[0] - self.title = args[1] - self.link = args[2] - self.width = args[3] - self.height = args[4] - self.description = args[5] - end - end - - private - def maker_target(maker) - maker.image - end - end - - class Cloud < Element - - include RSS09 - - [ - ["domain", "", true], - ["port", "", true, :integer], - ["path", "", true], - ["registerProcedure", "", true], - ["protocol", "", true], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.domain = args[0] - self.port = args[1] - self.path = args[2] - self.registerProcedure = args[3] - self.protocol = args[4] - end - end - end - - class Item < Element - - include RSS09 - - [ - ["title", '?', :text], - ["link", '?', :text], - ["description", '?', :text], - ["category", '*', :have_children, "categories"], - ["source", '?', :have_child], - ["enclosure", '?', :have_child], - ].each do |tag, occurs, type, *args| - __send__("install_#{type}_element", tag, "", occurs, tag, *args) - end - - private - def maker_target(items) - if items.respond_to?("items") - # For backward compatibility - items = items.items - end - items.new_item - end - - def setup_maker_element(item) - super - @enclosure.setup_maker(item) if @enclosure - @source.setup_maker(item) if @source - end - - class Source < Element - - include RSS09 - - [ - ["url", "", true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required) - end - - content_setup - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.url = args[0] - self.content = args[1] - end - end - - private - def maker_target(item) - item.source - end - - def setup_maker_attributes(source) - source.url = url - source.content = content - end - end - - class Enclosure < Element - - include RSS09 - - [ - ["url", "", true], - ["length", "", true, :integer], - ["type", "", true], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.url = args[0] - self.length = args[1] - self.type = args[2] - end - end - - private - def maker_target(item) - item.enclosure - end - - def setup_maker_attributes(enclosure) - enclosure.url = url - enclosure.length = length - enclosure.type = type - end - end - - class Category < Element - - include RSS09 - - [ - ["domain", "", false] - ].each do |name, uri, required| - install_get_attribute(name, uri, required) - end - - content_setup - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.domain = args[0] - self.content = args[1] - end - end - - private - def maker_target(item) - item.new_category - end - - def setup_maker_attributes(category) - category.domain = domain - category.content = content - end - - end - - end - - class TextInput < Element - - include RSS09 - - %w(title description name link).each do |name| - install_text_element(name, "", nil) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.title = args[0] - self.description = args[1] - self.name = args[2] - self.link = args[3] - end - end - - private - def maker_target(maker) - maker.textinput - end - end - - end - - end - - RSS09::ELEMENTS.each do |name| - BaseListener.install_get_text_element("", name, name) - end - - module ListenerMixin - private - def initial_start_rss(tag_name, prefix, attrs, ns) - check_ns(tag_name, prefix, ns, "", false) - - @rss = Rss.new(attrs['version'], @version, @encoding, @standalone) - @rss.do_validate = @do_validate - @rss.xml_stylesheets = @xml_stylesheets - @last_element = @rss - pr = Proc.new do |text, tags| - @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate - end - @proc_stack.push(pr) - end - - end - -end diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb deleted file mode 100644 index c8f92fb54ef476..00000000000000 --- a/lib/rss/1.0.rb +++ /dev/null @@ -1,485 +0,0 @@ -# frozen_string_literal: false -require_relative "parser" - -module RSS - - ## - # = RSS 1.0 support - # - # RSS has three different versions. This module contains support for version - # 1.0[http://web.resource.org/rss/1.0/] - # - # == Producing RSS 1.0 - # - # Producing our own RSS feeds is easy as well. Let's make a very basic feed: - # - # require "rss" - # - # rss = RSS::Maker.make("1.0") do |maker| - # maker.channel.language = "en" - # maker.channel.author = "matz" - # maker.channel.about = "About my feed." - # maker.channel.updated = Time.now.to_s - # maker.channel.link = "http://www.ruby-lang.org/en/feeds/news.rss" - # maker.channel.title = "Example Feed" - # maker.channel.description = "A longer description of my feed." - # maker.items.new_item do |item| - # item.link = "http://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/" - # item.title = "Ruby 1.9.2-p136 is released" - # item.updated = Time.now.to_s - # end - # end - # - # puts rss - # - # As you can see, this is a very Builder-like DSL. This code will spit out an - # RSS 1.0 feed with one item. If we needed a second item, we'd make another - # block with maker.items.new_item and build a second one. - module RSS10 - NSPOOL = {} - ELEMENTS = [] - - def self.append_features(klass) - super - - klass.install_must_call_validator('', ::RSS::URI) - end - - end - - class RDF < Element - - include RSS10 - include RootElementMixin - - class << self - - def required_uri - URI - end - - end - - @tag_name = 'RDF' - - PREFIX = 'rdf' - URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" - - install_ns('', ::RSS::URI) - install_ns(PREFIX, URI) - - [ - ["channel", nil], - ["image", "?"], - ["item", "+", :children], - ["textinput", "?"], - ].each do |tag, occurs, type| - type ||= :child - __send__("install_have_#{type}_element", tag, ::RSS::URI, occurs) - end - - alias_method(:rss_version, :feed_version) - def initialize(version=nil, encoding=nil, standalone=nil) - super('1.0', version, encoding, standalone) - @feed_type = "rss" - end - - def full_name - tag_name_with_prefix(PREFIX) - end - - class Li < Element - - include RSS10 - - class << self - def required_uri - URI - end - end - - [ - ["resource", [URI, ""], true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.resource = args[0] - end - end - - def full_name - tag_name_with_prefix(PREFIX) - end - end - - class Seq < Element - - include RSS10 - - Li = ::RSS::RDF::Li - - class << self - def required_uri - URI - end - end - - @tag_name = 'Seq' - - install_have_children_element("li", URI, "*") - install_must_call_validator('rdf', ::RSS::RDF::URI) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - @li = args[0] if args[0] - end - end - - def full_name - tag_name_with_prefix(PREFIX) - end - - def setup_maker(target) - lis.each do |li| - target << li.resource - end - end - end - - class Bag < Element - - include RSS10 - - Li = ::RSS::RDF::Li - - class << self - def required_uri - URI - end - end - - @tag_name = 'Bag' - - install_have_children_element("li", URI, "*") - install_must_call_validator('rdf', URI) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - @li = args[0] if args[0] - end - end - - def full_name - tag_name_with_prefix(PREFIX) - end - - def setup_maker(target) - lis.each do |li| - target << li.resource - end - end - end - - class Channel < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - [ - ["about", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - [ - ['title', nil, :text], - ['link', nil, :text], - ['description', nil, :text], - ['image', '?', :have_child], - ['items', nil, :have_child], - ['textinput', '?', :have_child], - ].each do |tag, occurs, type| - __send__("install_#{type}_element", tag, ::RSS::URI, occurs) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - end - end - - private - def maker_target(maker) - maker.channel - end - - def setup_maker_attributes(channel) - channel.about = about - end - - class Image < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - [ - ["resource", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.resource = args[0] - end - end - end - - class Textinput < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - [ - ["resource", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.resource = args[0] - end - end - end - - class Items < Element - - include RSS10 - - Seq = ::RSS::RDF::Seq - - class << self - - def required_uri - ::RSS::URI - end - - end - - install_have_child_element("Seq", URI, nil) - install_must_call_validator('rdf', URI) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.Seq = args[0] - end - self.Seq ||= Seq.new - end - - def resources - if @Seq - @Seq.lis.collect do |li| - li.resource - end - else - [] - end - end - end - end - - class Image < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - [ - ["about", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - %w(title url link).each do |name| - install_text_element(name, ::RSS::URI, nil) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - end - end - - private - def maker_target(maker) - maker.image - end - end - - class Item < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - - [ - ["about", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - [ - ["title", nil], - ["link", nil], - ["description", "?"], - ].each do |tag, occurs| - install_text_element(tag, ::RSS::URI, occurs) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - end - end - - private - def maker_target(items) - if items.respond_to?("items") - # For backward compatibility - items = items.items - end - items.new_item - end - end - - class Textinput < Element - - include RSS10 - - class << self - - def required_uri - ::RSS::URI - end - - end - - [ - ["about", URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{PREFIX}:#{name}") - end - - %w(title description name link).each do |name| - install_text_element(name, ::RSS::URI, nil) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - end - end - - private - def maker_target(maker) - maker.textinput - end - end - - end - - RSS10::ELEMENTS.each do |name| - BaseListener.install_get_text_element(URI, name, name) - end - - module ListenerMixin - private - def initial_start_RDF(tag_name, prefix, attrs, ns) - check_ns(tag_name, prefix, ns, RDF::URI, false) - - @rss = RDF.new(@version, @encoding, @standalone) - @rss.do_validate = @do_validate - @rss.xml_stylesheets = @xml_stylesheets - @last_element = @rss - pr = Proc.new do |text, tags| - @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate - end - @proc_stack.push(pr) - end - end - -end diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb deleted file mode 100644 index 13f9ade918a2f4..00000000000000 --- a/lib/rss/2.0.rb +++ /dev/null @@ -1,143 +0,0 @@ -# frozen_string_literal: false -require "rss/0.9" - -module RSS - - ## - # = RSS 2.0 support - # - # RSS has three different versions. This module contains support for version - # 2.0[http://www.rssboard.org/rss-specification] - # - # == Producing RSS 2.0 - # - # Producing our own RSS feeds is easy as well. Let's make a very basic feed: - # - # require "rss" - # - # rss = RSS::Maker.make("2.0") do |maker| - # maker.channel.language = "en" - # maker.channel.author = "matz" - # maker.channel.updated = Time.now.to_s - # maker.channel.link = "http://www.ruby-lang.org/en/feeds/news.rss" - # maker.channel.title = "Example Feed" - # maker.channel.description = "A longer description of my feed." - # maker.items.new_item do |item| - # item.link = "http://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/" - # item.title = "Ruby 1.9.2-p136 is released" - # item.updated = Time.now.to_s - # end - # end - # - # puts rss - # - # As you can see, this is a very Builder-like DSL. This code will spit out an - # RSS 2.0 feed with one item. If we needed a second item, we'd make another - # block with maker.items.new_item and build a second one. - class Rss - - class Channel - - [ - ["generator"], - ["ttl", :integer], - ].each do |name, type| - install_text_element(name, "", "?", name, type) - end - - [ - %w(category categories), - ].each do |name, plural_name| - install_have_children_element(name, "", "*", name, plural_name) - end - - [ - ["image", "?"], - ["language", "?"], - ].each do |name, occurs| - install_model(name, "", occurs) - end - - Category = Item::Category - - class Item - - [ - ["comments", "?"], - ["author", "?"], - ].each do |name, occurs| - install_text_element(name, "", occurs) - end - - [ - ["pubDate", '?'], - ].each do |name, occurs| - install_date_element(name, "", occurs, name, 'rfc822') - end - alias date pubDate - alias date= pubDate= - - [ - ["guid", '?'], - ].each do |name, occurs| - install_have_child_element(name, "", occurs) - end - - private - alias _setup_maker_element setup_maker_element - def setup_maker_element(item) - _setup_maker_element(item) - @guid.setup_maker(item) if @guid - end - - class Guid < Element - - include RSS09 - - [ - ["isPermaLink", "", false, :boolean] - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - content_setup - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.isPermaLink = args[0] - self.content = args[1] - end - end - - alias_method :_PermaLink?, :PermaLink? - private :_PermaLink? - def PermaLink? - perma = _PermaLink? - perma or perma.nil? - end - - private - def maker_target(item) - item.guid - end - - def setup_maker_attributes(guid) - guid.isPermaLink = isPermaLink - guid.content = content - end - end - - end - - end - - end - - RSS09::ELEMENTS.each do |name| - BaseListener.install_get_text_element("", name, name) - end - -end diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb deleted file mode 100644 index 48c27330d0b8f2..00000000000000 --- a/lib/rss/atom.rb +++ /dev/null @@ -1,1025 +0,0 @@ -# frozen_string_literal: false -require_relative 'parser' - -module RSS - ## - # Atom is an XML-based document format that is used to describe 'feeds' of related information. - # A typical use is in a news feed where the information is periodically updated and which users - # can subscribe to. The Atom format is described in http://tools.ietf.org/html/rfc4287 - # - # The Atom module provides support in reading and creating feeds. - # - # See the RSS module for examples consuming and creating feeds. - module Atom - - ## - # The Atom URI W3C Namespace - - URI = "http://www.w3.org/2005/Atom" - - ## - # The XHTML URI W3C Namespace - - XHTML_URI = "http://www.w3.org/1999/xhtml" - - module CommonModel - NSPOOL = {} - ELEMENTS = [] - - def self.append_features(klass) - super - klass.install_must_call_validator("atom", URI) - [ - ["lang", :xml], - ["base", :xml], - ].each do |name, uri, required| - klass.install_get_attribute(name, uri, required, [nil, :inherit]) - end - klass.class_eval do - class << self - # Returns the Atom URI W3C Namespace - def required_uri - URI - end - - # Returns true - def need_parent? - true - end - end - end - end - end - - module ContentModel - module ClassMethods - def content_type - @content_type ||= nil - end - end - - class << self - def append_features(klass) - super - klass.extend(ClassMethods) - klass.content_setup(klass.content_type, klass.tag_name) - end - end - - def maker_target(target) - target - end - - private - def setup_maker_element_writer - "#{self.class.name.split(/::/).last.downcase}=" - end - - def setup_maker_element(target) - target.__send__(setup_maker_element_writer, content) - super - end - end - - module URIContentModel - class << self - def append_features(klass) - super - klass.class_eval do - @content_type = [nil, :uri] - include(ContentModel) - end - end - end - end - - # The TextConstruct module is used to define a Text construct Atom element, - # which is used to store small quantities of human-readable text. - # - # The TextConstruct has a type attribute, e.g. text, html, xhtml - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#text.constructs - module TextConstruct - def self.append_features(klass) - super - klass.class_eval do - [ - ["type", ""], - ].each do |name, uri, required| - install_get_attribute(name, uri, required, :text_type) - end - - content_setup - add_need_initialize_variable("xhtml") - - class << self - def xml_getter - "xhtml" - end - - def xml_setter - "xhtml=" - end - end - end - end - - attr_writer :xhtml - - # Returns or builds the XHTML content. - def xhtml - return @xhtml if @xhtml.nil? - if @xhtml.is_a?(XML::Element) and - [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI] - return @xhtml - end - - children = @xhtml - children = [children] unless children.is_a?(Array) - XML::Element.new("div", nil, XHTML_URI, - {"xmlns" => XHTML_URI}, children) - end - - # Returns true if type is "xhtml". - def have_xml_content? - @type == "xhtml" - end - - # Raises a MissingTagError or NotExpectedTagError - # if the element is not properly formatted. - def atom_validate(ignore_unknown_element, tags, uri) - if have_xml_content? - if @xhtml.nil? - raise MissingTagError.new("div", tag_name) - end - unless [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI] - raise NotExpectedTagError.new(@xhtml.name, @xhtml.uri, tag_name) - end - end - end - - private - def maker_target(target) - target.__send__(self.class.name.split(/::/).last.downcase) {|x| x} - end - - def setup_maker_attributes(target) - target.type = type - target.content = content - target.xml_content = @xhtml - end - end - - # The PersonConstruct module is used to define a person Atom element that can be - # used to describe a person, corporation or similar entity. - # - # The PersonConstruct has a Name, Uri and Email child elements. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#atomPersonConstruct - module PersonConstruct - - # Adds attributes for name, uri, and email to the +klass+ - def self.append_features(klass) - super - klass.class_eval do - [ - ["name", nil], - ["uri", "?"], - ["email", "?"], - ].each do |tag, occurs| - install_have_attribute_element(tag, URI, occurs, nil, :content) - end - end - end - - def maker_target(target) - target.__send__("new_#{self.class.name.split(/::/).last.downcase}") - end - - # The name of the person or entity. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.name - class Name < RSS::Element - include CommonModel - include ContentModel - end - - # The URI of the person or entity. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.uri - class Uri < RSS::Element - include CommonModel - include URIContentModel - end - - # The email of the person or entity. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.email - class Email < RSS::Element - include CommonModel - include ContentModel - end - end - - # Element used to describe an Atom date and time in the ISO 8601 format - # - # Examples: - # * 2013-03-04T15:30:02Z - # * 2013-03-04T10:30:02-05:00 - module DateConstruct - def self.append_features(klass) - super - klass.class_eval do - @content_type = :w3cdtf - include(ContentModel) - end - end - - # Raises NotAvailableValueError if element content is nil - def atom_validate(ignore_unknown_element, tags, uri) - raise NotAvailableValueError.new(tag_name, "") if content.nil? - end - end - - module DuplicateLinkChecker - # Checks if there are duplicate links with the same type and hreflang attributes - # that have an alternate (or empty) rel attribute - # - # Raises a TooMuchTagError if there are duplicates found - def validate_duplicate_links(links) - link_infos = {} - links.each do |link| - rel = link.rel || "alternate" - next unless rel == "alternate" - key = [link.hreflang, link.type] - if link_infos.has_key?(key) - raise TooMuchTagError.new("link", tag_name) - end - link_infos[key] = true - end - end - end - - # Defines the top-level element of an Atom Feed Document. - # It consists of a number of children Entry elements, - # and has the following attributes: - # - # * author - # * categories - # * category - # * content - # * contributor - # * entries (aliased as items) - # * entry - # * generator - # * icon - # * id - # * link - # * logo - # * rights - # * subtitle - # * title - # * updated - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.feed - class Feed < RSS::Element - include RootElementMixin - include CommonModel - include DuplicateLinkChecker - - install_ns('', URI) - - [ - ["author", "*", :children], - ["category", "*", :children, "categories"], - ["contributor", "*", :children], - ["generator", "?"], - ["icon", "?", nil, :content], - ["id", nil, nil, :content], - ["link", "*", :children], - ["logo", "?"], - ["rights", "?"], - ["subtitle", "?", nil, :content], - ["title", nil, nil, :content], - ["updated", nil, nil, :content], - ["entry", "*", :children, "entries"], - ].each do |tag, occurs, type, *args| - type ||= :child - __send__("install_have_#{type}_element", - tag, URI, occurs, tag, *args) - end - - # Creates a new Atom feed - def initialize(version=nil, encoding=nil, standalone=nil) - super("1.0", version, encoding, standalone) - @feed_type = "atom" - @feed_subtype = "feed" - end - - alias_method :items, :entries - - # Returns true if there are any authors for the feed or any of the Entry - # child elements have an author - def have_author? - authors.any? {|author| !author.to_s.empty?} or - entries.any? {|entry| entry.have_author?(false)} - end - - private - def atom_validate(ignore_unknown_element, tags, uri) - unless have_author? - raise MissingTagError.new("author", tag_name) - end - validate_duplicate_links(links) - end - - def have_required_elements? - super and have_author? - end - - def maker_target(maker) - maker.channel - end - - def setup_maker_element(channel) - prev_dc_dates = channel.dc_dates.to_a.dup - super - channel.about = id.content if id - channel.dc_dates.replace(prev_dc_dates) - end - - def setup_maker_elements(channel) - super - items = channel.maker.items - entries.each do |entry| - entry.setup_maker(items) - end - end - - # PersonConstruct that contains information regarding the author - # of a Feed or Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.author - class Author < RSS::Element - include CommonModel - include PersonConstruct - end - - # Contains information about a category associated with a Feed or Entry. - # It has the following attributes: - # - # * term - # * scheme - # * label - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.category - class Category < RSS::Element - include CommonModel - - [ - ["term", "", true], - ["scheme", "", false, [nil, :uri]], - ["label", ""], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - private - def maker_target(target) - target.new_category - end - end - - # PersonConstruct that contains information regarding the - # contributors of a Feed or Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.contributor - class Contributor < RSS::Element - include CommonModel - include PersonConstruct - end - - # Contains information on the agent used to generate the feed. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.generator - class Generator < RSS::Element - include CommonModel - include ContentModel - - [ - ["uri", "", false, [nil, :uri]], - ["version", ""], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - private - def setup_maker_attributes(target) - target.generator do |generator| - generator.uri = uri if uri - generator.version = version if version - end - end - end - - # Defines an image that provides a visual identification for a eed. - # The image should have an aspect ratio of 1:1. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.icon - class Icon < RSS::Element - include CommonModel - include URIContentModel - end - - # Defines the Universally Unique Identifier (UUID) for a Feed or Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.id - class Id < RSS::Element - include CommonModel - include URIContentModel - end - - # Defines a reference to a Web resource. It has the following - # attributes: - # - # * href - # * rel - # * type - # * hreflang - # * title - # * length - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.link - class Link < RSS::Element - include CommonModel - - [ - ["href", "", true, [nil, :uri]], - ["rel", ""], - ["type", ""], - ["hreflang", ""], - ["title", ""], - ["length", ""], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - private - def maker_target(target) - target.new_link - end - end - - # Defines an image that provides a visual identification for the Feed. - # The image should have an aspect ratio of 2:1 (horizontal:vertical). - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.logo - class Logo < RSS::Element - include CommonModel - include URIContentModel - - def maker_target(target) - target.maker.image - end - - private - def setup_maker_element_writer - "url=" - end - end - - # TextConstruct that contains copyright information regarding - # the content in an Entry or Feed. It should not be used to - # convey machine readable licensing information. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.rights - class Rights < RSS::Element - include CommonModel - include TextConstruct - end - - # TextConstruct that conveys a description or subtitle for a Feed. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.subtitle - class Subtitle < RSS::Element - include CommonModel - include TextConstruct - end - - # TextConstruct that conveys a description or title for a Feed or Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.title - class Title < RSS::Element - include CommonModel - include TextConstruct - end - - # DateConstruct indicating the most recent time when a Feed or - # Entry was modified in a way the publisher considers - # significant. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.updated - class Updated < RSS::Element - include CommonModel - include DateConstruct - end - - # Defines a child Atom Entry element of an Atom Feed element. - # It has the following attributes: - # - # * author - # * category - # * categories - # * content - # * contributor - # * id - # * link - # * published - # * rights - # * source - # * summary - # * title - # * updated - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.entry - class Entry < RSS::Element - include CommonModel - include DuplicateLinkChecker - - [ - ["author", "*", :children], - ["category", "*", :children, "categories"], - ["content", "?", :child], - ["contributor", "*", :children], - ["id", nil, nil, :content], - ["link", "*", :children], - ["published", "?", :child, :content], - ["rights", "?", :child], - ["source", "?"], - ["summary", "?", :child], - ["title", nil], - ["updated", nil, :child, :content], - ].each do |tag, occurs, type, *args| - type ||= :attribute - __send__("install_have_#{type}_element", - tag, URI, occurs, tag, *args) - end - - # Returns whether any of the following are true: - # - # * There are any authors in the feed - # * If the parent element has an author and the +check_parent+ - # parameter was given. - # * There is a source element that has an author - def have_author?(check_parent=true) - authors.any? {|author| !author.to_s.empty?} or - (check_parent and @parent and @parent.have_author?) or - (source and source.have_author?) - end - - private - def atom_validate(ignore_unknown_element, tags, uri) - unless have_author? - raise MissingTagError.new("author", tag_name) - end - validate_duplicate_links(links) - end - - def have_required_elements? - super and have_author? - end - - def maker_target(items) - if items.respond_to?("items") - # For backward compatibility - items = items.items - end - items.new_item - end - - # Feed::Author - Author = Feed::Author - # Feed::Category - Category = Feed::Category - - # Contains or links to the content of the Entry. - # It has the following attributes: - # - # * type - # * src - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.content - class Content < RSS::Element - include CommonModel - - class << self - def xml_setter - "xml=" - end - - def xml_getter - "xml" - end - end - - [ - ["type", ""], - ["src", "", false, [nil, :uri]], - ].each do |name, uri, required, type| - install_get_attribute(name, uri, required, type) - end - - content_setup - add_need_initialize_variable("xml") - - # Returns the element content in XML. - attr_writer :xml - - # Returns true if the element has inline XML content. - def have_xml_content? - inline_xhtml? or inline_other_xml? - end - - # Returns or builds the element content in XML. - def xml - return @xml unless inline_xhtml? - return @xml if @xml.nil? - if @xml.is_a?(XML::Element) and - [@xml.name, @xml.uri] == ["div", XHTML_URI] - return @xml - end - - children = @xml - children = [children] unless children.is_a?(Array) - XML::Element.new("div", nil, XHTML_URI, - {"xmlns" => XHTML_URI}, children) - end - - # Returns the element content in XHTML. - def xhtml - if inline_xhtml? - xml - else - nil - end - end - - # Raises a MissingAttributeError, NotAvailableValueError, - # MissingTagError or NotExpectedTagError if the element is - # not properly formatted. - def atom_validate(ignore_unknown_element, tags, uri) - if out_of_line? - raise MissingAttributeError.new(tag_name, "type") if @type.nil? - unless (content.nil? or content.empty?) - raise NotAvailableValueError.new(tag_name, content) - end - elsif inline_xhtml? - if @xml.nil? - raise MissingTagError.new("div", tag_name) - end - unless @xml.name == "div" and @xml.uri == XHTML_URI - raise NotExpectedTagError.new(@xml.name, @xml.uri, tag_name) - end - end - end - - # Returns true if the element contains inline content - # that has a text or HTML media type, or no media type at all. - def inline_text? - !out_of_line? and [nil, "text", "html"].include?(@type) - end - - # Returns true if the element contains inline content that - # has a HTML media type. - def inline_html? - return false if out_of_line? - @type == "html" or mime_split == ["text", "html"] - end - - # Returns true if the element contains inline content that - # has a XHTML media type. - def inline_xhtml? - !out_of_line? and @type == "xhtml" - end - - # Returns true if the element contains inline content that - # has a MIME media type. - def inline_other? - return false if out_of_line? - media_type, subtype = mime_split - return false if media_type.nil? or subtype.nil? - true - end - - # Returns true if the element contains inline content that - # has a text media type. - def inline_other_text? - return false unless inline_other? - return false if inline_other_xml? - - media_type, = mime_split - return true if "text" == media_type.downcase - false - end - - # Returns true if the element contains inline content that - # has a XML media type. - def inline_other_xml? - return false unless inline_other? - - media_type, subtype = mime_split - normalized_mime_type = "#{media_type}/#{subtype}".downcase - if /(?:\+xml|^xml)$/ =~ subtype or - %w(text/xml-external-parsed-entity - application/xml-external-parsed-entity - application/xml-dtd).find {|x| x == normalized_mime_type} - return true - end - false - end - - # Returns true if the element contains inline content - # encoded in base64. - def inline_other_base64? - inline_other? and !inline_other_text? and !inline_other_xml? - end - - # Returns true if the element contains linked content. - def out_of_line? - not @src.nil? - end - - # Splits the type attribute into an array, e.g. ["text", "xml"] - def mime_split - media_type = subtype = nil - if /\A\s*([a-z]+)\/([a-z\+]+)\s*(?:;.*)?\z/i =~ @type.to_s - media_type = $1.downcase - subtype = $2.downcase - end - [media_type, subtype] - end - - # Returns true if the content needs to be encoded in base64. - def need_base64_encode? - inline_other_base64? - end - - private - def empty_content? - out_of_line? or super - end - end - - # Feed::Contributor - Contributor = Feed::Contributor - # Feed::Id - Id = Feed::Id - # Feed::Link - Link = Feed::Link - - # DateConstruct that usually indicates the time of the initial - # creation of an Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.published - class Published < RSS::Element - include CommonModel - include DateConstruct - end - - # Feed::Rights - Rights = Feed::Rights - - # Defines a Atom Source element. It has the following attributes: - # - # * author - # * category - # * categories - # * content - # * contributor - # * generator - # * icon - # * id - # * link - # * logo - # * rights - # * subtitle - # * title - # * updated - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.source - class Source < RSS::Element - include CommonModel - - [ - ["author", "*", :children], - ["category", "*", :children, "categories"], - ["contributor", "*", :children], - ["generator", "?"], - ["icon", "?"], - ["id", "?", nil, :content], - ["link", "*", :children], - ["logo", "?"], - ["rights", "?"], - ["subtitle", "?"], - ["title", "?"], - ["updated", "?", nil, :content], - ].each do |tag, occurs, type, *args| - type ||= :attribute - __send__("install_have_#{type}_element", - tag, URI, occurs, tag, *args) - end - - # Returns true if the Source element has an author. - def have_author? - !author.to_s.empty? - end - - # Feed::Author - Author = Feed::Author - # Feed::Category - Category = Feed::Category - # Feed::Contributor - Contributor = Feed::Contributor - # Feed::Generator - Generator = Feed::Generator - # Feed::Icon - Icon = Feed::Icon - # Feed::Id - Id = Feed::Id - # Feed::Link - Link = Feed::Link - # Feed::Logo - Logo = Feed::Logo - # Feed::Rights - Rights = Feed::Rights - # Feed::Subtitle - Subtitle = Feed::Subtitle - # Feed::Title - Title = Feed::Title - # Feed::Updated - Updated = Feed::Updated - end - - # TextConstruct that describes a summary of the Entry. - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.summary - class Summary < RSS::Element - include CommonModel - include TextConstruct - end - - # Feed::Title - Title = Feed::Title - # Feed::Updated - Updated = Feed::Updated - end - end - - # Defines a top-level Atom Entry element, - # used as the document element of a stand-alone Atom Entry Document. - # It has the following attributes: - # - # * author - # * category - # * categories - # * content - # * contributor - # * id - # * link - # * published - # * rights - # * source - # * summary - # * title - # * updated - # - # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.entry] - class Entry < RSS::Element - include RootElementMixin - include CommonModel - include DuplicateLinkChecker - - [ - ["author", "*", :children], - ["category", "*", :children, "categories"], - ["content", "?"], - ["contributor", "*", :children], - ["id", nil, nil, :content], - ["link", "*", :children], - ["published", "?", :child, :content], - ["rights", "?"], - ["source", "?"], - ["summary", "?"], - ["title", nil], - ["updated", nil, nil, :content], - ].each do |tag, occurs, type, *args| - type ||= :attribute - __send__("install_have_#{type}_element", - tag, URI, occurs, tag, *args) - end - - # Creates a new Atom Entry element. - def initialize(version=nil, encoding=nil, standalone=nil) - super("1.0", version, encoding, standalone) - @feed_type = "atom" - @feed_subtype = "entry" - end - - # Returns the Entry in an array. - def items - [self] - end - - # Sets up the +maker+ for constructing Entry elements. - def setup_maker(maker) - maker = maker.maker if maker.respond_to?("maker") - super(maker) - end - - # Returns where there are any authors present or there is a - # source with an author. - def have_author? - authors.any? {|author| !author.to_s.empty?} or - (source and source.have_author?) - end - - private - def atom_validate(ignore_unknown_element, tags, uri) - unless have_author? - raise MissingTagError.new("author", tag_name) - end - validate_duplicate_links(links) - end - - def have_required_elements? - super and have_author? - end - - def maker_target(maker) - maker.items.new_item - end - - # Feed::Entry::Author - Author = Feed::Entry::Author - # Feed::Entry::Category - Category = Feed::Entry::Category - # Feed::Entry::Content - Content = Feed::Entry::Content - # Feed::Entry::Contributor - Contributor = Feed::Entry::Contributor - # Feed::Entry::Id - Id = Feed::Entry::Id - # Feed::Entry::Link - Link = Feed::Entry::Link - # Feed::Entry::Published - Published = Feed::Entry::Published - # Feed::Entry::Rights - Rights = Feed::Entry::Rights - # Feed::Entry::Source - Source = Feed::Entry::Source - # Feed::Entry::Summary - Summary = Feed::Entry::Summary - # Feed::Entry::Title - Title = Feed::Entry::Title - # Feed::Entry::Updated - Updated = Feed::Entry::Updated - end - end - - Atom::CommonModel::ELEMENTS.each do |name| - BaseListener.install_get_text_element(Atom::URI, name, "#{name}=") - end - - module ListenerMixin - private - def initial_start_feed(tag_name, prefix, attrs, ns) - check_ns(tag_name, prefix, ns, Atom::URI, false) - - @rss = Atom::Feed.new(@version, @encoding, @standalone) - @rss.do_validate = @do_validate - @rss.xml_stylesheets = @xml_stylesheets - @rss.lang = attrs["xml:lang"] - @rss.base = attrs["xml:base"] - @last_element = @rss - pr = Proc.new do |text, tags| - @rss.validate_for_stream(tags) if @do_validate - end - @proc_stack.push(pr) - end - - def initial_start_entry(tag_name, prefix, attrs, ns) - check_ns(tag_name, prefix, ns, Atom::URI, false) - - @rss = Atom::Entry.new(@version, @encoding, @standalone) - @rss.do_validate = @do_validate - @rss.xml_stylesheets = @xml_stylesheets - @rss.lang = attrs["xml:lang"] - @rss.base = attrs["xml:base"] - @last_element = @rss - pr = Proc.new do |text, tags| - @rss.validate_for_stream(tags) if @do_validate - end - @proc_stack.push(pr) - end - end -end diff --git a/lib/rss/content.rb b/lib/rss/content.rb deleted file mode 100644 index 78c18d103c3f6e..00000000000000 --- a/lib/rss/content.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: false -require_relative "rss" - -module RSS - # The prefix for the Content XML namespace. - CONTENT_PREFIX = 'content' - # The URI of the Content specification. - CONTENT_URI = "http://purl.org/rss/1.0/modules/content/" - - module ContentModel - extend BaseModel - - ELEMENTS = ["#{CONTENT_PREFIX}_encoded"] - - def self.append_features(klass) - super - - klass.install_must_call_validator(CONTENT_PREFIX, CONTENT_URI) - ELEMENTS.each do |full_name| - name = full_name[(CONTENT_PREFIX.size + 1)..-1] - klass.install_text_element(name, CONTENT_URI, "?", full_name) - end - end - end - - prefix_size = CONTENT_PREFIX.size + 1 - ContentModel::ELEMENTS.each do |full_name| - name = full_name[prefix_size..-1] - BaseListener.install_get_text_element(CONTENT_URI, name, full_name) - end -end - -require 'rss/content/1.0' -require 'rss/content/2.0' diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb deleted file mode 100644 index 1367dfe092448d..00000000000000 --- a/lib/rss/content/1.0.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: false -require 'rss/1.0' - -module RSS - RDF.install_ns(CONTENT_PREFIX, CONTENT_URI) - - class RDF - class Item; include ContentModel; end - end -end diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb deleted file mode 100644 index 3b468248ace866..00000000000000 --- a/lib/rss/content/2.0.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: false -require "rss/2.0" - -module RSS - Rss.install_ns(CONTENT_PREFIX, CONTENT_URI) - - class Rss - class Channel - class Item; include ContentModel; end - end - end -end diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb deleted file mode 100644 index d372e067256c32..00000000000000 --- a/lib/rss/converter.rb +++ /dev/null @@ -1,171 +0,0 @@ -# frozen_string_literal: false -require_relative "utils" - -module RSS - - class Converter - - include Utils - - def initialize(to_enc, from_enc=nil) - if "".respond_to?(:encode) - @to_encoding = to_enc - return - end - normalized_to_enc = to_enc.downcase.gsub(/-/, '_') - from_enc ||= 'utf-8' - normalized_from_enc = from_enc.downcase.gsub(/-/, '_') - if normalized_to_enc == normalized_from_enc - def_same_enc() - else - def_diff_enc = "def_to_#{normalized_to_enc}_from_#{normalized_from_enc}" - if respond_to?(def_diff_enc) - __send__(def_diff_enc) - else - def_else_enc(to_enc, from_enc) - end - end - end - - def convert(value) - if value.is_a?(String) and value.respond_to?(:encode) - value.encode(@to_encoding) - else - value - end - end - - def def_convert(depth=0) - instance_eval(<<-EOC, *get_file_and_line_from_caller(depth)) - def convert(value) - if value.kind_of?(String) - #{yield('value')} - else - value - end - end - EOC - end - - def def_iconv_convert(to_enc, from_enc, depth=0) - begin - require "iconv" - @iconv = Iconv.new(to_enc, from_enc) - def_convert(depth+1) do |value| - <<-EOC - begin - @iconv.iconv(#{value}) - rescue Iconv::Failure - raise ConversionError.new(#{value}, "#{to_enc}", "#{from_enc}") - end - EOC - end - rescue LoadError, ArgumentError, SystemCallError - raise UnknownConversionMethodError.new(to_enc, from_enc) - end - end - - def def_else_enc(to_enc, from_enc) - def_iconv_convert(to_enc, from_enc, 0) - end - - def def_same_enc() - def_convert do |value| - value - end - end - - def def_uconv_convert_if_can(meth, to_enc, from_enc, nkf_arg) - begin - require "uconv" - def_convert(1) do |value| - <<-EOC - begin - Uconv.#{meth}(#{value}) - rescue Uconv::Error - raise ConversionError.new(#{value}, "#{to_enc}", "#{from_enc}") - end - EOC - end - rescue LoadError - require 'nkf' - if NKF.const_defined?(:UTF8) - def_convert(1) do |value| - "NKF.nkf(#{nkf_arg.dump}, #{value})" - end - else - def_iconv_convert(to_enc, from_enc, 1) - end - end - end - - def def_to_euc_jp_from_utf_8 - def_uconv_convert_if_can('u8toeuc', 'EUC-JP', 'UTF-8', '-We') - end - - def def_to_utf_8_from_euc_jp - def_uconv_convert_if_can('euctou8', 'UTF-8', 'EUC-JP', '-Ew') - end - - def def_to_shift_jis_from_utf_8 - def_uconv_convert_if_can('u8tosjis', 'Shift_JIS', 'UTF-8', '-Ws') - end - - def def_to_utf_8_from_shift_jis - def_uconv_convert_if_can('sjistou8', 'UTF-8', 'Shift_JIS', '-Sw') - end - - def def_to_euc_jp_from_shift_jis - require "nkf" - def_convert do |value| - "NKF.nkf('-Se', #{value})" - end - end - - def def_to_shift_jis_from_euc_jp - require "nkf" - def_convert do |value| - "NKF.nkf('-Es', #{value})" - end - end - - def def_to_euc_jp_from_iso_2022_jp - require "nkf" - def_convert do |value| - "NKF.nkf('-Je', #{value})" - end - end - - def def_to_iso_2022_jp_from_euc_jp - require "nkf" - def_convert do |value| - "NKF.nkf('-Ej', #{value})" - end - end - - def def_to_utf_8_from_iso_8859_1 - def_convert do |value| - "#{value}.unpack('C*').pack('U*')" - end - end - - def def_to_iso_8859_1_from_utf_8 - def_convert do |value| - <<-EOC - array_utf8 = #{value}.unpack('U*') - array_enc = [] - array_utf8.each do |num| - if num <= 0xFF - array_enc << num - else - array_enc.concat "&\#\#{num};".unpack('C*') - end - end - array_enc.pack('C*') - EOC - end - end - - end - -end diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb deleted file mode 100644 index 85b836d3bf3486..00000000000000 --- a/lib/rss/dublincore.rb +++ /dev/null @@ -1,164 +0,0 @@ -# frozen_string_literal: false -require_relative "rss" - -module RSS - # The prefix for the Dublin Core XML namespace. - DC_PREFIX = 'dc' - # The URI of the Dublin Core specification. - DC_URI = "http://purl.org/dc/elements/1.1/" - - module BaseDublinCoreModel - def append_features(klass) - super - - return if klass.instance_of?(Module) - DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name| - plural = plural_name || "#{name}s" - full_name = "#{DC_PREFIX}_#{name}" - full_plural_name = "#{DC_PREFIX}_#{plural}" - klass_name = "DublinCore#{Utils.to_class_name(name)}" - klass.install_must_call_validator(DC_PREFIX, DC_URI) - klass.install_have_children_element(name, DC_URI, "*", - full_name, full_plural_name) - klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0)) - remove_method :#{full_name} - remove_method :#{full_name}= - remove_method :set_#{full_name} - - def #{full_name} - @#{full_name}.first and @#{full_name}.first.value - end - - def #{full_name}=(new_value) - @#{full_name}[0] = Utils.new_with_value_if_need(#{klass_name}, new_value) - end - alias set_#{full_name} #{full_name}= - EOC - end - klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0)) - if method_defined?(:date) - alias date_without_#{DC_PREFIX}_date= date= - - def date=(value) - self.date_without_#{DC_PREFIX}_date = value - self.#{DC_PREFIX}_date = value - end - else - alias date #{DC_PREFIX}_date - alias date= #{DC_PREFIX}_date= - end - - # For backward compatibility - alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list - EOC - end - end - - module DublinCoreModel - - extend BaseModel - extend BaseDublinCoreModel - - TEXT_ELEMENTS = { - "title" => nil, - "description" => nil, - "creator" => nil, - "subject" => nil, - "publisher" => nil, - "contributor" => nil, - "type" => nil, - "format" => nil, - "identifier" => nil, - "source" => nil, - "language" => nil, - "relation" => nil, - "coverage" => nil, - "rights" => "rights_list" - } - - DATE_ELEMENTS = { - "date" => "w3cdtf", - } - - ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a - DublinCoreModel::DATE_ELEMENTS.each do |name, | - ELEMENT_NAME_INFOS << [name, nil] - end - - ELEMENTS = TEXT_ELEMENTS.keys + DATE_ELEMENTS.keys - - ELEMENTS.each do |name, plural_name| - module_eval(<<-EOC, *get_file_and_line_from_caller(0)) - class DublinCore#{Utils.to_class_name(name)} < Element - include RSS10 - - content_setup - - class << self - def required_prefix - DC_PREFIX - end - - def required_uri - DC_URI - end - end - - @tag_name = #{name.dump} - - alias_method(:value, :content) - alias_method(:value=, :content=) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.content = args[0] - end - end - - def full_name - tag_name_with_prefix(DC_PREFIX) - end - - def maker_target(target) - target.new_#{name} - end - - def setup_maker_attributes(#{name}) - #{name}.content = content - end - end - EOC - end - - DATE_ELEMENTS.each do |name, type| - tag_name = "#{DC_PREFIX}:#{name}" - module_eval(<<-EOC, *get_file_and_line_from_caller(0)) - class DublinCore#{Utils.to_class_name(name)} < Element - remove_method(:content=) - remove_method(:value=) - - date_writer("content", #{type.dump}, #{tag_name.dump}) - - alias_method(:value=, :content=) - end - EOC - end - end - - # For backward compatibility - DublincoreModel = DublinCoreModel - - DublinCoreModel::ELEMENTS.each do |name| - class_name = Utils.to_class_name(name) - BaseListener.install_class_name(DC_URI, name, "DublinCore#{class_name}") - end - - DublinCoreModel::ELEMENTS.collect! {|name| "#{DC_PREFIX}_#{name}"} -end - -require 'rss/dublincore/1.0' -require 'rss/dublincore/2.0' -require_relative 'dublincore/atom' diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb deleted file mode 100644 index 1d96fab9b91c71..00000000000000 --- a/lib/rss/dublincore/1.0.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: false -require "rss/1.0" - -module RSS - RDF.install_ns(DC_PREFIX, DC_URI) - - class RDF - class Channel; include DublinCoreModel; end - class Image; include DublinCoreModel; end - class Item; include DublinCoreModel; end - class Textinput; include DublinCoreModel; end - end -end diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb deleted file mode 100644 index e3011fef6a3203..00000000000000 --- a/lib/rss/dublincore/2.0.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: false -require "rss/2.0" - -module RSS - Rss.install_ns(DC_PREFIX, DC_URI) - - class Rss - class Channel - include DublinCoreModel - class Item; include DublinCoreModel; end - end - end -end diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb deleted file mode 100644 index 1cfcdec677c8b7..00000000000000 --- a/lib/rss/dublincore/atom.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: false -require_relative "../atom" - -module RSS - module Atom - Feed.install_ns(DC_PREFIX, DC_URI) - - class Feed - include DublinCoreModel - class Entry; include DublinCoreModel; end - end - - class Entry - include DublinCoreModel - end - end -end diff --git a/lib/rss/image.rb b/lib/rss/image.rb deleted file mode 100644 index 837f7d18f4dd60..00000000000000 --- a/lib/rss/image.rb +++ /dev/null @@ -1,198 +0,0 @@ -# frozen_string_literal: false -require 'rss/1.0' -require_relative 'dublincore' - -module RSS - - # The prefix for the Image XML namespace. - IMAGE_PREFIX = 'image' - # The URI for the Image specification. - IMAGE_URI = 'http://purl.org/rss/1.0/modules/image/' - - RDF.install_ns(IMAGE_PREFIX, IMAGE_URI) - - # This constant holds strings which contain the names of - # image elements, with the appropriate prefix. - IMAGE_ELEMENTS = [] - - %w(item favicon).each do |name| - class_name = Utils.to_class_name(name) - BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}") - IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}" - end - - module ImageModelUtils - def validate_one_tag_name(ignore_unknown_element, name, tags) - if !ignore_unknown_element - invalid = tags.find {|tag| tag != name} - raise UnknownTagError.new(invalid, IMAGE_URI) if invalid - end - raise TooMuchTagError.new(name, tag_name) if tags.size > 1 - end - end - - module ImageItemModel - include ImageModelUtils - extend BaseModel - - def self.append_features(klass) - super - - klass.install_have_child_element("item", IMAGE_URI, "?", - "#{IMAGE_PREFIX}_item") - klass.install_must_call_validator(IMAGE_PREFIX, IMAGE_URI) - end - - class ImageItem < Element - include RSS10 - include DublinCoreModel - - @tag_name = "item" - - class << self - def required_prefix - IMAGE_PREFIX - end - - def required_uri - IMAGE_URI - end - end - - install_must_call_validator(IMAGE_PREFIX, IMAGE_URI) - - [ - ["about", ::RSS::RDF::URI, true], - ["resource", ::RSS::RDF::URI, false], - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{::RSS::RDF::PREFIX}:#{name}") - end - - %w(width height).each do |tag| - full_name = "#{IMAGE_PREFIX}_#{tag}" - disp_name = "#{IMAGE_PREFIX}:#{tag}" - install_text_element(tag, IMAGE_URI, "?", - full_name, :integer, disp_name) - BaseListener.install_get_text_element(IMAGE_URI, tag, full_name) - end - - alias width= image_width= - alias width image_width - alias height= image_height= - alias height image_height - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - self.resource = args[1] - end - end - - def full_name - tag_name_with_prefix(IMAGE_PREFIX) - end - - private - def maker_target(target) - target.image_item - end - - def setup_maker_attributes(item) - item.about = self.about - item.resource = self.resource - end - end - end - - module ImageFaviconModel - include ImageModelUtils - extend BaseModel - - def self.append_features(klass) - super - - unless klass.class == Module - klass.install_have_child_element("favicon", IMAGE_URI, "?", - "#{IMAGE_PREFIX}_favicon") - klass.install_must_call_validator(IMAGE_PREFIX, IMAGE_URI) - end - end - - class ImageFavicon < Element - include RSS10 - include DublinCoreModel - - @tag_name = "favicon" - - class << self - def required_prefix - IMAGE_PREFIX - end - - def required_uri - IMAGE_URI - end - end - - [ - ["about", ::RSS::RDF::URI, true, ::RSS::RDF::PREFIX], - ["size", IMAGE_URI, true, IMAGE_PREFIX], - ].each do |name, uri, required, prefix| - install_get_attribute(name, uri, required, nil, nil, - "#{prefix}:#{name}") - end - - AVAILABLE_SIZES = %w(small medium large) - alias_method :set_size, :size= - private :set_size - def size=(new_value) - if @do_validate and !new_value.nil? - new_value = new_value.strip - unless AVAILABLE_SIZES.include?(new_value) - attr_name = "#{IMAGE_PREFIX}:size" - raise NotAvailableValueError.new(full_name, new_value, attr_name) - end - end - set_size(new_value) - end - - alias image_size= size= - alias image_size size - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - self.size = args[1] - end - end - - def full_name - tag_name_with_prefix(IMAGE_PREFIX) - end - - private - def maker_target(target) - target.image_favicon - end - - def setup_maker_attributes(favicon) - favicon.about = self.about - favicon.size = self.size - end - end - - end - - class RDF - class Channel; include ImageFaviconModel; end - class Item; include ImageItemModel; end - end - -end diff --git a/lib/rss/itunes.rb b/lib/rss/itunes.rb deleted file mode 100644 index bc3e25448a7c38..00000000000000 --- a/lib/rss/itunes.rb +++ /dev/null @@ -1,425 +0,0 @@ -# frozen_string_literal: false -require 'rss/2.0' - -module RSS - # The prefix for the iTunes XML namespace. - ITUNES_PREFIX = 'itunes' - # The URI of the iTunes specification. - ITUNES_URI = 'http://www.itunes.com/dtds/podcast-1.0.dtd' - - Rss.install_ns(ITUNES_PREFIX, ITUNES_URI) - - module ITunesModelUtils - include Utils - - def def_class_accessor(klass, name, type, *args) - normalized_name = name.gsub(/-/, "_") - full_name = "#{ITUNES_PREFIX}_#{normalized_name}" - klass_name = "ITunes#{Utils.to_class_name(normalized_name)}" - - case type - when :element, :attribute - klass::ELEMENTS << full_name - def_element_class_accessor(klass, name, full_name, klass_name, *args) - when :elements - klass::ELEMENTS << full_name - def_elements_class_accessor(klass, name, full_name, klass_name, *args) - else - klass.install_must_call_validator(ITUNES_PREFIX, ITUNES_URI) - klass.install_text_element(normalized_name, ITUNES_URI, "?", - full_name, type, name) - end - end - - def def_element_class_accessor(klass, name, full_name, klass_name, - recommended_attribute_name=nil) - klass.install_have_child_element(name, ITUNES_PREFIX, "?", full_name) - end - - def def_elements_class_accessor(klass, name, full_name, klass_name, - plural_name, recommended_attribute_name=nil) - full_plural_name = "#{ITUNES_PREFIX}_#{plural_name}" - klass.install_have_children_element(name, ITUNES_PREFIX, "*", - full_name, full_plural_name) - end - end - - module ITunesBaseModel - extend ITunesModelUtils - - ELEMENTS = [] - - ELEMENT_INFOS = [["author"], - ["block", :yes_other], - ["explicit", :explicit_clean_other], - ["keywords", :csv], - ["subtitle"], - ["summary"]] - end - - module ITunesChannelModel - extend BaseModel - extend ITunesModelUtils - include ITunesBaseModel - - ELEMENTS = [] - - class << self - def append_features(klass) - super - - return if klass.instance_of?(Module) - ELEMENT_INFOS.each do |name, type, *additional_infos| - def_class_accessor(klass, name, type, *additional_infos) - end - end - end - - ELEMENT_INFOS = [ - ["category", :elements, "categories", "text"], - ["image", :attribute, "href"], - ["owner", :element], - ["new-feed-url"], - ] + ITunesBaseModel::ELEMENT_INFOS - - class ITunesCategory < Element - include RSS09 - - @tag_name = "category" - - class << self - def required_prefix - ITUNES_PREFIX - end - - def required_uri - ITUNES_URI - end - end - - [ - ["text", "", true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required) - end - - ITunesCategory = self - install_have_children_element("category", ITUNES_URI, "*", - "#{ITUNES_PREFIX}_category", - "#{ITUNES_PREFIX}_categories") - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.text = args[0] - end - end - - def full_name - tag_name_with_prefix(ITUNES_PREFIX) - end - - private - def maker_target(categories) - if text or !itunes_categories.empty? - categories.new_category - else - nil - end - end - - def setup_maker_attributes(category) - category.text = text if text - end - - def setup_maker_elements(category) - super(category) - itunes_categories.each do |sub_category| - sub_category.setup_maker(category) - end - end - end - - class ITunesImage < Element - include RSS09 - - @tag_name = "image" - - class << self - def required_prefix - ITUNES_PREFIX - end - - def required_uri - ITUNES_URI - end - end - - [ - ["href", "", true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required) - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.href = args[0] - end - end - - def full_name - tag_name_with_prefix(ITUNES_PREFIX) - end - - private - def maker_target(target) - if href - target.itunes_image {|image| image} - else - nil - end - end - - def setup_maker_attributes(image) - image.href = href - end - end - - class ITunesOwner < Element - include RSS09 - - @tag_name = "owner" - - class << self - def required_prefix - ITUNES_PREFIX - end - - def required_uri - ITUNES_URI - end - end - - install_must_call_validator(ITUNES_PREFIX, ITUNES_URI) - [ - ["name"], - ["email"], - ].each do |name,| - ITunesBaseModel::ELEMENT_INFOS << name - install_text_element(name, ITUNES_URI, nil, "#{ITUNES_PREFIX}_#{name}") - end - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.itunes_name = args[0] - self.itunes_email = args[1] - end - end - - def full_name - tag_name_with_prefix(ITUNES_PREFIX) - end - - private - def maker_target(target) - target.itunes_owner - end - - def setup_maker_element(owner) - super(owner) - owner.itunes_name = itunes_name - owner.itunes_email = itunes_email - end - end - end - - module ITunesItemModel - extend BaseModel - extend ITunesModelUtils - include ITunesBaseModel - - class << self - def append_features(klass) - super - - return if klass.instance_of?(Module) - ELEMENT_INFOS.each do |name, type| - def_class_accessor(klass, name, type) - end - end - end - - ELEMENT_INFOS = ITunesBaseModel::ELEMENT_INFOS + - [["duration", :element, "content"]] - - class ITunesDuration < Element - include RSS09 - - @tag_name = "duration" - - class << self - def required_prefix - ITUNES_PREFIX - end - - def required_uri - ITUNES_URI - end - - def parse(duration, do_validate=true) - if do_validate and /\A(?: - \d?\d:[0-5]\d:[0-5]\d| - [0-5]?\d:[0-5]\d| - \d+ - )\z/x !~ duration - raise ArgumentError, - "must be one of HH:MM:SS, H:MM:SS, MM:SS, M:SS, S+: " + - duration.inspect - end - - if duration.include?(':') - components = duration.split(':') - components[3..-1] = nil if components.size > 3 - - components.unshift("00") until components.size == 3 - components.collect do |component| - component.to_i - end - else - seconds_to_components(duration.to_i) - end - end - - def construct(hours, minutes, seconds) - components = [minutes, seconds] - if components.include?(nil) - nil - else - components.unshift(hours) if hours and hours > 0 - components.collect do |component| - "%02d" % component - end.join(':') - end - end - - private - def seconds_to_components(total_seconds) - hours = total_seconds / (60 * 60) - minutes = (total_seconds / 60) % 60 - seconds = total_seconds % 60 - [hours, minutes, seconds] - end - end - - content_setup - alias_method(:value, :content) - remove_method(:content=) - - attr_reader :hour, :minute, :second - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - args = args[0] if args.size == 1 and args[0].is_a?(Array) - if args.size == 1 - self.content = args[0] - elsif args.size > 3 - raise ArgumentError, - "must be (do_validate, params), (content), " + - "(minute, second), ([minute, second]), " + - "(hour, minute, second) or ([hour, minute, second]): " + - args.inspect - else - @second, @minute, @hour = args.reverse - update_content - end - end - end - - def content=(value) - if value.nil? - @content = nil - elsif value.is_a?(self.class) - self.content = value.content - else - begin - @hour, @minute, @second = self.class.parse(value, @do_validate) - rescue ArgumentError - raise NotAvailableValueError.new(tag_name, value) - end - @content = value - end - end - alias_method(:value=, :content=) - - def hour=(hour) - @hour = @do_validate ? Integer(hour) : hour.to_i - update_content - hour - end - - def minute=(minute) - @minute = @do_validate ? Integer(minute) : minute.to_i - update_content - minute - end - - def second=(second) - @second = @do_validate ? Integer(second) : second.to_i - update_content - second - end - - def full_name - tag_name_with_prefix(ITUNES_PREFIX) - end - - private - def update_content - @content = self.class.construct(hour, minute, second) - end - - def maker_target(target) - if @content - target.itunes_duration {|duration| duration} - else - nil - end - end - - def setup_maker_element(duration) - super(duration) - duration.content = @content - end - end - end - - class Rss - class Channel - include ITunesChannelModel - class Item; include ITunesItemModel; end - end - end - - element_infos = - ITunesChannelModel::ELEMENT_INFOS + ITunesItemModel::ELEMENT_INFOS - element_infos.each do |name, type| - case type - when :element, :elements, :attribute - class_name = Utils.to_class_name(name) - BaseListener.install_class_name(ITUNES_URI, name, "ITunes#{class_name}") - else - accessor_base = "#{ITUNES_PREFIX}_#{name.gsub(/-/, '_')}" - BaseListener.install_get_text_element(ITUNES_URI, name, accessor_base) - end - end -end diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb deleted file mode 100644 index e32de81806658a..00000000000000 --- a/lib/rss/maker.rb +++ /dev/null @@ -1,79 +0,0 @@ -# frozen_string_literal: false -require_relative "rss" - -module RSS - ## - # - # Provides a set of builders for various RSS objects - # - # * Feeds - # * RSS 0.91 - # * RSS 1.0 - # * RSS 2.0 - # * Atom 1.0 - # - # * Elements - # * Atom::Entry - - module Maker - - # Collection of supported makers - MAKERS = {} - - class << self - # Builder for an RSS object - # Creates an object of the type passed in +args+ - # - # Executes the +block+ to populate elements of the created RSS object - def make(version, &block) - self[version].make(&block) - end - - # Returns the maker for the +version+ - def [](version) - maker_info = maker(version) - raise UnsupportedMakerVersionError.new(version) if maker_info.nil? - maker_info[:maker] - end - - # Adds a maker to the set of supported makers - def add_maker(version, normalized_version, maker) - MAKERS[version] = {:maker => maker, :version => normalized_version} - end - - # Returns collection of supported maker versions - def versions - MAKERS.keys.uniq.sort - end - - # Returns collection of supported makers - def makers - MAKERS.values.collect { |info| info[:maker] }.uniq - end - - # Returns true if the version is supported - def supported?(version) - versions.include?(version) - end - - private - # Can I remove this method? - def maker(version) - MAKERS[version] - end - end - end -end - -require_relative "maker/1.0" -require_relative "maker/2.0" -require_relative "maker/feed" -require_relative "maker/entry" -require_relative "maker/content" -require_relative "maker/dublincore" -require_relative "maker/slash" -require_relative "maker/syndication" -require_relative "maker/taxonomy" -require_relative "maker/trackback" -require_relative "maker/image" -require_relative "maker/itunes" diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb deleted file mode 100644 index eb35fc14e1adde..00000000000000 --- a/lib/rss/maker/0.9.rb +++ /dev/null @@ -1,509 +0,0 @@ -# frozen_string_literal: false -require_relative "../0.9" - -require_relative "base" - -module RSS - module Maker - - class RSS09 < RSSBase - - def initialize(feed_version) - super - @feed_type = "rss" - end - - private - def make_feed - Rss.new(@feed_version, @version, @encoding, @standalone) - end - - def setup_elements(rss) - setup_channel(rss) - end - - class Channel < ChannelBase - def to_feed(rss) - channel = Rss::Channel.new - setup_values(channel) - _not_set_required_variables = not_set_required_variables - if _not_set_required_variables.empty? - rss.channel = channel - set_parent(channel, rss) - setup_items(rss) - setup_image(rss) - setup_textinput(rss) - setup_other_elements(rss, channel) - rss - else - raise NotSetError.new("maker.channel", _not_set_required_variables) - end - end - - private - def setup_items(rss) - @maker.items.to_feed(rss) - end - - def setup_image(rss) - @maker.image.to_feed(rss) - end - - def setup_textinput(rss) - @maker.textinput.to_feed(rss) - end - - def variables - super + ["pubDate"] - end - - def required_variable_names - %w(link language) - end - - def not_set_required_variables - vars = super - vars << "description" unless description {|d| d.have_required_values?} - vars << "title" unless title {|t| t.have_required_values?} - vars - end - - class SkipDays < SkipDaysBase - def to_feed(rss, channel) - unless @days.empty? - skipDays = Rss::Channel::SkipDays.new - channel.skipDays = skipDays - set_parent(skipDays, channel) - @days.each do |day| - day.to_feed(rss, skipDays.days) - end - end - end - - class Day < DayBase - def to_feed(rss, days) - day = Rss::Channel::SkipDays::Day.new - set = setup_values(day) - if set - days << day - set_parent(day, days) - setup_other_elements(rss, day) - end - end - - private - def required_variable_names - %w(content) - end - end - end - - class SkipHours < SkipHoursBase - def to_feed(rss, channel) - unless @hours.empty? - skipHours = Rss::Channel::SkipHours.new - channel.skipHours = skipHours - set_parent(skipHours, channel) - @hours.each do |hour| - hour.to_feed(rss, skipHours.hours) - end - end - end - - class Hour < HourBase - def to_feed(rss, hours) - hour = Rss::Channel::SkipHours::Hour.new - set = setup_values(hour) - if set - hours << hour - set_parent(hour, hours) - setup_other_elements(rss, hour) - end - end - - private - def required_variable_names - %w(content) - end - end - end - - class Cloud < CloudBase - def to_feed(*args) - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Links < LinksBase - def to_feed(rss, channel) - return if @links.empty? - @links.first.to_feed(rss, channel) - end - - class Link < LinkBase - def to_feed(rss, channel) - if have_required_values? - channel.link = href - else - raise NotSetError.new("maker.channel.link", - not_set_required_variables) - end - end - - private - def required_variable_names - %w(href) - end - end - end - - class Authors < AuthorsBase - def to_feed(rss, channel) - end - - class Author < AuthorBase - def to_feed(rss, channel) - end - end - end - - class Contributors < ContributorsBase - def to_feed(rss, channel) - end - - class Contributor < ContributorBase - end - end - - class Generator < GeneratorBase - def to_feed(rss, channel) - end - end - - class Copyright < CopyrightBase - def to_feed(rss, channel) - channel.copyright = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - - class Description < DescriptionBase - def to_feed(rss, channel) - channel.description = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - - class Title < TitleBase - def to_feed(rss, channel) - channel.title = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - end - - class Image < ImageBase - def to_feed(rss) - image = Rss::Channel::Image.new - set = setup_values(image) - if set - image.link = link - rss.channel.image = image - set_parent(image, rss.channel) - setup_other_elements(rss, image) - elsif required_element? - raise NotSetError.new("maker.image", not_set_required_variables) - end - end - - private - def required_variable_names - %w(url title link) - end - - def required_element? - true - end - end - - class Items < ItemsBase - def to_feed(rss) - if rss.channel - normalize.each do |item| - item.to_feed(rss) - end - setup_other_elements(rss, rss.items) - end - end - - class Item < ItemBase - def to_feed(rss) - item = Rss::Channel::Item.new - setup_values(item) - _not_set_required_variables = not_set_required_variables - if _not_set_required_variables.empty? - rss.items << item - set_parent(item, rss.channel) - setup_other_elements(rss, item) - elsif variable_is_set? - raise NotSetError.new("maker.items", _not_set_required_variables) - end - end - - private - def required_variable_names - [] - end - - def not_set_required_variables - vars = super - if @maker.feed_version == "0.91" - vars << "title" unless title {|t| t.have_required_values?} - vars << "link" unless link - end - vars - end - - class Guid < GuidBase - def to_feed(*args) - end - end - - class Enclosure < EnclosureBase - def to_feed(*args) - end - end - - class Source < SourceBase - def to_feed(*args) - end - - class Authors < AuthorsBase - def to_feed(*args) - end - - class Author < AuthorBase - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Contributors < ContributorsBase - def to_feed(*args) - end - - class Contributor < ContributorBase - end - end - - class Generator < GeneratorBase - def to_feed(*args) - end - end - - class Icon < IconBase - def to_feed(*args) - end - end - - class Links < LinksBase - def to_feed(*args) - end - - class Link < LinkBase - end - end - - class Logo < LogoBase - def to_feed(*args) - end - end - - class Rights < RightsBase - def to_feed(*args) - end - end - - class Subtitle < SubtitleBase - def to_feed(*args) - end - end - - class Title < TitleBase - def to_feed(*args) - end - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Authors < AuthorsBase - def to_feed(*args) - end - - class Author < AuthorBase - end - end - - class Links < LinksBase - def to_feed(rss, item) - return if @links.empty? - @links.first.to_feed(rss, item) - end - - class Link < LinkBase - def to_feed(rss, item) - if have_required_values? - item.link = href - else - raise NotSetError.new("maker.link", - not_set_required_variables) - end - end - - private - def required_variable_names - %w(href) - end - end - end - - class Contributors < ContributorsBase - def to_feed(rss, item) - end - - class Contributor < ContributorBase - end - end - - class Rights < RightsBase - def to_feed(rss, item) - end - end - - class Description < DescriptionBase - def to_feed(rss, item) - item.description = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - - class Content < ContentBase - def to_feed(rss, item) - end - end - - class Title < TitleBase - def to_feed(rss, item) - item.title = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - end - end - - class Textinput < TextinputBase - def to_feed(rss) - textInput = Rss::Channel::TextInput.new - set = setup_values(textInput) - if set - rss.channel.textInput = textInput - set_parent(textInput, rss.channel) - setup_other_elements(rss, textInput) - end - end - - private - def required_variable_names - %w(title description name link) - end - end - end - - class RSS091 < RSS09 - def initialize(feed_version="0.91") - super - end - - class Channel < RSS09::Channel - end - - class Items < RSS09::Items - class Item < RSS09::Items::Item - end - end - - class Image < RSS09::Image - end - - class Textinput < RSS09::Textinput - end - end - - class RSS092 < RSS09 - def initialize(feed_version="0.92") - super - end - - class Channel < RSS09::Channel - end - - class Items < RSS09::Items - class Item < RSS09::Items::Item - end - end - - class Image < RSS09::Image - end - - class Textinput < RSS09::Textinput - end - end - - add_maker("0.9", "0.92", RSS092) - add_maker("0.91", "0.91", RSS091) - add_maker("0.92", "0.92", RSS092) - add_maker("rss0.9", "0.92", RSS092) - add_maker("rss0.91", "0.91", RSS091) - add_maker("rss0.92", "0.92", RSS092) - end -end diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb deleted file mode 100644 index 3934f9536c9b5d..00000000000000 --- a/lib/rss/maker/1.0.rb +++ /dev/null @@ -1,436 +0,0 @@ -# frozen_string_literal: false -require_relative "../1.0" - -require_relative "base" - -module RSS - module Maker - - class RSS10 < RSSBase - - def initialize(feed_version="1.0") - super - @feed_type = "rss" - end - - private - def make_feed - RDF.new(@version, @encoding, @standalone) - end - - def setup_elements(rss) - setup_channel(rss) - setup_image(rss) - setup_items(rss) - setup_textinput(rss) - end - - class Channel < ChannelBase - include SetupDefaultLanguage - - def to_feed(rss) - set_default_values do - _not_set_required_variables = not_set_required_variables - if _not_set_required_variables.empty? - channel = RDF::Channel.new(@about) - setup_values(channel) - channel.dc_dates.clear - rss.channel = channel - set_parent(channel, rss) - setup_items(rss) - setup_image(rss) - setup_textinput(rss) - setup_other_elements(rss, channel) - else - raise NotSetError.new("maker.channel", _not_set_required_variables) - end - end - end - - private - def setup_items(rss) - items = RDF::Channel::Items.new - seq = items.Seq - set_parent(items, seq) - target_items = @maker.items.normalize - raise NotSetError.new("maker", ["items"]) if target_items.empty? - target_items.each do |item| - li = RDF::Channel::Items::Seq::Li.new(item.link) - seq.lis << li - set_parent(li, seq) - end - rss.channel.items = items - set_parent(rss.channel, items) - end - - def setup_image(rss) - if @maker.image.have_required_values? - image = RDF::Channel::Image.new(@maker.image.url) - rss.channel.image = image - set_parent(image, rss.channel) - end - end - - def setup_textinput(rss) - if @maker.textinput.have_required_values? - textinput = RDF::Channel::Textinput.new(@maker.textinput.link) - rss.channel.textinput = textinput - set_parent(textinput, rss.channel) - end - end - - def required_variable_names - %w(about link) - end - - def not_set_required_variables - vars = super - vars << "description" unless description {|d| d.have_required_values?} - vars << "title" unless title {|t| t.have_required_values?} - vars - end - - class SkipDays < SkipDaysBase - def to_feed(*args) - end - - class Day < DayBase - end - end - - class SkipHours < SkipHoursBase - def to_feed(*args) - end - - class Hour < HourBase - end - end - - class Cloud < CloudBase - def to_feed(*args) - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Links < LinksBase - def to_feed(rss, channel) - return if @links.empty? - @links.first.to_feed(rss, channel) - end - - class Link < LinkBase - def to_feed(rss, channel) - if have_required_values? - channel.link = href - else - raise NotSetError.new("maker.channel.link", - not_set_required_variables) - end - end - - private - def required_variable_names - %w(href) - end - end - end - - class Authors < AuthorsBase - def to_feed(rss, channel) - end - - class Author < AuthorBase - def to_feed(rss, channel) - end - end - end - - class Contributors < ContributorsBase - def to_feed(rss, channel) - end - - class Contributor < ContributorBase - end - end - - class Generator < GeneratorBase - def to_feed(rss, channel) - end - end - - class Copyright < CopyrightBase - def to_feed(rss, channel) - end - end - - class Description < DescriptionBase - def to_feed(rss, channel) - channel.description = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - - class Title < TitleBase - def to_feed(rss, channel) - channel.title = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - end - - class Image < ImageBase - def to_feed(rss) - if @url - image = RDF::Image.new(@url) - set = setup_values(image) - if set - rss.image = image - set_parent(image, rss) - setup_other_elements(rss, image) - end - end - end - - def have_required_values? - super and @maker.channel.have_required_values? - end - - private - def variables - super + ["link"] - end - - def required_variable_names - %w(url title link) - end - end - - class Items < ItemsBase - def to_feed(rss) - if rss.channel - normalize.each do |item| - item.to_feed(rss) - end - setup_other_elements(rss, rss.items) - end - end - - class Item < ItemBase - def to_feed(rss) - set_default_values do - item = RDF::Item.new(link) - set = setup_values(item) - if set - item.dc_dates.clear - rss.items << item - set_parent(item, rss) - setup_other_elements(rss, item) - elsif !have_required_values? - raise NotSetError.new("maker.item", not_set_required_variables) - end - end - end - - private - def required_variable_names - %w(link) - end - - def variables - super + %w(link) - end - - def not_set_required_variables - set_default_values do - vars = super - vars << "title" unless title {|t| t.have_required_values?} - vars - end - end - - class Guid < GuidBase - def to_feed(*args) - end - end - - class Enclosure < EnclosureBase - def to_feed(*args) - end - end - - class Source < SourceBase - def to_feed(*args) - end - - class Authors < AuthorsBase - def to_feed(*args) - end - - class Author < AuthorBase - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Contributors < ContributorsBase - def to_feed(*args) - end - - class Contributor < ContributorBase - end - end - - class Generator < GeneratorBase - def to_feed(*args) - end - end - - class Icon < IconBase - def to_feed(*args) - end - end - - class Links < LinksBase - def to_feed(*args) - end - - class Link < LinkBase - end - end - - class Logo < LogoBase - def to_feed(*args) - end - end - - class Rights < RightsBase - def to_feed(*args) - end - end - - class Subtitle < SubtitleBase - def to_feed(*args) - end - end - - class Title < TitleBase - def to_feed(*args) - end - end - end - - class Categories < CategoriesBase - def to_feed(*args) - end - - class Category < CategoryBase - end - end - - class Authors < AuthorsBase - def to_feed(*args) - end - - class Author < AuthorBase - end - end - - class Links < LinksBase - def to_feed(*args) - end - - class Link < LinkBase - end - end - - class Contributors < ContributorsBase - def to_feed(rss, item) - end - - class Contributor < ContributorBase - end - end - - class Rights < RightsBase - def to_feed(rss, item) - end - end - - class Description < DescriptionBase - def to_feed(rss, item) - item.description = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - - class Content < ContentBase - def to_feed(rss, item) - end - end - - class Title < TitleBase - def to_feed(rss, item) - item.title = content if have_required_values? - end - - private - def required_variable_names - %w(content) - end - end - end - end - - class Textinput < TextinputBase - def to_feed(rss) - if @link - textinput = RDF::Textinput.new(@link) - set = setup_values(textinput) - if set - rss.textinput = textinput - set_parent(textinput, rss) - setup_other_elements(rss, textinput) - end - end - end - - def have_required_values? - super and @maker.channel.have_required_values? - end - - private - def required_variable_names - %w(title description name link) - end - end - end - - add_maker("1.0", "1.0", RSS10) - add_maker("rss1.0", "1.0", RSS10) - end -end diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb deleted file mode 100644 index 43d00226b7fea6..00000000000000 --- a/lib/rss/maker/2.0.rb +++ /dev/null @@ -1,224 +0,0 @@ -# frozen_string_literal: false -require_relative "../2.0" - -require_relative "0.9" - -module RSS - module Maker - - class RSS20 < RSS09 - - def initialize(feed_version="2.0") - super - end - - class Channel < RSS09::Channel - - private - def required_variable_names - %w(link) - end - - class SkipDays < RSS09::Channel::SkipDays - class Day < RSS09::Channel::SkipDays::Day - end - end - - class SkipHours < RSS09::Channel::SkipHours - class Hour < RSS09::Channel::SkipHours::Hour - end - end - - class Cloud < RSS09::Channel::Cloud - def to_feed(rss, channel) - cloud = Rss::Channel::Cloud.new - set = setup_values(cloud) - if set - channel.cloud = cloud - set_parent(cloud, channel) - setup_other_elements(rss, cloud) - end - end - - private - def required_variable_names - %w(domain port path registerProcedure protocol) - end - end - - class Categories < RSS09::Channel::Categories - def to_feed(rss, channel) - @categories.each do |category| - category.to_feed(rss, channel) - end - end - - class Category < RSS09::Channel::Categories::Category - def to_feed(rss, channel) - category = Rss::Channel::Category.new - set = setup_values(category) - if set - channel.categories << category - set_parent(category, channel) - setup_other_elements(rss, category) - end - end - - private - def required_variable_names - %w(content) - end - end - end - - class Generator < GeneratorBase - def to_feed(rss, channel) - channel.generator = content - end - - private - def required_variable_names - %w(content) - end - end - end - - class Image < RSS09::Image - private - def required_element? - false - end - end - - class Items < RSS09::Items - class Item < RSS09::Items::Item - private - def required_variable_names - [] - end - - def not_set_required_variables - vars = super - if !title {|t| t.have_required_values?} and - !description {|d| d.have_required_values?} - vars << "title or description" - end - vars - end - - def variables - super + ["pubDate"] - end - - class Guid < RSS09::Items::Item::Guid - def to_feed(rss, item) - guid = Rss::Channel::Item::Guid.new - set = setup_values(guid) - if set - item.guid = guid - set_parent(guid, item) - setup_other_elements(rss, guid) - end - end - - private - def required_variable_names - %w(content) - end - end - - class Enclosure < RSS09::Items::Item::Enclosure - def to_feed(rss, item) - enclosure = Rss::Channel::Item::Enclosure.new - set = setup_values(enclosure) - if set - item.enclosure = enclosure - set_parent(enclosure, item) - setup_other_elements(rss, enclosure) - end - end - - private - def required_variable_names - %w(url length type) - end - end - - class Source < RSS09::Items::Item::Source - def to_feed(rss, item) - source = Rss::Channel::Item::Source.new - set = setup_values(source) - if set - item.source = source - set_parent(source, item) - setup_other_elements(rss, source) - end - end - - private - def required_variable_names - %w(url content) - end - - class Links < RSS09::Items::Item::Source::Links - def to_feed(rss, source) - return if @links.empty? - @links.first.to_feed(rss, source) - end - - class Link < RSS09::Items::Item::Source::Links::Link - def to_feed(rss, source) - source.url = href - end - end - end - end - - class Categories < RSS09::Items::Item::Categories - def to_feed(rss, item) - @categories.each do |category| - category.to_feed(rss, item) - end - end - - class Category < RSS09::Items::Item::Categories::Category - def to_feed(rss, item) - category = Rss::Channel::Item::Category.new - set = setup_values(category) - if set - item.categories << category - set_parent(category, item) - setup_other_elements(rss) - end - end - - private - def required_variable_names - %w(content) - end - end - end - - class Authors < RSS09::Items::Item::Authors - def to_feed(rss, item) - return if @authors.empty? - @authors.first.to_feed(rss, item) - end - - class Author < RSS09::Items::Item::Authors::Author - def to_feed(rss, item) - item.author = name - end - end - end - end - end - - class Textinput < RSS09::Textinput - end - end - - add_maker("2.0", "2.0", RSS20) - add_maker("rss2.0", "2.0", RSS20) - end -end diff --git a/lib/rss/maker/atom.rb b/lib/rss/maker/atom.rb deleted file mode 100644 index cdd1d8753e2b7e..00000000000000 --- a/lib/rss/maker/atom.rb +++ /dev/null @@ -1,173 +0,0 @@ -# frozen_string_literal: false -require_relative "../atom" - -require_relative "base" - -module RSS - module Maker - module AtomPersons - module_function - def def_atom_persons(klass, name, maker_name, plural=nil) - plural ||= "#{name}s" - klass_name = Utils.to_class_name(name) - plural_klass_name = Utils.to_class_name(plural) - - klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1) - class #{plural_klass_name} < #{plural_klass_name}Base - class #{klass_name} < #{klass_name}Base - def to_feed(feed, current) - #{name} = feed.class::#{klass_name}.new - set = setup_values(#{name}) - unless set - raise NotSetError.new(#{maker_name.dump}, - not_set_required_variables) - end - current.#{plural} << #{name} - set_parent(#{name}, current) - setup_other_elements(#{name}) - end - - private - def required_variable_names - %w(name) - end - end - end -EOC - end - end - - module AtomTextConstruct - class << self - def def_atom_text_construct(klass, name, maker_name, klass_name=nil, - atom_klass_name=nil) - klass_name ||= Utils.to_class_name(name) - atom_klass_name ||= Utils.to_class_name(name) - - klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1) - class #{klass_name} < #{klass_name}Base - include #{self.name} - def to_feed(feed, current) - #{name} = current.class::#{atom_klass_name}.new - if setup_values(#{name}) - current.#{name} = #{name} - set_parent(#{name}, current) - setup_other_elements(feed) - elsif variable_is_set? - raise NotSetError.new(#{maker_name.dump}, - not_set_required_variables) - end - end - end - EOC - end - end - - private - def required_variable_names - if type == "xhtml" - %w(xml_content) - else - %w(content) - end - end - - def variables - if type == "xhtml" - super + %w(xhtml) - else - super - end - end - end - - module AtomCategory - def to_feed(feed, current) - category = feed.class::Category.new - set = setup_values(category) - if set - current.categories << category - set_parent(category, current) - setup_other_elements(feed) - else - raise NotSetError.new(self.class.not_set_name, - not_set_required_variables) - end - end - - private - def required_variable_names - %w(term) - end - - def variables - super + ["term", "scheme"] - end - end - - module AtomLink - def to_feed(feed, current) - link = feed.class::Link.new - set = setup_values(link) - if set - current.links << link - set_parent(link, current) - setup_other_elements(feed) - else - raise NotSetError.new(self.class.not_set_name, - not_set_required_variables) - end - end - - private - def required_variable_names - %w(href) - end - end - - module AtomGenerator - def to_feed(feed, current) - generator = current.class::Generator.new - if setup_values(generator) - current.generator = generator - set_parent(generator, current) - setup_other_elements(feed) - elsif variable_is_set? - raise NotSetError.new(self.class.not_set_name, - not_set_required_variables) - end - end - - private - def required_variable_names - %w(content) - end - end - - module AtomLogo - def to_feed(feed, current) - logo = current.class::Logo.new - class << logo - alias_method(:uri=, :content=) - end - set = setup_values(logo) - class << logo - remove_method(:uri=) - end - if set - current.logo = logo - set_parent(logo, current) - setup_other_elements(feed) - elsif variable_is_set? - raise NotSetError.new(self.class.not_set_name, - not_set_required_variables) - end - end - - private - def required_variable_names - %w(uri) - end - end - end -end diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb deleted file mode 100644 index 17537b70062504..00000000000000 --- a/lib/rss/maker/base.rb +++ /dev/null @@ -1,945 +0,0 @@ -# frozen_string_literal: false -require 'forwardable' - -require_relative '../rss' - -module RSS - module Maker - class Base - extend Utils::InheritedReader - - OTHER_ELEMENTS = [] - NEED_INITIALIZE_VARIABLES = [] - - class << self - def other_elements - inherited_array_reader("OTHER_ELEMENTS") - end - def need_initialize_variables - inherited_array_reader("NEED_INITIALIZE_VARIABLES") - end - - def inherited_base - ::RSS::Maker::Base - end - - def inherited(subclass) - subclass.const_set(:OTHER_ELEMENTS, []) - subclass.const_set(:NEED_INITIALIZE_VARIABLES, []) - end - - def add_other_element(variable_name) - self::OTHER_ELEMENTS << variable_name - end - - def add_need_initialize_variable(variable_name, init_value=nil, - &init_block) - init_value ||= init_block - self::NEED_INITIALIZE_VARIABLES << [variable_name, init_value] - end - - def def_array_element(name, plural=nil, klass_name=nil) - include Enumerable - extend Forwardable - - plural ||= "#{name}s" - klass_name ||= Utils.to_class_name(name) - def_delegators("@#{plural}", :<<, :[], :[]=, :first, :last) - def_delegators("@#{plural}", :push, :pop, :shift, :unshift) - def_delegators("@#{plural}", :each, :size, :empty?, :clear) - - add_need_initialize_variable(plural) {[]} - - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def new_#{name} - #{name} = self.class::#{klass_name}.new(@maker) - @#{plural} << #{name} - if block_given? - yield #{name} - else - #{name} - end - end - alias new_child new_#{name} - - def to_feed(*args) - @#{plural}.each do |#{name}| - #{name}.to_feed(*args) - end - end - - def replace(elements) - @#{plural}.replace(elements.to_a) - end - EOC - end - - def def_classed_element_without_accessor(name, class_name=nil) - class_name ||= Utils.to_class_name(name) - add_other_element(name) - add_need_initialize_variable(name) do |object| - object.send("make_#{name}") - end - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - private - def setup_#{name}(feed, current) - @#{name}.to_feed(feed, current) - end - - def make_#{name} - self.class::#{class_name}.new(@maker) - end - EOC - end - - def def_classed_element(name, class_name=nil, attribute_name=nil) - def_classed_element_without_accessor(name, class_name) - if attribute_name - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name} - if block_given? - yield(@#{name}) - else - @#{name}.#{attribute_name} - end - end - - def #{name}=(new_value) - @#{name}.#{attribute_name} = new_value - end - EOC - else - attr_reader name - end - end - - def def_classed_elements(name, attribute, plural_class_name=nil, - plural_name=nil, new_name=nil) - plural_name ||= "#{name}s" - new_name ||= name - def_classed_element(plural_name, plural_class_name) - local_variable_name = "_#{name}" - new_value_variable_name = "new_value" - additional_setup_code = nil - if block_given? - additional_setup_code = yield(local_variable_name, - new_value_variable_name) - end - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name} - #{local_variable_name} = #{plural_name}.first - #{local_variable_name} ? #{local_variable_name}.#{attribute} : nil - end - - def #{name}=(#{new_value_variable_name}) - #{local_variable_name} = - #{plural_name}.first || #{plural_name}.new_#{new_name} - #{additional_setup_code} - #{local_variable_name}.#{attribute} = #{new_value_variable_name} - end - EOC - end - - def def_other_element(name) - attr_accessor name - def_other_element_without_accessor(name) - end - - def def_other_element_without_accessor(name) - add_need_initialize_variable(name) - add_other_element(name) - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def setup_#{name}(feed, current) - if !@#{name}.nil? and current.respond_to?(:#{name}=) - current.#{name} = @#{name} - end - end - EOC - end - - def def_csv_element(name, type=nil) - def_other_element_without_accessor(name) - attr_reader(name) - converter = "" - if type == :integer - converter = "{|v| Integer(v)}" - end - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name}=(value) - @#{name} = Utils::CSV.parse(value)#{converter} - end - EOC - end - end - - attr_reader :maker - def initialize(maker) - @maker = maker - @default_values_are_set = false - initialize_variables - end - - def have_required_values? - not_set_required_variables.empty? - end - - def variable_is_set? - variables.any? {|var| not __send__(var).nil?} - end - - private - def initialize_variables - self.class.need_initialize_variables.each do |variable_name, init_value| - if init_value.nil? - value = nil - else - if init_value.respond_to?(:call) - value = init_value.call(self) - elsif init_value.is_a?(String) - # just for backward compatibility - value = instance_eval(init_value, __FILE__, __LINE__) - else - value = init_value - end - end - instance_variable_set("@#{variable_name}", value) - end - end - - def setup_other_elements(feed, current=nil) - current ||= current_element(feed) - self.class.other_elements.each do |element| - __send__("setup_#{element}", feed, current) - end - end - - def current_element(feed) - feed - end - - def set_default_values(&block) - return yield if @default_values_are_set - - begin - @default_values_are_set = true - _set_default_values(&block) - ensure - @default_values_are_set = false - end - end - - def _set_default_values(&block) - yield - end - - def setup_values(target) - set = false - if have_required_values? - variables.each do |var| - setter = "#{var}=" - if target.respond_to?(setter) - value = __send__(var) - unless value.nil? - target.__send__(setter, value) - set = true - end - end - end - end - set - end - - def set_parent(target, parent) - target.parent = parent if target.class.need_parent? - end - - def variables - self.class.need_initialize_variables.find_all do |name, init| - # init == "nil" is just for backward compatibility - init.nil? or init == "nil" - end.collect do |name, init| - name - end - end - - def not_set_required_variables - required_variable_names.find_all do |var| - __send__(var).nil? - end - end - - def required_variables_are_set? - required_variable_names.each do |var| - return false if __send__(var).nil? - end - true - end - end - - module AtomPersonConstructBase - def self.append_features(klass) - super - - klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1) - %w(name uri email).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - EOC - end - end - - module AtomTextConstructBase - module EnsureXMLContent - class << self - def included(base) - super - base.class_eval do - %w(type content xml_content).each do |element| - attr_reader element - attr_writer element if element != "xml_content" - add_need_initialize_variable(element) - end - - alias_method(:xhtml, :xml_content) - end - end - end - - def ensure_xml_content(content) - xhtml_uri = ::RSS::Atom::XHTML_URI - unless content.is_a?(RSS::XML::Element) and - ["div", xhtml_uri] == [content.name, content.uri] - children = content - children = [children] unless content.is_a?(Array) - children = set_xhtml_uri_as_default_uri(children) - content = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - children) - end - content - end - - def xml_content=(content) - @xml_content = ensure_xml_content(content) - end - - def xhtml=(content) - self.xml_content = content - end - - private - def set_xhtml_uri_as_default_uri(children) - children.collect do |child| - if child.is_a?(RSS::XML::Element) and - child.prefix.nil? and child.uri.nil? - RSS::XML::Element.new(child.name, nil, ::RSS::Atom::XHTML_URI, - child.attributes.dup, - set_xhtml_uri_as_default_uri(child.children)) - else - child - end - end - end - end - - def self.append_features(klass) - super - - klass.class_eval do - include EnsureXMLContent - end - end - end - - module SetupDefaultDate - private - def _set_default_values - keep = { - :date => date, - :dc_dates => dc_dates.to_a.dup, - } - _date = _parse_date_if_needed(date) - if _date and !dc_dates.any? {|dc_date| dc_date.value == _date} - dc_date = self.class::DublinCoreDates::DublinCoreDate.new(self) - dc_date.value = _date.dup - dc_dates.unshift(dc_date) - end - self.date ||= self.dc_date - super - ensure - self.date = keep[:date] - dc_dates.replace(keep[:dc_dates]) - end - - def _parse_date_if_needed(date_value) - date_value = Time.parse(date_value) if date_value.is_a?(String) - date_value - end - end - - module SetupDefaultLanguage - private - def _set_default_values - keep = { - :dc_languages => dc_languages.to_a.dup, - } - _language = language - if _language and - !dc_languages.any? {|dc_language| dc_language.value == _language} - dc_language = self.class::DublinCoreLanguages::DublinCoreLanguage.new(self) - dc_language.value = _language.dup - dc_languages.unshift(dc_language) - end - super - ensure - dc_languages.replace(keep[:dc_languages]) - end - end - - class RSSBase < Base - class << self - def make(*args, &block) - new(*args).make(&block) - end - end - - %w(xml_stylesheets channel image items textinput).each do |element| - attr_reader element - add_need_initialize_variable(element) do |object| - object.send("make_#{element}") - end - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - private - def setup_#{element}(feed) - @#{element}.to_feed(feed) - end - - def make_#{element} - self.class::#{Utils.to_class_name(element)}.new(self) - end - EOC - end - - attr_reader :feed_version - alias_method(:rss_version, :feed_version) - attr_accessor :version, :encoding, :standalone - - def initialize(feed_version) - super(self) - @feed_type = nil - @feed_subtype = nil - @feed_version = feed_version - @version = "1.0" - @encoding = "UTF-8" - @standalone = nil - end - - def make - yield(self) - to_feed - end - - def to_feed - feed = make_feed - setup_xml_stylesheets(feed) - setup_elements(feed) - setup_other_elements(feed) - feed.validate - feed - end - - private - remove_method :make_xml_stylesheets - def make_xml_stylesheets - XMLStyleSheets.new(self) - end - end - - class XMLStyleSheets < Base - def_array_element("xml_stylesheet", nil, "XMLStyleSheet") - - class XMLStyleSheet < Base - - ::RSS::XMLStyleSheet::ATTRIBUTES.each do |attribute| - attr_accessor attribute - add_need_initialize_variable(attribute) - end - - def to_feed(feed) - xss = ::RSS::XMLStyleSheet.new - guess_type_if_need(xss) - set = setup_values(xss) - if set - feed.xml_stylesheets << xss - end - end - - private - def guess_type_if_need(xss) - if @type.nil? - xss.href = @href - @type = xss.type - end - end - - def required_variable_names - %w(href type) - end - end - end - - class ChannelBase < Base - include SetupDefaultDate - - %w(cloud categories skipDays skipHours).each do |name| - def_classed_element(name) - end - - %w(generator copyright description title).each do |name| - def_classed_element(name, nil, "content") - end - - [ - ["link", "href", Proc.new {|target,| "#{target}.href = 'self'"}], - ["author", "name"], - ["contributor", "name"], - ].each do |name, attribute, additional_setup_maker| - def_classed_elements(name, attribute, &additional_setup_maker) - end - - %w(id about language - managingEditor webMaster rating docs ttl).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - %w(date lastBuildDate).each do |date_element| - attr_reader date_element - add_need_initialize_variable(date_element) - end - - def date=(_date) - @date = _parse_date_if_needed(_date) - end - - def lastBuildDate=(_date) - @lastBuildDate = _parse_date_if_needed(_date) - end - - def pubDate - date - end - - def pubDate=(date) - self.date = date - end - - def updated - date - end - - def updated=(date) - self.date = date - end - - alias_method(:rights, :copyright) - alias_method(:rights=, :copyright=) - - alias_method(:subtitle, :description) - alias_method(:subtitle=, :description=) - - def icon - image_favicon.about - end - - def icon=(url) - image_favicon.about = url - end - - def logo - maker.image.url - end - - def logo=(url) - maker.image.url = url - end - - class SkipDaysBase < Base - def_array_element("day") - - class DayBase < Base - %w(content).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - end - - class SkipHoursBase < Base - def_array_element("hour") - - class HourBase < Base - %w(content).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - end - - class CloudBase < Base - %w(domain port path registerProcedure protocol).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - - class CategoriesBase < Base - def_array_element("category", "categories") - - class CategoryBase < Base - %w(domain content label).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - alias_method(:term, :domain) - alias_method(:term=, :domain=) - alias_method(:scheme, :content) - alias_method(:scheme=, :content=) - end - end - - class LinksBase < Base - def_array_element("link") - - class LinkBase < Base - %w(href rel type hreflang title length).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - end - - class AuthorsBase < Base - def_array_element("author") - - class AuthorBase < Base - include AtomPersonConstructBase - end - end - - class ContributorsBase < Base - def_array_element("contributor") - - class ContributorBase < Base - include AtomPersonConstructBase - end - end - - class GeneratorBase < Base - %w(uri version content).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - - class CopyrightBase < Base - include AtomTextConstructBase - end - - class DescriptionBase < Base - include AtomTextConstructBase - end - - class TitleBase < Base - include AtomTextConstructBase - end - end - - class ImageBase < Base - %w(title url width height description).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - def link - @maker.channel.link - end - end - - class ItemsBase < Base - def_array_element("item") - - attr_accessor :do_sort, :max_size - - def initialize(maker) - super - @do_sort = false - @max_size = -1 - end - - def normalize - if @max_size >= 0 - sort_if_need[0...@max_size] - else - sort_if_need[0..@max_size] - end - end - - private - def sort_if_need - if @do_sort.respond_to?(:call) - @items.sort do |x, y| - @do_sort.call(x, y) - end - elsif @do_sort - @items.sort do |x, y| - y <=> x - end - else - @items - end - end - - class ItemBase < Base - include SetupDefaultDate - - %w(guid enclosure source categories content).each do |name| - def_classed_element(name) - end - - %w(rights description title).each do |name| - def_classed_element(name, nil, "content") - end - - [ - ["author", "name"], - ["link", "href", Proc.new {|target,| "#{target}.href = 'alternate'"}], - ["contributor", "name"], - ].each do |name, attribute| - def_classed_elements(name, attribute) - end - - %w(comments id published).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - %w(date).each do |date_element| - attr_reader date_element - add_need_initialize_variable(date_element) - end - - def date=(_date) - @date = _parse_date_if_needed(_date) - end - - def pubDate - date - end - - def pubDate=(date) - self.date = date - end - - def updated - date - end - - def updated=(date) - self.date = date - end - - alias_method(:summary, :description) - alias_method(:summary=, :description=) - - def <=>(other) - _date = date || dc_date - _other_date = other.date || other.dc_date - if _date and _other_date - _date <=> _other_date - elsif _date - 1 - elsif _other_date - -1 - else - 0 - end - end - - class GuidBase < Base - %w(isPermaLink content).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - def permanent_link? - isPermaLink - end - - def permanent_link=(bool) - self.isPermaLink = bool - end - end - - class EnclosureBase < Base - %w(url length type).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - - class SourceBase < Base - include SetupDefaultDate - - %w(authors categories contributors generator icon - logo rights subtitle title).each do |name| - def_classed_element(name) - end - - [ - ["link", "href"], - ].each do |name, attribute| - def_classed_elements(name, attribute) - end - - %w(id content).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - - alias_method(:url, :link) - alias_method(:url=, :link=) - - %w(date).each do |date_element| - attr_reader date_element - add_need_initialize_variable(date_element) - end - - def date=(_date) - @date = _parse_date_if_needed(_date) - end - - def updated - date - end - - def updated=(date) - self.date = date - end - - private - AuthorsBase = ChannelBase::AuthorsBase - CategoriesBase = ChannelBase::CategoriesBase - ContributorsBase = ChannelBase::ContributorsBase - GeneratorBase = ChannelBase::GeneratorBase - - class IconBase < Base - %w(url).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - - LinksBase = ChannelBase::LinksBase - - class LogoBase < Base - %w(uri).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - - class RightsBase < Base - include AtomTextConstructBase - end - - class SubtitleBase < Base - include AtomTextConstructBase - end - - class TitleBase < Base - include AtomTextConstructBase - end - end - - CategoriesBase = ChannelBase::CategoriesBase - AuthorsBase = ChannelBase::AuthorsBase - LinksBase = ChannelBase::LinksBase - ContributorsBase = ChannelBase::ContributorsBase - - class RightsBase < Base - include AtomTextConstructBase - end - - class DescriptionBase < Base - include AtomTextConstructBase - end - - class ContentBase < Base - include AtomTextConstructBase::EnsureXMLContent - - %w(src).each do |element| - attr_accessor(element) - add_need_initialize_variable(element) - end - - def xml_content=(content) - content = ensure_xml_content(content) if inline_xhtml? - @xml_content = content - end - - alias_method(:xml, :xml_content) - alias_method(:xml=, :xml_content=) - - def inline_text? - [nil, "text", "html"].include?(@type) - end - - def inline_html? - @type == "html" - end - - def inline_xhtml? - @type == "xhtml" - end - - def inline_other? - !out_of_line? and ![nil, "text", "html", "xhtml"].include?(@type) - end - - def inline_other_text? - return false if @type.nil? or out_of_line? - /\Atext\//i.match(@type) ? true : false - end - - def inline_other_xml? - return false if @type.nil? or out_of_line? - /[\+\/]xml\z/i.match(@type) ? true : false - end - - def inline_other_base64? - return false if @type.nil? or out_of_line? - @type.include?("/") and !inline_other_text? and !inline_other_xml? - end - - def out_of_line? - not @src.nil? and @content.nil? - end - end - - class TitleBase < Base - include AtomTextConstructBase - end - end - end - - class TextinputBase < Base - %w(title description name link).each do |element| - attr_accessor element - add_need_initialize_variable(element) - end - end - end -end diff --git a/lib/rss/maker/content.rb b/lib/rss/maker/content.rb deleted file mode 100644 index b3f4e5036e8945..00000000000000 --- a/lib/rss/maker/content.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: false -require_relative '../content' -require_relative '1.0' -require_relative '2.0' - -module RSS - module Maker - module ContentModel - def self.append_features(klass) - super - - ::RSS::ContentModel::ELEMENTS.each do |name| - klass.def_other_element(name) - end - end - end - - class ItemsBase - class ItemBase; include ContentModel; end - end - end -end diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb deleted file mode 100644 index beea3134b4f549..00000000000000 --- a/lib/rss/maker/dublincore.rb +++ /dev/null @@ -1,122 +0,0 @@ -# frozen_string_literal: false -require_relative '../dublincore' -require_relative '1.0' - -module RSS - module Maker - module DublinCoreModel - def self.append_features(klass) - super - - ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name| - plural_name ||= "#{name}s" - full_name = "#{RSS::DC_PREFIX}_#{name}" - full_plural_name = "#{RSS::DC_PREFIX}_#{plural_name}" - plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}" - klass.def_classed_elements(full_name, "value", plural_klass_name, - full_plural_name, name) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def new_#{full_name}(value=nil) - _#{full_name} = #{full_plural_name}.new_#{name} - _#{full_name}.value = value - if block_given? - yield _#{full_name} - else - _#{full_name} - end - end - EOC - end - - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - # For backward compatibility - alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list - EOC - end - - ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name| - plural_name ||= "#{name}s" - full_name ||= "#{DC_PREFIX}_#{name}" - full_plural_name ||= "#{DC_PREFIX}_#{plural_name}" - klass_name = Utils.to_class_name(name) - full_klass_name = "DublinCore#{klass_name}" - plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}" - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class #{plural_klass_name}Base < Base - def_array_element(#{name.dump}, #{full_plural_name.dump}, - #{full_klass_name.dump}) - - class #{full_klass_name}Base < Base - attr_accessor :value - add_need_initialize_variable("value") - alias_method(:content, :value) - alias_method(:content=, :value=) - - def have_required_values? - @value - end - - def to_feed(feed, current) - if value and current.respond_to?(:#{full_name}) - new_item = current.class::#{full_klass_name}.new(value) - current.#{full_plural_name} << new_item - end - end - end - #{klass_name}Base = #{full_klass_name}Base - end - EOC - end - - def self.install_dublin_core(klass) - ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name| - plural_name ||= "#{name}s" - klass_name = Utils.to_class_name(name) - full_klass_name = "DublinCore#{klass_name}" - plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}" - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class #{plural_klass_name} < #{plural_klass_name}Base - class #{full_klass_name} < #{full_klass_name}Base - end - #{klass_name} = #{full_klass_name} - end -EOC - end - end - end - - class ChannelBase - include DublinCoreModel - end - - class ImageBase; include DublinCoreModel; end - class ItemsBase - class ItemBase - include DublinCoreModel - end - end - class TextinputBase; include DublinCoreModel; end - - makers.each do |maker| - maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class Channel - DublinCoreModel.install_dublin_core(self) - end - - class Image - DublinCoreModel.install_dublin_core(self) - end - - class Items - class Item - DublinCoreModel.install_dublin_core(self) - end - end - - class Textinput - DublinCoreModel.install_dublin_core(self) - end - EOC - end - end -end diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb deleted file mode 100644 index ccdf9608ae6786..00000000000000 --- a/lib/rss/maker/entry.rb +++ /dev/null @@ -1,164 +0,0 @@ -# frozen_string_literal: false -require_relative "atom" -require_relative "feed" - -module RSS - module Maker - module Atom - class Entry < RSSBase - def initialize(feed_version="1.0") - super - @feed_type = "atom" - @feed_subtype = "entry" - end - - private - def make_feed - ::RSS::Atom::Entry.new(@version, @encoding, @standalone) - end - - def setup_elements(entry) - setup_items(entry) - end - - class Channel < ChannelBase - class SkipDays < SkipDaysBase - class Day < DayBase - end - end - - class SkipHours < SkipHoursBase - class Hour < HourBase - end - end - - class Cloud < CloudBase - end - - Categories = Feed::Channel::Categories - Links = Feed::Channel::Links - Authors = Feed::Channel::Authors - Contributors = Feed::Channel::Contributors - - class Generator < GeneratorBase - include AtomGenerator - - def self.not_set_name - "maker.channel.generator" - end - end - - Copyright = Feed::Channel::Copyright - - class Description < DescriptionBase - end - - Title = Feed::Channel::Title - end - - class Image < ImageBase - end - - class Items < ItemsBase - def to_feed(entry) - (normalize.first || Item.new(@maker)).to_feed(entry) - end - - class Item < ItemBase - def to_feed(entry) - set_default_values do - setup_values(entry) - entry.dc_dates.clear - setup_other_elements(entry) - unless have_required_values? - raise NotSetError.new("maker.item", not_set_required_variables) - end - end - end - - private - def required_variable_names - %w(id updated) - end - - def variables - super + ["updated"] - end - - def variable_is_set? - super or !authors.empty? - end - - def not_set_required_variables - set_default_values do - vars = super - if authors.all? {|author| !author.have_required_values?} - vars << "author" - end - vars << "title" unless title {|t| t.have_required_values?} - vars - end - end - - def _set_default_values - keep = { - :authors => authors.to_a.dup, - :contributors => contributors.to_a.dup, - :categories => categories.to_a.dup, - :id => id, - :links => links.to_a.dup, - :rights => @rights, - :title => @title, - :updated => updated, - } - authors.replace(@maker.channel.authors) if keep[:authors].empty? - if keep[:contributors].empty? - contributors.replace(@maker.channel.contributors) - end - if keep[:categories].empty? - categories.replace(@maker.channel.categories) - end - self.id ||= link || @maker.channel.id - links.replace(@maker.channel.links) if keep[:links].empty? - unless keep[:rights].variable_is_set? - @maker.channel.rights {|r| @rights = r} - end - unless keep[:title].variable_is_set? - @maker.channel.title {|t| @title = t} - end - self.updated ||= @maker.channel.updated - super - ensure - authors.replace(keep[:authors]) - contributors.replace(keep[:contributors]) - categories.replace(keep[:categories]) - links.replace(keep[:links]) - self.id = keep[:id] - @rights = keep[:rights] - @title = keep[:title] - self.updated = keep[:updated] - end - - Guid = Feed::Items::Item::Guid - Enclosure = Feed::Items::Item::Enclosure - Source = Feed::Items::Item::Source - Categories = Feed::Items::Item::Categories - Authors = Feed::Items::Item::Authors - Contributors = Feed::Items::Item::Contributors - Links = Feed::Items::Item::Links - Rights = Feed::Items::Item::Rights - Description = Feed::Items::Item::Description - Title = Feed::Items::Item::Title - Content = Feed::Items::Item::Content - end - end - - class Textinput < TextinputBase - end - end - end - - add_maker("atom:entry", "1.0", Atom::Entry) - add_maker("atom1.0:entry", "1.0", Atom::Entry) - end -end diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb deleted file mode 100644 index 72ee704d6af61c..00000000000000 --- a/lib/rss/maker/feed.rb +++ /dev/null @@ -1,427 +0,0 @@ -# frozen_string_literal: false -require_relative "atom" - -module RSS - module Maker - module Atom - class Feed < RSSBase - def initialize(feed_version="1.0") - super - @feed_type = "atom" - @feed_subtype = "feed" - end - - private - def make_feed - ::RSS::Atom::Feed.new(@version, @encoding, @standalone) - end - - def setup_elements(feed) - setup_channel(feed) - setup_image(feed) - setup_items(feed) - end - - class Channel < ChannelBase - include SetupDefaultLanguage - - def to_feed(feed) - set_default_values do - setup_values(feed) - feed.dc_dates.clear - setup_other_elements(feed) - if image_favicon.about - icon = feed.class::Icon.new - icon.content = image_favicon.about - feed.icon = icon - end - unless have_required_values? - raise NotSetError.new("maker.channel", - not_set_required_variables) - end - end - end - - def have_required_values? - super and - (!authors.empty? or - @maker.items.any? {|item| !item.authors.empty?}) - end - - private - def required_variable_names - %w(id updated) - end - - def variables - super + %w(id updated) - end - - def variable_is_set? - super or !authors.empty? - end - - def not_set_required_variables - vars = super - if authors.empty? and - @maker.items.all? {|item| item.author.to_s.empty?} - vars << "author" - end - vars << "title" unless title {|t| t.have_required_values?} - vars - end - - def _set_default_values(&block) - keep = { - :id => id, - } - self.id ||= about - super(&block) - ensure - self.id = keep[:id] - end - - class SkipDays < SkipDaysBase - def to_feed(*args) - end - - class Day < DayBase - end - end - - class SkipHours < SkipHoursBase - def to_feed(*args) - end - - class Hour < HourBase - end - end - - class Cloud < CloudBase - def to_feed(*args) - end - end - - class Categories < CategoriesBase - class Category < CategoryBase - include AtomCategory - - def self.not_set_name - "maker.channel.category" - end - end - end - - class Links < LinksBase - class Link < LinkBase - include AtomLink - - def self.not_set_name - "maker.channel.link" - end - end - end - - AtomPersons.def_atom_persons(self, "author", "maker.channel.author") - AtomPersons.def_atom_persons(self, "contributor", - "maker.channel.contributor") - - class Generator < GeneratorBase - include AtomGenerator - - def self.not_set_name - "maker.channel.generator" - end - end - - AtomTextConstruct.def_atom_text_construct(self, "rights", - "maker.channel.copyright", - "Copyright") - AtomTextConstruct.def_atom_text_construct(self, "subtitle", - "maker.channel.description", - "Description") - AtomTextConstruct.def_atom_text_construct(self, "title", - "maker.channel.title") - end - - class Image < ImageBase - def to_feed(feed) - logo = feed.class::Logo.new - class << logo - alias_method(:url=, :content=) - end - set = setup_values(logo) - class << logo - remove_method(:url=) - end - if set - feed.logo = logo - set_parent(logo, feed) - setup_other_elements(feed, logo) - elsif variable_is_set? - raise NotSetError.new("maker.image", not_set_required_variables) - end - end - - private - def required_variable_names - %w(url) - end - end - - class Items < ItemsBase - def to_feed(feed) - normalize.each do |item| - item.to_feed(feed) - end - setup_other_elements(feed, feed.entries) - end - - class Item < ItemBase - def to_feed(feed) - set_default_values do - entry = feed.class::Entry.new - set = setup_values(entry) - entry.dc_dates.clear - setup_other_elements(feed, entry) - if set - feed.entries << entry - set_parent(entry, feed) - elsif variable_is_set? - raise NotSetError.new("maker.item", not_set_required_variables) - end - end - end - - def have_required_values? - set_default_values do - super and title {|t| t.have_required_values?} - end - end - - private - def required_variable_names - %w(id updated) - end - - def variables - super + ["updated"] - end - - def not_set_required_variables - vars = super - vars << "title" unless title {|t| t.have_required_values?} - vars - end - - def _set_default_values(&block) - keep = { - :id => id, - } - self.id ||= link - super(&block) - ensure - self.id = keep[:id] - end - - class Guid < GuidBase - def to_feed(feed, current) - end - end - - class Enclosure < EnclosureBase - def to_feed(feed, current) - end - end - - class Source < SourceBase - def to_feed(feed, current) - source = current.class::Source.new - setup_values(source) - current.source = source - set_parent(source, current) - setup_other_elements(feed, source) - current.source = nil if source.to_s == "" - end - - private - def required_variable_names - [] - end - - def variables - super + ["updated"] - end - - AtomPersons.def_atom_persons(self, "author", - "maker.item.source.author") - AtomPersons.def_atom_persons(self, "contributor", - "maker.item.source.contributor") - - class Categories < CategoriesBase - class Category < CategoryBase - include AtomCategory - - def self.not_set_name - "maker.item.source.category" - end - end - end - - class Generator < GeneratorBase - include AtomGenerator - - def self.not_set_name - "maker.item.source.generator" - end - end - - class Icon < IconBase - def to_feed(feed, current) - icon = current.class::Icon.new - class << icon - alias_method(:url=, :content=) - end - set = setup_values(icon) - class << icon - remove_method(:url=) - end - if set - current.icon = icon - set_parent(icon, current) - setup_other_elements(feed, icon) - elsif variable_is_set? - raise NotSetError.new("maker.item.source.icon", - not_set_required_variables) - end - end - - private - def required_variable_names - %w(url) - end - end - - class Links < LinksBase - class Link < LinkBase - include AtomLink - - def self.not_set_name - "maker.item.source.link" - end - end - end - - class Logo < LogoBase - include AtomLogo - - def self.not_set_name - "maker.item.source.logo" - end - end - - maker_name_base = "maker.item.source." - maker_name = "#{maker_name_base}rights" - AtomTextConstruct.def_atom_text_construct(self, "rights", - maker_name) - maker_name = "#{maker_name_base}subtitle" - AtomTextConstruct.def_atom_text_construct(self, "subtitle", - maker_name) - maker_name = "#{maker_name_base}title" - AtomTextConstruct.def_atom_text_construct(self, "title", - maker_name) - end - - class Categories < CategoriesBase - class Category < CategoryBase - include AtomCategory - - def self.not_set_name - "maker.item.category" - end - end - end - - AtomPersons.def_atom_persons(self, "author", "maker.item.author") - AtomPersons.def_atom_persons(self, "contributor", - "maker.item.contributor") - - class Links < LinksBase - class Link < LinkBase - include AtomLink - - def self.not_set_name - "maker.item.link" - end - end - end - - AtomTextConstruct.def_atom_text_construct(self, "rights", - "maker.item.rights") - AtomTextConstruct.def_atom_text_construct(self, "summary", - "maker.item.description", - "Description") - AtomTextConstruct.def_atom_text_construct(self, "title", - "maker.item.title") - - class Content < ContentBase - def to_feed(feed, current) - content = current.class::Content.new - if setup_values(content) - content.src = nil if content.src and content.content - current.content = content - set_parent(content, current) - setup_other_elements(feed, content) - elsif variable_is_set? - raise NotSetError.new("maker.item.content", - not_set_required_variables) - end - end - - alias_method(:xml, :xml_content) - - private - def required_variable_names - if out_of_line? - %w(type) - elsif xml_type? - %w(xml_content) - else - %w(content) - end - end - - def variables - if out_of_line? - super - elsif xml_type? - super + %w(xml) - else - super - end - end - - def xml_type? - _type = type - return false if _type.nil? - _type == "xhtml" or - /(?:\+xml|\/xml)$/i =~ _type or - %w(text/xml-external-parsed-entity - application/xml-external-parsed-entity - application/xml-dtd).include?(_type.downcase) - end - end - end - end - - class Textinput < TextinputBase - end - end - end - - add_maker("atom", "1.0", Atom::Feed) - add_maker("atom:feed", "1.0", Atom::Feed) - add_maker("atom1.0", "1.0", Atom::Feed) - add_maker("atom1.0:feed", "1.0", Atom::Feed) - end -end diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb deleted file mode 100644 index e3e62d8b9e9de1..00000000000000 --- a/lib/rss/maker/image.rb +++ /dev/null @@ -1,112 +0,0 @@ -# frozen_string_literal: false -require_relative '../image' -require_relative '1.0' -require_relative 'dublincore' - -module RSS - module Maker - module ImageItemModel - def self.append_features(klass) - super - - name = "#{RSS::IMAGE_PREFIX}_item" - klass.def_classed_element(name) - end - - def self.install_image_item(klass) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class ImageItem < ImageItemBase - DublinCoreModel.install_dublin_core(self) - end -EOC - end - - class ImageItemBase < Base - include Maker::DublinCoreModel - - attr_accessor :about, :resource, :image_width, :image_height - add_need_initialize_variable("about") - add_need_initialize_variable("resource") - add_need_initialize_variable("image_width") - add_need_initialize_variable("image_height") - alias width= image_width= - alias width image_width - alias height= image_height= - alias height image_height - - def have_required_values? - @about - end - - def to_feed(feed, current) - if current.respond_to?(:image_item=) and have_required_values? - item = current.class::ImageItem.new - setup_values(item) - setup_other_elements(item) - current.image_item = item - end - end - end - end - - module ImageFaviconModel - def self.append_features(klass) - super - - name = "#{RSS::IMAGE_PREFIX}_favicon" - klass.def_classed_element(name) - end - - def self.install_image_favicon(klass) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class ImageFavicon < ImageFaviconBase - DublinCoreModel.install_dublin_core(self) - end - EOC - end - - class ImageFaviconBase < Base - include Maker::DublinCoreModel - - attr_accessor :about, :image_size - add_need_initialize_variable("about") - add_need_initialize_variable("image_size") - alias size image_size - alias size= image_size= - - def have_required_values? - @about and @image_size - end - - def to_feed(feed, current) - if current.respond_to?(:image_favicon=) and have_required_values? - favicon = current.class::ImageFavicon.new - setup_values(favicon) - setup_other_elements(favicon) - current.image_favicon = favicon - end - end - end - end - - class ChannelBase; include Maker::ImageFaviconModel; end - - class ItemsBase - class ItemBase; include Maker::ImageItemModel; end - end - - makers.each do |maker| - maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class Channel - ImageFaviconModel.install_image_favicon(self) - end - - class Items - class Item - ImageItemModel.install_image_item(self) - end - end - EOC - end - end -end diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb deleted file mode 100644 index 28cca3202137eb..00000000000000 --- a/lib/rss/maker/itunes.rb +++ /dev/null @@ -1,243 +0,0 @@ -# frozen_string_literal: false -require_relative '../itunes' -require_relative '2.0' - -module RSS - module Maker - module ITunesBaseModel - def def_class_accessor(klass, name, type, *args) - name = name.gsub(/-/, "_").gsub(/^itunes_/, '') - full_name = "#{RSS::ITUNES_PREFIX}_#{name}" - case type - when nil - klass.def_other_element(full_name) - when :yes_other - def_yes_other_accessor(klass, full_name) - when :explicit_clean_other - def_explicit_clean_other_accessor(klass, full_name) - when :csv - def_csv_accessor(klass, full_name) - when :element, :attribute - recommended_attribute_name, = *args - klass_name = "ITunes#{Utils.to_class_name(name)}" - klass.def_classed_element(full_name, klass_name, - recommended_attribute_name) - when :elements - plural_name, recommended_attribute_name = args - plural_name ||= "#{name}s" - full_plural_name = "#{RSS::ITUNES_PREFIX}_#{plural_name}" - klass_name = "ITunes#{Utils.to_class_name(name)}" - plural_klass_name = "ITunes#{Utils.to_class_name(plural_name)}" - def_elements_class_accessor(klass, name, full_name, full_plural_name, - klass_name, plural_klass_name, - recommended_attribute_name) - end - end - - def def_yes_other_accessor(klass, full_name) - klass.def_other_element(full_name) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{full_name}? - Utils::YesOther.parse(@#{full_name}) - end - EOC - end - - def def_explicit_clean_other_accessor(klass, full_name) - klass.def_other_element(full_name) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{full_name}? - Utils::ExplicitCleanOther.parse(#{full_name}) - end - EOC - end - - def def_csv_accessor(klass, full_name) - klass.def_csv_element(full_name) - end - - def def_elements_class_accessor(klass, name, full_name, full_plural_name, - klass_name, plural_klass_name, - recommended_attribute_name=nil) - if recommended_attribute_name - klass.def_classed_elements(full_name, recommended_attribute_name, - plural_klass_name, full_plural_name) - else - klass.def_classed_element(full_plural_name, plural_klass_name) - end - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def new_#{full_name}(text=nil) - #{full_name} = @#{full_plural_name}.new_#{name} - #{full_name}.text = text - if block_given? - yield #{full_name} - else - #{full_name} - end - end - EOC - end - end - - module ITunesChannelModel - extend ITunesBaseModel - - class << self - def append_features(klass) - super - - ::RSS::ITunesChannelModel::ELEMENT_INFOS.each do |name, type, *args| - def_class_accessor(klass, name, type, *args) - end - end - end - - class ITunesCategoriesBase < Base - def_array_element("category", "itunes_categories", - "ITunesCategory") - class ITunesCategoryBase < Base - attr_accessor :text - add_need_initialize_variable("text") - def_array_element("category", "itunes_categories", - "ITunesCategory") - - def have_required_values? - text - end - - alias_method :to_feed_for_categories, :to_feed - def to_feed(feed, current) - if text and current.respond_to?(:itunes_category) - new_item = current.class::ITunesCategory.new(text) - to_feed_for_categories(feed, new_item) - current.itunes_categories << new_item - end - end - end - end - - class ITunesImageBase < Base - add_need_initialize_variable("href") - attr_accessor("href") - - def to_feed(feed, current) - if @href and current.respond_to?(:itunes_image) - current.itunes_image ||= current.class::ITunesImage.new - current.itunes_image.href = @href - end - end - end - - class ITunesOwnerBase < Base - %w(itunes_name itunes_email).each do |name| - add_need_initialize_variable(name) - attr_accessor(name) - end - - def to_feed(feed, current) - if current.respond_to?(:itunes_owner=) - _not_set_required_variables = not_set_required_variables - if (required_variable_names - _not_set_required_variables).empty? - return - end - - unless have_required_values? - raise NotSetError.new("maker.channel.itunes_owner", - _not_set_required_variables) - end - current.itunes_owner ||= current.class::ITunesOwner.new - current.itunes_owner.itunes_name = @itunes_name - current.itunes_owner.itunes_email = @itunes_email - end - end - - private - def required_variable_names - %w(itunes_name itunes_email) - end - end - end - - module ITunesItemModel - extend ITunesBaseModel - - class << self - def append_features(klass) - super - - ::RSS::ITunesItemModel::ELEMENT_INFOS.each do |name, type, *args| - def_class_accessor(klass, name, type, *args) - end - end - end - - class ITunesDurationBase < Base - attr_reader :content - add_need_initialize_variable("content") - - %w(hour minute second).each do |name| - attr_reader(name) - add_need_initialize_variable(name, 0) - end - - def content=(content) - if content.nil? - @hour, @minute, @second, @content = nil - else - @hour, @minute, @second = - ::RSS::ITunesItemModel::ITunesDuration.parse(content) - @content = content - end - end - - def hour=(hour) - @hour = Integer(hour) - update_content - end - - def minute=(minute) - @minute = Integer(minute) - update_content - end - - def second=(second) - @second = Integer(second) - update_content - end - - def to_feed(feed, current) - if @content and current.respond_to?(:itunes_duration=) - current.itunes_duration ||= current.class::ITunesDuration.new - current.itunes_duration.content = @content - end - end - - private - def update_content - components = [@hour, @minute, @second] - @content = - ::RSS::ITunesItemModel::ITunesDuration.construct(*components) - end - end - end - - class ChannelBase - include Maker::ITunesChannelModel - class ITunesCategories < ITunesCategoriesBase - class ITunesCategory < ITunesCategoryBase - ITunesCategory = self - end - end - - class ITunesImage < ITunesImageBase; end - class ITunesOwner < ITunesOwnerBase; end - end - - class ItemsBase - class ItemBase - include Maker::ITunesItemModel - class ITunesDuration < ITunesDurationBase; end - end - end - end -end diff --git a/lib/rss/maker/slash.rb b/lib/rss/maker/slash.rb deleted file mode 100644 index 473991903f0df5..00000000000000 --- a/lib/rss/maker/slash.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: false -require_relative '../slash' -require_relative '1.0' - -module RSS - module Maker - module SlashModel - def self.append_features(klass) - super - - ::RSS::SlashModel::ELEMENT_INFOS.each do |name, type| - full_name = "#{RSS::SLASH_PREFIX}_#{name}" - case type - when :csv_integer - klass.def_csv_element(full_name, :integer) - else - klass.def_other_element(full_name) - end - end - - klass.module_eval do - alias_method(:slash_hit_parades, :slash_hit_parade) - alias_method(:slash_hit_parades=, :slash_hit_parade=) - end - end - end - - class ItemsBase - class ItemBase - include SlashModel - end - end - end -end diff --git a/lib/rss/maker/syndication.rb b/lib/rss/maker/syndication.rb deleted file mode 100644 index 9fd0efe99ea452..00000000000000 --- a/lib/rss/maker/syndication.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: false -require_relative '../syndication' -require_relative '1.0' - -module RSS - module Maker - module SyndicationModel - def self.append_features(klass) - super - - ::RSS::SyndicationModel::ELEMENTS.each do |name| - klass.def_other_element(name) - end - end - end - - class ChannelBase; include SyndicationModel; end - end -end diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb deleted file mode 100644 index f9858922dadf27..00000000000000 --- a/lib/rss/maker/taxonomy.rb +++ /dev/null @@ -1,119 +0,0 @@ -# frozen_string_literal: false -require_relative '../taxonomy' -require_relative '1.0' -require_relative 'dublincore' - -module RSS - module Maker - module TaxonomyTopicsModel - def self.append_features(klass) - super - - klass.def_classed_element("#{RSS::TAXO_PREFIX}_topics", - "TaxonomyTopics") - end - - def self.install_taxo_topics(klass) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class TaxonomyTopics < TaxonomyTopicsBase - def to_feed(feed, current) - if current.respond_to?(:taxo_topics) - topics = current.class::TaxonomyTopics.new - bag = topics.Bag - @resources.each do |resource| - bag.lis << RDF::Bag::Li.new(resource) - end - current.taxo_topics = topics - end - end - end -EOC - end - - class TaxonomyTopicsBase < Base - attr_reader :resources - def_array_element("resource") - remove_method :new_resource - end - end - - module TaxonomyTopicModel - def self.append_features(klass) - super - - class_name = "TaxonomyTopics" - klass.def_classed_elements("#{TAXO_PREFIX}_topic", "value", class_name) - end - - def self.install_taxo_topic(klass) - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class TaxonomyTopics < TaxonomyTopicsBase - class TaxonomyTopic < TaxonomyTopicBase - DublinCoreModel.install_dublin_core(self) - TaxonomyTopicsModel.install_taxo_topics(self) - - def to_feed(feed, current) - if current.respond_to?(:taxo_topics) - topic = current.class::TaxonomyTopic.new(value) - topic.taxo_link = value - taxo_topics.to_feed(feed, topic) if taxo_topics - current.taxo_topics << topic - setup_other_elements(feed, topic) - end - end - end - end -EOC - end - - class TaxonomyTopicsBase < Base - def_array_element("topic", nil, "TaxonomyTopic") - alias_method(:new_taxo_topic, :new_topic) # For backward compatibility - - class TaxonomyTopicBase < Base - include DublinCoreModel - include TaxonomyTopicsModel - - attr_accessor :value - add_need_initialize_variable("value") - alias_method(:taxo_link, :value) - alias_method(:taxo_link=, :value=) - - def have_required_values? - @value - end - end - end - end - - class RSSBase - include TaxonomyTopicModel - end - - class ChannelBase - include TaxonomyTopicsModel - end - - class ItemsBase - class ItemBase - include TaxonomyTopicsModel - end - end - - makers.each do |maker| - maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - TaxonomyTopicModel.install_taxo_topic(self) - - class Channel - TaxonomyTopicsModel.install_taxo_topics(self) - end - - class Items - class Item - TaxonomyTopicsModel.install_taxo_topics(self) - end - end - EOC - end - end -end diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb deleted file mode 100644 index f78b4058f93573..00000000000000 --- a/lib/rss/maker/trackback.rb +++ /dev/null @@ -1,62 +0,0 @@ -# frozen_string_literal: false -require_relative '../trackback' -require_relative '1.0' -require_relative '2.0' - -module RSS - module Maker - module TrackBackModel - def self.append_features(klass) - super - - klass.def_other_element("#{RSS::TRACKBACK_PREFIX}_ping") - klass.def_classed_elements("#{RSS::TRACKBACK_PREFIX}_about", "value", - "TrackBackAbouts") - end - - class TrackBackAboutsBase < Base - def_array_element("about", nil, "TrackBackAbout") - - class TrackBackAboutBase < Base - attr_accessor :value - add_need_initialize_variable("value") - - alias_method(:resource, :value) - alias_method(:resource=, :value=) - alias_method(:content, :value) - alias_method(:content=, :value=) - - def have_required_values? - @value - end - - def to_feed(feed, current) - if current.respond_to?(:trackback_abouts) and have_required_values? - about = current.class::TrackBackAbout.new - setup_values(about) - setup_other_elements(about) - current.trackback_abouts << about - end - end - end - end - end - - class ItemsBase - class ItemBase; include TrackBackModel; end - end - - makers.each do |maker| - maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - class Items - class Item - class TrackBackAbouts < TrackBackAboutsBase - class TrackBackAbout < TrackBackAboutBase - end - end - end - end - EOC - end - end -end diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb deleted file mode 100644 index e1bcfc53e34ed3..00000000000000 --- a/lib/rss/parser.rb +++ /dev/null @@ -1,589 +0,0 @@ -# frozen_string_literal: false -require "forwardable" -require "open-uri" - -require_relative "rss" -require_relative "xml" - -module RSS - - class NotWellFormedError < Error - attr_reader :line, :element - - # Create a new NotWellFormedError for an error at +line+ - # in +element+. If a block is given the return value of - # the block ends up in the error message. - def initialize(line=nil, element=nil) - message = "This is not well formed XML" - if element or line - message << "\nerror occurred" - message << " in #{element}" if element - message << " at about #{line} line" if line - end - message << "\n#{yield}" if block_given? - super(message) - end - end - - class XMLParserNotFound < Error - def initialize - super("available XML parser was not found in " << - "#{AVAILABLE_PARSER_LIBRARIES.inspect}.") - end - end - - class NotValidXMLParser < Error - def initialize(parser) - super("#{parser} is not an available XML parser. " << - "Available XML parser" << - (AVAILABLE_PARSERS.size > 1 ? "s are " : " is ") << - "#{AVAILABLE_PARSERS.inspect}.") - end - end - - class NSError < InvalidRSSError - attr_reader :tag, :prefix, :uri - def initialize(tag, prefix, require_uri) - @tag, @prefix, @uri = tag, prefix, require_uri - super("prefix <#{prefix}> doesn't associate uri " << - "<#{require_uri}> in tag <#{tag}>") - end - end - - class Parser - - extend Forwardable - - class << self - - @@default_parser = nil - - def default_parser - @@default_parser || AVAILABLE_PARSERS.first - end - - # Set @@default_parser to new_value if it is one of the - # available parsers. Else raise NotValidXMLParser error. - def default_parser=(new_value) - if AVAILABLE_PARSERS.include?(new_value) - @@default_parser = new_value - else - raise NotValidXMLParser.new(new_value) - end - end - - def parse(rss, *args) - if args.last.is_a?(Hash) - options = args.pop - else - options = {} - end - do_validate = boolean_argument(args[0], options[:validate], true) - ignore_unknown_element = - boolean_argument(args[1], options[:ignore_unknown_element], true) - parser_class = args[2] || options[:parser_class] || default_parser - parser = new(rss, parser_class) - parser.do_validate = do_validate - parser.ignore_unknown_element = ignore_unknown_element - parser.parse - end - - private - def boolean_argument(positioned_value, option_value, default) - value = positioned_value - if value.nil? and not option_value.nil? - value = option_value - end - value = default if value.nil? - value - end - end - - def_delegators(:@parser, :parse, :rss, - :ignore_unknown_element, - :ignore_unknown_element=, :do_validate, - :do_validate=) - - def initialize(rss, parser_class=self.class.default_parser) - @parser = parser_class.new(normalize_rss(rss)) - end - - private - - # Try to get the XML associated with +rss+. - # Return +rss+ if it already looks like XML, or treat it as a URI, - # or a file to get the XML, - def normalize_rss(rss) - return rss if maybe_xml?(rss) - - uri = to_uri(rss) - - if uri.respond_to?(:read) - uri.read - elsif (RUBY_VERSION >= '2.7' || !rss.tainted?) and File.readable?(rss) - File.open(rss) {|f| f.read} - else - rss - end - end - - # maybe_xml? tests if source is a string that looks like XML. - def maybe_xml?(source) - source.is_a?(String) and / :xml}] - @tag_stack = [[]] - @text_stack = [''] - @proc_stack = [] - @last_element = nil - @version = @encoding = @standalone = nil - @xml_stylesheets = [] - @xml_child_mode = false - @xml_element = nil - @last_xml_element = nil - end - - # set instance vars for version, encoding, standalone - def xmldecl(version, encoding, standalone) - @version, @encoding, @standalone = version, encoding, standalone - end - - def instruction(name, content) - if name == "xml-stylesheet" - params = parse_pi_content(content) - if params.has_key?("href") - @xml_stylesheets << XMLStyleSheet.new(params) - end - end - end - - def tag_start(name, attributes) - @text_stack.push('') - - ns = @ns_stack.last.dup - attrs = {} - attributes.each do |n, v| - if /\Axmlns(?:\z|:)/ =~ n - ns[$POSTMATCH] = v - else - attrs[n] = v - end - end - @ns_stack.push(ns) - - prefix, local = split_name(name) - @tag_stack.last.push([_ns(ns, prefix), local]) - @tag_stack.push([]) - if @xml_child_mode - previous = @last_xml_element - element_attrs = attributes.dup - unless previous - ns.each do |ns_prefix, value| - next if ns_prefix == "xml" - key = ns_prefix.empty? ? "xmlns" : "xmlns:#{ns_prefix}" - element_attrs[key] ||= value - end - end - next_element = XML::Element.new(local, - prefix.empty? ? nil : prefix, - _ns(ns, prefix), - element_attrs) - previous << next_element if previous - @last_xml_element = next_element - pr = Proc.new do |text, tags| - if previous - @last_xml_element = previous - else - @xml_element = @last_xml_element - @last_xml_element = nil - end - end - @proc_stack.push(pr) - else - if @rss.nil? and respond_to?("initial_start_#{local}", true) - __send__("initial_start_#{local}", local, prefix, attrs, ns.dup) - elsif respond_to?("start_#{local}", true) - __send__("start_#{local}", local, prefix, attrs, ns.dup) - else - start_else_element(local, prefix, attrs, ns.dup) - end - end - end - - def tag_end(name) - if DEBUG - p "end tag #{name}" - p @tag_stack - end - text = @text_stack.pop - tags = @tag_stack.pop - pr = @proc_stack.pop - pr.call(text, tags) unless pr.nil? - @ns_stack.pop - end - - def text(data) - if @xml_child_mode - @last_xml_element << data if @last_xml_element - else - @text_stack.last << data - end - end - - private - def _ns(ns, prefix) - ns.fetch(prefix, "") - end - - CONTENT_PATTERN = /\s*([^=]+)=(["'])([^\2]+?)\2/ - # Extract the first name="value" pair from content. - # Works with single quotes according to the constant - # CONTENT_PATTERN. Return a Hash. - def parse_pi_content(content) - params = {} - content.scan(CONTENT_PATTERN) do |name, quote, value| - params[name] = value - end - params - end - - def start_else_element(local, prefix, attrs, ns) - class_name = self.class.class_name(_ns(ns, prefix), local) - current_class = @last_element.class - if known_class?(current_class, class_name) - next_class = current_class.const_get(class_name) - start_have_something_element(local, prefix, attrs, ns, next_class) - else - if !@do_validate or @ignore_unknown_element - @proc_stack.push(setup_next_element_in_unknown_element) - else - parent = "ROOT ELEMENT???" - if current_class.tag_name - parent = current_class.tag_name - end - raise NotExpectedTagError.new(local, _ns(ns, prefix), parent) - end - end - end - - if Module.method(:const_defined?).arity == -1 - def known_class?(target_class, class_name) - class_name and - (target_class.const_defined?(class_name, false) or - target_class.constants.include?(class_name.to_sym)) - end - else - def known_class?(target_class, class_name) - class_name and - (target_class.const_defined?(class_name) or - target_class.constants.include?(class_name)) - end - end - - NAMESPLIT = /^(?:([\w:][-\w.]*):)?([\w:][-\w.]*)/ - def split_name(name) - name =~ NAMESPLIT - [$1 || '', $2] - end - - def check_ns(tag_name, prefix, ns, require_uri, ignore_unknown_element=nil) - if _ns(ns, prefix) == require_uri - true - else - if ignore_unknown_element.nil? - ignore_unknown_element = @ignore_unknown_element - end - - if ignore_unknown_element - false - elsif @do_validate - raise NSError.new(tag_name, prefix, require_uri) - else - # Force bind required URI with prefix - @ns_stack.last[prefix] = require_uri - true - end - end - end - - def start_get_text_element(tag_name, prefix, ns, required_uri) - pr = Proc.new do |text, tags| - setter = self.class.setter(required_uri, tag_name) - if setter and @last_element.respond_to?(setter) - if @do_validate - getter = self.class.getter(required_uri, tag_name) - if @last_element.__send__(getter) - raise TooMuchTagError.new(tag_name, @last_element.tag_name) - end - end - @last_element.__send__(setter, text.to_s) - else - if @do_validate and !@ignore_unknown_element - raise NotExpectedTagError.new(tag_name, _ns(ns, prefix), - @last_element.tag_name) - end - end - end - @proc_stack.push(pr) - end - - def start_have_something_element(tag_name, prefix, attrs, ns, klass) - if check_ns(tag_name, prefix, ns, klass.required_uri) - attributes = collect_attributes(tag_name, prefix, attrs, ns, klass) - @proc_stack.push(setup_next_element(tag_name, klass, attributes)) - else - @proc_stack.push(setup_next_element_in_unknown_element) - end - end - - def collect_attributes(tag_name, prefix, attrs, ns, klass) - attributes = {} - klass.get_attributes.each do |a_name, a_uri, required, element_name| - if a_uri.is_a?(String) or !a_uri.respond_to?(:include?) - a_uri = [a_uri] - end - unless a_uri == [""] - for prefix, uri in ns - if a_uri.include?(uri) - val = attrs["#{prefix}:#{a_name}"] - break if val - end - end - end - if val.nil? and a_uri.include?("") - val = attrs[a_name] - end - - if @do_validate and required and val.nil? - unless a_uri.include?("") - for prefix, uri in ns - if a_uri.include?(uri) - a_name = "#{prefix}:#{a_name}" - end - end - end - raise MissingAttributeError.new(tag_name, a_name) - end - - attributes[a_name] = val - end - attributes - end - - def setup_next_element(tag_name, klass, attributes) - previous = @last_element - next_element = klass.new(@do_validate, attributes) - previous.set_next_element(tag_name, next_element) - @last_element = next_element - @last_element.parent = previous if klass.need_parent? - @xml_child_mode = @last_element.have_xml_content? - - Proc.new do |text, tags| - p(@last_element.class) if DEBUG - if @xml_child_mode - @last_element.content = @xml_element.to_s - xml_setter = @last_element.class.xml_setter - @last_element.__send__(xml_setter, @xml_element) - @xml_element = nil - @xml_child_mode = false - else - if klass.have_content? - if @last_element.need_base64_encode? - text = text.lstrip.unpack("m").first - end - @last_element.content = text - end - end - if @do_validate - @last_element.validate_for_stream(tags, @ignore_unknown_element) - end - @last_element = previous - end - end - - def setup_next_element_in_unknown_element - current_element, @last_element = @last_element, nil - Proc.new {@last_element = current_element} - end - end - - unless const_defined? :AVAILABLE_PARSER_LIBRARIES - # The list of all available libraries for parsing. - AVAILABLE_PARSER_LIBRARIES = [ - ["rss/xmlparser", :XMLParserParser], - ["rss/xmlscanner", :XMLScanParser], - ["rss/rexmlparser", :REXMLParser], - ] - end - - # The list of all available parsers, in constant form. - AVAILABLE_PARSERS = [] - - AVAILABLE_PARSER_LIBRARIES.each do |lib, parser| - begin - require lib - AVAILABLE_PARSERS.push(const_get(parser)) - rescue LoadError - end - end - - if AVAILABLE_PARSERS.empty? - raise XMLParserNotFound - end -end diff --git a/lib/rss/rexmlparser.rb b/lib/rss/rexmlparser.rb deleted file mode 100644 index ef0595e447f2ae..00000000000000 --- a/lib/rss/rexmlparser.rb +++ /dev/null @@ -1,50 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" -require "rexml/streamlistener" - -module RSS - - class REXMLParser < BaseParser - - class << self - def listener - REXMLListener - end - end - - private - def _parse - begin - REXML::Document.parse_stream(@rss, @listener) - rescue RuntimeError => e - raise NotWellFormedError.new{e.message} - rescue REXML::ParseException => e - context = e.context - line = context[0] if context - raise NotWellFormedError.new(line){e.message} - end - end - - end - - class REXMLListener < BaseListener - - include REXML::StreamListener - include ListenerMixin - - class << self - def raise_for_undefined_entity? - false - end - end - - def xmldecl(version, encoding, standalone) - super(version, encoding, standalone == "yes") - # Encoding is converted to UTF-8 when REXML parse XML. - @encoding = 'UTF-8' - end - - alias_method(:cdata, :text) - end - -end diff --git a/lib/rss/rss.gemspec b/lib/rss/rss.gemspec deleted file mode 100644 index 04f2b2f42d70ab..00000000000000 --- a/lib/rss/rss.gemspec +++ /dev/null @@ -1,80 +0,0 @@ -begin - require_relative "lib/rss/version" -rescue LoadError - # for Ruby core repository - require_relative "version" -end - -Gem::Specification.new do |spec| - spec.name = "rss" - spec.version = RSS::VERSION - spec.authors = ["Kouhei Sutou"] - spec.email = ["kou@cozmixng.org"] - - spec.summary = %q{Family of libraries that support various formats of XML "feeds".} - spec.description = %q{Family of libraries that support various formats of XML "feeds".} - spec.homepage = "https://github.com/ruby/rss" - spec.license = "BSD-2-Clause" - - spec.files = [ - ".gitignore", - ".travis.yml", - "Gemfile", - "LICENSE.txt", - "NEWS.md", - "README.md", - "Rakefile", - "lib/rss.rb", - "lib/rss/0.9.rb", - "lib/rss/1.0.rb", - "lib/rss/2.0.rb", - "lib/rss/atom.rb", - "lib/rss/content.rb", - "lib/rss/content/1.0.rb", - "lib/rss/content/2.0.rb", - "lib/rss/converter.rb", - "lib/rss/dublincore.rb", - "lib/rss/dublincore/1.0.rb", - "lib/rss/dublincore/2.0.rb", - "lib/rss/dublincore/atom.rb", - "lib/rss/image.rb", - "lib/rss/itunes.rb", - "lib/rss/maker.rb", - "lib/rss/maker/0.9.rb", - "lib/rss/maker/1.0.rb", - "lib/rss/maker/2.0.rb", - "lib/rss/maker/atom.rb", - "lib/rss/maker/base.rb", - "lib/rss/maker/content.rb", - "lib/rss/maker/dublincore.rb", - "lib/rss/maker/entry.rb", - "lib/rss/maker/feed.rb", - "lib/rss/maker/image.rb", - "lib/rss/maker/itunes.rb", - "lib/rss/maker/slash.rb", - "lib/rss/maker/syndication.rb", - "lib/rss/maker/taxonomy.rb", - "lib/rss/maker/trackback.rb", - "lib/rss/parser.rb", - "lib/rss/rexmlparser.rb", - "lib/rss/rss.rb", - "lib/rss/slash.rb", - "lib/rss/syndication.rb", - "lib/rss/taxonomy.rb", - "lib/rss/trackback.rb", - "lib/rss/utils.rb", - "lib/rss/version.rb", - "lib/rss/xml-stylesheet.rb", - "lib/rss/xml.rb", - "lib/rss/xmlparser.rb", - "lib/rss/xmlscanner.rb", - "rss.gemspec", - ] - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ["lib"] - - spec.add_development_dependency "bundler" - spec.add_development_dependency "rake" - spec.add_development_dependency "test-unit" -end diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb deleted file mode 100644 index daa0837e9c1768..00000000000000 --- a/lib/rss/rss.rb +++ /dev/null @@ -1,1342 +0,0 @@ -# frozen_string_literal: false -require "time" - -class Time - class << self - unless respond_to?(:w3cdtf) - # This method converts a W3CDTF string date/time format to Time object. - # - # The W3CDTF format is defined here: http://www.w3.org/TR/NOTE-datetime - # - # Time.w3cdtf('2003-02-15T13:50:05-05:00') - # # => 2003-02-15 10:50:05 -0800 - # Time.w3cdtf('2003-02-15T13:50:05-05:00').class - # # => Time - def w3cdtf(date) - if /\A\s* - (-?\d+)-(\d\d)-(\d\d) - (?:T - (\d\d):(\d\d)(?::(\d\d))? - (\.\d+)? - (Z|[+-]\d\d:\d\d)?)? - \s*\z/ix =~ date and (($5 and $8) or (!$5 and !$8)) - datetime = [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i] - usec = 0 - usec = $7.to_f * 1000000 if $7 - zone = $8 - if zone - off = zone_offset(zone, datetime[0]) - datetime = apply_offset(*(datetime + [off])) - datetime << usec - time = Time.utc(*datetime) - force_zone!(time, zone, off) - time - else - datetime << usec - Time.local(*datetime) - end - else - raise ArgumentError.new("invalid date: #{date.inspect}") - end - end - end - end - - unless method_defined?(:w3cdtf) - # This method converts a Time object to a String. The String contains the - # time in W3CDTF date/time format. - # - # The W3CDTF format is defined here: http://www.w3.org/TR/NOTE-datetime - # - # Time.now.w3cdtf - # # => "2013-08-26T14:12:10.817124-07:00" - def w3cdtf - if usec.zero? - fraction_digits = 0 - else - fraction_digits = strftime('%6N').index(/0*\z/) - end - xmlschema(fraction_digits) - end - end -end - - -require "English" -require_relative "utils" -require_relative "converter" -require_relative "xml-stylesheet" - -module RSS - # The URI of the RSS 1.0 specification - URI = "http://purl.org/rss/1.0/" - - DEBUG = false # :nodoc: - - # The basic error all other RSS errors stem from. Rescue this error if you - # want to handle any given RSS error and you don't care about the details. - class Error < StandardError; end - - # RSS, being an XML-based format, has namespace support. If two namespaces are - # declared with the same name, an OverlappedPrefixError will be raised. - class OverlappedPrefixError < Error - attr_reader :prefix - def initialize(prefix) - @prefix = prefix - end - end - - # The InvalidRSSError error is the base class for a variety of errors - # related to a poorly-formed RSS feed. Rescue this error if you only - # care that a file could be invalid, but don't care how it is invalid. - class InvalidRSSError < Error; end - - # Since RSS is based on XML, it must have opening and closing tags that - # match. If they don't, a MissingTagError will be raised. - class MissingTagError < InvalidRSSError - attr_reader :tag, :parent - def initialize(tag, parent) - @tag, @parent = tag, parent - super("tag <#{tag}> is missing in tag <#{parent}>") - end - end - - # Some tags must only exist a specific number of times in a given RSS feed. - # If a feed has too many occurrences of one of these tags, a TooMuchTagError - # will be raised. - class TooMuchTagError < InvalidRSSError - attr_reader :tag, :parent - def initialize(tag, parent) - @tag, @parent = tag, parent - super("tag <#{tag}> is too much in tag <#{parent}>") - end - end - - # Certain attributes are required on specific tags in an RSS feed. If a feed - # is missing one of these attributes, a MissingAttributeError is raised. - class MissingAttributeError < InvalidRSSError - attr_reader :tag, :attribute - def initialize(tag, attribute) - @tag, @attribute = tag, attribute - super("attribute <#{attribute}> is missing in tag <#{tag}>") - end - end - - # RSS does not allow for free-form tag names, so if an RSS feed contains a - # tag that we don't know about, an UnknownTagError is raised. - class UnknownTagError < InvalidRSSError - attr_reader :tag, :uri - def initialize(tag, uri) - @tag, @uri = tag, uri - super("tag <#{tag}> is unknown in namespace specified by uri <#{uri}>") - end - end - - # Raised when an unexpected tag is encountered. - class NotExpectedTagError < InvalidRSSError - attr_reader :tag, :uri, :parent - def initialize(tag, uri, parent) - @tag, @uri, @parent = tag, uri, parent - super("tag <{#{uri}}#{tag}> is not expected in tag <#{parent}>") - end - end - # For backward compatibility :X - NotExceptedTagError = NotExpectedTagError # :nodoc: - - # Attributes are in key-value form, and if there's no value provided for an - # attribute, a NotAvailableValueError will be raised. - class NotAvailableValueError < InvalidRSSError - attr_reader :tag, :value, :attribute - def initialize(tag, value, attribute=nil) - @tag, @value, @attribute = tag, value, attribute - message = "value <#{value}> of " - message << "attribute <#{attribute}> of " if attribute - message << "tag <#{tag}> is not available." - super(message) - end - end - - # Raised when an unknown conversion error occurs. - class UnknownConversionMethodError < Error - attr_reader :to, :from - def initialize(to, from) - @to = to - @from = from - super("can't convert to #{to} from #{from}.") - end - end - # for backward compatibility - UnknownConvertMethod = UnknownConversionMethodError # :nodoc: - - # Raised when a conversion failure occurs. - class ConversionError < Error - attr_reader :string, :to, :from - def initialize(string, to, from) - @string = string - @to = to - @from = from - super("can't convert #{@string} to #{to} from #{from}.") - end - end - - # Raised when a required variable is not set. - class NotSetError < Error - attr_reader :name, :variables - def initialize(name, variables) - @name = name - @variables = variables - super("required variables of #{@name} are not set: #{@variables.join(', ')}") - end - end - - # Raised when a RSS::Maker attempts to use an unknown maker. - class UnsupportedMakerVersionError < Error - attr_reader :version - def initialize(version) - @version = version - super("Maker doesn't support version: #{@version}") - end - end - - module BaseModel - include Utils - - def install_have_child_element(tag_name, uri, occurs, name=nil, type=nil) - name ||= tag_name - add_need_initialize_variable(name) - install_model(tag_name, uri, occurs, name) - - writer_type, reader_type = type - def_corresponded_attr_writer name, writer_type - def_corresponded_attr_reader name, reader_type - install_element(name) do |n, elem_name| - <<-EOC - if @#{n} - "\#{@#{n}.to_s(need_convert, indent)}" - else - '' - end -EOC - end - end - alias_method(:install_have_attribute_element, :install_have_child_element) - - def install_have_children_element(tag_name, uri, occurs, name=nil, plural_name=nil) - name ||= tag_name - plural_name ||= "#{name}s" - add_have_children_element(name, plural_name) - add_plural_form(name, plural_name) - install_model(tag_name, uri, occurs, plural_name, true) - - def_children_accessor(name, plural_name) - install_element(name, "s") do |n, elem_name| - <<-EOC - rv = [] - @#{n}.each do |x| - value = "\#{x.to_s(need_convert, indent)}" - rv << value if /\\A\\s*\\z/ !~ value - end - rv.join("\n") -EOC - end - end - - def install_text_element(tag_name, uri, occurs, name=nil, type=nil, - disp_name=nil) - name ||= tag_name - disp_name ||= name - self::ELEMENTS << name unless self::ELEMENTS.include?(name) - add_need_initialize_variable(name) - install_model(tag_name, uri, occurs, name) - - def_corresponded_attr_writer(name, type, disp_name) - def_corresponded_attr_reader(name, type || :convert) - install_element(name) do |n, elem_name| - <<-EOC - if respond_to?(:#{n}_content) - content = #{n}_content - else - content = @#{n} - end - if content - rv = "\#{indent}<#{elem_name}>" - value = html_escape(content) - if need_convert - rv << convert(value) - else - rv << value - end - rv << "" - rv - else - '' - end -EOC - end - end - - def install_date_element(tag_name, uri, occurs, name=nil, type=nil, disp_name=nil) - name ||= tag_name - type ||= :w3cdtf - disp_name ||= name - self::ELEMENTS << name - add_need_initialize_variable(name) - install_model(tag_name, uri, occurs, name) - - # accessor - convert_attr_reader name - date_writer(name, type, disp_name) - - install_element(name) do |n, elem_name| - <<-EOC - if @#{n} - rv = "\#{indent}<#{elem_name}>" - value = html_escape(@#{n}.#{type}) - if need_convert - rv << convert(value) - else - rv << value - end - rv << "" - rv - else - '' - end -EOC - end - - end - - private - def install_element(name, postfix="") - elem_name = name.sub('_', ':') - method_name = "#{name}_element#{postfix}" - add_to_element_method(method_name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{method_name}(need_convert=true, indent='') - #{yield(name, elem_name)} - end - private :#{method_name} -EOC - end - - def inherit_convert_attr_reader(*attrs) - attrs.each do |attr| - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{attr}_without_inherit - convert(@#{attr}) - end - - def #{attr} - if @#{attr} - #{attr}_without_inherit - elsif @parent - @parent.#{attr} - else - nil - end - end -EOC - end - end - - def uri_convert_attr_reader(*attrs) - attrs.each do |attr| - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{attr}_without_base - convert(@#{attr}) - end - - def #{attr} - value = #{attr}_without_base - return nil if value.nil? - if /\\A[a-z][a-z0-9+.\\-]*:/i =~ value - value - else - "\#{base}\#{value}" - end - end -EOC - end - end - - def convert_attr_reader(*attrs) - attrs.each do |attr| - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{attr} - convert(@#{attr}) - end -EOC - end - end - - def explicit_clean_other_attr_reader(*attrs) - attrs.each do |attr| - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - attr_reader(:#{attr}) - def #{attr}? - ExplicitCleanOther.parse(@#{attr}) - end - EOC - end - end - - def yes_other_attr_reader(*attrs) - attrs.each do |attr| - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - attr_reader(:#{attr}) - def #{attr}? - Utils::YesOther.parse(@#{attr}) - end - EOC - end - end - - def csv_attr_reader(*attrs) - separator = nil - if attrs.last.is_a?(Hash) - options = attrs.pop - separator = options[:separator] - end - separator ||= ", " - attrs.each do |attr| - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - attr_reader(:#{attr}) - def #{attr}_content - if @#{attr}.nil? - @#{attr} - else - @#{attr}.join(#{separator.dump}) - end - end - EOC - end - end - - def date_writer(name, type, disp_name=name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if new_value.nil? - @#{name} = new_value - elsif new_value.kind_of?(Time) - @#{name} = new_value.dup - else - if @do_validate - begin - @#{name} = Time.__send__('#{type}', new_value) - rescue ArgumentError - raise NotAvailableValueError.new('#{disp_name}', new_value) - end - else - @#{name} = nil - if /\\A\\s*\\z/ !~ new_value.to_s - begin - unless Date._parse(new_value, false).empty? - @#{name} = Time.parse(new_value) - end - rescue ArgumentError - end - end - end - end - - # Is it need? - if @#{name} - class << @#{name} - undef_method(:to_s) - alias_method(:to_s, :#{type}) - end - end - - end -EOC - end - - def integer_writer(name, disp_name=name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if new_value.nil? - @#{name} = new_value - else - if @do_validate - begin - @#{name} = Integer(new_value) - rescue ArgumentError - raise NotAvailableValueError.new('#{disp_name}', new_value) - end - else - @#{name} = new_value.to_i - end - end - end -EOC - end - - def positive_integer_writer(name, disp_name=name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if new_value.nil? - @#{name} = new_value - else - if @do_validate - begin - tmp = Integer(new_value) - raise ArgumentError if tmp <= 0 - @#{name} = tmp - rescue ArgumentError - raise NotAvailableValueError.new('#{disp_name}', new_value) - end - else - @#{name} = new_value.to_i - end - end - end -EOC - end - - def boolean_writer(name, disp_name=name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if new_value.nil? - @#{name} = new_value - else - if @do_validate and - ![true, false, "true", "false"].include?(new_value) - raise NotAvailableValueError.new('#{disp_name}', new_value) - end - if [true, false].include?(new_value) - @#{name} = new_value - else - @#{name} = new_value == "true" - end - end - end -EOC - end - - def text_type_writer(name, disp_name=name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if @do_validate and - !["text", "html", "xhtml", nil].include?(new_value) - raise NotAvailableValueError.new('#{disp_name}', new_value) - end - @#{name} = new_value - end -EOC - end - - def content_writer(name, disp_name=name) - klass_name = "self.class::#{Utils.to_class_name(name)}" - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{name}=(new_value) - if new_value.is_a?(#{klass_name}) - @#{name} = new_value - else - @#{name} = #{klass_name}.new - @#{name}.content = new_value - end - end -EOC - end - - def explicit_clean_other_writer(name, disp_name=name) - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name}=(value) - value = (value ? "yes" : "no") if [true, false].include?(value) - @#{name} = value - end - EOC - end - - def yes_other_writer(name, disp_name=name) - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name}=(new_value) - if [true, false].include?(new_value) - new_value = new_value ? "yes" : "no" - end - @#{name} = new_value - end - EOC - end - - def csv_writer(name, disp_name=name) - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name}=(new_value) - @#{name} = Utils::CSV.parse(new_value) - end - EOC - end - - def csv_integer_writer(name, disp_name=name) - module_eval(<<-EOC, __FILE__, __LINE__ + 1) - def #{name}=(new_value) - @#{name} = Utils::CSV.parse(new_value) {|v| Integer(v)} - end - EOC - end - - def def_children_accessor(accessor_name, plural_name) - module_eval(<<-EOC, *get_file_and_line_from_caller(2)) - def #{plural_name} - @#{accessor_name} - end - - def #{accessor_name}(*args) - if args.empty? - @#{accessor_name}.first - else - @#{accessor_name}[*args] - end - end - - def #{accessor_name}=(*args) - receiver = self.class.name - warn("Don't use `\#{receiver}\##{accessor_name} = XXX'/" \ - "`\#{receiver}\#set_#{accessor_name}(XXX)'. " \ - "Those APIs are not sense of Ruby. " \ - "Use `\#{receiver}\##{plural_name} << XXX' instead of them.", uplevel: 1) - if args.size == 1 - @#{accessor_name}.push(args[0]) - else - @#{accessor_name}.__send__("[]=", *args) - end - end - alias_method(:set_#{accessor_name}, :#{accessor_name}=) -EOC - end - end - - module SetupMaker - def setup_maker(maker) - target = maker_target(maker) - unless target.nil? - setup_maker_attributes(target) - setup_maker_element(target) - setup_maker_elements(target) - end - end - - private - def maker_target(maker) - nil - end - - def setup_maker_attributes(target) - end - - def setup_maker_element(target) - self.class.need_initialize_variables.each do |var| - value = __send__(var) - next if value.nil? - if value.respond_to?("setup_maker") and - !not_need_to_call_setup_maker_variables.include?(var) - value.setup_maker(target) - else - setter = "#{var}=" - if target.respond_to?(setter) - target.__send__(setter, value) - end - end - end - end - - def not_need_to_call_setup_maker_variables - [] - end - - def setup_maker_elements(parent) - self.class.have_children_elements.each do |name, plural_name| - if parent.respond_to?(plural_name) - target = parent.__send__(plural_name) - __send__(plural_name).each do |elem| - elem.setup_maker(target) - end - end - end - end - end - - class Element - extend BaseModel - include Utils - extend Utils::InheritedReader - include SetupMaker - - INDENT = " " - - MUST_CALL_VALIDATORS = {} - MODELS = [] - GET_ATTRIBUTES = [] - HAVE_CHILDREN_ELEMENTS = [] - TO_ELEMENT_METHODS = [] - NEED_INITIALIZE_VARIABLES = [] - PLURAL_FORMS = {} - - class << self - def must_call_validators - inherited_hash_reader("MUST_CALL_VALIDATORS") - end - def models - inherited_array_reader("MODELS") - end - def get_attributes - inherited_array_reader("GET_ATTRIBUTES") - end - def have_children_elements - inherited_array_reader("HAVE_CHILDREN_ELEMENTS") - end - def to_element_methods - inherited_array_reader("TO_ELEMENT_METHODS") - end - def need_initialize_variables - inherited_array_reader("NEED_INITIALIZE_VARIABLES") - end - def plural_forms - inherited_hash_reader("PLURAL_FORMS") - end - - def inherited_base - ::RSS::Element - end - - def inherited(klass) - klass.const_set(:MUST_CALL_VALIDATORS, {}) - klass.const_set(:MODELS, []) - klass.const_set(:GET_ATTRIBUTES, []) - klass.const_set(:HAVE_CHILDREN_ELEMENTS, []) - klass.const_set(:TO_ELEMENT_METHODS, []) - klass.const_set(:NEED_INITIALIZE_VARIABLES, []) - klass.const_set(:PLURAL_FORMS, {}) - - tag_name = klass.name.split(/::/).last - tag_name[0, 1] = tag_name[0, 1].downcase - klass.instance_variable_set(:@tag_name, tag_name) - klass.instance_variable_set(:@have_content, false) - end - - def install_must_call_validator(prefix, uri) - self::MUST_CALL_VALIDATORS[uri] = prefix - end - - def install_model(tag, uri, occurs=nil, getter=nil, plural=false) - getter ||= tag - if m = self::MODELS.find {|t, u, o, g, p| t == tag and u == uri} - m[2] = occurs - else - self::MODELS << [tag, uri, occurs, getter, plural] - end - end - - def install_get_attribute(name, uri, required=true, - type=nil, disp_name=nil, - element_name=nil) - disp_name ||= name - element_name ||= name - writer_type, reader_type = type - def_corresponded_attr_writer name, writer_type, disp_name - def_corresponded_attr_reader name, reader_type - if type == :boolean and /^is/ =~ name - alias_method "#{$POSTMATCH}?", name - end - self::GET_ATTRIBUTES << [name, uri, required, element_name] - add_need_initialize_variable(disp_name) - end - - def def_corresponded_attr_writer(name, type=nil, disp_name=nil) - disp_name ||= name - case type - when :integer - integer_writer name, disp_name - when :positive_integer - positive_integer_writer name, disp_name - when :boolean - boolean_writer name, disp_name - when :w3cdtf, :rfc822, :rfc2822 - date_writer name, type, disp_name - when :text_type - text_type_writer name, disp_name - when :content - content_writer name, disp_name - when :explicit_clean_other - explicit_clean_other_writer name, disp_name - when :yes_other - yes_other_writer name, disp_name - when :csv - csv_writer name - when :csv_integer - csv_integer_writer name - else - attr_writer name - end - end - - def def_corresponded_attr_reader(name, type=nil) - case type - when :inherit - inherit_convert_attr_reader name - when :uri - uri_convert_attr_reader name - when :explicit_clean_other - explicit_clean_other_attr_reader name - when :yes_other - yes_other_attr_reader name - when :csv - csv_attr_reader name - when :csv_integer - csv_attr_reader name, :separator => "," - else - convert_attr_reader name - end - end - - def content_setup(type=nil, disp_name=nil) - writer_type, reader_type = type - def_corresponded_attr_writer :content, writer_type, disp_name - def_corresponded_attr_reader :content, reader_type - @have_content = true - end - - def have_content? - @have_content - end - - def add_have_children_element(variable_name, plural_name) - self::HAVE_CHILDREN_ELEMENTS << [variable_name, plural_name] - end - - def add_to_element_method(method_name) - self::TO_ELEMENT_METHODS << method_name - end - - def add_need_initialize_variable(variable_name) - self::NEED_INITIALIZE_VARIABLES << variable_name - end - - def add_plural_form(singular, plural) - self::PLURAL_FORMS[singular] = plural - end - - def required_prefix - nil - end - - def required_uri - "" - end - - def need_parent? - false - end - - def install_ns(prefix, uri) - if self::NSPOOL.has_key?(prefix) - raise OverlappedPrefixError.new(prefix) - end - self::NSPOOL[prefix] = uri - end - - def tag_name - @tag_name - end - end - - attr_accessor :parent, :do_validate - - def initialize(do_validate=true, attrs=nil) - @parent = nil - @converter = nil - if attrs.nil? and (do_validate.is_a?(Hash) or do_validate.is_a?(Array)) - do_validate, attrs = true, do_validate - end - @do_validate = do_validate - initialize_variables(attrs || {}) - end - - def tag_name - self.class.tag_name - end - - def full_name - tag_name - end - - def converter=(converter) - @converter = converter - targets = children.dup - self.class.have_children_elements.each do |variable_name, plural_name| - targets.concat(__send__(plural_name)) - end - targets.each do |target| - target.converter = converter unless target.nil? - end - end - - def convert(value) - if @converter - @converter.convert(value) - else - value - end - end - - def valid?(ignore_unknown_element=true) - validate(ignore_unknown_element) - true - rescue RSS::Error - false - end - - def validate(ignore_unknown_element=true) - do_validate = @do_validate - @do_validate = true - validate_attribute - __validate(ignore_unknown_element) - ensure - @do_validate = do_validate - end - - def validate_for_stream(tags, ignore_unknown_element=true) - validate_attribute - __validate(ignore_unknown_element, tags, false) - end - - def to_s(need_convert=true, indent='') - if self.class.have_content? - return "" if !empty_content? and !content_is_set? - rv = tag(indent) do |next_indent| - if empty_content? - "" - else - xmled_content - end - end - else - rv = tag(indent) do |next_indent| - self.class.to_element_methods.collect do |method_name| - __send__(method_name, false, next_indent) - end - end - end - rv = convert(rv) if need_convert - rv - end - - def have_xml_content? - false - end - - def need_base64_encode? - false - end - - def set_next_element(tag_name, next_element) - klass = next_element.class - prefix = "" - prefix << "#{klass.required_prefix}_" if klass.required_prefix - key = "#{prefix}#{tag_name.gsub(/-/, '_')}" - if self.class.plural_forms.has_key?(key) - ary = __send__("#{self.class.plural_forms[key]}") - ary << next_element - else - __send__("#{key}=", next_element) - end - end - - protected - def have_required_elements? - self.class::MODELS.all? do |tag, uri, occurs, getter| - if occurs.nil? or occurs == "+" - child = __send__(getter) - if child.is_a?(Array) - children = child - children.any? {|c| c.have_required_elements?} - else - not child.nil? - end - else - true - end - end - end - - private - def initialize_variables(attrs) - normalized_attrs = {} - attrs.each do |key, value| - normalized_attrs[key.to_s] = value - end - self.class.need_initialize_variables.each do |variable_name| - value = normalized_attrs[variable_name.to_s] - if value - __send__("#{variable_name}=", value) - else - instance_variable_set("@#{variable_name}", nil) - end - end - initialize_have_children_elements - @content = normalized_attrs["content"] if self.class.have_content? - end - - def initialize_have_children_elements - self.class.have_children_elements.each do |variable_name, plural_name| - instance_variable_set("@#{variable_name}", []) - end - end - - def tag(indent, additional_attrs={}, &block) - next_indent = indent + INDENT - - attrs = collect_attrs - return "" if attrs.nil? - - return "" unless have_required_elements? - - attrs.update(additional_attrs) - start_tag = make_start_tag(indent, next_indent, attrs.dup) - - if block - content = block.call(next_indent) - else - content = [] - end - - if content.is_a?(String) - content = [content] - start_tag << ">" - end_tag = "" - else - content = content.reject{|x| x.empty?} - if content.empty? - return "" if attrs.empty? - end_tag = "/>" - else - start_tag << ">\n" - end_tag = "\n#{indent}" - end - end - - start_tag + content.join("\n") + end_tag - end - - def make_start_tag(indent, next_indent, attrs) - start_tag = ["#{indent}<#{full_name}"] - unless attrs.empty? - start_tag << attrs.collect do |key, value| - %Q[#{h key}="#{h value}"] - end.join("\n#{next_indent}") - end - start_tag.join(" ") - end - - def collect_attrs - attrs = {} - _attrs.each do |name, required, alias_name| - value = __send__(alias_name || name) - return nil if required and value.nil? - next if value.nil? - return nil if attrs.has_key?(name) - attrs[name] = value - end - attrs - end - - def tag_name_with_prefix(prefix) - "#{prefix}:#{tag_name}" - end - - # For backward compatibility - def calc_indent - '' - end - - def children - rv = [] - self.class.models.each do |name, uri, occurs, getter| - value = __send__(getter) - next if value.nil? - value = [value] unless value.is_a?(Array) - value.each do |v| - rv << v if v.is_a?(Element) - end - end - rv - end - - def _tags - rv = [] - self.class.models.each do |name, uri, occurs, getter, plural| - value = __send__(getter) - next if value.nil? - if plural and value.is_a?(Array) - rv.concat([[uri, name]] * value.size) - else - rv << [uri, name] - end - end - rv - end - - def _attrs - self.class.get_attributes.collect do |name, uri, required, element_name| - [element_name, required, name] - end - end - - def __validate(ignore_unknown_element, tags=_tags, recursive=true) - if recursive - children.compact.each do |child| - child.validate - end - end - must_call_validators = self.class.must_call_validators - tags = tag_filter(tags.dup) - p tags if DEBUG - must_call_validators.each do |uri, prefix| - _validate(ignore_unknown_element, tags[uri], uri) - meth = "#{prefix}_validate" - if !prefix.empty? and respond_to?(meth, true) - __send__(meth, ignore_unknown_element, tags[uri], uri) - end - end - end - - def validate_attribute - _attrs.each do |a_name, required, alias_name| - value = instance_variable_get("@#{alias_name || a_name}") - if required and value.nil? - raise MissingAttributeError.new(tag_name, a_name) - end - __send__("#{alias_name || a_name}=", value) - end - end - - def _validate(ignore_unknown_element, tags, uri, models=self.class.models) - count = 1 - do_redo = false - not_shift = false - tag = nil - models = models.find_all {|model| model[1] == uri} - element_names = models.collect {|model| model[0]} - if tags - tags_size = tags.size - tags = tags.sort_by {|x| element_names.index(x) || tags_size} - end - - models.each_with_index do |model, i| - name, _, occurs, = model - - if DEBUG - p "before" - p tags - p model - end - - if not_shift - not_shift = false - elsif tags - tag = tags.shift - end - - if DEBUG - p "mid" - p count - end - - case occurs - when '?' - if count > 2 - raise TooMuchTagError.new(name, tag_name) - else - if name == tag - do_redo = true - else - not_shift = true - end - end - when '*' - if name == tag - do_redo = true - else - not_shift = true - end - when '+' - if name == tag - do_redo = true - else - if count > 1 - not_shift = true - else - raise MissingTagError.new(name, tag_name) - end - end - else - if name == tag - if models[i+1] and models[i+1][0] != name and - tags and tags.first == name - raise TooMuchTagError.new(name, tag_name) - end - else - raise MissingTagError.new(name, tag_name) - end - end - - if DEBUG - p "after" - p not_shift - p do_redo - p tag - end - - if do_redo - do_redo = false - count += 1 - redo - else - count = 1 - end - - end - - if !ignore_unknown_element and !tags.nil? and !tags.empty? - raise NotExpectedTagError.new(tags.first, uri, tag_name) - end - - end - - def tag_filter(tags) - rv = {} - tags.each do |tag| - rv[tag[0]] = [] unless rv.has_key?(tag[0]) - rv[tag[0]].push(tag[1]) - end - rv - end - - def empty_content? - false - end - - def content_is_set? - if have_xml_content? - __send__(self.class.xml_getter) - else - content - end - end - - def xmled_content - if have_xml_content? - __send__(self.class.xml_getter).to_s - else - _content = content - _content = [_content].pack("m0") if need_base64_encode? - h(_content) - end - end - end - - module RootElementMixin - - include XMLStyleSheetMixin - - attr_reader :output_encoding - attr_reader :feed_type, :feed_subtype, :feed_version - attr_accessor :version, :encoding, :standalone - def initialize(feed_version, version=nil, encoding=nil, standalone=nil) - super() - @feed_type = nil - @feed_subtype = nil - @feed_version = feed_version - @version = version || '1.0' - @encoding = encoding - @standalone = standalone - @output_encoding = nil - end - - def feed_info - [@feed_type, @feed_version, @feed_subtype] - end - - def output_encoding=(enc) - @output_encoding = enc - self.converter = Converter.new(@output_encoding, @encoding) - end - - def setup_maker(maker) - maker.version = version - maker.encoding = encoding - maker.standalone = standalone - - xml_stylesheets.each do |xss| - xss.setup_maker(maker) - end - - super - end - - def to_feed(type, &block) - Maker.make(type) do |maker| - setup_maker(maker) - block.call(maker) if block - end - end - - def to_rss(type, &block) - to_feed("rss#{type}", &block) - end - - def to_atom(type, &block) - to_feed("atom:#{type}", &block) - end - - def to_xml(type=nil, &block) - if type.nil? or same_feed_type?(type) - to_s - else - to_feed(type, &block).to_s - end - end - - private - def same_feed_type?(type) - if /^(atom|rss)?(\d+\.\d+)?(?::(.+))?$/i =~ type - feed_type = ($1 || @feed_type).downcase - feed_version = $2 || @feed_version - feed_subtype = $3 || @feed_subtype - [feed_type, feed_version, feed_subtype] == feed_info - else - false - end - end - - def tag(indent, attrs={}, &block) - rv = super(indent, ns_declarations.merge(attrs), &block) - return rv if rv.empty? - "#{xmldecl}#{xml_stylesheet_pi}#{rv}" - end - - def xmldecl - rv = %Q[\n" - rv - end - - def ns_declarations - decls = {} - self.class::NSPOOL.collect do |prefix, uri| - prefix = ":#{prefix}" unless prefix.empty? - decls["xmlns#{prefix}"] = uri - end - decls - end - - def maker_target(target) - target - end - end -end diff --git a/lib/rss/slash.rb b/lib/rss/slash.rb deleted file mode 100644 index 0055fc9f885e35..00000000000000 --- a/lib/rss/slash.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: false -require 'rss/1.0' - -module RSS - # The prefix for the Slash XML namespace. - SLASH_PREFIX = 'slash' - # The URI of the Slash specification. - SLASH_URI = "http://purl.org/rss/1.0/modules/slash/" - - RDF.install_ns(SLASH_PREFIX, SLASH_URI) - - module SlashModel - extend BaseModel - - ELEMENT_INFOS = \ - [ - ["section"], - ["department"], - ["comments", :positive_integer], - ["hit_parade", :csv_integer], - ] - - class << self - def append_features(klass) - super - - return if klass.instance_of?(Module) - klass.install_must_call_validator(SLASH_PREFIX, SLASH_URI) - ELEMENT_INFOS.each do |name, type, *additional_infos| - full_name = "#{SLASH_PREFIX}_#{name}" - klass.install_text_element(full_name, SLASH_URI, "?", - full_name, type, name) - end - - klass.module_eval do - alias_method(:slash_hit_parades, :slash_hit_parade) - undef_method(:slash_hit_parade) - alias_method(:slash_hit_parade, :slash_hit_parade_content) - end - end - end - end - - class RDF - class Item; include SlashModel; end - end - - SlashModel::ELEMENT_INFOS.each do |name, type| - accessor_base = "#{SLASH_PREFIX}_#{name}" - BaseListener.install_get_text_element(SLASH_URI, name, accessor_base) - end -end diff --git a/lib/rss/syndication.rb b/lib/rss/syndication.rb deleted file mode 100644 index 8f9620f9f3f35b..00000000000000 --- a/lib/rss/syndication.rb +++ /dev/null @@ -1,69 +0,0 @@ -# frozen_string_literal: false -require "rss/1.0" - -module RSS - # The prefix for the Syndication XML namespace. - SY_PREFIX = 'sy' - # The URI of the Syndication specification. - SY_URI = "http://purl.org/rss/1.0/modules/syndication/" - - RDF.install_ns(SY_PREFIX, SY_URI) - - module SyndicationModel - - extend BaseModel - - ELEMENTS = [] - - def self.append_features(klass) - super - - klass.install_must_call_validator(SY_PREFIX, SY_URI) - klass.module_eval do - [ - ["updatePeriod"], - ["updateFrequency", :positive_integer] - ].each do |name, type| - install_text_element(name, SY_URI, "?", - "#{SY_PREFIX}_#{name}", type, - "#{SY_PREFIX}:#{name}") - end - - %w(updateBase).each do |name| - install_date_element(name, SY_URI, "?", - "#{SY_PREFIX}_#{name}", 'w3cdtf', - "#{SY_PREFIX}:#{name}") - end - end - - klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) - alias_method(:_sy_updatePeriod=, :sy_updatePeriod=) - def sy_updatePeriod=(new_value) - new_value = new_value.strip - validate_sy_updatePeriod(new_value) if @do_validate - self._sy_updatePeriod = new_value - end - EOC - end - - private - SY_UPDATEPERIOD_AVAILABLE_VALUES = %w(hourly daily weekly monthly yearly) - def validate_sy_updatePeriod(value) # :nodoc: - unless SY_UPDATEPERIOD_AVAILABLE_VALUES.include?(value) - raise NotAvailableValueError.new("updatePeriod", value) - end - end - end - - class RDF - class Channel; include SyndicationModel; end - end - - prefix_size = SY_PREFIX.size + 1 - SyndicationModel::ELEMENTS.uniq! - SyndicationModel::ELEMENTS.each do |full_name| - name = full_name[prefix_size..-1] - BaseListener.install_get_text_element(SY_URI, name, full_name) - end - -end diff --git a/lib/rss/taxonomy.rb b/lib/rss/taxonomy.rb deleted file mode 100644 index 50688ee6c1f0f3..00000000000000 --- a/lib/rss/taxonomy.rb +++ /dev/null @@ -1,148 +0,0 @@ -# frozen_string_literal: false -require "rss/1.0" -require_relative "dublincore" - -module RSS - # The prefix for the Taxonomy XML namespace. - TAXO_PREFIX = "taxo" - # The URI for the specification of the Taxonomy XML namespace. - TAXO_URI = "http://purl.org/rss/1.0/modules/taxonomy/" - - RDF.install_ns(TAXO_PREFIX, TAXO_URI) - - # The listing of all the taxonomy elements, with the appropriate namespace. - TAXO_ELEMENTS = [] - - %w(link).each do |name| - full_name = "#{TAXO_PREFIX}_#{name}" - BaseListener.install_get_text_element(TAXO_URI, name, full_name) - TAXO_ELEMENTS << "#{TAXO_PREFIX}_#{name}" - end - - %w(topic topics).each do |name| - class_name = Utils.to_class_name(name) - BaseListener.install_class_name(TAXO_URI, name, "Taxonomy#{class_name}") - TAXO_ELEMENTS << "#{TAXO_PREFIX}_#{name}" - end - - module TaxonomyTopicsModel - extend BaseModel - - def self.append_features(klass) - super - - klass.install_must_call_validator(TAXO_PREFIX, TAXO_URI) - %w(topics).each do |name| - klass.install_have_child_element(name, TAXO_URI, "?", - "#{TAXO_PREFIX}_#{name}") - end - end - - class TaxonomyTopics < Element - include RSS10 - - Bag = ::RSS::RDF::Bag - - class << self - def required_prefix - TAXO_PREFIX - end - - def required_uri - TAXO_URI - end - end - - @tag_name = "topics" - - install_have_child_element("Bag", RDF::URI, nil) - install_must_call_validator('rdf', RDF::URI) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.Bag = args[0] - end - self.Bag ||= Bag.new - end - - def full_name - tag_name_with_prefix(TAXO_PREFIX) - end - - def maker_target(target) - target.taxo_topics - end - - def resources - if @Bag - @Bag.lis.collect do |li| - li.resource - end - else - [] - end - end - end - end - - module TaxonomyTopicModel - extend BaseModel - - def self.append_features(klass) - super - var_name = "#{TAXO_PREFIX}_topic" - klass.install_have_children_element("topic", TAXO_URI, "*", var_name) - end - - class TaxonomyTopic < Element - include RSS10 - - include DublinCoreModel - include TaxonomyTopicsModel - - class << self - def required_prefix - TAXO_PREFIX - end - - def required_uri - TAXO_URI - end - end - - @tag_name = "topic" - - install_get_attribute("about", ::RSS::RDF::URI, true, nil, nil, - "#{RDF::PREFIX}:about") - install_text_element("link", TAXO_URI, "?", "#{TAXO_PREFIX}_link") - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.about = args[0] - end - end - - def full_name - tag_name_with_prefix(TAXO_PREFIX) - end - - def maker_target(target) - target.new_taxo_topic - end - end - end - - class RDF - include TaxonomyTopicModel - class Channel - include TaxonomyTopicsModel - end - class Item; include TaxonomyTopicsModel; end - end -end diff --git a/lib/rss/trackback.rb b/lib/rss/trackback.rb deleted file mode 100644 index 1a3c3849b57154..00000000000000 --- a/lib/rss/trackback.rb +++ /dev/null @@ -1,291 +0,0 @@ -# frozen_string_literal: false -# This file contains the implementation of trackbacks. It is entirely internal -# and not useful to outside developers. -require 'rss/1.0' -require 'rss/2.0' - -module RSS # :nodoc: all - - TRACKBACK_PREFIX = 'trackback' - TRACKBACK_URI = 'http://madskills.com/public/xml/rss/module/trackback/' - - RDF.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) - Rss.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) - - module TrackBackUtils - private - def trackback_validate(ignore_unknown_element, tags, uri) - return if tags.nil? - if tags.find {|tag| tag == "about"} and - !tags.find {|tag| tag == "ping"} - raise MissingTagError.new("#{TRACKBACK_PREFIX}:ping", tag_name) - end - end - end - - module BaseTrackBackModel - - ELEMENTS = %w(ping about) - - def append_features(klass) - super - - unless klass.class == Module - klass.module_eval {include TrackBackUtils} - - klass.install_must_call_validator(TRACKBACK_PREFIX, TRACKBACK_URI) - %w(ping).each do |name| - var_name = "#{TRACKBACK_PREFIX}_#{name}" - klass_name = "TrackBack#{Utils.to_class_name(name)}" - klass.install_have_child_element(name, TRACKBACK_URI, "?", var_name) - klass.module_eval(<<-EOC, __FILE__, __LINE__) - remove_method :#{var_name} - def #{var_name} - @#{var_name} and @#{var_name}.value - end - - remove_method :#{var_name}= - def #{var_name}=(value) - @#{var_name} = Utils.new_with_value_if_need(#{klass_name}, value) - end - EOC - end - - [%w(about s)].each do |name, postfix| - var_name = "#{TRACKBACK_PREFIX}_#{name}" - klass_name = "TrackBack#{Utils.to_class_name(name)}" - klass.install_have_children_element(name, TRACKBACK_URI, "*", - var_name) - klass.module_eval(<<-EOC, __FILE__, __LINE__) - remove_method :#{var_name} - def #{var_name}(*args) - if args.empty? - @#{var_name}.first and @#{var_name}.first.value - else - ret = @#{var_name}.__send__("[]", *args) - if ret.is_a?(Array) - ret.collect {|x| x.value} - else - ret.value - end - end - end - - remove_method :#{var_name}= - remove_method :set_#{var_name} - def #{var_name}=(*args) - if args.size == 1 - item = Utils.new_with_value_if_need(#{klass_name}, args[0]) - @#{var_name}.push(item) - else - new_val = args.last - if new_val.is_a?(Array) - new_val = new_value.collect do |val| - Utils.new_with_value_if_need(#{klass_name}, val) - end - else - new_val = Utils.new_with_value_if_need(#{klass_name}, new_val) - end - @#{var_name}.__send__("[]=", *(args[0..-2] + [new_val])) - end - end - alias set_#{var_name} #{var_name}= - EOC - end - end - end - end - - module TrackBackModel10 - extend BaseModel - extend BaseTrackBackModel - - class TrackBackPing < Element - include RSS10 - - class << self - - def required_prefix - TRACKBACK_PREFIX - end - - def required_uri - TRACKBACK_URI - end - - end - - @tag_name = "ping" - - [ - ["resource", ::RSS::RDF::URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{::RSS::RDF::PREFIX}:#{name}") - end - - alias_method(:value, :resource) - alias_method(:value=, :resource=) - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.resource = args[0] - end - end - - def full_name - tag_name_with_prefix(TRACKBACK_PREFIX) - end - end - - class TrackBackAbout < Element - include RSS10 - - class << self - - def required_prefix - TRACKBACK_PREFIX - end - - def required_uri - TRACKBACK_URI - end - - end - - @tag_name = "about" - - [ - ["resource", ::RSS::RDF::URI, true] - ].each do |name, uri, required| - install_get_attribute(name, uri, required, nil, nil, - "#{::RSS::RDF::PREFIX}:#{name}") - end - - alias_method(:value, :resource) - alias_method(:value=, :resource=) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.resource = args[0] - end - end - - def full_name - tag_name_with_prefix(TRACKBACK_PREFIX) - end - - private - def maker_target(abouts) - abouts.new_about - end - - def setup_maker_attributes(about) - about.resource = self.resource - end - - end - end - - module TrackBackModel20 - extend BaseModel - extend BaseTrackBackModel - - class TrackBackPing < Element - include RSS09 - - @tag_name = "ping" - - content_setup - - class << self - - def required_prefix - TRACKBACK_PREFIX - end - - def required_uri - TRACKBACK_URI - end - - end - - alias_method(:value, :content) - alias_method(:value=, :content=) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.content = args[0] - end - end - - def full_name - tag_name_with_prefix(TRACKBACK_PREFIX) - end - - end - - class TrackBackAbout < Element - include RSS09 - - @tag_name = "about" - - content_setup - - class << self - - def required_prefix - TRACKBACK_PREFIX - end - - def required_uri - TRACKBACK_URI - end - - end - - alias_method(:value, :content) - alias_method(:value=, :content=) - - def initialize(*args) - if Utils.element_initialize_arguments?(args) - super - else - super() - self.content = args[0] - end - end - - def full_name - tag_name_with_prefix(TRACKBACK_PREFIX) - end - - end - end - - class RDF - class Item; include TrackBackModel10; end - end - - class Rss - class Channel - class Item; include TrackBackModel20; end - end - end - - BaseTrackBackModel::ELEMENTS.each do |name| - class_name = Utils.to_class_name(name) - BaseListener.install_class_name(TRACKBACK_URI, name, - "TrackBack#{class_name}") - end - - BaseTrackBackModel::ELEMENTS.collect! {|name| "#{TRACKBACK_PREFIX}_#{name}"} -end diff --git a/lib/rss/utils.rb b/lib/rss/utils.rb deleted file mode 100644 index 9203df9a9b7663..00000000000000 --- a/lib/rss/utils.rb +++ /dev/null @@ -1,200 +0,0 @@ -# frozen_string_literal: false -module RSS - - ## - # RSS::Utils is a module that holds various utility functions that are used - # across many parts of the rest of the RSS library. Like most modules named - # some variant of 'util', its methods are probably not particularly useful - # to those who aren't developing the library itself. - module Utils - module_function - - # Given a +name+ in a name_with_underscores or a name-with-dashes format, - # returns the CamelCase version of +name+. - # - # If the +name+ is already CamelCased, nothing happens. - # - # Examples: - # - # require 'rss/utils' - # - # RSS::Utils.to_class_name("sample_name") - # # => "SampleName" - # RSS::Utils.to_class_name("with-dashes") - # # => "WithDashes" - # RSS::Utils.to_class_name("CamelCase") - # # => "CamelCase" - def to_class_name(name) - name.split(/[_\-]/).collect do |part| - "#{part[0, 1].upcase}#{part[1..-1]}" - end.join("") - end - - # Returns an array of two elements: the filename where the calling method - # is located, and the line number where it is defined. - # - # Takes an optional argument +i+, which specifies how many callers up the - # stack to look. - # - # Examples: - # - # require 'rss/utils' - # - # def foo - # p RSS::Utils.get_file_and_line_from_caller - # p RSS::Utils.get_file_and_line_from_caller(1) - # end - # - # def bar - # foo - # end - # - # def baz - # bar - # end - # - # baz - # # => ["test.rb", 5] - # # => ["test.rb", 9] - # - # If +i+ is not given, or is the default value of 0, it attempts to figure - # out the correct value. This is useful when in combination with - # instance_eval. For example: - # - # require 'rss/utils' - # - # def foo - # p RSS::Utils.get_file_and_line_from_caller(1) - # end - # - # def bar - # foo - # end - # - # instance_eval <<-RUBY, *RSS::Utils.get_file_and_line_from_caller - # def baz - # bar - # end - # RUBY - # - # baz - # - # # => ["test.rb", 8] - def get_file_and_line_from_caller(i=0) - file, line, = caller[i].split(':') - line = line.to_i - line += 1 if i.zero? - [file, line] - end - - # Takes a string +s+ with some HTML in it, and escapes '&', '"', '<' and '>', by - # replacing them with the appropriate entities. - # - # This method is also aliased to h, for convenience. - # - # Examples: - # - # require 'rss/utils' - # - # RSS::Utils.html_escape("Dungeons & Dragons") - # # => "Dungeons & Dragons" - # RSS::Utils.h(">_>") - # # => ">_>" - def html_escape(s) - s.to_s.gsub(/&/, "&").gsub(/\"/, """).gsub(/>/, ">").gsub(/ "text/xsl", - "css" => "text/css", - } - - attr_accessor(*ATTRIBUTES) - attr_accessor(:do_validate) - def initialize(*attrs) - if attrs.size == 1 and - (attrs.first.is_a?(Hash) or attrs.first.is_a?(Array)) - attrs = attrs.first - end - @do_validate = true - ATTRIBUTES.each do |attr| - __send__("#{attr}=", nil) - end - vars = ATTRIBUTES.dup - vars.unshift(:do_validate) - attrs.each do |name, value| - if vars.include?(name.to_s) - __send__("#{name}=", value) - end - end - end - - def to_s - rv = "" - if @href - rv << %Q[] - end - rv - end - - remove_method(:href=) - def href=(value) - @href = value - if @href and @type.nil? - @type = guess_type(@href) - end - @href - end - - remove_method(:alternate=) - def alternate=(value) - if value.nil? or /\A(?:yes|no)\z/ =~ value - @alternate = value - else - if @do_validate - args = ["?xml-stylesheet?", %Q[alternate="#{value}"]] - raise NotAvailableValueError.new(*args) - end - end - @alternate - end - - def setup_maker(maker) - xss = maker.xml_stylesheets.new_xml_stylesheet - ATTRIBUTES.each do |attr| - xss.__send__("#{attr}=", __send__(attr)) - end - end - - private - def guess_type(filename) - /\.([^.]+)$/ =~ filename - GUESS_TABLE[$1] - end - - end -end diff --git a/lib/rss/xml.rb b/lib/rss/xml.rb deleted file mode 100644 index b74630295fc700..00000000000000 --- a/lib/rss/xml.rb +++ /dev/null @@ -1,72 +0,0 @@ -# frozen_string_literal: false -require_relative "utils" - -module RSS - module XML - class Element - include Enumerable - - attr_reader :name, :prefix, :uri, :attributes, :children - def initialize(name, prefix=nil, uri=nil, attributes={}, children=[]) - @name = name - @prefix = prefix - @uri = uri - @attributes = attributes - if children.is_a?(String) or !children.respond_to?(:each) - @children = [children] - else - @children = children - end - end - - def [](name) - @attributes[name] - end - - def []=(name, value) - @attributes[name] = value - end - - def <<(child) - @children << child - end - - def each(&block) - @children.each(&block) - end - - def ==(other) - other.kind_of?(self.class) and - @name == other.name and - @uri == other.uri and - @attributes == other.attributes and - @children == other.children - end - - def to_s - rv = "<#{full_name}" - attributes.each do |key, value| - rv << " #{Utils.html_escape(key)}=\"#{Utils.html_escape(value)}\"" - end - if children.empty? - rv << "/>" - else - rv << ">" - children.each do |child| - rv << child.to_s - end - rv << "" - end - rv - end - - def full_name - if @prefix - "#{@prefix}:#{@name}" - else - @name - end - end - end - end -end diff --git a/lib/rss/xmlparser.rb b/lib/rss/xmlparser.rb deleted file mode 100644 index cb2dd2afdd90a3..00000000000000 --- a/lib/rss/xmlparser.rb +++ /dev/null @@ -1,95 +0,0 @@ -# frozen_string_literal: false -begin - require "xml/parser" -rescue LoadError - require "xmlparser" -end - -begin - require "xml/encoding-ja" -rescue LoadError - require "xmlencoding-ja" - if defined?(Kconv) - module XMLEncoding_ja - class SJISHandler - include Kconv - end - end - end -end - -module XML - class Parser - unless defined?(Error) - # This error is legacy, so we just set it to the new one - Error = ::XMLParserError # :nodoc: - end - end -end - -module RSS - - class REXMLLikeXMLParser < ::XML::Parser - - include ::XML::Encoding_ja - - def listener=(listener) - @listener = listener - end - - def startElement(name, attrs) - @listener.tag_start(name, attrs) - end - - def endElement(name) - @listener.tag_end(name) - end - - def character(data) - @listener.text(data) - end - - def xmlDecl(version, encoding, standalone) - @listener.xmldecl(version, encoding, standalone == 1) - end - - def processingInstruction(target, content) - @listener.instruction(target, content) - end - - end - - class XMLParserParser < BaseParser - - class << self - def listener - XMLParserListener - end - end - - private - def _parse - begin - parser = REXMLLikeXMLParser.new - parser.listener = @listener - parser.parse(@rss) - rescue ::XML::Parser::Error => e - raise NotWellFormedError.new(parser.line){e.message} - end - end - - end - - class XMLParserListener < BaseListener - - include ListenerMixin - - def xmldecl(version, encoding, standalone) - super - # Encoding is converted to UTF-8 when XMLParser parses XML. - @encoding = 'UTF-8' - end - - end - -end diff --git a/lib/rss/xmlscanner.rb b/lib/rss/xmlscanner.rb deleted file mode 100644 index 6e3b13d2f57f50..00000000000000 --- a/lib/rss/xmlscanner.rb +++ /dev/null @@ -1,122 +0,0 @@ -# frozen_string_literal: false -require 'xmlscan/scanner' -require 'stringio' - -module RSS - - class XMLScanParser < BaseParser - - class << self - def listener - XMLScanListener - end - end - - private - def _parse - begin - if @rss.is_a?(String) - input = StringIO.new(@rss) - else - input = @rss - end - scanner = XMLScan::XMLScanner.new(@listener) - scanner.parse(input) - rescue XMLScan::Error => e - lineno = e.lineno || scanner.lineno || input.lineno - raise NotWellFormedError.new(lineno){e.message} - end - end - - end - - class XMLScanListener < BaseListener - - include XMLScan::Visitor - include ListenerMixin - - ENTITIES = { - 'lt' => '<', - 'gt' => '>', - 'amp' => '&', - 'quot' => '"', - 'apos' => '\'' - } - - def on_xmldecl_version(str) - @version = str - end - - def on_xmldecl_encoding(str) - @encoding = str - end - - def on_xmldecl_standalone(str) - @standalone = str - end - - def on_xmldecl_end - xmldecl(@version, @encoding, @standalone == "yes") - end - - alias_method(:on_pi, :instruction) - alias_method(:on_chardata, :text) - alias_method(:on_cdata, :text) - - def on_etag(name) - tag_end(name) - end - - def on_entityref(ref) - text(entity(ref)) - end - - def on_charref(code) - text([code].pack('U')) - end - - alias_method(:on_charref_hex, :on_charref) - - def on_stag(name) - @attrs = {} - end - - def on_attribute(name) - @attrs[name] = @current_attr = '' - end - - def on_attr_value(str) - @current_attr << str - end - - def on_attr_entityref(ref) - @current_attr << entity(ref) - end - - def on_attr_charref(code) - @current_attr << [code].pack('U') - end - - alias_method(:on_attr_charref_hex, :on_attr_charref) - - def on_stag_end(name) - tag_start(name, @attrs) - end - - def on_stag_end_empty(name) - tag_start(name, @attrs) - tag_end(name) - end - - private - def entity(ref) - ent = ENTITIES[ref] - if ent - ent - else - wellformed_error("undefined entity: #{ref}") - end - end - end - -end diff --git a/test/rss/dot.png b/test/rss/dot.png deleted file mode 100644 index 9c6960fa2f9f850f27ea1d8077f71caace320231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2ryoCO|{#X#BvjNMLV+kphj3LMjc vG*~sm@u~4|fgB!B7sn8e>&ZX<|F>sg{m1n0&Y8&PKye07S3j3^P6 e - assert_equal(prefix, e.prefix) - assert_equal(uri, e.uri) - end - end - end - - def assert_missing_tag(tag, parent) - _wrap_assertion do - begin - yield - flunk("Not raise MissingTagError") - rescue ::RSS::MissingTagError => e - assert_equal(tag, e.tag) - assert_equal(parent, e.parent) - end - end - end - - def assert_too_much_tag(tag, parent) - _wrap_assertion do - begin - yield - flunk("Not raise TooMuchTagError") - rescue ::RSS::TooMuchTagError => e - assert_equal(tag, e.tag) - assert_equal(parent, e.parent) - end - end - end - - def assert_missing_attribute(tag, attrname) - _wrap_assertion do - begin - yield - flunk("Not raise MissingAttributeError") - rescue ::RSS::MissingAttributeError => e - assert_equal(tag, e.tag) - assert_equal(attrname, e.attribute) - end - end - end - - def assert_not_expected_tag(tag, uri, parent) - _wrap_assertion do - begin - yield - flunk("Not raise NotExpectedTagError") - rescue ::RSS::NotExpectedTagError => e - assert_equal(tag, e.tag) - assert_equal(uri, e.uri) - assert_equal(parent, e.parent) - end - end - end - - def assert_not_available_value(tag, value, attribute=nil) - _wrap_assertion do - begin - yield - flunk("Not raise NotAvailableValueError") - rescue ::RSS::NotAvailableValueError => e - assert_equal(tag, e.tag) - assert_equal(value, e.value) - assert_equal(attribute, e.attribute) - end - end - end - - def assert_not_set_error(name, variables) - _wrap_assertion do - begin - yield - flunk("Not raise NotSetError") - rescue ::RSS::NotSetError => e - assert_equal(name, e.name) - assert_kind_of(Array, variables) - assert_equal(variables.sort, e.variables.sort) - end - end - end - - def assert_xml_declaration(version, encoding, standalone, rss) - _wrap_assertion do - assert_equal(version, rss.version) - assert_equal(encoding, rss.encoding) - assert_equal(standalone, rss.standalone) - end - end - - def assert_xml_stylesheet_attrs(attrs, xsl) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - ::RSS::XMLStyleSheet::ATTRIBUTES.each do |name| - assert_equal(n_attrs[name], xsl.__send__(name)) - end - end - end - - def assert_xml_stylesheet(target, attrs, xsl) - _wrap_assertion do - if attrs.has_key?(:href) - if !attrs.has_key?(:type) and attrs.has_key?(:guess_type) - attrs[:type] = attrs[:guess_type] - end - assert_equal("xml-stylesheet", target) - assert_xml_stylesheet_attrs(attrs, xsl) - else - assert_nil(target) - assert_equal("", xsl.to_s) - end - end - end - - def assert_xml_stylesheet_pis(attrs_ary, rss=nil) - _wrap_assertion do - if rss.nil? - rss = ::RSS::RDF.new - setup_rss10(rss) - end - xss_strs = [] - attrs_ary.each do |attrs| - xss = ::RSS::XMLStyleSheet.new(attrs) - xss_strs.push(xss.to_s) - rss.xml_stylesheets.push(xss) - end - pi_str = rss.to_s.gsub(/<\?xml .*\n/, "").gsub(/\s*<[^\?].*\z/m, "") - assert_equal(xss_strs.join("\n"), pi_str) - end - end - - def assert_xml_stylesheets(attrs, xss) - _wrap_assertion do - xss.each_with_index do |xs, i| - assert_xml_stylesheet_attrs(attrs[i], xs) - end - end - end - - - def assert_atom_person(tag_name, generator) - _wrap_assertion do - name = "Mark Pilgrim" - uri = "http://example.org/" - email = "f8dy@example.com" - - assert_parse(generator.call(<<-EOA), :missing_tag, "name", tag_name) - <#{tag_name}/> -EOA - - assert_parse(generator.call(<<-EOA), :missing_tag, "name", tag_name) - <#{tag_name}> - #{uri} - #{email} - -EOA - - assert_parse(generator.call(<<-EOA), :nothing_raised) - <#{tag_name}> - #{name} - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - <#{tag_name}> - #{name} - #{uri} - #{email} - -EOA - - person = yield(feed) - assert_not_nil(person) - assert_equal(name, person.name.content) - assert_equal(uri, person.uri.content) - assert_equal(email, person.email.content) - end - end - - def assert_atom_category(generator) - _wrap_assertion do - term = "Music" - scheme = "http://xmlns.com/wordnet/1.6/" - label = "music" - - missing_args = [:missing_attribute, "category", "term"] - assert_parse(generator.call(<<-EOA), *missing_args) - -EOA - - assert_parse(generator.call(<<-EOA), *missing_args) - -EOA - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - -EOA - - category = yield(feed) - assert_not_nil(category) - assert_equal(term, category.term) - assert_equal(scheme, category.scheme) - assert_equal(label, category.label) - end - end - - def assert_atom_link(generator) - _wrap_assertion do - href = "http://example.org/feed.atom" - rel = "self" - type = "application/atom+xml" - hreflang = "en" - title = "Atom" - length = "1024" - - assert_parse(generator.call(<<-EOA), :missing_attribute, "link", "href") - -EOA - - assert_parse(generator.call(<<-EOA), :missing_attribute, "link", "href") - -EOA - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - -EOA - - link = yield(feed) - assert_not_nil(link) - assert_equal(href, link.href) - assert_equal(rel, link.rel) - assert_equal(type, link.type) - assert_equal(hreflang, link.hreflang) - assert_equal(title, link.title) - assert_equal(length, link.length) - - - href = "http://example.org/index.html.ja" - parent = link.parent.tag_name - return if parent == "source" - - optional_attributes = %w(hreflang="ja" type="text/html") - 0.upto(optional_attributes.size) do |i| - combination(optional_attributes, i).each do |attributes| - attrs = attributes.join(" ") - assert_parse(generator.call(<<-EOA), :too_much_tag, "link", parent) - - -EOA - end - end - end - end - - def assert_atom_generator(generator) - _wrap_assertion do - uri = "http://www.example.com/" - version = "1.0" - content = "Example Toolkit" - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{content} -EOA - - gen = yield(feed) - assert_not_nil(gen) - assert_equal(uri, gen.uri) - assert_equal(version, gen.version) - assert_equal(content, gen.content) - end - end - - def assert_atom_icon(generator) - _wrap_assertion do - content = "http://www.example.com/example.png" - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{content} -EOA - - icon = yield(feed) - assert_not_nil(icon) - assert_equal(content, icon.content) - end - end - - def assert_atom_text_construct(tag_name, generator) - _wrap_assertion do - [nil, "text", "html"].each do |type| - attr = "" - attr = " type=\"#{type}\"" if type - assert_parse(generator.call(<<-EOA), :nothing_raised) - <#{tag_name}#{attr}/> -EOA - end - - assert_parse(generator.call(<<-EOA), :missing_tag, "div", tag_name) - <#{tag_name} type="xhtml"/> -EOA - - args = ["x", Atom::URI, tag_name] - assert_parse(generator.call(<<-EOA), :not_expected_tag, *args) - <#{tag_name} type="xhtml"> -EOA - - invalid_value = "invalid" - args = ["type", invalid_value] - assert_parse(generator.call(<<-EOA), :not_available_value, *args) - <#{tag_name} type="#{invalid_value}"/> -EOA - - [ - [nil, "A lot of effort went into making this effortless"], - ["text", "A lot of effort went into making this effortless"], - ["html", "A lot of effort went into making this effortless"], - ].each do |type, content| - attr = "" - attr = " type=\"#{type}\"" if type - feed = RSS::Parser.parse(generator.call(<<-EOA)) - <#{tag_name}#{attr}>#{h content} -EOA - - element = yield(feed) - assert_not_nil(element) - assert_equal(type, element.type) - assert_equal(content, element.content) - end - - [false, true].each do |with_space| - xhtml_uri = "http://www.w3.org/1999/xhtml" - xhtml_content = "
abc
" - xhtml_element = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - ["abc"]) - content = xhtml_content - content = " #{content} " if with_space - feed = RSS::Parser.parse(generator.call(<<-EOA)) - <#{tag_name} type="xhtml">#{content} -EOA - - element = yield(feed) - assert_not_nil(element) - assert_equal("xhtml", element.type) - assert_equal(xhtml_content, element.content) - assert_equal(xhtml_element, element.xhtml) - end - end - end - - def assert_atom_date_construct(tag_name, generator) - _wrap_assertion do - args = [tag_name, ""] - assert_parse(generator.call(<<-EOR), :not_available_value, *args) - <#{tag_name}/> -EOR - - [ - ["xxx", false], - ["2007", false], - ["2007/02/09", true], - ].each do |invalid_value, can_parse| - assert_not_available_value(tag_name, invalid_value) do - RSS::Parser.parse(generator.call(<<-EOR)) - <#{tag_name}>#{invalid_value} -EOR - end - - feed = RSS::Parser.parse(generator.call(<<-EOR), false) - <#{tag_name}>#{invalid_value} -EOR - value = yield(feed).content - if can_parse - assert_equal(Time.parse(invalid_value), value) - else - assert_nil(value) - end - end - - [ - "2003-12-13T18:30:02Z", - "2003-12-13T18:30:02.25Z", - "2003-12-13T18:30:02+01:00", - "2003-12-13T18:30:02.25+01:00", - ].each do |valid_value| - assert_parse(generator.call(<<-EOR), :nothing_raised) - <#{tag_name}>#{valid_value} -EOR - - feed = RSS::Parser.parse(generator.call(<<-EOR)) - <#{tag_name}>#{valid_value} -EOR - assert_equal(Time.parse(valid_value), yield(feed).content) - end - end - end - - def assert_atom_logo(generator) - _wrap_assertion do - content = "http://www.example.com/example.png" - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{content} -EOA - - logo = yield(feed) - assert_not_nil(logo) - assert_equal(content, logo.content) - end - end - - def assert_atom_content(generator, &getter) - _wrap_assertion do - assert_atom_content_inline_text(generator, &getter) - assert_atom_content_inline_xhtml(generator, &getter) - assert_atom_content_inline_other(generator, &getter) - assert_atom_content_out_of_line(generator, &getter) - end - end - - def assert_atom_content_inline_text(generator) - _wrap_assertion do - [nil, "text", "html"].each do |type| - content = "sample content"] - ].each do |type, content_content| - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{h content_content} -EOA - content = yield(feed) - assert_equal(type, content.type) - if %w(text html).include?(type) - assert(content.inline_text?) - else - assert(!content.inline_text?) - end - if type == "html" - assert(content.inline_html?) - else - assert(!content.inline_html?) - end - assert(!content.inline_xhtml?) - if type == "text/plain" - assert(content.inline_other?) - assert(content.inline_other_text?) - else - assert(!content.inline_other?) - assert(!content.inline_other_text?) - end - assert(!content.inline_other_xml?) - assert(!content.inline_other_base64?) - assert(!content.out_of_line?) - assert(!content.have_xml_content?) - assert_equal(content_content, content.content) - end - end - end - - def assert_atom_content_inline_xhtml(generator) - _wrap_assertion do - args = ["div", "content"] - assert_parse(generator.call(<<-EOA), :missing_tag, *args) - -EOA - - args = ["x", Atom::URI, "content"] - assert_parse(generator.call(<<-EOA), :not_expected_tag, *args) - -EOA - - xhtml_uri = "http://www.w3.org/1999/xhtml" - xhtml_content = "
abc
" - xhtml_element = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - ["abc"]) - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{xhtml_content} -EOA - - content = yield(feed) - assert_not_nil(content) - assert_equal("xhtml", content.type) - assert(!content.inline_text?) - assert(!content.inline_html?) - assert(content.inline_xhtml?) - assert(!content.inline_other?) - assert(!content.inline_other_text?) - assert(!content.inline_other_xml?) - assert(!content.inline_other_base64?) - assert(!content.out_of_line?) - assert(content.have_xml_content?) - assert_equal(xhtml_content, content.content) - assert_equal(xhtml_element, content.xhtml) - end - end - - def assert_atom_content_inline_other(generator, &getter) - _wrap_assertion do - assert_atom_content_inline_other_text(generator, &getter) - assert_atom_content_inline_other_xml(generator, &getter) - end - end - - def assert_atom_content_inline_other_text(generator) - _wrap_assertion do - type = "image/png" - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - png_file = File.join(File.dirname(__FILE__), "dot.png") - png = File.open(png_file, "rb") do |file| - file.read.force_encoding("binary") - end - base64_content = [png].pack("m").delete("\n") - - [false, true].each do |with_space| - xml_content = base64_content - xml_content = " #{base64_content}" if with_space - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{xml_content} -EOA - - content = yield(feed) - assert_not_nil(content) - assert_equal(type, content.type) - assert(!content.inline_text?) - assert(!content.inline_html?) - assert(!content.inline_xhtml?) - assert(content.inline_other?) - assert(!content.inline_other_text?) - assert(!content.inline_other_xml?) - assert(content.inline_other_base64?) - assert(!content.out_of_line?) - assert(!content.have_xml_content?) - assert_equal(png, content.content) - - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([], {"type" => type}, base64_content, xml) - end - end - end - - def assert_atom_content_inline_other_xml(generator) - _wrap_assertion do - type = "image/svg+xml" - - assert_parse(generator.call(<<-EOA), :nothing_raised) - -EOA - - svg_uri = "http://www.w3.org/2000/svg" - svg_width = "50pt" - svg_height = "20pt" - svg_version = "1.0" - text_x = "15" - text_y = "15" - text = "text" - svg_content = <<-EOS -#{text} -EOS - - text_element = RSS::XML::Element.new("text", nil, svg_uri, - { - "x" => text_x, - "y" => text_y, - }, - [text]) - svg_element = RSS::XML::Element.new("svg", nil, svg_uri, - { - "xmlns" => svg_uri, - "width" => svg_width, - "height" => svg_height, - "version" => svg_version, - }, - [text_element]) - feed = RSS::Parser.parse(generator.call(<<-EOA)) - #{svg_content} -EOA - - content = yield(feed) - assert_not_nil(content) - assert_equal(type, content.type) - assert(!content.inline_text?) - assert(!content.inline_html?) - assert(!content.inline_xhtml?) - assert(content.inline_other?) - assert(!content.inline_other_text?) - assert(content.inline_other_xml?) - assert(!content.inline_other_base64?) - assert(!content.out_of_line?) - assert(content.have_xml_content?) - assert_equal(REXML::Document.new(svg_content).to_s.chomp, - REXML::Document.new(content.content).to_s.chomp) - assert_equal(svg_element, content.xml) - assert_nil(content.xhtml) - end - end - - def assert_atom_content_out_of_line(generator) - _wrap_assertion do - text_type = "text/plain" - text_src = "http://example.com/README.txt" - - missing_args = [:missing_attribute, "content", "type"] - # RSS Parser raises error even if this is "should" not "must". - assert_parse(generator.call(<<-EOA), *missing_args) - -EOA - - content_content = "xxx" - not_available_value_args = [:not_available_value, - "content", content_content] - assert_parse(generator.call(<<-EOA), *not_available_value_args) - #{content_content} -EOA - - feed = RSS::Parser.parse(generator.call(<<-EOA)) - -EOA - content = yield(feed) - assert_not_nil(content) - assert_equal(text_type, content.type) - assert_equal(text_src, content.src) - assert(!content.inline_text?) - assert(!content.inline_html?) - assert(!content.inline_xhtml?) - assert(!content.inline_other?) - assert(!content.inline_other_text?) - assert(!content.inline_other_xml?) - assert(!content.inline_other_base64?) - assert(content.out_of_line?) - assert(!content.have_xml_content?) - assert_nil(content.xml) - assert_nil(content.xhtml) - assert_equal("", content.content) - end - end - - def assert_atom_source(generator, &getter) - _wrap_assertion do - assert_atom_source_author(generator, &getter) - assert_atom_source_category(generator, &getter) - assert_atom_source_contributor(generator, &getter) - assert_atom_source_generator(generator, &getter) - assert_atom_source_icon(generator, &getter) - assert_atom_source_id(generator, &getter) - assert_atom_source_link(generator, &getter) - assert_atom_source_logo(generator, &getter) - assert_atom_source_rights(generator, &getter) - assert_atom_source_subtitle(generator, &getter) - assert_atom_source_title(generator, &getter) - assert_atom_source_updated(generator, &getter) - end - end - - def assert_atom_source_author(generator) - assert_atom_person("author", generator) do |feed| - source = yield(feed) - assert_equal(1, source.authors.size) - source.author - end - end - - def assert_atom_source_category(generator) - assert_atom_category(generator) do |feed| - source = yield(feed) - assert_equal(1, source.categories.size) - source.category - end - end - - def assert_atom_source_contributor(generator) - assert_atom_person("contributor", generator) do |feed| - source = yield(feed) - assert_equal(1, source.contributors.size) - source.contributor - end - end - - def assert_atom_source_generator(generator) - assert_atom_generator(generator) do |feed| - yield(feed).generator - end - end - - def assert_atom_source_icon(generator) - assert_atom_icon(generator) do |feed| - yield(feed).icon - end - end - - def assert_atom_source_id(generator) - id_content = "urn:uuid:a2fb588b-5674-4898-b420-265a734fea69" - id = "#{id_content}" - feed = RSS::Parser.parse(generator.call(id)) - assert_equal(id_content, yield(feed).id.content) - end - - def assert_atom_source_link(generator) - assert_atom_link(generator) do |feed| - source = yield(feed) - assert_equal(1, source.links.size) - source.link - end - end - - def assert_atom_source_logo(generator) - assert_atom_logo(generator) do |feed| - yield(feed).logo - end - end - - def assert_atom_source_rights(generator) - assert_atom_text_construct("rights", generator) do |feed| - yield(feed).rights - end - end - - def assert_atom_source_subtitle(generator) - assert_atom_text_construct("subtitle", generator) do |feed| - yield(feed).subtitle - end - end - - def assert_atom_source_title(generator) - assert_atom_text_construct("title", generator) do |feed| - yield(feed).title - end - end - - def assert_atom_source_updated(generator) - assert_atom_date_construct("updated", generator) do |feed| - yield(feed).updated - end - end - - def assert_dublin_core(elems, target) - _wrap_assertion do - elems.each do |name, value| - assert_equal(value, target.__send__("dc_#{name}")) - end - end - end - - def assert_multiple_dublin_core(elems, target) - _wrap_assertion do - elems.each do |name, values, plural| - plural ||= "#{name}s" - actual = target.__send__("dc_#{plural}").collect{|x| x.value} - assert_equal(values, actual) - end - end - end - - def assert_syndication(elems, target) - _wrap_assertion do - elems.each do |name, value| - meth = "sy_#{name}" - value = value.to_i if meth == "sy_updateFrequency" - assert_equal(value, target.__send__(meth )) - end - end - end - - def assert_content(elems, target) - _wrap_assertion do - elems.each do |name, value| - assert_equal(value, target.__send__("content_#{name}")) - end - end - end - - def assert_trackback(attrs, target) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - if n_attrs["ping"] - assert_equal(n_attrs["ping"], target.trackback_ping) - end - if n_attrs["abouts"] - n_attrs["abouts"].each_with_index do |about, i| - assert_equal(about, target.trackback_abouts[i].value) - end - end - end - end - - def assert_taxo_topic(topics, target) - _wrap_assertion do - topics.each_with_index do |topic, i| - taxo_topic = target.taxo_topics[i] - topic.each do |name, value| - case name - when :link - assert_equal(value, taxo_topic.about) - assert_equal(value, taxo_topic.taxo_link) - when :topics - assert_equal(value, taxo_topic.taxo_topics.resources) - else - assert_equal(value, taxo_topic.__send__("dc_#{name}")) - end - end - end - end - end - - - def assert_attributes(attrs, names, target) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - names.each do |info| - if info.is_a?(String) - name = info - type = nil - else - name, type = info - end - value = n_attrs[name] - if value.is_a?(Time) - actual = target.__send__(name) - assert_instance_of(Time, actual) - assert_equal(value.to_i, actual.to_i) - elsif value - case type - when :integer - value = value.to_i - when :boolean - value = value == "true" if value.is_a?(String) - end - assert_equal(value, target.__send__(name)) - end - end - end - end - - def assert_rexml_element(children, attrs, text, element, text_type=nil) - _wrap_assertion do - if children - children_info = element.elements.collect {|e| [e.namespace, e.name]} - assert_equal(children.collect {|uri, name| [uri, name]}.sort, - children_info.sort) - end - if attrs - assert_equal(attrs.collect {|k, v| [k, v]}.sort, - element.attributes.collect {|k, v| [k, v]}.sort) - end - case text_type - when :time - assert_not_nil(element.text) - assert_equal(Time.parse(text).to_s, Time.parse(element.text).to_s) - else - assert_equal(text, element.text) - end - end - end - - def _assert_maker_atom_persons(feed_type, maker_readers, feed_readers) - _wrap_assertion do - persons = [] - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - targets.each do |target| - person = { - :name => target.name, - :uri => target.uri, - :email => target.email, - } - persons << person if person[:name] - end - end - - actual_persons = chain_reader(feed, feed_readers) || [] - actual_persons = actual_persons.collect do |person| - { - :name => person.name ? person.name.content : nil, - :uri => person.uri ? person.uri.content : nil, - :email => person.email ? person.email.content : nil, - } - end - assert_equal(persons, actual_persons) - end - end - - def assert_maker_atom_persons(feed_type, maker_readers, feed_readers, - not_set_error_name=nil, - parent_not_set_error_name=nil, - parent_not_set_variable=nil) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - args = [feed_type, maker_readers, feed_readers] - if parent_not_set_error_name or parent_not_set_variable - assert_not_set_error(parent_not_set_error_name, - parent_not_set_variable) do - _assert_maker_atom_persons(*args) do |maker| - yield maker - end - end - else - _assert_maker_atom_persons(*args) do |maker| - yield maker - end - end - - assert_not_set_error(not_set_error_name, %w(name)) do - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - targets.new_child - end - end - - assert_not_set_error(not_set_error_name, %w(name)) do - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.uri = "http://example.com/~me/" - end - end - - assert_not_set_error(not_set_error_name, %w(name)) do - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.email = "me@example.com" - end - end - - assert_not_set_error(not_set_error_name, %w(name)) do - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.uri = "http://example.com/~me/" - target.email = "me@example.com" - end - end - - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.name = "me" - end - - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.name = "me" - target.uri = "http://example.com/~me/" - end - - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.name = "me" - target.email = "me@example.com" - end - - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - target = targets.new_child - target.name = "me" - target.uri = "http://example.com/~me/" - target.email = "me@example.com" - end - - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - - target = targets.new_child - target.name = "me" - target.uri = "http://example.com/~me/" - target.email = "me@example.com" - - target = targets.new_child - target.name = "you" - target.uri = "http://example.com/~you/" - target.email = "you@example.com" - end - - assert_not_set_error(not_set_error_name, %w(name)) do - _assert_maker_atom_persons(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - - target = targets.new_child - target.name = "me" - target.uri = "http://example.com/~me/" - target.email = "me@example.com" - - targets.new_child - end - end - end - end - - def _assert_maker_atom_text_construct(feed_type, maker_readers, - feed_readers, &block) - maker_extractor = Proc.new do |target| - text = { - :type => target.type, - :content => target.content, - :xml_content => target.xml_content, - } - if text[:type] == "xhtml" - if text[:xml_content] - xml_content = text[:xml_content] - xhtml_uri = "http://www.w3.org/1999/xhtml" - unless xml_content.is_a?(RSS::XML::Element) and - ["div", xhtml_uri] == [xml_content.name, xml_content.uri] - children = xml_content - children = [children] unless children.is_a?(Array) - xml_content = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - children) - text[:xml_content] = xml_content - end - text - else - nil - end - else - text[:content] ? text : nil - end - end - feed_extractor = Proc.new do |target| - { - :type => target.type, - :content => target.content, - :xml_content => target.xhtml, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_text_construct(feed_type, maker_readers, feed_readers, - parent_not_set_error_name=nil, - parent_not_set_variable=nil, - not_set_error_name=nil) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - args = [feed_type, maker_readers, feed_readers] - if parent_not_set_error_name or parent_not_set_variable - assert_not_set_error(parent_not_set_error_name, - parent_not_set_variable) do - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - end - end - else - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - end - end - - assert_not_set_error(not_set_error_name, %w(content)) do - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "text" - end - end - - assert_not_set_error(not_set_error_name, %w(content)) do - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "html" - end - end - - assert_not_set_error(not_set_error_name, %w(xml_content)) do - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "xhtml" - end - end - - assert_not_set_error(not_set_error_name, %w(xml_content)) do - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "xhtml" - target.content = "Content" - end - end - - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "text" - target.content = "Content" - end - - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "html" - target.content = "Content" - end - - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "xhtml" - target.xml_content = "text only" - end - - _assert_maker_atom_text_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - target.type = "xhtml" - target.xml_content = RSS::XML::Element.new("unknown") - end - end - end - - def _assert_maker_atom_date_construct(feed_type, maker_readers, - feed_readers, &block) - maker_extractor = Proc.new do |target| - date = { - :content => target, - } - date[:content] ? date : nil - end - feed_extractor = Proc.new do |target| - { - :content => target.content, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, false, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_date_construct(feed_type, maker_readers, feed_readers, - parent_not_set_error_name=nil, - parent_not_set_variable=nil) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - if parent_not_set_error_name or parent_not_set_variable - assert_not_set_error(parent_not_set_error_name, - parent_not_set_variable) do - _assert_maker_atom_date_construct(*args) do |maker| - yield maker - end - end - else - _assert_maker_atom_date_construct(*args) do |maker| - yield maker - end - end - - maker_readers = maker_readers.dup - writer = "#{maker_readers.pop}=" - _assert_maker_atom_date_construct(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.__send__(writer, Time.now) - end - end - end - - def _assert_maker_atom_element(feed_type, - maker_readers, - maker_readers_need_block, - feed_readers, - maker_extractor, - feed_extractor) - _wrap_assertion do - element = nil - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - if maker_readers_need_block - target = chain_reader(maker, maker_readers) {|x| x} - else - target = chain_reader(maker, maker_readers) - end - element = maker_extractor.call(target) - end - - target = chain_reader(feed, feed_readers) - if target - actual_element = feed_extractor.call(target) - else - actual_element = nil - end - assert_equal(element, actual_element) - end - end - - def _assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - maker_extractor, feed_extractor, - invalid_feed_checker=nil) - _wrap_assertion do - elements = [] - invalid_feed_exception = nil - feed = nil - begin - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - targets.each do |target| - element = maker_extractor.call(target) - elements << element if element - end - if invalid_feed_checker - invalid_feed_exception = invalid_feed_checker.call(targets) - end - end - rescue RSS::Error - if invalid_feed_exception.is_a?(RSS::TooMuchTagError) - assert_too_much_tag(invalid_feed_exception.tag, - invalid_feed_exception.parent) do - raise - end - else - raise - end - end - - if invalid_feed_exception.nil? - actual_elements = chain_reader(feed, feed_readers) || [] - actual_elements = actual_elements.collect do |target| - feed_extractor.call(target) - end - assert_equal(elements, actual_elements) - end - end - end - - def assert_maker_atom_element(feed_type, maker_readers, feed_readers, - setup_target, optional_variables, - required_variable, assert_method_name, - not_set_error_name=nil, - *additional_args) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - 0.upto(optional_variables.size) do |i| - combination(optional_variables, i).each do |names| - have = {} - names.each do |name| - have[name.intern] = true - end - have_required_variable_too = - have.merge({required_variable.intern => true}) - - assert_not_set_error(not_set_error_name, [required_variable]) do - __send__(assert_method_name, feed_type, maker_readers, - feed_readers, *additional_args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - setup_target.call(target, have) - end - end - - __send__(assert_method_name, feed_type, maker_readers, feed_readers, - *additional_args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) {|x| x} - setup_target.call(target, have_required_variable_too) - end - end - end - end - end - - def assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - setup_target, optional_variables, - required_variable, assert_method_name, - not_set_error_name=nil, - *additional_args) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - 0.upto(optional_variables.size) do |i| - combination(optional_variables, i).each do |names| - have = {} - names.each do |name| - have[name.intern] = true - end - have_required_variable_too = - have.merge({required_variable.intern => true}) - - assert_not_set_error(not_set_error_name, [required_variable]) do - __send__(assert_method_name, feed_type, maker_readers, - feed_readers, *additional_args) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - setup_target.call(targets, have) - end - end - - __send__(assert_method_name, feed_type, maker_readers, feed_readers, - *additional_args) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - setup_target.call(targets, have_required_variable_too) - end - - __send__(assert_method_name, feed_type, maker_readers, feed_readers, - *additional_args) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - setup_target.call(targets, have_required_variable_too) - setup_target.call(targets, have_required_variable_too) - end - - assert_not_set_error(not_set_error_name, [required_variable]) do - __send__(assert_method_name, feed_type, maker_readers, feed_readers, - *additional_args) do |maker| - yield maker - targets = chain_reader(maker, maker_readers) - setup_target.call(targets, have_required_variable_too) - setup_target.call(targets, have) - end - end - end - end - end - end - - def _assert_maker_atom_categories(feed_type, maker_readers, - feed_readers, &block) - maker_extractor = Proc.new do |target| - category = { - :term => target.term, - :scheme => target.scheme, - :label => target.label, - } - category[:term] ? category : nil - end - feed_extractor = Proc.new do |target| - { - :term => target.term, - :scheme => target.scheme, - :label => target.label, - } - end - _assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - maker_extractor, feed_extractor, &block) - end - - def assert_maker_atom_categories(feed_type, maker_readers, feed_readers, - not_set_error_name=nil, &block) - _wrap_assertion do - _assert_maker_atom_categories(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - end - - setup_target = Proc.new do |targets, have| - target = targets.new_child - target.term = "music" if have[:term] - target.scheme = "http://example.com/category/music" if have[:scheme] - target.label = "Music" if have[:label] - end - - optional_variables = %w(scheme label) - - assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - setup_target, optional_variables, - "term", :_assert_maker_atom_categories, - not_set_error_name, &block) - end - end - - def _assert_maker_atom_generator(feed_type, maker_readers, - feed_readers, &block) - maker_extractor = Proc.new do |target| - generator = { - :uri => target.uri, - :version => target.version, - :content => target.content, - } - generator[:content] ? generator : nil - end - feed_extractor = Proc.new do |target| - { - :uri => target.uri, - :version => target.version, - :content => target.content, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_generator(feed_type, maker_readers, feed_readers, - not_set_error_name=nil, &block) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - _assert_maker_atom_generator(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - end - - setup_target = Proc.new do |target, have| - target.content = "RSS Maker" if have[:content] - target.uri = "http://example.com/rss/maker" if have[:uri] - target.version = "0.0.1" if have[:version] - end - - optional_variables = %w(uri version) - - assert_maker_atom_element(feed_type, maker_readers, feed_readers, - setup_target, optional_variables, - "content", :_assert_maker_atom_generator, - not_set_error_name, &block) - end - end - - def _assert_maker_atom_icon(feed_type, maker_readers, feed_readers, - accessor_base, &block) - maker_extractor = Proc.new do |target| - icon = { - :content => target.__send__(accessor_base), - } - icon[:content] ? icon : nil - end - feed_extractor = Proc.new do |target| - { - :content => target.content, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_icon(feed_type, maker_readers, feed_readers, - accessor_base=nil, not_set_error_name=nil) - _wrap_assertion do - accessor_base ||= "url" - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - _assert_maker_atom_icon(feed_type, maker_readers, feed_readers, - accessor_base) do |maker| - yield maker - end - - _assert_maker_atom_icon(feed_type, maker_readers, feed_readers, - accessor_base) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.__send__("#{accessor_base}=", "http://example.com/icon.png") - end - end - end - - def _assert_maker_atom_links(feed_type, maker_readers, feed_readers, - allow_duplication=false, &block) - maker_extractor = Proc.new do |target| - link = { - :href => target.href, - :rel => target.rel, - :type => target.type, - :hreflang => target.hreflang, - :title => target.title, - :length => target.length, - } - link[:href] ? link : nil - end - feed_extractor = Proc.new do |target| - { - :href => target.href, - :rel => target.rel, - :type => target.type, - :hreflang => target.hreflang, - :title => target.title, - :length => target.length, - } - end - - if feed_readers.first == "entries" - parent = "entry" - else - parent = feed_type - end - invalid_feed_checker = Proc.new do |targets| - infos = {} - invalid_exception = nil - targets.each do |target| - key = [target.hreflang, target.type] - if infos.has_key?(key) - invalid_exception = RSS::TooMuchTagError.new("link", parent) - break - end - infos[key] = true if target.rel.nil? or target.rel == "alternate" - end - invalid_exception - end - invalid_feed_checker = nil if allow_duplication - _assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - maker_extractor, feed_extractor, - invalid_feed_checker, - &block) - end - - def assert_maker_atom_links(feed_type, maker_readers, feed_readers, - not_set_error_name=nil, allow_duplication=false, - &block) - _wrap_assertion do - _assert_maker_atom_links(feed_type, maker_readers, - feed_readers) do |maker| - yield maker - end - - langs = %(ja en fr zh po) - setup_target = Proc.new do |targets, have| - target = targets.new_child - lang = langs[targets.size % langs.size] - target.href = "http://example.com/index.html.#{lang}" if have[:href] - target.rel = "alternate" if have[:rel] - target.type = "text/xhtml" if have[:type] - target.hreflang = lang if have[:hreflang] - target.title = "FrontPage(#{lang})" if have[:title] - target.length = 1024 if have[:length] - end - - optional_variables = %w(rel type hreflang title length) - - assert_maker_atom_elements(feed_type, maker_readers, feed_readers, - setup_target, optional_variables, - "href", :_assert_maker_atom_links, - not_set_error_name, allow_duplication, - &block) - end - end - - def _assert_maker_atom_logo(feed_type, maker_readers, feed_readers, - accessor_base, &block) - maker_extractor = Proc.new do |target| - logo = { - :uri => target.__send__(accessor_base), - } - logo[:uri] ? logo : nil - end - feed_extractor = Proc.new do |target| - { - :uri => target.content, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_logo(feed_type, maker_readers, feed_readers, - accessor_base=nil, not_set_error_name=nil) - _wrap_assertion do - accessor_base ||= "uri" - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - _assert_maker_atom_logo(feed_type, maker_readers, feed_readers, - accessor_base) do |maker| - yield maker - end - - _assert_maker_atom_logo(feed_type, maker_readers, feed_readers, - accessor_base) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.__send__("#{accessor_base}=", "http://example.com/logo.png") - end - end - end - - def _assert_maker_atom_id(feed_type, maker_readers, feed_readers, &block) - maker_extractor = Proc.new do |target| - id = { - :uri => target.id, - } - id[:uri] ? id : nil - end - feed_extractor = Proc.new do |target| - if target.id - { - :uri => target.id.content, - } - else - nil - end - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_id(feed_type, maker_readers, feed_readers, - not_set_error_name=nil) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - - args = [feed_type, maker_readers, feed_readers] - _assert_maker_atom_id(*args) do |maker| - yield maker - end - - _assert_maker_atom_id(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.id = "http://example.com/id/1" - end - end - end - - def _assert_maker_atom_content(feed_type, maker_readers, - feed_readers, &block) - maker_extractor = Proc.new do |target| - content = { - :type => target.type, - :src => target.src, - :content => target.content, - :xml => target.xml, - :inline_text => target.inline_text?, - :inline_html => target.inline_html?, - :inline_xhtml => target.inline_xhtml?, - :inline_other => target.inline_other?, - :inline_other_text => target.inline_other_text?, - :inline_other_xml => target.inline_other_xml?, - :inline_other_base64 => target.inline_other_base64?, - :out_of_line => target.out_of_line?, - } - content[:src] = nil if content[:src] and content[:content] - if content[:type] or content[:content] - content - else - nil - end - end - feed_extractor = Proc.new do |target| - { - :type => target.type, - :src => target.src, - :content => target.content, - :xml => target.xml, - :inline_text => target.inline_text?, - :inline_html => target.inline_html?, - :inline_xhtml => target.inline_xhtml?, - :inline_other => target.inline_other?, - :inline_other_text => target.inline_other_text?, - :inline_other_xml => target.inline_other_xml?, - :inline_other_base64 => target.inline_other_base64?, - :out_of_line => target.out_of_line?, - } - end - _assert_maker_atom_element(feed_type, - maker_readers, true, - feed_readers, - maker_extractor, - feed_extractor, - &block) - end - - def assert_maker_atom_content(feed_type, maker_readers, feed_readers, - not_set_error_name=nil, &block) - _wrap_assertion do - not_set_error_name ||= "maker.#{maker_readers.join('.')}" - args = [feed_type, maker_readers, feed_readers, not_set_error_name] - assert_maker_atom_content_inline_text(*args, &block) - assert_maker_atom_content_inline_xhtml(*args, &block) - assert_maker_atom_content_inline_other(*args, &block) - assert_maker_atom_content_out_of_line(*args, &block) - end - end - - def assert_maker_atom_content_inline_text(feed_type, maker_readers, - feed_readers, not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - _assert_maker_atom_content(*args) do |maker| - yield maker - end - - assert_not_set_error(not_set_error_name, %w(content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "text" - end - end - - assert_not_set_error(not_set_error_name, %w(content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "html" - end - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.content = "" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "text" - target.content = "example content" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "html" - target.content = "text" - end - end - end - - def assert_maker_atom_content_inline_xhtml(feed_type, maker_readers, - feed_readers, not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - assert_not_set_error(not_set_error_name, %w(xml_content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - end - end - - assert_not_set_error(not_set_error_name, %w(xml_content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.content = "dummy" - end - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml_content = "text" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml = "text" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml_content = - RSS::XML::Element.new("em", nil, nil, {}, ["text"]) - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml = RSS::XML::Element.new("em", nil, nil, {}, ["text"]) - end - - - xhtml_uri = "http://www.w3.org/1999/xhtml" - em = RSS::XML::Element.new("em", nil, nil, {}, ["text"]) - em_with_xhtml_uri = - RSS::XML::Element.new("em", nil, xhtml_uri, {}, ["text"]) - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml = em - end - assert_equal(RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - [em_with_xhtml_uri]), - chain_reader(feed, feed_readers).xml) - - div = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri, - "class" => "sample"}, - ["text"]) - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "xhtml" - target.xml = div - end - assert_equal(div, chain_reader(feed, feed_readers).xml) - end - end - - def assert_maker_atom_content_inline_other(*args, &block) - _wrap_assertion do - assert_maker_atom_content_inline_other_xml(*args, &block) - assert_maker_atom_content_inline_other_text(*args, &block) - assert_maker_atom_content_inline_other_base64(*args, &block) - end - end - - def assert_maker_atom_content_inline_other_xml(feed_type, maker_readers, - feed_readers, - not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - assert_not_set_error(not_set_error_name, %w(xml_content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "application/xml" - end - end - - assert_not_set_error(not_set_error_name, %w(xml_content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "svg/image+xml" - end - end - - svg_uri = "http://www.w3.org/2000/svg" - rect = RSS::XML::Element.new("rect", nil, svg_uri, - {"x" => "0.5cm", - "y" => "0.5cm", - "width" => "2cm", - "height" => "1cm"}) - svg = RSS::XML::Element.new("svg", nil, svg_uri, - {"xmlns" => svg_uri, - "version" => "1.1", - "width" => "5cm", - "height" => "4cm"}, - [rect]) - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/svg+xml" - target.xml = svg - end - - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/svg+xml" - target.xml = svg - end - assert_equal(svg, chain_reader(feed, feed_readers).xml) - end - end - - def assert_maker_atom_content_inline_other_text(feed_type, maker_readers, - feed_readers, - not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - assert_not_set_error(not_set_error_name, %w(content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "text/plain" - end - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "text/plain" - target.content = "text" - end - end - end - - def assert_maker_atom_content_inline_other_base64(feed_type, maker_readers, - feed_readers, - not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - content = "\211PNG\r\n\032\n" - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - target.content = content - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - target.src = "http://example.com/logo.png" - target.content = content - end - - feed = RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - target.src = "http://example.com/logo.png" - target.content = content - end - target = chain_reader(feed, feed_readers) - assert_nil(target.src) - assert_equal(content, target.content) - end - end - - def assert_maker_atom_content_out_of_line(feed_type, maker_readers, - feed_readers, not_set_error_name) - _wrap_assertion do - args = [feed_type, maker_readers, feed_readers] - assert_not_set_error(not_set_error_name, %w(content)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - end - end - - assert_not_set_error(not_set_error_name, %w(type)) do - RSS::Maker.make("atom:#{feed_type}") do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.src = "http://example.com/logo.png" - end - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - target.src = "http://example.com/logo.png" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "image/png" - target.content = "\211PNG\r\n\032\n" - end - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "application/xml" - target.src = "http://example.com/sample.xml" - end - - - _assert_maker_atom_content(*args) do |maker| - yield maker - target = chain_reader(maker, maker_readers) - target.type = "text/plain" - target.src = "http://example.com/README.txt" - end - end - end - - def assert_slash_elements(expected, target) - assert_equal(expected, - { - "section" => target.slash_section, - "department" => target.slash_department, - "comments" => target.slash_comments, - "hit_parades" => target.slash_hit_parades, - }) - assert_equal(expected["hit_parades"].join(","), - target.slash_hit_parade) - end - - def chain_reader(target, readers, &block) - readers.inject(target) do |result, reader| - return nil if result.nil? - result.__send__(reader, &block) - end - end - - def normalized_attrs(attrs) - n_attrs = {} - attrs.each do |name, value| - n_attrs[name.to_s] = value - end - n_attrs - end - - def combination(elements, n) - if n <= 0 or elements.size < n - [] - elsif n == 1 - elements.collect {|element| [element]} - else - first, *rest = elements - combination(rest, n - 1).collect do |sub_elements| - [first, *sub_elements] - end + combination(rest, n) - end - end - - def tag(name, content=nil, attributes={}) - attributes = attributes.collect do |key, value| - "#{ERB::Util.h(key)}=\"#{ERB::Util.h(value)}\"" - end.join(" ") - begin_tag = "<#{name}" - begin_tag << " #{attributes}" unless attributes.empty? - if content - "#{begin_tag}>#{content}\n" - else - "#{begin_tag}/>\n" - end - end - end -end diff --git a/test/rss/rss-testcase.rb b/test/rss/rss-testcase.rb deleted file mode 100644 index 30067d43b2d201..00000000000000 --- a/test/rss/rss-testcase.rb +++ /dev/null @@ -1,479 +0,0 @@ -# frozen_string_literal: false -require "erb" - -require "test/unit" -require_relative 'rss-assertions' - -require "rss" - -module RSS - class TestCase < Test::Unit::TestCase - include ERB::Util - - include RSS - include Assertions - - XMLDECL_VERSION = "1.0" - XMLDECL_ENCODING = "UTF-8" - XMLDECL_STANDALONE = "no" - - RDF_ABOUT = "http://www.xml.com/xml/news.rss" - RDF_RESOURCE = "http://xml.com/universal/images/xml_tiny.gif" - TITLE_VALUE = "XML.com" - LINK_VALUE = "http://xml.com/pub" - URL_VALUE = "http://xml.com/universal/images/xml_tiny.gif" - NAME_VALUE = "hogehoge" - LANGUAGE_VALUE = "ja" - DESCRIPTION_VALUE = " - XML.com features a rich mix of information and services - for the XML community. - " - RESOURCES = [ - "http://xml.com/pub/2000/08/09/xslt/xslt.html", - "http://xml.com/pub/2000/08/09/rdfdb/index.html", - ] - - CLOUD_DOMAIN = "data.ourfavoritesongs.com" - CLOUD_PORT = "80" - CLOUD_PATH = "/RPC2" - CLOUD_REGISTER_PROCEDURE = "ourFavoriteSongs.rssPleaseNotify" - CLOUD_PROTOCOL = "xml-rpc" - - ENCLOSURE_URL = "http://www.scripting.com/mp3s/weatherReportSuite.mp3" - ENCLOSURE_LENGTH = "12216320" - ENCLOSURE_TYPE = "audio/mpeg" - - CATEGORY_DOMAIN = "http://www.superopendirectory.com/" - - FEED_TITLE = "dive into mark" - FEED_UPDATED = "2003-12-13T18:30:02Z" - FEED_AUTHOR_NAME = "John Doe" - FEED_ID = "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" - - ENTRY_TITLE = "Atom-Powered Robots Run Amok" - ENTRY_LINK = "http://example.org/2003/12/13/atom03" - ENTRY_ID = "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" - ENTRY_UPDATED = "2003-12-13T18:30:02Z" - ENTRY_SUMMARY = "Some text." - - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - DC_ELEMENTS = { - :title => "hoge", - :description => - " XML is placing increasingly heavy loads on - the existing technical infrastructure of the Internet.", - :creator => "Rael Dornfest (mailto:rael@oreilly.com)", - :subject => "XML", - :publisher => "The O'Reilly Network", - :contributor => "hogehoge", - :type => "fugafuga", - :format => "hohoho", - :identifier => "fufufu", - :source => "barbar", - :language => "ja", - :relation => "cococo", - :rights => "Copyright (c) 2000 O'Reilly & Associates, Inc.", - :date => t, - } - - DC_NODES = DC_ELEMENTS.collect do |name, value| - "<#{DC_PREFIX}:#{name}>#{value}" - end.join("\n") - - def default_test - # This class isn't tested - end - - private - def make_xmldecl(v=XMLDECL_VERSION, e=XMLDECL_ENCODING, s=XMLDECL_STANDALONE) - rv = "" - rv - end - - def make_RDF(content=nil, xmlns=[]) - <<-EORSS -#{make_xmldecl} - -#{block_given? ? yield : content} - -EORSS - end - - def make_channel(content=nil) - <<-EOC - - #{TITLE_VALUE} - #{LINK_VALUE} - #{DESCRIPTION_VALUE} - - - - - -#{RESOURCES.collect do |res| '' end.join("\n")} - - - - - -#{block_given? ? yield : content} - -EOC - end - - def make_image(content=nil) - <<-EOI - - #{TITLE_VALUE} - #{URL_VALUE} - #{LINK_VALUE} -#{block_given? ? yield : content} - -EOI - end - - def make_item(content=nil) - <<-EOI - - #{TITLE_VALUE} - #{LINK_VALUE} - #{DESCRIPTION_VALUE} -#{block_given? ? yield : content} - -EOI - end - - def make_textinput(content=nil) - <<-EOT - - #{TITLE_VALUE} - #{DESCRIPTION_VALUE} - #{NAME_VALUE} - #{LINK_VALUE} -#{block_given? ? yield : content} - -EOT - end - - def make_sample_RDF - make_RDF(<<-EOR) -#{make_channel} -#{make_image} -#{make_item} -#{make_textinput} -EOR - end - - def make_rss20(content=nil, xmlns=[]) - <<-EORSS -#{make_xmldecl} - -#{block_given? ? yield : content} - -EORSS - end - - def make_sample_items20 - RESOURCES.collect do |res| - elems = ["#{res}"] - elems << "title of #{res}" - elems = elems.join("\n") - "\n#{elems}\n" - end.join("\n") - end - - def make_channel20(content=nil) - <<-EOC - - #{TITLE_VALUE} - #{LINK_VALUE} - #{DESCRIPTION_VALUE} - #{LANGUAGE_VALUE} - - - #{RDF_RESOURCE} - #{TITLE_VALUE} - #{LINK_VALUE} - - -#{make_sample_items20} - - - #{TITLE_VALUE} - #{DESCRIPTION_VALUE} - #{NAME_VALUE} - #{RDF_RESOURCE} - - -#{block_given? ? yield : content} - -EOC - end - - def make_item20(content=nil) - <<-EOI - - #{TITLE_VALUE} - #{LINK_VALUE} - #{DESCRIPTION_VALUE} -#{block_given? ? yield : content} - -EOI - end - - def make_cloud20 - <<-EOC - -EOC - end - - def make_sample_rss20 - make_rss20(<<-EOR) -#{make_channel20} -EOR - end - - def make_feed_without_entry(content=nil, xmlns=[]) - <<-EOA - - #{FEED_ID} - #{FEED_TITLE} - #{FEED_UPDATED} - - #{FEED_AUTHOR_NAME} - -#{block_given? ? yield : content} - -EOA - end - - def make_entry(content=nil) - <<-EOA - - #{ENTRY_TITLE} - #{ENTRY_ID} - #{ENTRY_UPDATED} -#{block_given? ? yield : content} - -EOA - end - - def make_feed_with_open_entry(content=nil, xmlns=[], &block) - make_feed_without_entry(<<-EOA, xmlns) -#{make_entry(content, &block)} -EOA - end - - def make_feed_with_open_entry_source(content=nil, xmlns=[]) - make_feed_with_open_entry(<<-EOA, xmlns) - -#{block_given? ? yield : content} - -EOA - end - - def make_feed(content=nil, xmlns=[]) - make_feed_without_entry(<<-EOA, xmlns) - - #{ENTRY_TITLE} - - #{ENTRY_ID} - #{ENTRY_UPDATED} - #{ENTRY_SUMMARY} - -#{block_given? ? yield : content} -EOA - end - - def make_entry_document(content=nil, xmlns=[]) - <<-EOA - - #{ENTRY_ID} - #{ENTRY_TITLE} - #{ENTRY_UPDATED} - - #{FEED_AUTHOR_NAME} - -#{block_given? ? yield : content} - -EOA - end - - def make_entry_document_with_open_source(content=nil, xmlns=[]) - make_entry_document(<<-EOA, xmlns) - -#{block_given? ? yield : content} - -EOA - end - - def make_element(elem_name, attrs, contents) - attrs_str = attrs.collect do |name, value| - "#{h name}='#{h value}'" - end.join(" ") - attrs_str = " #{attrs_str}" unless attrs_str.empty? - - if contents.is_a?(String) - contents_str = h(contents) - else - contents_str = contents.collect do |name, value| - "#{Element::INDENT}<#{h name}>#{h value}" - end.join("\n") - contents_str = "\n#{contents_str}\n" - end - - "<#{h elem_name}#{attrs_str}>#{contents_str}" - end - - def xmlns_container(xmlns_decls, content) - attributes = xmlns_decls.collect do |prefix, uri| - "xmlns:#{h prefix}=\"#{h uri}\"" - end.join(" ") - "#{content}" - end - - private - def setup_rss10(rdf) - assert_equal("", rdf.to_s) - - channel = RDF::Channel.new - assert_equal("", channel.to_s) - channel.about = "http://example.com/index.rdf" - channel.title = "title" - channel.link = "http://example.com/" - channel.description = "description" - assert_equal("", channel.to_s) - - item_title = "item title" - item_link = "http://example.com/item" - channel.items = RDF::Channel::Items.new - channel.items.Seq.lis << RDF::Channel::Items::Seq::Li.new(item_link) - assert_not_equal("", channel.to_s) - - rdf.channel = channel - assert_equal("", rdf.to_s) - - item = RDF::Item.new - item.title = item_title - item.link = item_link - item.about = item_link - rdf.items << item - assert_not_equal("", rdf.to_s) - end - - def setup_rss20(rss) - assert_equal("", rss.to_s) - - channel = Rss::Channel.new - assert_equal("", channel.to_s) - channel.title = "title" - channel.link = "http://example.com/" - channel.description = "description" - assert_not_equal("", channel.to_s) - - rss.channel = channel - assert_not_equal("", rss.to_s) - end - - def setup_dummy_channel(maker) - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com/feed.xml" - description = "fugafugafugafuga" - language = "ja" - - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - end - - def setup_dummy_channel_atom(maker) - updated = Time.now - author = "Foo" - - setup_dummy_channel(maker) - maker.channel.links.first.rel = "self" - maker.channel.links.first.type = "application/atom+xml" - maker.channel.updated = updated - maker.channel.author = author - end - - def setup_dummy_image(maker) - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - - maker.channel.link = link if maker.channel.link.nil? - - maker.image.title = title - maker.image.url = url - end - - def setup_dummy_textinput(maker) - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com/search.cgi" - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - - def setup_dummy_item(maker) - title = "TITLE" - link = "http://hoge.com/" - - item = maker.items.new_item - item.title = title - item.link = link - end - - def setup_dummy_item_atom(maker) - setup_dummy_item(maker) - - item = maker.items.first - item.id = "http://example.net/xxx" - item.updated = Time.now - end - - def setup_taxo_topic(target, topics) - topics.each do |topic| - taxo_topic = target.taxo_topics.new_taxo_topic - topic.each do |name, value| - case name - when :link - taxo_topic.taxo_link = value - when :topics - value.each do |t| - taxo_topic.taxo_topics << t - end - else - dc_elems = taxo_topic.__send__("dc_#{name}s") - dc_elem = dc_elems.__send__("new_#{name}") - dc_elem.value = value - end - end - end - end - end -end diff --git a/test/rss/test_1.0.rb b/test/rss/test_1.0.rb deleted file mode 100644 index 33ae29141bdec7..00000000000000 --- a/test/rss/test_1.0.rb +++ /dev/null @@ -1,308 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" - -module RSS - class TestRSS10Core < TestCase - - def setup - @rdf_prefix = "rdf" - @rdf_uri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" - @uri = "http://purl.org/rss/1.0/" - end - - def test_RDF - version = "1.0" - encoding = "UTF-8" - standalone = false - - rdf = RDF.new(version, encoding, standalone) - setup_rss10(rdf) - doc = REXML::Document.new(rdf.to_s) - - xmldecl = doc.xml_decl - - assert_equal(version, xmldecl.version) - assert_equal(encoding, xmldecl.encoding.to_s) - assert_equal(standalone, !xmldecl.standalone.nil?) - - assert_equal(@rdf_uri, doc.root.namespace) - end - - def test_not_displayed_xml_stylesheets - rdf = RDF.new() - plain_rdf = rdf.to_s - 3.times do - rdf.xml_stylesheets.push(XMLStyleSheet.new) - assert_equal(plain_rdf, rdf.to_s) - end - end - - def test_xml_stylesheets - [ - [{:href => "a.xsl", :type => "text/xsl"}], - [ - {:href => "a.xsl", :type => "text/xsl"}, - {:href => "a.css", :type => "text/css"}, - ], - ].each do |attrs_ary| - assert_xml_stylesheet_pis(attrs_ary) - end - end - - def test_channel - about = "http://hoge.com" - resource = "http://hoge.com/hoge.png" - - item_title = "item title" - item_link = "http://hoge.com/item" - - image = RDF::Channel::Image.new(resource) - items = RDF::Channel::Items.new - items.Seq.lis << items.class::Seq::Li.new(item_link) - textinput = RDF::Channel::Textinput.new(resource) - - rss_item = RDF::Item.new - rss_item.title = item_title - rss_item.link = item_link - rss_item.about = item_link - - h = { - 'title' => "fugafuga", - 'link' => "http://hoge.com", - 'description' => "fugafugafugafuga", - 'image' => image, - 'items' => items, - 'textinput' => textinput, - } - - channel = RDF::Channel.new(about) - %w(title link description image items textinput).each do |x| - channel.__send__("#{x}=", h[x]) - end - - doc = REXML::Document.new(make_RDF(<<-EOR)) -#{channel} - -#{rss_item} - -EOR - c = doc.root.elements[1] - - assert_equal(about, c.attributes["about"]) - %w(title link description image textinput).each do |x| - elem = c.elements[x] - assert_equal(x, elem.name) - assert_equal(@uri, elem.namespace) - if x == "image" or x == "textinput" - excepted = resource - res = elem.attributes.get_attribute("resource") - assert_equal(@rdf_uri, res.namespace) - value = res.value - else - excepted = h[x] - value = elem.text - end - assert_equal(excepted, value) - end - assert_equal(@uri, c.elements["items"].namespace) - assert_equal("items", c.elements["items"].name) - end - - def test_channel_image - resource = "http://hoge.com/hoge.png" - image = RDF::Channel::Image.new(resource) - - doc = REXML::Document.new(make_RDF(image.to_s)) - i = doc.root.elements[1] - - assert_equal("image", i.name) - assert_equal(@uri, i.namespace) - - res = i.attributes.get_attribute("resource") - - assert_equal(@rdf_uri, res.namespace) - assert_equal(resource, res.value) - end - - def test_channel_textinput - resource = "http://hoge.com/hoge.png" - textinput = RDF::Channel::Textinput.new(resource) - - doc = REXML::Document.new(make_RDF(textinput.to_s)) - t = doc.root.elements[1] - - assert_equal("textinput", t.name) - assert_equal(@uri, t.namespace) - - res = t.attributes.get_attribute("resource") - - assert_equal(@rdf_uri, res.namespace) - assert_equal(resource, res.value) - end - - def test_channel_items - item_link = "http://example.com/item" - - items = RDF::Channel::Items.new - li = items.Seq.class::Li.new(item_link) - items.Seq.lis << li - - doc = REXML::Document.new(make_RDF(items.to_s)) - i = doc.root.elements[1] - - assert_equal("items", i.name) - assert_equal(@uri, i.namespace) - - assert_equal(1, i.elements.size) - seq = i.elements[1] - assert_equal("Seq", seq.name) - assert_equal(@rdf_uri, seq.namespace) - - assert_equal(1, seq.elements.size) - l = seq.elements[1] - assert_equal("li", l.name) - assert_equal(@rdf_uri, l.namespace) - assert_equal(item_link, l.attributes["resource"]) - end - - def test_seq - item_link = "http://example.com/item" - seq = RDF::Seq.new - li = seq.class::Li.new(item_link) - seq.lis << li - - doc = REXML::Document.new(make_RDF(seq.to_s)) - s = doc.root.elements[1] - - assert_equal("Seq", s.name) - assert_equal(@rdf_uri, s.namespace) - - assert_equal(1, s.elements.size) - l = s.elements[1] - assert_equal("li", l.name) - assert_equal(@rdf_uri, l.namespace) - assert_equal(item_link, l.attributes["resource"]) - end - - def test_li - resource = "http://hoge.com/" - li = RDF::Li.new(resource) - - doc = REXML::Document.new(make_RDF(li.to_s)) - l = doc.root.elements[1] - - assert_equal("li", l.name) - assert_equal(@rdf_uri, l.namespace(l.prefix)) - - res = l.attributes.get_attribute("resource") - - assert_equal('', res.instance_eval("@prefix")) - assert_equal(resource, res.value) - end - - def test_image - about = "http://hoge.com" - h = { - 'title' => "fugafuga", - 'url' => "http://hoge.com/hoge", - 'link' => "http://hoge.com/fuga", - } - - image = RDF::Image.new(about) - %w(title url link).each do |x| - image.__send__("#{x}=", h[x]) - end - - doc = REXML::Document.new(make_RDF(image.to_s)) - i = doc.root.elements[1] - - assert_equal(about, i.attributes["about"]) - %w(title url link).each do |x| - elem = i.elements[x] - assert_equal(x, elem.name) - assert_equal(@uri, elem.namespace) - assert_equal(h[x], elem.text) - end - end - - def test_item - about = "http://hoge.com" - h = { - 'title' => "fugafuga", - 'link' => "http://hoge.com/fuga", - 'description' => "hogehogehoge", - } - - item = RDF::Item.new(about) - %w(title link description).each do |x| - item.__send__("#{x}=", h[x]) - end - - doc = REXML::Document.new(make_RDF(item.to_s)) - i = doc.root.elements[1] - - assert_equal(about, i.attributes["about"]) - %w(title link description).each do |x| - elem = i.elements[x] - assert_equal(x, elem.name) - assert_equal(@uri, elem.namespace) - assert_equal(h[x], elem.text) - end - end - - def test_textinput - about = "http://hoge.com" - h = { - 'title' => "fugafuga", - 'link' => "http://hoge.com/fuga", - 'name' => "foo", - 'description' => "hogehogehoge", - } - - textinput = RDF::Textinput.new(about) - %w(title link name description).each do |x| - textinput.__send__("#{x}=", h[x]) - end - - doc = REXML::Document.new(make_RDF(textinput.to_s)) - t = doc.root.elements[1] - - assert_equal(about, t.attributes["about"]) - %w(title link name description).each do |x| - elem = t.elements[x] - assert_equal(x, elem.name) - assert_equal(@uri, elem.namespace) - assert_equal(h[x], elem.text) - end - end - - def test_to_xml - rss = RSS::Parser.parse(make_sample_RDF) - assert_equal(rss.to_s, rss.to_xml) - assert_equal(rss.to_s, rss.to_xml("1.0")) - rss09 = rss.to_xml("0.91") do |maker| - maker.channel.language = "en-us" - end - rss09 = RSS::Parser.parse(rss09) - assert_equal("0.91", rss09.rss_version) - assert_equal(["rss", "0.91", nil], rss09.feed_info) - rss20 = RSS::Parser.parse(rss.to_xml("2.0")) - assert_equal("2.0", rss20.rss_version) - assert_equal(["rss", "2.0", nil], rss20.feed_info) - - atom_xml = rss.to_xml("atom") do |maker| - maker.channel.author = "Alice" - maker.channel.updated ||= Time.now - maker.items.each do |item| - item.updated ||= Time.now - end - end - atom = RSS::Parser.parse(atom_xml) - assert_equal(["atom", "1.0", "feed"], atom.feed_info) - end - end -end diff --git a/test/rss/test_2.0.rb b/test/rss/test_2.0.rb deleted file mode 100644 index 650f8350105259..00000000000000 --- a/test/rss/test_2.0.rb +++ /dev/null @@ -1,412 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" - -require_relative "rss-testcase" - -module RSS - class TestRSS20Core < TestCase - - def setup - @rss_version = "2.0" - end - - def test_Rss - version = "1.0" - encoding = "UTF-8" - standalone = false - - rss = Rss.new(@rss_version, version, encoding, standalone) - setup_rss20(rss) - - doc = REXML::Document.new(rss.to_s(false)) - - xmldecl = doc.xml_decl - - assert_equal(version, xmldecl.version) - assert_equal(encoding, xmldecl.encoding.to_s) - assert_equal(standalone, !xmldecl.standalone.nil?) - - assert_equal("", doc.root.namespace) - assert_equal(@rss_version, doc.root.attributes["version"]) - end - - def test_not_displayed_xml_stylesheets - rss = Rss.new(@rss_version) - plain_rss = rss.to_s - 3.times do - rss.xml_stylesheets.push(XMLStyleSheet.new) - assert_equal(plain_rss, rss.to_s) - end - end - - def test_xml_stylesheets - [ - [{:href => "a.xsl", :type => "text/xsl"}], - [ - {:href => "a.xsl", :type => "text/xsl"}, - {:href => "a.css", :type => "text/css"}, - ], - ].each do |attrs_ary| - rss = Rss.new(@rss_version) - setup_rss20(rss) - assert_xml_stylesheet_pis(attrs_ary, rss) - end - end - - def test_channel - h = { - 'title' => "fugafuga", - 'link' => "http://hoge.com", - 'description' => "fugafugafugafuga", - - 'language' => "en-us", - 'copyright' => "Copyright 2002, Spartanburg Herald-Journal", - 'managingEditor' => "geo@herald.com (George Matesky)", - 'webMaster' => "betty@herald.com (Betty Guernsey)", - 'pubDate' => Time.parse("Sat, 07 Sep 2002 00:00:01 GMT"), - 'lastBuildDate' => Time.parse("Sat, 07 Sep 2002 09:42:31 GMT"), - 'generator' => "MightyInHouse Content System v2.3", - 'docs' => "http://blogs.law.harvard.edu/tech/rss", - 'ttl' => "60", - 'rating' => '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))', - } - categories = [ - { - :content => "Newspapers", - }, - { - :domain => "Syndic8", - :content => "1765", - } - ] - - channel = Rss::Channel.new - - elems = %w(title link description language copyright - managingEditor webMaster pubDate lastBuildDate - generator docs ttl rating) - elems.each do |x| - value = h[x] - value = value.rfc822 if %w(pubDate lastBuildDate).include?(x) - channel.__send__("#{x}=", value) - end - categories.each do |cat| - channel.categories << Rss::Channel::Category.new(cat[:domain], - cat[:content]) - end - - doc = REXML::Document.new(make_rss20(channel.to_s)) - c = doc.root.elements[1] - - elems.each do |x| - elem = c.elements[x] - assert_equal(x, elem.name) - assert_equal("", elem.namespace) - expected = h[x] - case x - when "pubDate", "lastBuildDate" - assert_equal(expected, Time.parse(elem.text)) - when "ttl" - expected = channel.__send__(x) - assert_equal(expected, elem.text.to_i) - else - assert_equal(expected, elem.text) - end - end - categories.each_with_index do |cat, i| - cat = cat.dup - cat[:domain] ||= nil - category = c.elements["category[#{i+1}]"] - actual = { - :domain => category.attributes["domain"], - :content => category.text, - } - assert_equal(cat, actual) - end - end - - def test_channel_cloud - cloud_params = { - :domain => "rpc.sys.com", - :port => "80", - :path => "/RPC2", - :registerProcedure => "myCloud.rssPleaseNotify", - :protocol => "xml-rpc", - } - cloud = Rss::Channel::Cloud.new(cloud_params[:domain], - cloud_params[:port], - cloud_params[:path], - cloud_params[:registerProcedure], - cloud_params[:protocol]) - cloud_params[:port] = cloud.port - - doc = REXML::Document.new(cloud.to_s) - cloud_elem = doc.root - - actual = {} - cloud_elem.attributes.each do |name, value| - value = value.to_i if name == "port" - actual[name.intern] = value - end - assert_equal(cloud_params, actual) - end - - def test_channel_image - image_params = { - :url => "http://hoge.com/hoge.png", - :title => "fugafuga", - :link => "http://hoge.com", - :width => "144", - :height => "400", - :description => "an image", - } - image = Rss::Channel::Image.new(image_params[:url], - image_params[:title], - image_params[:link], - image_params[:width], - image_params[:height], - image_params[:description]) - - doc = REXML::Document.new(image.to_s) - image_elem = doc.root - - image_params.each do |name, value| - value = image.__send__(name) - actual = image_elem.elements[name.to_s].text - actual = actual.to_i if [:width, :height].include?(name) - assert_equal(value, actual) - end - end - - def test_channel_textInput - textInput_params = { - :title => "fugafuga", - :description => "text hoge fuga", - :name => "hoge", - :link => "http://hoge.com", - } - textInput = Rss::Channel::TextInput.new(textInput_params[:title], - textInput_params[:description], - textInput_params[:name], - textInput_params[:link]) - - doc = REXML::Document.new(textInput.to_s) - input_elem = doc.root - - textInput_params.each do |name, value| - actual = input_elem.elements[name.to_s].text - assert_equal(value, actual) - end - end - - def test_channel_skip_days - skipDays_values = [ - "Sunday", - "Monday", - ] - skipDays = Rss::Channel::SkipDays.new - skipDays_values.each do |value| - skipDays.days << Rss::Channel::SkipDays::Day.new(value) - end - - doc = REXML::Document.new(skipDays.to_s) - days_elem = doc.root - - skipDays_values.each_with_index do |value, i| - assert_equal(value, days_elem.elements[i + 1].text) - end - end - - def test_channel_skip_hours - skipHours_values = [ - "0", - "13", - ] - skipHours = Rss::Channel::SkipHours.new - skipHours_values.each do |value| - skipHours.hours << Rss::Channel::SkipHours::Hour.new(value) - end - - doc = REXML::Document.new(skipHours.to_s) - hours_elem = doc.root - - skipHours_values.each_with_index do |value, i| - expected = skipHours.hours[i].content - assert_equal(expected, hours_elem.elements[i + 1].text.to_i) - end - end - - def test_item - h = { - 'title' => "fugafuga", - 'link' => "http://hoge.com/", - 'description' => "text hoge fuga", - 'author' => "oprah@oxygen.net", - 'comments' => "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290", - 'pubDate' => Time.parse("Sat, 07 Sep 2002 00:00:01 GMT"), - } - categories = [ - { - :content => "Newspapers", - }, - { - :domain => "Syndic8", - :content => "1765", - } - ] - - channel = Rss::Channel.new - channel.title = "title" - channel.link = "http://example.com/" - channel.description = "description" - - item = Rss::Channel::Item.new - channel.items << item - - elems = %w(title link description author comments pubDate) - elems.each do |x| - value = h[x] - value = value.rfc822 if x == "pubDate" - item.__send__("#{x}=", value) - end - categories.each do |cat| - item.categories << Rss::Channel::Category.new(cat[:domain], - cat[:content]) - end - - doc = REXML::Document.new(channel.to_s) - channel_elem = doc.root - - item_elem = channel_elem.elements["item[1]"] - elems.each do |x| - elem = item_elem.elements[x] - assert_equal(x, elem.name) - assert_equal("", elem.namespace) - expected = h[x] - case x - when "pubDate" - assert_equal(expected, Time.parse(elem.text)) - else - assert_equal(expected, elem.text) - end - end - categories.each_with_index do |cat, i| - cat = cat.dup - cat[:domain] ||= nil - category = item_elem.elements["category[#{i+1}]"] - actual = { - :domain => category.attributes["domain"], - :content => category.text, - } - assert_equal(cat, actual) - end - end - - def test_item_enclosure - enclosure_params = { - :url => "http://www.scripting.com/mp3s/weatherReportSuite.mp3", - :length => "12216320", - :type => "audio/mpeg", - } - - enclosure = Rss::Channel::Item::Enclosure.new(enclosure_params[:url], - enclosure_params[:length], - enclosure_params[:type]) - enclosure_params[:length] = enclosure.length - - doc = REXML::Document.new(enclosure.to_s) - enclosure_elem = doc.root - - actual = {} - enclosure_elem.attributes.each do |name, value| - value = value.to_i if name == "length" - actual[name.intern] = value - end - assert_equal(enclosure_params, actual) - end - - def test_item_guid - test_params = [ - { - :content => "http://some.server.com/weblogItem3207", - }, - { - :isPermaLink => "true", - :content => "http://inessential.com/2002/09/01.php#a2", - }, - ] - - test_params.each do |guid_params| - guid = Rss::Channel::Item::Guid.new(guid_params[:isPermaLink], - guid_params[:content]) - if guid_params.has_key?(:isPermaLink) - guid_params[:isPermaLink] = guid.isPermaLink - end - if guid.isPermaLink.nil? - assert_equal(true, guid.PermaLink?) - else - assert_equal(guid.isPermaLink, guid.PermaLink?) - end - - doc = REXML::Document.new(guid.to_s) - guid_elem = doc.root - - actual = {} - actual[:content] = guid_elem.text if guid_elem.text - guid_elem.attributes.each do |name, value| - value = value == "true" if name == "isPermaLink" - actual[name.intern] = value - end - assert_equal(guid_params, actual) - end - end - - def test_item_source - source_params = { - :url => "http://www.tomalak.org/links2.xml", - :content => "Tomalak's Realm", - } - - source = Rss::Channel::Item::Source.new(source_params[:url], - source_params[:content]) - - doc = REXML::Document.new(source.to_s) - source_elem = doc.root - - actual = {} - actual[:content] = source_elem.text - source_elem.attributes.each do |name, value| - actual[name.intern] = value - end - assert_equal(source_params, actual) - end - - def test_to_xml - rss = RSS::Parser.parse(make_sample_rss20) - assert_equal(rss.to_s, rss.to_xml) - assert_equal(rss.to_s, rss.to_xml("2.0")) - rss09_xml = rss.to_xml("0.91") do |maker| - setup_dummy_image(maker) - end - rss09 = RSS::Parser.parse(rss09_xml) - assert_equal("0.91", rss09.rss_version) - rss10 = rss.to_xml("1.0") do |maker| - maker.channel.about = "http://www.example.com/index.rdf" - end - rss10 = RSS::Parser.parse(rss10) - assert_equal("1.0", rss10.rss_version) - - atom_xml = rss.to_xml("atom1.0") do |maker| - maker.channel.id = "http://www.example.com/atom.xml" - maker.channel.author = "Alice" - maker.channel.updated = Time.now - maker.items.each do |item| - item.author = "Bob" - item.updated = Time.now - end - end - atom = RSS::Parser.parse(atom_xml) - assert_equal(["atom", "1.0", "feed"], atom.feed_info) - end - end -end diff --git a/test/rss/test_accessor.rb b/test/rss/test_accessor.rb deleted file mode 100644 index 7d4424dbbdcaf1..00000000000000 --- a/test/rss/test_accessor.rb +++ /dev/null @@ -1,104 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/2.0" -require "rss/syndication" -require "rss/image" - -module RSS - class TestAccessor < TestCase - def test_date - channel = Rss::Channel.new - channel.pubDate = nil - assert_nil(channel.pubDate) - - time = Time.now - channel.pubDate = time - assert_equal(time, channel.pubDate) - - time = Time.parse(Time.now.rfc822) - channel.pubDate = time.rfc822 - assert_equal(time, channel.pubDate) - - time = Time.parse(Time.now.iso8601) - value = time.iso8601 - assert_not_available_value("pubDate", value) do - channel.pubDate = value - end - - channel.do_validate = false - time = Time.parse(Time.now.iso8601) - value = time.iso8601 - channel.pubDate = value - assert_equal(time, channel.pubDate) - - channel.pubDate = nil - assert_nil(channel.pubDate) - end - - def test_integer - image_item = RDF::Item::ImageItem.new - - image_item.width = nil - assert_nil(image_item.width) - - width = 10 - image_item.width = width - assert_equal(width, image_item.width) - - width = 10.0 - image_item.width = width - assert_equal(width, image_item.width) - - width = "10" - image_item.width = width - assert_equal(width.to_i, image_item.width) - - width = "10.0" - assert_not_available_value("image:width", width) do - image_item.width = width - end - - image_item.do_validate = false - width = "10.0" - image_item.width = width - assert_equal(width.to_i, image_item.width) - - image_item.width = nil - assert_nil(image_item.width) - end - - def test_positive_integer - channel = RDF::Channel.new - - channel.sy_updateFrequency = nil - assert_nil(channel.sy_updateFrequency) - - freq = 10 - channel.sy_updateFrequency = freq - assert_equal(freq, channel.sy_updateFrequency) - - freq = 10.0 - channel.sy_updateFrequency = freq - assert_equal(freq, channel.sy_updateFrequency) - - freq = "10" - channel.sy_updateFrequency = freq - assert_equal(freq.to_i, channel.sy_updateFrequency) - - freq = "10.0" - assert_not_available_value("sy:updateFrequency", freq) do - channel.sy_updateFrequency = freq - end - - channel.do_validate = false - freq = "10.0" - channel.sy_updateFrequency = freq - assert_equal(freq.to_i, channel.sy_updateFrequency) - - channel.sy_updateFrequency = nil - assert_nil(channel.sy_updateFrequency) - end - end -end diff --git a/test/rss/test_atom.rb b/test/rss/test_atom.rb deleted file mode 100644 index 774064eff76c0b..00000000000000 --- a/test/rss/test_atom.rb +++ /dev/null @@ -1,684 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/atom" - -module RSS - class TestAtomCore < TestCase - def setup - @uri = "http://www.w3.org/2005/Atom" - @xhtml_uri = "http://www.w3.org/1999/xhtml" - end - - def test_feed - version = "1.0" - encoding = "UTF-8" - standalone = false - - feed = Atom::Feed.new(version, encoding, standalone) - assert_equal("", feed.to_s) - - author = feed.class::Author.new - name = feed.class::Author::Name.new - name.content = "an author" - author.name = name - assert_not_equal("", author.to_s) - feed.authors << author - assert_equal("", feed.to_s) - - id = feed.class::Id.new - id.content = "http://example.com/atom.xml" - assert_not_equal("", id.to_s) - feed.id = id - assert_equal("", feed.to_s) - - title = feed.class::Title.new - title.content = "a title" - assert_not_equal("", title.to_s) - feed.title = title - assert_equal("", feed.to_s) - - updated = feed.class::Updated.new - updated.content = Time.now - assert_not_equal("", updated.to_s) - feed.updated = updated - assert_not_equal("", feed.to_s) - - - feed.authors.clear - assert_equal("", feed.to_s) - entry = Atom::Feed::Entry.new - setup_entry(entry) - assert_not_equal("", entry.to_s) - - author = entry.authors.first - entry.authors.clear - assert_equal("", entry.to_s) - entry.parent = feed - assert_equal("", entry.to_s) - feed.authors << author - assert_not_equal("", entry.to_s) - feed.authors.clear - feed.entries << entry - assert_equal("", feed.to_s) - entry.authors << author - assert_not_equal("", entry.to_s) - assert_not_equal("", feed.to_s) - - doc = REXML::Document.new(feed.to_s) - xmldecl = doc.xml_decl - - assert_equal(version, xmldecl.version) - assert_equal(encoding, xmldecl.encoding.to_s) - assert_equal(standalone, !xmldecl.standalone.nil?) - - assert_equal(@uri, doc.root.namespace) - end - - def test_entry - version = "1.0" - encoding = "UTF-8" - standalone = false - - entry = Atom::Entry.new(version, encoding, standalone) - setup_entry(entry) - - author = entry.authors.first - entry.authors.clear - assert_equal("", entry.to_s) - source = Atom::Entry::Source.new - source.authors << author - entry.source = source - assert_not_equal("", entry.to_s) - - doc = REXML::Document.new(entry.to_s) - xmldecl = doc.xml_decl - - assert_equal(version, xmldecl.version) - assert_equal(encoding, xmldecl.encoding.to_s) - assert_equal(standalone, !xmldecl.standalone.nil?) - - assert_equal(@uri, doc.root.namespace) - end - - def test_not_displayed_xml_stylesheets - feed = Atom::Feed.new - plain_feed = feed.to_s - 3.times do - feed.xml_stylesheets.push(XMLStyleSheet.new) - assert_equal(plain_feed, feed.to_s) - end - end - - def test_atom_author - assert_atom_person_to_s(Atom::Feed::Author) - assert_atom_person_to_s(Atom::Feed::Entry::Author) - assert_atom_person_to_s(Atom::Entry::Author) - assert_atom_person_to_s(Atom::Feed::Entry::Source::Author) - assert_atom_person_to_s(Atom::Entry::Source::Author) - end - - def test_atom_category - assert_atom_category_to_s(Atom::Feed::Category) - assert_atom_category_to_s(Atom::Feed::Entry::Category) - assert_atom_category_to_s(Atom::Entry::Category) - assert_atom_category_to_s(Atom::Feed::Entry::Source::Category) - assert_atom_category_to_s(Atom::Entry::Source::Category) - end - - def test_atom_contributor - assert_atom_person_to_s(Atom::Feed::Contributor) - assert_atom_person_to_s(Atom::Feed::Entry::Contributor) - assert_atom_person_to_s(Atom::Entry::Contributor) - assert_atom_person_to_s(Atom::Feed::Entry::Source::Contributor) - assert_atom_person_to_s(Atom::Entry::Source::Contributor) - end - - def test_atom_generator - assert_atom_generator_to_s(Atom::Feed::Generator) - assert_atom_generator_to_s(Atom::Feed::Entry::Source::Generator) - assert_atom_generator_to_s(Atom::Entry::Source::Generator) - end - - def test_atom_icon - assert_atom_icon_to_s(Atom::Feed::Icon) - assert_atom_icon_to_s(Atom::Feed::Entry::Source::Icon) - assert_atom_icon_to_s(Atom::Entry::Source::Icon) - end - - def test_atom_id - assert_atom_id_to_s(Atom::Feed::Id) - assert_atom_id_to_s(Atom::Feed::Entry::Id) - assert_atom_id_to_s(Atom::Entry::Id) - assert_atom_id_to_s(Atom::Feed::Entry::Source::Id) - assert_atom_id_to_s(Atom::Entry::Source::Id) - end - - def test_atom_link - assert_atom_link_to_s(Atom::Feed::Link) - assert_atom_link_to_s(Atom::Feed::Entry::Link) - assert_atom_link_to_s(Atom::Entry::Link) - assert_atom_link_to_s(Atom::Feed::Entry::Source::Link) - assert_atom_link_to_s(Atom::Entry::Source::Link) - end - - def test_atom_logo - assert_atom_logo_to_s(Atom::Feed::Logo) - assert_atom_logo_to_s(Atom::Feed::Entry::Source::Logo) - assert_atom_logo_to_s(Atom::Entry::Source::Logo) - end - - def test_atom_rights - assert_atom_text_construct_to_s(Atom::Feed::Rights) - assert_atom_text_construct_to_s(Atom::Feed::Entry::Rights) - assert_atom_text_construct_to_s(Atom::Entry::Rights) - assert_atom_text_construct_to_s(Atom::Feed::Entry::Source::Rights) - assert_atom_text_construct_to_s(Atom::Entry::Source::Rights) - end - - def test_atom_subtitle - assert_atom_text_construct_to_s(Atom::Feed::Subtitle) - assert_atom_text_construct_to_s(Atom::Feed::Entry::Source::Subtitle) - assert_atom_text_construct_to_s(Atom::Entry::Source::Subtitle) - end - - def test_atom_title - assert_atom_text_construct_to_s(Atom::Feed::Title) - assert_atom_text_construct_to_s(Atom::Feed::Entry::Title) - assert_atom_text_construct_to_s(Atom::Entry::Title) - assert_atom_text_construct_to_s(Atom::Feed::Entry::Source::Title) - assert_atom_text_construct_to_s(Atom::Entry::Source::Title) - end - - def test_atom_updated - assert_atom_date_construct_to_s(Atom::Feed::Updated) - assert_atom_date_construct_to_s(Atom::Feed::Entry::Updated) - assert_atom_date_construct_to_s(Atom::Entry::Updated) - assert_atom_date_construct_to_s(Atom::Feed::Entry::Source::Updated) - assert_atom_date_construct_to_s(Atom::Entry::Source::Updated) - end - - def test_atom_content - assert_atom_content_to_s(Atom::Feed::Entry::Content) - assert_atom_content_to_s(Atom::Entry::Content) - end - - def test_atom_published - assert_atom_date_construct_to_s(Atom::Feed::Entry::Published) - assert_atom_date_construct_to_s(Atom::Entry::Published) - end - - def test_atom_summary - assert_atom_text_construct_to_s(Atom::Feed::Entry::Summary) - assert_atom_text_construct_to_s(Atom::Entry::Summary) - end - - - def test_to_xml(with_convenience_way=true) - atom = RSS::Parser.parse(make_feed) - assert_equal(atom.to_s, atom.to_xml) - assert_equal(atom.to_s, atom.to_xml("atom")) - assert_equal(atom.to_s, atom.to_xml("atom1.0")) - assert_equal(atom.to_s, atom.to_xml("atom1.0:feed")) - assert_equal(atom.to_s, atom.to_xml("atom:feed")) - - rss09_xml = atom.to_xml("0.91") do |maker| - maker.channel.language = "en-us" - maker.channel.link = "http://example.com/" - if with_convenience_way - maker.channel.description = atom.title.content - else - maker.channel.description {|d| d.content = atom.title.content} - end - - maker.image.url = "http://example.com/logo.png" - maker.image.title = "Logo" - end - rss09 = RSS::Parser.parse(rss09_xml) - assert_equal(["rss", "0.91", nil], rss09.feed_info) - - rss20_xml = atom.to_xml("2.0") do |maker| - maker.channel.link = "http://example.com/" - if with_convenience_way - maker.channel.description = atom.title.content - else - maker.channel.description {|d| d.content = atom.title.content} - end - end - rss20 = RSS::Parser.parse(rss20_xml) - assert_equal("2.0", rss20.rss_version) - assert_equal(["rss", "2.0", nil], rss20.feed_info) - end - - def test_to_xml_with_new_api_since_018 - test_to_xml(false) - end - - private - def setup_entry(entry) - _wrap_assertion do - assert_equal("", entry.to_s) - - author = entry.class::Author.new - name = entry.class::Author::Name.new - name.content = "an author" - author.name = name - assert_not_equal("", author.to_s) - entry.authors << author - assert_equal("", entry.to_s) - - id = entry.class::Id.new - id.content = "http://example.com/atom.xml" - assert_not_equal("", id.to_s) - entry.id = id - assert_equal("", entry.to_s) - - title = entry.class::Title.new - title.content = "a title" - assert_not_equal("", title.to_s) - entry.title = title - assert_equal("", entry.to_s) - - updated = entry.class::Updated.new - updated.content = Time.now - assert_not_equal("", updated.to_s) - entry.updated = updated - assert_not_equal("", entry.to_s) - end - end - - - def assert_atom_person_to_s(target_class) - _wrap_assertion do - name = "A person" - uri = "http://example.com/person/" - email = "person@example.com" - - target = target_class.new - assert_equal("", target.to_s) - - target = target_class.new - person_name = target_class::Name.new - person_name.content = name - target.name = person_name - xml_target = REXML::Document.new(target.to_s).root - assert_equal(["name"], xml_target.elements.collect {|e| e.name}) - assert_equal([name], xml_target.elements.collect {|e| e.text}) - - person_uri = target_class::Uri.new - person_uri.content = uri - target.uri = person_uri - xml_target = REXML::Document.new(target.to_s).root - assert_equal(["name", "uri"], xml_target.elements.collect {|e| e.name}) - assert_equal([name, uri], xml_target.elements.collect {|e| e.text}) - - person_email = target_class::Email.new - person_email.content = email - target.email = person_email - xml_target = REXML::Document.new(target.to_s).root - assert_equal(["name", "uri", "email"], - xml_target.elements.collect {|e| e.name}) - assert_equal([name, uri, email], - xml_target.elements.collect {|e| e.text}) - end - end - - def assert_atom_category_to_s(target_class) - _wrap_assertion do - term = "music" - scheme = "http://example.com/music" - label = "Music" - - category = target_class.new - assert_equal("", category.to_s) - - category = target_class.new - category.scheme = scheme - assert_equal("", category.to_s) - - category = target_class.new - category.label = label - assert_equal("", category.to_s) - - category = target_class.new - category.scheme = scheme - category.label = label - assert_equal("", category.to_s) - - category = target_class.new - category.term = term - xml = REXML::Document.new(category.to_s).root - assert_rexml_element([], {"term" => term}, nil, xml) - - category = target_class.new - category.term = term - category.scheme = scheme - xml = REXML::Document.new(category.to_s).root - assert_rexml_element([], {"term" => term, "scheme" => scheme}, nil, xml) - - category = target_class.new - category.term = term - category.label = label - xml = REXML::Document.new(category.to_s).root - assert_rexml_element([], {"term" => term, "label" => label}, nil, xml) - - category = target_class.new - category.term = term - category.scheme = scheme - category.label = label - xml = REXML::Document.new(category.to_s).root - attrs = {"term" => term, "scheme" => scheme, "label" => label} - assert_rexml_element([], attrs, nil, xml) - end - end - - def assert_atom_generator_to_s(target_class) - _wrap_assertion do - content = "Feed generator" - uri = "http://example.com/generator" - version = "0.0.1" - - generator = target_class.new - assert_equal("", generator.to_s) - - generator = target_class.new - generator.uri = uri - assert_equal("", generator.to_s) - - generator = target_class.new - generator.version = version - assert_equal("", generator.to_s) - - generator = target_class.new - generator.uri = uri - generator.version = version - assert_equal("", generator.to_s) - - generator = target_class.new - generator.content = content - xml = REXML::Document.new(generator.to_s).root - assert_rexml_element([], {}, content, xml) - - generator = target_class.new - generator.content = content - generator.uri = uri - xml = REXML::Document.new(generator.to_s).root - assert_rexml_element([], {"uri" => uri}, content, xml) - - generator = target_class.new - generator.content = content - generator.version = version - xml = REXML::Document.new(generator.to_s).root - assert_rexml_element([], {"version" => version}, content, xml) - - generator = target_class.new - generator.content = content - generator.uri = uri - generator.version = version - xml = REXML::Document.new(generator.to_s).root - assert_rexml_element([], {"uri" => uri, "version" => version}, - content, xml) - end - end - - def assert_atom_icon_to_s(target_class) - _wrap_assertion do - content = "http://example.com/icon.png" - - icon = target_class.new - assert_equal("", icon.to_s) - - icon = target_class.new - icon.content = content - xml = REXML::Document.new(icon.to_s).root - assert_rexml_element([], {}, content, xml) - end - end - - def assert_atom_id_to_s(target_class) - _wrap_assertion do - content = "http://example.com/1" - - id = target_class.new - assert_equal("", id.to_s) - - id = target_class.new - id.content = content - xml = REXML::Document.new(id.to_s).root - assert_rexml_element([], {}, content, xml) - end - end - - def assert_atom_link_to_s(target_class) - _wrap_assertion do - href = "http://example.com/atom.xml" - optvs = { - 'rel' => "self", - 'type' => "application/atom+xml", - 'hreflang' => "ja", - 'title' => "Atom Feed", - 'length' => "801", - } - - link = target_class.new - assert_equal("", link.to_s) - - link = target_class.new - link.href = href - xml = REXML::Document.new(link.to_s).root - assert_rexml_element([], {"href" => href}, nil, xml) - - optional_arguments = %w(rel type hreflang title length) - optional_arguments.each do |name| - rest = optional_arguments.reject {|x| x == name} - - link = target_class.new - link.__send__("#{name}=", optvs[name]) - assert_equal("", link.to_s) - - rest.each do |n| - link.__send__("#{n}=", optvs[n]) - assert_equal("", link.to_s) - end - - link = target_class.new - link.href = href - link.__send__("#{name}=", optvs[name]) - attrs = [["href", href], [name, optvs[name]]] - xml = REXML::Document.new(link.to_s).root - assert_rexml_element([], attrs, nil, xml) - - rest.each do |n| - link.__send__("#{n}=", optvs[n]) - attrs << [n, optvs[n]] - xml = REXML::Document.new(link.to_s).root - assert_rexml_element([], attrs, nil, xml) - end - end - end - end - - def assert_atom_logo_to_s(target_class) - _wrap_assertion do - content = "http://example.com/logo.png" - - logo = target_class.new - assert_equal("", logo.to_s) - - logo = target_class.new - logo.content = content - xml = REXML::Document.new(logo.to_s).root - assert_rexml_element([], {}, content, xml) - end - end - - def assert_atom_text_construct_to_s(target_class) - _wrap_assertion do - text_content = "plain text" - html_content = "#{text_content}" - xhtml_uri = "http://www.w3.org/1999/xhtml" - xhtml_em = RSS::XML::Element.new("em", nil, xhtml_uri, {}, text_content) - xhtml_content = RSS::XML::Element.new("div", nil, xhtml_uri, - {"xmlns" => xhtml_uri}, - [xhtml_em]) - - text = target_class.new - assert_equal("", text.to_s) - - text = target_class.new - text.type = "text" - assert_equal("", text.to_s) - - text = target_class.new - text.content = text_content - xml = REXML::Document.new(text.to_s).root - assert_rexml_element([], {}, text_content, xml) - - text = target_class.new - text.type = "text" - text.content = text_content - xml = REXML::Document.new(text.to_s).root - assert_rexml_element([], {"type" => "text"}, text_content, xml) - - text = target_class.new - text.type = "html" - text.content = html_content - xml = REXML::Document.new(text.to_s).root - assert_rexml_element([], {"type" => "html"}, html_content, xml) - - text = target_class.new - text.type = "xhtml" - text.content = xhtml_content - assert_equal("", text.to_s) - - text = target_class.new - text.type = "xhtml" - text.__send__(target_class.xml_setter, xhtml_content) - xml = REXML::Document.new(text.to_s).root - assert_rexml_element([[xhtml_uri, "div"]], {"type" => "xhtml"}, - nil, xml) - assert_rexml_element([[xhtml_uri, "em"]], nil, nil, xml.elements[1]) - assert_rexml_element([], {}, text_content, xml.elements[1].elements[1]) - - text = target_class.new - text.type = "xhtml" - text.__send__(target_class.xml_setter, xhtml_em) - xml = REXML::Document.new(text.to_s).root - assert_rexml_element([[xhtml_uri, "div"]], {"type" => "xhtml"}, - nil, xml) - assert_rexml_element([[xhtml_uri, "em"]], nil, nil, xml.elements[1]) - assert_rexml_element([], {}, text_content, xml.elements[1].elements[1]) - end - end - - def assert_atom_date_construct_to_s(target_class) - _wrap_assertion do - date = target_class.new - assert_equal("", date.to_s) - - [ - "2003-12-13T18:30:02Z", - "2003-12-13T18:30:02.25Z", - "2003-12-13T18:30:02+01:00", - "2003-12-13T18:30:02.25+01:00", - ].each do |content| - date = target_class.new - date.content = content - xml = REXML::Document.new(date.to_s).root - assert_rexml_element([], {}, content, xml, :time) - - date = target_class.new - date.content = Time.parse(content) - xml = REXML::Document.new(date.to_s).root - assert_rexml_element([], {}, content, xml, :time) - end - end - end - - def assert_atom_content_to_s(target_class) - _wrap_assertion do - assert_atom_text_construct_to_s(target_class) - assert_atom_content_inline_other_xml_to_s(target_class) - assert_atom_content_inline_other_text_to_s(target_class) - assert_atom_content_inline_other_base64_to_s(target_class) - assert_atom_content_out_of_line_to_s(target_class) - end - end - - def assert_atom_content_inline_other_xml_to_s(target_class) - _wrap_assertion do - content = target_class.new - content.type = "text/xml" - assert_equal("", content.to_s) - - content = target_class.new - content.type = "text/xml" - content.xml = RSS::XML::Element.new("em") - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([["", "em"]], {"type" => "text/xml"}, nil, xml) - end - end - - def assert_atom_content_inline_other_text_to_s(target_class) - _wrap_assertion do - content = target_class.new - content.type = "text/plain" - assert_equal("", content.to_s) - - content = target_class.new - content.type = "text/plain" - content.xml = RSS::XML::Element.new("em") - assert_equal("", content.to_s) - - content = target_class.new - content.type = "text/plain" - content.content = "content" - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([], {"type" => "text/plain"}, "content", xml) - end - end - - def assert_atom_content_inline_other_base64_to_s(target_class) - _wrap_assertion do - type = "image/png" - png_file = File.join(File.dirname(__FILE__), "dot.png") - original_content = File.open(png_file, "rb") do |file| - file.read.force_encoding("binary") - end - - content = target_class.new - content.type = type - content.content = original_content - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([], {"type" => type}, - [original_content].pack("m").delete("\n"), - xml) - end - end - - def assert_atom_content_out_of_line_to_s(target_class) - _wrap_assertion do - type = "application/zip" - src = "http://example.com/xxx.zip" - - content = target_class.new - assert(!content.out_of_line?) - content.src = src - assert(content.out_of_line?) - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([], {"src" => src}, nil, xml) - - content = target_class.new - assert(!content.out_of_line?) - content.type = type - assert(!content.out_of_line?) - content.src = src - assert(content.out_of_line?) - xml = REXML::Document.new(content.to_s).root - assert_rexml_element([], {"type" => type, "src" => src}, nil, xml) - end - end - end -end diff --git a/test/rss/test_content.rb b/test/rss/test_content.rb deleted file mode 100644 index fc8269df129205..00000000000000 --- a/test/rss/test_content.rb +++ /dev/null @@ -1,105 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/content" - -module RSS - class TestContent < TestCase - def setup - @prefix = "content" - @uri = "http://purl.org/rss/1.0/modules/content/" - - @elems = { - :encoded => "ATTENTION", - } - - @content_nodes = @elems.collect do |name, value| - "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}" - end.join("\n") - - @rss10_source = make_RDF(<<-EOR, {@prefix => @uri}) -#{make_channel()} -#{make_image()} -#{make_item(@content_nodes)} -#{make_textinput()} -EOR - - @rss10 = Parser.parse(@rss10_source) - - - @rss20_source = make_rss20(<<-EOR, {@prefix => @uri}) -#{make_channel20(make_item20(@content_nodes))} -EOR - - @rss20 = Parser.parse(@rss20_source) - end - - def test_parser - assert_nothing_raised do - Parser.parse(@rss10_source) - end - - assert_nothing_raised do - Parser.parse(@rss20_source) - end - - @elems.each do |tag, value| - tag_name = "#{@prefix}:#{tag}" - content_encodes = make_element(tag_name, {}, value) * 2 - - assert_too_much_tag(tag.to_s, "item") do - Parser.parse(make_RDF(<<-EOR, {@prefix => @uri})) -#{make_channel} -#{make_item(content_encodes)} -EOR - end - - assert_too_much_tag(tag.to_s, "item") do - Parser.parse(make_rss20(<<-EOR, {@prefix => @uri})) -#{make_channel20(make_item20(content_encodes))} -EOR - end - end - end - - def test_accessor - new_value = { - :encoded => "hoge]]>", - } - - @elems.each do |name, value| - [@rss10, @rss20].each do |rss| - meth = "#{RSS::CONTENT_PREFIX}_#{name}" - parent = rss.items.last - assert_equal(value, parent.__send__(meth)) - parent.__send__("#{meth}=", new_value[name].to_s) - assert_equal(new_value[name], parent.__send__(meth)) - end - end - end - - def test_to_s - @elems.each do |name, value| - excepted = make_element("#{@prefix}:#{name}", {}, value) - meth = "#{RSS::CONTENT_PREFIX}_#{name}_element" - [@rss10, @rss20].each do |rss| - assert_equal(excepted, rss.items.last.__send__(meth)) - end - end - - [@rss10_source, @rss20_source].each do |source| - REXML::Document.new(source).root.each_element do |parent| - next unless parent.name != "item" - parent.each_element do |elem| - if elem.namespace == @uri - assert_equal(elem.text, @elems[elem.name.intern].to_s) - end - end - end - end - end - end -end diff --git a/test/rss/test_dublincore.rb b/test/rss/test_dublincore.rb deleted file mode 100644 index 37ef1771993cbe..00000000000000 --- a/test/rss/test_dublincore.rb +++ /dev/null @@ -1,270 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/dublincore" - -module RSS - class TestDublinCore < TestCase - def setup - @rss10_parents = [%w(channel), %w(image), %w(item), %w(textinput)] - - @rss10_source = make_RDF(<<-EOR, {DC_PREFIX => DC_URI}) -#{make_channel(DC_NODES)} -#{make_image(DC_NODES)} -#{make_item(DC_NODES)} -#{make_textinput(DC_NODES)} -EOR - - @rss20_parents = [%w(channel), %w(items last)] - - @rss20_source = make_rss20(<<-EOR, {DC_PREFIX => DC_URI}) -#{make_channel20(DC_NODES + make_item20(DC_NODES))} -EOR - - @atom_feed_parents = [[], %w(entries last)] - - @atom_feed_source = make_feed(<<-EOR, {DC_PREFIX => DC_URI}) -#{DC_NODES} -#{make_entry(DC_NODES)} -EOR - - @atom_entry_parents = [[]] - - @atom_entry_source = make_entry_document(<<-EOR, {DC_PREFIX => DC_URI}) -#{DC_NODES} -EOR - end - - def test_parser - rss10_maker = Proc.new do |content, xmlns| - make_RDF(<<-EOR, xmlns) -#{make_channel(content)} -#{make_image(content)} -#{make_item(content)} -#{make_textinput(content)} -EOR - end - assert_dc_parse(@rss10_source, @rss10_parents, false, &rss10_maker) - assert_dc_parse(@rss10_source, @rss10_parents, true, &rss10_maker) - - rss20_maker = Proc.new do |content, xmlns| - make_rss20(<<-EOR, xmlns) -#{make_channel20(content + make_item20(content))} -EOR - end - assert_dc_parse(@rss20_source, @rss20_parents, false, &rss20_maker) - assert_dc_parse(@rss20_source, @rss20_parents, true, &rss20_maker) - - atom_feed_maker = Proc.new do |content, xmlns| - make_feed(<<-EOR, xmlns) -#{content} -#{make_entry(content)} -EOR - end - assert_dc_parse(@atom_feed_source, @atom_feed_parents, false, - &atom_feed_maker) - assert_dc_parse(@atom_feed_source, @atom_feed_parents, true, - &atom_feed_maker) - - atom_entry_maker = Proc.new do |content, xmlns| - make_entry_document(<<-EOR, xmlns) -#{content} -EOR - end - assert_dc_parse(@atom_entry_source, @atom_entry_parents, false, - &atom_entry_maker) - assert_dc_parse(@atom_entry_source, @atom_entry_parents, true, - &atom_entry_maker) - end - - def test_singular_accessor - assert_dc_singular_accessor(@rss10_source, @rss10_parents) - assert_dc_singular_accessor(@rss20_source, @rss20_parents) - assert_dc_singular_accessor(@atom_feed_source, @atom_feed_parents) - assert_dc_singular_accessor(@atom_entry_source, @atom_entry_parents) - end - - def test_plural_accessor - assert_dc_plural_accessor(@rss10_source, @rss10_parents, false) - assert_dc_plural_accessor(@rss10_source, @rss10_parents, true) - - assert_dc_plural_accessor(@rss20_source, @rss20_parents, false) - assert_dc_plural_accessor(@rss20_source, @rss20_parents, true) - - assert_dc_plural_accessor(@atom_feed_source, @atom_feed_parents, false) - assert_dc_plural_accessor(@atom_feed_source, @atom_feed_parents, true) - - assert_dc_plural_accessor(@atom_entry_source, @atom_entry_parents, false) - assert_dc_plural_accessor(@atom_entry_source, @atom_entry_parents, true) - end - - def test_to_s - assert_dc_to_s(@rss10_source, @rss10_parents, false) - assert_dc_to_s(@rss10_source, @rss10_parents, true) - - targets = ["channel", "channel/item[3]"] - assert_dc_to_s(@rss20_source, @rss20_parents, false, targets) - assert_dc_to_s(@rss20_source, @rss20_parents, true, targets) - - targets = [".", "entry"] - assert_dc_to_s(@atom_feed_source, @atom_feed_parents, false, targets) - assert_dc_to_s(@atom_feed_source, @atom_feed_parents, true, targets) - - targets = ["."] - assert_dc_to_s(@atom_entry_source, @atom_entry_parents, false, targets) - assert_dc_to_s(@atom_entry_source, @atom_entry_parents, true, targets) - end - - private - def dc_plural_suffix(name, check_backward_compatibility) - if name == :rights - if check_backward_compatibility - "es" - else - "_list" - end - else - "s" - end - end - - def assert_dc_parse(source, parents, check_backward_compatibility, &maker) - assert_nothing_raised do - Parser.parse(source) - end - - DC_ELEMENTS.each do |name, value| - parents.each do |parent_readers| - feed = nil - assert_nothing_raised do - tag = "#{DC_PREFIX}:#{name}" - dc_content = "<#{tag}>#{value}\n" - dc_content *= 2 - feed = Parser.parse(maker.call(dc_content, {DC_PREFIX => DC_URI})) - end - parent = chain_reader(feed, parent_readers) - - plural_suffix = dc_plural_suffix(name, check_backward_compatibility) - plural_reader = "dc_#{name}#{plural_suffix}" - values = parent.__send__(plural_reader).collect(&:value) - value = CGI.unescapeHTML(value) if value.kind_of?(String) - assert_equal([value, value], values) - end - end - end - - def assert_dc_singular_accessor(source, parents) - feed = Parser.parse(source) - new_value = "hoge" - - parents.each do |parent_readers| - parent = chain_reader(feed, parent_readers) - DC_ELEMENTS.each do |name, value| - parsed_value = parent.__send__("dc_#{name}") - value = CGI.unescapeHTML(value) if value.kind_of?(String) - assert_equal(value, parsed_value) - if name == :date - t = Time.iso8601("2003-01-01T02:30:23+09:00") - class << t - alias_method(:to_s, :iso8601) - end - parent.__send__("dc_#{name}=", t.iso8601) - assert_equal(t, parent.__send__("dc_#{name}")) - if parent.class.method_defined?(:date_without_dc_date=) - assert_nil(parent.date) - else - assert_equal(t, parent.date) - end - - parent.date = value - assert_equal(value, parent.date) - assert_equal(value, parent.__send__("dc_#{name}")) - else - parent.__send__("dc_#{name}=", new_value) - assert_equal(new_value, parent.__send__("dc_#{name}")) - end - end - end - end - - def assert_dc_plural_accessor(source, parents, check_backward_compatibility) - feed = Parser.parse(source) - new_value = "hoge" - - DC_ELEMENTS.each do |name, value| - parents.each do |parent_readers| - parent = chain_reader(feed, parent_readers) - parsed_value = parent.__send__("dc_#{name}") - value = CGI.unescapeHTML(value) if value.kind_of?(String) - assert_equal(value, parsed_value) - - plural_suffix = dc_plural_suffix(name, check_backward_compatibility) - plural_reader = "dc_#{name}#{plural_suffix}" - klass_name = "DublinCore#{Utils.to_class_name(name.to_s)}" - klass = DublinCoreModel.const_get(klass_name) - if name == :date - t = Time.iso8601("2003-01-01T02:30:23+09:00") - class << t - alias_method(:to_s, :iso8601) - end - elems = parent.__send__(plural_reader) - elems << klass.new(t.iso8601) - new_elems = parent.__send__(plural_reader) - values = new_elems.collect{|x| x.value} - assert_equal([parent.__send__("dc_#{name}"), t], values) - else - elems = parent.__send__(plural_reader) - elems << klass.new(new_value) - new_elems = parent.__send__(plural_reader) - values = new_elems.collect{|x| x.value} - assert_equal([parent.__send__("dc_#{name}"), new_value], - values) - end - end - end - end - - def assert_dc_to_s(source, parents, check_backward_compatibility, - targets=nil) - feed = Parser.parse(source) - - DC_ELEMENTS.each do |name, value| - excepted = "<#{DC_PREFIX}:#{name}>#{value}" - parents.each do |parent_readers| - parent = chain_reader(feed, parent_readers) - assert_equal(excepted, parent.__send__("dc_#{name}_elements")) - end - - plural_suffix = dc_plural_suffix(name, check_backward_compatibility) - reader = "dc_#{name}#{plural_suffix}" - excepted = Array.new(2, excepted).join("\n") - parents.each do |parent_readers| - parent = chain_reader(feed, parent_readers) - elems = parent.__send__(reader) - klass_name = "DublinCore#{Utils.to_class_name(name.to_s)}" - klass = DublinCoreModel.const_get(klass_name) - elems << klass.new(parent.__send__("dc_#{name}")) - assert_equal(excepted, parent.__send__("dc_#{name}_elements")) - end - end - - targets ||= parents.collect do |parent_readers| - parent_readers.first - end - feed_root = REXML::Document.new(source).root - targets.each do |target_xpath| - parent = feed_root.elements[target_xpath] - parent.each_element do |elem| - if elem.namespace == DC_URI - assert_equal(elem.text, - CGI.unescapeHTML(DC_ELEMENTS[elem.name.intern].to_s)) - end - end - end - end - end -end diff --git a/test/rss/test_image.rb b/test/rss/test_image.rb deleted file mode 100644 index 0f1cd8c9e28fc8..00000000000000 --- a/test/rss/test_image.rb +++ /dev/null @@ -1,215 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/image" - -module RSS - class TestImage < TestCase - - def setup - @prefix = "image" - @uri = "http://purl.org/rss/1.0/modules/image/" - - @favicon_attrs = { - "rdf:about" => "http://www.kuro5hin.org/favicon.ico", - "#{@prefix}:size" => "small", - } - @favicon_contents = {"dc:title" => "Kuro5hin",} - @items = [ - [ - { - "rdf:about" => "http://www.example.org/item.png", - "rdf:resource" => "http://www.example.org/item", - }, - { - "dc:title" => "Example Image", - "#{@prefix}:width" => "100", - "#{@prefix}:height" => "65", - }, - ], - [ - { - "rdf:about" => "http://www.kuro5hin.org/images/topics/culture.jpg", - }, - { - "dc:title" => "Culture", - "#{@prefix}:width" => "80", - "#{@prefix}:height" => "50", - }, - ] - ] - - - @channel_nodes = make_element("#{@prefix}:favicon", - @favicon_attrs, - @favicon_contents) - items = "" - @items.each do |attrs, contents| - image_item = make_element("#{@prefix}:item", attrs, contents) - items << make_item(image_item) - end - - @ns = { - @prefix => @uri, - DC_PREFIX => DC_URI, - } - @rss_source = make_RDF(<<-EOR, @ns) -#{make_channel(@channel_nodes)} -#{make_image} -#{items} -#{make_textinput} -EOR - - @rss = Parser.parse(@rss_source) - end - - def test_parser - assert_nothing_raised do - Parser.parse(@rss_source) - end - - assert_too_much_tag("favicon", "channel") do - Parser.parse(make_RDF(<<-EOR, @ns)) -#{make_channel(@channel_nodes * 2)} -#{make_item} -EOR - end - - attrs = {"rdf:about" => "http://www.example.org/item.png"} - contents = [["#{@prefix}:width", "80"]] * 5 - image_item = make_element("#{@prefix}:item", attrs, contents) - assert_too_much_tag("width", "item") do - Parser.parse(make_RDF(<<-EOR, @ns)) -#{make_channel} -#{make_item(image_item)} -EOR - end - end - - def test_favicon_accessor - favicon = @rss.channel.image_favicon - [ - %w(about rdf:about http://example.com/favicon.ico), - %w(size image:size large), - %w(image_size image:size medium), - ].each do |name, full_name, new_value| - assert_equal(@favicon_attrs[full_name], favicon.__send__(name)) - favicon.__send__("#{name}=", new_value) - assert_equal(new_value, favicon.__send__(name)) - favicon.__send__("#{name}=", @favicon_attrs[full_name]) - assert_equal(@favicon_attrs[full_name], favicon.__send__(name)) - end - - %w(small medium large).each do |value| - assert_nothing_raised do - favicon.size = value - favicon.image_size = value - end - end - - %w(aaa AAA SMALL MEDIUM LARGE).each do |value| - args = ["#{@prefix}:favicon", value, "#{@prefix}:size"] - assert_not_available_value(*args) do - favicon.size = value - end - assert_not_available_value(*args) do - favicon.image_size = value - end - end - - [ - %w(dc_title dc:title sample-favicon), - ].each do |name, full_name, new_value| - assert_equal(@favicon_contents[full_name], favicon.__send__(name)) - favicon.__send__("#{name}=", new_value) - assert_equal(new_value, favicon.__send__(name)) - favicon.__send__("#{name}=", @favicon_contents[full_name]) - assert_equal(@favicon_contents[full_name], favicon.__send__(name)) - end - end - - def test_item_accessor - @rss.items.each_with_index do |item, i| - image_item = item.image_item - attrs, contents = @items[i] - [ - %w(about rdf:about http://example.com/image.png), - %w(resource rdf:resource http://example.com/), - ].each do |name, full_name, new_value| - assert_equal(attrs[full_name], image_item.__send__(name)) - image_item.__send__("#{name}=", new_value) - assert_equal(new_value, image_item.__send__(name)) - image_item.__send__("#{name}=", attrs[full_name]) - assert_equal(attrs[full_name], image_item.__send__(name)) - end - - [ - ["width", "image:width", "111"], - ["image_width", "image:width", "44"], - ["height", "image:height", "222"], - ["image_height", "image:height", "88"], - ].each do |name, full_name, new_value| - assert_equal(contents[full_name].to_i, image_item.__send__(name)) - image_item.__send__("#{name}=", new_value) - assert_equal(new_value.to_i, image_item.__send__(name)) - image_item.__send__("#{name}=", contents[full_name]) - assert_equal(contents[full_name].to_i, image_item.__send__(name)) - end - - [ - ["dc_title", "dc:title", "sample-image"], - ].each do |name, full_name, new_value| - assert_equal(contents[full_name], image_item.__send__(name)) - image_item.__send__("#{name}=", new_value) - assert_equal(new_value, image_item.__send__(name)) - image_item.__send__("#{name}=", contents[full_name]) - assert_equal(contents[full_name], image_item.__send__(name)) - end - end - end - - def test_favicon_to_s - favicon = @rss.channel.image_favicon - expected_xml = image_xmlns_container(make_element("#{@prefix}:favicon", - @favicon_attrs, - @favicon_contents)) - expected = REXML::Document.new(expected_xml) - actual_xml = image_xmlns_container(favicon.to_s(false, "")) - actual = REXML::Document.new(actual_xml) - assert_equal(expected.to_s, actual.to_s) - end - - def test_item_to_s - @rss.items.each_with_index do |item, i| - attrs, contents = @items[i] - expected_xml = make_element("#{@prefix}:item", attrs, contents) - expected_xml = image_xmlns_container(expected_xml) - expected = REXML::Document.new(expected_xml) - actual_xml = image_xmlns_container(item.image_item.to_s(false, "")) - actual = REXML::Document.new(actual_xml) - - assert_equal(expected[0].attributes, actual[0].attributes) - - %w(image:height image:width dc:title).each do |name| - actual_target = actual.elements["//#{name}"] - expected_target = expected.elements["//#{name}"] - assert_equal(expected_target.to_s, actual_target.to_s) - end - end - end - - private - def image_xmlns_container(content) - xmlns_container({ - @prefix => @uri, - "dc" => "http://purl.org/dc/elements/1.1/", - "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", - }, - content) - end - end -end diff --git a/test/rss/test_inherit.rb b/test/rss/test_inherit.rb deleted file mode 100644 index 020f066c5f8d66..00000000000000 --- a/test/rss/test_inherit.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/1.0" - -module RSS - class TestInherit < TestCase - - class InheritedImage < RSS::RDF::Image - def self.indent_size; 1; end - def self.tag_name; 'image'; end - end - - def setup - @rss = make_RDF(<<-EOR) -#{make_channel} -#{make_image} -#{make_item} -#{make_textinput} -EOR - end - - def test_inherit - rss = RSS::Parser.parse(@rss) - orig_image = rss.image - prefix = "[INHERIT]" - image = InheritedImage.new("#{prefix} #{orig_image.about}") - image.title = "#{prefix} #{orig_image.title}" - image.url = "#{prefix} #{orig_image.url}" - image.link = "#{prefix} #{orig_image.link}" - rss.image = image - - new_rss = RSS::Parser.parse(rss.to_s) - new_image = new_rss.image - assert_equal("#{prefix} #{orig_image.about}", new_image.about) - assert_equal("#{prefix} #{orig_image.title}", new_image.title) - assert_equal("#{prefix} #{orig_image.url}", new_image.url) - assert_equal("#{prefix} #{orig_image.link}", new_image.link) - end - end -end diff --git a/test/rss/test_itunes.rb b/test/rss/test_itunes.rb deleted file mode 100644 index 4459d8bfc74864..00000000000000 --- a/test/rss/test_itunes.rb +++ /dev/null @@ -1,356 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/2.0" -require "rss/itunes" - -module RSS - class TestITunes < TestCase - def test_author - assert_itunes_author(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - - assert_itunes_author(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_block - assert_itunes_block(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_category - assert_itunes_category(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - end - - def test_image - assert_itunes_image(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - end - - def test_duration - assert_itunes_duration(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_explicit - assert_itunes_explicit(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - - assert_itunes_explicit(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_keywords - assert_itunes_keywords(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - - assert_itunes_keywords(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_new_feed_url - assert_itunes_new_feed_url(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - end - - def test_owner - assert_itunes_owner(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - end - - def test_subtitle - assert_itunes_subtitle(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - - assert_itunes_subtitle(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - def test_summary - assert_itunes_summary(%w(channel)) do |content, xmlns| - make_rss20(make_channel20(content), xmlns) - end - - assert_itunes_summary(%w(items last)) do |content, xmlns| - make_rss20(make_channel20(make_item20(content)), xmlns) - end - end - - private - def itunes_rss20_parse(content, &maker) - xmlns = {"itunes" => "http://www.itunes.com/dtds/podcast-1.0.dtd"} - rss20_xml = maker.call(content, xmlns) - ::RSS::Parser.parse(rss20_xml) - end - - def assert_itunes_author(readers, &rss20_maker) - _wrap_assertion do - author = "John Lennon" - rss20 = itunes_rss20_parse(tag("itunes:author", author), &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(author, target.itunes_author) - end - end - - def _assert_itunes_block(value, boolean_value, readers, &rss20_maker) - rss20 = itunes_rss20_parse(tag("itunes:block", value), &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(value, target.itunes_block) - assert_equal(boolean_value, target.itunes_block?) - end - - def assert_itunes_block(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_block("yes", true, readers, &rss20_maker) - _assert_itunes_block("Yes", true, readers, &rss20_maker) - _assert_itunes_block("no", false, readers, &rss20_maker) - _assert_itunes_block("", false, readers, &rss20_maker) - end - end - - def _assert_itunes_category(categories, readers, &rss20_maker) - cats = categories.collect do |category| - if category.is_a?(Array) - category, sub_category = category - tag("itunes:category", - tag("itunes:category", nil, {"text" => sub_category}), - {"text" => category}) - else - tag("itunes:category", nil, {"text" => category}) - end - end.join - rss20 = itunes_rss20_parse(cats, &rss20_maker) - target = chain_reader(rss20, readers) - actual_categories = target.itunes_categories.collect do |category| - cat = category.text - if category.itunes_categories.empty? - cat - else - [cat, *category.itunes_categories.collect {|c| c.text}] - end - end - assert_equal(categories, actual_categories) - end - - def assert_itunes_category(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_category(["Audio Blogs"], readers, &rss20_maker) - _assert_itunes_category([["Arts & Entertainment", "Games"]], - readers, &rss20_maker) - _assert_itunes_category([["Arts & Entertainment", "Games"], - ["Technology", "Computers"], - "Audio Blogs"], - readers, &rss20_maker) - end - end - - def assert_itunes_image(readers, &rss20_maker) - _wrap_assertion do - url = "http://example.com/podcasts/everything/AllAboutEverything.jpg" - content = tag("itunes:image", nil, {"href" => url}) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_not_nil(target.itunes_image) - assert_equal(url, target.itunes_image.href) - - assert_missing_attribute("image", "href") do - content = tag("itunes:image") - itunes_rss20_parse(content, &rss20_maker) - end - end - end - - def _assert_itunes_duration(hour, minute, second, value, - readers, &rss20_maker) - content = tag("itunes:duration", value) - rss20 = itunes_rss20_parse(content, &rss20_maker) - duration = chain_reader(rss20, readers).itunes_duration - assert_equal(value, duration.content) - assert_equal(hour, duration.hour) - assert_equal(minute, duration.minute) - assert_equal(second, duration.second) - end - - def _assert_itunes_duration_not_available_value(value, &rss20_maker) - assert_not_available_value("duration", value) do - content = tag("itunes:duration", value) - itunes_rss20_parse(content, &rss20_maker) - end - end - - def assert_itunes_duration(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_duration(7, 14, 5, "07:14:05", readers, &rss20_maker) - _assert_itunes_duration(7, 14, 5, "7:14:05", readers, &rss20_maker) - _assert_itunes_duration(0, 4, 55, "04:55", readers, &rss20_maker) - _assert_itunes_duration(0, 4, 5, "4:05", readers, &rss20_maker) - _assert_itunes_duration(0, 0, 5, "5", readers, &rss20_maker) - _assert_itunes_duration(0, 3, 15, "195", readers, &rss20_maker) - _assert_itunes_duration(1, 0, 1, "3601", readers, &rss20_maker) - - _assert_itunes_duration_not_available_value("09:07:14:05", &rss20_maker) - _assert_itunes_duration_not_available_value("10:5", &rss20_maker) - _assert_itunes_duration_not_available_value("10:03:5", &rss20_maker) - _assert_itunes_duration_not_available_value("10:3:05", &rss20_maker) - - _assert_itunes_duration_not_available_value("xx:xx:xx", &rss20_maker) - - _assert_itunes_duration_not_available_value("", &rss20_maker) - end - end - - def _assert_itunes_explicit(explicit, value, readers, &rss20_maker) - content = tag("itunes:explicit", value) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(value, target.itunes_explicit) - assert_equal(explicit, target.itunes_explicit?) - end - - def assert_itunes_explicit(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_explicit(true, "explicit", readers, &rss20_maker) - _assert_itunes_explicit(true, "yes", readers, &rss20_maker) - _assert_itunes_explicit(true, "true", readers, &rss20_maker) - _assert_itunes_explicit(false, "clean", readers, &rss20_maker) - _assert_itunes_explicit(false, "no", readers, &rss20_maker) - _assert_itunes_explicit(false, "false", readers, &rss20_maker) - _assert_itunes_explicit(nil, "invalid", readers, &rss20_maker) - end - end - - def _assert_itunes_keywords(keywords, value, readers, &rss20_maker) - content = tag("itunes:keywords", value) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(keywords, target.itunes_keywords) - end - - def assert_itunes_keywords(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_keywords(["salt"], "salt", readers, &rss20_maker) - _assert_itunes_keywords(["salt"], " salt ", readers, &rss20_maker) - _assert_itunes_keywords(["salt", "pepper", "shaker", "exciting"], - "salt, pepper, shaker, exciting", - readers, &rss20_maker) - _assert_itunes_keywords(["metric", "socket", "wrenches", "toolsalt"], - "metric, socket, wrenches, toolsalt", - readers, &rss20_maker) - _assert_itunes_keywords(["olitics", "red", "blue", "state"], - "olitics, red, blue, state", - readers, &rss20_maker) - end - end - - def assert_itunes_new_feed_url(readers, &rss20_maker) - _wrap_assertion do - url = "http://newlocation.com/example.rss" - content = tag("itunes:new-feed-url", url) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(url, target.itunes_new_feed_url) - end - end - - def _assert_itunes_owner(name, email, readers, &rss20_maker) - content = tag("itunes:owner", - tag("itunes:name", name) + tag("itunes:email", email)) - rss20 = itunes_rss20_parse(content, &rss20_maker) - owner = chain_reader(rss20, readers).itunes_owner - assert_equal(name, owner.itunes_name) - assert_equal(email, owner.itunes_email) - end - - def assert_itunes_owner(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_owner("John Doe", "john.doe@example.com", - readers, &rss20_maker) - - assert_missing_tag("name", "owner") do - content = tag("itunes:owner") - itunes_rss20_parse(content, &rss20_maker) - end - - assert_missing_tag("name", "owner") do - content = tag("itunes:owner", - tag("itunes:email", "john.doe@example.com")) - itunes_rss20_parse(content, &rss20_maker) - end - - assert_missing_tag("email", "owner") do - content = tag("itunes:owner", tag("itunes:name", "John Doe")) - itunes_rss20_parse(content, &rss20_maker) - end - end - end - - def _assert_itunes_subtitle(value, readers, &rss20_maker) - content = tag("itunes:subtitle", value) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(value, target.itunes_subtitle) - end - - def assert_itunes_subtitle(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_subtitle("A show about everything", readers, &rss20_maker) - _assert_itunes_subtitle("A short primer on table spices", - readers, &rss20_maker) - _assert_itunes_subtitle("Comparing socket wrenches is fun!", - readers, &rss20_maker) - _assert_itunes_subtitle("Red + Blue != Purple", readers, &rss20_maker) - end - end - - def _assert_itunes_summary(value, readers, &rss20_maker) - content = tag("itunes:summary", value) - rss20 = itunes_rss20_parse(content, &rss20_maker) - target = chain_reader(rss20, readers) - assert_equal(value, target.itunes_summary) - end - - def assert_itunes_summary(readers, &rss20_maker) - _wrap_assertion do - _assert_itunes_summary("All About Everything is a show about " + - "everything. Each week we dive into any " + - "subject known to man and talk about it as " + - "much as we can. Look for our Podcast in " + - "the iTunes Music Store", - readers, &rss20_maker) - _assert_itunes_summary("This week we talk about salt and pepper " + - "shakers, comparing and contrasting pour " + - "rates, construction materials, and overall " + - "aesthetics. Come and join the party!", - readers, &rss20_maker) - _assert_itunes_summary("This week we talk about metric vs. old " + - "english socket wrenches. Which one is " + - "better? Do you really need both? Get all " + - "of your answers here.", - readers, &rss20_maker) - _assert_itunes_summary("This week we talk about surviving in a " + - "Red state if you're a Blue person. Or " + - "vice versa.", - readers, &rss20_maker) - end - end - end -end diff --git a/test/rss/test_maker_0.9.rb b/test/rss/test_maker_0.9.rb deleted file mode 100644 index d07a724ab16d6e..00000000000000 --- a/test/rss/test_maker_0.9.rb +++ /dev/null @@ -1,477 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMaker09 < TestCase - def test_supported? - assert(RSS::Maker.supported?("0.9")) - assert(RSS::Maker.supported?("rss0.9")) - assert(RSS::Maker.supported?("0.91")) - assert(RSS::Maker.supported?("rss0.91")) - assert(RSS::Maker.supported?("0.92")) - assert(RSS::Maker.supported?("rss0.92")) - assert(!RSS::Maker.supported?("0.93")) - assert(!RSS::Maker.supported?("rss0.93")) - end - - def test_find_class - assert_equal(RSS::Maker::RSS091, RSS::Maker["0.91"]) - assert_equal(RSS::Maker::RSS091, RSS::Maker["rss0.91"]) - assert_equal(RSS::Maker::RSS092, RSS::Maker["0.9"]) - assert_equal(RSS::Maker::RSS092, RSS::Maker["0.92"]) - assert_equal(RSS::Maker::RSS092, RSS::Maker["rss0.92"]) - end - - def test_rss - assert_raise(LocalJumpError) do - RSS::Maker.make("0.91") - end - - rss = RSS::Maker.make("0.9") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - end - assert_equal("0.92", rss.rss_version) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - end - assert_equal("0.91", rss.rss_version) - - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.encoding = "EUC-JP" - end - assert_equal("0.91", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.standalone = "yes" - end - assert_equal("0.91", rss.rss_version) - assert_equal("yes", rss.standalone) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.encoding = "EUC-JP" - maker.standalone = "yes" - end - assert_equal("0.91", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - assert_equal("yes", rss.standalone) - end - - def test_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - copyright = "foo" - managingEditor = "bar" - webMaster = "web master" - rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))' - docs = "http://foo.com/doc" - skipDays = [ - "Sunday", - "Monday", - ] - skipHours = [ - "0", - "13", - ] - pubDate = Time.now - lastBuildDate = Time.now - - image_url = "http://example.com/logo.png" - image_title = "Logo" - - rss = RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - maker.channel.copyright = copyright - maker.channel.managingEditor = managingEditor - maker.channel.webMaster = webMaster - maker.channel.rating = rating - maker.channel.docs = docs - maker.channel.pubDate = pubDate - maker.channel.lastBuildDate = lastBuildDate - - skipDays.each do |day| - maker.channel.skipDays.new_day do |new_day| - new_day.content = day - end - end - skipHours.each do |hour| - maker.channel.skipHours.new_hour do |new_hour| - new_hour.content = hour - end - end - - maker.image.url = image_url - maker.image.title = image_title - end - channel = rss.channel - - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(language, channel.language) - assert_equal(copyright, channel.copyright) - assert_equal(managingEditor, channel.managingEditor) - assert_equal(webMaster, channel.webMaster) - assert_equal(rating, channel.rating) - assert_equal(docs, channel.docs) - assert_equal(pubDate, channel.pubDate) - assert_equal(pubDate, channel.date) - assert_equal(lastBuildDate, channel.lastBuildDate) - - skipDays.each_with_index do |day, i| - assert_equal(day, channel.skipDays.days[i].content) - end - skipHours.each_with_index do |hour, i| - assert_equal(hour.to_i, channel.skipHours.hours[i].content) - end - - assert(channel.items.empty?) - - assert_equal(image_url, channel.image.url) - assert_equal(image_title, channel.image.title) - assert_equal(link, channel.image.link) - - assert_nil(channel.textInput) - end - - def test_not_valid_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - - assert_not_set_error("maker.channel", %w(title)) do - RSS::Maker.make("0.91") do |maker| - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - end - end - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - # maker.channel.link = link - maker.channel.link = nil - maker.channel.description = description - maker.channel.language = language - end - end - - assert_not_set_error("maker.channel", %w(description)) do - RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description - maker.channel.language = language - end - end - - assert_not_set_error("maker.channel", %w(language)) do - RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - # maker.channel.language = language - end - end - end - - def test_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - image = rss.image - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - assert_equal(width.to_i, image.width) - assert_equal(height.to_i, image.height) - assert_equal(description, image.description) - - assert_not_set_error("maker.channel", %w(description title language)) do - RSS::Maker.make("0.91") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - end - - def test_not_valid_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - assert_not_set_error("maker.image", %w(title)) do - RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - # maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - - assert_not_set_error("maker.image", %w(url)) do - RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - # maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - end - - def test_items(with_convenience_way=true) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - end - assert(rss.channel.items.empty?) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - item.title = title - item.link = link - # item.description = description - end - - setup_dummy_image(maker) - end - assert_equal(1, rss.channel.items.size) - item = rss.channel.items.first - assert_equal(title, item.title) - assert_equal(link, item.link) - assert_nil(item.description) - - pubDate = Time.now - - item_size = 5 - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - _item.date = pubDate - i - end - end - maker.items.do_sort = true - - setup_dummy_image(maker) - end - assert_equal(item_size, rss.items.size) - rss.channel.items.each_with_index do |_item, i| - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - end - end - maker.items.do_sort = Proc.new do |x, y| - if with_convenience_way - y.title[-1] <=> x.title[-1] - else - y.title {|t| t.content[-1]} <=> x.title {|t| t.content[-1]} - end - end - - setup_dummy_image(maker) - end - assert_equal(item_size, rss.items.size) - rss.channel.items.reverse.each_with_index do |_item, i| - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - end - - def test_items_with_new_api_since_018 - test_items(false) - end - - def test_textInput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - textInput = rss.channel.textInput - assert_equal(title, textInput.title) - assert_equal(description, textInput.description) - assert_equal(name, textInput.name) - assert_equal(link, textInput.link) - - assert_not_set_error("maker.channel", - %w(link language description title)) do - RSS::Maker.make("0.91") do |maker| - # setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - end - end - - def test_not_valid_textInput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - # maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.textinput.title = title - # maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.textinput.title = title - maker.textinput.description = description - # maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - # maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - end - - def test_date_in_string - date = Time.now - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.items.new_item do |item| - item.title = "The first item" - item.link = "http://example.com/blog/1.html" - item.date = date.rfc822 - end - end - - assert_equal(date.iso8601, rss.items[0].date.iso8601) - end - end -end diff --git a/test/rss/test_maker_1.0.rb b/test/rss/test_maker_1.0.rb deleted file mode 100644 index f3c0e50cebcfba..00000000000000 --- a/test/rss/test_maker_1.0.rb +++ /dev/null @@ -1,519 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMaker10 < TestCase - def test_supported? - assert(RSS::Maker.supported?("1.0")) - assert(RSS::Maker.supported?("rss1.0")) - assert(!RSS::Maker.supported?("1.1")) - assert(!RSS::Maker.supported?("rss1.1")) - end - - def test_find_class - assert_equal(RSS::Maker::RSS10, RSS::Maker["1.0"]) - assert_equal(RSS::Maker::RSS10, RSS::Maker["rss1.0"]) - end - - def test_rdf - assert_raise(LocalJumpError) do - RSS::Maker.make("1.0") - end - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - assert_equal("1.0", rss.rss_version) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.encoding = "EUC-JP" - - setup_dummy_item(maker) - end - assert_equal("1.0", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.standalone = "yes" - - setup_dummy_item(maker) - end - assert_equal("1.0", rss.rss_version) - assert_equal("yes", rss.standalone) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.encoding = "EUC-JP" - maker.standalone = "yes" - - setup_dummy_item(maker) - end - assert_equal("1.0", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - assert_equal("yes", rss.standalone) - end - - def test_channel - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - - setup_dummy_item(maker) - end - channel = rss.channel - assert_equal(about, channel.about) - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(1, channel.items.Seq.lis.size) - assert_nil(channel.image) - assert_nil(channel.textinput) - - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - - setup_dummy_image(maker) - - setup_dummy_textinput(maker) - - setup_dummy_item(maker) - end - channel = rss.channel - assert_equal(about, channel.about) - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(1, channel.items.Seq.lis.size) - assert_equal(rss.image.about, channel.image.resource) - assert_equal(rss.textinput.about, channel.textinput.resource) - end - - def test_channel_language - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - - setup_dummy_item(maker) - end - channel = rss.channel - assert_equal(language, channel.dc_language) - end - - def test_not_valid_channel - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - - assert_not_set_error("maker.channel", %w(about)) do - RSS::Maker.make("1.0") do |maker| - # maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - end - end - - assert_not_set_error("maker.channel", %w(title)) do - RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - end - end - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - # maker.channel.link = link - maker.channel.description = description - end - end - - assert_not_set_error("maker.channel", %w(description)) do - RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description - end - end - end - - - def test_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - - setup_dummy_item(maker) - end - image = rss.image - assert_equal(url, image.about) - assert_equal(url, rss.channel.image.resource) - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - - assert_not_set_error("maker.channel", %w(about title description)) do - RSS::Maker.make("1.0") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - end - end - end - - def test_not_valid_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - # maker.image.url = url - maker.image.title = title - - setup_dummy_item(maker) - end - assert_nil(rss.channel.image) - assert_nil(rss.image) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.url = url - # maker.image.title = title - - setup_dummy_item(maker) - end - assert_nil(rss.channel.image) - assert_nil(rss.image) - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil - - maker.image.url = url - maker.image.title = title - - setup_dummy_item(maker) - end - end - end - - def test_items(with_convenience_way=true) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - - assert_not_set_error("maker", %w(items)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - end - end - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - item.title = title - item.link = link - # item.description = description - end - end - assert_equal(1, rss.items.size) - item = rss.items.first - assert_equal(link, item.about) - assert_equal(title, item.title) - assert_equal(link, item.link) - assert_nil(item.description) - - pubDate = Time.now - - item_size = 5 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - _item.date = pubDate - i - end - end - maker.items.do_sort = true - end - assert_equal(item_size, rss.items.size) - rss.items.each_with_index do |_item, i| - assert_equal("#{link}#{i}", _item.about) - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - end - end - maker.items.do_sort = Proc.new do |x, y| - if with_convenience_way - y.title[-1] <=> x.title[-1] - else - y.title {|t| t.content[-1]} <=> x.title {|t| t.content[-1]} - end - end - end - assert_equal(item_size, rss.items.size) - rss.items.reverse.each_with_index do |_item, i| - assert_equal("#{link}#{i}", _item.about) - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - - max_size = item_size / 2 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - end - end - maker.items.max_size = max_size - end - assert_equal(max_size, rss.items.size) - rss.items.each_with_index do |_item, i| - assert_equal("#{link}#{i}", _item.about) - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - - max_size = 0 - assert_not_set_error("maker", %w(items)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - end - end - maker.items.max_size = max_size - end - end - - max_size = -2 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |_item| - _item.title = "#{title}#{i}" - _item.link = "#{link}#{i}" - _item.description = "#{description}#{i}" - end - end - maker.items.max_size = max_size - end - assert_equal(item_size + max_size + 1, rss.items.size) - rss.items.each_with_index do |_item, i| - assert_equal("#{link}#{i}", _item.about) - assert_equal("#{title}#{i}", _item.title) - assert_equal("#{link}#{i}", _item.link) - assert_equal("#{description}#{i}", _item.description) - end - end - - def test_items_with_new_api_since_018 - test_items(false) - end - - def test_not_valid_items - title = "TITLE" - link = "http://hoge.com/" - - assert_not_set_error("maker.item", %w(title)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - # item.title = title - item.link = link - end - end - end - - assert_not_set_error("maker.item", %w(link)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - item.title = title - # item.link = link - end - end - end - - assert_not_set_error("maker.item", %w(title link)) do - RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - # item.title = title - # item.link = link - end - end - end - end - - def test_textinput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.link = link - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - - setup_dummy_item(maker) - end - textinput = rss.textinput - assert_equal(link, textinput.about) - assert_equal(link, rss.channel.textinput.resource) - assert_equal(title, textinput.title) - assert_equal(name, textinput.name) - assert_equal(description, textinput.description) - assert_equal(link, textinput.link) - - assert_not_set_error("maker.channel", %w(about link description title)) do - RSS::Maker.make("1.0") do |maker| - # setup_dummy_channel(maker) - - maker.textinput.link = link - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - end - end - end - - def test_not_valid_textinput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - # maker.textinput.link = link - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - - setup_dummy_item(maker) - end - assert_nil(rss.channel.textinput) - assert_nil(rss.textinput) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.link = link - # maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - - setup_dummy_item(maker) - end - assert_nil(rss.channel.textinput) - assert_nil(rss.textinput) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.link = link - maker.textinput.title = title - # maker.textinput.description = description - maker.textinput.name = name - - setup_dummy_item(maker) - end - assert_nil(rss.channel.textinput) - assert_nil(rss.textinput) - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.link = link - maker.textinput.title = title - maker.textinput.description = description - # maker.textinput.name = name - - setup_dummy_item(maker) - end - assert_nil(rss.channel.textinput) - assert_nil(rss.textinput) - end - - end -end diff --git a/test/rss/test_maker_2.0.rb b/test/rss/test_maker_2.0.rb deleted file mode 100644 index f6d83f0c3d48f5..00000000000000 --- a/test/rss/test_maker_2.0.rb +++ /dev/null @@ -1,758 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMaker20 < TestCase - def test_supported? - assert(RSS::Maker.supported?("2.0")) - assert(RSS::Maker.supported?("rss2.0")) - assert(!RSS::Maker.supported?("2.2")) - assert(!RSS::Maker.supported?("rss2.2")) - end - - def test_find_class - assert_equal(RSS::Maker::RSS20, RSS::Maker["2.0"]) - assert_equal(RSS::Maker::RSS20, RSS::Maker["rss2.0"]) - end - - def test_rss - assert_raise(LocalJumpError) do - RSS::Maker.make("2.0") - end - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - end - assert_equal("2.0", rss.rss_version) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.encoding = "EUC-JP" - end - assert_equal("2.0", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.standalone = "yes" - end - assert_equal("2.0", rss.rss_version) - assert_equal("yes", rss.standalone) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.encoding = "EUC-JP" - maker.standalone = "yes" - end - assert_equal("2.0", rss.rss_version) - assert_equal("EUC-JP", rss.encoding) - assert_equal("yes", rss.standalone) - end - - def test_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - copyright = "foo" - managingEditor = "bar" - webMaster = "web master" - rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))' - docs = "http://foo.com/doc" - skipDays = [ - "Sunday", - "Monday", - ] - skipHours = [ - "0", - "13", - ] - pubDate = Time.now - lastBuildDate = Time.now - categories = [ - "Nespapers", - "misc", - ] - generator = "RSS Maker" - ttl = "60" - - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - maker.channel.copyright = copyright - maker.channel.managingEditor = managingEditor - maker.channel.webMaster = webMaster - maker.channel.rating = rating - maker.channel.docs = docs - maker.channel.pubDate = pubDate - maker.channel.lastBuildDate = lastBuildDate - - skipDays.each do |day| - maker.channel.skipDays.new_day do |new_day| - new_day.content = day - end - end - skipHours.each do |hour| - maker.channel.skipHours.new_hour do |new_hour| - new_hour.content = hour - end - end - - categories.each do |category| - maker.channel.categories.new_category do |new_category| - new_category.content = category - end - end - - maker.channel.generator = generator - maker.channel.ttl = ttl - end - channel = rss.channel - - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(language, channel.language) - assert_equal(copyright, channel.copyright) - assert_equal(managingEditor, channel.managingEditor) - assert_equal(webMaster, channel.webMaster) - assert_equal(rating, channel.rating) - assert_equal(docs, channel.docs) - assert_equal(pubDate, channel.pubDate) - assert_equal(pubDate, channel.date) - assert_equal(lastBuildDate, channel.lastBuildDate) - - skipDays.each_with_index do |day, i| - assert_equal(day, channel.skipDays.days[i].content) - end - skipHours.each_with_index do |hour, i| - assert_equal(hour.to_i, channel.skipHours.hours[i].content) - end - - channel.categories.each_with_index do |category, i| - assert_equal(categories[i], category.content) - end - - assert_equal(generator, channel.generator) - assert_equal(ttl.to_i, channel.ttl) - - assert(channel.items.empty?) - assert_nil(channel.image) - assert_nil(channel.textInput) - end - - def test_not_valid_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - - assert_not_set_error("maker.channel", %w(title)) do - RSS::Maker.make("2.0") do |maker| - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - end - end - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - # maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - end - end - - assert_not_set_error("maker.channel", %w(description)) do - RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description - maker.channel.language = language - end - end - - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - # maker.channel.language = language - end - assert_not_nil(rss) - end - - - def test_cloud - domain = "rpc.sys.com" - port = "80" - path = "/RPC2" - registerProcedure = "myCloud.rssPleaseNotify" - protocol = "xml-rpc" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.channel.cloud.domain = domain - maker.channel.cloud.port = port - maker.channel.cloud.path = path - maker.channel.cloud.registerProcedure = registerProcedure - maker.channel.cloud.protocol = protocol - end - cloud = rss.channel.cloud - assert_equal(domain, cloud.domain) - assert_equal(port.to_i, cloud.port) - assert_equal(path, cloud.path) - assert_equal(registerProcedure, cloud.registerProcedure) - assert_equal(protocol, cloud.protocol) - end - - def test_not_valid_cloud - domain = "rpc.sys.com" - port = "80" - path = "/RPC2" - registerProcedure = "myCloud.rssPleaseNotify" - protocol = "xml-rpc" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - # maker.channel.cloud.domain = domain - maker.channel.cloud.port = port - maker.channel.cloud.path = path - maker.channel.cloud.registerProcedure = registerProcedure - maker.channel.cloud.protocol = protocol - end - assert_nil(rss.channel.cloud) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.channel.cloud.domain = domain - # maker.channel.cloud.port = port - maker.channel.cloud.path = path - maker.channel.cloud.registerProcedure = registerProcedure - maker.channel.cloud.protocol = protocol - end - assert_nil(rss.channel.cloud) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.channel.cloud.domain = domain - maker.channel.cloud.port = port - # maker.channel.cloud.path = path - maker.channel.cloud.registerProcedure = registerProcedure - maker.channel.cloud.protocol = protocol - end - assert_nil(rss.channel.cloud) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.channel.cloud.domain = domain - maker.channel.cloud.port = port - maker.channel.cloud.path = path - # maker.channel.cloud.registerProcedure = registerProcedure - maker.channel.cloud.protocol = protocol - end - assert_nil(rss.channel.cloud) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.channel.cloud.domain = domain - maker.channel.cloud.port = port - maker.channel.cloud.path = path - maker.channel.cloud.registerProcedure = registerProcedure - # maker.channel.cloud.protocol = protocol - end - assert_nil(rss.channel.cloud) - end - - - def test_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - image = rss.image - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - assert_equal(width.to_i, image.width) - assert_equal(height.to_i, image.height) - assert_equal(description, image.description) - - assert_not_set_error("maker.channel", %w(title description)) do - RSS::Maker.make("2.0") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - end - - def test_not_valid_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - # maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - assert_nil(rss.image) - - assert_not_set_error("maker.channel", %w(link)) do - RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - end - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - # maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - assert_nil(rss.image) - end - - def test_items(with_convenience_way=true) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - author = "oprah@oxygen.net" - comments = "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290" - pubDate = Time.now - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - end - assert(rss.channel.items.empty?) - - item_size = 5 - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.author = "#{author}#{i}" - item.comments = "#{comments}#{i}" - item.date = pubDate - i - end - end - maker.items.do_sort = true - end - assert_equal(item_size, rss.items.size) - rss.channel.items.each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - assert_equal("#{author}#{i}", item.author) - assert_equal("#{comments}#{i}", item.comments) - assert_equal(pubDate - i, item.pubDate) - assert_equal(pubDate - i, item.date) - end - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.author = "#{author}#{i}" - item.comments = "#{comments}#{i}" - item.date = pubDate - end - end - maker.items.do_sort = Proc.new do |x, y| - if with_convenience_way - y.title[-1] <=> x.title[-1] - else - y.title {|t| t.content[-1]} <=> x.title {|t| t.content[-1]} - end - end - end - assert_equal(item_size, rss.items.size) - rss.channel.items.reverse.each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - assert_equal("#{author}#{i}", item.author) - assert_equal("#{comments}#{i}", item.comments) - assert_equal(pubDate, item.pubDate) - assert_equal(pubDate, item.date) - end - end - - def test_items_with_new_api_since_018 - test_items(false) - end - - def test_pubDate_without_description - title = "TITLE" - link = "http://hoge.com/" - # description = "text hoge fuga" - author = "oprah@oxygen.net" - pubDate = Time.now - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.items.new_item do |item| - item.title = title - item.link = link - # item.description = description - item.author = author - item.pubDate = pubDate - end - end - assert_equal(1, rss.items.size) - rss.channel.items.each_with_index do |item, i| - assert_equal(title, item.title) - assert_equal(link, item.link) - # assert_equal(description, item.description) - assert_equal(author, item.author) - assert_equal(pubDate, item.pubDate) - assert_equal(pubDate, item.date) - end - end - - def test_guid - isPermaLink = "true" - content = "http://inessential.com/2002/09/01.php#a2" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - guid = maker.items.last.guid - guid.isPermaLink = isPermaLink - guid.content = content - end - guid = rss.channel.items.last.guid - assert_equal(isPermaLink == "true", guid.isPermaLink) - assert_equal(content, guid.content) - end - - def test_guid_permanent_link - content = "http://inessential.com/2002/09/01.php#a2" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - guid = maker.items.last.guid - assert_equal(nil, guid.permanent_link?) - assert_equal(guid.isPermaLink, guid.permanent_link?) - guid.permanent_link = true - assert_equal(true, guid.permanent_link?) - assert_equal(guid.isPermaLink, guid.permanent_link?) - guid.content = content - end - guid = rss.channel.items.last.guid - assert_equal(true, guid.isPermaLink) - assert_equal(content, guid.content) - end - - def test_guid_permanent_link_false - content = "http://inessential.com/2002/09/01.php#a2" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - guid = maker.items.last.guid - assert_equal(nil, guid.permanent_link?) - assert_equal(guid.isPermaLink, guid.permanent_link?) - guid.permanent_link = false - assert_equal(false, guid.permanent_link?) - assert_equal(guid.isPermaLink, guid.permanent_link?) - guid.content = content - end - guid = rss.channel.items.last.guid - assert_equal(false, guid.isPermaLink) - assert_equal(content, guid.content) - end - - def test_not_valid_guid - # content = "http://inessential.com/2002/09/01.php#a2" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - # guid = maker.items.last.guid - # guid.content = content - end - assert_nil(rss.channel.items.last.guid) - end - - def test_enclosure - url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3" - length = "12216320" - type = "audio/mpeg" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - enclosure = maker.items.last.enclosure - enclosure.url = url - enclosure.length = length - enclosure.type = type - end - enclosure = rss.channel.items.last.enclosure - assert_equal(url, enclosure.url) - assert_equal(length.to_i, enclosure.length) - assert_equal(type, enclosure.type) - end - - def test_not_valid_enclosure - url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3" - length = "12216320" - type = "audio/mpeg" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - enclosure = maker.items.last.enclosure - # enclosure.url = url - enclosure.length = length - enclosure.type = type - end - assert_nil(rss.channel.items.last.enclosure) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - enclosure = maker.items.last.enclosure - enclosure.url = url - # enclosure.length = length - enclosure.type = type - end - assert_nil(rss.channel.items.last.enclosure) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - enclosure = maker.items.last.enclosure - enclosure.url = url - enclosure.length = length - # enclosure.type = type - end - assert_nil(rss.channel.items.last.enclosure) - end - - - def test_source - url = "http://static.userland.com/tomalak/links2.xml" - content = "Tomalak's Realm" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - source = maker.items.last.source - source.url = url - source.content = content - end - source = rss.channel.items.last.source - assert_equal(url, source.url) - assert_equal(content, source.content) - end - - def test_not_valid_source - url = "http://static.userland.com/tomalak/links2.xml" - content = "Tomalak's Realm" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - source = maker.items.last.source - # source.url = url - source.content = content - end - assert_nil(rss.channel.items.last.source) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - source = maker.items.last.source - source.url = url - # source.content = content - end - assert_nil(rss.channel.items.last.source) - end - - def test_category - domain = "http://www.fool.com/cusips" - content = "MSFT" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - maker.items.last.categories.new_category do |category| - category.domain = domain - category.content = content - end - end - category = rss.channel.items.last.categories.last - assert_equal(domain, category.domain) - assert_equal(content, category.content) - end - - def test_not_valid_category - # content = "Grateful Dead" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - maker.items.last.categories.new_category do |category| - # category.content = content - end - end - assert(rss.channel.items.last.categories.empty?) - end - - def test_textInput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - textInput = rss.channel.textInput - assert_equal(title, textInput.title) - assert_equal(description, textInput.description) - assert_equal(name, textInput.name) - assert_equal(link, textInput.link) - - assert_not_set_error("maker.channel", %w(link description title)) do - RSS::Maker.make("2.0") do |maker| - # setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - end - end - - def test_not_valid_textInput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - # maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.title = title - # maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - # maker.textinput.name = name - maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - # maker.textinput.link = link - end - assert_nil(rss.channel.textInput) - end - end -end diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb deleted file mode 100644 index 8e41c7c50ebe25..00000000000000 --- a/test/rss/test_maker_atom_entry.rb +++ /dev/null @@ -1,394 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerAtomEntry < TestCase - def test_supported? - assert(RSS::Maker.supported?("atom:entry")) - assert(RSS::Maker.supported?("atom1.0:entry")) - assert(!RSS::Maker.supported?("atom2.0:entry")) - end - - def test_find_class - assert_equal(RSS::Maker::Atom::Entry, RSS::Maker["atom:entry"]) - assert_equal(RSS::Maker::Atom::Entry, RSS::Maker["atom1.0:entry"]) - end - - def test_root_element - entry = Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - assert_equal(["atom", "1.0", "entry"], entry.feed_info) - - entry = Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.encoding = "EUC-JP" - end - assert_equal(["atom", "1.0", "entry"], entry.feed_info) - assert_equal("EUC-JP", entry.encoding) - - entry = Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.standalone = "yes" - end - assert_equal(["atom", "1.0", "entry"], entry.feed_info) - assert_equal("yes", entry.standalone) - - entry = Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.encoding = "EUC-JP" - maker.standalone = "yes" - end - assert_equal(["atom", "1.0", "entry"], entry.feed_info) - assert_equal("EUC-JP", entry.encoding) - assert_equal("yes", entry.standalone) - end - - def test_invalid_feed - assert_not_set_error("maker.item", %w(id title author updated)) do - Maker.make("atom:entry") do |maker| - end - end - - assert_not_set_error("maker.item", %w(id title updated)) do - Maker.make("atom:entry") do |maker| - maker.channel.author = "foo" - end - end - - assert_not_set_error("maker.item", %w(title updated)) do - Maker.make("atom:entry") do |maker| - maker.channel.author = "foo" - maker.channel.id = "http://example.com" - end - end - - assert_not_set_error("maker.item", %w(updated)) do - Maker.make("atom:entry") do |maker| - maker.channel.author = "foo" - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - end - end - - assert_not_set_error("maker.item", %w(author)) do - Maker.make("atom:entry") do |maker| - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - maker.channel.updated = Time.now - end - end - - entry = Maker.make("atom:entry") do |maker| - maker.channel.author = "Foo" - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - maker.channel.updated = Time.now - end - assert_not_nil(entry) - end - - def test_author - assert_maker_atom_persons("entry", - ["channel", "authors"], - ["authors"], - "maker.channel.author") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_persons("entry", - ["items", "first", "authors"], - ["authors"], - "maker.item.author", - "maker.item", ["author"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.authors.clear - maker.items.first.authors.clear - end - - assert_maker_atom_persons("entry", - ["items", "first", "source", "authors"], - ["source", "authors"], - "maker.item.source.author") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_category - assert_maker_atom_categories("entry", - ["channel", "categories"], - ["categories"], - "maker.channel.category") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_categories("entry", - ["items", "first", "categories"], - ["categories"], - "maker.item.category") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_categories("entry", - ["items", "first", "source", "categories"], - ["source", "categories"], - "maker.item.source.category") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_content - assert_maker_atom_content("entry", - ["items", "first", "content"], - ["content"], - "maker.item.content") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_contributor - assert_maker_atom_persons("entry", - ["channel", "contributors"], - ["contributors"], - "maker.channel.contributor") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_persons("entry", - ["items", "first", "contributors"], - ["contributors"], - "maker.item.contributor") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_persons("entry", - ["items", "first", "source", "contributors"], - ["source", "contributors"], - "maker.item.source.contributor") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_link - assert_maker_atom_links("entry", - ["channel", "links"], - ["links"], - "maker.channel.link") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.links.clear - maker.items.first.links.clear - end - - assert_maker_atom_links("entry", - ["items", "first", "links"], - ["links"], - "maker.item.link") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.links.clear - maker.items.first.links.clear - end - - assert_maker_atom_links("entry", - ["items", "first", "source", "links"], - ["source", "links"], - "maker.item.source.link", true) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_published - assert_maker_atom_date_construct("entry", - ["items", "first", "published"], - ["published"] - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_rights - assert_maker_atom_text_construct("entry", - ["channel", "copyright"], - ["rights"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_text_construct("entry", - ["items", "first", "rights"], - ["rights"], - nil, nil, "maker.item.rights" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_text_construct("entry", - ["items", "first", "source", "rights"], - ["source", "rights"], - nil, nil, "maker.item.source.rights" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - - def test_source_generator - assert_maker_atom_generator("entry", - ["items", "first", "source", "generator"], - ["source", "generator"], - "maker.item.source.generator") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_source_icon - assert_maker_atom_icon("entry", - ["items", "first", "source", "icon"], - ["source", "icon"], - nil, "maker.item.source.icon") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_source_id - assert_maker_atom_id("entry", - ["items", "first", "source"], - ["source"], - "maker.item.source") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_source_logo - assert_maker_atom_logo("entry", - ["items", "first", "source", "logo"], - ["source", "logo"], - nil, - "maker.item.source.logo") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_source_subtitle - assert_maker_atom_text_construct("entry", - ["items", "first", "source", "subtitle"], - ["source", "subtitle"], - nil, nil, - "maker.item.source.subtitle") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_summary - assert_maker_atom_text_construct("entry", - ["items", "first", "description"], - ["summary"], - nil, nil, "maker.item.description" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_title - assert_maker_atom_text_construct("entry", - ["channel", "title"], ["title"], - "maker.item", ["title"], - "maker.channel.title") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.title = nil - maker.items.first.title = nil - end - - assert_maker_atom_text_construct("entry", - ["items", "first", "title"], - ["title"], - "maker.item", ["title"], - "maker.item.title") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.title = nil - maker.items.first.title = nil - end - - assert_maker_atom_text_construct("entry", - ["items", "first", "source", "title"], - ["source", "title"], - nil, nil, "maker.item.source.title" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_updated - assert_maker_atom_date_construct("entry", - ["channel", "updated"], ["updated"], - "maker.item", ["updated"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.updated = nil - maker.items.first.updated = nil - end - - assert_maker_atom_date_construct("entry", - ["items", "first", "updated"], - ["updated"], - "maker.item", ["updated"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.updated = nil - maker.items.first.updated = nil - end - - assert_maker_atom_date_construct("entry", - ["items", "first", "source", "updated"], - ["source", "updated"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_date - date = Time.parse("2004/11/1 10:10") - feed = Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - maker.channel.date = nil - maker.items.new_item do |item| - item.link = "http://example.com/article.html" - item.title = "Sample Article" - item.date = date - end - end - assert_equal(date, feed.items[0].updated.content) - assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value}) - end - end -end diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb deleted file mode 100644 index d4eacd36ad1fb1..00000000000000 --- a/test/rss/test_maker_atom_feed.rb +++ /dev/null @@ -1,455 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerAtomFeed < TestCase - def test_supported? - assert(RSS::Maker.supported?("atom")) - assert(RSS::Maker.supported?("atom:feed")) - assert(RSS::Maker.supported?("atom1.0")) - assert(RSS::Maker.supported?("atom1.0:feed")) - assert(!RSS::Maker.supported?("atom2.0")) - assert(!RSS::Maker.supported?("atom2.0:feed")) - end - - def test_find_class - assert_equal(RSS::Maker::Atom::Feed, RSS::Maker["atom"]) - assert_equal(RSS::Maker::Atom::Feed, RSS::Maker["atom:feed"]) - assert_equal(RSS::Maker::Atom::Feed, RSS::Maker["atom1.0"]) - assert_equal(RSS::Maker::Atom::Feed, RSS::Maker["atom1.0:feed"]) - end - - def test_root_element - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - end - assert_equal(["atom", "1.0", "feed"], feed.feed_info) - - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.encoding = "EUC-JP" - end - assert_equal(["atom", "1.0", "feed"], feed.feed_info) - assert_equal("EUC-JP", feed.encoding) - - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.standalone = "yes" - end - assert_equal(["atom", "1.0", "feed"], feed.feed_info) - assert_equal("yes", feed.standalone) - - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.encoding = "EUC-JP" - maker.standalone = "yes" - end - assert_equal(["atom", "1.0", "feed"], feed.feed_info) - assert_equal("EUC-JP", feed.encoding) - assert_equal("yes", feed.standalone) - end - - def test_invalid_feed - assert_not_set_error("maker.channel", %w(id title author updated)) do - Maker.make("atom") do |maker| - end - end - - assert_not_set_error("maker.channel", %w(id title updated)) do - Maker.make("atom") do |maker| - maker.channel.author = "foo" - end - end - - assert_not_set_error("maker.channel", %w(title updated)) do - Maker.make("atom") do |maker| - maker.channel.author = "foo" - maker.channel.id = "http://example.com" - end - end - - assert_not_set_error("maker.channel", %w(updated)) do - Maker.make("atom") do |maker| - maker.channel.author = "foo" - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - end - end - - assert_not_set_error("maker.channel", %w(author)) do - Maker.make("atom") do |maker| - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - maker.channel.updated = Time.now - end - end - - feed = Maker.make("atom") do |maker| - maker.channel.author = "Foo" - maker.channel.id = "http://example.com" - maker.channel.title = "Atom Feed" - maker.channel.updated = Time.now - end - assert_not_nil(feed) - end - - def test_author - assert_maker_atom_persons("feed", - ["channel", "authors"], - ["authors"], - "maker.channel.author") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_not_set_error("maker.channel", %w(author)) do - RSS::Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.channel.authors.clear - end - end - - assert_maker_atom_persons("feed", - ["items", "first", "authors"], - ["entries", "first", "authors"], - "maker.item.author") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_persons("feed", - ["items", "first", "source", "authors"], - ["entries", "first", "source", "authors"], - "maker.item.source.author") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_category - assert_maker_atom_categories("feed", - ["channel", "categories"], - ["categories"], - "maker.channel.category") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_categories("feed", - ["items", "first", "categories"], - ["entries", "first", "categories"], - "maker.item.category") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_categories("feed", - ["items", "first", "source", "categories"], - ["entries", "first", "source", "categories"], - "maker.item.source.category") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_contributor - assert_maker_atom_persons("feed", - ["channel", "contributors"], - ["contributors"], - "maker.channel.contributor") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_persons("feed", - ["items", "first", "contributors"], - ["entries", "first", "contributors"], - "maker.item.contributor") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_persons("feed", - ["items", "first", "source", "contributors"], - ["entries", "first", "source", "contributors"], - "maker.item.source.contributor") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_generator - assert_maker_atom_generator("feed", - ["channel", "generator"], - ["generator"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_generator("feed", - ["items", "first", "source", "generator"], - ["entries", "first", "source", "generator"], - "maker.item.source.generator") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_icon - assert_maker_atom_icon("feed", ["channel"], ["icon"], "icon") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_icon("feed", - ["items", "first", "source", "icon"], - ["entries", "first", "source", "icon"], - nil, "maker.item.source.icon") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_link - assert_maker_atom_links("feed", - ["channel", "links"], - ["links"], - "maker.channel.link") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_links("feed", - ["items", "first", "links"], - ["entries", "first", "links"], - "maker.item.link") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_links("feed", - ["items", "first", "source", "links"], - ["entries", "first", "source", "links"], - "maker.item.source.link", true) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_logo - assert_maker_atom_logo("feed", ["channel"], ["logo"], "logo") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_logo("feed", ["image"], ["logo"], "url") do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_logo("feed", - ["items", "first", "source", "logo"], - ["entries", "first", "source", "logo"], - nil, "maker.item.source.logo") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_rights - assert_maker_atom_text_construct("feed", - ["channel", "copyright"], - ["rights"]) do |maker| - setup_dummy_channel_atom(maker) - end - - assert_maker_atom_text_construct("feed", - ["items", "first", "rights"], - ["entries", "first", "rights"], - nil, nil, "maker.item.rights" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - - assert_maker_atom_text_construct("feed", - ["items", "first", "source", "rights"], - ["entries", "first", "source", "rights"], - nil, nil, "maker.item.source.rights" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_subtitle - assert_maker_atom_text_construct("feed", - ["channel", "subtitle"], - ["subtitle"], - nil, nil, - "maker.channel.description") do |maker| - setup_dummy_channel_atom(maker) - maker.channel.description = nil - end - - assert_maker_atom_text_construct("feed", - ["channel", "subtitle"], - ["subtitle"], - nil, nil, - "maker.channel.description") do |maker| - setup_dummy_channel_atom(maker) - maker.channel.description {|d| d.content = nil} - end - - assert_maker_atom_text_construct("feed", - ["items", "first", "source", "subtitle"], - ["entries", "first", - "source", "subtitle"], - nil, nil, - "maker.item.source.subtitle") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_title - assert_maker_atom_text_construct("feed", - ["channel", "title"], ["title"], - "maker.channel", ["title"]) do |maker| - setup_dummy_channel_atom(maker) - maker.channel.title = nil - end - - assert_maker_atom_text_construct("feed", - ["items", "first", "title"], - ["entries", "first", "title"], - "maker.item", ["title"], - "maker.item.title") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.items.first.title = nil - end - - assert_maker_atom_text_construct("feed", - ["items", "first", "source", "title"], - ["entries", "first", "source", "title"], - nil, nil, "maker.item.source.title" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_updated - assert_maker_atom_date_construct("feed", - ["channel", "updated"], ["updated"], - "maker.channel", ["updated"]) do |maker| - setup_dummy_channel_atom(maker) - maker.channel.updated = nil - end - - assert_maker_atom_date_construct("feed", - ["items", "first", "updated"], - ["entries", "first", "updated"], - "maker.item", ["updated"]) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - maker.items.first.updated = nil - end - - assert_maker_atom_date_construct("feed", - ["items", "first", "source", "updated"], - ["entries", "first", "source", "updated"] - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_published - assert_maker_atom_date_construct("feed", - ["items", "first", "published"], - ["entries", "first", "published"] - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_summary - assert_maker_atom_text_construct("feed", - ["items", "first", "description"], - ["entries", "first", "summary"], - nil, nil, "maker.item.description" - ) do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_content - assert_maker_atom_content("feed", - ["items", "first", "content"], - ["entries", "first", "content"], - "maker.item.content") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_id - assert_maker_atom_id("feed", - ["items", "first", "source"], - ["entries", "first", "source"], - "maker.item.source") do |maker| - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - end - - def test_language - language = "ja" - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.channel.language = "ja" - end - assert_equal(language, feed.dc_language) - end - - def test_date - date = Time.parse("2004/11/1 10:10") - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.items.new_item do |item| - item.link = "http://example.com/article.html" - item.title = "sample article" - item.date = date - end - end - assert_equal(date, feed.items[0].updated.content) - assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value}) - end - - def test_channel_dc_date - date = Time.parse("2004/11/1 10:10") - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.channel.updated = nil - maker.channel.dc_date = date - setup_dummy_item_atom(maker) - end - assert_equal(date, feed.updated.content) - assert_equal([date], feed.dc_dates.collect {|_date| _date.value}) - end - - def test_item_dc_date - date = Time.parse("2004/11/1 10:10") - feed = Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - maker.items.new_item do |item| - item.link = "http://example.com/article.html" - item.title = "sample article" - item.dc_date = date - end - end - assert_equal(date, feed.items[0].updated.content) - assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value}) - end - end -end diff --git a/test/rss/test_maker_content.rb b/test/rss/test_maker_content.rb deleted file mode 100644 index e3b84c53a41141..00000000000000 --- a/test/rss/test_maker_content.rb +++ /dev/null @@ -1,48 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerContent < TestCase - - def setup - @uri = "http://purl.org/rss/1.0/modules/content/" - - @elements = { - :encoded => "ATTENTION", - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - setup_dummy_item(maker) - item = maker.items.last - @elements.each do |name, value| - item.__send__("#{accessor_name(name)}=", value) - end - end - assert_content(@elements, rss.items.last) - end - - def test_rss20 - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - setup_dummy_item(maker) - item = maker.items.last - @elements.each do |name, value| - item.__send__("#{accessor_name(name)}=", value) - end - end - assert_content(@elements, rss.items.last) - end - - private - def accessor_name(name) - "content_#{name}" - end - end -end diff --git a/test/rss/test_maker_dc.rb b/test/rss/test_maker_dc.rb deleted file mode 100644 index f5c8bad2b30c9d..00000000000000 --- a/test/rss/test_maker_dc.rb +++ /dev/null @@ -1,150 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerDublinCore < TestCase - - def setup - @uri = "http://purl.org/dc/elements/1.1/" - - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @elements = { - :title => "hoge", - :description => - " XML is placing increasingly heavy loads on - the existing technical infrastructure of the Internet.", - :creator => "Rael Dornfest (mailto:rael@oreilly.com)", - :subject => "XML", - :publisher => "The O'Reilly Network", - :contributor => "hogehoge", - :type => "fugafuga", - :format => "hohoho", - :identifier => "fufufu", - :source => "barbar", - :language => "ja", - :relation => "cococo", - :rights => "Copyright (c) 2000 O'Reilly & Associates, Inc.", - :date => t, - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - set_elements(maker.channel) - - setup_dummy_image(maker) - set_elements(maker.image) - - setup_dummy_item(maker) - item = maker.items.last - @elements.each do |name, value| - item.__send__("#{accessor_name(name)}=", value) - end - - setup_dummy_textinput(maker) - set_elements(maker.textinput) - end - assert_dublin_core(@elements, rss.channel) - assert_dublin_core(@elements, rss.image) - assert_dublin_core(@elements, rss.items.last) - assert_dublin_core(@elements, rss.textinput) - end - - def test_rss10_multiple - assert_multiple_dublin_core_rss10("_list") - assert_multiple_dublin_core_rss10("es") - end - - def assert_multiple_dublin_core_rss10(multiple_rights_suffix) - elems = [] - @elements.each do |name, value| - plural = name.to_s + (name == :rights ? multiple_rights_suffix : "s") - values = [value] - if name == :date - values << value + 60 - else - values << value * 2 - end - elems << [name, values, plural] - end - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - set_multiple_elements(maker.channel, elems) - - setup_dummy_image(maker) - set_multiple_elements(maker.image, elems) - - setup_dummy_item(maker) - item = maker.items.last - elems.each do |name, values, plural| - dc_elems = item.__send__("dc_#{plural}") - values.each do |value| - elem = dc_elems.__send__("new_#{name}") - elem.value = value - end - end - - setup_dummy_textinput(maker) - set_multiple_elements(maker.textinput, elems) - end - assert_multiple_dublin_core(elems, rss.channel) - assert_multiple_dublin_core(elems, rss.image) - assert_multiple_dublin_core(elems, rss.items.last) - assert_multiple_dublin_core(elems, rss.textinput) - end - - def test_date - t1 = Time.iso8601("2000-01-01T12:00:05+00:00") - t2 = Time.iso8601("2005-01-01T12:00:05+00:00") - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.date = t1 - maker.channel.dc_dates.new_date do |date| - date.value = t2 - end - - setup_dummy_item(maker) - item = maker.items.last - item.date = t2 - item.dc_dates.new_date do |date| - date.value = t1 - end - end - assert_equal([t1, t2], rss.channel.dc_dates.collect{|x| x.value}) - assert_equal([t2, t1], rss.items.last.dc_dates.collect{|x| x.value}) - end - - private - def accessor_name(name) - "dc_#{name}" - end - - def set_elements(target, elems=@elements) - elems.each do |name, value| - target.__send__("#{accessor_name(name)}=", value) - end - end - - def set_multiple_elements(target, elems) - elems.each do |name, values, plural| - plural ||= "#{name}s" - dc_elems = target.__send__("dc_#{plural}") - values.each do |value| - dc_elems.__send__("new_#{name}") do |new_dc_elem| - new_dc_elem.value = value - end - end - end - end - - end -end diff --git a/test/rss/test_maker_image.rb b/test/rss/test_maker_image.rb deleted file mode 100644 index cc663c6a5cd801..00000000000000 --- a/test/rss/test_maker_image.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerImage < TestCase - - def setup - @uri = "http://web.resource.org/rss/1.0/modules/image/" - - @favicon_infos = { - "about" => "http://www.kuro5hin.org/favicon.ico", - "image_size" => "small", - "dc_title" => "example", - } - @item_infos = { - "about" => "http://www.example.org/item.png", - "resource" => "http://www.example.org/item", - "dc_title" => "Example Image", - "image_width" => "100", - "image_height" => "65", - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - @favicon_infos.each do |name, value| - maker.channel.image_favicon.__send__("#{name}=", value) - end - - setup_dummy_image(maker) - - setup_dummy_item(maker) - item = maker.items.last - @item_infos.each do |name, value| - item.image_item.__send__("#{name}=", value) - end - - setup_dummy_textinput(maker) - end - - setup_rss = RSS::Maker.make("1.0") do |maker| - rss.setup_maker(maker) - end - - [rss, setup_rss].each_with_index do |target, i| - favicon = target.channel.image_favicon - assert_equal(@favicon_infos["about"], favicon.about) - assert_equal(@favicon_infos["image_size"], favicon.image_size) - assert_equal(@favicon_infos["dc_title"], favicon.dc_title) - - item = target.items.last.image_item - assert_equal(@item_infos["about"], item.about) - assert_equal(@item_infos["resource"], item.resource) - assert_equal(@item_infos["image_width"].to_i, item.image_width) - assert_equal(@item_infos["image_height"].to_i, item.image_height) - assert_equal(@item_infos["dc_title"], item.dc_title) - end - end - end -end diff --git a/test/rss/test_maker_itunes.rb b/test/rss/test_maker_itunes.rb deleted file mode 100644 index cba612c099d414..00000000000000 --- a/test/rss/test_maker_itunes.rb +++ /dev/null @@ -1,487 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerITunes < TestCase - def test_author - assert_maker_itunes_author(%w(channel)) - assert_maker_itunes_author(%w(items last)) - end - - def test_block - assert_maker_itunes_block(%w(channel)) - assert_maker_itunes_block(%w(items last)) - end - - def test_category - assert_maker_itunes_category(%w(channel)) - end - - def test_image - assert_maker_itunes_image(%w(channel)) - end - - def test_duration - assert_maker_itunes_duration(%w(items last)) - end - - def test_explicit - assert_maker_itunes_explicit(%w(channel)) - assert_maker_itunes_explicit(%w(items last)) - end - - def test_keywords - assert_maker_itunes_keywords(%w(channel)) - assert_maker_itunes_keywords(%w(items last)) - end - - def test_new_feed_url - assert_maker_itunes_new_feed_url(%w(channel)) - end - - def test_owner - assert_maker_itunes_owner(%w(channel)) - end - - def test_subtitle - assert_maker_itunes_subtitle(%w(channel)) - assert_maker_itunes_subtitle(%w(items last)) - end - - def test_summary - assert_maker_itunes_summary(%w(channel)) - assert_maker_itunes_summary(%w(items last)) - end - - private - - def assert_maker_itunes_author(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - author = "John Doe" - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_author = author - end - target = chain_reader(rss20, feed_readers) - assert_equal(author, target.itunes_author) - end - end - - def _assert_maker_itunes_block(value, boolean_value, maker_readers, - feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_block = value - assert_equal(value, target.itunes_block) - assert_equal(boolean_value, target.itunes_block?) - end - target = chain_reader(rss20, feed_readers) - if [true, false].include?(value) - value = value ? "yes" : "no" - end - assert_equal(value, target.itunes_block) - assert_equal(boolean_value, target.itunes_block?) - end - - def assert_maker_itunes_block(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_block("yes", true, maker_readers, feed_readers) - _assert_maker_itunes_block("Yes", true, maker_readers, feed_readers) - _assert_maker_itunes_block("no", false, maker_readers, feed_readers) - _assert_maker_itunes_block("", false, maker_readers, feed_readers) - _assert_maker_itunes_block(true, true, maker_readers, feed_readers) - _assert_maker_itunes_block(false, false, maker_readers, feed_readers) - _assert_maker_itunes_block(nil, false, maker_readers, feed_readers) - end - end - - def _assert_maker_itunes_category(categories, maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - categories.each do |category| - sub_target = target.itunes_categories - if category.is_a?(Array) - category.each do |sub_category| - sub_target = sub_target.new_category - sub_target.text = sub_category - end - else - sub_target.new_category.text = category - end - end - end - - target = chain_reader(rss20, feed_readers) - actual_categories = target.itunes_categories.collect do |category| - cat = category.text - if category.itunes_categories.empty? - cat - else - [cat, *category.itunes_categories.collect {|c| c.text}] - end - end - assert_equal(categories, actual_categories) - end - - def assert_maker_itunes_category(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_category(["Audio Blogs"], - maker_readers, feed_readers) - _assert_maker_itunes_category([["Arts & Entertainment", "Games"]], - maker_readers, feed_readers) - _assert_maker_itunes_category([["Arts & Entertainment", "Games"], - ["Technology", "Computers"], - "Audio Blogs"], - maker_readers, feed_readers) - end - end - - def assert_maker_itunes_image(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - url = "http://example.com/podcasts/everything/AllAboutEverything.jpg" - - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_image = url - end - - target = chain_reader(rss20, feed_readers) - assert_not_nil(target.itunes_image) - assert_equal(url, target.itunes_image.href) - end - end - - def _assert_maker_itunes_duration(hour, minute, second, value, - maker_readers, feed_readers) - _assert_maker_itunes_duration_by_value(hour, minute, second, value, - maker_readers, feed_readers) - _assert_maker_itunes_duration_by_hour_minute_second(hour, minute, second, - value, - maker_readers, - feed_readers) - end - - def _assert_maker_itunes_duration_by(hour, minute, second, value, - maker_readers, feed_readers) - expected_value = nil - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - expected_value = yield(target) - assert_equal(expected_value, target.itunes_duration) - target.itunes_duration do |duration| - assert_equal([hour, minute, second, expected_value], - [duration.hour, duration.minute, - duration.second, duration.content]) - end - end - target = chain_reader(rss20, feed_readers) - duration = target.itunes_duration - assert_not_nil(duration) - assert_equal([hour, minute, second, expected_value], - [duration.hour, duration.minute, - duration.second, duration.content]) - end - - def _assert_maker_itunes_duration_by_value(hour, minute, second, value, - maker_readers, feed_readers) - _assert_maker_itunes_duration_by(hour, minute, second, value, - maker_readers, feed_readers) do |target| - target.itunes_duration = value - value - end - end - - def _assert_maker_itunes_duration_by_hour_minute_second(hour, minute, second, - value, - maker_readers, - feed_readers) - _assert_maker_itunes_duration_by(hour, minute, second, value, - maker_readers, feed_readers) do |target| - target.itunes_duration do |duration| - duration.hour = hour - duration.minute = minute - duration.second = second - end - value.split(":").collect {|v| "%02d" % v.to_i}.join(":") - end - end - - def _assert_maker_itunes_duration_invalid_value(value, maker_readers) - assert_raise(ArgumentError) do - ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_duration = value - end - end - end - - def assert_maker_itunes_duration(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_duration(7, 14, 5, "07:14:05", maker_readers, - feed_readers) - _assert_maker_itunes_duration(7, 14, 5, "7:14:05", maker_readers, - feed_readers) - _assert_maker_itunes_duration(0, 4, 55, "04:55", maker_readers, - feed_readers) - _assert_maker_itunes_duration(0, 4, 5, "4:05", maker_readers, - feed_readers) - _assert_maker_itunes_duration(0, 0, 5, "0:05", maker_readers, - feed_readers) - _assert_maker_itunes_duration_by_value(0, 5, 15, "315", maker_readers, - feed_readers) - _assert_maker_itunes_duration_by_value(1, 0, 1, "3601", maker_readers, - feed_readers) - - _assert_maker_itunes_duration_invalid_value("09:07:14:05", maker_readers) - _assert_maker_itunes_duration_invalid_value("10:5", maker_readers) - _assert_maker_itunes_duration_invalid_value("10:03:5", maker_readers) - _assert_maker_itunes_duration_invalid_value("10:3:05", maker_readers) - - _assert_maker_itunes_duration_invalid_value("xx:xx:xx", maker_readers) - - _assert_maker_itunes_duration_invalid_value("", maker_readers) - end - end - - def _assert_maker_itunes_explicit(explicit, value, - maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_explicit = value - assert_equal(explicit, target.itunes_explicit?) - end - target = chain_reader(rss20, feed_readers) - assert_equal(value, target.itunes_explicit) - assert_equal(explicit, target.itunes_explicit?) - end - - def assert_maker_itunes_explicit(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_explicit(true, "explicit", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(true, "yes", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(true, "true", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(false, "clean", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(false, "no", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(false, "false", - maker_readers, feed_readers) - _assert_maker_itunes_explicit(nil, "invalid", - maker_readers, feed_readers) - end - end - - def _assert_maker_itunes_keywords(keywords, value, - maker_readers, feed_readers) - _assert_maker_itunes_keywords_by_value(keywords, value, - maker_readers, feed_readers) - _assert_maker_itunes_keywords_by_keywords(keywords, maker_readers, - feed_readers) - end - - def _assert_maker_itunes_keywords_by(keywords, maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - yield(target) - end - assert_nothing_raised do - rss20 = ::RSS::Parser.parse(rss20.to_s) - end - target = chain_reader(rss20, feed_readers) - assert_equal(keywords, target.itunes_keywords) - end - - def _assert_maker_itunes_keywords_by_value(keywords, value, - maker_readers, feed_readers) - _assert_maker_itunes_keywords_by(keywords, maker_readers, - feed_readers) do |target| - target.itunes_keywords = value - end - end - - def _assert_maker_itunes_keywords_by_keywords(keywords, - maker_readers, feed_readers) - _assert_maker_itunes_keywords_by(keywords, maker_readers, - feed_readers) do |target| - target.itunes_keywords = keywords - end - end - - def assert_maker_itunes_keywords(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_keywords(["salt"], "salt", - maker_readers, feed_readers) - _assert_maker_itunes_keywords(["salt"], " salt ", - maker_readers, feed_readers) - _assert_maker_itunes_keywords(["salt", "pepper", "shaker", "exciting"], - "salt, pepper, shaker, exciting", - maker_readers, feed_readers) - _assert_maker_itunes_keywords(["metric", "socket", "wrenches", - "toolsalt"], - "metric, socket, wrenches, toolsalt", - maker_readers, feed_readers) - _assert_maker_itunes_keywords(["olitics", "red", "blue", "state"], - "olitics, red, blue, state", - maker_readers, feed_readers) - end - end - - def assert_maker_itunes_new_feed_url(maker_readers, feed_readers=nil) - feed_readers ||= maker_readers - url = "http://newlocation.com/example.rss" - - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_new_feed_url = url - end - target = chain_reader(rss20, feed_readers) - assert_equal(url, target.itunes_new_feed_url) - end - - def _assert_maker_itunes_owner(name, email, maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - owner = target.itunes_owner - owner.itunes_name = name - owner.itunes_email = email - end - owner = chain_reader(rss20, feed_readers).itunes_owner - if name.nil? and email.nil? - assert_nil(owner) - else - assert_not_nil(owner) - assert_equal(name, owner.itunes_name) - assert_equal(email, owner.itunes_email) - end - end - - def assert_maker_itunes_owner(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_owner("John Doe", "john.doe@example.com", - maker_readers, feed_readers) - - not_set_name = (["maker"] + maker_readers + ["itunes_owner"]).join(".") - assert_not_set_error(not_set_name, ["itunes_name"]) do - _assert_maker_itunes_owner(nil, "john.doe@example.com", - maker_readers, feed_readers) - end - assert_not_set_error(not_set_name, ["itunes_email"]) do - _assert_maker_itunes_owner("John Doe", nil, - maker_readers, feed_readers) - end - - _assert_maker_itunes_owner(nil, nil, maker_readers, feed_readers) - end - end - - def _assert_maker_itunes_subtitle(subtitle, maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_subtitle = subtitle - end - - target = chain_reader(rss20, feed_readers) - assert_equal(subtitle, target.itunes_subtitle) - end - - def assert_maker_itunes_subtitle(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_subtitle("A show about everything", - maker_readers, feed_readers) - _assert_maker_itunes_subtitle("A short primer on table spices", - maker_readers, feed_readers) - _assert_maker_itunes_subtitle("Comparing socket wrenches is fun!", - maker_readers, feed_readers) - _assert_maker_itunes_subtitle("Red + Blue != Purple", - maker_readers, feed_readers) - end - end - - def _assert_maker_itunes_summary(summary, maker_readers, feed_readers) - rss20 = ::RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - target = chain_reader(maker, maker_readers) - target.itunes_summary = summary - end - - target = chain_reader(rss20, feed_readers) - assert_equal(summary, target.itunes_summary) - end - - def assert_maker_itunes_summary(maker_readers, feed_readers=nil) - _wrap_assertion do - feed_readers ||= maker_readers - _assert_maker_itunes_summary("All About Everything is a show about " + - "everything. Each week we dive into any " + - "subject known to man and talk about it " + - "as much as we can. Look for our Podcast " + - "in the iTunes Music Store", - maker_readers, feed_readers) - _assert_maker_itunes_summary("This week we talk about salt and pepper " + - "shakers, comparing and contrasting pour " + - "rates, construction materials, and " + - "overall aesthetics. Come and join the " + - "party!", - maker_readers, feed_readers) - _assert_maker_itunes_summary("This week we talk about metric vs. old " + - "english socket wrenches. Which one is " + - "better? Do you really need both? Get " + - "all of your answers here.", - maker_readers, feed_readers) - _assert_maker_itunes_summary("This week we talk about surviving in a " + - "Red state if you're a Blue person. Or " + - "vice versa.", - maker_readers, feed_readers) - end - end - end -end diff --git a/test/rss/test_maker_slash.rb b/test/rss/test_maker_slash.rb deleted file mode 100644 index 5e5761ab0f61db..00000000000000 --- a/test/rss/test_maker_slash.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerSlash < TestCase - def setup - @elements = { - "section" => "articles", - "department" => "not-an-ocean-unless-there-are-lobsters", - "comments" => 177, - "hit_parades" => [177, 155, 105, 33, 6, 3, 0], - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - setup_dummy_item(maker) - item = maker.items.last - @elements.each do |name, value| - item.send("slash_#{name}=", value) - end - end - - item = rss.items.last - assert_not_nil(item) - assert_slash_elements(item) - end - - private - def assert_slash_elements(target) - super(@elements, target) - end - end -end diff --git a/test/rss/test_maker_sy.rb b/test/rss/test_maker_sy.rb deleted file mode 100644 index 6f4d6f839075d7..00000000000000 --- a/test/rss/test_maker_sy.rb +++ /dev/null @@ -1,45 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerSyndication < TestCase - - def setup - @uri = "http://purl.org/rss/1.0/modules/syndication/" - - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @elements = { - :updatePeriod => "hourly", - :updateFrequency => "2", - :updateBase => t, - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - set_elements(maker.channel) - setup_dummy_item(maker) - end - assert_syndication(@elements, rss.channel) - end - - private - def accessor_name(name) - "sy_#{name}" - end - - def set_elements(target) - @elements.each do |name, value| - target.__send__("#{accessor_name(name)}=", value) - end - end - - end -end diff --git a/test/rss/test_maker_taxo.rb b/test/rss/test_maker_taxo.rb deleted file mode 100644 index 9a19a52dc46e68..00000000000000 --- a/test/rss/test_maker_taxo.rb +++ /dev/null @@ -1,82 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerTaxonomy < TestCase - - def setup - @uri = "http://purl.org/rss/1.0/modules/taxonomy/" - - @resources = [ - "http://meerkat.oreillynet.com/?c=cat23", - "http://meerkat.oreillynet.com/?c=47", - "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/", - ] - - @topics = [ - { - :link => "http://meerkat.oreillynet.com/?c=cat23", - :title => "Data: XML", - :description => "A Meerkat channel", - }, - { - :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/", - :title => "XML", - :subject => "XML", - :description => "DMOZ category", - :topics => [ - "http://meerkat.oreillynet.com/?c=cat23", - "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/", - "http://dmoz.org/Computers/Programming/Internet/", - ] - }, - ] - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - set_topics(maker.channel) - - setup_dummy_item(maker) - set_topics(maker.items.last) - - setup_taxo_topic(maker, @topics) - end - assert_equal(@resources, rss.channel.taxo_topics.resources) - assert_equal(@resources, rss.items.last.taxo_topics.resources) - assert_taxo_topic(@topics, rss) - end - - def _test_date - t1 = Time.iso8601("2000-01-01T12:00:05+00:00") - t2 = Time.iso8601("2005-01-01T12:00:05+00:00") - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.date = t1 - maker.channel.dc_dates.new_date do |date| - date.value = t2 - end - - setup_dummy_item(maker) - item = maker.items.last - item.date = t2 - item.dc_dates.new_date do |date| - date.value = t1 - end - end - assert_equal([t1, t2], rss.channel.dc_dates.collect{|x| x.value}) - assert_equal([t2, t1], rss.items.last.dc_dates.collect{|x| x.value}) - end - - private - def set_topics(target, resources=@resources) - resources.each do |value| - target.taxo_topics << value - end - end - end -end diff --git a/test/rss/test_maker_trackback.rb b/test/rss/test_maker_trackback.rb deleted file mode 100644 index b49e5c3f57cb50..00000000000000 --- a/test/rss/test_maker_trackback.rb +++ /dev/null @@ -1,42 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerTrackBack < TestCase - - def setup - @uri = "http://madskills.com/public/xml/rss/module/trackback/" - - @elements = { - :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback", - :abouts => [ - "http://foo.com/trackback/tb.cgi?tb_id=20020923", - "http://bar.com/trackback/tb.cgi?tb_id=20041114", - ], - } - end - - def test_rss10 - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - setup_dummy_item(maker) - item = maker.items.last - item.trackback_ping = @elements[:ping] - @elements[:abouts].each do |about| - item.trackback_abouts.new_about do |new_about| - new_about.value = about - end - end - end - assert_trackback(@elements, rss.items.last) - end - - private - def accessor_name(name) - "trackback_#{name}" - end - end -end diff --git a/test/rss/test_maker_xml-stylesheet.rb b/test/rss/test_maker_xml-stylesheet.rb deleted file mode 100644 index 4563de9902aefb..00000000000000 --- a/test/rss/test_maker_xml-stylesheet.rb +++ /dev/null @@ -1,84 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestMakerXMLStyleSheet < TestCase - - def test_xml_stylesheet - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - rss = RSS::Maker.make("1.0") do |maker| - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - - xss = rss.xml_stylesheets.first - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - - - href = 'http://example.com/index.xsl' - type = 'text/xsl' - rss = RSS::Maker.make("1.0") do |maker| - maker.xml_stylesheets.new_xml_stylesheet do |_xss| - _xss.href = href - end - - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - - xss = rss.xml_stylesheets.first - assert_equal(href, xss.href) - assert_equal(type, xss.type) - end - - def test_not_valid_xml_stylesheet - href = 'xss.XXX' - type = "text/xsl" - - rss = RSS::Maker.make("1.0") do |maker| - maker.xml_stylesheets.new_xml_stylesheet do |xss| - # xss.href = href - xss.type = type - end - - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - assert(rss.xml_stylesheets.empty?) - - rss = RSS::Maker.make("1.0") do |maker| - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - # xss.type = type - end - - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - assert(rss.xml_stylesheets.empty?) - end - - end -end diff --git a/test/rss/test_parser.rb b/test/rss/test_parser.rb deleted file mode 100644 index 19344a064322f7..00000000000000 --- a/test/rss/test_parser.rb +++ /dev/null @@ -1,121 +0,0 @@ -# frozen_string_literal: false -require "tempfile" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/dublincore" - -module RSS - class TestParser < TestCase - def setup - @_default_parser = Parser.default_parser - @rss10 = make_RDF(<<-EOR) -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} -EOR - @rss_tmp = Tempfile.new(%w"rss10- .rdf") - @rss_tmp.print(@rss10) - @rss_tmp.close - @rss_file = @rss_tmp.path - end - - def teardown - Parser.default_parser = @_default_parser - @rss_tmp.close(true) - end - - def test_default_parser - assert_nothing_raised do - Parser.default_parser = RSS::AVAILABLE_PARSERS.first - end - - assert_raise(RSS::NotValidXMLParser) do - Parser.default_parser = RSS::Parser - end - end - - def test_parse - assert_not_nil(RSS::Parser.parse(@rss_file)) - - garbage_rss_file = @rss_file + "-garbage" - if RSS::Parser.default_parser.name == "RSS::XMLParserParser" - assert_raise(RSS::NotWellFormedError) do - RSS::Parser.parse(garbage_rss_file) - end - else - assert_nil(RSS::Parser.parse(garbage_rss_file)) - end - end - - def test_parse_tag_includes_hyphen - assert_nothing_raised do - RSS::Parser.parse(make_RDF(<<-EOR)) - -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} -EOR - end - end - - def test_parse_option_validate_nil - assert_raise(RSS::MissingTagError) do - RSS::Parser.parse(make_RDF(<<-RDF), :validate => nil) - RDF - end - end - - def test_parse_option_validate_true - assert_raise(RSS::MissingTagError) do - RSS::Parser.parse(make_RDF(<<-RDF), :validate => true) - RDF - end - end - - def test_parse_option_validate_false - rdf = RSS::Parser.parse(make_RDF(<<-RDF), :validate => false) - RDF - assert_nil(rdf.channel) - end - - def test_parse_option_ignore_unknown_element_nil - assert_nothing_raised do - RSS::Parser.parse(make_RDF(<<-RDF), :ignore_unknown_element => nil) - -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} - RDF - end - end - - def test_parse_option_ignore_unknown_element_true - assert_nothing_raised do - RSS::Parser.parse(make_RDF(<<-RDF), :ignore_unknown_element => true) - -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} - RDF - end - end - - def test_parse_option_ignore_unknown_element_false - assert_raise(RSS::NotExpectedTagError) do - RSS::Parser.parse(make_RDF(<<-RDF), :ignore_unknown_element => false) - -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} - RDF - end - end - end -end diff --git a/test/rss/test_parser_1.0.rb b/test/rss/test_parser_1.0.rb deleted file mode 100644 index f7be5153af4e4a..00000000000000 --- a/test/rss/test_parser_1.0.rb +++ /dev/null @@ -1,529 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/dublincore" - -module RSS - class TestParser10 < TestCase - def test_RDF - assert_ns("", RDF::URI) do - Parser.parse(<<-EOR) -#{make_xmldecl} - -EOR - end - - assert_ns("", RDF::URI) do - Parser.parse(<<-EOR) -#{make_xmldecl} - -EOR - end - - assert_ns("rdf", RDF::URI) do - Parser.parse(<<-EOR) -#{make_xmldecl} - -EOR - end - - assert_parse(<<-EOR, :missing_tag, "channel", "RDF") -#{make_xmldecl} - -EOR - - assert_parse(<<-EOR, :missing_tag, "channel", "RDF") -#{make_xmldecl} - -EOR - - assert_parse(<<-EOR, :missing_tag, "channel", "RDF") -#{make_xmldecl} - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") -#{make_channel} -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") -#{make_channel} -#{make_image} -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") -#{make_channel} -#{make_textinput} -EOR - - assert_too_much_tag("image", "RDF") do - Parser.parse(make_RDF(<<-EOR)) -#{make_channel} -#{make_image} -#{make_image} -#{make_item} -#{make_textinput} -EOR - end - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_item} -#{make_image} -#{make_textinput} -EOR - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_item} -#{make_textinput} -#{make_image} -EOR - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_image} -#{make_item} -EOR - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_image} -#{make_item} -#{make_textinput} -EOR - - 1.step(15, 3) do |i| - rss = make_RDF() do - res = make_channel - i.times { res << make_item } - res - end - assert_parse(rss, :nothing_raised) - end - end - - def test_undefined_entity - return unless RSS::Parser.default_parser.raise_for_undefined_entity? - assert_parse(make_RDF(<<-EOR), :raises, RSS::NotWellFormedError) -#{make_channel} -#{make_image} - - #{TITLE_VALUE} &UNKNOWN_ENTITY; - #{LINK_VALUE} - #{DESCRIPTION_VALUE} - -#{make_textinput} -EOR - end - - def test_channel - assert_parse(make_RDF(<<-EOR), :missing_attribute, "channel", "rdf:about") - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "channel") - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "channel") - - hoge - -EOR - - assert_parse(make_RDF(< - hoge - http://example.com/ - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "items", "channel") - - hoge - http://example.com/ - hogehoge - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_attribute, "image", "rdf:resource") - - hoge - http://example.com/ - hogehoge - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "items", "channel") - - hoge - http://example.com/ - hogehoge - - -EOR - - rss = make_RDF(<<-EOR) - - hoge - http://example.com/ - hogehoge - - - -EOR - - assert_missing_tag("Seq", "items") do - Parser.parse(rss) - end - - assert_missing_tag("item", "RDF") do - Parser.parse(rss, false).validate - end - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") - - hoge - http://example.com/ - hogehoge - - - - - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_attribute, "textinput", "rdf:resource") - - hoge - http://example.com/ - hogehoge - - - - - - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") - - hoge - http://example.com/ - hogehoge - - - - - - - -EOR - end - - def test_rdf_li - rss = make_RDF(<<-EOR) - - hoge - http://example.com/ - hogehoge - - - - - - - - -#{make_item} -EOR - - source = Proc.new do |rdf_li_attr| - eval(%Q[%Q[#{rss}]], binding) - end - - attr = %q[resource="http://example.com/hoge"] - assert_parse(source.call(attr), :nothing_raised) - - attr = %q[rdf:resource="http://example.com/hoge"] - assert_parse(source.call(attr), :nothing_raised) - - assert_parse(source.call(""), :missing_attribute, "li", "resource") - end - - def test_image - assert_parse(make_RDF(<<-EOR), :missing_attribute, "image", "rdf:about") -#{make_channel} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "image") -#{make_channel} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "url", "image") -#{make_channel} - - hoge - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "image") -#{make_channel} - - hoge - http://example.com/hoge.png - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF") -#{make_channel} - - hoge - http://example.com/hoge.png - http://example.com/ - -EOR - - rss = make_RDF(<<-EOR) -#{make_channel} - - http://example.com/ - http://example.com/hoge.png - hoge - -EOR - - assert_missing_tag("item", "RDF") do - Parser.parse(rss) - end - - assert_missing_tag("item", "RDF") do - Parser.parse(rss, false).validate - end - end - - def test_item - assert_parse(make_RDF(<<-EOR), :missing_attribute, "item", "rdf:about") -#{make_channel} -#{make_image} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "item") -#{make_channel} -#{make_image} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "item") -#{make_channel} -#{make_image} - - hoge - -EOR - - assert_too_much_tag("title", "item") do - Parser.parse(make_RDF(<<-EOR)) -#{make_channel} -#{make_image} - - hoge - hoge - http://example.com/hoge.html - -EOR - end - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_image} - - hoge - http://example.com/hoge.html - -EOR - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_image} - - hoge - http://example.com/hoge.html - hogehoge - -EOR - end - - def test_textinput - assert_parse(make_RDF(<<-EOR), :missing_attribute, "textinput", "rdf:about") -#{make_channel} -#{make_image} -#{make_item} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "textinput") -#{make_channel} -#{make_image} -#{make_item} - - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "description", "textinput") -#{make_channel} -#{make_image} -#{make_item} - - hoge - -EOR - - assert_too_much_tag("title", "textinput") do - Parser.parse(make_RDF(<<-EOR)) -#{make_channel} -#{make_image} -#{make_item} - - hoge - hoge - hogehoge - -EOR - end - - assert_parse(make_RDF(<<-EOR), :missing_tag, "name", "textinput") -#{make_channel} -#{make_image} -#{make_item} - - hoge - hogehoge - -EOR - - assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "textinput") -#{make_channel} -#{make_image} -#{make_item} - - hoge - hogehoge - key - -EOR - - assert_parse(make_RDF(<<-EOR), :nothing_raised) -#{make_channel} -#{make_image} -#{make_item} - - hoge - hogehoge - key - http://example.com/search.html - -EOR - end - - def test_ignore - name = "a" - rss = make_RDF(<<-EOR) -#{make_channel} -#{make_item} -<#{name}/> -EOR - assert_not_expected_tag(name, ::RSS::URI, "RDF") do - Parser.parse(rss, true, false) - end - - uri = "" - name = "a" - rss = make_RDF(<<-EOR) -#{make_channel} -#{make_item} -<#{name} xmlns=""/> -EOR - assert_parse(rss, :nothing_raised) - assert_not_expected_tag(name, uri, "RDF") do - Parser.parse(rss, true, false) - end - - uri = "http://example.com/" - name = "a" - rss = make_RDF(<<-EOR) -#{make_channel} -#{make_item} - -EOR - assert_parse(rss, :nothing_raised) - assert_not_expected_tag(name, uri, "RDF") do - Parser.parse(rss, true, false) - end - - uri = ::RSS::URI - name = "a" - rss = make_RDF(<<-EOR) -#{make_channel} -#{make_item} -#{make_image("<#{name}/>")} -EOR - assert_parse(rss, :nothing_raised) - assert_not_expected_tag(name, uri, "image") do - Parser.parse(rss, true, false) - end - - uri = CONTENT_URI - name = "encoded" - elem = "<#{name} xmlns='#{uri}'/>" - rss = make_RDF(<<-EOR) -#{make_channel} -#{make_item} -#{make_image(elem)} -EOR - assert_parse(rss, :nothing_raised) - assert_not_expected_tag(name, uri, "image") do - Parser.parse(rss, true, false) - end - end - - def test_unknown_duplicated_element - xmlns = {"test" => "http://localhost/test"} - assert_parse(make_RDF(<<-EOR, xmlns), :nothing_raised) - #{make_channel("")} - #{make_item} - #{make_image} - EOR - end - - def test_unknown_case_insensitive_duplicated_element - xmlns = { - "foaf" => "http://xmlns.com/foaf/0.1/", - "dc" => "http://purl.org/dc/elements/1.1/", - } - assert_parse(make_RDF(<<-EOR, xmlns), :nothing_raised) - #{make_channel} - #{make_item} - #{make_image} - - Myself - http://example.com/ - - EOR - end - end -end - diff --git a/test/rss/test_parser_2.0.rb b/test/rss/test_parser_2.0.rb deleted file mode 100644 index ac7a67b8b16d59..00000000000000 --- a/test/rss/test_parser_2.0.rb +++ /dev/null @@ -1,123 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/2.0" - -module RSS - class TestParser20 < TestCase - def test_rss20 - assert_parse(make_rss20(<<-EOR), :missing_tag, "channel", "rss") -EOR - - assert_parse(make_rss20(<<-EOR), :nothing_raised) -#{make_channel20("")} -EOR - end - - def test_cloud20 - attrs = [ - ["domain", CLOUD_DOMAIN], - ["port", CLOUD_PORT], - ["path", CLOUD_PATH], - ["registerProcedure", CLOUD_REGISTER_PROCEDURE], - ["protocol", CLOUD_PROTOCOL], - ] - - (attrs.size + 1).times do |i| - missing_attr = attrs[i] - if missing_attr - meth = :missing_attribute - args = ["cloud", missing_attr[0]] - else - meth = :nothing_raised - args = [] - end - - cloud_attrs = [] - attrs.each_with_index do |attr, j| - unless i == j - cloud_attrs << %Q[#{attr[0]}="#{attr[1]}"] - end - end - - assert_parse(make_rss20(<<-EOR), meth, *args) -#{make_channel20(%Q[])} -EOR - end - end - - def test_source20 - assert_parse(make_rss20(<<-EOR), :missing_attribute, "source", "url") -#{make_channel20(make_item20(%Q[Example]))} -EOR - - assert_parse(make_rss20(<<-EOR), :nothing_raised) -#{make_channel20(make_item20(%Q[]))} -EOR - - assert_parse(make_rss20(<<-EOR), :nothing_raised) -#{make_channel20(make_item20(%Q[Example]))} -EOR - end - - def test_enclosure20 - attrs = [ - ["url", ENCLOSURE_URL], - ["length", ENCLOSURE_LENGTH], - ["type", ENCLOSURE_TYPE], - ] - - (attrs.size + 1).times do |i| - missing_attr = attrs[i] - if missing_attr - meth = :missing_attribute - args = ["enclosure", missing_attr[0]] - else - meth = :nothing_raised - args = [] - end - - enclosure_attrs = [] - attrs.each_with_index do |attr, j| - unless i == j - enclosure_attrs << %Q[#{attr[0]}="#{attr[1]}"] - end - end - - assert_parse(make_rss20(<<-EOR), meth, *args) -#{make_channel20(%Q[ -#{make_item20(%Q[ - - ])} - ])} -EOR - end - end - - def test_category20 - values = [nil, CATEGORY_DOMAIN] - values.each do |value| - domain = "" - domain << %Q[domain="#{value}"] if value - - ["", "Example Text"].each do |text| - rss_src = make_rss20(<<-EOR) -#{make_channel20(%Q[ -#{make_item20(%Q[ -#{text} - ])} - ])} -EOR - assert_parse(rss_src, :nothing_raised) - - rss = RSS::Parser.parse(rss_src) - category = rss.items.last.categories.first - assert_equal(value, category.domain) - assert_equal(text, category.content) - end - end - end - end -end - diff --git a/test/rss/test_parser_atom_entry.rb b/test/rss/test_parser_atom_entry.rb deleted file mode 100644 index 4f54ba3cadbaa1..00000000000000 --- a/test/rss/test_parser_atom_entry.rb +++ /dev/null @@ -1,164 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/atom" - -module RSS - class TestParserAtom < TestCase - def test_entry_validation - assert_ns("", Atom::URI) do - Parser.parse(<<-EOA) - -EOA - end - - assert_ns("", Atom::URI) do - Parser.parse(<<-EOA) - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "id", "entry") do - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "title", "entry") do - - urn:uuid:506e336c-a26e-4457-917b-b89dca7ae746 - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "updated", "entry") do - - urn:uuid:506e336c-a26e-4457-917b-b89dca7ae746 - Example Entry - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "author", "entry") do - - urn:uuid:506e336c-a26e-4457-917b-b89dca7ae746 - Example Entry - 2003-10-10T18:30:02Z - -EOA - end - - assert_parse(<<-EOA, :nothing_raised) do - - urn:uuid:506e336c-a26e-4457-917b-b89dca7ae746 - Example Entry - 2003-10-10T18:30:02Z - - A person - - -EOA - end - end - - def test_entry - entry = RSS::Parser.parse(<<-EOA) - - - - A person - - Atom-Powered Robots Run Amok - - urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a - 2003-12-13T18:30:02Z - Some text. - -EOA - assert_not_nil(entry) - assert_equal("Atom-Powered Robots Run Amok", entry.title.content) - assert_equal("http://example.org/2003/12/13/atom03", entry.link.href) - assert_equal("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a", - entry.id.content) - assert_equal(Time.parse("2003-12-13T18:30:02Z"), entry.updated.content) - assert_equal("Some text.", entry.summary.content) - end - - def test_entry_author - assert_atom_person("author", method(:make_entry_document)) do |entry| - assert_equal(2, entry.authors.size) - entry.authors.last - end - end - - def test_entry_category - assert_atom_category(method(:make_entry_document)) do |entry| - assert_equal(1, entry.categories.size) - entry.category - end - end - - def test_entry_content_text - assert_atom_content(method(:make_entry_document)) do |entry| - entry.content - end - end - - def test_entry_contributor - assert_atom_person("contributor", method(:make_entry_document)) do |entry| - assert_equal(1, entry.contributors.size) - entry.contributor - end - end - - def test_entry_id - entry = RSS::Parser.parse(make_entry_document) - assert_equal(ENTRY_ID, entry.id.content) - end - - def test_entry_link - assert_atom_link(method(:make_entry_document)) do |entry| - assert_equal(1, entry.links.size) - entry.link - end - end - - def test_published - generator = method(:make_entry_document) - assert_atom_date_construct("published", generator) do |entry| - entry.published - end - end - - def test_entry_rights - generator = method(:make_entry_document) - assert_atom_text_construct("rights", generator) do |entry| - entry.rights - end - end - - def test_entry_source - generator = method(:make_entry_document_with_open_source) - assert_atom_source(generator) do |entry| - assert_not_nil(entry.source) - entry.source - end - end - - def test_entry_summary - generator = method(:make_entry_document) - assert_atom_text_construct("summary", generator) do |entry| - entry.summary - end - end - - def test_entry_title - entry = RSS::Parser.parse(make_entry_document) - assert_equal(ENTRY_TITLE, entry.title.content) - end - - def test_entry_updated - entry = RSS::Parser.parse(make_entry_document) - assert_equal(Time.parse(ENTRY_UPDATED), entry.updated.content) - end - end -end diff --git a/test/rss/test_parser_atom_feed.rb b/test/rss/test_parser_atom_feed.rb deleted file mode 100644 index 626062d23aeca4..00000000000000 --- a/test/rss/test_parser_atom_feed.rb +++ /dev/null @@ -1,277 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/atom" - -module RSS - class TestParserAtomFeed < TestCase - def test_feed_validation - assert_ns("", Atom::URI) do - Parser.parse(<<-EOA) - -EOA - end - - assert_ns("", Atom::URI) do - Parser.parse(<<-EOA) - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "id", "feed") do - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "title", "feed") do - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "updated", "feed") do - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - Example Feed - -EOA - end - - assert_parse(<<-EOA, :missing_tag, "author", "feed") do - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - Example Feed - 2003-12-13T18:30:02Z - -EOA - end - - assert_parse(<<-EOA, :nothing_raised) do - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - Example Feed - 2003-12-13T18:30:02Z - - A person - - -EOA - end - end - - def test_lang - feed = RSS::Parser.parse(<<-EOA) - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - Example Feed - 2003-12-13T18:30:02Z - - A person - - -EOA - - assert_equal("ja", feed.lang) - assert_equal("ja", feed.id.lang) - assert_equal("en", feed.title.lang) - assert_equal("ja", feed.updated.lang) - assert_equal("en", feed.author.lang) - assert_equal("en", feed.author.name.lang) - end - - def test_base - feed = RSS::Parser.parse(<<-EOA) - - urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - Example Feed - 2003-12-13T18:30:02Z - Generator - - - - - A person - person - - -EOA - - assert_equal("http://example.com/", feed.base) - assert_equal("http://example.com/", feed.id.base) - assert_equal("http://example.com/", feed.title.base) - assert_equal("http://example.com/", feed.updated.base) - assert_equal("http://example.com/", feed.generator.base) - assert_equal("http://example.com/generator", feed.generator.uri) - - assert_equal("http://example.com/", feed.links[0].base) - assert_equal("http://example.org/link1", feed.links[0].href) - assert_equal("http://example.com/", feed.links[1].base) - assert_equal("http://example.com/link2", feed.links[1].href) - assert_equal("http://example.net/", feed.links[2].base) - assert_equal("http://example.net/link3", feed.links[2].href) - assert_equal("http://example.com/person", feed.author.uri.content) - end - - def test_feed_author - assert_atom_person("author", method(:make_feed)) do |feed| - assert_equal(2, feed.authors.size) - feed.authors[1] - end - end - - def test_entry_author - generator = method(:make_feed_with_open_entry) - assert_atom_person("author", generator) do |feed| - assert_equal(1, feed.entries.size) - assert_equal(1, feed.entry.authors.size) - feed.entry.author - end - end - - def test_feed_category - assert_atom_category(method(:make_feed)) do |feed| - assert_equal(1, feed.categories.size) - feed.category - end - end - - def test_entry_category - assert_atom_category(method(:make_feed_with_open_entry)) do |feed| - assert_equal(1, feed.entries.size) - assert_equal(1, feed.entry.categories.size) - feed.entry.category - end - end - - def test_entry_content - assert_atom_content(method(:make_feed_with_open_entry)) do |feed| - assert_equal(1, feed.entries.size) - feed.entry.content - end - end - - def test_feed_contributor - assert_atom_person("contributor", method(:make_feed)) do |feed| - assert_equal(1, feed.contributors.size) - feed.contributor - end - end - - def test_entry_contributor - generator = method(:make_feed_with_open_entry) - assert_atom_person("contributor", generator) do |feed| - assert_equal(1, feed.entries.size) - assert_equal(1, feed.entry.contributors.size) - feed.entry.contributor - end - end - - def test_feed_generator - assert_atom_generator(method(:make_feed)) do |feed| - feed.generator - end - end - - def test_feed_icon - assert_atom_icon(method(:make_feed)) do |feed| - feed.icon - end - end - - def test_feed_id - feed = RSS::Parser.parse(make_feed('')) - assert_equal(FEED_ID, feed.id.content) - end - - def test_entry_id - feed = RSS::Parser.parse(make_feed('')) - assert_equal(ENTRY_ID, feed.entry.id.content) - end - - def test_feed_link - assert_atom_link(method(:make_feed)) do |feed| - assert_equal(1, feed.links.size) - feed.link - end - end - - def test_entry_link - assert_atom_link(method(:make_feed_with_open_entry)) do |feed| - assert_equal(1, feed.entries.size) - assert_equal(1, feed.entry.links.size) - feed.entry.link - end - end - - def test_feed_logo - assert_atom_logo(method(:make_feed)) do |feed| - feed.logo - end - end - - def test_feed_rights - assert_atom_text_construct("rights", method(:make_feed)) do |feed| - feed.rights - end - end - - def test_entry_rights - generator = method(:make_feed_with_open_entry) - assert_atom_text_construct("rights", generator) do |feed| - assert_equal(1, feed.entries.size) - feed.entry.rights - end - end - - def test_entry_source - assert_atom_source(method(:make_feed_with_open_entry_source)) do |feed| - assert_equal(1, feed.entries.size) - assert_not_nil(feed.entry.source) - feed.entry.source - end - end - - def test_feed_subtitle - assert_atom_text_construct("subtitle", method(:make_feed)) do |feed| - feed.subtitle - end - end - - def test_feed_title - feed = RSS::Parser.parse(make_feed('')) - assert_equal(FEED_TITLE, feed.title.content) - end - - def test_entry_title - feed = RSS::Parser.parse(make_feed('')) - assert_equal(ENTRY_TITLE, feed.entry.title.content) - end - - def test_feed_updated - feed = RSS::Parser.parse(make_feed('')) - assert_equal(Time.parse(FEED_UPDATED), feed.updated.content) - end - - def test_entry_updated - feed = RSS::Parser.parse(make_feed('')) - assert_equal(Time.parse(ENTRY_UPDATED), feed.entry.updated.content) - end - - def test_entry_published - generator = method(:make_feed_with_open_entry) - assert_atom_date_construct("published", generator) do |feed| - assert_equal(1, feed.entries.size) - feed.entry.published - end - end - - def test_entry_summary - generator = method(:make_feed_with_open_entry) - assert_atom_text_construct("summary", generator) do |feed| - assert_equal(1, feed.entries.size) - feed.entry.summary - end - end - end -end diff --git a/test/rss/test_setup_maker_0.9.rb b/test/rss/test_setup_maker_0.9.rb deleted file mode 100644 index 4eae62417a982a..00000000000000 --- a/test/rss/test_setup_maker_0.9.rb +++ /dev/null @@ -1,247 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMaker09 < TestCase - - def test_setup_maker_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - copyright = "foo" - managingEditor = "bar" - webMaster = "web master" - rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))' - docs = "http://foo.com/doc" - skipDays = [ - "Sunday", - "Monday", - ] - skipHours = [ - "0", - "13", - ] - pubDate = Time.now - lastBuildDate = Time.now - - rss = RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - maker.channel.copyright = copyright - maker.channel.managingEditor = managingEditor - maker.channel.webMaster = webMaster - maker.channel.rating = rating - maker.channel.docs = docs - maker.channel.pubDate = pubDate - maker.channel.lastBuildDate = lastBuildDate - - skipDays.each do |day| - maker.channel.skipDays.new_day do |new_day| - new_day.content = day - end - end - skipHours.each do |hour| - maker.channel.skipHours.new_hour do |new_hour| - new_hour.content = hour - end - end - - setup_dummy_image(maker) - end - - assert_not_set_error("maker.image", %w(title url)) do - RSS::Maker.make("0.91") do |maker| - rss.channel.setup_maker(maker) - end - end - - new_rss = RSS::Maker.make("0.91") do |maker| - rss.channel.setup_maker(maker) - setup_dummy_image(maker) - end - channel = new_rss.channel - - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(language, channel.language) - assert_equal(copyright, channel.copyright) - assert_equal(managingEditor, channel.managingEditor) - assert_equal(webMaster, channel.webMaster) - assert_equal(rating, channel.rating) - assert_equal(docs, channel.docs) - assert_equal(pubDate, channel.pubDate) - assert_equal(lastBuildDate, channel.lastBuildDate) - - skipDays.each_with_index do |day, i| - assert_equal(day, channel.skipDays.days[i].content) - end - skipHours.each_with_index do |hour, i| - assert_equal(hour.to_i, channel.skipHours.hours[i].content) - end - - assert(channel.items.empty?) - assert_nil(channel.textInput) - end - - def test_setup_maker_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - - new_rss = RSS::Maker.make("0.91") do |maker| - rss.channel.setup_maker(maker) - rss.image.setup_maker(maker) - end - - image = new_rss.image - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - assert_equal(width.to_i, image.width) - assert_equal(height.to_i, image.height) - assert_equal(description, image.description) - end - - def test_setup_maker_textinput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - setup_dummy_image(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - - new_rss = RSS::Maker.make("0.91") do |maker| - rss.channel.setup_maker(maker) - rss.image.setup_maker(maker) - rss.textinput.setup_maker(maker) - end - - textInput = new_rss.channel.textInput - assert_equal(title, textInput.title) - assert_equal(description, textInput.description) - assert_equal(name, textInput.name) - assert_equal(link, textInput.link) - end - - def test_setup_maker_items(for_backward_compatibility=false) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - - item_size = 5 - - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - end - end - - setup_dummy_image(maker) - end - - new_rss = RSS::Maker.make("0.91") do |maker| - rss.channel.setup_maker(maker) - - rss.items.each do |item| - if for_backward_compatibility - item.setup_maker(maker) - else - item.setup_maker(maker.items) - end - end - - rss.image.setup_maker(maker) - end - - assert_equal(item_size, new_rss.items.size) - new_rss.items.each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - end - end - - def test_setup_maker_items_backward_compatibility - test_setup_maker_items(true) - end - - def test_setup_maker - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - rss = RSS::Maker.make("0.91") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel(maker) - setup_dummy_image(maker) - end - - new_rss = RSS::Maker.make("0.91") do |maker| - rss.setup_maker(maker) - end - - assert_equal("0.91", new_rss.rss_version) - assert_equal(encoding, new_rss.encoding) - assert_equal(standalone, new_rss.standalone) - - xss = rss.xml_stylesheets.first - assert_equal(1, rss.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - end - end -end diff --git a/test/rss/test_setup_maker_1.0.rb b/test/rss/test_setup_maker_1.0.rb deleted file mode 100644 index a9d60ddb979fdc..00000000000000 --- a/test/rss/test_setup_maker_1.0.rb +++ /dev/null @@ -1,551 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMaker10 < TestCase - - def setup - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @dc_elems = { - :title => "hoge", - :description => - " XML is placing increasingly heavy loads on - the existing technical infrastructure of the Internet.", - :creator => "Rael Dornfest (mailto:rael@oreilly.com)", - :subject => "XML", - :publisher => "The O'Reilly Network", - :contributor => "hogehoge", - :type => "fugafuga", - :format => "hohoho", - :identifier => "fufufu", - :source => "barbar", - :language => "ja", - :relation => "cococo", - :rights => "Copyright (c) 2000 O'Reilly & Associates, Inc.", - :date => t, - } - - @sy_elems = { - :updatePeriod => "hourly", - :updateFrequency => "2", - :updateBase => t, - } - - @content_elems = { - :encoded => "ATTENTION", - } - - @trackback_elems = { - :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback", - :about => [ - "http://foo.com/trackback/tb.cgi?tb_id=20020923", - "http://foo.com/trackback/tb.cgi?tb_id=20021010", - ], - } - - @taxo_topic_elems = [ - { - :link => "http://meerkat.oreillynet.com/?c=cat23", - :title => "Data: XML", - :description => "A Meerkat channel", - }, - { - :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/", - :title => "XML", - :subject => "XML", - :description => "DMOZ category", - :topics => [ - "http://meerkat.oreillynet.com/?c=cat23", - "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/", - "http://dmoz.org/Computers/Programming/Internet/", - ] - }, - ] - end - - def test_setup_maker_channel - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - - @dc_elems.each do |var, value| - maker.channel.__send__("dc_#{var}=", value) - end - - @sy_elems.each do |var, value| - maker.channel.__send__("sy_#{var}=", value) - end - - setup_dummy_item(maker) - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.channel.setup_maker(maker) - rss.items.each do |item| - item.setup_maker(maker) - end - end - channel = new_rss.channel - - assert_equal(about, channel.about) - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(1, channel.items.Seq.lis.size) - assert_nil(channel.image) - assert_nil(channel.textinput) - - @dc_elems.each do |var, value| - assert_equal(value, channel.__send__("dc_#{var}")) - end - - @sy_elems.each do |var, value| - value = value.to_i if var == :updateFrequency - assert_equal(value, channel.__send__("sy_#{var}")) - end - - end - - def test_setup_maker_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - - @dc_elems.each do |var, value| - maker.image.__send__("dc_#{var}=", value) - end - - setup_dummy_item(maker) - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.channel.setup_maker(maker) - rss.image.setup_maker(maker) - rss.items.each do |item| - item.setup_maker(maker) - end - end - - image = new_rss.image - assert_equal(url, image.about) - assert_equal(url, new_rss.channel.image.resource) - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - - @dc_elems.each do |var, value| - assert_equal(image.__send__("dc_#{var}"), value) - end - end - - def test_setup_maker_textinput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.link = link - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - - @dc_elems.each do |var, value| - maker.textinput.__send__("dc_#{var}=", value) - end - - setup_dummy_item(maker) - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.channel.setup_maker(maker) - rss.textinput.setup_maker(maker) - rss.items.each do |item| - item.setup_maker(maker) - end - end - - textinput = new_rss.textinput - assert_equal(link, textinput.about) - assert_equal(link, new_rss.channel.textinput.resource) - assert_equal(title, textinput.title) - assert_equal(name, textinput.name) - assert_equal(description, textinput.description) - assert_equal(link, textinput.link) - - @dc_elems.each do |var, value| - assert_equal(textinput.__send__("dc_#{var}"), value) - end - end - - def test_setup_maker_items(for_backward_compatibility=false) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - - item_size = 5 - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - - @dc_elems.each do |var, value| - item.__send__("dc_#{var}=", value) - end - - @content_elems.each do |var, value| - item.__send__("content_#{var}=", value) - end - - item.trackback_ping = @trackback_elems[:ping] - @trackback_elems[:about].each do |value| - item.trackback_abouts.new_about do |new_about| - new_about.value = value - end - end - end - end - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.channel.setup_maker(maker) - - rss.items.each do |item| - if for_backward_compatibility - item.setup_maker(maker) - else - item.setup_maker(maker.items) - end - end - end - - assert_equal(item_size, new_rss.items.size) - new_rss.items.each_with_index do |item, i| - assert_equal("#{link}#{i}", item.about) - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - - @dc_elems.each do |var, value| - assert_equal(item.__send__("dc_#{var}"), value) - end - - @content_elems.each do |var, value| - assert_equal(item.__send__("content_#{var}"), value) - end - - assert_equal(@trackback_elems[:ping], item.trackback_ping) - assert_equal(@trackback_elems[:about].size, item.trackback_abouts.size) - item.trackback_abouts.each_with_index do |about, j| - assert_equal(@trackback_elems[:about][j], about.value) - end - end - end - - def test_setup_maker_items_sort - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - - item_size = 5 - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - item = RSS::RDF::Item.new("#{link}#{i}") - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.dc_date = Time.now + i * 60 - item.setup_maker(maker.items) - end - maker.items.do_sort = false - end - assert_equal(item_size, rss.items.size) - rss.items.each_with_index do |item, i| - assert_equal("#{link}#{i}", item.about) - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - end - - - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - item = RSS::RDF::Item.new("#{link}#{i}") - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.dc_date = Time.now + i * 60 - item.setup_maker(maker.items) - end - maker.items.do_sort = true - end - assert_equal(item_size, rss.items.size) - rss.items.reverse.each_with_index do |item, i| - assert_equal("#{link}#{i}", item.about) - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - end - end - - def test_setup_maker_items_backward_compatibility - test_setup_maker_items(true) - end - - def test_setup_maker - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - rss = RSS::Maker.make("1.0") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel(maker) - setup_dummy_item(maker) - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.setup_maker(maker) - end - - assert_equal("1.0", new_rss.rss_version) - assert_equal(encoding, new_rss.encoding) - assert_equal(standalone, new_rss.standalone) - - xss = new_rss.xml_stylesheets.first - assert_equal(1, new_rss.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - end - - def test_setup_maker_full - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - channel_about = "http://hoge.com" - channel_title = "fugafuga" - channel_link = "http://hoge.com" - channel_description = "fugafugafugafuga" - - image_title = "fugafuga" - image_url = "http://hoge.com/hoge.png" - - textinput_title = "fugafuga" - textinput_description = "text hoge fuga" - textinput_name = "hoge" - textinput_link = "http://hoge.com" - - item_title = "TITLE" - item_link = "http://hoge.com/" - item_description = "text hoge fuga" - - item_size = 5 - - rss = RSS::Maker.make("1.0") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - maker.channel.about = channel_about - maker.channel.title = channel_title - maker.channel.link = channel_link - maker.channel.description = channel_description - @dc_elems.each do |var, value| - maker.channel.__send__("dc_#{var}=", value) - end - @sy_elems.each do |var, value| - maker.channel.__send__("sy_#{var}=", value) - end - - maker.image.title = image_title - maker.image.url = image_url - @dc_elems.each do |var, value| - maker.image.__send__("dc_#{var}=", value) - end - - maker.textinput.link = textinput_link - maker.textinput.title = textinput_title - maker.textinput.description = textinput_description - maker.textinput.name = textinput_name - @dc_elems.each do |var, value| - maker.textinput.__send__("dc_#{var}=", value) - end - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{item_title}#{i}" - item.link = "#{item_link}#{i}" - item.description = "#{item_description}#{i}" - - @dc_elems.each do |var, value| - item.__send__("dc_#{var}=", value) - end - - @content_elems.each do |var, value| - item.__send__("content_#{var}=", value) - end - - item.trackback_ping = @trackback_elems[:ping] - @trackback_elems[:about].each do |value| - item.trackback_abouts.new_about do |new_about| - new_about.value = value - end - end - end - end - - setup_taxo_topic(maker, @taxo_topic_elems) - end - - new_rss = RSS::Maker.make("1.0") do |maker| - rss.setup_maker(maker) - end - - assert_equal("1.0", new_rss.rss_version) - assert_equal(encoding, new_rss.encoding) - assert_equal(standalone, new_rss.standalone) - - xss = new_rss.xml_stylesheets.first - assert_equal(1, new_rss.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - - channel = new_rss.channel - assert_equal(channel_about, channel.about) - assert_equal(channel_title, channel.title) - assert_equal(channel_link, channel.link) - assert_equal(channel_description, channel.description) - item_resources = [] - item_size.times do |i| - item_resources << "#{item_link}#{i}" - end - assert_equal(item_resources, channel.items.resources) - assert_equal(image_url, channel.image.resource) - assert_equal(textinput_link, channel.textinput.resource) - @dc_elems.each do |var, value| - assert_equal(value, channel.__send__("dc_#{var}")) - end - @sy_elems.each do |var, value| - value = value.to_i if var == :updateFrequency - assert_equal(value, channel.__send__("sy_#{var}")) - end - - image = new_rss.image - assert_equal(image_url, image.about) - assert_equal(image_url, new_rss.channel.image.resource) - assert_equal(image_title, image.title) - assert_equal(channel_link, image.link) - assert_equal(image_url, image.url) - @dc_elems.each do |var, value| - assert_equal(image.__send__("dc_#{var}"), value) - end - - textinput = new_rss.textinput - assert_equal(textinput_link, textinput.about) - assert_equal(textinput_link, new_rss.channel.textinput.resource) - assert_equal(textinput_title, textinput.title) - assert_equal(textinput_name, textinput.name) - assert_equal(textinput_description, textinput.description) - assert_equal(textinput_link, textinput.link) - @dc_elems.each do |var, value| - assert_equal(textinput.__send__("dc_#{var}"), value) - end - - assert_equal(item_size, new_rss.items.size) - new_rss.items.each_with_index do |item, i| - assert_equal("#{item_link}#{i}", item.about) - assert_equal("#{item_title}#{i}", item.title) - assert_equal("#{item_link}#{i}", item.link) - assert_equal("#{item_description}#{i}", item.description) - - @dc_elems.each do |var, value| - assert_equal(item.__send__("dc_#{var}"), value) - end - - @content_elems.each do |var, value| - assert_equal(item.__send__("content_#{var}"), value) - end - - assert_equal(@trackback_elems[:ping], item.trackback_ping) - assert_equal(@trackback_elems[:about].size, item.trackback_abouts.size) - item.trackback_abouts.each_with_index do |about, j| - assert_equal(@trackback_elems[:about][j], about.value) - end - end - - assert_taxo_topic(@taxo_topic_elems, new_rss) - end - - end -end diff --git a/test/rss/test_setup_maker_2.0.rb b/test/rss/test_setup_maker_2.0.rb deleted file mode 100644 index dffffe6da9e71e..00000000000000 --- a/test/rss/test_setup_maker_2.0.rb +++ /dev/null @@ -1,309 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMaker20 < TestCase - - def test_setup_maker_channel - title = "fugafuga" - link = "http://hoge.com" - description = "fugafugafugafuga" - language = "ja" - copyright = "foo" - managingEditor = "bar" - webMaster = "web master" - rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))' - docs = "http://foo.com/doc" - skipDays = [ - "Sunday", - "Monday", - ] - skipHours = [ - "0", - "13", - ] - pubDate = Time.now - lastBuildDate = Time.now - categories = [ - "Nespapers", - "misc", - ] - generator = "RSS Maker" - ttl = "60" - - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language - maker.channel.copyright = copyright - maker.channel.managingEditor = managingEditor - maker.channel.webMaster = webMaster - maker.channel.rating = rating - maker.channel.docs = docs - maker.channel.pubDate = pubDate - maker.channel.lastBuildDate = lastBuildDate - - skipDays.each do |day| - maker.channel.skipDays.new_day do |new_day| - new_day.content = day - end - end - skipHours.each do |hour| - maker.channel.skipHours.new_hour do |new_hour| - new_hour.content = hour - end - end - - - categories.each do |category| - maker.channel.categories.new_category do |new_category| - new_category.content = category - end - end - - maker.channel.generator = generator - maker.channel.ttl = ttl - end - - new_rss = RSS::Maker.make("2.0") do |maker| - rss.channel.setup_maker(maker) - end - channel = new_rss.channel - - assert_equal(title, channel.title) - assert_equal(link, channel.link) - assert_equal(description, channel.description) - assert_equal(language, channel.language) - assert_equal(copyright, channel.copyright) - assert_equal(managingEditor, channel.managingEditor) - assert_equal(webMaster, channel.webMaster) - assert_equal(rating, channel.rating) - assert_equal(docs, channel.docs) - assert_equal(pubDate, channel.pubDate) - assert_equal(lastBuildDate, channel.lastBuildDate) - - skipDays.each_with_index do |day, i| - assert_equal(day, channel.skipDays.days[i].content) - end - skipHours.each_with_index do |hour, i| - assert_equal(hour.to_i, channel.skipHours.hours[i].content) - end - - - channel.categories.each_with_index do |category, i| - assert_equal(categories[i], category.content) - end - - assert_equal(generator, channel.generator) - assert_equal(ttl.to_i, channel.ttl) - - - assert(channel.items.empty?) - assert_nil(channel.image) - assert_nil(channel.textInput) - end - - def test_setup_maker_image - title = "fugafuga" - link = "http://hoge.com" - url = "http://hoge.com/hoge.png" - width = "144" - height = "400" - description = "an image" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description - end - - new_rss = RSS::Maker.make("2.0") do |maker| - rss.channel.setup_maker(maker) - rss.image.setup_maker(maker) - end - - image = new_rss.image - assert_equal(title, image.title) - assert_equal(link, image.link) - assert_equal(url, image.url) - assert_equal(width.to_i, image.width) - assert_equal(height.to_i, image.height) - assert_equal(description, image.description) - end - - def test_setup_maker_textinput - title = "fugafuga" - description = "text hoge fuga" - name = "hoge" - link = "http://hoge.com" - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - maker.textinput.title = title - maker.textinput.description = description - maker.textinput.name = name - maker.textinput.link = link - end - - new_rss = RSS::Maker.make("2.0") do |maker| - rss.channel.setup_maker(maker) - rss.textinput.setup_maker(maker) - end - - textInput = new_rss.channel.textInput - assert_equal(title, textInput.title) - assert_equal(description, textInput.description) - assert_equal(name, textInput.name) - assert_equal(link, textInput.link) - end - - def test_setup_maker_items(for_backward_compatibility=false) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - author = "oprah@oxygen.net" - comments = "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290" - pubDate = Time.now - - guid_isPermaLink = "true" - guid_content = "http://inessential.com/2002/09/01.php#a2" - - enclosure_url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3" - enclosure_length = "12216320" - enclosure_type = "audio/mpeg" - - source_url = "http://static.userland.com/tomalak/links2.xml" - source_content = "Tomalak's Realm" - - category_domain = "http://www.fool.com/cusips" - category_content = "MSFT" - - item_size = 5 - - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.author = "#{author}#{i}" - item.comments = "#{comments}#{i}" - item.date = pubDate - - item.guid.isPermaLink = guid_isPermaLink - item.guid.content = guid_content - - item.enclosure.url = enclosure_url - item.enclosure.length = enclosure_length - item.enclosure.type = enclosure_type - - item.source.url = source_url - item.source.content = source_content - - category = item.categories.new_category - category.domain = category_domain - category.content = category_content - end - end - end - - new_rss = RSS::Maker.make("2.0") do |maker| - rss.channel.setup_maker(maker) - - rss.items.each do |item| - if for_backward_compatibility - item.setup_maker(maker) - else - item.setup_maker(maker.items) - end - end - end - - assert_equal(item_size, new_rss.items.size) - new_rss.items.each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title) - assert_equal("#{link}#{i}", item.link) - assert_equal("#{description}#{i}", item.description) - assert_equal("#{author}#{i}", item.author) - assert_equal("#{comments}#{i}", item.comments) - assert_equal(pubDate, item.pubDate) - - assert_equal(guid_isPermaLink == "true", item.guid.isPermaLink) - assert_equal(guid_content, item.guid.content) - - assert_equal(enclosure_url, item.enclosure.url) - assert_equal(enclosure_length.to_i, item.enclosure.length) - assert_equal(enclosure_type, item.enclosure.type) - - assert_equal(source_url, item.source.url) - assert_equal(source_content, item.source.content) - - assert_equal(1, item.categories.size) - assert_equal(category_domain, item.category.domain) - assert_equal(category_content, item.category.content) - end - - end - - def test_setup_maker_items_backward_compatibility - test_setup_maker_items(true) - end - - def test_setup_maker - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - rss = RSS::Maker.make("2.0") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel(maker) - end - - new_rss = RSS::Maker.make("2.0") do |maker| - rss.setup_maker(maker) - end - - assert_equal("2.0", new_rss.rss_version) - assert_equal(encoding, new_rss.encoding) - assert_equal(standalone, new_rss.standalone) - - xss = rss.xml_stylesheets.first - assert_equal(1, rss.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - end - - end -end diff --git a/test/rss/test_setup_maker_atom_entry.rb b/test/rss/test_setup_maker_atom_entry.rb deleted file mode 100644 index f8649ea185674d..00000000000000 --- a/test/rss/test_setup_maker_atom_entry.rb +++ /dev/null @@ -1,410 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMakerAtomEntry < TestCase - def setup - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @dc_elems = { - :title => "hoge", - :description => - " XML is placing increasingly heavy loads on - the existing technical infrastructure of the Internet.", - :creator => "Rael Dornfest (mailto:rael@oreilly.com)", - :subject => "XML", - :publisher => "The O'Reilly Network", - :contributor => "hogehoge", - :type => "fugafuga", - :format => "hohoho", - :identifier => "fufufu", - :source => "barbar", - :language => "ja", - :relation => "cococo", - :rights => "Copyright (c) 2000 O'Reilly & Associates, Inc.", - :date => t, - } - end - - def test_setup_maker_entry(with_dc=true) - authors = [ - { - :name => "Bob", - :uri => "http://example.com/~bob/", - :email => "bob@example.com", - }, - { - :name => "Alice", - :uri => "http://example.com/~alice/", - :email => "alice@example.com", - }, - ] - categories = [ - { - :term => "music", - :label => "Music", - }, - { - :term => "book", - :scheme => "http://example.com/category/book/", - :label => "Book", - }, - ] - contributors = [ - { - :name => "Chris", - :email => "chris@example.com", - }, - { - :name => "Eva", - :uri => "http://example.com/~eva/", - }, - ] - id = "urn:uuid:8b105336-7e20-45fc-bb78-37fb3e1db25a" - link = "http://hoge.com" - published = Time.now - 60 * 3600 - rights = "Copyrights (c) 2007 Alice and Bob" - description = "fugafugafugafuga" - title = "fugafuga" - updated = Time.now - - feed = RSS::Maker.make("atom:entry") do |maker| - maker.items.new_item do |item| - authors.each do |author_info| - item.authors.new_author do |author| - author_info.each do |key, value| - author.__send__("#{key}=", value) - end - end - end - - categories.each do |category_info| - item.categories.new_category do |category| - category_info.each do |key, value| - category.__send__("#{key}=", value) - end - end - end - - contributors.each do |contributor_info| - item.contributors.new_contributor do |contributor| - contributor_info.each do |key, value| - contributor.__send__("#{key}=", value) - end - end - end - - item.id = id - item.link = link - item.published = published - item.rights = rights - item.description = description - item.title = title - item.updated = updated - - if with_dc - @dc_elems.each do |var, value| - if var == :date - item.new_dc_date(value) - else - item.__send__("dc_#{var}=", value) - end - end - end - end - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("atom:entry") do |maker| - feed.setup_maker(maker) - end - assert_not_nil(new_feed) - - new_authors = new_feed.authors.collect do |author| - { - :name => author.name.content, - :uri => author.uri.content, - :email => author.email.content, - } - end - assert_equal(authors, new_authors) - - new_categories = new_feed.categories.collect do |category| - { - :term => category.term, - :scheme => category.scheme, - :label => category.label, - }.reject {|key, value| value.nil?} - end - assert_equal(categories, new_categories) - - new_contributors = new_feed.contributors.collect do |contributor| - info = {} - info[:name] = contributor.name.content - info[:uri] = contributor.uri.content if contributor.uri - info[:email] = contributor.email.content if contributor.email - info - end - assert_equal(contributors, new_contributors) - - assert_equal(id, new_feed.id.content) - assert_equal(link, new_feed.link.href) - assert_equal(published, new_feed.published.content) - assert_equal(rights, new_feed.rights.content) - assert_equal(description, new_feed.summary.content) - assert_equal(title, new_feed.title.content) - assert_equal(updated, new_feed.updated.content) - - if with_dc - @dc_elems.each do |var, value| - if var == :date - assert_equal([updated, value], - new_feed.dc_dates.collect {|date| date.value}) - else - assert_equal(value, new_feed.__send__("dc_#{var}")) - end - end - end - - assert_equal(1, new_feed.items.size) - end - - def test_setup_maker_entry_without_dc - test_setup_maker_entry(false) - end - - def test_setup_maker_items(for_backward_compatibility=false) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - updated = Time.now - - item_size = 5 - feed = RSS::Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.updated = updated + i * 60 - end - end - end - - new_feed = RSS::Maker.make("atom:entry") do |maker| - feed.items.each do |item| - if for_backward_compatibility - item.setup_maker(maker) - else - item.setup_maker(maker.items) - end - end - - feed.items.clear - feed.setup_maker(maker) - end - - assert_equal(1, new_feed.items.size) - new_feed.items[0..1].each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title.content) - assert_equal("#{link}#{i}", item.link.href) - assert_equal("#{description}#{i}", item.summary.content) - assert_equal(updated + i * 60, item.updated.content) - end - end - - def test_setup_maker_items_sort - title = "TITLE" - link = "http://hoge.com/" - summary = "text hoge fuga" - updated = Time.now - - feed_size = 5 - feed = RSS::Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - - feed_size.times do |i| - entry_class = RSS::Atom::Entry - entry = entry_class.new - entry.title = entry_class::Title.new(:content => "#{title}#{i}") - entry.links << entry_class::Link.new(:href => "#{link}#{i}") - entry.summary = entry_class::Summary.new(:content => "#{summary}#{i}") - entry.updated = entry_class::Updated.new(:content => updated + i * 60) - entry.setup_maker(maker.items) - end - maker.items.do_sort = false - end - assert_equal(1, feed.items.size) - - assert_equal("#{title}0", feed.title.content) - assert_equal("#{link}0", feed.link.href) - assert_equal("#{summary}0", feed.summary.content) - - - feed = RSS::Maker.make("atom:entry") do |maker| - setup_dummy_channel_atom(maker) - - feed_size.times do |i| - entry_class = RSS::Atom::Entry - entry = entry_class.new - entry.title = entry_class::Title.new(:content => "#{title}#{i}") - entry.links << entry_class::Link.new(:href => "#{link}#{i}") - entry.summary = entry_class::Summary.new(:content => "#{summary}#{i}") - entry.updated = entry_class::Updated.new(:content => updated + i * 60) - entry.setup_maker(maker.items) - end - maker.items.do_sort = true - end - assert_equal(1, feed.items.size) - - assert_equal("#{title}#{feed_size - 1}", feed.title.content) - assert_equal("#{link}#{feed_size - 1}", feed.link.href) - assert_equal("#{summary}#{feed_size - 1}", feed.summary.content) - end - - def test_setup_maker_items_backward_compatibility - test_setup_maker_items(true) - end - - def test_setup_maker - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - feed = RSS::Maker.make("atom:entry") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("atom:entry") do |maker| - feed.setup_maker(maker) - end - - assert_equal(["atom", "1.0", "entry"], new_feed.feed_info) - assert_equal(encoding, new_feed.encoding) - assert_equal(standalone, new_feed.standalone) - - xss = new_feed.xml_stylesheets.first - assert_equal(1, new_feed.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - end - - def test_setup_maker_full - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - channel_about = "http://hoge.com" - channel_title = "fugafuga" - channel_link = "http://hoge.com" - channel_description = "fugafugafugafuga" - channel_author = "Bob" - - image_url = "http://hoge.com/hoge.png" - - item_title = "TITLE" - item_link = "http://hoge.com/" - item_description = "text hoge fuga" - - entry_size = 5 - feed = RSS::Maker.make("atom:entry") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - maker.channel.about = channel_about - maker.channel.title = channel_title - maker.channel.link = channel_link - maker.channel.description = channel_description - maker.channel.author = channel_author - @dc_elems.each do |var, value| - maker.channel.__send__("dc_#{var}=", value) - end - - maker.image.url = image_url - - entry_size.times do |i| - maker.items.new_item do |item| - item.title = "#{item_title}#{i}" - item.link = "#{item_link}#{i}" - item.description = "#{item_description}#{i}" - - @dc_elems.each do |var, value| - item.__send__("dc_#{var}=", value) - end - end - end - end - - new_feed = RSS::Maker.make("atom:entry") do |maker| - feed.setup_maker(maker) - end - - assert_equal(["atom", "1.0", "entry"], new_feed.feed_info) - assert_equal(encoding, new_feed.encoding) - assert_equal(standalone, new_feed.standalone) - - xss = new_feed.xml_stylesheets.first - assert_equal(1, new_feed.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - - assert_equal("#{item_title}0", new_feed.title.content) - assert_equal("#{item_link}0", new_feed.link.href) - assert_equal("#{item_description}0", new_feed.summary.content) - @dc_elems.each do |var, value| - assert_equal(value, new_feed.__send__("dc_#{var}")) - end - assert_equal(1, new_feed.items.size) - end - end -end diff --git a/test/rss/test_setup_maker_atom_feed.rb b/test/rss/test_setup_maker_atom_feed.rb deleted file mode 100644 index 2196f1a46a440e..00000000000000 --- a/test/rss/test_setup_maker_atom_feed.rb +++ /dev/null @@ -1,446 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMakerAtomFeed < TestCase - def setup - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @dc_elems = { - :title => "hoge", - :description => - " XML is placing increasingly heavy loads on - the existing technical infrastructure of the Internet.", - :creator => "Rael Dornfest (mailto:rael@oreilly.com)", - :subject => "XML", - :publisher => "The O'Reilly Network", - :contributor => "hogehoge", - :type => "fugafuga", - :format => "hohoho", - :identifier => "fufufu", - :source => "barbar", - :language => "ja", - :relation => "cococo", - :rights => "Copyright (c) 2000 O'Reilly & Associates, Inc.", - :date => t, - } - end - - def test_setup_maker_feed(with_dc=true) - authors = [ - { - :name => "Bob", - :uri => "http://example.com/~bob/", - :email => "bob@example.com", - }, - { - :name => "Alice", - :uri => "http://example.com/~alice/", - :email => "alice@example.com", - }, - ] - categories = [ - { - :term => "music", - :label => "Music", - }, - { - :term => "book", - :scheme => "http://example.com/category/book/", - :label => "Book", - }, - ] - contributors = [ - { - :name => "Chris", - :email => "chris@example.com", - }, - { - :name => "Eva", - :uri => "http://example.com/~eva/", - }, - ] - generator = { - :uri => "http://example.com/generator/", - :version => "0.0.1", - :content => "Feed Generator", - } - icon = "http://example.com/icon.png" - about = "http://hoge.com" - title = "fugafuga" - link = "http://hoge.com" - logo = "http://example.com/logo.png" - rights = "Copyrights (c) 2007 Alice and Bob" - description = "fugafugafugafuga" - updated = Time.now - - feed = RSS::Maker.make("atom") do |maker| - authors.each do |author_info| - maker.channel.authors.new_author do |author| - author_info.each do |key, value| - author.__send__("#{key}=", value) - end - end - end - - categories.each do |category_info| - maker.channel.categories.new_category do |category| - category_info.each do |key, value| - category.__send__("#{key}=", value) - end - end - end - - contributors.each do |contributor_info| - maker.channel.contributors.new_contributor do |contributor| - contributor_info.each do |key, value| - contributor.__send__("#{key}=", value) - end - end - end - - generator.each do |key, value| - maker.channel.generator do |g| - g.__send__("#{key}=", value) - end - end - - maker.channel.icon = icon - - maker.channel.about = about - maker.channel.link = link - maker.channel.logo = logo - maker.channel.rights = rights - maker.channel.title = title - maker.channel.description = description - maker.channel.updated = updated - - if with_dc - @dc_elems.each do |var, value| - if var == :date - maker.channel.new_dc_date(value) - else - maker.channel.__send__("dc_#{var}=", value) - end - end - end - - setup_dummy_item_atom(maker) - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("atom") do |maker| - feed.setup_maker(maker) - end - assert_not_nil(new_feed) - - new_authors = new_feed.authors.collect do |author| - { - :name => author.name.content, - :uri => author.uri.content, - :email => author.email.content, - } - end - assert_equal(authors, new_authors) - - new_categories = new_feed.categories.collect do |category| - { - :term => category.term, - :scheme => category.scheme, - :label => category.label, - }.reject {|key, value| value.nil?} - end - assert_equal(categories, new_categories) - - new_contributors = new_feed.contributors.collect do |contributor| - info = {} - info[:name] = contributor.name.content - info[:uri] = contributor.uri.content if contributor.uri - info[:email] = contributor.email.content if contributor.email - info - end - assert_equal(contributors, new_contributors) - - new_generator = { - :uri => new_feed.generator.uri, - :version => new_feed.generator.version, - :content => new_feed.generator.content, - } - assert_equal(generator, new_generator) - - assert_equal(icon, new_feed.icon.content) - assert_equal(about, new_feed.id.content) - assert_equal(link, new_feed.link.href) - assert_equal(logo, new_feed.logo.content) - assert_equal(rights, new_feed.rights.content) - assert_equal(description, new_feed.subtitle.content) - assert_equal(title, new_feed.title.content) - assert_equal(updated, new_feed.updated.content) - - if with_dc - @dc_elems.each do |var, value| - if var == :date - assert_equal([updated, value], - new_feed.dc_dates.collect {|date| date.value}) - else - assert_equal(value, new_feed.__send__("dc_#{var}")) - end - end - end - - assert_equal(1, new_feed.items.size) - end - - def test_setup_maker_feed_without_dc - test_setup_maker_feed(false) - end - - def test_setup_maker_items(for_backward_compatibility=false) - title = "TITLE" - link = "http://hoge.com/" - description = "text hoge fuga" - updated = Time.now - - item_size = 5 - feed = RSS::Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - - item_size.times do |i| - maker.items.new_item do |item| - item.title = "#{title}#{i}" - item.link = "#{link}#{i}" - item.description = "#{description}#{i}" - item.updated = updated + i * 60 - end - end - end - - new_feed = RSS::Maker.make("atom") do |maker| - feed.items.each do |item| - if for_backward_compatibility - item.setup_maker(maker) - else - item.setup_maker(maker.items) - end - end - - feed.items.clear - feed.setup_maker(maker) - end - - assert_equal(item_size, new_feed.items.size) - new_feed.items.each_with_index do |item, i| - assert_equal("#{title}#{i}", item.title.content) - assert_equal("#{link}#{i}", item.link.href) - assert_equal("#{description}#{i}", item.summary.content) - assert_equal(updated + i * 60, item.updated.content) - end - end - - def test_setup_maker_items_sort - title = "TITLE" - link = "http://hoge.com/" - summary = "text hoge fuga" - updated = Time.now - - feed_size = 5 - feed = RSS::Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - - feed_size.times do |i| - entry_class = RSS::Atom::Feed::Entry - entry = entry_class.new - entry.title = entry_class::Title.new(:content => "#{title}#{i}") - entry.links << entry_class::Link.new(:href => "#{link}#{i}") - entry.summary = entry_class::Summary.new(:content => "#{summary}#{i}") - entry.updated = entry_class::Updated.new(:content => updated + i * 60) - entry.setup_maker(maker.items) - end - maker.items.do_sort = false - end - assert_equal(feed_size, feed.entries.size) - feed.entries.each_with_index do |entry, i| - assert_equal("#{title}#{i}", entry.title.content) - assert_equal("#{link}#{i}", entry.link.href) - assert_equal("#{summary}#{i}", entry.summary.content) - end - - - feed = RSS::Maker.make("atom") do |maker| - setup_dummy_channel_atom(maker) - - feed_size.times do |i| - entry_class = RSS::Atom::Feed::Entry - entry = entry_class.new - entry.title = entry_class::Title.new(:content => "#{title}#{i}") - entry.links << entry_class::Link.new(:href => "#{link}#{i}") - entry.summary = entry_class::Summary.new(:content => "#{summary}#{i}") - entry.updated = entry_class::Updated.new(:content => updated + i * 60) - entry.setup_maker(maker.items) - end - maker.items.do_sort = true - end - assert_equal(feed_size, feed.entries.size) - feed.entries.reverse.each_with_index do |entry, i| - assert_equal("#{title}#{i}", entry.title.content) - assert_equal("#{link}#{i}", entry.link.href) - assert_equal("#{summary}#{i}", entry.summary.content) - end - end - - def test_setup_maker_items_backward_compatibility - test_setup_maker_items(true) - end - - def test_setup_maker - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - feed = RSS::Maker.make("atom") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - setup_dummy_channel_atom(maker) - setup_dummy_item_atom(maker) - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("atom") do |maker| - feed.setup_maker(maker) - end - - assert_equal(["atom", "1.0", "feed"], new_feed.feed_info) - assert_equal(encoding, new_feed.encoding) - assert_equal(standalone, new_feed.standalone) - - xss = new_feed.xml_stylesheets.first - assert_equal(1, new_feed.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - end - - def test_setup_maker_full - encoding = "EUC-JP" - standalone = true - - href = 'a.xsl' - type = 'text/xsl' - title = 'sample' - media = 'printer' - charset = 'UTF-8' - alternate = 'yes' - - channel_about = "http://hoge.com" - channel_title = "fugafuga" - channel_link = "http://hoge.com" - channel_description = "fugafugafugafuga" - channel_author = "Bob" - - image_url = "http://hoge.com/hoge.png" - - item_title = "TITLE" - item_link = "http://hoge.com/" - item_description = "text hoge fuga" - - entry_size = 5 - feed = RSS::Maker.make("atom") do |maker| - maker.encoding = encoding - maker.standalone = standalone - - maker.xml_stylesheets.new_xml_stylesheet do |xss| - xss.href = href - xss.type = type - xss.title = title - xss.media = media - xss.charset = charset - xss.alternate = alternate - end - - maker.channel.about = channel_about - maker.channel.title = channel_title - maker.channel.link = channel_link - maker.channel.description = channel_description - maker.channel.author = channel_author - @dc_elems.each do |var, value| - maker.channel.__send__("dc_#{var}=", value) - end - - maker.image.url = image_url - - entry_size.times do |i| - maker.items.new_item do |item| - item.title = "#{item_title}#{i}" - item.link = "#{item_link}#{i}" - item.description = "#{item_description}#{i}" - - @dc_elems.each do |var, value| - item.__send__("dc_#{var}=", value) - end - end - end - end - - new_feed = RSS::Maker.make("atom") do |maker| - feed.setup_maker(maker) - end - - assert_equal(["atom", "1.0", "feed"], new_feed.feed_info) - assert_equal(encoding, new_feed.encoding) - assert_equal(standalone, new_feed.standalone) - - xss = new_feed.xml_stylesheets.first - assert_equal(1, new_feed.xml_stylesheets.size) - assert_equal(href, xss.href) - assert_equal(type, xss.type) - assert_equal(title, xss.title) - assert_equal(media, xss.media) - assert_equal(charset, xss.charset) - assert_equal(alternate, xss.alternate) - - assert_equal(channel_title, new_feed.title.content) - assert_equal(channel_link, new_feed.link.href) - assert_equal(channel_description, new_feed.subtitle.content) - assert_equal(channel_author, new_feed.author.name.content) - assert_equal(image_url, new_feed.logo.content) - @dc_elems.each do |var, value| - assert_equal(value, new_feed.__send__("dc_#{var}")) - end - - assert_equal(entry_size, new_feed.entries.size) - new_feed.entries.each_with_index do |entry, i| - assert_equal("#{item_title}#{i}", entry.title.content) - assert_equal("#{item_link}#{i}", entry.link.href) - assert_equal("#{item_description}#{i}", entry.summary.content) - - @dc_elems.each do |var, value| - assert_equal(value, entry.__send__("dc_#{var}")) - end - end - end - end -end diff --git a/test/rss/test_setup_maker_itunes.rb b/test/rss/test_setup_maker_itunes.rb deleted file mode 100644 index 35ecfb4829a034..00000000000000 --- a/test/rss/test_setup_maker_itunes.rb +++ /dev/null @@ -1,144 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMakerITunes < TestCase - def test_setup_maker_simple - author = "John Doe" - block = true - categories = ["Audio Blogs"] - image = "http://example.com/podcasts/everything/AllAboutEverything.jpg" - duration = "4:05" - duration_components = [0, 4, 5] - explicit = true - keywords = ["salt", "pepper", "shaker", "exciting"] - owner = {:name => "John Doe", :email => "john.doe@example.com"} - subtitle = "A show about everything" - summary = "All About Everything is a show about " + - "everything. Each week we dive into any " + - "subject known to man and talk about it " + - "as much as we can. Look for our Podcast " + - "in the iTunes Music Store" - - feed = RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - channel = maker.channel - channel.itunes_author = author - channel.itunes_block = block - categories.each do |category| - channel.itunes_categories.new_category.text = category - end - channel.itunes_image = image - channel.itunes_explicit = explicit - channel.itunes_keywords = keywords - channel.itunes_owner.itunes_name = owner[:name] - channel.itunes_owner.itunes_email = owner[:email] - channel.itunes_subtitle = subtitle - channel.itunes_summary = summary - - item = maker.items.last - item.itunes_author = author - item.itunes_block = block - item.itunes_duration = duration - item.itunes_explicit = explicit - item.itunes_keywords = keywords - item.itunes_subtitle = subtitle - item.itunes_summary = summary - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("rss2.0") do |maker| - feed.setup_maker(maker) - end - assert_not_nil(new_feed) - - channel = new_feed.channel - item = new_feed.items.last - - assert_equal(author, channel.itunes_author) - assert_equal(author, item.itunes_author) - - assert_equal(block, channel.itunes_block?) - assert_equal(block, item.itunes_block?) - - assert_equal(categories, - collect_itunes_categories(channel.itunes_categories)) - - assert_equal(image, channel.itunes_image.href) - - assert_equal(duration_components, - [item.itunes_duration.hour, - item.itunes_duration.minute, - item.itunes_duration.second]) - - assert_equal(explicit, channel.itunes_explicit?) - assert_equal(explicit, item.itunes_explicit?) - - assert_equal(keywords, channel.itunes_keywords) - assert_equal(keywords, item.itunes_keywords) - - assert_equal(owner, - { - :name => channel.itunes_owner.itunes_name, - :email => channel.itunes_owner.itunes_email - }) - - assert_equal(subtitle, channel.itunes_subtitle) - assert_equal(subtitle, item.itunes_subtitle) - - assert_equal(summary, channel.itunes_summary) - assert_equal(summary, item.itunes_summary) - end - - def test_setup_maker_with_nested_categories - categories = [["Arts & Entertainment", "Games"], - ["Technology", "Computers"], - "Audio Blogs"] - - feed = RSS::Maker.make("rss2.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - channel = maker.channel - categories.each do |category| - target = channel.itunes_categories - if category.is_a?(Array) - category.each do |sub_category| - target = target.new_category - target.text = sub_category - end - else - target.new_category.text = category - end - end - end - assert_not_nil(feed) - - new_feed = RSS::Maker.make("rss2.0") do |maker| - feed.setup_maker(maker) - end - assert_not_nil(new_feed) - - channel = new_feed.channel - - assert_equal(categories, - collect_itunes_categories(channel.itunes_categories)) - end - - private - def collect_itunes_categories(categories) - categories.collect do |c| - rest = collect_itunes_categories(c.itunes_categories) - if rest.empty? - c.text - else - [c.text, *rest] - end - end - end - end -end diff --git a/test/rss/test_setup_maker_slash.rb b/test/rss/test_setup_maker_slash.rb deleted file mode 100644 index d6973bed4e68ba..00000000000000 --- a/test/rss/test_setup_maker_slash.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: false -require_relative "rss-testcase" - -require "rss/maker" - -module RSS - class TestSetupMakerSlash < TestCase - def test_setup_maker - elements = { - "section" => "articles", - "department" => "not-an-ocean-unless-there-are-lobsters", - "comments" => 177, - "hit_parades" => [177, 155, 105, 33, 6, 3, 0], - } - - rss = RSS::Maker.make("rss1.0") do |maker| - setup_dummy_channel(maker) - setup_dummy_item(maker) - - item = maker.items.last - item.slash_section = elements["section"] - item.slash_department = elements["department"] - item.slash_comments = elements["comments"] - item.slash_hit_parade = elements["hit_parades"].join(",") - end - assert_not_nil(rss) - - new_rss = RSS::Maker.make("rss1.0") do |maker| - rss.setup_maker(maker) - end - assert_not_nil(new_rss) - - item = new_rss.items.last - assert_not_nil(item) - - assert_slash_elements(elements, item) - end - end -end diff --git a/test/rss/test_slash.rb b/test/rss/test_slash.rb deleted file mode 100644 index 6746e4488ffcf5..00000000000000 --- a/test/rss/test_slash.rb +++ /dev/null @@ -1,65 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/slash" - -module RSS - class TestSlash < TestCase - def setup - @elements = { - "section" => "articles", - "department" => "not-an-ocean-unless-there-are-lobsters", - "comments" => 177, - "hit_parades" => [177, 155, 105, 33, 6, 3, 0], - } - - slash_nodes = @elements.collect do |name, value| - if name == "hit_parades" - name = "hit_parade" - value = value.join(",") - end - "#{value}" - end.join("\n") - - slash_ns = {"slash" => "http://purl.org/rss/1.0/modules/slash/"} - @source = make_RDF(<<-EOR, slash_ns) -#{make_channel} -#{make_image} -#{make_item(slash_nodes)} -#{make_textinput} -EOR - end - - def test_parser - rss = RSS::Parser.parse(@source) - - assert_not_nil(rss) - - item = rss.items[0] - assert_not_nil(item) - - assert_slash_elements(item) - end - - def test_to_s - rss = RSS::Parser.parse(@source) - rss = RSS::Parser.parse(rss.to_s) - - assert_not_nil(rss) - - item = rss.items[0] - assert_not_nil(item) - - assert_slash_elements(item) - end - - private - def assert_slash_elements(target) - super(@elements, target) - end - end -end diff --git a/test/rss/test_syndication.rb b/test/rss/test_syndication.rb deleted file mode 100644 index ec3895eafc7b2c..00000000000000 --- a/test/rss/test_syndication.rb +++ /dev/null @@ -1,126 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/syndication" - -module RSS - class TestSyndication < TestCase - - def setup - @prefix = "sy" - @uri = "http://purl.org/rss/1.0/modules/syndication/" - - @parents = %w(channel) - - t = Time.iso8601("2000-01-01T12:00:05+00:00") - class << t - alias_method(:to_s, :iso8601) - end - - @elems = { - :updatePeriod => "hourly", - :updateFrequency => "2", - :updateBase => t, - } - - @sy_nodes = @elems.collect do |name, value| - "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}" - end.join("\n") - - @rss_source = make_RDF(<<-EOR, {@prefix => @uri}) -#{make_channel(@sy_nodes)} -#{make_image()} -#{make_item()} -#{make_textinput()} -EOR - - @rss = Parser.parse(@rss_source) - end - - def test_parser - - assert_nothing_raised do - Parser.parse(@rss_source) - end - - @elems.each do |tag, value| - assert_too_much_tag(tag.to_s, "channel") do - Parser.parse(make_RDF(<<-EOR, {@prefix => @uri})) -#{make_channel(("<" + @prefix + ":" + tag.to_s + ">" + - CGI.escapeHTML(value.to_s) + - "") * 2)} -#{make_item} -EOR - end - end - - end - - def test_accessor - - t = Time.iso8601("2003-01-01T12:00:23+09:00") - class << t - alias_method(:to_s, :iso8601) - end - - new_value = { - :updatePeriod => "daily", - :updateFrequency => "11", - :updateBase => t, - } - - @elems.each do |name, value| - value = value.to_i if name == :updateFrequency - @parents.each do |parent| - assert_equal(value, @rss.__send__(parent).__send__("sy_#{name}")) - @rss.__send__(parent).__send__("sy_#{name}=", new_value[name]) - new_val = new_value[name] - new_val = new_val.to_i if name == :updateFrequency - assert_equal(new_val, @rss.__send__(parent).__send__("sy_#{name}")) - end - end - - %w(hourly daily weekly monthly yearly).each do |x| - @parents.each do |parent| - assert_nothing_raised do - @rss.__send__(parent).sy_updatePeriod = x - end - end - end - - %w(-2 0.3 -0.4).each do |x| - @parents.each do |parent| - assert_not_available_value("sy:updateBase", x) do - @rss.__send__(parent).sy_updateBase = x - end - end - end - - end - - def test_to_s - - @elems.each do |name, value| - excepted = "<#{@prefix}:#{name}>#{value}" - @parents.each do |parent| - assert_equal(excepted, - @rss.__send__(parent).__send__("sy_#{name}_element")) - end - end - - REXML::Document.new(@rss_source).root.each_element do |parent| - if @parents.include?(parent.name) - parent.each_element do |elem| - if elem.namespace == @uri - assert_equal(elem.text, @elems[elem.name.intern].to_s) - end - end - end - end - end - end -end diff --git a/test/rss/test_taxonomy.rb b/test/rss/test_taxonomy.rb deleted file mode 100644 index 89f49a94c34753..00000000000000 --- a/test/rss/test_taxonomy.rb +++ /dev/null @@ -1,173 +0,0 @@ -# frozen_string_literal: false -require "cgi" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/2.0" -require "rss/taxonomy" - -module RSS - class TestTaxonomy < TestCase - - def setup - @prefix = "taxo" - @uri = "http://purl.org/rss/1.0/modules/taxonomy/" - @dc_prefix = "dc" - @dc_uri = "http://purl.org/dc/elements/1.1/" - - @ns = { - @prefix => @uri, - @dc_prefix => @dc_uri, - } - - @topics_parents = %w(channel item) - - @topics_lis = [ - "http://meerkat.oreillynet.com/?c=cat23", - "http://meerkat.oreillynet.com/?c=47", - "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/", - ] - - @topics_node = "<#{@prefix}:topics>\n" - @topics_node << " \n" - @topics_lis.each do |value| - resource = CGI.escapeHTML(value) - @topics_node << " \n" - end - @topics_node << " \n" - @topics_node << "" - - @topic_topics_lis = \ - [ - "http://meerkat.oreillynet.com/?c=cat23", - "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/", - "http://dmoz.org/Computers/Programming/Internet/", - ] - - @topic_contents = \ - [ - { - :link => "http://meerkat.oreillynet.com/?c=cat23", - :title => "Data: XML", - :description => "A Meerkat channel", - }, - { - :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/", - :title => "XML", - :subject => "XML", - :description => "DMOZ category", - :topics => @topic_topics_lis, - } - ] - - @topic_nodes = @topic_contents.collect do |info| - link = info[:link] - rv = "<#{@prefix}:topic rdf:about=\"#{link}\">\n" - info.each do |name, value| - case name - when :topics - rv << " <#{@prefix}:topics>\n" - rv << " \n" - value.each do |li| - resource = CGI.escapeHTML(li) - rv << " \n" - end - rv << " \n" - rv << " \n" - else - prefix = (name == :link ? @prefix : @dc_prefix) - rv << " <#{prefix}:#{name}>#{value}\n" - end - end - rv << "" - end - - @rss_source = make_RDF(<<-EOR, @ns) -#{make_channel(@topics_node)} -#{make_image()} -#{make_item(@topics_node)} -#{make_textinput()} -#{@topic_nodes.join("\n")} -EOR - - @rss = Parser.parse(@rss_source) - end - - def test_parser - assert_nothing_raised do - Parser.parse(@rss_source) - end - - assert_too_much_tag("topics", "channel") do - Parser.parse(make_RDF(<<-EOR, @ns)) -#{make_channel(@topics_node * 2)} -#{make_item()} -EOR - end - - assert_too_much_tag("topics", "item") do - Parser.parse(make_RDF(<<-EOR, @ns)) -#{make_channel()} -#{make_item(@topics_node * 2)} -EOR - end - end - - def test_accessor - topics = @rss.channel.taxo_topics - assert_equal(@topics_lis.sort, - topics.Bag.lis.collect {|li| li.resource}.sort) - assert_equal(@topics_lis.sort, topics.resources.sort) - - assert_equal(@rss.taxo_topics.first, @rss.taxo_topic) - - @topic_contents.each_with_index do |info, i| - topic = @rss.taxo_topics[i] - info.each do |name, value| - case name - when :link - assert_equal(value, topic.about) - assert_equal(value, topic.taxo_link) - when :topics - assert_equal(value.sort, topic.taxo_topics.resources.sort) - else - assert_equal(value, topic.__send__("dc_#{name}")) - end - end - end - end - - def test_to_s - @topics_parents.each do |parent| - meth = "taxo_topics_element" - assert_equal(@topics_node, @rss.__send__(parent).__send__(meth)) - end - - @topic_nodes.each_with_index do |node, i| - expected_xml = taxo_xmlns_container(node) - expected = REXML::Document.new(expected_xml).root.elements[1] - actual_xml = taxo_xmlns_container(@rss.taxo_topics[i].to_s(true, "")) - actual = REXML::Document.new(actual_xml).root.elements[1] - expected_elems = expected.reject {|x| x.is_a?(REXML::Text)} - actual_elems = actual.reject {|x| x.is_a?(REXML::Text)} - expected_elems.sort! {|x, y| x.name <=> y.name} - actual_elems.sort! {|x, y| x.name <=> y.name} - assert_equal(expected_elems.collect {|x| x.to_s}, - actual_elems.collect {|x| x.to_s}) - assert_equal(expected.attributes.sort, actual.attributes.sort) - end - end - - private - def taxo_xmlns_container(content) - xmlns_container({ - @prefix => @uri, - "dc" => "http://purl.org/dc/elements/1.1/", - "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", - }, - content) - end - end -end - diff --git a/test/rss/test_to_s.rb b/test/rss/test_to_s.rb deleted file mode 100644 index bbdd74ef0b017b..00000000000000 --- a/test/rss/test_to_s.rb +++ /dev/null @@ -1,701 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/maker" -require "rss/1.0" -require "rss/2.0" -require "rss/content" -require "rss/dublincore" -require "rss/syndication" -require "rss/trackback" - -module RSS - class TestToS < TestCase - def setup - @image_url = "http://example.com/foo.png" - @textinput_link = "http://example.com/search.cgi" - @item_links = [ - "http://example.com/1", - "http://example.com/2", - ] - - setup_xml_declaration_info - setup_xml_stylesheet_infos - setup_channel_info - setup_item_infos - setup_image_info - setup_textinput_info - - setup_dublin_core_info - setup_syndication_info - setup_content_info - setup_trackback_info - end - - def test_to_s_10 - rss = RSS::Maker.make("1.0") do |maker| - setup_full(maker) - end - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel10(@channel_info, rss.channel) - assert_items10(@item_infos, rss.items) - rss.items.each do |item| - assert_trackback(@trackback_info, item) - end - assert_image10(@image_info, rss.image) - assert_textinput10(@textinput_info, rss.textinput) - - rss = RSS::Parser.parse(rss.to_s) - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel10(@channel_info, rss.channel) - assert_items10(@item_infos, rss.items) - assert_image10(@image_info, rss.image) - assert_textinput10(@textinput_info, rss.textinput) - end - - def test_to_s_09 - rss = RSS::Maker.make("0.91") do |maker| - setup_full(maker) - end - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel09(@channel_info, rss.channel) - assert_items09(@item_infos, rss.items) - assert_image09(@image_info, rss.image) - assert_textinput09(@textinput_info, rss.textinput) - - rss = RSS::Parser.parse(rss.to_s) - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel09(@channel_info, rss.channel) - assert_items09(@item_infos, rss.items) - assert_image09(@image_info, rss.image) - assert_textinput09(@textinput_info, rss.textinput) - end - - def test_to_s_20 - rss = RSS::Maker.make("2.0") do |maker| - setup_full(maker) - end - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel20(@channel_info, rss.channel) - assert_items20(@item_infos, rss.items) - assert_image20(@image_info, rss.image) - assert_textinput20(@textinput_info, rss.textinput) - - rss = RSS::Parser.parse(rss.to_s) - - assert_xml_declaration(@version, @encoding, @standalone, rss) - assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets) - assert_channel20(@channel_info, rss.channel) - assert_items20(@item_infos, rss.items) - assert_image20(@image_info, rss.image) - assert_textinput20(@textinput_info, rss.textinput) - end - - def test_time_w3cdtf - assert_equal("2015-09-05T01:25:48.0001Z", - Time.utc(2015, 9, 5, 1, 25, 48, 100).w3cdtf, - '[ruby-core:70667] [Bug #11509]') - end - - def test_20_empty_text - title = "Blog entries" - link = "http://blog.example.com/" - description = "" - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - end - - parsed_rss = RSS::Parser.parse(rss.to_s) - assert_equal({ - title: title, - link: link, - description: description, - }, - { - title: parsed_rss.channel.title, - link: parsed_rss.channel.link, - description: parsed_rss.channel.description, - }, - "[ruby-core:80965] [Bug #13531]") - end - - private - def setup_xml_declaration_info - @version = "1.0" - @encoding = "UTF-8" - @standalone = false - end - - def setup_xml_stylesheet_infos - @xs_infos = [ - { - "href" => "XXX.xsl", - "type" => "text/xsl", - "title" => "XXX", - "media" => "print", - "alternate" => "no", - }, - { - "href" => "YYY.css", - "type" => "text/css", - "title" => "YYY", - "media" => "all", - "alternate" => "no", - }, - ] - end - - def setup_channel_info - @channel_info = { - "about" => "http://example.com/index.rdf", - "title" => "Sample RSS", - "link" => "http://example.com/", - "description" => "Sample\n\n\n\n\nSite", - "language" => "en", - "copyright" => "FDL", - "managingEditor" => "foo@example.com", - "webMaster" => "webmaster@example.com", - "rating" => '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))', - "docs" => "http://backend.userland.com/rss091", - "skipDays" => [ - "Monday", - "Friday", - ], - "skipHours" => [ - "12", - "23", - ], - "date" => Time.now, - "lastBuildDate" => Time.now - 3600, - "generator" => "RSS Maker", - "ttl" => "60", - "cloud" => { - "domain" => "rpc.sys.com", - "port" => "80", - "path" => "/RPC2", - "registerProcedure" => "myCloud.rssPleaseNotify", - "protocol" => "xml-rpc", - }, - "category" => { - "domain" => "http://example.com/misc/", - "content" => "misc", - }, - - "image" => { - "resource" => @image_url, - }, - - "textinput" => { - "resource" => @textinput_link, - }, - - "items" => @item_links.collect{|link| {"resource" => link}}, - } - end - - def setup_item_infos - @item_infos = [ - { - "title" => "Sample item1", - "link" => @item_links[0], - "description" => "Sample description1", - "date" => Time.now - 3600, - "author" => "foo@example.com", - "comments" => "http://example.com/1/comments", - "guid" => { - "isPermaLink" => "true", - "content" => "http://example.com/1", - }, - "enclosure" => { - "url" => "http://example.com/1.mp3", - "length" => "100", - "type" => "audio/mpeg", - }, - "source" => { - "url" => "http:/example.com/", - "content" => "Sample site", - }, - "category" => { - "domain" => "http://example.com/misc/", - "content" => "misc", - }, - }, - - { - "title" => "Sample item2", - "link" => @item_links[1], - "description" => "Sample description2", - "date" => Time.now - 7200, - "author" => "foo@example.com", - "comments" => "http://example.com/2/comments", - "guid" => { - "isPermaLink" => "false", - "content" => "http://example.com/2", - }, - "enclosure" => { - "url" => "http://example.com/2.mp3", - "length" => "200", - "type" => "audio/mpeg", - }, - "source" => { - "url" => "http:/example.com/", - "content" => "Sample site", - }, - "category" => { - "domain" => "http://example.com/misc/", - "content" => "misc", - }, - }, - ] - end - - def setup_image_info - @image_info = { - "title" => "Sample image", - "url" => @image_url, - "width" => "88", - "height" => "31", - "description" => "Sample", - } - end - - def setup_textinput_info - @textinput_info = { - "title" => "Sample textinput", - "description" => "Search", - "name" => "key", - "link" => @textinput_link, - } - end - - def setup_dublin_core_info - @dc_info = { - "title" => "DC title", - "description" => "DC desc", - "creator" => "DC creator", - "subject" => "DC subject", - "publisher" => "DC publisher", - "contributor" => "DC contributor", - "type" => "DC type", - "format" => "DC format", - "identifier" => "DC identifier", - "source" => "DC source", - "language" => "ja", - "relation" => "DC relation", - "coverage" => "DC coverage", - "rights" => "DC rights", - "date" => Time.now - 60, - } - end - - def setup_syndication_info - @sy_info = { - "updatePeriod" => "hourly", - "updateFrequency" => "2", - "updateBase" => Time.now - 3600, - } - end - - def setup_content_info - @content_info = { - "encoded" => "

p

", - } - end - - def setup_trackback_info - @trackback_info = { - "ping" => "http://example.com/tb.cgi?tb_id=XXX", - "abouts" => [ - "http://example.net/tb.cgi?tb_id=YYY", - "http://example.org/tb.cgi?tb_id=ZZZ", - ] - } - end - - - def setup_full(maker) - setup_xml_declaration(maker) - setup_xml_stylesheets(maker) - setup_channel(maker) - setup_image(maker) - setup_items(maker) - setup_textinput(maker) - end - - def setup_xml_declaration(maker) - %w(version encoding standalone).each do |name| - maker.__send__("#{name}=", instance_eval("@#{name}")) - end - end - - def setup_xml_stylesheets(maker) - @xs_infos.each do |info| - xs = maker.xml_stylesheets.new_xml_stylesheet - info.each do |name, value| - xs.__send__("#{name}=", value) - end - end - end - - def setup_channel(maker) - channel = maker.channel - info = @channel_info - - %w(about title link description language copyright - managingEditor webMaster rating docs date - lastBuildDate generator ttl).each do |name| - channel.__send__("#{name}=", info[name]) - end - - skipDays = channel.skipDays - info["skipDays"].each do |day| - new_day = skipDays.new_day - new_day.content = day - end - - skipHours = channel.skipHours - info["skipHours"].each do |hour| - new_hour = skipHours.new_hour - new_hour.content = hour - end - - cloud = channel.cloud - %w(domain port path registerProcedure protocol).each do |name| - cloud.__send__("#{name}=", info["cloud"][name]) - end - - category = channel.categories.new_category - %w(domain content).each do |name| - category.__send__("#{name}=", info["category"][name]) - end - end - - def setup_image(maker) - image = maker.image - info = @image_info - - %w(title url width height description).each do |name| - image.__send__("#{name}=", info[name]) - end - end - - def setup_items(maker) - items = maker.items - - @item_infos.each do |info| - item = items.new_item - %w(title link description date author comments).each do |name| - item.__send__("#{name}=", info[name]) - end - - guid = item.guid - %w(isPermaLink content).each do |name| - guid.__send__("#{name}=", info["guid"][name]) - end - - enclosure = item.enclosure - %w(url length type).each do |name| - enclosure.__send__("#{name}=", info["enclosure"][name]) - end - - source = item.source - %w(url content).each do |name| - source.__send__("#{name}=", info["source"][name]) - end - - category = item.categories.new_category - %w(domain content).each do |name| - category.__send__("#{name}=", info["category"][name]) - end - - setup_trackback(item) - end - end - - def setup_textinput(maker) - textinput = maker.textinput - info = @textinput_info - - %w(title description name link).each do |name| - textinput.__send__("#{name}=", info[name]) - end - end - - def setup_content(target) - prefix = "content" - %w(encoded).each do |name| - target.__send__("#{prefix}_#{name}=", @content_info[name]) - end - end - - def setup_dublin_core(target) - prefix = "dc" - %w(title description creator subject publisher - contributor type format identifier source language - relation coverage rights).each do |name| - target.__send__("#{prefix}_#{name}=", @dc_info[name]) - end - end - - def setup_syndicate(target) - prefix = "sy" - %w(updatePeriod updateFrequency updateBase).each do |name| - target.__send__("#{prefix}_#{name}=", @sy_info[name]) - end - end - - def setup_trackback(target) - target.trackback_ping = @trackback_info["ping"] - @trackback_info["abouts"].each do |about| - new_about = target.trackback_abouts.new_about - new_about.value = about - end - end - - - def assert_channel10(attrs, channel) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - - names = %w(about title link description) - assert_attributes(attrs, names, channel) - - %w(image items textinput).each do |name| - value = n_attrs[name] - if value - target = channel.__send__(name) - __send__("assert_channel10_#{name}", value, target) - end - end - end - end - - def assert_channel10_image(attrs, image) - _wrap_assertion do - assert_attributes(attrs, %w(resource), image) - end - end - - def assert_channel10_textinput(attrs, textinput) - _wrap_assertion do - assert_attributes(attrs, %w(resource), textinput) - end - end - - def assert_channel10_items(attrs, items) - _wrap_assertion do - assert_equal(items.resources, items.Seq.lis.collect {|x| x.resource}) - items.Seq.lis.each_with_index do |li, i| - assert_attributes(attrs[i], %w(resource), li) - end - end - end - - def assert_image10(attrs, image) - _wrap_assertion do - names = %w(about title url link) - assert_attributes(attrs, names, image) - end - end - - def assert_items10(attrs, items) - _wrap_assertion do - names = %w(about title link description) - items.each_with_index do |item, i| - assert_attributes(attrs[i], names, item) - end - end - end - - def assert_textinput10(attrs, textinput) - _wrap_assertion do - names = %w(about title description name link) - assert_attributes(attrs, names, textinput) - end - end - - - def assert_channel09(attrs, channel) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - - names = %w(title description link language rating - copyright pubDate lastBuildDate docs - managingEditor webMaster) - assert_attributes(attrs, names, channel) - - %w(skipHours skipDays).each do |name| - value = n_attrs[name] - if value - target = channel.__send__(name) - __send__("assert_channel09_#{name}", value, target) - end - end - end - end - - def assert_channel09_skipDays(contents, skipDays) - _wrap_assertion do - days = skipDays.days - contents.each_with_index do |content, i| - assert_equal(content, days[i].content) - end - end - end - - def assert_channel09_skipHours(contents, skipHours) - _wrap_assertion do - hours = skipHours.hours - contents.each_with_index do |content, i| - assert_equal(content.to_i, hours[i].content) - end - end - end - - def assert_image09(attrs, image) - _wrap_assertion do - names = %w(url link title description) - names << ["width", :integer] - names << ["height", :integer] - assert_attributes(attrs, names, image) - end - end - - def assert_items09(attrs, items) - _wrap_assertion do - names = %w(title link description) - items.each_with_index do |item, i| - assert_attributes(attrs[i], names, item) - end - end - end - - def assert_textinput09(attrs, textinput) - _wrap_assertion do - names = %w(title description name link) - assert_attributes(attrs, names, textinput) - end - end - - - def assert_channel20(attrs, channel) - _wrap_assertion do - n_attrs = normalized_attrs(attrs) - - names = %w(title link description language copyright - managingEditor webMaster pubDate - lastBuildDate generator docs rating) - names << ["ttl", :integer] - assert_attributes(attrs, names, channel) - - %w(cloud categories skipHours skipDays).each do |name| - value = n_attrs[name] - if value - target = channel.__send__(name) - __send__("assert_channel20_#{name}", value, target) - end - end - end - end - - def assert_channel20_skipDays(contents, skipDays) - assert_channel09_skipDays(contents, skipDays) - end - - def assert_channel20_skipHours(contents, skipHours) - assert_channel09_skipHours(contents, skipHours) - end - - def assert_channel20_cloud(attrs, cloud) - _wrap_assertion do - names = %w(domain path registerProcedure protocol) - names << ["port", :integer] - assert_attributes(attrs, names, cloud) - end - end - - def assert_channel20_categories(attrs, categories) - _wrap_assertion do - names = %w(domain content) - categories.each_with_index do |category, i| - assert_attributes(attrs[i], names, category) - end - end - end - - def assert_image20(attrs, image) - _wrap_assertion do - names = %w(url link title description) - names << ["width", :integer] - names << ["height", :integer] - assert_attributes(attrs, names, image) - end - end - - def assert_items20(attrs, items) - _wrap_assertion do - names = %w(about title link description) - items.each_with_index do |item, i| - assert_attributes(attrs[i], names, item) - - n_attrs = normalized_attrs(attrs[i]) - - %w(source enclosure categories guid).each do |name| - value = n_attrs[name] - if value - target = item.__send__(name) - __send__("assert_items20_#{name}", value, target) - end - end - end - end - end - - def assert_items20_source(attrs, source) - _wrap_assertion do - assert_attributes(attrs, %w(url content), source) - end - end - - def assert_items20_enclosure(attrs, enclosure) - _wrap_assertion do - names = ["url", ["length", :integer], "type"] - assert_attributes(attrs, names, enclosure) - end - end - - def assert_items20_categories(attrs, categories) - _wrap_assertion do - assert_channel20_categories(attrs, categories) - end - end - - def assert_items20_guid(attrs, guid) - _wrap_assertion do - names = [["isPermaLink", :boolean], ["content"]] - assert_attributes(attrs, names, guid) - end - end - - def assert_textinput20(attrs, textinput) - _wrap_assertion do - names = %w(title description name link) - assert_attributes(attrs, names, textinput) - end - end - end -end diff --git a/test/rss/test_trackback.rb b/test/rss/test_trackback.rb deleted file mode 100644 index 2910b4b344a386..00000000000000 --- a/test/rss/test_trackback.rb +++ /dev/null @@ -1,136 +0,0 @@ -# frozen_string_literal: false -require "cgi" -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/2.0" -require "rss/trackback" - -module RSS - class TestTrackBack < TestCase - - def setup - @prefix = "trackback" - @uri = "http://madskills.com/public/xml/rss/module/trackback/" - - @parents = %w(item) - - @elems = { - :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback", - :about => "http://foo.com/trackback/tb.cgi?tb_id=20020923", - } - - @content_nodes = @elems.collect do |name, value| - "<#{@prefix}:#{name} rdf:resource=\"#{CGI.escapeHTML(value.to_s)}\"/>" - end.join("\n") - - @content_nodes2 = @elems.collect do |name, value| - "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}" - end.join("\n") - - @rss_source = make_RDF(<<-EOR, {@prefix => @uri}) -#{make_channel()} -#{make_image()} -#{make_item(@content_nodes)} -#{make_textinput()} -EOR - - @rss = Parser.parse(@rss_source) - - @rss20_source = make_rss20(nil, {@prefix => @uri}) do - make_channel20(nil) do - make_item20(@content_nodes2) - end - end - - @rss20 = Parser.parse(@rss20_source, false) - end - - def test_parser - - assert_nothing_raised do - Parser.parse(@rss_source) - end - - @elems.find_all{|k, v| k == :ping}.each do |tag, value| - assert_too_much_tag(tag.to_s, "item") do - Parser.parse(make_RDF(<<-EOR, {@prefix => @uri})) -#{make_channel()} -#{make_item(("<" + @prefix + ":" + tag.to_s + " rdf:resource=\"" + - CGI.escapeHTML(value.to_s) + - "\"/>") * 2)} -EOR - end - end - - @elems.find_all{|k, v| k == :about}.each do |tag, value| - assert_missing_tag("trackback:ping", "item") do - Parser.parse(make_RDF(<<-EOR, {@prefix => @uri})) -#{make_channel()} -#{make_item(("<" + @prefix + ":" + tag.to_s + " rdf:resource=\"" + - CGI.escapeHTML(value.to_s) + - "\"/>") * 2)} -EOR - end - - end - - end - - def test_accessor - - new_value = { - :ping => "http://baz.com/trackback/tb.cgi?tb_id=20030808", - :about => "http://hoge.com/trackback/tb.cgi?tb_id=90030808", - } - - @elems.each do |name, value| - @parents.each do |parent| - accessor = "#{RSS::TRACKBACK_PREFIX}_#{name}" - target = @rss.__send__(parent) - target20 = @rss20.channel.__send__(parent, -1) - assert_equal(value, target.__send__(accessor)) - assert_equal(value, target20.__send__(accessor)) - if name == :about - # abount is zero or more - target.__send__("#{accessor}=", 0, new_value[name].to_s) - target20.__send__("#{accessor}=", 0, new_value[name].to_s) - else - target.__send__("#{accessor}=", new_value[name].to_s) - target20.__send__("#{accessor}=", new_value[name].to_s) - end - assert_equal(new_value[name], target.__send__(accessor)) - assert_equal(new_value[name], target20.__send__(accessor)) - end - end - - end - - def test_to_s - - @elems.each do |name, value| - excepted = %Q!<#{@prefix}:#{name} rdf:resource="#{CGI.escapeHTML(value)}"/>! - @parents.each do |parent| - meth = "#{RSS::TRACKBACK_PREFIX}_#{name}_element" - meth << "s" if name == :about - assert_equal(excepted, @rss.__send__(parent).__send__(meth)) - end - end - - REXML::Document.new(@rss_source).root.each_element do |parent| - if @parents.include?(parent.name) - parent.each_element do |elem| - if elem.namespace == @uri - assert_equal(elem.attributes["resource"], @elems[elem.name.intern]) - end - end - end - end - - end - - end -end - diff --git a/test/rss/test_xml-stylesheet.rb b/test/rss/test_xml-stylesheet.rb deleted file mode 100644 index 71be1d8feaa3f4..00000000000000 --- a/test/rss/test_xml-stylesheet.rb +++ /dev/null @@ -1,109 +0,0 @@ -# frozen_string_literal: false -require "rexml/document" - -require_relative "rss-testcase" - -require "rss/1.0" -require "rss/xml-stylesheet" - -module RSS - class TestXMLStyleSheet < TestCase - - def test_accessor - [ - {:href => "a.xsl", :type => "text/xsl"}, - {:media => "print", :title => "FOO"}, - {:charset => "UTF-8", :alternate => "yes"}, - ].each do |attrs| - assert_xml_stylesheet_attrs(attrs, XMLStyleSheet.new(attrs)) - end - end - - def test_to_s - [ - {:href => "a.xsl", :type => "text/xsl"}, - {:type => "text/xsl"}, - {:href => "a.xsl", :guess_type => "text/xsl"}, - {:href => "a.css", :type => "text/css"}, - {:href => "a.css", :type => "text/xsl", - :guess_type => "text/css"}, - {:href => "a.xsl", :type => "text/xsl", - :title => "sample", :media => "printer", - :charset => "UTF-8", :alternate => "yes"}, - {:href => "a.css", :guess_type => "text/css", - :alternate => "no"}, - {:type => "text/xsl", :title => "sample", - :media => "printer", :charset => "UTF-8", - :alternate => "yes"}, - ].each do |attrs| - target, contents = parse_pi(XMLStyleSheet.new(attrs).to_s) - assert_xml_stylesheet(target, attrs, XMLStyleSheet.new(contents)) - end - end - - def test_bad_alternate - %w(a ___ ??? BAD_ALTERNATE).each do |value| - xss = XMLStyleSheet.new - assert_raise(NotAvailableValueError) do - xss.alternate = value - end - xss.do_validate = false - assert_nothing_raised do - xss.alternate = value - end - assert_nil(xss.alternate) - end - end - - def test_parse - [ - [{:href => "a.xsl", :type => "text/xsl"},], - [{:media => "print", :title => "FOO"},], - [{:charset => "UTF-8", :alternate => "yes"},], - [{:href => "a.xsl", :type => "text/xsl"}, - {:type => "text/xsl"}, - {:href => "a.xsl", :guess_type => "text/xsl"}, - {:href => "a.css", :type => "text/css"}, - {:href => "a.css", :type => "text/xsl", - :guess_type => "text/css"}, - {:href => "a.xsl", :type => "text/xsl", - :title => "sample", :media => "printer", - :charset => "UTF-8", :alternate => "yes"}, - {:href => "a.css", :guess_type => "text/css", - :alternate => "no"}, - {:type => "text/xsl", :title => "sample", - :media => "printer", :charset => "UTF-8", - :alternate => "yes"},], - ].each do |xsss| - doc = REXML::Document.new(make_sample_RDF) - root = doc.root - xsss.each do |xss| - content = xss.collect do |key, name| - %Q[#{key}="#{name}"] - end.join(" ") - pi = REXML::Instruction.new("xml-stylesheet", content) - root.previous_sibling = pi - end - rss = Parser.parse(doc.to_s) - have_href_xsss = xsss.find_all {|xss| xss.has_key?(:href)} - assert_equal(have_href_xsss.size, rss.xml_stylesheets.size) - rss.xml_stylesheets.each_with_index do |stylesheet, i| - target, = parse_pi(stylesheet.to_s) - assert_xml_stylesheet(target, have_href_xsss[i], stylesheet) - end - end - end - - def parse_pi(pi) - /\A\s*<\?(\S+)([^?]*\?+(?:[^?>][^?]*\?+)*)>\s*\z/ =~ pi - target = $1 - dummy = REXML::Document.new("").root - contents = {} - dummy.attributes.each do |name, value| - contents[name] = value - end - [target, contents] - end - - end -end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index a4725671942645..38117602acfe70 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -25,7 +25,6 @@ # * https://github.com/ruby/prime # * https://github.com/ruby/matrix # * https://github.com/ruby/ostruct -# * https://github.com/ruby/rss # * https://github.com/ruby/irb # * https://github.com/ruby/tracer # * https://github.com/ruby/forwardable @@ -79,7 +78,6 @@ prime: 'ruby/prime', matrix: 'ruby/matrix', ostruct: 'ruby/ostruct', - rss: 'ruby/rss', irb: 'ruby/irb', tracer: 'ruby/tracer', forwardable: "ruby/forwardable", @@ -129,7 +127,7 @@ def sync_default_gems(gem) cp_r("#{upstream}/rdoc.gemspec", "lib/rdoc") cp_r("#{upstream}/exe/rdoc", "libexec") cp_r("#{upstream}/exe/ri", "libexec") - rm_rf(%w[lib/rdoc/markdown.kpeg lib/rdoc/markdown/literals.kpeg lib/rdoc/rd/block_parser.ry lib/rdoc/rd/inline_parser.ry]) + rm_rf(%w[lib/rdoc/markdown.kpeg lib/rdoc/markdown/literals.kpeg lib/rdoc/rd/block_pager.ry lib/rdoc/rd/inline_parser.ry]) `git checkout lib/rdoc/.document` when "reline" rm_rf(%w[lib/reline* test/reline]) From e61cab3a367c4040a2a487dd893c7be9a37889a9 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 12 Jan 2020 08:14:26 +0900 Subject: [PATCH 364/878] Ignore rexml examples on ruby/spec --- .../library/rexml/attribute/clone_spec.rb | 17 ++-- .../library/rexml/attribute/element_spec.rb | 33 ++++--- .../rexml/attribute/equal_value_spec.rb | 25 ++--- .../ruby/library/rexml/attribute/hash_spec.rb | 21 +++-- .../rexml/attribute/initialize_spec.rb | 45 ++++----- .../library/rexml/attribute/inspect_spec.rb | 29 +++--- .../library/rexml/attribute/namespace_spec.rb | 39 ++++---- .../library/rexml/attribute/node_type_spec.rb | 15 +-- .../library/rexml/attribute/prefix_spec.rb | 25 ++--- .../library/rexml/attribute/remove_spec.rb | 31 ++++--- .../ruby/library/rexml/attribute/to_s_spec.rb | 21 +++-- .../library/rexml/attribute/to_string_spec.rb | 21 +++-- .../library/rexml/attribute/value_spec.rb | 21 +++-- .../library/rexml/attribute/write_spec.rb | 35 +++---- .../library/rexml/attribute/xpath_spec.rb | 27 +++--- .../ruby/library/rexml/attributes/add_spec.rb | 11 ++- .../library/rexml/attributes/append_spec.rb | 11 ++- .../rexml/attributes/delete_all_spec.rb | 51 ++++++----- .../library/rexml/attributes/delete_spec.rb | 43 +++++---- .../rexml/attributes/each_attribute_spec.rb | 33 ++++--- .../library/rexml/attributes/each_spec.rb | 37 ++++---- .../attributes/element_reference_spec.rb | 27 +++--- .../rexml/attributes/element_set_spec.rb | 39 ++++---- .../rexml/attributes/get_attribute_ns_spec.rb | 23 +++-- .../rexml/attributes/get_attribute_spec.rb | 45 ++++----- .../rexml/attributes/initialize_spec.rb | 27 +++--- .../library/rexml/attributes/length_spec.rb | 11 ++- .../rexml/attributes/namespaces_spec.rb | 9 +- .../library/rexml/attributes/prefixes_spec.rb | 37 ++++---- .../library/rexml/attributes/size_spec.rb | 11 ++- .../library/rexml/attributes/to_a_spec.rb | 27 +++--- spec/ruby/library/rexml/cdata/clone_spec.rb | 15 +-- .../library/rexml/cdata/initialize_spec.rb | 37 ++++---- spec/ruby/library/rexml/cdata/to_s_spec.rb | 11 ++- spec/ruby/library/rexml/cdata/value_spec.rb | 11 ++- .../rexml/document/add_element_spec.rb | 51 ++++++----- spec/ruby/library/rexml/document/add_spec.rb | 89 +++++++++--------- .../ruby/library/rexml/document/clone_spec.rb | 33 ++++--- .../library/rexml/document/doctype_spec.rb | 23 +++-- .../library/rexml/document/encoding_spec.rb | 33 ++++--- .../rexml/document/expanded_name_spec.rb | 23 +++-- spec/ruby/library/rexml/document/new_spec.rb | 55 +++++------ .../library/rexml/document/node_type_spec.rb | 11 ++- spec/ruby/library/rexml/document/root_spec.rb | 17 ++-- .../rexml/document/stand_alone_spec.rb | 31 ++++--- .../library/rexml/document/version_spec.rb | 21 +++-- .../ruby/library/rexml/document/write_spec.rb | 57 ++++++------ .../library/rexml/document/xml_decl_spec.rb | 23 +++-- .../rexml/element/add_attribute_spec.rb | 65 ++++++------- .../rexml/element/add_attributes_spec.rb | 35 +++---- .../library/rexml/element/add_element_spec.rb | 62 +++++++------ .../rexml/element/add_namespace_spec.rb | 35 +++---- .../library/rexml/element/add_text_spec.rb | 37 ++++---- .../library/rexml/element/attribute_spec.rb | 27 +++--- .../library/rexml/element/attributes_spec.rb | 27 +++--- .../ruby/library/rexml/element/cdatas_spec.rb | 37 ++++---- spec/ruby/library/rexml/element/clone_spec.rb | 47 +++++----- .../library/rexml/element/comments_spec.rb | 31 ++++--- .../rexml/element/delete_attribute_spec.rb | 62 +++++++------ .../rexml/element/delete_element_spec.rb | 81 +++++++++-------- .../rexml/element/delete_namespace_spec.rb | 37 ++++---- .../library/rexml/element/document_spec.rb | 23 +++-- .../each_element_with_attribute_spec.rb | 57 ++++++------ .../element/each_element_with_text_spec.rb | 49 +++++----- .../rexml/element/element_reference_spec.rb | 29 +++--- .../library/rexml/element/get_text_spec.rb | 27 +++--- .../rexml/element/has_attributes_spec.rb | 25 ++--- .../rexml/element/has_elements_spec.rb | 27 +++--- .../library/rexml/element/has_text_spec.rb | 23 +++-- .../library/rexml/element/inspect_spec.rb | 41 +++++---- .../rexml/element/instructions_spec.rb | 33 ++++--- .../library/rexml/element/namespace_spec.rb | 41 +++++---- .../library/rexml/element/namespaces_spec.rb | 51 ++++++----- spec/ruby/library/rexml/element/new_spec.rb | 55 +++++------ .../rexml/element/next_element_spec.rb | 31 ++++--- .../library/rexml/element/node_type_spec.rb | 11 ++- .../library/rexml/element/prefixes_spec.rb | 35 +++---- .../rexml/element/previous_element_spec.rb | 31 ++++--- spec/ruby/library/rexml/element/raw_spec.rb | 35 +++---- spec/ruby/library/rexml/element/root_spec.rb | 43 +++++---- spec/ruby/library/rexml/element/text_spec.rb | 87 +++++++++--------- spec/ruby/library/rexml/element/texts_spec.rb | 23 +++-- .../library/rexml/element/whitespace_spec.rb | 33 ++++--- .../library/rexml/node/each_recursive_spec.rb | 35 +++---- .../rexml/node/find_first_recursive_spec.rb | 41 +++++---- .../rexml/node/index_in_parent_spec.rb | 23 +++-- .../rexml/node/next_sibling_node_spec.rb | 33 ++++--- spec/ruby/library/rexml/node/parent_spec.rb | 31 ++++--- .../rexml/node/previous_sibling_node_spec.rb | 33 ++++--- spec/ruby/library/rexml/text/append_spec.rb | 15 +-- spec/ruby/library/rexml/text/clone_spec.rb | 15 +-- .../library/rexml/text/comparison_spec.rb | 39 ++++---- spec/ruby/library/rexml/text/empty_spec.rb | 17 ++-- .../library/rexml/text/indent_text_spec.rb | 35 +++---- spec/ruby/library/rexml/text/inspect_spec.rb | 11 ++- spec/ruby/library/rexml/text/new_spec.rb | 91 ++++++++++--------- .../ruby/library/rexml/text/node_type_spec.rb | 11 ++- .../ruby/library/rexml/text/normalize_spec.rb | 11 ++- .../rexml/text/read_with_substitution_spec.rb | 17 ++-- spec/ruby/library/rexml/text/to_s_spec.rb | 25 ++--- .../library/rexml/text/unnormalize_spec.rb | 11 ++- spec/ruby/library/rexml/text/value_spec.rb | 55 +++++------ spec/ruby/library/rexml/text/wrap_spec.rb | 29 +++--- .../text/write_with_substitution_spec.rb | 53 ++++++----- 104 files changed, 1862 insertions(+), 1550 deletions(-) diff --git a/spec/ruby/library/rexml/attribute/clone_spec.rb b/spec/ruby/library/rexml/attribute/clone_spec.rb index 9a4a4079e16bd8..44c8ddebcc29bd 100644 --- a/spec/ruby/library/rexml/attribute/clone_spec.rb +++ b/spec/ruby/library/rexml/attribute/clone_spec.rb @@ -1,11 +1,14 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#clone" do - it "returns a copy of this Attribute" do - orig = REXML::Attribute.new("name", "value&&") - orig.should == orig.clone - orig.clone.to_s.should == orig.to_s - orig.clone.to_string.should == orig.to_string +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attribute#clone" do + it "returns a copy of this Attribute" do + orig = REXML::Attribute.new("name", "value&&") + orig.should == orig.clone + orig.clone.to_s.should == orig.to_s + orig.clone.to_string.should == orig.to_string + end end end diff --git a/spec/ruby/library/rexml/attribute/element_spec.rb b/spec/ruby/library/rexml/attribute/element_spec.rb index 832e7e9a4185a6..4fc4d9ed585114 100644 --- a/spec/ruby/library/rexml/attribute/element_spec.rb +++ b/spec/ruby/library/rexml/attribute/element_spec.rb @@ -1,23 +1,26 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#element" do - it "returns the parent element" do - e = REXML::Element.new "root" +ruby_version_is ''...'2.8' do + require 'rexml/document' - REXML::Attribute.new("name", "value", e).element.should == e - REXML::Attribute.new("name", "default_constructor").element.should == nil + describe "REXML::Attribute#element" do + it "returns the parent element" do + e = REXML::Element.new "root" + + REXML::Attribute.new("name", "value", e).element.should == e + REXML::Attribute.new("name", "default_constructor").element.should == nil + end end -end -describe "REXML::Attribute#element=" do - it "sets the parent element" do - e = REXML::Element.new "root" - f = REXML::Element.new "temp" - a = REXML::Attribute.new("name", "value", e) - a.element.should == e + describe "REXML::Attribute#element=" do + it "sets the parent element" do + e = REXML::Element.new "root" + f = REXML::Element.new "temp" + a = REXML::Attribute.new("name", "value", e) + a.element.should == e - a.element = f - a.element.should == f + a.element = f + a.element.should == f + end end end diff --git a/spec/ruby/library/rexml/attribute/equal_value_spec.rb b/spec/ruby/library/rexml/attribute/equal_value_spec.rb index 8bf2c0a3a19fd5..a51e1cc3900f15 100644 --- a/spec/ruby/library/rexml/attribute/equal_value_spec.rb +++ b/spec/ruby/library/rexml/attribute/equal_value_spec.rb @@ -1,18 +1,21 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#==" do - it "returns true if other has equal name and value" do - a1 = REXML::Attribute.new("foo", "bar") - a1.should == a1.clone +ruby_version_is ''...'2.8' do + require 'rexml/document' - a2 = REXML::Attribute.new("foo", "bar") - a1.should == a2 + describe "REXML::Attribute#==" do + it "returns true if other has equal name and value" do + a1 = REXML::Attribute.new("foo", "bar") + a1.should == a1.clone - a3 = REXML::Attribute.new("foo", "bla") - a1.should_not == a3 + a2 = REXML::Attribute.new("foo", "bar") + a1.should == a2 - a4 = REXML::Attribute.new("baz", "bar") - a1.should_not == a4 + a3 = REXML::Attribute.new("foo", "bla") + a1.should_not == a3 + + a4 = REXML::Attribute.new("baz", "bar") + a1.should_not == a4 + end end end diff --git a/spec/ruby/library/rexml/attribute/hash_spec.rb b/spec/ruby/library/rexml/attribute/hash_spec.rb index dd71b281082952..544cb395158380 100644 --- a/spec/ruby/library/rexml/attribute/hash_spec.rb +++ b/spec/ruby/library/rexml/attribute/hash_spec.rb @@ -1,13 +1,16 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#hash" do - # These are not really complete, any idea on how to make them more - # "testable" will be appreciated. - it "returns a hashcode made of the name and value of self" do - a = REXML::Attribute.new("name", "value") - a.hash.should be_kind_of(Numeric) - b = REXML::Attribute.new(a) - a.hash.should == b.hash +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attribute#hash" do + # These are not really complete, any idea on how to make them more + # "testable" will be appreciated. + it "returns a hashcode made of the name and value of self" do + a = REXML::Attribute.new("name", "value") + a.hash.should be_kind_of(Numeric) + b = REXML::Attribute.new(a) + a.hash.should == b.hash + end end end diff --git a/spec/ruby/library/rexml/attribute/initialize_spec.rb b/spec/ruby/library/rexml/attribute/initialize_spec.rb index 9f5e30c517cf03..84c17d8b7c8b03 100644 --- a/spec/ruby/library/rexml/attribute/initialize_spec.rb +++ b/spec/ruby/library/rexml/attribute/initialize_spec.rb @@ -1,29 +1,32 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#initialize" do - before :each do - @e = REXML::Element.new "root" - @name = REXML::Attribute.new("name", "Nicko") - @e.add_attribute @name - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "receives two strings for name and value" do - @e.attributes["name"].should == "Nicko" - @e.add_attribute REXML::Attribute.new("last_name", nil) - @e.attributes["last_name"].should == "" - end + describe "REXML::Attribute#initialize" do + before :each do + @e = REXML::Element.new "root" + @name = REXML::Attribute.new("name", "Nicko") + @e.add_attribute @name + end - it "receives an Attribute and clones it" do - copy = REXML::Attribute.new(@name) - copy.should == @name - end + it "receives two strings for name and value" do + @e.attributes["name"].should == "Nicko" + @e.add_attribute REXML::Attribute.new("last_name", nil) + @e.attributes["last_name"].should == "" + end + + it "receives an Attribute and clones it" do + copy = REXML::Attribute.new(@name) + copy.should == @name + end - it "receives a parent node" do - last_name = REXML::Attribute.new("last_name", "McBrain", @e) - last_name.element.should == @e + it "receives a parent node" do + last_name = REXML::Attribute.new("last_name", "McBrain", @e) + last_name.element.should == @e - last_name = REXML::Attribute.new(@name, @e) - last_name.element.should == @e + last_name = REXML::Attribute.new(@name, @e) + last_name.element.should == @e + end end end diff --git a/spec/ruby/library/rexml/attribute/inspect_spec.rb b/spec/ruby/library/rexml/attribute/inspect_spec.rb index 632b477cca4d2e..ffacf78de88e85 100644 --- a/spec/ruby/library/rexml/attribute/inspect_spec.rb +++ b/spec/ruby/library/rexml/attribute/inspect_spec.rb @@ -1,19 +1,22 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#inspect" do - it "returns the name and value as a string" do - a = REXML::Attribute.new("my_name", "my_value") - a.inspect.should == "my_name='my_value'" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "accepts attributes with no value" do - a = REXML::Attribute.new("my_name") - a.inspect.should == "my_name=''" - end + describe "REXML::Attribute#inspect" do + it "returns the name and value as a string" do + a = REXML::Attribute.new("my_name", "my_value") + a.inspect.should == "my_name='my_value'" + end + + it "accepts attributes with no value" do + a = REXML::Attribute.new("my_name") + a.inspect.should == "my_name=''" + end - it "does not escape text" do - a = REXML::Attribute.new("name", "<>") - a.inspect.should == "name='<>'" + it "does not escape text" do + a = REXML::Attribute.new("name", "<>") + a.inspect.should == "name='<>'" + end end end diff --git a/spec/ruby/library/rexml/attribute/namespace_spec.rb b/spec/ruby/library/rexml/attribute/namespace_spec.rb index 9d50770735ad59..9b0ff1e9c2734b 100644 --- a/spec/ruby/library/rexml/attribute/namespace_spec.rb +++ b/spec/ruby/library/rexml/attribute/namespace_spec.rb @@ -1,24 +1,27 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#namespace" do - it "returns the namespace url" do - e = REXML::Element.new("root") - e.add_attribute REXML::Attribute.new("xmlns:ns", "http://some_uri") - e.namespace("ns").should == "http://some_uri" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns nil if namespace is not defined" do - e = REXML::Element.new("root") - e.add_attribute REXML::Attribute.new("test", "value") - e.namespace("test").should == nil - e.namespace("ns").should == nil - end + describe "REXML::Attribute#namespace" do + it "returns the namespace url" do + e = REXML::Element.new("root") + e.add_attribute REXML::Attribute.new("xmlns:ns", "http://some_uri") + e.namespace("ns").should == "http://some_uri" + end + + it "returns nil if namespace is not defined" do + e = REXML::Element.new("root") + e.add_attribute REXML::Attribute.new("test", "value") + e.namespace("test").should == nil + e.namespace("ns").should == nil + end - it "defaults arg to nil" do - e = REXML::Element.new("root") - e.add_attribute REXML::Attribute.new("xmlns:ns", "http://some_uri") - e.namespace.should == "" - e.namespace("ns").should == "http://some_uri" + it "defaults arg to nil" do + e = REXML::Element.new("root") + e.add_attribute REXML::Attribute.new("xmlns:ns", "http://some_uri") + e.namespace.should == "" + e.namespace("ns").should == "http://some_uri" + end end end diff --git a/spec/ruby/library/rexml/attribute/node_type_spec.rb b/spec/ruby/library/rexml/attribute/node_type_spec.rb index 664d7cfa03bef1..f2ba0af8399c14 100644 --- a/spec/ruby/library/rexml/attribute/node_type_spec.rb +++ b/spec/ruby/library/rexml/attribute/node_type_spec.rb @@ -1,10 +1,13 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#node_type" do - it "always returns :attribute" do - attr = REXML::Attribute.new("foo", "bar") - attr.node_type.should == :attribute - REXML::Attribute.new(attr).node_type.should == :attribute +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attribute#node_type" do + it "always returns :attribute" do + attr = REXML::Attribute.new("foo", "bar") + attr.node_type.should == :attribute + REXML::Attribute.new(attr).node_type.should == :attribute + end end end diff --git a/spec/ruby/library/rexml/attribute/prefix_spec.rb b/spec/ruby/library/rexml/attribute/prefix_spec.rb index 2a47f74ad18e86..0eee50de3355a8 100644 --- a/spec/ruby/library/rexml/attribute/prefix_spec.rb +++ b/spec/ruby/library/rexml/attribute/prefix_spec.rb @@ -1,18 +1,21 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#prefix" do - it "returns the namespace of the Attribute" do - ans = REXML::Attribute.new("ns:someattr", "some_value") - out = REXML::Attribute.new("out:something", "some_other_value") +ruby_version_is ''...'2.8' do + require 'rexml/document' - ans.prefix.should == "ns" - out.prefix.should == "out" - end + describe "REXML::Attribute#prefix" do + it "returns the namespace of the Attribute" do + ans = REXML::Attribute.new("ns:someattr", "some_value") + out = REXML::Attribute.new("out:something", "some_other_value") + + ans.prefix.should == "ns" + out.prefix.should == "out" + end - it "returns an empty string for Attributes with no prefixes" do - attr = REXML::Attribute.new("foo", "bar") + it "returns an empty string for Attributes with no prefixes" do + attr = REXML::Attribute.new("foo", "bar") - attr.prefix.should == "" + attr.prefix.should == "" + end end end diff --git a/spec/ruby/library/rexml/attribute/remove_spec.rb b/spec/ruby/library/rexml/attribute/remove_spec.rb index 08d22cb6bab98c..c7a9904eb843ec 100644 --- a/spec/ruby/library/rexml/attribute/remove_spec.rb +++ b/spec/ruby/library/rexml/attribute/remove_spec.rb @@ -1,20 +1,23 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#remove" do - before :each do - @e = REXML::Element.new "Root" - @attr = REXML::Attribute.new("foo", "bar") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "deletes this Attribute from parent" do - @e.add_attribute(@attr) - @e.attributes["foo"].should_not == nil - @attr.remove - @e.attributes["foo"].should == nil - end + describe "REXML::Attribute#remove" do + before :each do + @e = REXML::Element.new "Root" + @attr = REXML::Attribute.new("foo", "bar") + end + + it "deletes this Attribute from parent" do + @e.add_attribute(@attr) + @e.attributes["foo"].should_not == nil + @attr.remove + @e.attributes["foo"].should == nil + end - it "does not anything if element has no parent" do - -> {@attr.remove}.should_not raise_error(Exception) + it "does not anything if element has no parent" do + -> {@attr.remove}.should_not raise_error(Exception) + end end end diff --git a/spec/ruby/library/rexml/attribute/to_s_spec.rb b/spec/ruby/library/rexml/attribute/to_s_spec.rb index e1ce48ec330ed2..00e7e96648c742 100644 --- a/spec/ruby/library/rexml/attribute/to_s_spec.rb +++ b/spec/ruby/library/rexml/attribute/to_s_spec.rb @@ -1,14 +1,17 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#to_s" do - it "returns the value of the Attribute" do - REXML::Attribute.new("name", "some_value").to_s.should == "some_value" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attribute#to_s" do + it "returns the value of the Attribute" do + REXML::Attribute.new("name", "some_value").to_s.should == "some_value" + end - it "returns the escaped value if it was created from Attribute" do - orig = REXML::Attribute.new("name", "<&>") - copy = REXML::Attribute.new(orig) - copy.to_s.should == "<&>" + it "returns the escaped value if it was created from Attribute" do + orig = REXML::Attribute.new("name", "<&>") + copy = REXML::Attribute.new(orig) + copy.to_s.should == "<&>" + end end end diff --git a/spec/ruby/library/rexml/attribute/to_string_spec.rb b/spec/ruby/library/rexml/attribute/to_string_spec.rb index 420913afeb82fb..f26c5b85f0bd04 100644 --- a/spec/ruby/library/rexml/attribute/to_string_spec.rb +++ b/spec/ruby/library/rexml/attribute/to_string_spec.rb @@ -1,14 +1,17 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#to_string" do - it "returns the attribute as XML" do - attr = REXML::Attribute.new("name", "value") - attr_empty = REXML::Attribute.new("name") - attr_ns = REXML::Attribute.new("xmlns:ns", "http://uri") +ruby_version_is ''...'2.8' do + require 'rexml/document' - attr.to_string.should == "name='value'" - attr_empty.to_string.should == "name=''" - attr_ns.to_string.should == "xmlns:ns='http://uri'" + describe "REXML::Attribute#to_string" do + it "returns the attribute as XML" do + attr = REXML::Attribute.new("name", "value") + attr_empty = REXML::Attribute.new("name") + attr_ns = REXML::Attribute.new("xmlns:ns", "http://uri") + + attr.to_string.should == "name='value'" + attr_empty.to_string.should == "name=''" + attr_ns.to_string.should == "xmlns:ns='http://uri'" + end end end diff --git a/spec/ruby/library/rexml/attribute/value_spec.rb b/spec/ruby/library/rexml/attribute/value_spec.rb index 7763976881595e..cf6d1deef4e35a 100644 --- a/spec/ruby/library/rexml/attribute/value_spec.rb +++ b/spec/ruby/library/rexml/attribute/value_spec.rb @@ -1,14 +1,17 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#value" do - it "returns the value of the Attribute unnormalized" do - attr = REXML::Attribute.new("name", "value") - attr_ents = REXML::Attribute.new("name", "<&>") - attr_empty = REXML::Attribute.new("name") +ruby_version_is ''...'2.8' do + require 'rexml/document' - attr.value.should == "value" - attr_ents.value.should == "<&>" - attr_empty.value.should == "" + describe "REXML::Attribute#value" do + it "returns the value of the Attribute unnormalized" do + attr = REXML::Attribute.new("name", "value") + attr_ents = REXML::Attribute.new("name", "<&>") + attr_empty = REXML::Attribute.new("name") + + attr.value.should == "value" + attr_ents.value.should == "<&>" + attr_empty.value.should == "" + end end end diff --git a/spec/ruby/library/rexml/attribute/write_spec.rb b/spec/ruby/library/rexml/attribute/write_spec.rb index 7ada7460f93d8a..f69689e724e01e 100644 --- a/spec/ruby/library/rexml/attribute/write_spec.rb +++ b/spec/ruby/library/rexml/attribute/write_spec.rb @@ -1,23 +1,26 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#write" do - before :each do - @attr = REXML::Attribute.new("name", "Charlotte") - @s = "" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "writes the name and value to output" do - @attr.write(@s) - @s.should == "name='Charlotte'" - end + describe "REXML::Attribute#write" do + before :each do + @attr = REXML::Attribute.new("name", "Charlotte") + @s = "" + end + + it "writes the name and value to output" do + @attr.write(@s) + @s.should == "name='Charlotte'" + end - it "currently ignores the second argument" do - @attr.write(@s, 3) - @s.should == "name='Charlotte'" + it "currently ignores the second argument" do + @attr.write(@s, 3) + @s.should == "name='Charlotte'" - @s = "" - @attr.write(@s, "foo") - @s.should == "name='Charlotte'" + @s = "" + @attr.write(@s, "foo") + @s.should == "name='Charlotte'" + end end end diff --git a/spec/ruby/library/rexml/attribute/xpath_spec.rb b/spec/ruby/library/rexml/attribute/xpath_spec.rb index 8335e0a8ef25e3..945e76280fe4cc 100644 --- a/spec/ruby/library/rexml/attribute/xpath_spec.rb +++ b/spec/ruby/library/rexml/attribute/xpath_spec.rb @@ -1,19 +1,22 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attribute#xpath" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - before :each do - @e = REXML::Element.new "root" - @attr = REXML::Attribute.new("year", "1989") - end + describe "REXML::Attribute#xpath" do - it "returns the path for Attribute" do - @e.add_attribute @attr - @attr.xpath.should == "root/@year" - end + before :each do + @e = REXML::Element.new "root" + @attr = REXML::Attribute.new("year", "1989") + end + + it "returns the path for Attribute" do + @e.add_attribute @attr + @attr.xpath.should == "root/@year" + end - it "raises an error if attribute has no parent" do - -> { @attr.xpath }.should raise_error(Exception) + it "raises an error if attribute has no parent" do + -> { @attr.xpath }.should raise_error(Exception) + end end end diff --git a/spec/ruby/library/rexml/attributes/add_spec.rb b/spec/ruby/library/rexml/attributes/add_spec.rb index 32a927e10b2536..fd23bd458c66fa 100644 --- a/spec/ruby/library/rexml/attributes/add_spec.rb +++ b/spec/ruby/library/rexml/attributes/add_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/add' -require 'rexml/document' -describe "REXML::Attributes#add" do - it_behaves_like :rexml_attribute_add, :add +ruby_version_is ''...'2.8' do + require_relative 'shared/add' + require 'rexml/document' + + describe "REXML::Attributes#add" do + it_behaves_like :rexml_attribute_add, :add + end end diff --git a/spec/ruby/library/rexml/attributes/append_spec.rb b/spec/ruby/library/rexml/attributes/append_spec.rb index f1b08f7d6adff4..99585979f2c435 100644 --- a/spec/ruby/library/rexml/attributes/append_spec.rb +++ b/spec/ruby/library/rexml/attributes/append_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/add' -require 'rexml/document' -describe "REXML::Attributes#<<" do - it_behaves_like :rexml_attribute_add, :<< +ruby_version_is ''...'2.8' do + require_relative 'shared/add' + require 'rexml/document' + + describe "REXML::Attributes#<<" do + it_behaves_like :rexml_attribute_add, :<< + end end diff --git a/spec/ruby/library/rexml/attributes/delete_all_spec.rb b/spec/ruby/library/rexml/attributes/delete_all_spec.rb index 9340b5693b01af..f5e6a897c54cb1 100644 --- a/spec/ruby/library/rexml/attributes/delete_all_spec.rb +++ b/spec/ruby/library/rexml/attributes/delete_all_spec.rb @@ -1,31 +1,34 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#delete_all" do - before :each do - @e = REXML::Element.new("root") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "deletes all attributes that match name" do - uri = REXML::Attribute.new("uri", "http://something") - @e.attributes << uri - @e.attributes.delete_all("uri") - @e.attributes.should be_empty - @e.attributes["uri"].should == nil - end + describe "REXML::Attributes#delete_all" do + before :each do + @e = REXML::Element.new("root") + end - it "deletes all attributes that match name with a namespace" do - ns_uri = REXML::Attribute.new("xmlns:uri", "http://something_here_too") - @e.attributes << ns_uri - @e.attributes.delete_all("xmlns:uri") - @e.attributes.should be_empty - @e.attributes["xmlns:uri"].should == nil - end + it "deletes all attributes that match name" do + uri = REXML::Attribute.new("uri", "http://something") + @e.attributes << uri + @e.attributes.delete_all("uri") + @e.attributes.should be_empty + @e.attributes["uri"].should == nil + end + + it "deletes all attributes that match name with a namespace" do + ns_uri = REXML::Attribute.new("xmlns:uri", "http://something_here_too") + @e.attributes << ns_uri + @e.attributes.delete_all("xmlns:uri") + @e.attributes.should be_empty + @e.attributes["xmlns:uri"].should == nil + end - it "returns the removed attribute" do - uri = REXML::Attribute.new("uri", "http://something_here_too") - @e.attributes << uri - attrs = @e.attributes.delete_all("uri") - attrs.first.should == uri + it "returns the removed attribute" do + uri = REXML::Attribute.new("uri", "http://something_here_too") + @e.attributes << uri + attrs = @e.attributes.delete_all("uri") + attrs.first.should == uri + end end end diff --git a/spec/ruby/library/rexml/attributes/delete_spec.rb b/spec/ruby/library/rexml/attributes/delete_spec.rb index 495e4085ef0b82..59641e55db3d80 100644 --- a/spec/ruby/library/rexml/attributes/delete_spec.rb +++ b/spec/ruby/library/rexml/attributes/delete_spec.rb @@ -1,27 +1,30 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#delete" do - before :each do - @e = REXML::Element.new("root") - @name = REXML::Attribute.new("name", "Pepe") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "takes an attribute name and deletes the attribute" do - @e.attributes.delete("name") - @e.attributes["name"].should be_nil - @e.attributes.should be_empty - end + describe "REXML::Attributes#delete" do + before :each do + @e = REXML::Element.new("root") + @name = REXML::Attribute.new("name", "Pepe") + end - it "takes an Attribute and deletes it" do - @e.attributes.delete(@name) - @e.attributes["name"].should be_nil - @e.attributes.should be_empty - end + it "takes an attribute name and deletes the attribute" do + @e.attributes.delete("name") + @e.attributes["name"].should be_nil + @e.attributes.should be_empty + end + + it "takes an Attribute and deletes it" do + @e.attributes.delete(@name) + @e.attributes["name"].should be_nil + @e.attributes.should be_empty + end - it "returns the element with the attribute removed" do - ret_val = @e.attributes.delete(@name) - ret_val.should == @e - ret_val.attributes.should be_empty + it "returns the element with the attribute removed" do + ret_val = @e.attributes.delete(@name) + ret_val.should == @e + ret_val.attributes.should be_empty + end end end diff --git a/spec/ruby/library/rexml/attributes/each_attribute_spec.rb b/spec/ruby/library/rexml/attributes/each_attribute_spec.rb index e84c8dbf51a8e1..1e6b5c1c1f9b5d 100644 --- a/spec/ruby/library/rexml/attributes/each_attribute_spec.rb +++ b/spec/ruby/library/rexml/attributes/each_attribute_spec.rb @@ -1,22 +1,25 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#each_attribute" do - it "iterates over the attributes yielding actual Attribute objects" do - e = REXML::Element.new("root") - name = REXML::Attribute.new("name", "Joe") - ns_uri = REXML::Attribute.new("xmlns:ns", "http://some_uri") - e.add_attribute name - e.add_attribute ns_uri +ruby_version_is ''...'2.8' do + require 'rexml/document' - attributes = [] + describe "REXML::Attributes#each_attribute" do + it "iterates over the attributes yielding actual Attribute objects" do + e = REXML::Element.new("root") + name = REXML::Attribute.new("name", "Joe") + ns_uri = REXML::Attribute.new("xmlns:ns", "http://some_uri") + e.add_attribute name + e.add_attribute ns_uri - e.attributes.each_attribute do |attr| - attributes << attr - end + attributes = [] + + e.attributes.each_attribute do |attr| + attributes << attr + end - attributes = attributes.sort_by {|a| a.name } - attributes.first.should == name - attributes.last.should == ns_uri + attributes = attributes.sort_by {|a| a.name } + attributes.first.should == name + attributes.last.should == ns_uri + end end end diff --git a/spec/ruby/library/rexml/attributes/each_spec.rb b/spec/ruby/library/rexml/attributes/each_spec.rb index ed60634b90d669..4865114cf147a3 100644 --- a/spec/ruby/library/rexml/attributes/each_spec.rb +++ b/spec/ruby/library/rexml/attributes/each_spec.rb @@ -1,23 +1,26 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#each" do - before :each do - @e = REXML::Element.new("root") - @name = REXML::Attribute.new("name", "Joe") - @ns_uri = REXML::Attribute.new("xmlns:ns", "http://some_uri") - @e.add_attribute @name - @e.add_attribute @ns_uri - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attributes#each" do + before :each do + @e = REXML::Element.new("root") + @name = REXML::Attribute.new("name", "Joe") + @ns_uri = REXML::Attribute.new("xmlns:ns", "http://some_uri") + @e.add_attribute @name + @e.add_attribute @ns_uri + end - it "iterates over the attributes yielding expanded-name/value" do - attributes = [] - @e.attributes.each do |attr| - attr.should be_kind_of(Array) - attributes << attr + it "iterates over the attributes yielding expanded-name/value" do + attributes = [] + @e.attributes.each do |attr| + attr.should be_kind_of(Array) + attributes << attr + end + attributes = attributes.sort_by {|a| a.first } + attributes.first.should == ["name", "Joe"] + attributes.last.should == ["xmlns:ns", "http://some_uri"] end - attributes = attributes.sort_by {|a| a.first } - attributes.first.should == ["name", "Joe"] - attributes.last.should == ["xmlns:ns", "http://some_uri"] end end diff --git a/spec/ruby/library/rexml/attributes/element_reference_spec.rb b/spec/ruby/library/rexml/attributes/element_reference_spec.rb index dac79526695214..86e0c57fc902e5 100644 --- a/spec/ruby/library/rexml/attributes/element_reference_spec.rb +++ b/spec/ruby/library/rexml/attributes/element_reference_spec.rb @@ -1,18 +1,21 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#[]" do - before :each do - @e = REXML::Element.new("root") - @lang = REXML::Attribute.new("language", "english") - @e.attributes << @lang - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the value of an attribute" do - @e.attributes["language"].should == "english" - end + describe "REXML::Attributes#[]" do + before :each do + @e = REXML::Element.new("root") + @lang = REXML::Attribute.new("language", "english") + @e.attributes << @lang + end + + it "returns the value of an attribute" do + @e.attributes["language"].should == "english" + end - it "returns nil if the attribute does not exist" do - @e.attributes["chunky bacon"].should == nil + it "returns nil if the attribute does not exist" do + @e.attributes["chunky bacon"].should == nil + end end end diff --git a/spec/ruby/library/rexml/attributes/element_set_spec.rb b/spec/ruby/library/rexml/attributes/element_set_spec.rb index 1ed94dd2a1002e..90096be82ce948 100644 --- a/spec/ruby/library/rexml/attributes/element_set_spec.rb +++ b/spec/ruby/library/rexml/attributes/element_set_spec.rb @@ -1,25 +1,28 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#[]=" do - before :each do - @e = REXML::Element.new("song") - @name = REXML::Attribute.new("name", "Holy Smoke!") - @e.attributes << @name - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "sets an attribute" do - @e.attributes["author"] = "_why's foxes" - @e.attributes["author"].should == "_why's foxes" - end + describe "REXML::Attributes#[]=" do + before :each do + @e = REXML::Element.new("song") + @name = REXML::Attribute.new("name", "Holy Smoke!") + @e.attributes << @name + end - it "overwrites an existing attribute" do - @e.attributes["name"] = "Chunky Bacon" - @e.attributes["name"].should == "Chunky Bacon" - end + it "sets an attribute" do + @e.attributes["author"] = "_why's foxes" + @e.attributes["author"].should == "_why's foxes" + end + + it "overwrites an existing attribute" do + @e.attributes["name"] = "Chunky Bacon" + @e.attributes["name"].should == "Chunky Bacon" + end - it "deletes an attribute is value is nil" do - @e.attributes["name"] = nil - @e.attributes.length.should == 0 + it "deletes an attribute is value is nil" do + @e.attributes["name"] = nil + @e.attributes.length.should == 0 + end end end diff --git a/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb b/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb index 1664d6e42a87fc..56ed733d37b525 100644 --- a/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb +++ b/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb @@ -1,14 +1,17 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#get_attribute_ns" do - it "returns an attribute by name and namespace" do - e = REXML::Element.new("root") - attr = REXML::Attribute.new("xmlns:ns", "http://some_url") - e.attributes << attr - attr.prefix.should == "xmlns" - # This might be a bug in Attribute, commenting until those specs - # are ready - # e.attributes.get_attribute_ns(attr.prefix, "name").should == "http://some_url" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attributes#get_attribute_ns" do + it "returns an attribute by name and namespace" do + e = REXML::Element.new("root") + attr = REXML::Attribute.new("xmlns:ns", "http://some_url") + e.attributes << attr + attr.prefix.should == "xmlns" + # This might be a bug in Attribute, commenting until those specs + # are ready + # e.attributes.get_attribute_ns(attr.prefix, "name").should == "http://some_url" + end end end diff --git a/spec/ruby/library/rexml/attributes/get_attribute_spec.rb b/spec/ruby/library/rexml/attributes/get_attribute_spec.rb index cfe58c1b9ea7ae..cf08446eaf7b68 100644 --- a/spec/ruby/library/rexml/attributes/get_attribute_spec.rb +++ b/spec/ruby/library/rexml/attributes/get_attribute_spec.rb @@ -1,29 +1,32 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#get_attribute" do - before :each do - @e = REXML::Element.new("root") - @name = REXML::Attribute.new("name", "Dave") - @e.attributes << @name - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "fetches an attributes" do - @e.attributes.get_attribute("name").should == @name - end + describe "REXML::Attributes#get_attribute" do + before :each do + @e = REXML::Element.new("root") + @name = REXML::Attribute.new("name", "Dave") + @e.attributes << @name + end - it "fetches an namespaced attribute" do - ns_name = REXML::Attribute.new("im:name", "Murray") - @e.attributes << ns_name - @e.attributes.get_attribute("name").should == @name - @e.attributes.get_attribute("im:name").should == ns_name - end + it "fetches an attributes" do + @e.attributes.get_attribute("name").should == @name + end - it "returns an Attribute" do - @e.attributes.get_attribute("name").should be_kind_of(REXML::Attribute) - end + it "fetches an namespaced attribute" do + ns_name = REXML::Attribute.new("im:name", "Murray") + @e.attributes << ns_name + @e.attributes.get_attribute("name").should == @name + @e.attributes.get_attribute("im:name").should == ns_name + end + + it "returns an Attribute" do + @e.attributes.get_attribute("name").should be_kind_of(REXML::Attribute) + end - it "returns nil if it attribute does not exist" do - @e.attributes.get_attribute("fake").should be_nil + it "returns nil if it attribute does not exist" do + @e.attributes.get_attribute("fake").should be_nil + end end end diff --git a/spec/ruby/library/rexml/attributes/initialize_spec.rb b/spec/ruby/library/rexml/attributes/initialize_spec.rb index f18bd20c699a95..f7c965217124ae 100644 --- a/spec/ruby/library/rexml/attributes/initialize_spec.rb +++ b/spec/ruby/library/rexml/attributes/initialize_spec.rb @@ -1,18 +1,21 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#initialize" do - it "is auto initialized by Element" do - e = REXML::Element.new "root" - e.attributes.should be_kind_of(REXML::Attributes) +ruby_version_is ''...'2.8' do + require 'rexml/document' - e.attributes << REXML::Attribute.new("name", "Paul") - e.attributes["name"].should == "Paul" - end + describe "REXML::Attributes#initialize" do + it "is auto initialized by Element" do + e = REXML::Element.new "root" + e.attributes.should be_kind_of(REXML::Attributes) + + e.attributes << REXML::Attribute.new("name", "Paul") + e.attributes["name"].should == "Paul" + end - it "receives a parent node" do - e = REXML::Element.new "root" - e.attributes << REXML::Attribute.new("name", "Vic") - e.attributes["name"].should == "Vic" + it "receives a parent node" do + e = REXML::Element.new "root" + e.attributes << REXML::Attribute.new("name", "Vic") + e.attributes["name"].should == "Vic" + end end end diff --git a/spec/ruby/library/rexml/attributes/length_spec.rb b/spec/ruby/library/rexml/attributes/length_spec.rb index 3a8361b8d70eee..60a348ef7ba262 100644 --- a/spec/ruby/library/rexml/attributes/length_spec.rb +++ b/spec/ruby/library/rexml/attributes/length_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/length' -require 'rexml/document' -describe "REXML::Attributes#length" do - it_behaves_like :rexml_attribute_length, :length +ruby_version_is ''...'2.8' do + require_relative 'shared/length' + require 'rexml/document' + + describe "REXML::Attributes#length" do + it_behaves_like :rexml_attribute_length, :length + end end diff --git a/spec/ruby/library/rexml/attributes/namespaces_spec.rb b/spec/ruby/library/rexml/attributes/namespaces_spec.rb index 9e329fef6f7c23..80c40ccc900813 100644 --- a/spec/ruby/library/rexml/attributes/namespaces_spec.rb +++ b/spec/ruby/library/rexml/attributes/namespaces_spec.rb @@ -1,6 +1,9 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#namespaces" do - it "needs to be reviewed for spec completeness" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Attributes#namespaces" do + it "needs to be reviewed for spec completeness" + end end diff --git a/spec/ruby/library/rexml/attributes/prefixes_spec.rb b/spec/ruby/library/rexml/attributes/prefixes_spec.rb index 4675095aad60e6..2c1e3f870569a3 100644 --- a/spec/ruby/library/rexml/attributes/prefixes_spec.rb +++ b/spec/ruby/library/rexml/attributes/prefixes_spec.rb @@ -1,24 +1,27 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#prefixes" do - before :each do - @e = REXML::Element.new("root") - a1 = REXML::Attribute.new("xmlns:a", "bar") - a2 = REXML::Attribute.new("xmlns:b", "bla") - a3 = REXML::Attribute.new("xmlns:c", "baz") - @e.attributes << a1 - @e.attributes << a2 - @e.attributes << a3 +ruby_version_is ''...'2.8' do + require 'rexml/document' - @e.attributes << REXML::Attribute.new("xmlns", "foo") - end + describe "REXML::Attributes#prefixes" do + before :each do + @e = REXML::Element.new("root") + a1 = REXML::Attribute.new("xmlns:a", "bar") + a2 = REXML::Attribute.new("xmlns:b", "bla") + a3 = REXML::Attribute.new("xmlns:c", "baz") + @e.attributes << a1 + @e.attributes << a2 + @e.attributes << a3 - it "returns an array with the prefixes of each attribute" do - @e.attributes.prefixes.sort.should == ["a", "b", "c"] - end + @e.attributes << REXML::Attribute.new("xmlns", "foo") + end + + it "returns an array with the prefixes of each attribute" do + @e.attributes.prefixes.sort.should == ["a", "b", "c"] + end - it "does not include the default namespace" do - @e.attributes.prefixes.include?("xmlns").should == false + it "does not include the default namespace" do + @e.attributes.prefixes.include?("xmlns").should == false + end end end diff --git a/spec/ruby/library/rexml/attributes/size_spec.rb b/spec/ruby/library/rexml/attributes/size_spec.rb index 3b1df9510d97a0..e7fad6bd11044c 100644 --- a/spec/ruby/library/rexml/attributes/size_spec.rb +++ b/spec/ruby/library/rexml/attributes/size_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/length' -require 'rexml/document' -describe "REXML::Attributes#size" do - it_behaves_like :rexml_attribute_length, :size +ruby_version_is ''...'2.8' do + require_relative 'shared/length' + require 'rexml/document' + + describe "REXML::Attributes#size" do + it_behaves_like :rexml_attribute_length, :size + end end diff --git a/spec/ruby/library/rexml/attributes/to_a_spec.rb b/spec/ruby/library/rexml/attributes/to_a_spec.rb index 1fbf71b683165f..cc98e4f0d9d04c 100644 --- a/spec/ruby/library/rexml/attributes/to_a_spec.rb +++ b/spec/ruby/library/rexml/attributes/to_a_spec.rb @@ -1,19 +1,22 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Attributes#to_a" do - it "returns an array with the attributes" do - e = REXML::Element.new("root") - name = REXML::Attribute.new("name", "Dave") - last = REXML::Attribute.new("last_name", "Murray") +ruby_version_is ''...'2.8' do + require 'rexml/document' - e.attributes << name - e.attributes << last + describe "REXML::Attributes#to_a" do + it "returns an array with the attributes" do + e = REXML::Element.new("root") + name = REXML::Attribute.new("name", "Dave") + last = REXML::Attribute.new("last_name", "Murray") - e.attributes.to_a.sort{|a,b|a.to_s<=>b.to_s}.should == [name, last] - end + e.attributes << name + e.attributes << last + + e.attributes.to_a.sort{|a,b|a.to_s<=>b.to_s}.should == [name, last] + end - it "returns an empty array if it has no attributes" do - REXML::Element.new("root").attributes.to_a.should == [] + it "returns an empty array if it has no attributes" do + REXML::Element.new("root").attributes.to_a.should == [] + end end end diff --git a/spec/ruby/library/rexml/cdata/clone_spec.rb b/spec/ruby/library/rexml/cdata/clone_spec.rb index 7d3cfda9022397..e8e322f9a52b55 100644 --- a/spec/ruby/library/rexml/cdata/clone_spec.rb +++ b/spec/ruby/library/rexml/cdata/clone_spec.rb @@ -1,10 +1,13 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::CData#clone" do - it "makes a copy of itself" do - c = REXML::CData.new("some text") - c.clone.to_s.should == c.to_s - c.clone.should == c +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::CData#clone" do + it "makes a copy of itself" do + c = REXML::CData.new("some text") + c.clone.to_s.should == c.to_s + c.clone.should == c + end end end diff --git a/spec/ruby/library/rexml/cdata/initialize_spec.rb b/spec/ruby/library/rexml/cdata/initialize_spec.rb index 0184440d87744f..2ef1cab2b3c5ab 100644 --- a/spec/ruby/library/rexml/cdata/initialize_spec.rb +++ b/spec/ruby/library/rexml/cdata/initialize_spec.rb @@ -1,24 +1,27 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::CData#initialize" do - it "creates a new CData object" do - c = REXML::CData.new("some text") - c.should be_kind_of(REXML::CData) - c.should be_kind_of(REXML::Text) - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "respects whitespace if whitespace is true" do - c = REXML::CData.new("whitespace test", true) - c1 = REXML::CData.new("whitespace test", false) + describe "REXML::CData#initialize" do + it "creates a new CData object" do + c = REXML::CData.new("some text") + c.should be_kind_of(REXML::CData) + c.should be_kind_of(REXML::Text) + end - c.to_s.should == "whitespace test" - c1.to_s.should == "whitespace test" - end + it "respects whitespace if whitespace is true" do + c = REXML::CData.new("whitespace test", true) + c1 = REXML::CData.new("whitespace test", false) + + c.to_s.should == "whitespace test" + c1.to_s.should == "whitespace test" + end - it "receives parent as third argument" do - e = REXML::Element.new("root") - REXML::CData.new("test", true, e) - e.to_s.should == "" + it "receives parent as third argument" do + e = REXML::Element.new("root") + REXML::CData.new("test", true, e) + e.to_s.should == "" + end end end diff --git a/spec/ruby/library/rexml/cdata/to_s_spec.rb b/spec/ruby/library/rexml/cdata/to_s_spec.rb index ff3076e55e0435..e42d7491b85524 100644 --- a/spec/ruby/library/rexml/cdata/to_s_spec.rb +++ b/spec/ruby/library/rexml/cdata/to_s_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/to_s' -require 'rexml/document' -describe "REXML::CData#to_s" do - it_behaves_like :rexml_cdata_to_s, :to_s +ruby_version_is ''...'2.8' do + require_relative 'shared/to_s' + require 'rexml/document' + + describe "REXML::CData#to_s" do + it_behaves_like :rexml_cdata_to_s, :to_s + end end diff --git a/spec/ruby/library/rexml/cdata/value_spec.rb b/spec/ruby/library/rexml/cdata/value_spec.rb index 6e8f8587a121c0..1c25cb205e8256 100644 --- a/spec/ruby/library/rexml/cdata/value_spec.rb +++ b/spec/ruby/library/rexml/cdata/value_spec.rb @@ -1,7 +1,10 @@ require_relative '../../../spec_helper' -require_relative 'shared/to_s' -require 'rexml/document' -describe "REXML::CData#value" do - it_behaves_like :rexml_cdata_to_s, :value +ruby_version_is ''...'2.8' do + require_relative 'shared/to_s' + require 'rexml/document' + + describe "REXML::CData#value" do + it_behaves_like :rexml_cdata_to_s, :value + end end diff --git a/spec/ruby/library/rexml/document/add_element_spec.rb b/spec/ruby/library/rexml/document/add_element_spec.rb index 42981d6465be1e..cc0617c061da65 100644 --- a/spec/ruby/library/rexml/document/add_element_spec.rb +++ b/spec/ruby/library/rexml/document/add_element_spec.rb @@ -1,31 +1,34 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#add_element" do - it "adds arg1 with attributes arg2 as root node" do - d = REXML::Document.new - e = REXML::Element.new("root") - d.add_element e - d.root.should == e - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "sets arg2 as arg1's attributes" do - d = REXML::Document.new - e = REXML::Element.new("root") - attr = {"foo" => "bar"} - d.add_element(e,attr) - d.root.attributes["foo"].should == attr["foo"] - end + describe "REXML::Document#add_element" do + it "adds arg1 with attributes arg2 as root node" do + d = REXML::Document.new + e = REXML::Element.new("root") + d.add_element e + d.root.should == e + end - it "accepts a node name as arg1 and adds it as root" do - d = REXML::Document.new - d.add_element "foo" - d.root.name.should == "foo" - end + it "sets arg2 as arg1's attributes" do + d = REXML::Document.new + e = REXML::Element.new("root") + attr = {"foo" => "bar"} + d.add_element(e,attr) + d.root.attributes["foo"].should == attr["foo"] + end + + it "accepts a node name as arg1 and adds it as root" do + d = REXML::Document.new + d.add_element "foo" + d.root.name.should == "foo" + end - it "sets arg1's context to the root's context" do - d = REXML::Document.new("", {"foo" => "bar"}) - d.add_element "foo" - d.root.context.should == d.context + it "sets arg1's context to the root's context" do + d = REXML::Document.new("", {"foo" => "bar"}) + d.add_element "foo" + d.root.context.should == d.context + end end end diff --git a/spec/ruby/library/rexml/document/add_spec.rb b/spec/ruby/library/rexml/document/add_spec.rb index db95114e7ed190..10056ed1e7520c 100644 --- a/spec/ruby/library/rexml/document/add_spec.rb +++ b/spec/ruby/library/rexml/document/add_spec.rb @@ -1,57 +1,60 @@ -require 'rexml/document' require_relative '../../../spec_helper' -# This spec defines Document#add and Document#<< +ruby_version_is ''...'2.8' do + require 'rexml/document' -describe :rexml_document_add, shared: true do - before :each do - @doc = REXML::Document.new("") - @decl = REXML::XMLDecl.new("1.0") - end + # This spec defines Document#add and Document#<< - it "sets document's XML declaration" do - @doc.send(@method, @decl) - @doc.xml_decl.should == @decl - end + describe :rexml_document_add, shared: true do + before :each do + @doc = REXML::Document.new("") + @decl = REXML::XMLDecl.new("1.0") + end - it "inserts XML declaration as first node" do - @doc.send(@method, @decl) - @doc.children[0].version.should == "1.0" - end + it "sets document's XML declaration" do + @doc.send(@method, @decl) + @doc.xml_decl.should == @decl + end - it "overwrites existing XML declaration" do - @doc.send(@method, @decl) - @doc.send(@method, REXML::XMLDecl.new("2.0")) - @doc.xml_decl.version.should == "2.0" - end + it "inserts XML declaration as first node" do + @doc.send(@method, @decl) + @doc.children[0].version.should == "1.0" + end - it "sets document DocType" do - @doc.send(@method, REXML::DocType.new("transitional")) - @doc.doctype.name.should == "transitional" - end + it "overwrites existing XML declaration" do + @doc.send(@method, @decl) + @doc.send(@method, REXML::XMLDecl.new("2.0")) + @doc.xml_decl.version.should == "2.0" + end - it "overwrites existing DocType" do - @doc.send(@method, REXML::DocType.new("transitional")) - @doc.send(@method, REXML::DocType.new("strict")) - @doc.doctype.name.should == "strict" - end + it "sets document DocType" do + @doc.send(@method, REXML::DocType.new("transitional")) + @doc.doctype.name.should == "transitional" + end - it "adds root node unless it exists" do - d = REXML::Document.new("") - elem = REXML::Element.new "root" - d.send(@method, elem) - d.root.should == elem - end + it "overwrites existing DocType" do + @doc.send(@method, REXML::DocType.new("transitional")) + @doc.send(@method, REXML::DocType.new("strict")) + @doc.doctype.name.should == "strict" + end + + it "adds root node unless it exists" do + d = REXML::Document.new("") + elem = REXML::Element.new "root" + d.send(@method, elem) + d.root.should == elem + end - it "refuses to add second root" do - -> { @doc.send(@method, REXML::Element.new("foo")) }.should raise_error(RuntimeError) + it "refuses to add second root" do + -> { @doc.send(@method, REXML::Element.new("foo")) }.should raise_error(RuntimeError) + end end -end -describe "REXML::Document#add" do - it_behaves_like :rexml_document_add, :add -end + describe "REXML::Document#add" do + it_behaves_like :rexml_document_add, :add + end -describe "REXML::Document#<<" do - it_behaves_like :rexml_document_add, :<< + describe "REXML::Document#<<" do + it_behaves_like :rexml_document_add, :<< + end end diff --git a/spec/ruby/library/rexml/document/clone_spec.rb b/spec/ruby/library/rexml/document/clone_spec.rb index 4aebb6f15625c8..2106c728882829 100644 --- a/spec/ruby/library/rexml/document/clone_spec.rb +++ b/spec/ruby/library/rexml/document/clone_spec.rb @@ -1,20 +1,23 @@ -require 'rexml/document' require_relative '../../../spec_helper' -# According to the MRI documentation (http://www.ruby-doc.org/stdlib/libdoc/rexml/rdoc/index.html), -# clone's behavior "should be obvious". Apparently "obvious" means cloning -# only the attributes and the context of the document, not its children. -describe "REXML::Document#clone" do - it "clones document attributes" do - d = REXML::Document.new("foo") - d.attributes["foo"] = "bar" - e = d.clone - e.attributes.should == d.attributes - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + # According to the MRI documentation (http://www.ruby-doc.org/stdlib/libdoc/rexml/rdoc/index.html), + # clone's behavior "should be obvious". Apparently "obvious" means cloning + # only the attributes and the context of the document, not its children. + describe "REXML::Document#clone" do + it "clones document attributes" do + d = REXML::Document.new("foo") + d.attributes["foo"] = "bar" + e = d.clone + e.attributes.should == d.attributes + end - it "clones document context" do - d = REXML::Document.new("foo", {"foo" => "bar"}) - e = d.clone - e.context.should == d.context + it "clones document context" do + d = REXML::Document.new("foo", {"foo" => "bar"}) + e = d.clone + e.context.should == d.context + end end end diff --git a/spec/ruby/library/rexml/document/doctype_spec.rb b/spec/ruby/library/rexml/document/doctype_spec.rb index b919b071e16a70..4d14460ef47b20 100644 --- a/spec/ruby/library/rexml/document/doctype_spec.rb +++ b/spec/ruby/library/rexml/document/doctype_spec.rb @@ -1,15 +1,18 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#doctype" do - it "returns the doctype" do - d = REXML::Document.new - dt = REXML::DocType.new("foo") - d.add dt - d.doctype.should == dt - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Document#doctype" do + it "returns the doctype" do + d = REXML::Document.new + dt = REXML::DocType.new("foo") + d.add dt + d.doctype.should == dt + end - it "returns nil if there's no doctype" do - REXML::Document.new.doctype.should == nil + it "returns nil if there's no doctype" do + REXML::Document.new.doctype.should == nil + end end end diff --git a/spec/ruby/library/rexml/document/encoding_spec.rb b/spec/ruby/library/rexml/document/encoding_spec.rb index 343e0ee45f08db..aa140b0f6f9331 100644 --- a/spec/ruby/library/rexml/document/encoding_spec.rb +++ b/spec/ruby/library/rexml/document/encoding_spec.rb @@ -1,22 +1,25 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#encoding" do - before :each do - @doc = REXML::Document.new - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns encoding from XML declaration" do - @doc.add REXML::XMLDecl.new(nil, "UTF-16", nil) - @doc.encoding.should == "UTF-16" - end + describe "REXML::Document#encoding" do + before :each do + @doc = REXML::Document.new + end - it "returns encoding from XML declaration (for UTF-16 as well)" do - @doc.add REXML::XMLDecl.new("1.0", "UTF-8", nil) - @doc.encoding.should == "UTF-8" - end + it "returns encoding from XML declaration" do + @doc.add REXML::XMLDecl.new(nil, "UTF-16", nil) + @doc.encoding.should == "UTF-16" + end + + it "returns encoding from XML declaration (for UTF-16 as well)" do + @doc.add REXML::XMLDecl.new("1.0", "UTF-8", nil) + @doc.encoding.should == "UTF-8" + end - it "uses UTF-8 as default encoding" do - @doc.encoding.should == "UTF-8" + it "uses UTF-8 as default encoding" do + @doc.encoding.should == "UTF-8" + end end end diff --git a/spec/ruby/library/rexml/document/expanded_name_spec.rb b/spec/ruby/library/rexml/document/expanded_name_spec.rb index 1225d13fb0ff8a..4f5391432632f1 100644 --- a/spec/ruby/library/rexml/document/expanded_name_spec.rb +++ b/spec/ruby/library/rexml/document/expanded_name_spec.rb @@ -1,16 +1,19 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe :document_expanded_name, shared: true do - it "returns an empty string for root" do # root nodes have no expanded name - REXML::Document.new.send(@method).should == "" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe :document_expanded_name, shared: true do + it "returns an empty string for root" do # root nodes have no expanded name + REXML::Document.new.send(@method).should == "" + end end -end -describe "REXML::Document#expanded_name" do - it_behaves_like :document_expanded_name, :expanded_name -end + describe "REXML::Document#expanded_name" do + it_behaves_like :document_expanded_name, :expanded_name + end -describe "REXML::Document#name" do - it_behaves_like :document_expanded_name, :name + describe "REXML::Document#name" do + it_behaves_like :document_expanded_name, :name + end end diff --git a/spec/ruby/library/rexml/document/new_spec.rb b/spec/ruby/library/rexml/document/new_spec.rb index 3ff5e99b25aed5..52b20341f40597 100644 --- a/spec/ruby/library/rexml/document/new_spec.rb +++ b/spec/ruby/library/rexml/document/new_spec.rb @@ -1,36 +1,39 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Document#new" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "initializes context of {} unless specified" do - d = REXML::Document.new("") - d.context.should == {} - end + describe "REXML::Document#new" do - it "has empty attributes if source is nil" do - d = REXML::Document.new(nil) - d.elements.should be_empty - end + it "initializes context of {} unless specified" do + d = REXML::Document.new("") + d.context.should == {} + end - it "can use other document context" do - s = REXML::Document.new("") - d = REXML::Document.new(s) - d.context.should == s.context - end + it "has empty attributes if source is nil" do + d = REXML::Document.new(nil) + d.elements.should be_empty + end - it "clones source attributes" do - s = REXML::Document.new("") - s.attributes["some_attr"] = "some_val" - d = REXML::Document.new(s) - d.attributes.should == s.attributes - end + it "can use other document context" do + s = REXML::Document.new("") + d = REXML::Document.new(s) + d.context.should == s.context + end - it "raises an error if source is not a Document, String or IO" do - -> {REXML::Document.new(3)}.should raise_error(RuntimeError) - end + it "clones source attributes" do + s = REXML::Document.new("") + s.attributes["some_attr"] = "some_val" + d = REXML::Document.new(s) + d.attributes.should == s.attributes + end + + it "raises an error if source is not a Document, String or IO" do + -> {REXML::Document.new(3)}.should raise_error(RuntimeError) + end - it "does not perform XML validation" do - REXML::Document.new("Invalid document").should be_kind_of(REXML::Document) + it "does not perform XML validation" do + REXML::Document.new("Invalid document").should be_kind_of(REXML::Document) + end end end diff --git a/spec/ruby/library/rexml/document/node_type_spec.rb b/spec/ruby/library/rexml/document/node_type_spec.rb index 85a4d507aa5128..13aa6a6eb5ba39 100644 --- a/spec/ruby/library/rexml/document/node_type_spec.rb +++ b/spec/ruby/library/rexml/document/node_type_spec.rb @@ -1,8 +1,11 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#node_type" do - it "returns :document" do - REXML::Document.new.node_type.should == :document +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Document#node_type" do + it "returns :document" do + REXML::Document.new.node_type.should == :document + end end end diff --git a/spec/ruby/library/rexml/document/root_spec.rb b/spec/ruby/library/rexml/document/root_spec.rb index 3c24e79b2de147..e01b0fa67c92ed 100644 --- a/spec/ruby/library/rexml/document/root_spec.rb +++ b/spec/ruby/library/rexml/document/root_spec.rb @@ -1,12 +1,15 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#root" do - it "returns document root tag name" do - REXML::Document.new("").root.name.should == "foo" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Document#root" do + it "returns document root tag name" do + REXML::Document.new("").root.name.should == "foo" + end - it "returns nil if there is not root" do - REXML::Document.new.root.should == nil + it "returns nil if there is not root" do + REXML::Document.new.root.should == nil + end end end diff --git a/spec/ruby/library/rexml/document/stand_alone_spec.rb b/spec/ruby/library/rexml/document/stand_alone_spec.rb index 4ac24329d6577a..667b2c0184fa92 100644 --- a/spec/ruby/library/rexml/document/stand_alone_spec.rb +++ b/spec/ruby/library/rexml/document/stand_alone_spec.rb @@ -1,19 +1,22 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#stand_alone?" do - it "returns the XMLDecl standalone value" do - d = REXML::Document.new - decl = REXML::XMLDecl.new("1.0", "UTF-8", "yes") - d.add decl - d.stand_alone?.should == "yes" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - # According to the docs this should return the default XMLDecl but that - # will carry some more problems when printing the document. Currently, it - # returns nil. See http://www.ruby-forum.com/topic/146812#650061 - it "returns the default value when no XML declaration present" do - REXML::Document.new.stand_alone?.should == nil - end + describe "REXML::Document#stand_alone?" do + it "returns the XMLDecl standalone value" do + d = REXML::Document.new + decl = REXML::XMLDecl.new("1.0", "UTF-8", "yes") + d.add decl + d.stand_alone?.should == "yes" + end + # According to the docs this should return the default XMLDecl but that + # will carry some more problems when printing the document. Currently, it + # returns nil. See http://www.ruby-forum.com/topic/146812#650061 + it "returns the default value when no XML declaration present" do + REXML::Document.new.stand_alone?.should == nil + end + + end end diff --git a/spec/ruby/library/rexml/document/version_spec.rb b/spec/ruby/library/rexml/document/version_spec.rb index 983b4b9af055ef..8e0f66cb072475 100644 --- a/spec/ruby/library/rexml/document/version_spec.rb +++ b/spec/ruby/library/rexml/document/version_spec.rb @@ -1,14 +1,17 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#version" do - it "returns XML version from declaration" do - d = REXML::Document.new - d.add REXML::XMLDecl.new("1.1") - d.version.should == "1.1" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Document#version" do + it "returns XML version from declaration" do + d = REXML::Document.new + d.add REXML::XMLDecl.new("1.1") + d.version.should == "1.1" + end - it "returns the default version when declaration is not present" do - REXML::Document.new.version.should == REXML::XMLDecl::DEFAULT_VERSION + it "returns the default version when declaration is not present" do + REXML::Document.new.version.should == REXML::XMLDecl::DEFAULT_VERSION + end end end diff --git a/spec/ruby/library/rexml/document/write_spec.rb b/spec/ruby/library/rexml/document/write_spec.rb index efa94b71177108..774c12982c46a6 100644 --- a/spec/ruby/library/rexml/document/write_spec.rb +++ b/spec/ruby/library/rexml/document/write_spec.rb @@ -1,35 +1,38 @@ -require 'rexml/document' -require 'rexml/formatters/transitive' require_relative '../../../spec_helper' -# Maybe this can be cleaned -describe "REXML::Document#write" do - before :each do - @d = REXML::Document.new - city = REXML::Element.new "Springfield" - street = REXML::Element.new "EvergreenTerrace" - address = REXML::Element.new "House742" - @d << city << street << address - @str = "" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + require 'rexml/formatters/transitive' - it "returns document source as string" do - @d.write(@str) - @str.should == "" - end + # Maybe this can be cleaned + describe "REXML::Document#write" do + before :each do + @d = REXML::Document.new + city = REXML::Element.new "Springfield" + street = REXML::Element.new "EvergreenTerrace" + address = REXML::Element.new "House742" + @d << city << street << address + @str = "" + end - it "returns document indented" do - @d.write(@str, 2) - @str.should =~ /\s*\s*\s*\s*<\/EvergreenTerrace>\s*<\/Springfield>/ - end + it "returns document source as string" do + @d.write(@str) + @str.should == "" + end - it "returns document with transitive support" do - @d.write(@str, 2, true) - @str.should =~ /\s*<\/EvergreenTerrace\s*><\/Springfield\s*>/ - end + it "returns document indented" do + @d.write(@str, 2) + @str.should =~ /\s*\s*\s*\s*<\/EvergreenTerrace>\s*<\/Springfield>/ + end + + it "returns document with transitive support" do + @d.write(@str, 2, true) + @str.should =~ /\s*<\/EvergreenTerrace\s*><\/Springfield\s*>/ + end - it "returns document with support for IE" do - @d.write(@str, -1, false, true) - @str.should == "" + it "returns document with support for IE" do + @d.write(@str, -1, false, true) + @str.should == "" + end end end diff --git a/spec/ruby/library/rexml/document/xml_decl_spec.rb b/spec/ruby/library/rexml/document/xml_decl_spec.rb index 30288a150bf81e..6862c7bb6bb560 100644 --- a/spec/ruby/library/rexml/document/xml_decl_spec.rb +++ b/spec/ruby/library/rexml/document/xml_decl_spec.rb @@ -1,15 +1,18 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Document#xml_decl" do - it "returns XML declaration of the document" do - d = REXML::Document.new - decl = REXML::XMLDecl.new("1.0", "UTF-16", "yes") - d.add decl - d.xml_decl.should == decl - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Document#xml_decl" do + it "returns XML declaration of the document" do + d = REXML::Document.new + decl = REXML::XMLDecl.new("1.0", "UTF-16", "yes") + d.add decl + d.xml_decl.should == decl + end - it "returns default XML declaration unless present" do - REXML::Document.new.xml_decl.should == REXML::XMLDecl.new + it "returns default XML declaration unless present" do + REXML::Document.new.xml_decl.should == REXML::XMLDecl.new + end end end diff --git a/spec/ruby/library/rexml/element/add_attribute_spec.rb b/spec/ruby/library/rexml/element/add_attribute_spec.rb index d15fb81ef1f685..b688f1db652293 100644 --- a/spec/ruby/library/rexml/element/add_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/add_attribute_spec.rb @@ -1,41 +1,44 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#add_attribute" do - before :each do - @person = REXML::Element.new "person" - @person.attributes["name"] = "Bill" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "adds a new attribute" do - @person.add_attribute("age", "17") - @person.attributes["age"].should == "17" - end + describe "REXML::Element#add_attribute" do + before :each do + @person = REXML::Element.new "person" + @person.attributes["name"] = "Bill" + end - it "overwrites an existing attribute" do - @person.add_attribute("name", "Bill") - @person.attributes["name"].should == "Bill" - end + it "adds a new attribute" do + @person.add_attribute("age", "17") + @person.attributes["age"].should == "17" + end - it "accepts a pair of strings" do - @person.add_attribute("male", "true") - @person.attributes["male"].should == "true" - end + it "overwrites an existing attribute" do + @person.add_attribute("name", "Bill") + @person.attributes["name"].should == "Bill" + end - it "accepts an Attribute for key" do - attr = REXML::Attribute.new("male", "true") - @person.add_attribute attr - @person.attributes["male"].should == "true" - end + it "accepts a pair of strings" do + @person.add_attribute("male", "true") + @person.attributes["male"].should == "true" + end - it "ignores value if key is an Attribute" do - attr = REXML::Attribute.new("male", "true") - @person.add_attribute(attr, "false") - @person.attributes["male"].should == "true" - end + it "accepts an Attribute for key" do + attr = REXML::Attribute.new("male", "true") + @person.add_attribute attr + @person.attributes["male"].should == "true" + end + + it "ignores value if key is an Attribute" do + attr = REXML::Attribute.new("male", "true") + @person.add_attribute(attr, "false") + @person.attributes["male"].should == "true" + end - it "returns the attribute added" do - attr = REXML::Attribute.new("name", "Tony") - @person.add_attribute(attr).should == attr + it "returns the attribute added" do + attr = REXML::Attribute.new("name", "Tony") + @person.add_attribute(attr).should == attr + end end end diff --git a/spec/ruby/library/rexml/element/add_attributes_spec.rb b/spec/ruby/library/rexml/element/add_attributes_spec.rb index b462fdf5fe87e4..8e7e991f118257 100644 --- a/spec/ruby/library/rexml/element/add_attributes_spec.rb +++ b/spec/ruby/library/rexml/element/add_attributes_spec.rb @@ -1,22 +1,25 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#add_attributes" do - before :each do - @person = REXML::Element.new "person" - @person.attributes["name"] = "Bill" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "adds multiple attributes from a hash" do - @person.add_attributes({"name" => "Joe", "age" => "27"}) - @person.attributes["name"].should == "Joe" - @person.attributes["age"].should == "27" - end + describe "REXML::Element#add_attributes" do + before :each do + @person = REXML::Element.new "person" + @person.attributes["name"] = "Bill" + end + + it "adds multiple attributes from a hash" do + @person.add_attributes({"name" => "Joe", "age" => "27"}) + @person.attributes["name"].should == "Joe" + @person.attributes["age"].should == "27" + end - it "adds multiple attributes from an array" do - attrs = { "name" => "Joe", "age" => "27"} - @person.add_attributes attrs.to_a - @person.attributes["name"].should == "Joe" - @person.attributes["age"].should == "27" + it "adds multiple attributes from an array" do + attrs = { "name" => "Joe", "age" => "27"} + @person.add_attributes attrs.to_a + @person.attributes["name"].should == "Joe" + @person.attributes["age"].should == "27" + end end end diff --git a/spec/ruby/library/rexml/element/add_element_spec.rb b/spec/ruby/library/rexml/element/add_element_spec.rb index 8e2ffe31485ab4..90fb36f8e3621b 100644 --- a/spec/ruby/library/rexml/element/add_element_spec.rb +++ b/spec/ruby/library/rexml/element/add_element_spec.rb @@ -1,39 +1,41 @@ -require 'rexml/document' require_relative '../../../spec_helper' +ruby_version_is ''...'2.8' do + require 'rexml/document' -describe "REXML::Element#add_element" do - before :each do - @root = REXML::Element.new("root") - end + describe "REXML::Element#add_element" do + before :each do + @root = REXML::Element.new("root") + end - it "adds a child without attributes" do - name = REXML::Element.new("name") - @root.add_element name - @root.elements["name"].name.should == name.name - @root.elements["name"].attributes.should == name.attributes - @root.elements["name"].context.should == name.context - end + it "adds a child without attributes" do + name = REXML::Element.new("name") + @root.add_element name + @root.elements["name"].name.should == name.name + @root.elements["name"].attributes.should == name.attributes + @root.elements["name"].context.should == name.context + end - it "adds a child with attributes" do - person = REXML::Element.new("person") - @root.add_element(person, {"name" => "Madonna"}) - @root.elements["person"].name.should == person.name - @root.elements["person"].attributes.should == person.attributes - @root.elements["person"].context.should == person.context - end + it "adds a child with attributes" do + person = REXML::Element.new("person") + @root.add_element(person, {"name" => "Madonna"}) + @root.elements["person"].name.should == person.name + @root.elements["person"].attributes.should == person.attributes + @root.elements["person"].context.should == person.context + end - it "adds a child with name" do - @root.add_element "name" - @root.elements["name"].name.should == "name" - @root.elements["name"].attributes.should == {} - @root.elements["name"].context.should == nil - end + it "adds a child with name" do + @root.add_element "name" + @root.elements["name"].name.should == "name" + @root.elements["name"].attributes.should == {} + @root.elements["name"].context.should == nil + end - it "returns the added child" do - name = @root.add_element "name" - @root.elements["name"].name.should == name.name - @root.elements["name"].attributes.should == name.attributes - @root.elements["name"].context.should == name.context + it "returns the added child" do + name = @root.add_element "name" + @root.elements["name"].name.should == name.name + @root.elements["name"].attributes.should == name.attributes + @root.elements["name"].context.should == name.context + end end end diff --git a/spec/ruby/library/rexml/element/add_namespace_spec.rb b/spec/ruby/library/rexml/element/add_namespace_spec.rb index 77c00eec46a927..5e601dcf2841b4 100644 --- a/spec/ruby/library/rexml/element/add_namespace_spec.rb +++ b/spec/ruby/library/rexml/element/add_namespace_spec.rb @@ -1,23 +1,26 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#add_namespace" do - before :each do - @elem = REXML::Element.new("person") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "adds a namespace to element" do - @elem.add_namespace("foo", "bar") - @elem.namespace("foo").should == "bar" - end + describe "REXML::Element#add_namespace" do + before :each do + @elem = REXML::Element.new("person") + end - it "accepts a prefix string as prefix" do - @elem.add_namespace("xmlns:foo", "bar") - @elem.namespace("foo").should == "bar" - end + it "adds a namespace to element" do + @elem.add_namespace("foo", "bar") + @elem.namespace("foo").should == "bar" + end + + it "accepts a prefix string as prefix" do + @elem.add_namespace("xmlns:foo", "bar") + @elem.namespace("foo").should == "bar" + end - it "uses prefix as URI if uri is nil" do - @elem.add_namespace("some_uri", nil) - @elem.namespace.should == "some_uri" + it "uses prefix as URI if uri is nil" do + @elem.add_namespace("some_uri", nil) + @elem.namespace.should == "some_uri" + end end end diff --git a/spec/ruby/library/rexml/element/add_text_spec.rb b/spec/ruby/library/rexml/element/add_text_spec.rb index 54e127bf4bfe1d..200d748e6127f9 100644 --- a/spec/ruby/library/rexml/element/add_text_spec.rb +++ b/spec/ruby/library/rexml/element/add_text_spec.rb @@ -1,24 +1,27 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#add_text" do - before :each do - @name = REXML::Element.new "Name" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "adds text to an element" do - @name.add_text "Ringo" - @name.to_s.should == "Ringo" - end + describe "REXML::Element#add_text" do + before :each do + @name = REXML::Element.new "Name" + end - it "accepts a Text" do - @name.add_text(REXML::Text.new("Ringo")) - @name.to_s.should == "Ringo" - end + it "adds text to an element" do + @name.add_text "Ringo" + @name.to_s.should == "Ringo" + end + + it "accepts a Text" do + @name.add_text(REXML::Text.new("Ringo")) + @name.to_s.should == "Ringo" + end - it "joins the new text with the old one" do - @name.add_text "Ringo" - @name.add_text " Starr" - @name.to_s.should == "Ringo Starr" + it "joins the new text with the old one" do + @name.add_text "Ringo" + @name.add_text " Starr" + @name.to_s.should == "Ringo Starr" + end end end diff --git a/spec/ruby/library/rexml/element/attribute_spec.rb b/spec/ruby/library/rexml/element/attribute_spec.rb index e40d612ef39ba1..7b2c26658af9a3 100644 --- a/spec/ruby/library/rexml/element/attribute_spec.rb +++ b/spec/ruby/library/rexml/element/attribute_spec.rb @@ -1,17 +1,20 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#attribute" do - it "returns an attribute by name" do - person = REXML::Element.new "Person" - attribute = REXML::Attribute.new("drink", "coffee") - person.add_attribute(attribute) - person.attribute("drink").should == attribute - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Element#attribute" do + it "returns an attribute by name" do + person = REXML::Element.new "Person" + attribute = REXML::Attribute.new("drink", "coffee") + person.add_attribute(attribute) + person.attribute("drink").should == attribute + end - it "supports attributes inside namespaces" do - e = REXML::Element.new("element") - e.add_attributes({"xmlns:ns" => "http://some_uri"}) - e.attribute("ns", "ns").to_s.should == "http://some_uri" + it "supports attributes inside namespaces" do + e = REXML::Element.new("element") + e.add_attributes({"xmlns:ns" => "http://some_uri"}) + e.attribute("ns", "ns").to_s.should == "http://some_uri" + end end end diff --git a/spec/ruby/library/rexml/element/attributes_spec.rb b/spec/ruby/library/rexml/element/attributes_spec.rb index 8959b769a89683..79a3368a9e4c5a 100644 --- a/spec/ruby/library/rexml/element/attributes_spec.rb +++ b/spec/ruby/library/rexml/element/attributes_spec.rb @@ -1,19 +1,22 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#attributes" do - it "returns element's Attributes" do - p = REXML::Element.new "Person" +ruby_version_is ''...'2.8' do + require 'rexml/document' - name = REXML::Attribute.new("name", "John") - attrs = REXML::Attributes.new(p) - attrs.add name + describe "REXML::Element#attributes" do + it "returns element's Attributes" do + p = REXML::Element.new "Person" - p.add_attribute name - p.attributes.should == attrs - end + name = REXML::Attribute.new("name", "John") + attrs = REXML::Attributes.new(p) + attrs.add name + + p.add_attribute name + p.attributes.should == attrs + end - it "returns an empty hash if element has no attributes" do - REXML::Element.new("Person").attributes.should == {} + it "returns an empty hash if element has no attributes" do + REXML::Element.new("Person").attributes.should == {} + end end end diff --git a/spec/ruby/library/rexml/element/cdatas_spec.rb b/spec/ruby/library/rexml/element/cdatas_spec.rb index a371a5734be9a1..4cc592aae374eb 100644 --- a/spec/ruby/library/rexml/element/cdatas_spec.rb +++ b/spec/ruby/library/rexml/element/cdatas_spec.rb @@ -1,24 +1,27 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#cdatas" do - before :each do - @e = REXML::Element.new("Root") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the array of children cdatas" do - c = REXML::CData.new("Primary") - d = REXML::CData.new("Secondary") - @e << c - @e << d - @e.cdatas.should == [c, d] - end + describe "REXML::Element#cdatas" do + before :each do + @e = REXML::Element.new("Root") + end - it "freezes the returned array" do - @e.cdatas.frozen?.should == true - end + it "returns the array of children cdatas" do + c = REXML::CData.new("Primary") + d = REXML::CData.new("Secondary") + @e << c + @e << d + @e.cdatas.should == [c, d] + end + + it "freezes the returned array" do + @e.cdatas.frozen?.should == true + end - it "returns an empty array if element has no cdata" do - @e.cdatas.should == [] + it "returns an empty array if element has no cdata" do + @e.cdatas.should == [] + end end end diff --git a/spec/ruby/library/rexml/element/clone_spec.rb b/spec/ruby/library/rexml/element/clone_spec.rb index d26392db4187f5..06948585a4fdeb 100644 --- a/spec/ruby/library/rexml/element/clone_spec.rb +++ b/spec/ruby/library/rexml/element/clone_spec.rb @@ -1,29 +1,32 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#clone" do - before :each do - @e = REXML::Element.new "a" - end - it "creates a copy of element" do - @e.clone.to_s.should == @e.to_s - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "copies the attributes" do - @e.add_attribute("foo", "bar") - @e.clone.to_s.should == @e.to_s - end + describe "REXML::Element#clone" do + before :each do + @e = REXML::Element.new "a" + end + it "creates a copy of element" do + @e.clone.to_s.should == @e.to_s + end - it "does not copy the text" do - @e.add_text "some text..." - @e.clone.to_s.should_not == @e - @e.clone.to_s.should == "" - end + it "copies the attributes" do + @e.add_attribute("foo", "bar") + @e.clone.to_s.should == @e.to_s + end + + it "does not copy the text" do + @e.add_text "some text..." + @e.clone.to_s.should_not == @e + @e.clone.to_s.should == "" + end - it "does not copy the child elements" do - b = REXML::Element.new "b" - @e << b - @e.clone.should_not == @e - @e.clone.to_s.should == "" + it "does not copy the child elements" do + b = REXML::Element.new "b" + @e << b + @e.clone.should_not == @e + @e.clone.to_s.should == "" + end end end diff --git a/spec/ruby/library/rexml/element/comments_spec.rb b/spec/ruby/library/rexml/element/comments_spec.rb index 9dac2cc5b86526..59a0b3e4fb33bb 100644 --- a/spec/ruby/library/rexml/element/comments_spec.rb +++ b/spec/ruby/library/rexml/element/comments_spec.rb @@ -1,20 +1,23 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#comments" do - before :each do - @e = REXML::Element.new "root" - @c1 = REXML::Comment.new "this is a comment" - @c2 = REXML::Comment.new "this is another comment" - @e << @c1 - @e << @c2 - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the array of comments" do - @e.comments.should == [@c1, @c2] - end + describe "REXML::Element#comments" do + before :each do + @e = REXML::Element.new "root" + @c1 = REXML::Comment.new "this is a comment" + @c2 = REXML::Comment.new "this is another comment" + @e << @c1 + @e << @c2 + end + + it "returns the array of comments" do + @e.comments.should == [@c1, @c2] + end - it "returns a frozen object" do - @e.comments.frozen?.should == true + it "returns a frozen object" do + @e.comments.frozen?.should == true + end end end diff --git a/spec/ruby/library/rexml/element/delete_attribute_spec.rb b/spec/ruby/library/rexml/element/delete_attribute_spec.rb index 5c55c5efda8f4e..9d8669e405f8d1 100644 --- a/spec/ruby/library/rexml/element/delete_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/delete_attribute_spec.rb @@ -1,39 +1,43 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#delete_attribute" do - before :each do - @e = REXML::Element.new("Person") - @attr = REXML::Attribute.new("name", "Sean") - @e.add_attribute(@attr) - end - - it "deletes an attribute from the element" do - @e.delete_attribute("name") - @e.attributes["name"].should be_nil - end +ruby_version_is ''...'2.8' do + require 'rexml/document' -# Bug was filled with a patch in Ruby's tracker #20298 - quarantine! do - it "receives an Attribute" do + describe "REXML::Element#delete_attribute" do + before :each do + @e = REXML::Element.new("Person") + @attr = REXML::Attribute.new("name", "Sean") @e.add_attribute(@attr) - @e.delete_attribute(@attr) + end + + it "deletes an attribute from the element" do + @e.delete_attribute("name") @e.attributes["name"].should be_nil end - end - # Docs say that it returns the removed attribute but then examples - # show it returns the element with the attribute removed. - # Also fixed in #20298 - it "returns the element with the attribute removed" do - elem = @e.delete_attribute("name") - elem.attributes.should be_empty - elem.to_s.should eql("") - end + # Bug was filled with a patch in Ruby's tracker #20298 + quarantine! do + it "receives an Attribute" do + @e.add_attribute(@attr) + @e.delete_attribute(@attr) + @e.attributes["name"].should be_nil + end + end + + # Docs say that it returns the removed attribute but then examples + # show it returns the element with the attribute removed. + # Also fixed in #20298 + it "returns the element with the attribute removed" do + elem = @e.delete_attribute("name") + elem.attributes.should be_empty + elem.to_s.should eql("") + end - it "returns nil if the attribute does not exist" do - @e.delete_attribute("name") - at = @e.delete_attribute("name") - at.should be_nil + it "returns nil if the attribute does not exist" do + @e.delete_attribute("name") + at = @e.delete_attribute("name") + at.should be_nil + end end end + diff --git a/spec/ruby/library/rexml/element/delete_element_spec.rb b/spec/ruby/library/rexml/element/delete_element_spec.rb index 9417229bd4abed..f2c50eb95ec544 100644 --- a/spec/ruby/library/rexml/element/delete_element_spec.rb +++ b/spec/ruby/library/rexml/element/delete_element_spec.rb @@ -1,49 +1,52 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#delete_element" do - before :each do - @root = REXML::Element.new("root") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "deletes the child element" do - node = REXML::Element.new("some_node") - @root.add_element node - @root.delete_element node - @root.elements.size.should == 0 - end + describe "REXML::Element#delete_element" do + before :each do + @root = REXML::Element.new("root") + end - it "deletes a child via XPath" do - @root.add_element "some_node" - @root.delete_element "some_node" - @root.elements.size.should == 0 - end + it "deletes the child element" do + node = REXML::Element.new("some_node") + @root.add_element node + @root.delete_element node + @root.elements.size.should == 0 + end - it "deletes the child at index" do - @root.add_element "some_node" - @root.delete_element 1 - @root.elements.size.should == 0 - end + it "deletes a child via XPath" do + @root.add_element "some_node" + @root.delete_element "some_node" + @root.elements.size.should == 0 + end - # According to the docs this should return the deleted element - # but it won't if it's an Element. - it "deletes Element and returns it" do - node = REXML::Element.new("some_node") - @root.add_element node - del_node = @root.delete_element node - del_node.should == node - end + it "deletes the child at index" do + @root.add_element "some_node" + @root.delete_element 1 + @root.elements.size.should == 0 + end - # Note how passing the string will return the removed element - # but passing the Element as above won't. - it "deletes an element and returns it" do - node = REXML::Element.new("some_node") - @root.add_element node - del_node = @root.delete_element "some_node" - del_node.should == node - end + # According to the docs this should return the deleted element + # but it won't if it's an Element. + it "deletes Element and returns it" do + node = REXML::Element.new("some_node") + @root.add_element node + del_node = @root.delete_element node + del_node.should == node + end + + # Note how passing the string will return the removed element + # but passing the Element as above won't. + it "deletes an element and returns it" do + node = REXML::Element.new("some_node") + @root.add_element node + del_node = @root.delete_element "some_node" + del_node.should == node + end - it "returns nil unless element exists" do - @root.delete_element("something").should == nil + it "returns nil unless element exists" do + @root.delete_element("something").should == nil + end end end diff --git a/spec/ruby/library/rexml/element/delete_namespace_spec.rb b/spec/ruby/library/rexml/element/delete_namespace_spec.rb index 8683a40cab7f38..4b37c2c41c6af0 100644 --- a/spec/ruby/library/rexml/element/delete_namespace_spec.rb +++ b/spec/ruby/library/rexml/element/delete_namespace_spec.rb @@ -1,25 +1,28 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#delete_namespace" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - before :each do - @doc = REXML::Document.new "" - end + describe "REXML::Element#delete_namespace" do - it "deletes a namespace from the element" do - @doc.root.delete_namespace 'foo' - @doc.root.namespace("foo").should be_nil - @doc.root.to_s.should == "" - end + before :each do + @doc = REXML::Document.new "" + end - it "deletes default namespace when called with no args" do - @doc.root.delete_namespace - @doc.root.namespace.should be_empty - @doc.root.to_s.should == "" - end + it "deletes a namespace from the element" do + @doc.root.delete_namespace 'foo' + @doc.root.namespace("foo").should be_nil + @doc.root.to_s.should == "" + end + + it "deletes default namespace when called with no args" do + @doc.root.delete_namespace + @doc.root.namespace.should be_empty + @doc.root.to_s.should == "" + end - it "returns the element" do - @doc.root.delete_namespace.should == @doc.root + it "returns the element" do + @doc.root.delete_namespace.should == @doc.root + end end end diff --git a/spec/ruby/library/rexml/element/document_spec.rb b/spec/ruby/library/rexml/element/document_spec.rb index 24773580f293b8..c9f74c405652fa 100644 --- a/spec/ruby/library/rexml/element/document_spec.rb +++ b/spec/ruby/library/rexml/element/document_spec.rb @@ -1,16 +1,19 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#document" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the element's document" do - d = REXML::Document.new("") - d << REXML::XMLDecl.new - d.root.document.should == d - d.root.document.to_s.should == d.to_s - end + describe "REXML::Element#document" do + + it "returns the element's document" do + d = REXML::Document.new("") + d << REXML::XMLDecl.new + d.root.document.should == d + d.root.document.to_s.should == d.to_s + end - it "returns nil if it belongs to no document" do - REXML::Element.new("standalone").document.should be_nil + it "returns nil if it belongs to no document" do + REXML::Element.new("standalone").document.should be_nil + end end end diff --git a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb index 3c5da3f015e8ae..5d6f4b371a86bc 100644 --- a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb @@ -1,35 +1,38 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#each_element_with_attributes" do - before :each do - @document = REXML::Element.new("people") - @father = REXML::Element.new("Person") - @father.attributes["name"] = "Joe" - @son = REXML::Element.new("Child") - @son.attributes["name"] = "Fred" - @document.root << @father - @document.root << @son - @childs = [] - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns childs with attribute" do - @document.each_element_with_attribute("name") { |elem| @childs << elem } - @childs[0].should == @father - @childs[1].should == @son - end + describe "REXML::Element#each_element_with_attributes" do + before :each do + @document = REXML::Element.new("people") + @father = REXML::Element.new("Person") + @father.attributes["name"] = "Joe" + @son = REXML::Element.new("Child") + @son.attributes["name"] = "Fred" + @document.root << @father + @document.root << @son + @childs = [] + end - it "takes attribute value as second argument" do - @document.each_element_with_attribute("name", "Fred"){ |elem| elem.should == @son } - end + it "returns childs with attribute" do + @document.each_element_with_attribute("name") { |elem| @childs << elem } + @childs[0].should == @father + @childs[1].should == @son + end - it "takes max number of childs as third argument" do - @document.each_element_with_attribute("name", nil, 1) { |elem| @childs << elem } - @childs.size.should == 1 - @childs[0].should == @father - end + it "takes attribute value as second argument" do + @document.each_element_with_attribute("name", "Fred"){ |elem| elem.should == @son } + end + + it "takes max number of childs as third argument" do + @document.each_element_with_attribute("name", nil, 1) { |elem| @childs << elem } + @childs.size.should == 1 + @childs[0].should == @father + end - it "takes XPath filter as fourth argument" do - @document.each_element_with_attribute("name", nil, 0, "Child"){ |elem| elem.should == @son} + it "takes XPath filter as fourth argument" do + @document.each_element_with_attribute("name", nil, 0, "Child"){ |elem| elem.should == @son} + end end end diff --git a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb index 5f9e5b85dc92e9..65f5ea5f11664e 100644 --- a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb +++ b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb @@ -1,31 +1,34 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#each_element_with_text" do - before :each do - @document = REXML::Element.new("people") +ruby_version_is ''...'2.8' do + require 'rexml/document' - @joe = REXML::Element.new("Person") - @joe.text = "Joe" - @fred = REXML::Element.new("Person") - @fred.text = "Fred" - @another = REXML::Element.new("AnotherPerson") - @another.text = "Fred" - @document.root << @joe - @document.root << @fred - @document.root << @another - @childs = [] - end + describe "REXML::Element#each_element_with_text" do + before :each do + @document = REXML::Element.new("people") - it "returns childs with text" do - @document.each_element_with_text("Joe"){|c| c.should == @joe} - end + @joe = REXML::Element.new("Person") + @joe.text = "Joe" + @fred = REXML::Element.new("Person") + @fred.text = "Fred" + @another = REXML::Element.new("AnotherPerson") + @another.text = "Fred" + @document.root << @joe + @document.root << @fred + @document.root << @another + @childs = [] + end - it "takes max as second argument" do - @document.each_element_with_text("Fred", 1){ |c| c.should == @fred} - end + it "returns childs with text" do + @document.each_element_with_text("Joe"){|c| c.should == @joe} + end + + it "takes max as second argument" do + @document.each_element_with_text("Fred", 1){ |c| c.should == @fred} + end - it "takes XPath filter as third argument" do - @document.each_element_with_text("Fred", 0, "Person"){ |c| c.should == @fred} + it "takes XPath filter as third argument" do + @document.each_element_with_text("Fred", 0, "Person"){ |c| c.should == @fred} + end end end diff --git a/spec/ruby/library/rexml/element/element_reference_spec.rb b/spec/ruby/library/rexml/element/element_reference_spec.rb index 9660ff7507e96e..0deaf990eb927e 100644 --- a/spec/ruby/library/rexml/element/element_reference_spec.rb +++ b/spec/ruby/library/rexml/element/element_reference_spec.rb @@ -1,20 +1,23 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#[]" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - before :each do - @doc = REXML::Document.new("") - @child = REXML::Element.new("child") - @doc.root.add_element @child - end + describe "REXML::Element#[]" do - it "return attribute value if argument is string or symbol" do - @doc.root[:foo].should == 'bar' - @doc.root['foo'].should == 'bar' - end + before :each do + @doc = REXML::Document.new("") + @child = REXML::Element.new("child") + @doc.root.add_element @child + end + + it "return attribute value if argument is string or symbol" do + @doc.root[:foo].should == 'bar' + @doc.root['foo'].should == 'bar' + end - it "return nth element if argument is int" do - @doc.root[0].should == @child + it "return nth element if argument is int" do + @doc.root[0].should == @child + end end end diff --git a/spec/ruby/library/rexml/element/get_text_spec.rb b/spec/ruby/library/rexml/element/get_text_spec.rb index 8ee9ea0824d4a0..cfdc758acdd91d 100644 --- a/spec/ruby/library/rexml/element/get_text_spec.rb +++ b/spec/ruby/library/rexml/element/get_text_spec.rb @@ -1,18 +1,21 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#get_text" do - before :each do - @doc = REXML::Document.new "

some textthis is bold! more text

" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the first text child node" do - @doc.root.get_text.value.should == "some text" - @doc.root.get_text.should be_kind_of(REXML::Text) - end + describe "REXML::Element#get_text" do + before :each do + @doc = REXML::Document.new "

some textthis is bold! more text

" + end + + it "returns the first text child node" do + @doc.root.get_text.value.should == "some text" + @doc.root.get_text.should be_kind_of(REXML::Text) + end - it "returns text from an element matching path" do - @doc.root.get_text("b").value.should == "this is bold!" - @doc.root.get_text("b").should be_kind_of(REXML::Text) + it "returns text from an element matching path" do + @doc.root.get_text("b").value.should == "this is bold!" + @doc.root.get_text("b").should be_kind_of(REXML::Text) + end end end diff --git a/spec/ruby/library/rexml/element/has_attributes_spec.rb b/spec/ruby/library/rexml/element/has_attributes_spec.rb index f89ec675f508dd..83d71396c4fc5a 100644 --- a/spec/ruby/library/rexml/element/has_attributes_spec.rb +++ b/spec/ruby/library/rexml/element/has_attributes_spec.rb @@ -1,17 +1,20 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#has_attributes?" do - before :each do - @e = REXML::Element.new("test_elem") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns true when element has any attributes" do - @e.add_attribute("name", "Joe") - @e.has_attributes?.should be_true - end + describe "REXML::Element#has_attributes?" do + before :each do + @e = REXML::Element.new("test_elem") + end + + it "returns true when element has any attributes" do + @e.add_attribute("name", "Joe") + @e.has_attributes?.should be_true + end - it "returns false if element has no attributes" do - @e.has_attributes?.should be_false + it "returns false if element has no attributes" do + @e.has_attributes?.should be_false + end end end diff --git a/spec/ruby/library/rexml/element/has_elements_spec.rb b/spec/ruby/library/rexml/element/has_elements_spec.rb index dc5fc9c25b1cfb..815a987ca0aabf 100644 --- a/spec/ruby/library/rexml/element/has_elements_spec.rb +++ b/spec/ruby/library/rexml/element/has_elements_spec.rb @@ -1,18 +1,21 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#has_elements?" do - before :each do - @e = REXML::Element.new("root") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns true if element has child elements" do - child = REXML::Element.new("child") - @e << child - @e.has_elements?.should be_true - end + describe "REXML::Element#has_elements?" do + before :each do + @e = REXML::Element.new("root") + end + + it "returns true if element has child elements" do + child = REXML::Element.new("child") + @e << child + @e.has_elements?.should be_true + end - it "returns false if element doesn't have child elements" do - @e.has_elements?.should be_false + it "returns false if element doesn't have child elements" do + @e.has_elements?.should be_false + end end end diff --git a/spec/ruby/library/rexml/element/has_text_spec.rb b/spec/ruby/library/rexml/element/has_text_spec.rb index e9d5a176cb57ad..f2c5bc4ffaaaf8 100644 --- a/spec/ruby/library/rexml/element/has_text_spec.rb +++ b/spec/ruby/library/rexml/element/has_text_spec.rb @@ -1,16 +1,19 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#has_text?" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns true if element has a Text child" do - e = REXML::Element.new("Person") - e.text = "My text" - e.has_text?.should be_true - end + describe "REXML::Element#has_text?" do + + it "returns true if element has a Text child" do + e = REXML::Element.new("Person") + e.text = "My text" + e.has_text?.should be_true + end - it "returns false if it has no Text childs" do - e = REXML::Element.new("Person") - e.has_text?.should be_false + it "returns false if it has no Text childs" do + e = REXML::Element.new("Person") + e.has_text?.should be_false + end end end diff --git a/spec/ruby/library/rexml/element/inspect_spec.rb b/spec/ruby/library/rexml/element/inspect_spec.rb index f45edd0b1f7790..5eb8ef22650616 100644 --- a/spec/ruby/library/rexml/element/inspect_spec.rb +++ b/spec/ruby/library/rexml/element/inspect_spec.rb @@ -1,27 +1,30 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#inspect" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - before :each do - @name = REXML::Element.new "name" - end + describe "REXML::Element#inspect" do - it "returns the node as a string" do - @name.inspect.should == "" - end + before :each do + @name = REXML::Element.new "name" + end - it "inserts '...' if the node has children" do - e = REXML::Element.new "last_name" - @name << e - @name.inspect.should == " ... " - # This might make more sense but differs from MRI's default behavior - # @name.inspect.should == " ... " - end + it "returns the node as a string" do + @name.inspect.should == "" + end + + it "inserts '...' if the node has children" do + e = REXML::Element.new "last_name" + @name << e + @name.inspect.should == " ... " + # This might make more sense but differs from MRI's default behavior + # @name.inspect.should == " ... " + end - it "inserts the attributes in the string" do - @name.add_attribute "language" - @name.attributes["language"] = "english" - @name.inspect.should == "" + it "inserts the attributes in the string" do + @name.add_attribute "language" + @name.attributes["language"] = "english" + @name.inspect.should == "" + end end end diff --git a/spec/ruby/library/rexml/element/instructions_spec.rb b/spec/ruby/library/rexml/element/instructions_spec.rb index aa2d192e7ce0ca..bd9dfcef50448e 100644 --- a/spec/ruby/library/rexml/element/instructions_spec.rb +++ b/spec/ruby/library/rexml/element/instructions_spec.rb @@ -1,21 +1,24 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#instructions" do - before :each do - @elem = REXML::Element.new("root") - end - it "returns the Instruction children nodes" do - inst = REXML::Instruction.new("xml-stylesheet", "href='headlines.css'") - @elem << inst - @elem.instructions.first.should == inst - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns an empty array if it has no Instruction children" do - @elem.instructions.should be_empty - end + describe "REXML::Element#instructions" do + before :each do + @elem = REXML::Element.new("root") + end + it "returns the Instruction children nodes" do + inst = REXML::Instruction.new("xml-stylesheet", "href='headlines.css'") + @elem << inst + @elem.instructions.first.should == inst + end + + it "returns an empty array if it has no Instruction children" do + @elem.instructions.should be_empty + end - it "freezes the returned array" do - @elem.instructions.frozen?.should be_true + it "freezes the returned array" do + @elem.instructions.frozen?.should be_true + end end end diff --git a/spec/ruby/library/rexml/element/namespace_spec.rb b/spec/ruby/library/rexml/element/namespace_spec.rb index 89662f3599735c..a3598878260acd 100644 --- a/spec/ruby/library/rexml/element/namespace_spec.rb +++ b/spec/ruby/library/rexml/element/namespace_spec.rb @@ -1,27 +1,30 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#namespace" do - before :each do - @doc = REXML::Document.new("") - @elem = @doc.elements["//b"] - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the default namespace" do - @elem.namespace.should == "1" - end + describe "REXML::Element#namespace" do + before :each do + @doc = REXML::Document.new("") + @elem = @doc.elements["//b"] + end - it "accepts a namespace prefix" do - @elem.namespace("y").should == "2" - @doc.elements["//c"].namespace("z").should == "3" - end + it "returns the default namespace" do + @elem.namespace.should == "1" + end - it "returns an empty String if default namespace is not defined" do - e = REXML::Document.new("") - e.root.namespace.should be_empty - end + it "accepts a namespace prefix" do + @elem.namespace("y").should == "2" + @doc.elements["//c"].namespace("z").should == "3" + end + + it "returns an empty String if default namespace is not defined" do + e = REXML::Document.new("") + e.root.namespace.should be_empty + end - it "returns nil if namespace is not defined" do - @elem.namespace("z").should be_nil + it "returns nil if namespace is not defined" do + @elem.namespace("z").should be_nil + end end end diff --git a/spec/ruby/library/rexml/element/namespaces_spec.rb b/spec/ruby/library/rexml/element/namespaces_spec.rb index a84c1d1dabcd7f..7bf8ec64213134 100644 --- a/spec/ruby/library/rexml/element/namespaces_spec.rb +++ b/spec/ruby/library/rexml/element/namespaces_spec.rb @@ -1,32 +1,35 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#namespaces" do - before :each do - doc = REXML::Document.new("") - @elem = doc.elements["//c"] - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns a hash of the namespaces" do - ns = {"y"=>"2", "z"=>"3", "xmlns"=>"1"} - @elem.namespaces.keys.sort.should == ns.keys.sort - @elem.namespaces.values.sort.should == ns.values.sort - end + describe "REXML::Element#namespaces" do + before :each do + doc = REXML::Document.new("") + @elem = doc.elements["//c"] + end - it "returns an empty hash if no namespaces exist" do - e = REXML::Element.new "element" - e.namespaces.kind_of?(Hash).should == true - e.namespaces.should be_empty - end + it "returns a hash of the namespaces" do + ns = {"y"=>"2", "z"=>"3", "xmlns"=>"1"} + @elem.namespaces.keys.sort.should == ns.keys.sort + @elem.namespaces.values.sort.should == ns.values.sort + end - it "uses namespace prefixes as keys" do - prefixes = ["y", "z", "xmlns"] - @elem.namespaces.keys.sort.should == prefixes.sort - end + it "returns an empty hash if no namespaces exist" do + e = REXML::Element.new "element" + e.namespaces.kind_of?(Hash).should == true + e.namespaces.should be_empty + end - it "uses namespace values as the hash values" do - values = ["2", "3", "1"] - @elem.namespaces.values.sort.should == values.sort - end + it "uses namespace prefixes as keys" do + prefixes = ["y", "z", "xmlns"] + @elem.namespaces.keys.sort.should == prefixes.sort + end + + it "uses namespace values as the hash values" do + values = ["2", "3", "1"] + @elem.namespaces.values.sort.should == values.sort + end + end end diff --git a/spec/ruby/library/rexml/element/new_spec.rb b/spec/ruby/library/rexml/element/new_spec.rb index 4ffdf4dabec0d8..35a8438495112e 100644 --- a/spec/ruby/library/rexml/element/new_spec.rb +++ b/spec/ruby/library/rexml/element/new_spec.rb @@ -1,35 +1,38 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#new" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "creates element from tag name" do - REXML::Element.new("foo").name.should == "foo" - end + describe "REXML::Element#new" do - it "creates element with default attributes" do - e = REXML::Element.new - e.name.should == REXML::Element::UNDEFINED - e.context.should == nil - e.parent.should == nil - end + it "creates element from tag name" do + REXML::Element.new("foo").name.should == "foo" + end - it "creates element from another element" do - e = REXML::Element.new "foo" - f = REXML::Element.new e - e.name.should == f.name - e.context.should == f.context - e.parent.should == f.parent - end + it "creates element with default attributes" do + e = REXML::Element.new + e.name.should == REXML::Element::UNDEFINED + e.context.should == nil + e.parent.should == nil + end - it "takes parent as second argument" do - parent = REXML::Element.new "foo" - child = REXML::Element.new "bar", parent - child.parent.should == parent - end + it "creates element from another element" do + e = REXML::Element.new "foo" + f = REXML::Element.new e + e.name.should == f.name + e.context.should == f.context + e.parent.should == f.parent + end + + it "takes parent as second argument" do + parent = REXML::Element.new "foo" + child = REXML::Element.new "bar", parent + child.parent.should == parent + end - it "takes context as third argument" do - context = {"some_key" => "some_value"} - REXML::Element.new("foo", nil, context).context.should == context + it "takes context as third argument" do + context = {"some_key" => "some_value"} + REXML::Element.new("foo", nil, context).context.should == context + end end end diff --git a/spec/ruby/library/rexml/element/next_element_spec.rb b/spec/ruby/library/rexml/element/next_element_spec.rb index 5b6d6cad9bfbab..2c7875a24822b8 100644 --- a/spec/ruby/library/rexml/element/next_element_spec.rb +++ b/spec/ruby/library/rexml/element/next_element_spec.rb @@ -1,19 +1,22 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#next_element" do - before :each do - @a = REXML::Element.new "a" - @b = REXML::Element.new "b" - @c = REXML::Element.new "c" - @a.root << @b - @a.root << @c - end - it "returns next existing element" do - @a.elements["b"].next_element.should == @c - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Element#next_element" do + before :each do + @a = REXML::Element.new "a" + @b = REXML::Element.new "b" + @c = REXML::Element.new "c" + @a.root << @b + @a.root << @c + end + it "returns next existing element" do + @a.elements["b"].next_element.should == @c + end - it "returns nil on last element" do - @a.elements["c"].next_element.should == nil + it "returns nil on last element" do + @a.elements["c"].next_element.should == nil + end end end diff --git a/spec/ruby/library/rexml/element/node_type_spec.rb b/spec/ruby/library/rexml/element/node_type_spec.rb index bcab9e126d87fd..d641dd89d3e40b 100644 --- a/spec/ruby/library/rexml/element/node_type_spec.rb +++ b/spec/ruby/library/rexml/element/node_type_spec.rb @@ -1,8 +1,11 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#node_type" do - it "returns :element" do - REXML::Element.new("MyElem").node_type.should == :element +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Element#node_type" do + it "returns :element" do + REXML::Element.new("MyElem").node_type.should == :element + end end end diff --git a/spec/ruby/library/rexml/element/prefixes_spec.rb b/spec/ruby/library/rexml/element/prefixes_spec.rb index b6edf9a84729e9..77557e165a8005 100644 --- a/spec/ruby/library/rexml/element/prefixes_spec.rb +++ b/spec/ruby/library/rexml/element/prefixes_spec.rb @@ -1,23 +1,26 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#prefixes" do - before :each do - doc = REXML::Document.new("") - @elem = doc.elements["//c"] - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns an array of the prefixes of the namespaces" do - @elem.prefixes.should == ["y", "z"] - end + describe "REXML::Element#prefixes" do + before :each do + doc = REXML::Document.new("") + @elem = doc.elements["//c"] + end - it "does not include the default namespace" do - @elem.prefixes.include?("xmlns").should == false - end + it "returns an array of the prefixes of the namespaces" do + @elem.prefixes.should == ["y", "z"] + end + + it "does not include the default namespace" do + @elem.prefixes.include?("xmlns").should == false + end - it "returns an empty array if no namespace was defined" do - doc = REXML::Document.new "" - root = doc.elements["//root"] - root.prefixes.should == [] + it "returns an empty array if no namespace was defined" do + doc = REXML::Document.new "" + root = doc.elements["//root"] + root.prefixes.should == [] + end end end diff --git a/spec/ruby/library/rexml/element/previous_element_spec.rb b/spec/ruby/library/rexml/element/previous_element_spec.rb index 2fe79d955f6bb9..aa19c187beb33b 100644 --- a/spec/ruby/library/rexml/element/previous_element_spec.rb +++ b/spec/ruby/library/rexml/element/previous_element_spec.rb @@ -1,20 +1,23 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#previous_element" do - before :each do - @a = REXML::Element.new "a" - @b = REXML::Element.new "b" - @c = REXML::Element.new "c" - @a.root << @b - @a.root << @c - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns previous element" do - @a.elements["c"].previous_element.should == @b - end + describe "REXML::Element#previous_element" do + before :each do + @a = REXML::Element.new "a" + @b = REXML::Element.new "b" + @c = REXML::Element.new "c" + @a.root << @b + @a.root << @c + end + + it "returns previous element" do + @a.elements["c"].previous_element.should == @b + end - it "returns nil on first element" do - @a.elements["b"].previous_element.should == nil + it "returns nil on first element" do + @a.elements["b"].previous_element.should == nil + end end end diff --git a/spec/ruby/library/rexml/element/raw_spec.rb b/spec/ruby/library/rexml/element/raw_spec.rb index 404ccce5f4b667..2a913e1ac705dc 100644 --- a/spec/ruby/library/rexml/element/raw_spec.rb +++ b/spec/ruby/library/rexml/element/raw_spec.rb @@ -1,24 +1,27 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#raw" do - it "returns true if raw mode is set to all" do - REXML::Element.new("MyElem", nil, {raw: :all}).raw.should == true - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns true if raw mode is set to expanded_name" do - REXML::Element.new("MyElem", nil, {raw: "MyElem"}).raw.should == true - end + describe "REXML::Element#raw" do + it "returns true if raw mode is set to all" do + REXML::Element.new("MyElem", nil, {raw: :all}).raw.should == true + end - it "returns false if raw mode is not set" do - REXML::Element.new("MyElem", nil, {raw: ""}).raw.should == false - end + it "returns true if raw mode is set to expanded_name" do + REXML::Element.new("MyElem", nil, {raw: "MyElem"}).raw.should == true + end - it "returns false if raw is not :all or expanded_name" do - REXML::Element.new("MyElem", nil, {raw: "Something"}).raw.should == false - end + it "returns false if raw mode is not set" do + REXML::Element.new("MyElem", nil, {raw: ""}).raw.should == false + end + + it "returns false if raw is not :all or expanded_name" do + REXML::Element.new("MyElem", nil, {raw: "Something"}).raw.should == false + end - it "returns nil if context is not set" do - REXML::Element.new("MyElem").raw.should == nil + it "returns nil if context is not set" do + REXML::Element.new("MyElem").raw.should == nil + end end end diff --git a/spec/ruby/library/rexml/element/root_spec.rb b/spec/ruby/library/rexml/element/root_spec.rb index 1e0669033e86ce..4e88446ac25f41 100644 --- a/spec/ruby/library/rexml/element/root_spec.rb +++ b/spec/ruby/library/rexml/element/root_spec.rb @@ -1,28 +1,31 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Element#root" do - before :each do - @doc = REXML::Document.new - @root = REXML::Element.new "root" - @node = REXML::Element.new "node" - @doc << @root << @node - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns first child on documents" do - @doc.root.should == @root - end + describe "REXML::Element#root" do + before :each do + @doc = REXML::Document.new + @root = REXML::Element.new "root" + @node = REXML::Element.new "node" + @doc << @root << @node + end - it "returns self on root nodes" do - @root.root.should == @root - end + it "returns first child on documents" do + @doc.root.should == @root + end - it "returns parent's root on child nodes" do - @node.root.should == @root - end + it "returns self on root nodes" do + @root.root.should == @root + end + + it "returns parent's root on child nodes" do + @node.root.should == @root + end - it "returns self on standalone nodes" do - e = REXML::Element.new "Elem" # Note that it doesn't have a parent node - e.root.should == e + it "returns self on standalone nodes" do + e = REXML::Element.new "Elem" # Note that it doesn't have a parent node + e.root.should == e + end end end diff --git a/spec/ruby/library/rexml/element/text_spec.rb b/spec/ruby/library/rexml/element/text_spec.rb index 7c290c4cdac6ec..b7d493589e9f5a 100644 --- a/spec/ruby/library/rexml/element/text_spec.rb +++ b/spec/ruby/library/rexml/element/text_spec.rb @@ -1,46 +1,49 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#text" do - before :each do - @e = REXML::Element.new "name" - @e.text = "John" - end - - it "returns the text node of element" do - @e.text.should == "John" - end - - it "returns the text node value" do - t = REXML::Text.new "Joe" - @e.text = t - @e.text.should == "Joe" - @e.text.should_not == t - end - - it "returns nil if no text is attached" do - elem = REXML::Element.new "name" - elem.text.should == nil - end -end - -describe "REXML::Element#text=" do - before :each do - @e = REXML::Element.new "name" - @e.text = "John" - end - - it "sets the text node" do - @e.to_s.should == "John" - end - - it "replaces existing text" do - @e.text = "Joe" - @e.to_s.should == "Joe" - end - - it "receives nil as an argument" do - @e.text = nil - @e.to_s.should == "" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Element#text" do + before :each do + @e = REXML::Element.new "name" + @e.text = "John" + end + + it "returns the text node of element" do + @e.text.should == "John" + end + + it "returns the text node value" do + t = REXML::Text.new "Joe" + @e.text = t + @e.text.should == "Joe" + @e.text.should_not == t + end + + it "returns nil if no text is attached" do + elem = REXML::Element.new "name" + elem.text.should == nil + end + end + + describe "REXML::Element#text=" do + before :each do + @e = REXML::Element.new "name" + @e.text = "John" + end + + it "sets the text node" do + @e.to_s.should == "John" + end + + it "replaces existing text" do + @e.text = "Joe" + @e.to_s.should == "Joe" + end + + it "receives nil as an argument" do + @e.text = nil + @e.to_s.should == "" + end end end diff --git a/spec/ruby/library/rexml/element/texts_spec.rb b/spec/ruby/library/rexml/element/texts_spec.rb index 7975833c89a2f4..7f610ba31b758a 100644 --- a/spec/ruby/library/rexml/element/texts_spec.rb +++ b/spec/ruby/library/rexml/element/texts_spec.rb @@ -1,16 +1,19 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#texts" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns an array of the Text children" do - e = REXML::Element.new("root") - e.add_text "First" - e.add_text "Second" - e.texts.should == ["FirstSecond"] - end + describe "REXML::Element#texts" do + + it "returns an array of the Text children" do + e = REXML::Element.new("root") + e.add_text "First" + e.add_text "Second" + e.texts.should == ["FirstSecond"] + end - it "returns an empty array if it has no Text children" do - REXML::Element.new("root").texts.should == [] + it "returns an empty array if it has no Text children" do + REXML::Element.new("root").texts.should == [] + end end end diff --git a/spec/ruby/library/rexml/element/whitespace_spec.rb b/spec/ruby/library/rexml/element/whitespace_spec.rb index dc785ae5cec919..8cd2e5b5e8bf8b 100644 --- a/spec/ruby/library/rexml/element/whitespace_spec.rb +++ b/spec/ruby/library/rexml/element/whitespace_spec.rb @@ -1,23 +1,26 @@ -require 'rexml/document' require_relative '../../../spec_helper' -describe "REXML::Element#whitespace" do - it "returns true if whitespace is respected in the element" do - e = REXML::Element.new("root") - e.whitespace.should be_true +ruby_version_is ''...'2.8' do + require 'rexml/document' - e = REXML::Element.new("root", nil, respect_whitespace: :all) - e.whitespace.should be_true + describe "REXML::Element#whitespace" do + it "returns true if whitespace is respected in the element" do + e = REXML::Element.new("root") + e.whitespace.should be_true - e = REXML::Element.new("root", nil, respect_whitespace: ["root"]) - e.whitespace.should be_true - end + e = REXML::Element.new("root", nil, respect_whitespace: :all) + e.whitespace.should be_true + + e = REXML::Element.new("root", nil, respect_whitespace: ["root"]) + e.whitespace.should be_true + end - it "returns false if whitespace is ignored inside element" do - e = REXML::Element.new("root", nil, compress_whitespace: :all) - e.whitespace.should be_false + it "returns false if whitespace is ignored inside element" do + e = REXML::Element.new("root", nil, compress_whitespace: :all) + e.whitespace.should be_false - e = REXML::Element.new("root", nil, compress_whitespace: ["root"]) - e.whitespace.should be_false + e = REXML::Element.new("root", nil, compress_whitespace: ["root"]) + e.whitespace.should be_false + end end end diff --git a/spec/ruby/library/rexml/node/each_recursive_spec.rb b/spec/ruby/library/rexml/node/each_recursive_spec.rb index dd4aa9a2f256bc..4a669a399dfb67 100644 --- a/spec/ruby/library/rexml/node/each_recursive_spec.rb +++ b/spec/ruby/library/rexml/node/each_recursive_spec.rb @@ -1,21 +1,24 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#each_recursive" do - before :each do - @doc = REXML::Document.new - @doc << REXML::XMLDecl.new - @root = REXML::Element.new "root" - @child1 = REXML::Element.new "child1" - @child2 = REXML::Element.new "child2" - @root << @child1 - @root << @child2 - @doc << @root - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Node#each_recursive" do + before :each do + @doc = REXML::Document.new + @doc << REXML::XMLDecl.new + @root = REXML::Element.new "root" + @child1 = REXML::Element.new "child1" + @child2 = REXML::Element.new "child2" + @root << @child1 + @root << @child2 + @doc << @root + end - it "visits all subnodes of self" do - nodes = [] - @doc.each_recursive { |node| nodes << node} - nodes.should == [@root, @child1, @child2] + it "visits all subnodes of self" do + nodes = [] + @doc.each_recursive { |node| nodes << node} + nodes.should == [@root, @child1, @child2] + end end end diff --git a/spec/ruby/library/rexml/node/find_first_recursive_spec.rb b/spec/ruby/library/rexml/node/find_first_recursive_spec.rb index ba46f2ca35c85f..ab7900a3ac6727 100644 --- a/spec/ruby/library/rexml/node/find_first_recursive_spec.rb +++ b/spec/ruby/library/rexml/node/find_first_recursive_spec.rb @@ -1,25 +1,28 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#find_first_recursive" do - before :each do - @e = REXML::Element.new("root") - @node1 = REXML::Element.new("node") - @node2 = REXML::Element.new("another node") - @subnode = REXML::Element.new("another node") - @node1 << @subnode - @e << @node1 - @e << @node2 - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "finds the first element that matches block" do - found = @e.find_first_recursive { |n| n.to_s == ""} - found.should == @node1 - end + describe "REXML::Node#find_first_recursive" do + before :each do + @e = REXML::Element.new("root") + @node1 = REXML::Element.new("node") + @node2 = REXML::Element.new("another node") + @subnode = REXML::Element.new("another node") + @node1 << @subnode + @e << @node1 + @e << @node2 + end + + it "finds the first element that matches block" do + found = @e.find_first_recursive { |n| n.to_s == ""} + found.should == @node1 + end - it "visits the nodes in preorder" do - found = @e.find_first_recursive { |n| n.to_s == ""} - found.should == @subnode - found.should_not == @node2 + it "visits the nodes in preorder" do + found = @e.find_first_recursive { |n| n.to_s == ""} + found.should == @subnode + found.should_not == @node2 + end end end diff --git a/spec/ruby/library/rexml/node/index_in_parent_spec.rb b/spec/ruby/library/rexml/node/index_in_parent_spec.rb index 092851e3e78265..1c75c8cd54d918 100644 --- a/spec/ruby/library/rexml/node/index_in_parent_spec.rb +++ b/spec/ruby/library/rexml/node/index_in_parent_spec.rb @@ -1,15 +1,18 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#index_in_parent" do - it "returns the index (starting from 1) of self in parent" do - e = REXML::Element.new("root") - node1 = REXML::Element.new("node") - node2 = REXML::Element.new("another node") - e << node1 - e << node2 +ruby_version_is ''...'2.8' do + require 'rexml/document' - node1.index_in_parent.should == 1 - node2.index_in_parent.should == 2 + describe "REXML::Node#index_in_parent" do + it "returns the index (starting from 1) of self in parent" do + e = REXML::Element.new("root") + node1 = REXML::Element.new("node") + node2 = REXML::Element.new("another node") + e << node1 + e << node2 + + node1.index_in_parent.should == 1 + node2.index_in_parent.should == 2 + end end end diff --git a/spec/ruby/library/rexml/node/next_sibling_node_spec.rb b/spec/ruby/library/rexml/node/next_sibling_node_spec.rb index 2e8601627d12e2..0aac3fee0f9dff 100644 --- a/spec/ruby/library/rexml/node/next_sibling_node_spec.rb +++ b/spec/ruby/library/rexml/node/next_sibling_node_spec.rb @@ -1,21 +1,24 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#next_sibling_node" do - before :each do - @e = REXML::Element.new("root") - @node1 = REXML::Element.new("node") - @node2 = REXML::Element.new("another node") - @e << @node1 - @e << @node2 - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the next child node in parent" do - @node1.next_sibling_node.should == @node2 - end + describe "REXML::Node#next_sibling_node" do + before :each do + @e = REXML::Element.new("root") + @node1 = REXML::Element.new("node") + @node2 = REXML::Element.new("another node") + @e << @node1 + @e << @node2 + end + + it "returns the next child node in parent" do + @node1.next_sibling_node.should == @node2 + end - it "returns nil if there are no more child nodes next" do - @node2.next_sibling_node.should == nil - @e.next_sibling_node.should == nil + it "returns nil if there are no more child nodes next" do + @node2.next_sibling_node.should == nil + @e.next_sibling_node.should == nil + end end end diff --git a/spec/ruby/library/rexml/node/parent_spec.rb b/spec/ruby/library/rexml/node/parent_spec.rb index d88ba696579903..693ee9d5c200a9 100644 --- a/spec/ruby/library/rexml/node/parent_spec.rb +++ b/spec/ruby/library/rexml/node/parent_spec.rb @@ -1,20 +1,23 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#parent?" do - it "returns true for Elements" do - e = REXML::Element.new("foo") - e.parent?.should == true - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns true for Documents" do - e = REXML::Document.new - e.parent?.should == true - end + describe "REXML::Node#parent?" do + it "returns true for Elements" do + e = REXML::Element.new("foo") + e.parent?.should == true + end + + it "returns true for Documents" do + e = REXML::Document.new + e.parent?.should == true + end - # This includes attributes, CDatas and declarations. - it "returns false for Texts" do - e = REXML::Text.new("foo") - e.parent?.should == false + # This includes attributes, CDatas and declarations. + it "returns false for Texts" do + e = REXML::Text.new("foo") + e.parent?.should == false + end end end diff --git a/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb b/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb index 8b96f1565af2fc..ca07e1e1f9d7fc 100644 --- a/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb +++ b/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb @@ -1,21 +1,24 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Node#previous_sibling_node" do - before :each do - @e = REXML::Element.new("root") - @node1 = REXML::Element.new("node") - @node2 = REXML::Element.new("another node") - @e << @node1 - @e << @node2 - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns the previous child node in parent" do - @node2.previous_sibling_node.should == @node1 - end + describe "REXML::Node#previous_sibling_node" do + before :each do + @e = REXML::Element.new("root") + @node1 = REXML::Element.new("node") + @node2 = REXML::Element.new("another node") + @e << @node1 + @e << @node2 + end + + it "returns the previous child node in parent" do + @node2.previous_sibling_node.should == @node1 + end - it "returns nil if there are no more child nodes before" do - @node1.previous_sibling_node.should == nil - @e.previous_sibling_node.should == nil + it "returns nil if there are no more child nodes before" do + @node1.previous_sibling_node.should == nil + @e.previous_sibling_node.should == nil + end end end diff --git a/spec/ruby/library/rexml/text/append_spec.rb b/spec/ruby/library/rexml/text/append_spec.rb index de281fb0b0e974..be5636e84d28ba 100644 --- a/spec/ruby/library/rexml/text/append_spec.rb +++ b/spec/ruby/library/rexml/text/append_spec.rb @@ -1,10 +1,13 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#<<" do - it "appends a string to this text node" do - text = REXML::Text.new("foo") - text << "bar" - text.should == "foobar" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text#<<" do + it "appends a string to this text node" do + text = REXML::Text.new("foo") + text << "bar" + text.should == "foobar" + end end end diff --git a/spec/ruby/library/rexml/text/clone_spec.rb b/spec/ruby/library/rexml/text/clone_spec.rb index 8031e140c7dfcc..28feef40e9c055 100644 --- a/spec/ruby/library/rexml/text/clone_spec.rb +++ b/spec/ruby/library/rexml/text/clone_spec.rb @@ -1,10 +1,13 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#clone" do - it "creates a copy of this node" do - text = REXML::Text.new("foo") - text.clone.should == "foo" - text.clone.should == text +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text#clone" do + it "creates a copy of this node" do + text = REXML::Text.new("foo") + text.clone.should == "foo" + text.clone.should == text + end end end diff --git a/spec/ruby/library/rexml/text/comparison_spec.rb b/spec/ruby/library/rexml/text/comparison_spec.rb index 8bc5d66a03eb0f..ebd95683c66d11 100644 --- a/spec/ruby/library/rexml/text/comparison_spec.rb +++ b/spec/ruby/library/rexml/text/comparison_spec.rb @@ -1,25 +1,28 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#<=>" do - before :each do - @first = REXML::Text.new("abc") - @last = REXML::Text.new("def") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "returns -1 if lvalue is less than rvalue" do - val = @first <=> @last - val.should == -1 - end + describe "REXML::Text#<=>" do + before :each do + @first = REXML::Text.new("abc") + @last = REXML::Text.new("def") + end - it "returns -1 if lvalue is greater than rvalue" do - val = @last <=> @first - val.should == 1 - end + it "returns -1 if lvalue is less than rvalue" do + val = @first <=> @last + val.should == -1 + end + + it "returns -1 if lvalue is greater than rvalue" do + val = @last <=> @first + val.should == 1 + end - it "returns 0 if both values are equal" do - tmp = REXML::Text.new("tmp") - val = tmp <=> tmp - val.should == 0 + it "returns 0 if both values are equal" do + tmp = REXML::Text.new("tmp") + val = tmp <=> tmp + val.should == 0 + end end end diff --git a/spec/ruby/library/rexml/text/empty_spec.rb b/spec/ruby/library/rexml/text/empty_spec.rb index d0b66b7a2a107b..392b536a4cf24c 100644 --- a/spec/ruby/library/rexml/text/empty_spec.rb +++ b/spec/ruby/library/rexml/text/empty_spec.rb @@ -1,12 +1,15 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#empty?" do - it "returns true if the text is empty" do - REXML::Text.new("").empty?.should == true - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text#empty?" do + it "returns true if the text is empty" do + REXML::Text.new("").empty?.should == true + end - it "returns false if the text is not empty" do - REXML::Text.new("some_text").empty?.should == false + it "returns false if the text is not empty" do + REXML::Text.new("some_text").empty?.should == false + end end end diff --git a/spec/ruby/library/rexml/text/indent_text_spec.rb b/spec/ruby/library/rexml/text/indent_text_spec.rb index 1b0ee5ab16bb5e..16cba7faf67695 100644 --- a/spec/ruby/library/rexml/text/indent_text_spec.rb +++ b/spec/ruby/library/rexml/text/indent_text_spec.rb @@ -1,23 +1,26 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#indent_text" do - before :each do - @t = REXML::Text.new("") - end - it "indents a string with default parameters" do - @t.indent_text("foo").should == "\tfoo" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "accepts a custom indentation level as second argument" do - @t.indent_text("foo", 2, "\t", true).should == "\t\tfoo" - end + describe "REXML::Text#indent_text" do + before :each do + @t = REXML::Text.new("") + end + it "indents a string with default parameters" do + @t.indent_text("foo").should == "\tfoo" + end - it "accepts a custom separator as third argument" do - @t.indent_text("foo", 1, "\n", true).should == "\nfoo" - end + it "accepts a custom indentation level as second argument" do + @t.indent_text("foo", 2, "\t", true).should == "\t\tfoo" + end + + it "accepts a custom separator as third argument" do + @t.indent_text("foo", 1, "\n", true).should == "\nfoo" + end - it "accepts a fourth parameter to skip the first line" do - @t.indent_text("foo", 1, "\t", false).should == "foo" + it "accepts a fourth parameter to skip the first line" do + @t.indent_text("foo", 1, "\t", false).should == "foo" + end end end diff --git a/spec/ruby/library/rexml/text/inspect_spec.rb b/spec/ruby/library/rexml/text/inspect_spec.rb index 0d66088a6457b5..87203b246c8a37 100644 --- a/spec/ruby/library/rexml/text/inspect_spec.rb +++ b/spec/ruby/library/rexml/text/inspect_spec.rb @@ -1,8 +1,11 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#inspect" do - it "inspects the string attribute as a string" do - REXML::Text.new("a text").inspect.should == "a text".inspect +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text#inspect" do + it "inspects the string attribute as a string" do + REXML::Text.new("a text").inspect.should == "a text".inspect + end end end diff --git a/spec/ruby/library/rexml/text/new_spec.rb b/spec/ruby/library/rexml/text/new_spec.rb index 3c081dec30c5f7..7a39f11fa6dd17 100644 --- a/spec/ruby/library/rexml/text/new_spec.rb +++ b/spec/ruby/library/rexml/text/new_spec.rb @@ -1,48 +1,51 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text.new" do - - it "creates a Text child node with no parent" do - t = REXML::Text.new("test") - t.should be_kind_of(REXML::Child) - t.should == "test" - t.parent.should == nil - end - - it "respects whitespace if second argument is true" do - t = REXML::Text.new("testing whitespace", true) - t.should == "testing whitespace" - t = REXML::Text.new(" ", true) - t.should == " " - end - - it "receives a parent as third argument" do - e = REXML::Element.new("root") - t = REXML::Text.new("test", false, e) - t.parent.should == e - e.to_s.should == "test" - end - - it "expects escaped text if raw is true" do - t = REXML::Text.new("<&>", false, nil, true) - t.should == "<&>" - - ->{ REXML::Text.new("<&>", false, nil, true)}.should raise_error(Exception) - end - - it "uses raw value of the parent if raw is nil" do - e1 = REXML::Element.new("root", nil, { raw: :all}) - -> {REXML::Text.new("<&>", false, e1)}.should raise_error(Exception) - - e2 = REXML::Element.new("root", nil, { raw: []}) - e2.raw.should be_false - t1 = REXML::Text.new("<&>", false, e2) - t1.should == "<&>" - end - - it "escapes the values if raw is false" do - t = REXML::Text.new("<&>", false, nil, false) - t.should == "<&>" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text.new" do + + it "creates a Text child node with no parent" do + t = REXML::Text.new("test") + t.should be_kind_of(REXML::Child) + t.should == "test" + t.parent.should == nil + end + + it "respects whitespace if second argument is true" do + t = REXML::Text.new("testing whitespace", true) + t.should == "testing whitespace" + t = REXML::Text.new(" ", true) + t.should == " " + end + + it "receives a parent as third argument" do + e = REXML::Element.new("root") + t = REXML::Text.new("test", false, e) + t.parent.should == e + e.to_s.should == "test" + end + + it "expects escaped text if raw is true" do + t = REXML::Text.new("<&>", false, nil, true) + t.should == "<&>" + + ->{ REXML::Text.new("<&>", false, nil, true)}.should raise_error(Exception) + end + + it "uses raw value of the parent if raw is nil" do + e1 = REXML::Element.new("root", nil, { raw: :all}) + -> {REXML::Text.new("<&>", false, e1)}.should raise_error(Exception) + + e2 = REXML::Element.new("root", nil, { raw: []}) + e2.raw.should be_false + t1 = REXML::Text.new("<&>", false, e2) + t1.should == "<&>" + end + + it "escapes the values if raw is false" do + t = REXML::Text.new("<&>", false, nil, false) + t.should == "<&>" + end end end diff --git a/spec/ruby/library/rexml/text/node_type_spec.rb b/spec/ruby/library/rexml/text/node_type_spec.rb index 1c25a74dad76ce..17fefb87f141d3 100644 --- a/spec/ruby/library/rexml/text/node_type_spec.rb +++ b/spec/ruby/library/rexml/text/node_type_spec.rb @@ -1,8 +1,11 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#node_type" do - it "returns :text" do - REXML::Text.new("test").node_type.should == :text +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text#node_type" do + it "returns :text" do + REXML::Text.new("test").node_type.should == :text + end end end diff --git a/spec/ruby/library/rexml/text/normalize_spec.rb b/spec/ruby/library/rexml/text/normalize_spec.rb index ce3b2b3b5f5d33..10ce92615aabbe 100644 --- a/spec/ruby/library/rexml/text/normalize_spec.rb +++ b/spec/ruby/library/rexml/text/normalize_spec.rb @@ -1,8 +1,11 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text.normalize" do - it "escapes a string with <, >, &, ' and \" " do - REXML::Text.normalize("< > & \" '").should == "< > & " '" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text.normalize" do + it "escapes a string with <, >, &, ' and \" " do + REXML::Text.normalize("< > & \" '").should == "< > & " '" + end end end diff --git a/spec/ruby/library/rexml/text/read_with_substitution_spec.rb b/spec/ruby/library/rexml/text/read_with_substitution_spec.rb index 83b42f6d6b4cd0..4bf54c1b3136db 100644 --- a/spec/ruby/library/rexml/text/read_with_substitution_spec.rb +++ b/spec/ruby/library/rexml/text/read_with_substitution_spec.rb @@ -1,12 +1,15 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text.read_with_substitution" do - it "reads a text and escapes entities" do - REXML::Text.read_with_substitution("< > & " '").should == "< > & \" '" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text.read_with_substitution" do + it "reads a text and escapes entities" do + REXML::Text.read_with_substitution("< > & " '").should == "< > & \" '" + end - it "accepts an regex for invalid expressions and raises an error if text matches" do - -> {REXML::Text.read_with_substitution("this is illegal", /illegal/)}.should raise_error(Exception) + it "accepts an regex for invalid expressions and raises an error if text matches" do + -> {REXML::Text.read_with_substitution("this is illegal", /illegal/)}.should raise_error(Exception) + end end end diff --git a/spec/ruby/library/rexml/text/to_s_spec.rb b/spec/ruby/library/rexml/text/to_s_spec.rb index 14d7399a60d87e..f7e0e0b2847a75 100644 --- a/spec/ruby/library/rexml/text/to_s_spec.rb +++ b/spec/ruby/library/rexml/text/to_s_spec.rb @@ -1,17 +1,20 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#to_s" do - it "returns the string of this Text node" do - u = REXML::Text.new("sean russell", false, nil, true) - u.to_s.should == "sean russell" +ruby_version_is ''...'2.8' do + require 'rexml/document' - t = REXML::Text.new("some test text") - t.to_s.should == "some test text" - end + describe "REXML::Text#to_s" do + it "returns the string of this Text node" do + u = REXML::Text.new("sean russell", false, nil, true) + u.to_s.should == "sean russell" + + t = REXML::Text.new("some test text") + t.to_s.should == "some test text" + end - it "escapes the text" do - t = REXML::Text.new("& < >") - t.to_s.should == "& < >" + it "escapes the text" do + t = REXML::Text.new("& < >") + t.to_s.should == "& < >" + end end end diff --git a/spec/ruby/library/rexml/text/unnormalize_spec.rb b/spec/ruby/library/rexml/text/unnormalize_spec.rb index 3072809c132468..0f173710fa455d 100644 --- a/spec/ruby/library/rexml/text/unnormalize_spec.rb +++ b/spec/ruby/library/rexml/text/unnormalize_spec.rb @@ -1,8 +1,11 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text.unnormalize" do - it "unescapes a string with the values defined in SETUTITSBUS" do - REXML::Text.unnormalize("< > & " '").should == "< > & \" '" +ruby_version_is ''...'2.8' do + require 'rexml/document' + + describe "REXML::Text.unnormalize" do + it "unescapes a string with the values defined in SETUTITSBUS" do + REXML::Text.unnormalize("< > & " '").should == "< > & \" '" + end end end diff --git a/spec/ruby/library/rexml/text/value_spec.rb b/spec/ruby/library/rexml/text/value_spec.rb index b0545b3cbde941..f5664121286aef 100644 --- a/spec/ruby/library/rexml/text/value_spec.rb +++ b/spec/ruby/library/rexml/text/value_spec.rb @@ -1,37 +1,40 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#value" do - it "returns the text value of this node" do - REXML::Text.new("test").value.should == "test" - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "does not escape entities" do - REXML::Text.new("& \"").value.should == "& \"" - end + describe "REXML::Text#value" do + it "returns the text value of this node" do + REXML::Text.new("test").value.should == "test" + end - it "follows the respect_whitespace attribute" do - REXML::Text.new("test bar", false).value.should == "test bar" - REXML::Text.new("test bar", true).value.should == "test bar" - end + it "does not escape entities" do + REXML::Text.new("& \"").value.should == "& \"" + end - it "ignores the raw attribute" do - REXML::Text.new("sean russell", false, nil, true).value.should == "sean russell" - end -end + it "follows the respect_whitespace attribute" do + REXML::Text.new("test bar", false).value.should == "test bar" + REXML::Text.new("test bar", true).value.should == "test bar" + end -describe "REXML::Text#value=" do - before :each do - @t = REXML::Text.new("new") + it "ignores the raw attribute" do + REXML::Text.new("sean russell", false, nil, true).value.should == "sean russell" + end end - it "sets the text of the node" do - @t.value = "another text" - @t.to_s.should == "another text" - end + describe "REXML::Text#value=" do + before :each do + @t = REXML::Text.new("new") + end + + it "sets the text of the node" do + @t.value = "another text" + @t.to_s.should == "another text" + end - it "escapes entities" do - @t.value = "" - @t.to_s.should == "<a>" + it "escapes entities" do + @t.value = "" + @t.to_s.should == "<a>" + end end end diff --git a/spec/ruby/library/rexml/text/wrap_spec.rb b/spec/ruby/library/rexml/text/wrap_spec.rb index 0b60fd41514d14..415775dd47bd20 100644 --- a/spec/ruby/library/rexml/text/wrap_spec.rb +++ b/spec/ruby/library/rexml/text/wrap_spec.rb @@ -1,20 +1,23 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#wrap" do - before :each do - @t = REXML::Text.new("abc def") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "wraps the text at width" do - @t.wrap("abc def", 3, false).should == "abc\ndef" - end + describe "REXML::Text#wrap" do + before :each do + @t = REXML::Text.new("abc def") + end - it "returns the string if width is greater than the size of the string" do - @t.wrap("abc def", 10, false).should == "abc def" - end + it "wraps the text at width" do + @t.wrap("abc def", 3, false).should == "abc\ndef" + end + + it "returns the string if width is greater than the size of the string" do + @t.wrap("abc def", 10, false).should == "abc def" + end - it "takes a newline at the beginning option as the third parameter" do - @t.wrap("abc def", 3, true).should == "\nabc\ndef" + it "takes a newline at the beginning option as the third parameter" do + @t.wrap("abc def", 3, true).should == "\nabc\ndef" + end end end diff --git a/spec/ruby/library/rexml/text/write_with_substitution_spec.rb b/spec/ruby/library/rexml/text/write_with_substitution_spec.rb index ee79489d8676ce..1737b443d7271e 100644 --- a/spec/ruby/library/rexml/text/write_with_substitution_spec.rb +++ b/spec/ruby/library/rexml/text/write_with_substitution_spec.rb @@ -1,33 +1,36 @@ require_relative '../../../spec_helper' -require 'rexml/document' -describe "REXML::Text#write_with_substitution" do - before :each do - @t = REXML::Text.new("test") - @f = tmp("rexml_spec") - @file = File.open(@f, "w+") - end +ruby_version_is ''...'2.8' do + require 'rexml/document' - after :each do - @file.close - rm_r @f - end + describe "REXML::Text#write_with_substitution" do + before :each do + @t = REXML::Text.new("test") + @f = tmp("rexml_spec") + @file = File.open(@f, "w+") + end - it "writes out the input to a String" do - s = "" - @t.write_with_substitution(s, "some text") - s.should == "some text" - end + after :each do + @file.close + rm_r @f + end - it "writes out the input to an IO" do - @t.write_with_substitution(@file, "some text") - @file.rewind - @file.gets.should == "some text" - end + it "writes out the input to a String" do + s = "" + @t.write_with_substitution(s, "some text") + s.should == "some text" + end + + it "writes out the input to an IO" do + @t.write_with_substitution(@file, "some text") + @file.rewind + @file.gets.should == "some text" + end - it "escapes characters" do - @t.write_with_substitution(@file, "& < >") - @file.rewind - @file.gets.should == "& < >" + it "escapes characters" do + @t.write_with_substitution(@file, "& < >") + @file.rewind + @file.gets.should == "& < >" + end end end From c7ef7d8a7387e427c394c3c0d03b8dd102e97b29 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 12 Jan 2020 09:15:46 +0900 Subject: [PATCH 365/878] Also ignored cve_2014_8080_spec --- spec/ruby/security/cve_2014_8080_spec.rb | 51 +++++++++++++----------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/spec/ruby/security/cve_2014_8080_spec.rb b/spec/ruby/security/cve_2014_8080_spec.rb index 64e22cf3a75760..d881032ef7da37 100644 --- a/spec/ruby/security/cve_2014_8080_spec.rb +++ b/spec/ruby/security/cve_2014_8080_spec.rb @@ -1,32 +1,35 @@ require_relative '../spec_helper' -require 'rexml/document' -describe "REXML::Document.new" do +ruby_version_is ''...'2.8' do + require 'rexml/document' - it "resists CVE-2014-8080 by raising an exception when entity expansion has grown too large" do - xml = < - - - - - - - - - - - ]> - - %x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9; - + describe "REXML::Document.new" do + + it "resists CVE-2014-8080 by raising an exception when entity expansion has grown too large" do + xml = < + + + + + + + + + + + ]> + + %x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9;%x9; + XML - -> { - REXML::Document.new(xml).doctype.entities['x9'].value - }.should raise_error(REXML::ParseException, /entity expansion has grown too large/) - end + -> { + REXML::Document.new(xml).doctype.entities['x9'].value + }.should raise_error(REXML::ParseException, /entity expansion has grown too large/) + end + end end From ca6546704a3035cefff82fe91c8d307df4f2d3be Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 12 Jan 2020 09:59:10 +0900 Subject: [PATCH 366/878] Allow failures with rss tests on test-bundled-gems --- .github/workflows/macos.yml | 3 ++- .github/workflows/ubuntu.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d86f03845f9426..3797bf626591bb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -60,7 +60,8 @@ jobs: env: RUBY_TESTOPTS: "-q --tty=no" # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest" + # rss needs to add workaround for the non rexml environment + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss" - name: Leaked Globals run: make -C build -s leaked-globals - uses: k0kubun/action-slack@v2.0.0 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7a40c24acf6a9a..6bf3f291a62e28 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -94,7 +94,8 @@ jobs: env: RUBY_TESTOPTS: "-q --tty=no" # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest" + # rss needs to add workaround for the non rexml environment + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss" - name: Leaked Globals run: make -C build -s leaked-globals - uses: k0kubun/action-slack@v2.0.0 From ae69aea3b04271ac078df721887b176d6b6be3db Mon Sep 17 00:00:00 2001 From: git Date: Sun, 12 Jan 2020 12:28:54 +0900 Subject: [PATCH 367/878] * 2020-01-12 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 2ce6702e90a5d1..5dace1c89edea8 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" From cccfc66760fe479692852adf62167857243b4847 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 12 Jan 2020 19:39:00 +0900 Subject: [PATCH 368/878] Added make target to export the ChangeLog file --- common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common.mk b/common.mk index 22e7d99237fbfa..ad32792daba60e 100644 --- a/common.mk +++ b/common.mk @@ -1523,6 +1523,11 @@ update-man-date: PHONY -e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \ "$(srcdir)" "$(srcdir)"/man/*.1 +ChangeLog: + -$(Q) $(BASERUBY) -I"$(srcdir)/tool/lib" -rvcs \ + -e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \ + "$(srcdir)" $@ + HELP_EXTRA_TASKS = "" help: PHONY From b34f39e86004e0155960dc15685b61a020de7c45 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 12 Jan 2020 19:43:59 +0900 Subject: [PATCH 369/878] vcs.rb: Allow to empty a part in commit log --- tool/lib/vcs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index 85e119995aa15d..c01c01da8eeeeb 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -643,7 +643,7 @@ def format_changelog(path, arg) h, s = s.split(/^$/, 2) s = s.lines fix.each_line do |x| - if %r[^ +(\d+)s/(.+)/(.+)/] =~ x + if %r[^ +(\d+)s/(.+)/(.*)/] =~ x s[$1.to_i][$2] = $3 end end From 8afd304f41ad044964c700ac194b818003b39a6e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 12 Jan 2020 19:50:34 +0900 Subject: [PATCH 370/878] Ignore existing ChangeLog file and generate always [ci skip] --- common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.mk b/common.mk index ad32792daba60e..374832c2b813e0 100644 --- a/common.mk +++ b/common.mk @@ -1523,7 +1523,9 @@ update-man-date: PHONY -e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \ "$(srcdir)" "$(srcdir)"/man/*.1 +.PHONY: ChangeLog ChangeLog: + $(ECHO) Generating $@ -$(Q) $(BASERUBY) -I"$(srcdir)/tool/lib" -rvcs \ -e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \ "$(srcdir)" $@ From e288632f22b18b29efd20a1469292b0a3ba9b74c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 12 Jan 2020 19:54:59 +0900 Subject: [PATCH 371/878] Clean generated ChangeLog [ci skip] --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 374832c2b813e0..9c9624f19c4887 100644 --- a/common.mk +++ b/common.mk @@ -594,7 +594,7 @@ clean-local:: clean-runnable $(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time $(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) $(COROUTINE_H:/Context.h=/.time) - $(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp + $(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp ChangeLog $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) -$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine 2> $(NULL) || $(NULLCMD) From 350dafd56a9cff58d36303aeb7515ab41c5dbbb3 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 13 Jan 2020 03:36:47 +0900 Subject: [PATCH 372/878] reload AR table body for transient heap. ar_talbe (Hash representation for <=8 size) can use transient heap and the memory area can move. So we need to restore `pair' ptr after `func` call (which can run any programs) because of moving. --- hash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hash.c b/hash.c index 878f2b1790a3b3..644f85d6da8a59 100644 --- a/hash.c +++ b/hash.c @@ -974,6 +974,7 @@ ar_foreach_check(VALUE hash, st_foreach_check_callback_func *func, st_data_t arg switch (retval) { case ST_CHECK: { + pair = RHASH_AR_TABLE_REF(hash, i); if (pair->key == never) break; ret = ar_find_entry_hint(hash, hint, key); if (ret == RHASH_AR_TABLE_MAX_BOUND) { From 83b8dfac90e63d114918c46cda04caa9ed2c573d Mon Sep 17 00:00:00 2001 From: git Date: Mon, 13 Jan 2020 03:44:08 +0900 Subject: [PATCH 373/878] * 2020-01-13 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 5dace1c89edea8..607236b11a483a 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" From 61ff5cd5fd43ef2a88752b569050d7e24077e827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lourens=20Naud=C3=A9?= Date: Sun, 12 Jan 2020 10:36:15 +0000 Subject: [PATCH 374/878] Fix syntax error in obj_free with hash size debug counter when USE_DEBUG_COUNTER is enabled --- gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gc.c b/gc.c index a126de9a426245..59313d35d671ee 100644 --- a/gc.c +++ b/gc.c @@ -2653,7 +2653,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) break; case T_HASH: #if USE_DEBUG_COUNTER - switch RHASH_SIZE(obj) { + switch (RHASH_SIZE(obj)) { case 0: RB_DEBUG_COUNTER_INC(obj_hash_empty); break; From c9b1969fa30c7e86e8d134d2a9bf412796dacdad Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 13 Jan 2020 10:02:04 +0900 Subject: [PATCH 375/878] Checkout with git on cygwin for EOL code `shell: bash` runs bash on msys which prefers git on msys too, then checked out in CRLF mode. Cygwin sed doesn't consider the CR a part of EOL code, though. --- .github/workflows/cygwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index b8360d4523f24a..a066b35a6a8707 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -44,10 +44,10 @@ jobs: # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - name: Checkout ruby run: | - git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src + git clone --single-branch --shallow-since=yesterday --branch=%GITHUB_REF:refs/heads/=% https://github.com/${{ github.repository }} src git -C src reset --hard ${{ github.sha }} if: github.event_name == 'push' - shell: bash + shell: cmd - name: Checkout a pull request run: | git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src From f43940633d176464c395ba1342195bf3b2090fbc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 13 Jan 2020 12:27:24 +0900 Subject: [PATCH 376/878] test-bundled-gems.rb: Use real paths for symlinks --- tool/test-bundled-gems.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index ded4bc852a6dfa..e97e6c19a566e2 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -3,15 +3,15 @@ allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || '' allowed_failures = allowed_failures.split(',').reject(&:empty?) -gem_dir = File.expand_path('../../gems', __FILE__) +rake = File.realpath("../../.bundle/bin/rake", __FILE__) +gem_dir = File.realpath('../../gems', __FILE__) exit_code = 0 ruby = ENV['RUBY'] || RbConfig.ruby File.foreach("#{gem_dir}/bundled_gems") do |line| gem = line.split.first puts "\nTesting the #{gem} gem" - gem_src_dir = File.expand_path("#{gem_dir}/src/#{gem}", __FILE__) - test_command = "#{ruby} -C #{gem_src_dir} -Ilib ../../../.bundle/bin/rake" + test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake}" puts test_command system test_command From 5aa0e6bee916f454ecf886252e1b025d824f7bd8 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 13 Jan 2020 21:22:22 +0900 Subject: [PATCH 377/878] Mention new feature of Hash#transform_keys [Feature #16273] ref b25e27277dc39f25cfca4db8452d254f6cc8046e --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 15f5f14eb800eb..8b43c6b7ff9462 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,12 @@ sufficient information, see the ChangeLog file or Redmine === Core classes updates (outstanding ones only) +Hash:: + + Modified method:: + + * Hash#transform_keys now accepts a hash that maps keys to new keys. [Feature #16274] + === Stdlib updates (outstanding ones only) === Compatibility issues (excluding feature bug fixes) From c2e45422f7abc9836d3b68bb94e527b3aad9bfd7 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Thu, 2 Jan 2020 11:48:02 -0800 Subject: [PATCH 378/878] Store "UTC" and "" fstring as globals in time.c --- time.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/time.c b/time.c index 0f7b35f824f897..fbccc9078dd9a3 100644 --- a/time.c +++ b/time.c @@ -47,6 +47,8 @@ static ID id_submicro, id_nano_num, id_nano_den, id_offset, id_zone; static ID id_nanosecond, id_microsecond, id_millisecond, id_nsec, id_usec; static ID id_local_to_utc, id_utc_to_local, id_find_timezone; static ID id_year, id_mon, id_mday, id_hour, id_min, id_sec, id_isdst; +static VALUE str_utc, str_empty; + #define id_quo idQuo #define id_div idDiv #define id_divmod idDivmod @@ -1023,7 +1025,7 @@ gmtimew_noleapsecond(wideval_t timew, struct vtm *vtm) } vtm->utc_offset = INT2FIX(0); - vtm->zone = rb_fstring_lit("UTC"); + vtm->zone = str_utc; } static struct tm * @@ -1455,7 +1457,7 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret) timev = w2v(rb_time_unmagnify(timegmw(&vtm2))); t = NUM2TIMET(timev); - zone = rb_fstring_lit("UTC"); + zone = str_utc; if (localtime_with_gmtoff_zone(&t, &tm, &gmtoff, &zone)) { if (isdst_ret) *isdst_ret = tm.tm_isdst; @@ -2299,7 +2301,7 @@ time_init_1(int argc, VALUE *argv, VALUE time) vtm.wday = VTM_WDAY_INITVAL; vtm.yday = 0; - vtm.zone = rb_fstring_lit(""); + vtm.zone = str_empty; /* year mon mday hour min sec off */ rb_scan_args(argc, argv, "16", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6]); @@ -2994,7 +2996,7 @@ time_arg(int argc, const VALUE *argv, struct vtm *vtm) vtm->wday = 0; vtm->yday = 0; vtm->isdst = 0; - vtm->zone = rb_fstring_lit(""); + vtm->zone = str_empty; if (argc == 10) { v[0] = argv[5]; @@ -3918,7 +3920,7 @@ time_gmtime(VALUE time) time_modify(time); } - vtm.zone = rb_fstring_lit("UTC"); + vtm.zone = str_utc; GMTIMEW(tobj->timew, &vtm); tobj->vtm = vtm; @@ -5367,7 +5369,7 @@ time_mload(VALUE time, VALUE str) vtm.utc_offset = INT2FIX(0); vtm.yday = vtm.wday = 0; vtm.isdst = 0; - vtm.zone = rb_fstring_lit(""); + vtm.zone = str_empty; usec = (long)(s & 0xfffff); nsec = usec * 1000; @@ -5841,6 +5843,11 @@ Init_Time(void) id_isdst = rb_intern("isdst"); id_find_timezone = rb_intern("find_timezone"); + str_utc = rb_fstring_lit("UTC"); + rb_gc_register_mark_object(str_utc); + str_empty = rb_fstring_lit(""); + rb_gc_register_mark_object(str_empty); + rb_cTime = rb_define_class("Time", rb_cObject); rb_include_module(rb_cTime, rb_mComparable); From 5f3189474c3ee3e11b6588acfbb026e119522092 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Thu, 2 Jan 2020 11:48:03 -0800 Subject: [PATCH 379/878] Avoid rb_check_string_type in month_arg This will usually receive a fixnum so we should check that first instead of the more expensive rb_check_string_type check. --- time.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/time.c b/time.c index fbccc9078dd9a3..817b6ef1013053 100644 --- a/time.c +++ b/time.c @@ -2923,6 +2923,10 @@ month_arg(VALUE arg) { int i, mon; + if (FIXNUM_P(arg)) { + return obj2ubits(arg, 4); + } + VALUE s = rb_check_string_type(arg); if (!NIL_P(s) && RSTRING_LEN(s) > 0) { mon = 0; From 91601dcc6a608cb6f9a124959c738755091dfbd9 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Thu, 2 Jan 2020 11:48:03 -0800 Subject: [PATCH 380/878] Simplify obj2ubits checks If this value is less than zero, then the mask check is guaranteed to fail as well, so we might as well rely on that. --- test/ruby/test_time.rb | 4 ++++ time.c | 16 ++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 35e3172fb1bbd9..3cf7f2b145136c 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -431,6 +431,10 @@ def o.to_int; 10; end assert_equal(-4427700000, Time.utc(-4427700000,12,1).year) assert_equal(-2**30+10, Time.utc(-2**30+10,1,1).year) + + assert_raise(ArgumentError) { Time.gm(2000, 1, -1) } + assert_raise(ArgumentError) { Time.gm(2000, 1, 2**30 + 1) } + assert_raise(ArgumentError) { Time.gm(2000, 1, -2**30 + 1) } end def test_time_interval diff --git a/time.c b/time.c index 817b6ef1013053..b5d1aee375ab8d 100644 --- a/time.c +++ b/time.c @@ -656,7 +656,7 @@ VALUE rb_cTime; static VALUE rb_cTimeTM; static int obj2int(VALUE obj); -static uint32_t obj2ubits(VALUE obj, size_t bits); +static uint32_t obj2ubits(VALUE obj, unsigned int bits); static VALUE obj2vint(VALUE obj); static uint32_t month_arg(VALUE arg); static VALUE validate_utc_offset(VALUE utc_offset); @@ -2863,20 +2863,16 @@ obj2int(VALUE obj) return NUM2INT(obj); } +/* bits should be 0 <= x <= 31 */ static uint32_t -obj2ubits(VALUE obj, size_t bits) +obj2ubits(VALUE obj, unsigned int bits) { - static const uint32_t u32max = (uint32_t)-1; - const uint32_t usable_mask = ~(u32max << bits); - uint32_t rv; - int tmp = obj2int(obj); + const unsigned int usable_mask = (1U << bits) - 1; + unsigned int rv = (unsigned int)obj2int(obj); - if (tmp < 0) - rb_raise(rb_eArgError, "argument out of range"); - rv = tmp; if ((rv & usable_mask) != rv) rb_raise(rb_eArgError, "argument out of range"); - return rv; + return (uint32_t)rv; } static VALUE From e0a9b8ecef32a1eb719b80e0935a9c5840d2a1fe Mon Sep 17 00:00:00 2001 From: git Date: Tue, 14 Jan 2020 06:58:47 +0900 Subject: [PATCH 381/878] * 2020-01-14 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 607236b11a483a..c550de0d64b22d 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #include "ruby/version.h" From 440013b2fa73d12aeb4027bb8d8d237ea8700099 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 13 Jan 2020 18:00:33 +0100 Subject: [PATCH 382/878] Remove s390x from allow_failures --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b09d0cae956de..f5199c7992c887 100644 --- a/.travis.yml +++ b/.travis.yml @@ -442,7 +442,6 @@ matrix: - <<: *CALL_THREADED_CODE - <<: *NO_THREADED_CODE allow_failures: - - name: s390x-linux - name: -fsanitize=address - name: -fsanitize=memory - name: -fsanitize=undefined From 9994eb8a5e72ff68ee2a13ddeff8d9307ba7cd84 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 30 Dec 2019 11:18:05 -0500 Subject: [PATCH 383/878] [ruby/irb] Fix newline depth with multiple braces This commit fixes the check_newline_depth_difference method to multiple open braces on one line into account. Before this change we were subtracting from the depth in check_newline_depth_difference on every open brace. This is the right thing to do if the opening and closing brace are on the same line. For example in a method definition we have an opening and closing parentheses we want to add 1 to our depth, and then remove it. ``` def foo() end ``` However this isn't the correct behavior when the brace spans multiple lines. If a brace spans multiple lines we don't want to subtract from check_newline_depth_difference and we want to treat the braces the same way as we do `end` and allow check_corresponding_token_depth to pop the correct depth. Example of bad behavior: ``` def foo() [ ] puts 'bar' end ``` Example of desired behavior: ``` def foo() [ ] puts 'bar' end ``` https://github.com/ruby/irb/commit/7dc8af01e0 --- lib/irb/ruby-lex.rb | 5 ++++- test/irb/test_ruby_lex.rb | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index b4c31c16fe5ccc..0a5e2c45b6d42d 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -317,11 +317,13 @@ def process_nesting_level def check_newline_depth_difference depth_difference = 0 + open_brace_on_line = 0 @tokens.each_with_index do |t, index| case t[1] when :on_ignored_nl, :on_nl, :on_comment if index != (@tokens.size - 1) depth_difference = 0 + open_brace_on_line = 0 end next when :on_sp @@ -330,8 +332,9 @@ def check_newline_depth_difference case t[1] when :on_lbracket, :on_lbrace, :on_lparen depth_difference += 1 + open_brace_on_line += 1 when :on_rbracket, :on_rbrace, :on_rparen - depth_difference -= 1 + depth_difference -= 1 if open_brace_on_line > 0 when :on_kw next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME) case t[2] diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb index f3a9b30e954012..ae25b1d501cdaf 100644 --- a/test/irb/test_ruby_lex.rb +++ b/test/irb/test_ruby_lex.rb @@ -73,7 +73,22 @@ def test_auto_indent lines = [] input_with_correct_indents.each do |row| lines << row.content + assert_indenting(lines, row.current_line_spaces, false) + assert_indenting(lines, row.new_line_spaces, true) + end + end + def test_braces_on_thier_own_line + input_with_correct_indents = [ + Row.new(%q(if true), nil, 2), + Row.new(%q( [), nil, 4), + Row.new(%q( ]), 2, 2), + Row.new(%q(end), 0, 0), + ] + + lines = [] + input_with_correct_indents.each do |row| + lines << row.content assert_indenting(lines, row.current_line_spaces, false) assert_indenting(lines, row.new_line_spaces, true) end From c94025b63091be5b5e83a2f5ab5dc8d6c6147b84 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 5 Jan 2020 14:44:38 -0500 Subject: [PATCH 384/878] [ruby/irb] Fix crashing when multiple open braces per line https://github.com/ruby/irb/issues/55 If we had put multiple open braces on a line the with no closing brace spaces_of_nest array keeps getting '0' added to it. This means that when we pop off of this array we are saying that we should be in position zero for the next line. This is an issue because we don't always want to be in position 0 after a closing brace. Example: ``` [[[ ] ] ] ``` In the above example the 'spaces_of_nest' array looks like this after the first line is entered: [0,0,0]. We really want to be indented 4 spaces for the 1st closing brace 2 for the 2nd and 0 for the 3rd. i.e. we want it to be: [0,2,4]. We also saw this issue with a heredoc inside of an array. ``` [< Date: Sun, 12 Jan 2020 22:24:17 +0900 Subject: [PATCH 385/878] Introduce an abstracted structure about the encoding of Reline The command prompt on Windows always uses Unicode to take input and print output but most Reline implementation depends on Encoding.default_external. This commit introduces an abstracted structure about the encoding of Reline. --- lib/reline.rb | 33 +++++++++++++++------------ lib/reline/ansi.rb | 4 ++++ lib/reline/general_io.rb | 4 ++++ lib/reline/history.rb | 6 ++--- lib/reline/line_editor.rb | 10 ++++---- lib/reline/windows.rb | 6 ++++- test/reline/test_key_actor_emacs.rb | 4 ++-- test/reline/test_key_actor_vi.rb | 4 ++-- test/reline/test_macro.rb | 3 ++- test/reline/test_string_processing.rb | 4 ++-- 10 files changed, 48 insertions(+), 30 deletions(-) diff --git a/lib/reline.rb b/lib/reline.rb index 9a9f7429092d0e..606dd4645b7d14 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -38,8 +38,10 @@ class Core attr_accessor :ambiguous_width attr_accessor :last_incremental_search attr_reader :output + attr_reader :encoding - def initialize + def initialize(encoding) + @encoding = encoding self.output = STDOUT yield self @completion_quote_character = nil @@ -49,36 +51,36 @@ def completion_append_character=(val) if val.nil? @completion_append_character = nil elsif val.size == 1 - @completion_append_character = val.encode(Encoding::default_external) + @completion_append_character = val.encode(@encoding) elsif val.size > 1 - @completion_append_character = val[0].encode(Encoding::default_external) + @completion_append_character = val[0].encode(@encoding) else @completion_append_character = nil end end def basic_word_break_characters=(v) - @basic_word_break_characters = v.encode(Encoding::default_external) + @basic_word_break_characters = v.encode(@encoding) end def completer_word_break_characters=(v) - @completer_word_break_characters = v.encode(Encoding::default_external) + @completer_word_break_characters = v.encode(@encoding) end def basic_quote_characters=(v) - @basic_quote_characters = v.encode(Encoding::default_external) + @basic_quote_characters = v.encode(@encoding) end def completer_quote_characters=(v) - @completer_quote_characters = v.encode(Encoding::default_external) + @completer_quote_characters = v.encode(@encoding) end def filename_quote_characters=(v) - @filename_quote_characters = v.encode(Encoding::default_external) + @filename_quote_characters = v.encode(@encoding) end def special_prefixes=(v) - @special_prefixes = v.encode(Encoding::default_external) + @special_prefixes = v.encode(@encoding) end def completion_case_fold=(v) @@ -201,7 +203,7 @@ def readline(prompt = '', add_hist = false) otio = Reline::IOGate.prep may_req_ambiguous_char_width - line_editor.reset(prompt) + line_editor.reset(prompt, encoding: @encoding) if multiline line_editor.multiline_on if block_given? @@ -387,11 +389,15 @@ def self.insert_text(*args, &block) def_instance_delegators self, :readmultiline private :readmultiline + def self.encoding_system_needs + self.core.encoding + end + def self.core - @core ||= Core.new { |core| + @core ||= Core.new(Reline::IOGate.encoding) { |core| core.config = Reline::Config.new core.key_stroke = Reline::KeyStroke.new(core.config) - core.line_editor = Reline::LineEditor.new(core.config) + core.line_editor = Reline::LineEditor.new(core.config, Reline::IOGate.encoding) core.basic_word_break_characters = " \t\n`><=;|&{(" core.completer_word_break_characters = " \t\n`><=;|&{(" @@ -405,8 +411,6 @@ def self.core def self.line_editor core.line_editor end - - HISTORY = History.new(core.config) end if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/ @@ -422,4 +426,5 @@ def self.line_editor require 'reline/ansi' Reline::IOGate = Reline::ANSI end +Reline::HISTORY = Reline::History.new(Reline.core.config) require 'reline/general_io' diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index cd780c61893d9b..395721ea81275a 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -1,6 +1,10 @@ require 'io/console' class Reline::ANSI + def self.encoding + Encoding.default_external + end + RAW_KEYSTROKE_CONFIG = { [27, 91, 65] => :ed_prev_history, # ↑ [27, 91, 66] => :ed_next_history, # ↓ diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb index 291c14c7b3b762..6281d5fbf67a22 100644 --- a/lib/reline/general_io.rb +++ b/lib/reline/general_io.rb @@ -1,6 +1,10 @@ require 'timeout' class Reline::GeneralIO + def self.encoding + Encoding.default_external + end + RAW_KEYSTROKE_CONFIG = {} @@buf = [] diff --git a/lib/reline/history.rb b/lib/reline/history.rb index 238fcf2a7632c7..d95f1cebc3b8e4 100644 --- a/lib/reline/history.rb +++ b/lib/reline/history.rb @@ -19,7 +19,7 @@ def [](index) def []=(index, val) index = check_index(index) - super(index, String.new(val, encoding: Encoding::default_external)) + super(index, String.new(val, encoding: Reline.encoding_system_needs)) end def concat(*val) @@ -39,12 +39,12 @@ def push(*val) val.shift(diff) end end - super(*(val.map{ |v| String.new(v, encoding: Encoding::default_external) })) + super(*(val.map{ |v| String.new(v, encoding: Reline.encoding_system_needs) })) end def <<(val) shift if size + 1 > @config.history_size - super(String.new(val, encoding: Encoding::default_external)) + super(String.new(val, encoding: Reline.encoding_system_needs)) end private def check_index(index) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 475f76fd652792..dda602e1555942 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -57,10 +57,10 @@ module CompletionState NON_PRINTING_END = "\2" WIDTH_SCANNER = /\G(?:#{NON_PRINTING_START}|#{NON_PRINTING_END}|#{CSI_REGEXP}|#{OSC_REGEXP}|\X)/ - def initialize(config) + def initialize(config, encoding) @config = config @completion_append_character = '' - reset_variables + reset_variables(encoding: encoding) end private def check_multiline_prompt(buffer, prompt) @@ -85,10 +85,10 @@ def initialize(config) end end - def reset(prompt = '', encoding = Encoding.default_external) + def reset(prompt = '', encoding:) @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y @screen_size = Reline::IOGate.get_screen_size - reset_variables(prompt, encoding) + reset_variables(prompt, encoding: encoding) @old_trap = Signal.trap('SIGINT') { @old_trap.call if @old_trap.respond_to?(:call) # can also be string, ex: "DEFAULT" raise Interrupt @@ -139,7 +139,7 @@ def eof? @eof end - def reset_variables(prompt = '', encoding = Encoding.default_external) + def reset_variables(prompt = '', encoding:) @prompt = prompt @mark_pointer = nil @encoding = encoding diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb index aef3073a7ea919..4fbf243c371a0f 100644 --- a/lib/reline/windows.rb +++ b/lib/reline/windows.rb @@ -1,6 +1,10 @@ require 'fiddle/import' class Reline::Windows + def self.encoding + Encoding::UTF_8 + end + RAW_KEYSTROKE_CONFIG = { [224, 72] => :ed_prev_history, # ↑ [224, 80] => :ed_next_history, # ↓ @@ -99,7 +103,7 @@ def self.getwch return @@input_buf.shift end begin - bytes = ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes + bytes = ret.chr(Encoding::UTF_8).bytes @@input_buf.push(*bytes) rescue Encoding::UndefinedConversionError @@input_buf << ret diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 6de448fa03db0c..7e97caad236ebf 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -8,8 +8,8 @@ def setup Reline::HISTORY.instance_variable_set(:@config, @config) Reline::HISTORY.clear @encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external) - @line_editor = Reline::LineEditor.new(@config) - @line_editor.reset(@prompt, @encoding) + @line_editor = Reline::LineEditor.new(@config, @encoding) + @line_editor.reset(@prompt, encoding: @encoding) end def test_ed_insert_one diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index 1ea160b6b5a10c..25bc4e94fb9c11 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -9,8 +9,8 @@ def setup set editing-mode vi LINES @encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external) - @line_editor = Reline::LineEditor.new(@config) - @line_editor.reset(@prompt, @encoding) + @line_editor = Reline::LineEditor.new(@config, @encoding) + @line_editor.reset(@prompt, encoding: @encoding) end def test_vi_command_mode diff --git a/test/reline/test_macro.rb b/test/reline/test_macro.rb index c69b50416a5410..b97de88a97386e 100644 --- a/test/reline/test_macro.rb +++ b/test/reline/test_macro.rb @@ -3,7 +3,8 @@ class Reline::MacroTest < Reline::TestCase def setup @config = Reline::Config.new - @line_editor = Reline::LineEditor.new(@config) + @encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external) + @line_editor = Reline::LineEditor.new(@config, @encoding) @line_editor.instance_variable_set(:@screen_size, [24, 80]) @output = @line_editor.output = File.open(IO::NULL, "w") end diff --git a/test/reline/test_string_processing.rb b/test/reline/test_string_processing.rb index 4df0363848ae37..e76fa384f29e5b 100644 --- a/test/reline/test_string_processing.rb +++ b/test/reline/test_string_processing.rb @@ -7,8 +7,8 @@ def setup @config = Reline::Config.new Reline::HISTORY.instance_variable_set(:@config, @config) @encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external) - @line_editor = Reline::LineEditor.new(@config) - @line_editor.reset(@prompt, @encoding) + @line_editor = Reline::LineEditor.new(@config, @encoding) + @line_editor.reset(@prompt, encoding: @encoding) end def test_calculate_width From a2638c0d87106c6ba023a321eea502f35131753e Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 13 Jan 2020 18:26:32 +0900 Subject: [PATCH 386/878] Remove an unused setting variable --- lib/irb/init.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/irb/init.rb b/lib/irb/init.rb index 2af872fd0331a3..11f940da49ec5e 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -300,7 +300,6 @@ def set_encoding(extern, intern = nil) verbose, $VERBOSE = $VERBOSE, nil Encoding.default_external = extern unless extern.nil? || extern.empty? Encoding.default_internal = intern unless intern.nil? || intern.empty? - @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern) [$stdin, $stdout, $stderr].each do |io| io.set_encoding(extern, intern) end From 8c3efa494091e6e0001f4a708fb7568c242387b9 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 14 Jan 2020 15:40:03 +0900 Subject: [PATCH 387/878] Use Reline.encoding_system_needs if exists --- lib/irb/ext/save-history.rb | 4 ++-- lib/irb/init.rb | 8 ++++++-- lib/irb/input-method.rb | 4 ++++ lib/irb/locale.rb | 11 ++++++++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb index c0d4d372b7c0d5..edc4f234cc1841 100644 --- a/lib/irb/ext/save-history.rb +++ b/lib/irb/ext/save-history.rb @@ -72,7 +72,7 @@ def load_history end history_file = IRB.rc_file("_history") unless history_file if File.exist?(history_file) - open(history_file) do |f| + open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f| f.each { |l| l = l.chomp if self.class == ReidlineInputMethod and history.last&.end_with?("\\") @@ -107,7 +107,7 @@ def save_history raise end - open(history_file, 'w', 0600 ) do |f| + open(history_file, "w:#{IRB.conf[:LC_MESSAGES].encoding}", 0600) do |f| hist = history.map{ |l| l.split("\n").join("\\\n") } f.puts(hist[-num..-1] || hist) end diff --git a/lib/irb/init.rb b/lib/irb/init.rb index 11f940da49ec5e..37d1f8d6091041 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -296,14 +296,18 @@ def IRB.load_modules DefaultEncodings = Struct.new(:external, :internal) class << IRB private - def set_encoding(extern, intern = nil) + def set_encoding(extern, intern = nil, override: true) verbose, $VERBOSE = $VERBOSE, nil Encoding.default_external = extern unless extern.nil? || extern.empty? Encoding.default_internal = intern unless intern.nil? || intern.empty? [$stdin, $stdout, $stderr].each do |io| io.set_encoding(extern, intern) end - @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern) + if override + @CONF[:LC_MESSAGES].instance_variable_set(:@override_encoding, extern) + else + @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern) + end ensure $VERBOSE = verbose end diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb index a1777d79044b2e..9fbbaeb0f33e32 100644 --- a/lib/irb/input-method.rb +++ b/lib/irb/input-method.rb @@ -133,6 +133,9 @@ class ReadlineInputMethod < InputMethod include Readline # Creates a new input method object using Readline def initialize + if Readline.respond_to?(:encoding_system_needs) + IRB.__send__(:set_encoding, Readline.encoding_system_needs.name, override: false) + end super @line_no = 0 @@ -207,6 +210,7 @@ class ReidlineInputMethod < InputMethod include Reline # Creates a new input method object using Readline def initialize + IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false) super @line_no = 0 diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index ba833eced4a2ee..bb44b4100227ba 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -24,6 +24,7 @@ class Locale @@loaded = [] def initialize(locale = nil) + @override_encoding = nil @lang = @territory = @encoding_name = @modifier = nil @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" if m = LOCALE_NAME_RE.match(@locale) @@ -40,12 +41,16 @@ def initialize(locale = nil) @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT) end - attr_reader :lang, :territory, :encoding, :modifier + attr_reader :lang, :territory, :modifier + + def encoding + @override_encoding || @encoding + end def String(mes) mes = super(mes) - if @encoding - mes.encode(@encoding, undef: :replace) + if encoding + mes.encode(encoding, undef: :replace) else mes end From eb4c86a698e1be9fa2a79f4edb1c891396e6074e Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 15 Jan 2020 10:20:19 +0900 Subject: [PATCH 388/878] Add option hash doc for GC stats. Add a description about optional hash objects for GC.stat and GC.latest_gc_info. [Bug #14408] The patch is provided by sho-h (Sho Hashimoto). Thank you so much. --- gc.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gc.rb b/gc.rb index fcfa48fbe15b5f..a87f9185f93414 100644 --- a/gc.rb +++ b/gc.rb @@ -140,6 +140,10 @@ def self.count # The contents of the hash are implementation specific and may be changed in # the future. # + # If the optional argument, hash, is given, + # it is overwritten and returned. + # This is intended to avoid probe effect. + # # This method is only expected to work on C Ruby. def self.stat hash_or_key = nil __builtin_gc_stat hash_or_key @@ -151,6 +155,10 @@ def self.stat hash_or_key = nil # GC.latest_gc_info(:major_by) -> :malloc # # Returns information about the most recent garbage collection. + # + # If the optional argument, hash, is given, + # it is overwritten and returned. + # This is intended to avoid probe effect. def self.latest_gc_info hash_or_key = nil __builtin_gc_latest_gc_info hash_or_key end From 07aef4c99ac4be3073f8b15ebdfa324a7f94f5e3 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 15 Jan 2020 10:23:37 +0900 Subject: [PATCH 389/878] * 2020-01-15 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index c550de0d64b22d..8fc1ff4eae7a3a 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" From 98ef38ada43338c073f50a0093196f0356284625 Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Wed, 27 Nov 2019 11:40:18 +0000 Subject: [PATCH 390/878] Freeze Regexp literals [Feature #8948] [Feature #16377] Since Regexp literals always reference the same instance, allowing to mutate them can lead to state leak. --- re.c | 1 + spec/ruby/core/marshal/dump_spec.rb | 4 ++-- spec/ruby/core/marshal/shared/load.rb | 2 +- spec/ruby/core/regexp/initialize_spec.rb | 12 ++++++++++-- spec/ruby/core/string/match_spec.rb | 2 +- spec/ruby/language/regexp_spec.rb | 6 ++++++ spec/ruby/optional/capi/encoding_spec.rb | 6 +++--- test/ruby/test_regexp.rb | 2 +- 8 files changed, 25 insertions(+), 10 deletions(-) diff --git a/re.c b/re.c index 56b5144f9f4662..3efd5403593311 100644 --- a/re.c +++ b/re.c @@ -2967,6 +2967,7 @@ rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline) return Qnil; } FL_SET(re, REG_LITERAL); + rb_obj_freeze(re); return re; } diff --git a/spec/ruby/core/marshal/dump_spec.rb b/spec/ruby/core/marshal/dump_spec.rb index fc78ca4ff98c69..ea021991a8dc18 100644 --- a/spec/ruby/core/marshal/dump_spec.rb +++ b/spec/ruby/core/marshal/dump_spec.rb @@ -235,13 +235,13 @@ end it "dumps a Regexp with instance variables" do - o = // + o = Regexp.new("") o.instance_variable_set(:@ivar, :ivar) Marshal.dump(o).should == "\x04\bI/\x00\x00\a:\x06EF:\n@ivar:\tivar" end it "dumps an extended Regexp" do - Marshal.dump(//.extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF" + Marshal.dump(Regexp.new("").extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF" end it "dumps a Regexp subclass" do diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb index 302d3d5bda3e4c..78fc9fb2860025 100644 --- a/spec/ruby/core/marshal/shared/load.rb +++ b/spec/ruby/core/marshal/shared/load.rb @@ -623,7 +623,7 @@ describe "for a Regexp" do it "loads an extended Regexp" do - obj = /[a-z]/.extend(Meths, MethsMore) + obj = /[a-z]/.dup.extend(Meths, MethsMore) new_obj = Marshal.send(@method, "\004\be:\nMethse:\016MethsMore/\n[a-z]\000") new_obj.should == obj diff --git a/spec/ruby/core/regexp/initialize_spec.rb b/spec/ruby/core/regexp/initialize_spec.rb index 36fd5c7bf26b2b..ae188fb9c29e0f 100644 --- a/spec/ruby/core/regexp/initialize_spec.rb +++ b/spec/ruby/core/regexp/initialize_spec.rb @@ -5,8 +5,16 @@ Regexp.should have_private_method(:initialize) end - it "raises a SecurityError on a Regexp literal" do - -> { //.send(:initialize, "") }.should raise_error(SecurityError) + ruby_version_is ""..."2.7" do + it "raises a SecurityError on a Regexp literal" do + -> { //.send(:initialize, "") }.should raise_error(SecurityError) + end + end + + ruby_version_is "2.7" do + it "raises a FrozenError on a Regexp literal" do + -> { //.send(:initialize, "") }.should raise_error(FrozenError) + end end it "raises a TypeError on an initialized non-literal Regexp" do diff --git a/spec/ruby/core/string/match_spec.rb b/spec/ruby/core/string/match_spec.rb index 78b94baa440067..5e988f34caea80 100644 --- a/spec/ruby/core/string/match_spec.rb +++ b/spec/ruby/core/string/match_spec.rb @@ -137,7 +137,7 @@ def obj.method_missing(*args) "." end end it "calls match on the regular expression" do - regexp = /./ + regexp = /./.dup regexp.should_receive(:match).and_return(:foo) 'hello'.match(regexp).should == :foo end diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb index 67c7c034e906ce..5881afe6f14f36 100644 --- a/spec/ruby/language/regexp_spec.rb +++ b/spec/ruby/language/regexp_spec.rb @@ -18,6 +18,12 @@ /Hello/.should be_kind_of(Regexp) end + ruby_version_is "2.7" do + it "is frozen" do + /Hello/.frozen?.should == true + end + end + it "caches the Regexp object" do rs = [] 2.times do |i| diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb index 857e421ddb4854..b74a3607608747 100644 --- a/spec/ruby/optional/capi/encoding_spec.rb +++ b/spec/ruby/optional/capi/encoding_spec.rb @@ -312,7 +312,7 @@ end it "sets the encoding of a Regexp to that of the second argument" do - @s.rb_enc_copy(/regexp/, @obj).encoding.should == Encoding::US_ASCII + @s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII end end @@ -363,7 +363,7 @@ end it "sets the encoding of a Regexp to the encoding" do - @s.rb_enc_associate(/regexp/, "BINARY").encoding.should == Encoding::BINARY + @s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY end it "sets the encoding of a String to a default when the encoding is NULL" do @@ -380,7 +380,7 @@ it "sets the encoding of a Regexp to the encoding" do index = @s.rb_enc_find_index("UTF-8") - enc = @s.rb_enc_associate_index(/regexp/, index).encoding + enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding enc.should == Encoding::UTF_8 end diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index a1d49c595a6198..39577bd75d188b 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -622,7 +622,7 @@ def test_union2 def test_dup assert_equal(//, //.dup) - assert_raise(TypeError) { //.instance_eval { initialize_copy(nil) } } + assert_raise(TypeError) { //.dup.instance_eval { initialize_copy(nil) } } end def test_regsub From ac93cf4ff85ef195e8f6f151091a86f449a0be7a Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 15 Jan 2020 10:50:53 +0900 Subject: [PATCH 391/878] Update version guard fix up 98ef38ada43338c073f50a0093196f0356284625 --- spec/ruby/core/regexp/initialize_spec.rb | 4 ++-- spec/ruby/language/regexp_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/ruby/core/regexp/initialize_spec.rb b/spec/ruby/core/regexp/initialize_spec.rb index ae188fb9c29e0f..28255ad60f721e 100644 --- a/spec/ruby/core/regexp/initialize_spec.rb +++ b/spec/ruby/core/regexp/initialize_spec.rb @@ -5,13 +5,13 @@ Regexp.should have_private_method(:initialize) end - ruby_version_is ""..."2.7" do + ruby_version_is ""..."2.8" do it "raises a SecurityError on a Regexp literal" do -> { //.send(:initialize, "") }.should raise_error(SecurityError) end end - ruby_version_is "2.7" do + ruby_version_is "2.8" do it "raises a FrozenError on a Regexp literal" do -> { //.send(:initialize, "") }.should raise_error(FrozenError) end diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb index 5881afe6f14f36..cd71d543386ae0 100644 --- a/spec/ruby/language/regexp_spec.rb +++ b/spec/ruby/language/regexp_spec.rb @@ -18,7 +18,7 @@ /Hello/.should be_kind_of(Regexp) end - ruby_version_is "2.7" do + ruby_version_is "2.8" do it "is frozen" do /Hello/.frozen?.should == true end From 9feca5ceb924858e54e312da4b1ba097f72c5582 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 15 Jan 2020 12:42:47 +0900 Subject: [PATCH 392/878] NEWS.md: converted from NEWS and NEWS is deleted --- .document | 2 +- NEWS | 37 ------------------------------------- NEWS.md | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 NEWS create mode 100644 NEWS.md diff --git a/.document b/.document index 8a418e5d4ae571..7410eaaed5cee8 100644 --- a/.document +++ b/.document @@ -25,7 +25,7 @@ lib ext # rdoc files -NEWS +NEWS.md README.md README.ja.md diff --git a/NEWS b/NEWS deleted file mode 100644 index 8b43c6b7ff9462..00000000000000 --- a/NEWS +++ /dev/null @@ -1,37 +0,0 @@ -# -*- rdoc -*- - -= NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) - -This document is a list of user visible feature changes made between -releases except for bug fixes. - -Note that each entry is kept so brief that no reason behind or reference -information is supplied with. For a full list of changes with all -sufficient information, see the ChangeLog file or Redmine -(e.g. https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER). - -== Changes since the 2.7.0 release - -=== Language changes - -=== Command line options - -=== Core classes updates (outstanding ones only) - -Hash:: - - Modified method:: - - * Hash#transform_keys now accepts a hash that maps keys to new keys. [Feature #16274] - -=== Stdlib updates (outstanding ones only) - -=== Compatibility issues (excluding feature bug fixes) - -=== Stdlib compatibility issues (excluding feature bug fixes) - -=== C API updates - -=== Implementation improvements - -=== Miscellaneous changes diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 00000000000000..0bc98be8944f78 --- /dev/null +++ b/NEWS.md @@ -0,0 +1,35 @@ +# NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) + +This document is a list of user visible feature changes made between +releases except for bug fixes. + +Note that each entry is kept so brief that no reason behind or reference +information is supplied with. For a full list of changes with all +sufficient information, see the ChangeLog file or Redmine +(e.g. `https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER`). + +## Changes since the 2.7.0 release + +### Language changes + +### Command line options + +### Core classes updates (outstanding ones only) + +Hash:: + + Modified method:: + + * Hash#transform_keys now accepts a hash that maps keys to new keys. [Feature #16274] + +### Stdlib updates (outstanding ones only) + +### Compatibility issues (excluding feature bug fixes) + +### Stdlib compatibility issues (excluding feature bug fixes) + +### C API updates + +### Implementation improvements + +### Miscellaneous changes From 815807d2ab9e87b5543d6837234952fd6cd481a3 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 15 Jan 2020 12:43:49 +0900 Subject: [PATCH 393/878] NEWS.md: mention "Freeze Regexp literals" [Feature #8948] --- NEWS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.md b/NEWS.md index 0bc98be8944f78..6f8e8a01f91198 100644 --- a/NEWS.md +++ b/NEWS.md @@ -26,6 +26,12 @@ Hash:: ### Compatibility issues (excluding feature bug fixes) +* Regexp literals are frozen [Feature #8948] [Feature #16377] + +``` +/foo/.frozen? #=> true +``` + ### Stdlib compatibility issues (excluding feature bug fixes) ### C API updates From 4f19666e8b144600e959e4673f79d63f98bd637d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 16 Jan 2020 11:25:43 +0900 Subject: [PATCH 394/878] `Regexp` in `MatchData` can be `nil` `String#sub` with a string pattern defers creating a `Regexp` until `MatchData#regexp` creates a `Regexp` from the matched string. `Regexp#last_match(group_name)` accessed its content without creating the `Regexp` though. [Bug #16508] --- re.c | 1 + test/ruby/test_regexp.rb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/re.c b/re.c index 3efd5403593311..44418ec064246d 100644 --- a/re.c +++ b/re.c @@ -1912,6 +1912,7 @@ match_captures(VALUE match) static int name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end) { + if (NIL_P(regexp)) return -1; return onig_name_to_backref_number(RREGEXP_PTR(regexp), (const unsigned char *)name, (const unsigned char *)name_end, regs); } diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 39577bd75d188b..231fd392d17d0e 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -161,6 +161,10 @@ def test_named_capture s = "foo" s[/(?o)/, "bar"] = "baz" assert_equal("fbazo", s) + + /.*/ =~ "abc" + "a".sub("a", "") + assert_raise(IndexError) {Regexp.last_match(:_id)} end def test_named_capture_with_nul From 0b6682dc57afc95eca9f75f895ec1bf554697e6c Mon Sep 17 00:00:00 2001 From: git Date: Thu, 16 Jan 2020 11:34:30 +0900 Subject: [PATCH 395/878] * 2020-01-16 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 8fc1ff4eae7a3a..a0b2e4d00ae5b6 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" From fce54a5404139a77bd0b7d6f82901083fcb16f1e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 16 Jan 2020 15:36:38 +0900 Subject: [PATCH 396/878] Fix `String#partition` Split with the matched part when the separator matches the empty part at the beginning. [Bug #11014] --- string.c | 1 - test/ruby/test_string.rb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/string.c b/string.c index 2413fbf8fc0ffa..ca425e97808154 100644 --- a/string.c +++ b/string.c @@ -9795,7 +9795,6 @@ rb_str_partition(VALUE str, VALUE sep) return rb_ary_new3(3, rb_str_dup(str), str_new_empty(str), str_new_empty(str)); } sep = rb_str_subpat(str, sep, INT2FIX(0)); - if (pos == 0 && RSTRING_LEN(sep) == 0) goto failed; } else { pos = rb_str_index(str, sep, 0); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 09d099bb4afaf5..f0b765314c9de9 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -2567,6 +2567,8 @@ def (hyphen = Object.new).to_str; "-"; end hello = "hello" hello.partition("hi").map(&:upcase!) assert_equal("hello", hello, bug) + + assert_equal(["", "", "foo"], "foo".partition(/^=*/)) end def test_rpartition From 62baad9fe17077f8881e8512234cf55563aa9fca Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 16 Jan 2020 16:56:53 +0900 Subject: [PATCH 397/878] Removed xmlrpc and net-telnet from the bundled gems. [Feature #16484][ruby-core:96682] --- NEWS.md | 6 ++++++ doc/maintainers.rdoc | 4 ---- doc/standard_library.rdoc | 2 -- gems/bundled_gems | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 6f8e8a01f91198..9fb9943ed9de32 100644 --- a/NEWS.md +++ b/NEWS.md @@ -32,6 +32,12 @@ Hash:: /foo/.frozen? #=> true ``` +* The bundled gems + + * net-telnet and xmlrpc has been removed from the bundled gems. + If you interested in the maintain them, Please comment your plan + to https://github.com/ruby/xmlrpc or https://github.com/ruby/net-telnet. + ### Stdlib compatibility issues (excluding feature bug fixes) ### C API updates diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 87221bb8f9f754..bf76fa1b20e2a0 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -339,16 +339,12 @@ Zachary Scott (zzak) [minitest] https://github.com/seattlerb/minitest -[net-telnet] - https://github.com/ruby/net-telnet [power_assert] https://github.com/k-tsj/power_assert [rake] https://github.com/ruby/rake [test-unit] https://github.com/test-unit/test-unit -[xmlrpc] - https://github.com/ruby/xmlrpc [rexml] https://github.com/ruby/rexml [rss] diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index c9f72a13c56ed1..38de1cc75468a5 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -112,10 +112,8 @@ Zlib:: Ruby interface for the zlib compression/decompression library == Libraries MiniTest:: A test suite with TDD, BDD, mocking and benchmarking -Net::Telnet:: Telnet client library for Ruby PowerAssert:: Power Assert for Ruby. Rake:: Ruby build program with capabilities similar to make Test::Unit:: A compatibility layer for MiniTest -XMLRPC:: Remote Procedure Call over HTTP support for Ruby REXML:: An XML toolkit for Ruby RSS:: Family of libraries that support various formats of XML "feeds" diff --git a/gems/bundled_gems b/gems/bundled_gems index 065a6241d29baf..68bca73d544fb3 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -1,8 +1,6 @@ minitest 5.13.0 https://github.com/seattlerb/minitest -net-telnet 0.2.0 https://github.com/ruby/net-telnet power_assert 1.1.5 https://github.com/k-tsj/power_assert rake 13.0.1 https://github.com/ruby/rake test-unit 3.3.4 https://github.com/test-unit/test-unit -xmlrpc 0.3.0 https://github.com/ruby/xmlrpc rexml 3.2.3 https://github.com/ruby/rexml rss 0.2.8 https://github.com/ruby/rss From f38b3e8c707ebdcad05aa9485cf1760640b74fbb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 16 Jan 2020 18:34:31 +0900 Subject: [PATCH 398/878] Fixed the location of args node with numbered parameter --- parse.y | 6 +++++- test/ruby/test_syntax.rb | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index d1d25694408f5d..21b384d10ac040 100644 --- a/parse.y +++ b/parse.y @@ -11377,7 +11377,11 @@ static NODE * args_with_numbered(struct parser_params *p, NODE *args, int max_numparam) { if (max_numparam > NO_PARAM) { - if (!args) args = new_args_tail(p, 0, 0, 0, 0); + if (!args) { + YYLTYPE loc = RUBY_INIT_YYLLOC(); + args = new_args_tail(p, 0, 0, 0, 0); + nd_set_loc(args, &loc); + } args->nd_ainfo->pre_args_num = max_numparam; } return args; diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 01f329510141dc..b93062cf2d165e 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1449,6 +1449,8 @@ def test_numbered_parameter assert_valid_syntax("->{#{c};->{_1};end;_1}\n") assert_valid_syntax("->{_1;#{c};->{_1};end}\n") end + + 1.times {_1} end def test_value_expr_in_condition From c171ab23e376b6c7f1094a77f137d916b0a403e6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 16 Jan 2020 18:38:48 +0900 Subject: [PATCH 399/878] Separate numbered parameter scope in eval [Feature #16432] --- parse.y | 2 +- test/ruby/test_syntax.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/parse.y b/parse.y index 21b384d10ac040..1facda553ebdfd 100644 --- a/parse.y +++ b/parse.y @@ -12041,7 +12041,7 @@ dvar_defined_ref(struct parser_params *p, ID id, ID **vidrefp) if (used) used = used->prev; } - if (vars == DVARS_INHERIT) { + if (vars == DVARS_INHERIT && !NUMPARAM_ID_P(id)) { return rb_dvar_defined(id, p->parent_iseq); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index b93062cf2d165e..5591b7cb31f87b 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1450,7 +1450,13 @@ def test_numbered_parameter assert_valid_syntax("->{_1;#{c};->{_1};end}\n") end - 1.times {_1} + 1.times { + [ + _1, + assert_equal([:a], eval("[:a].map{_1}")), + assert_raise(NameError) {eval("_1")}, + ] + } end def test_value_expr_in_condition From ec0b366a5c6eadab1315a8f2681a0ef6de20be75 Mon Sep 17 00:00:00 2001 From: aycabta Date: Thu, 16 Jan 2020 20:26:50 +0900 Subject: [PATCH 400/878] Add tests for vi_insert and vi_add --- test/reline/test_key_actor_vi.rb | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index 25bc4e94fb9c11..d46d784d1b8443 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -24,6 +24,38 @@ def test_vi_command_mode_with_input assert_line('abc') end + def test_vi_insert + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys('i') + assert_line('i') + assert_cursor(1) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys("\C-[") + assert_line('i') + assert_cursor(0) + assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode) + input_keys('i') + assert_line('i') + assert_cursor(0) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + end + + def test_vi_add + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys('a') + assert_line('a') + assert_cursor(1) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys("\C-[") + assert_line('a') + assert_cursor(0) + assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode) + input_keys('a') + assert_line('a') + assert_cursor(1) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + end + def test_ed_insert_one input_keys('a') assert_line('a') From 800c2a8e4c4b644aca4bede913d492c25ba304c1 Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 17 Jan 2020 01:35:13 +0900 Subject: [PATCH 401/878] Implement vi_insert_at_bol and vi_add_at_eol --- lib/reline/line_editor.rb | 10 +++++++++ test/reline/test_key_actor_vi.rb | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index dda602e1555942..1387bfa8766c65 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1890,6 +1890,16 @@ def finish end end + private def vi_insert_at_bol(key) + ed_move_to_beg(key) + @config.editing_mode = :vi_insert + end + + private def vi_add_at_eol(key) + ed_move_to_end(key) + @config.editing_mode = :vi_insert + end + private def ed_delete_prev_char(key, arg: 1) deleted = '' arg.times do diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index d46d784d1b8443..b8ab160ff40e5f 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -56,6 +56,42 @@ def test_vi_add assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) end + def test_vi_insert_at_bol + input_keys('I') + assert_line('I') + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys("12345\C-[hh") + assert_line('I12345') + assert_byte_pointer_size('I12') + assert_cursor(3) + assert_cursor_max(6) + assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode) + input_keys('I') + assert_line('I12345') + assert_byte_pointer_size('') + assert_cursor(0) + assert_cursor_max(6) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + end + + def test_vi_add_at_eol + input_keys('A') + assert_line('A') + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + input_keys("12345\C-[hh") + assert_line('A12345') + assert_byte_pointer_size('A12') + assert_cursor(3) + assert_cursor_max(6) + assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode) + input_keys('A') + assert_line('A12345') + assert_byte_pointer_size('A12345') + assert_cursor(6) + assert_cursor_max(6) + assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode) + end + def test_ed_insert_one input_keys('a') assert_line('a') From 95301378fc3b41528b4264de54722a0e7be0e875 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 17 Jan 2020 01:37:30 +0900 Subject: [PATCH 402/878] * 2020-01-17 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index a0b2e4d00ae5b6..1f4dd50ea4d86f 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" From 8ab11096ef3e0cf594308da285af2257cb4f5291 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Thu, 16 Jan 2020 13:28:37 -0600 Subject: [PATCH 403/878] Clarify documentation for Module#included_modules and Module#included? [DOC] [ci skip] [Bug #8841] --- class.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/class.c b/class.c index 66c149b6bf77bc..46f7cc307383ea 100644 --- a/class.c +++ b/class.c @@ -1022,17 +1022,22 @@ rb_prepend_module(VALUE klass, VALUE module) * call-seq: * mod.included_modules -> array * - * Returns the list of modules included in mod. + * Returns the list of modules included or prepended in mod + * or one of mod's ancestors. + * + * module Sub + * end * * module Mixin + * prepend Sub * end * * module Outer * include Mixin * end * - * Mixin.included_modules #=> [] - * Outer.included_modules #=> [Mixin] + * Mixin.included_modules #=> [Sub] + * Outer.included_modules #=> [Sub, Mixin] */ VALUE @@ -1056,8 +1061,8 @@ rb_mod_included_modules(VALUE mod) * call-seq: * mod.include?(module) -> true or false * - * Returns true if module is included in - * mod or one of mod's ancestors. + * Returns true if module is included + * or prepended in mod or one of mod's ancestors. * * module A * end From 019a0ed0c78ccd0eb694d09c6a226761261ec15d Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Fri, 17 Jan 2020 09:05:17 +0900 Subject: [PATCH 404/878] Make RATIONAL_SET_{NUM,DEN} static inline functions --- internal/rational.h | 18 ++++++++++++++++-- parse.y | 2 +- rational.c | 8 ++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/internal/rational.h b/internal/rational.h index c783c5162b6dd9..028fc4c03e6101 100644 --- a/internal/rational.h +++ b/internal/rational.h @@ -11,6 +11,7 @@ */ #include "ruby/config.h" /* for HAVE_LIBGMP */ #include "ruby/ruby.h" /* for struct RBasic */ +#include "internal/gc.h" /* for RB_OBJ_WRITE */ struct RRational { struct RBasic basic; @@ -19,8 +20,6 @@ struct RRational { }; #define RRATIONAL(obj) (R_CAST(RRational)(obj)) -#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &RRATIONAL(rat)->num, (n)) -#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &RRATIONAL(rat)->den, (d)) /* rational.c */ VALUE rb_rational_canonicalize(VALUE x); @@ -37,6 +36,9 @@ VALUE rb_numeric_quo(VALUE x, VALUE y); VALUE rb_float_numerator(VALUE x); VALUE rb_float_denominator(VALUE x); +static inline void RATIONAL_SET_NUM(VALUE r, VALUE n); +static inline void RATIONAL_SET_DEN(VALUE r, VALUE d); + RUBY_SYMBOL_EXPORT_BEGIN /* rational.c (export) */ VALUE rb_gcd(VALUE x, VALUE y); @@ -46,4 +48,16 @@ VALUE rb_gcd_gmp(VALUE x, VALUE y); #endif RUBY_SYMBOL_EXPORT_END +static inline void +RATIONAL_SET_NUM(VALUE r, VALUE n) +{ + RB_OBJ_WRITE(r, &RRATIONAL(r)->num, n); +} + +static inline void +RATIONAL_SET_DEN(VALUE r, VALUE d) +{ + RB_OBJ_WRITE(r, &RRATIONAL(r)->den, d); +} + #endif /* INTERNAL_RATIONAL_H */ diff --git a/parse.y b/parse.y index 1facda553ebdfd..c0d4639509c7ee 100644 --- a/parse.y +++ b/parse.y @@ -11240,7 +11240,7 @@ negate_lit(struct parser_params *p, VALUE lit) lit = rb_big_norm(lit); break; case T_RATIONAL: - RRATIONAL_SET_NUM(lit, negate_lit(p, RRATIONAL(lit)->num)); + RATIONAL_SET_NUM(lit, negate_lit(p, RRATIONAL(lit)->num)); break; case T_COMPLEX: RCOMPLEX_SET_REAL(lit, negate_lit(p, RCOMPLEX(lit)->real)); diff --git a/rational.c b/rational.c index 8b4a39452c709a..4ae872bd3329c9 100644 --- a/rational.c +++ b/rational.c @@ -403,8 +403,8 @@ nurat_s_new_internal(VALUE klass, VALUE num, VALUE den) { NEWOBJ_OF(obj, struct RRational, klass, T_RATIONAL | (RGENGC_WB_PROTECTED_RATIONAL ? FL_WB_PROTECTED : 0)); - RRATIONAL_SET_NUM(obj, num); - RRATIONAL_SET_DEN(obj, den); + RATIONAL_SET_NUM((VALUE)obj, num); + RATIONAL_SET_DEN((VALUE)obj, den); OBJ_FREEZE_RAW(obj); return (VALUE)obj; @@ -1836,8 +1836,8 @@ nurat_loader(VALUE self, VALUE a) nurat_int_check(num); nurat_int_check(den); nurat_canonicalize(&num, &den); - RRATIONAL_SET_NUM(dat, num); - RRATIONAL_SET_DEN(dat, den); + RATIONAL_SET_NUM((VALUE)dat, num); + RATIONAL_SET_DEN((VALUE)dat, den); OBJ_FREEZE_RAW(self); return self; From fbc00c2d863f6cdeb65203e798b08157997cf786 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Fri, 17 Jan 2020 09:45:10 +0900 Subject: [PATCH 405/878] rational.c: remove nurat_s_new --- rational.c | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/rational.c b/rational.c index 4ae872bd3329c9..0f9841667f7dae 100644 --- a/rational.c +++ b/rational.c @@ -497,25 +497,6 @@ nurat_s_canonicalize_internal_no_reduce(VALUE klass, VALUE num, VALUE den) return nurat_s_new_internal(klass, num, den); } -static VALUE -nurat_s_new(int argc, VALUE *argv, VALUE klass) -{ - VALUE num, den; - - switch (rb_scan_args(argc, argv, "11", &num, &den)) { - case 1: - num = nurat_int_value(num); - den = ONE; - break; - default: - num = nurat_int_value(num); - den = nurat_int_value(den); - break; - } - - return nurat_s_canonicalize_internal(klass, num, den); -} - inline static VALUE f_rational_new2(VALUE klass, VALUE x, VALUE y) { @@ -2644,21 +2625,20 @@ nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise) return f_div(a1, a2); } - { - int argc; - VALUE argv2[2]; - argv2[0] = a1; - if (a2 == Qundef) { - argv2[1] = Qnil; - argc = 1; - } - else { - if (!k_integer_p(a2) && !raise) return Qnil; - argv2[1] = a2; - argc = 2; - } - return nurat_s_new(argc, argv2, klass); + a1 = nurat_int_value(a1); + + if (a2 == Qundef) { + a2 = ONE; + } + else if (!k_integer_p(a2) && !raise) { + return Qnil; } + else { + a2 = nurat_int_value(a2); + } + + + return nurat_s_canonicalize_internal(klass, a1, a2); } static VALUE From 07ce51c5aaf25a5a184a35074a40138256a0c099 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Fri, 17 Jan 2020 09:55:50 +0900 Subject: [PATCH 406/878] internal/rational.h: insert assertions in RATIONAL_SET_{NUM,DEN} --- internal/numeric.h | 12 ++++++++++++ internal/rational.h | 5 +++++ rational.c | 1 - 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/internal/numeric.h b/internal/numeric.h index 609b0c5fffa17a..a5875fbbff1bd3 100644 --- a/internal/numeric.h +++ b/internal/numeric.h @@ -89,6 +89,7 @@ static inline double rb_float_flonum_value(VALUE v); static inline double rb_float_noflonum_value(VALUE v); static inline double rb_float_value_inline(VALUE v); static inline VALUE rb_float_new_inline(double d); +static inline bool INT_POSITIVE_P(VALUE num); static inline bool INT_NEGATIVE_P(VALUE num); static inline bool FLOAT_ZERO_P(VALUE num); #define rb_float_value rb_float_value_inline @@ -108,6 +109,17 @@ VALUE rb_float_eql(VALUE x, VALUE y); VALUE rb_fix_aref(VALUE fix, VALUE idx); MJIT_SYMBOL_EXPORT_END +static inline bool +INT_POSITIVE_P(VALUE num) +{ + if (FIXNUM_P(num)) { + return FIXNUM_POSITIVE_P(num); + } + else { + return BIGNUM_POSITIVE_P(num); + } +} + static inline bool INT_NEGATIVE_P(VALUE num) { diff --git a/internal/rational.h b/internal/rational.h index 028fc4c03e6101..d51405064119fa 100644 --- a/internal/rational.h +++ b/internal/rational.h @@ -12,6 +12,8 @@ #include "ruby/config.h" /* for HAVE_LIBGMP */ #include "ruby/ruby.h" /* for struct RBasic */ #include "internal/gc.h" /* for RB_OBJ_WRITE */ +#include "internal/numeric.h" /* for INT_POSITIVE_P */ +#include "ruby_assert.h" /* for assert */ struct RRational { struct RBasic basic; @@ -51,12 +53,15 @@ RUBY_SYMBOL_EXPORT_END static inline void RATIONAL_SET_NUM(VALUE r, VALUE n) { + assert(RB_INTEGER_TYPE_P(n)); RB_OBJ_WRITE(r, &RRATIONAL(r)->num, n); } static inline void RATIONAL_SET_DEN(VALUE r, VALUE d) { + assert(RB_INTEGER_TYPE_P(d)); + assert(INT_POSITIVE_P(d)); RB_OBJ_WRITE(r, &RRATIONAL(r)->den, d); } diff --git a/rational.c b/rational.c index 0f9841667f7dae..f483c6d68b3a4d 100644 --- a/rational.c +++ b/rational.c @@ -37,7 +37,6 @@ #define GMP_GCD_DIGITS 1 -#define INT_POSITIVE_P(x) (FIXNUM_P(x) ? FIXNUM_POSITIVE_P(x) : BIGNUM_POSITIVE_P(x)) #define INT_ZERO_P(x) (FIXNUM_P(x) ? FIXNUM_ZERO_P(x) : rb_bigzero_p(x)) VALUE rb_cRational; From 73618d84e807b4157e0ba44e9a09e4c643de6c2c Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 17 Jan 2020 10:25:00 +0900 Subject: [PATCH 407/878] Update dependencies in makefiles patch from https://travis-ci.org/ruby/ruby/jobs/638226493 --- common.mk | 1 + ext/-test-/rational/depend | 2 ++ 2 files changed, 3 insertions(+) diff --git a/common.mk b/common.mk index 9c9624f19c4887..d1e43b445b3e8d 100644 --- a/common.mk +++ b/common.mk @@ -3927,6 +3927,7 @@ time.$(OBJEXT): $(top_srcdir)/internal/bits.h time.$(OBJEXT): $(top_srcdir)/internal/compar.h time.$(OBJEXT): $(top_srcdir)/internal/compilers.h time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h +time.$(OBJEXT): $(top_srcdir)/internal/gc.h time.$(OBJEXT): $(top_srcdir)/internal/numeric.h time.$(OBJEXT): $(top_srcdir)/internal/rational.h time.$(OBJEXT): $(top_srcdir)/internal/serial.h diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend index d5bf1b554e5243..72e908f46f3769 100644 --- a/ext/-test-/rational/depend +++ b/ext/-test-/rational/depend @@ -15,6 +15,8 @@ rat.o: $(hdrdir)/ruby/ruby.h rat.o: $(hdrdir)/ruby/st.h rat.o: $(hdrdir)/ruby/subst.h rat.o: $(top_srcdir)/internal.h +rat.o: $(top_srcdir)/internal/compilers.h +rat.o: $(top_srcdir)/internal/gc.h rat.o: $(top_srcdir)/internal/rational.h rat.o: rat.c # AUTOGENERATED DEPENDENCIES END From 47465ab1ccf48d2c905dbcf3b676e30b61cc41ca Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Fri, 17 Jan 2020 10:41:03 +0900 Subject: [PATCH 408/878] rb_rational_raw: make a denominator always positive --- ext/-test-/rational/rat.c | 8 ++++++++ rational.c | 4 ++++ test/-ext-/rational/test_rat.rb | 14 ++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c index 01388346f7ca82..b1ffbda144890a 100644 --- a/ext/-test-/rational/rat.c +++ b/ext/-test-/rational/rat.c @@ -29,9 +29,17 @@ gcd_gmp(VALUE x, VALUE y) #define gcd_gmp rb_f_notimplement #endif +static VALUE +s_rational_raw(VALUE klass, VALUE x, VALUE y) +{ + return rb_rational_raw(x, y); +} + void Init_rational(VALUE klass) { rb_define_method(rb_cInteger, "gcd_normal", gcd_normal, 1); rb_define_method(rb_cInteger, "gcd_gmp", gcd_gmp, 1); + + rb_define_singleton_method(rb_cRational, "raw", s_rational_raw, 2); } diff --git a/rational.c b/rational.c index f483c6d68b3a4d..0261c6940a0805 100644 --- a/rational.c +++ b/rational.c @@ -1927,6 +1927,10 @@ rb_gcdlcm(VALUE self, VALUE other) VALUE rb_rational_raw(VALUE x, VALUE y) { + if (INT_NEGATIVE_P(y)) { + x = rb_int_uminus(x); + y = rb_int_uminus(y); + } return nurat_s_new_internal(rb_cRational, x, y); } diff --git a/test/-ext-/rational/test_rat.rb b/test/-ext-/rational/test_rat.rb index 626ffb96611f91..dbba00ca61f50c 100644 --- a/test/-ext-/rational/test_rat.rb +++ b/test/-ext-/rational/test_rat.rb @@ -29,4 +29,18 @@ def test_gcd_gmp_brute_force rescue NotImplementedError end end + + def test_rb_rational_raw + rat = Rational.raw(1, 2) + assert_equal(1, rat.numerator) + assert_equal(2, rat.denominator) + + rat = Rational.raw(-1, 2) + assert_equal(-1, rat.numerator) + assert_equal(2, rat.denominator) + + rat = Rational.raw(1, -2) + assert_equal(-1, rat.numerator) + assert_equal(2, rat.denominator) + end end From 5275d8bf4c43db9f057d24a26cf33ecd69f8b345 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Fri, 17 Jan 2020 10:47:20 +0900 Subject: [PATCH 409/878] rb_rational_raw: convert num and den by to_int --- rational.c | 4 ++++ test/-ext-/rational/test_rat.rb | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/rational.c b/rational.c index 0261c6940a0805..1cd4ecc3075fe5 100644 --- a/rational.c +++ b/rational.c @@ -1927,6 +1927,10 @@ rb_gcdlcm(VALUE self, VALUE other) VALUE rb_rational_raw(VALUE x, VALUE y) { + if (! RB_INTEGER_TYPE_P(x)) + x = rb_to_int(x); + if (! RB_INTEGER_TYPE_P(y)) + y = rb_to_int(y); if (INT_NEGATIVE_P(y)) { x = rb_int_uminus(x); y = rb_int_uminus(y); diff --git a/test/-ext-/rational/test_rat.rb b/test/-ext-/rational/test_rat.rb index dbba00ca61f50c..7683483e667f93 100644 --- a/test/-ext-/rational/test_rat.rb +++ b/test/-ext-/rational/test_rat.rb @@ -42,5 +42,29 @@ def test_rb_rational_raw rat = Rational.raw(1, -2) assert_equal(-1, rat.numerator) assert_equal(2, rat.denominator) + + assert_equal(1/2r, Rational.raw(1.0, 2.0)) + + assert_raise(TypeError) { Rational.raw("1", 2) } + assert_raise(TypeError) { Rational.raw(1, "2") } + + class << (o = Object.new) + def to_i; 42; end + end + + assert_raise(TypeError) { Rational.raw(o, 2) } + assert_raise(TypeError) { Rational.raw(1, o) } + + class << (o = Object.new) + def to_int; 42; end + end + + rat = Rational.raw(o, 2) + assert_equal(42, rat.numerator) + assert_equal(2, rat.denominator) + + rat = Rational.raw(2, o) + assert_equal(2, rat.numerator) + assert_equal(42, rat.denominator) end end From 4e6bcac23e927bb0ede0935d62491b6c32cbc621 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 17 Jan 2020 11:19:01 +0900 Subject: [PATCH 410/878] Update dependencies in makefiles again patch from https://travis-ci.org/ruby/ruby/jobs/638231960 --- common.mk | 3 +++ ext/-test-/rational/depend | 9 +++++++++ ext/ripper/depend | 1 + 3 files changed, 13 insertions(+) diff --git a/common.mk b/common.mk index d1e43b445b3e8d..60ebf83516d86f 100644 --- a/common.mk +++ b/common.mk @@ -3053,6 +3053,7 @@ numeric.$(OBJEXT): {$(VPATH)}missing.h numeric.$(OBJEXT): {$(VPATH)}numeric.c numeric.$(OBJEXT): {$(VPATH)}onigmo.h numeric.$(OBJEXT): {$(VPATH)}oniguruma.h +numeric.$(OBJEXT): {$(VPATH)}ruby_assert.h numeric.$(OBJEXT): {$(VPATH)}st.h numeric.$(OBJEXT): {$(VPATH)}subst.h numeric.$(OBJEXT): {$(VPATH)}util.h @@ -3175,6 +3176,7 @@ parse.$(OBJEXT): {$(VPATH)}probes.dmyh parse.$(OBJEXT): {$(VPATH)}probes.h parse.$(OBJEXT): {$(VPATH)}regenc.h parse.$(OBJEXT): {$(VPATH)}regex.h +parse.$(OBJEXT): {$(VPATH)}ruby_assert.h parse.$(OBJEXT): {$(VPATH)}st.h parse.$(OBJEXT): {$(VPATH)}subst.h parse.$(OBJEXT): {$(VPATH)}symbol.h @@ -3949,6 +3951,7 @@ time.$(OBJEXT): {$(VPATH)}internal.h time.$(OBJEXT): {$(VPATH)}missing.h time.$(OBJEXT): {$(VPATH)}onigmo.h time.$(OBJEXT): {$(VPATH)}oniguruma.h +time.$(OBJEXT): {$(VPATH)}ruby_assert.h time.$(OBJEXT): {$(VPATH)}st.h time.$(OBJEXT): {$(VPATH)}subst.h time.$(OBJEXT): {$(VPATH)}time.c diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend index 72e908f46f3769..8cbac9a3648ee5 100644 --- a/ext/-test-/rational/depend +++ b/ext/-test-/rational/depend @@ -15,8 +15,17 @@ rat.o: $(hdrdir)/ruby/ruby.h rat.o: $(hdrdir)/ruby/st.h rat.o: $(hdrdir)/ruby/subst.h rat.o: $(top_srcdir)/internal.h +rat.o: $(top_srcdir)/internal/bignum.h +rat.o: $(top_srcdir)/internal/bits.h rat.o: $(top_srcdir)/internal/compilers.h +rat.o: $(top_srcdir)/internal/fixnum.h rat.o: $(top_srcdir)/internal/gc.h +rat.o: $(top_srcdir)/internal/numeric.h rat.o: $(top_srcdir)/internal/rational.h +rat.o: $(top_srcdir)/internal/serial.h +rat.o: $(top_srcdir)/internal/static_assert.h +rat.o: $(top_srcdir)/internal/stdbool.h +rat.o: $(top_srcdir)/internal/vm.h +rat.o: $(top_srcdir)/ruby_assert.h rat.o: rat.c # AUTOGENERATED DEPENDENCIES END diff --git a/ext/ripper/depend b/ext/ripper/depend index 851af739494df5..f1fbeaf5c34649 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -96,6 +96,7 @@ ripper.o: $(top_srcdir)/internal/vm.h ripper.o: $(top_srcdir)/internal/warnings.h ripper.o: $(top_srcdir)/node.h ripper.o: $(top_srcdir)/regenc.h +ripper.o: $(top_srcdir)/ruby_assert.h ripper.o: $(top_srcdir)/symbol.h ripper.o: ../../probes.h ripper.o: eventids2.c From f9788ca7fe645be50f9248264253b453820d1d35 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 17 Jan 2020 16:41:46 +0900 Subject: [PATCH 411/878] Update dependencies internal/rational.h needs internal/warnings.h with Apple clang, for `UNALIGNED_MEMBER_ACCESS`. --- common.mk | 1 + ext/-test-/rational/depend | 1 + 2 files changed, 2 insertions(+) diff --git a/common.mk b/common.mk index 60ebf83516d86f..8103d8e0201f08 100644 --- a/common.mk +++ b/common.mk @@ -3939,6 +3939,7 @@ time.$(OBJEXT): $(top_srcdir)/internal/string.h time.$(OBJEXT): $(top_srcdir)/internal/time.h time.$(OBJEXT): $(top_srcdir)/internal/variable.h time.$(OBJEXT): $(top_srcdir)/internal/vm.h +time.$(OBJEXT): $(top_srcdir)/internal/warnings.h time.$(OBJEXT): {$(VPATH)}assert.h time.$(OBJEXT): {$(VPATH)}config.h time.$(OBJEXT): {$(VPATH)}constant.h diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend index 8cbac9a3648ee5..c3134d0be57c3f 100644 --- a/ext/-test-/rational/depend +++ b/ext/-test-/rational/depend @@ -26,6 +26,7 @@ rat.o: $(top_srcdir)/internal/serial.h rat.o: $(top_srcdir)/internal/static_assert.h rat.o: $(top_srcdir)/internal/stdbool.h rat.o: $(top_srcdir)/internal/vm.h +rat.o: $(top_srcdir)/internal/warnings.h rat.o: $(top_srcdir)/ruby_assert.h rat.o: rat.c # AUTOGENERATED DEPENDENCIES END From c98c492578d898dc07a04b8240d8d5b1508ffafa Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 17 Jan 2020 16:56:53 +0900 Subject: [PATCH 412/878] Added test for f38b3e8c707ebdcad05aa9485cf1760640b74fbb --- test/ruby/test_ast.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb index 4c156650b85c12..147d05eadf5726 100644 --- a/test/ruby/test_ast.rb +++ b/test/ruby/test_ast.rb @@ -42,10 +42,11 @@ class TestAst < Test::Unit::TestCase class Helper attr_reader :errors - def initialize(path) + def initialize(path, src: nil) @path = path @errors = [] @debug = false + @ast = RubyVM::AbstractSyntaxTree.parse(src) if src end def validate_range @@ -312,4 +313,10 @@ def test_keyword_rest assert_equal(false, kwrest.call('**nil')) assert_equal([:a], kwrest.call('**a')) end + + def test_ranges_numbered_parameter + helper = Helper.new(__FILE__, src: "1.times {_1}") + helper.validate_range + assert_equal([], helper.errors) + end end From b23fd59cbb3f097bcd559d0c85a86ff7a1eeeb7e Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 11 Jan 2020 15:04:44 +0900 Subject: [PATCH 413/878] marshal.c: Support dump and load of a Hash with the ruby2_keywords flag It is useful for a program that dumps and load arguments (like drb). In future, they should deal with both positional arguments and keyword ones explicitly, but until ruby2_keywords is deprecated, it is good to support the flag in marshal. The implementation is similar to String's encoding; it is dumped as a hidden instance variable. [Feature #16501] --- marshal.c | 52 +++++++++++++++++++++++++++++++++------ test/ruby/test_marshal.rb | 14 +++++++++++ 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/marshal.c b/marshal.c index 532627118e08db..8af1d8b8145e7e 100644 --- a/marshal.c +++ b/marshal.c @@ -94,7 +94,7 @@ shortlen(size_t len, BDIGIT *ds) static ID s_dump, s_load, s_mdump, s_mload; static ID s_dump_data, s_load_data, s_alloc, s_call; static ID s_getbyte, s_read, s_write, s_binmode; -static ID s_encoding_short; +static ID s_encoding_short, s_ruby2_keywords_flag; #define name_s_dump "_dump" #define name_s_load "_load" @@ -109,6 +109,7 @@ static ID s_encoding_short; #define name_s_write "write" #define name_s_binmode "binmode" #define name_s_encoding_short "E" +#define name_s_ruby2_keywords_flag "K" typedef struct { VALUE newclass; @@ -568,7 +569,7 @@ w_uclass(VALUE obj, VALUE super, struct dump_arg *arg) } } -#define to_be_skipped_id(id) (id == rb_id_encoding() || id == s_encoding_short || !rb_id2str(id)) +#define to_be_skipped_id(id) (id == rb_id_encoding() || id == s_encoding_short || id == s_ruby2_keywords_flag || !rb_id2str(id)) struct w_ivar_arg { struct dump_call_arg *dump; @@ -588,6 +589,10 @@ w_obj_each(st_data_t key, st_data_t val, st_data_t a) rb_warn("instance variable `"name_s_encoding_short"' on class %"PRIsVALUE" is not dumped", CLASS_OF(arg->obj)); } + if (id == s_ruby2_keywords_flag) { + rb_warn("instance variable `"name_s_ruby2_keywords_flag"' on class %"PRIsVALUE" is not dumped", + CLASS_OF(arg->obj)); + } return ST_CONTINUE; } if (!ivarg->num_ivar) { @@ -665,6 +670,7 @@ has_ivars(VALUE obj, VALUE encname, VALUE *ivobj) { st_index_t enc = !NIL_P(encname); st_index_t num = 0; + st_index_t ruby2_keywords_flag = 0; if (SPECIAL_CONST_P(obj)) goto generic; switch (BUILTIN_TYPE(obj)) { @@ -672,13 +678,16 @@ has_ivars(VALUE obj, VALUE encname, VALUE *ivobj) case T_CLASS: case T_MODULE: break; /* counted elsewhere */ + case T_HASH: + ruby2_keywords_flag = RHASH(obj)->basic.flags & RHASH_PASS_AS_KEYWORDS ? 1 : 0; + /* fall through */ default: generic: rb_ivar_foreach(obj, obj_count_ivars, (st_data_t)&num); - if (num) *ivobj = obj; + if (ruby2_keywords_flag || num) *ivobj = obj; } - return num + enc; + return num + enc + ruby2_keywords_flag; } static void @@ -698,7 +707,14 @@ w_ivar(st_index_t num, VALUE ivobj, VALUE encname, struct dump_call_arg *arg) { w_long(num, arg->arg); num -= w_encoding(encname, arg); - if (ivobj != Qundef) { + if (RB_TYPE_P(ivobj, T_HASH) && (RHASH(ivobj)->basic.flags & RHASH_PASS_AS_KEYWORDS)) { + int limit = arg->limit; + if (limit >= 0) ++limit; + w_symbol(ID2SYM(s_ruby2_keywords_flag), arg->arg); + w_object(Qtrue, arg->arg, limit); + num--; + } + if (ivobj != Qundef && num) { w_ivar_each(ivobj, num, arg); } } @@ -1399,6 +1415,19 @@ sym2encidx(VALUE sym, VALUE val) return -1; } +static int +ruby2_keywords_flag_check(VALUE sym) +{ + const char *p; + long l; + RSTRING_GETMEM(sym, p, l); + if (l <= 0) return 0; + if (name_equal(name_s_ruby2_keywords_flag, rb_strlen_lit(name_s_ruby2_keywords_flag), p, 1)) { + return 1; + } + return 0; +} + static VALUE r_symlink(struct load_arg *arg) { @@ -1552,8 +1581,16 @@ r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg) } if (has_encoding) *has_encoding = TRUE; } - else { - rb_ivar_set(obj, rb_intern_str(sym), val); + else if (ruby2_keywords_flag_check(sym)) { + if (RB_TYPE_P(obj, T_HASH)) { + RHASH(obj)->basic.flags |= RHASH_PASS_AS_KEYWORDS; + } + else { + rb_raise(rb_eArgError, "ruby2_keywords flag is given but %"PRIsVALUE" is not a Hash", obj); + } + } + else { + rb_ivar_set(obj, rb_intern_str(sym), val); } } while (--len > 0); } @@ -2299,6 +2336,7 @@ Init_marshal(void) set_id(s_write); set_id(s_binmode); set_id(s_encoding_short); + set_id(s_ruby2_keywords_flag); rb_define_module_function(rb_mMarshal, "dump", marshal_dump, -1); rb_define_module_function(rb_mMarshal, "load", marshal_load, -1); diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 74ea75ee42f31c..dbeee825da79fe 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -754,4 +754,18 @@ def test_marshal_dump_removing_instance_variable Marshal.dump(obj) end end + + ruby2_keywords def ruby2_keywords_hash(*a) + a.last + end + + def ruby2_keywords_test(key: 1) + key + end + + def test_marshal_with_ruby2_keywords_hash + flagged_hash = ruby2_keywords_hash(key: 42) + hash = Marshal.load(Marshal.dump(flagged_hash)) + assert_equal(42, ruby2_keywords_test(*[hash])) + end end From 7cfe93c028fbf7aa0022ca8a4ac6a66d0103337a Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 6 Jan 2020 18:22:43 +0900 Subject: [PATCH 414/878] hash.c: Add a feature to manipulate ruby2_keywords flag It was found that a feature to check and add ruby2_keywords flag to an existing Hash is needed when arguments are serialized and deserialized. It is possible to do the same without explicit APIs, but it would be good to provide them as a core feature. https://github.com/rails/rails/pull/38105#discussion_r361863767 Hash.ruby2_keywords_hash?(hash) checks if hash is flagged or not. Hash.ruby2_keywords_hash(hash) returns a duplicated hash that has a ruby2_keywords flag, [Bug #16486] --- hash.c | 49 ++++++++++++++++++++++++++++++++++++++++++ test/ruby/test_hash.rb | 24 +++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/hash.c b/hash.c index 644f85d6da8a59..a1b57cee248d5e 100644 --- a/hash.c +++ b/hash.c @@ -1874,6 +1874,52 @@ rb_hash_s_try_convert(VALUE dummy, VALUE hash) return rb_check_hash_type(hash); } +/* + * call-seq: + * Hash.ruby2_keywords_hash?(hash) -> true or false + * + * Checks if a given hash is flagged by Module#ruby2_keywords (or + * Proc#ruby2_keywords). + * This method is not for casual use; debugging, researching, and + * some truly necessary cases like serialization of arguments. + * + * ruby2_keywords def foo(*args) + * Hash.ruby2_keywords_hash?(args.last) + * end + * foo(k: 1) #=> true + * foo({k: 1}) #=> false + */ +static VALUE +rb_hash_s_ruby2_keywords_hash_p(VALUE dummy, VALUE hash) +{ + Check_Type(hash, T_HASH); + return (RHASH(hash)->basic.flags & RHASH_PASS_AS_KEYWORDS) ? Qtrue : Qfalse; +} + +/* + * call-seq: + * Hash.ruby2_keywords_hash(hash) -> hash + * + * Duplicates a given hash and adds a ruby2_keywords flag. + * This method is not for casual use; debugging, researching, and + * some truly necessary cases like deserialization of arguments. + * + * h = {k: 1} + * h = Hash.ruby2_keywords_hash(h) + * def foo(k: 42) + * k + * end + * foo(*[h]) #=> 1 with neither a warning or an error + */ +static VALUE +rb_hash_s_ruby2_keywords_hash(VALUE dummy, VALUE hash) +{ + Check_Type(hash, T_HASH); + hash = rb_hash_dup(hash); + RHASH(hash)->basic.flags |= RHASH_PASS_AS_KEYWORDS; + return hash; +} + struct rehash_arg { VALUE hash; st_table *tbl; @@ -6415,6 +6461,9 @@ Init_Hash(void) rb_define_method(rb_cHash, "deconstruct_keys", rb_hash_deconstruct_keys, 1); + rb_define_singleton_method(rb_cHash, "ruby2_keywords_hash?", rb_hash_s_ruby2_keywords_hash_p, 1); + rb_define_singleton_method(rb_cHash, "ruby2_keywords_hash", rb_hash_s_ruby2_keywords_hash, 1); + /* Document-class: ENV * * ENV is a hash-like accessor for environment variables. diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index ef32cff8682aa3..2c449739f16318 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1756,4 +1756,28 @@ def setup super end end + + ruby2_keywords def get_flagged_hash(*args) + args.last + end + + def check_flagged_hash(k: :NG) + k + end + + def test_ruby2_keywords_hash? + flagged_hash = get_flagged_hash(k: 1) + assert_equal(true, Hash.ruby2_keywords_hash?(flagged_hash)) + assert_equal(false, Hash.ruby2_keywords_hash?({})) + assert_raise(TypeError) { Hash.ruby2_keywords_hash?(1) } + end + + def test_ruby2_keywords_hash! + hash = {k: 1} + assert_equal(false, Hash.ruby2_keywords_hash?(hash)) + hash = Hash.ruby2_keywords_hash(hash) + assert_equal(true, Hash.ruby2_keywords_hash?(hash)) + assert_equal(1, check_flagged_hash(*[hash])) + assert_raise(TypeError) { Hash.ruby2_keywords_hash(1) } + end end From 3344f811074e1e6119eec23684013457dab4f8b0 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Fri, 17 Jan 2020 17:25:05 +0900 Subject: [PATCH 415/878] .github/workflows/cygwin.yml: Removed There is no active maintainer for cygwin. The CI failure is too noisy. [Misc #16407] --- .github/workflows/cygwin.yml | 93 ------------------------------------ 1 file changed, 93 deletions(-) delete mode 100644 .github/workflows/cygwin.yml diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml deleted file mode 100644 index a066b35a6a8707..00000000000000 --- a/.github/workflows/cygwin.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: Cygwin -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' -jobs: - make: - strategy: - matrix: - test_task: [test] - os: [windows-2019] - vs: [2019] - fail-fast: false - runs-on: ${{ matrix.os }} - if: "!contains(github.event.head_commit.message, '[ci skip]')" - steps: - - uses: actions/cache@v1 - with: - path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey - key: ${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}- - ${{ runner.os }}-cygwin-chocolatey- - - name: Install cygwin base packages with chocolatey - run: | - choco install --no-progress cygwin - - uses: actions/cache@v1 - with: - path: C:\tools\cygwin\package - key: ${{ runner.os }}-cygwin-package-${{ matrix.os }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-cygwin-package-${{ matrix.os }}- - ${{ runner.os }}-cygwin-package- - - name: Install cygwin additional packages - run: | - C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -l C:/tools/cygwin/package -s http://mirrors.kernel.org/sourceware/cygwin/ -P autoconf,bison,gcc-core,git,libffi-devel,libgdbm-devel,libgmp-devel,libreadline-devel,libssl-devel,make,patch,ruby,zlib-devel - shell: cmd - - name: Set ENV - run: | - echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' - # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork. - - name: Checkout ruby - run: | - git clone --single-branch --shallow-since=yesterday --branch=%GITHUB_REF:refs/heads/=% https://github.com/${{ github.repository }} src - git -C src reset --hard ${{ github.sha }} - if: github.event_name == 'push' - shell: cmd - - name: Checkout a pull request - run: | - git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src - git -C src reset --hard ${{ github.event.pull_request.head.sha }} - if: github.event_name == 'pull_request' - shell: cmd - - run: ./src/tool/actions-commit-info.sh - shell: bash - id: commit_info - - name: Autoconf - run: | - cd src - bash /usr/bin/autoconf - shell: cmd - - name: Configure - run: | - md build - cd build - bash ../src/configure - shell: cmd - - name: make - run: | - make -C build - shell: cmd - # TODO: Fix test fail on cygwin environment on GitHub Actions - # - name: make btest - # run: | - # make -C build btest - # shell: cmd - - uses: k0kubun/action-slack@v2.0.0 - with: - payload: | - { - "attachments": [{ - "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + - "() " + - "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", - "color": "danger" - }] - } - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - if: failure() && github.event_name == 'push' From 09271acdaf8816562c882780d45306b3155152a1 Mon Sep 17 00:00:00 2001 From: Adam Isom Date: Thu, 16 Jan 2020 14:42:36 -0700 Subject: [PATCH 416/878] Update documentation for Array/Hash Argument section of methods.rdoc --- doc/syntax/methods.rdoc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc index 924e31611f15de..c11bd449bc99fc 100644 --- a/doc/syntax/methods.rdoc +++ b/doc/syntax/methods.rdoc @@ -379,12 +379,23 @@ converted to an Array: gather_arguments 1, 2, 3 # prints [1, 2, 3] -The array argument must be the last positional argument, it must appear before -any keyword arguments. +The array argument must appear before any keyword arguments. + +It is possible to gather arguments at the beginning or in the middle: + + def gather_arguments(first_arg, *middle_arguments, last_arg) + p middle_arguments + end + + gather_arguments 1, 2, 3, 4 # prints [2, 3] The array argument will capture a Hash as the last entry if a hash was sent by the caller after all positional arguments. + def gather_arguments(*arguments) + p arguments + end + gather_arguments 1, a: 2 # prints [1, {:a=>2}] However, this only occurs if the method does not declare any keyword arguments. From 4e1a7678cdb9c14c0299d893673d9cb07293b78d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 23 Dec 2019 12:14:11 +0900 Subject: [PATCH 417/878] [ruby/io-console] Update the minimum requirement of Ruby version https://github.com/ruby/io-console/commit/73e7b6318a --- ext/io/console/io-console.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index 0920fc3e6ad32f..fe6366cc734d4e 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.summary = "Console interface" s.email = "nobu@ruby-lang.org" s.description = "add console capabilities to IO instances." - s.required_ruby_version = ">= 2.2.0" + s.required_ruby_version = ">= 2.4.0" s.homepage = "https://github.com/ruby/io-console" s.metadata["source_code_url"] = s.homepage s.authors = ["Nobu Nakada"] From 569f56e0f74e29924a63579e77e3e60411dc0479 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Mon, 13 Jan 2020 13:42:56 -0600 Subject: [PATCH 418/878] [ruby/io-console] Filter Ruby engine name rather than just /ruby/ This breaks tests using this path on JRuby because the `jruby` executable turns into `jjruby` after the sub. https://github.com/ruby/io-console/commit/e5951aa34c --- test/io/console/test_io_console.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index 77c6dac5a63d7e..a02605dd1e12fd 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -462,7 +462,7 @@ def test_sync noctty = [EnvUtil.rubybin, "-e", "Process.daemon(true)"] when !(rubyw = RbConfig::CONFIG["RUBYW_INSTALL_NAME"]).empty? dir, base = File.split(EnvUtil.rubybin) - noctty = [File.join(dir, base.sub(/ruby/, rubyw))] + noctty = [File.join(dir, base.sub(RUBY_ENGINE, rubyw))] end if noctty From 4e56ec4ef74cf77dbcb4ce7c669e0595cd0d12fa Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 17 Jan 2020 23:49:26 +0900 Subject: [PATCH 419/878] [ruby/io-console] Set `OPOST` when `intr` is true To enable implementation-defined output processing, for the compatibility with readline. [Bug #16509] https://bugs.ruby-lang.org/issues/16509 https://github.com/ruby/io-console/commit/8c8b0b6757 --- ext/io/console/console.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 3a6bb25db251ea..bfba1e71520a26 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -190,6 +190,7 @@ set_rawmode(conmode *t, void *arg) if (r->intr) { t->c_iflag |= BRKINT; t->c_lflag |= ISIG; + t->c_oflag |= OPOST; } #endif (void)r; From 199d829a513fc2750c4b6027b07d82b665e7ccb7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 00:17:05 +0900 Subject: [PATCH 420/878] [ruby/io-console] bump up to 0.5.5 --- ext/io/console/io-console.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index fe6366cc734d4e..40f4c6c5436517 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -1,5 +1,5 @@ # -*- ruby -*- -_VERSION = "0.5.4" +_VERSION = "0.5.5" date = %w$Date:: $[1] Gem::Specification.new do |s| From 1e29fe77f4b0f6260e7b418994e798e4277b66fe Mon Sep 17 00:00:00 2001 From: git Date: Sat, 18 Jan 2020 00:17:39 +0900 Subject: [PATCH 421/878] * 2020-01-18 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1f4dd50ea4d86f..18b5bce59dbe25 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" From 93a51c15d95b93bae428540966c73feebc9f5d4b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 16:45:31 +0900 Subject: [PATCH 422/878] Update clean-local [ci skip] * Remove builtin_binary.inc which is generated for each time miniruby is built. * dSYM is a directory, not a file. --- common.mk | 2 +- template/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 8103d8e0201f08..4cb305ffc77092 100644 --- a/common.mk +++ b/common.mk @@ -595,7 +595,7 @@ clean-local:: clean-runnable $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time $(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) $(COROUTINE_H:/Context.h=/.time) $(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp ChangeLog - $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) + $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) builtin_binary.inc -$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine 2> $(NULL) || $(NULLCMD) bin/clean-runnable:: PHONY diff --git a/template/Makefile.in b/template/Makefile.in index 3845f02dc7342f..50ea282976c3f0 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -474,9 +474,9 @@ clean-local:: $(Q)$(RM) \ ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \ enc/encinit.c enc/encinit.$(OBJEXT) $(pkgconfig_DATA) \ - ruby-runner.$(OBJEXT) ruby-runner.h *.dSYM \ + ruby-runner.$(OBJEXT) ruby-runner.h \ || $(NULLCMD) - -$(Q)$(RMALL) exe/ + -$(Q)$(RMALL) exe/ *.dSYM distclean-local:: $(Q)$(RM) \ From a1ce1dc2a773e1c49c82e3df4807f5c18d26e3be Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 17:23:20 +0900 Subject: [PATCH 423/878] NEWS.md: fixed lists and indents [ci skip] * The definition lists extensions of the RDoc Markdown parser does not support nesting. * The RDoc Markdown parser requires more indents for nested lists. --- NEWS.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9fb9943ed9de32..f9c70e175b0b85 100644 --- a/NEWS.md +++ b/NEWS.md @@ -16,11 +16,12 @@ sufficient information, see the ChangeLog file or Redmine ### Core classes updates (outstanding ones only) -Hash:: +* Hash - Modified method:: + * Modified method - * Hash#transform_keys now accepts a hash that maps keys to new keys. [Feature #16274] + * Hash#transform_keys now accepts a hash that maps keys to new + keys. [Feature #16274] ### Stdlib updates (outstanding ones only) @@ -28,13 +29,13 @@ Hash:: * Regexp literals are frozen [Feature #8948] [Feature #16377] -``` -/foo/.frozen? #=> true -``` + ``` + /foo/.frozen? #=> true + ``` * The bundled gems - * net-telnet and xmlrpc has been removed from the bundled gems. + net-telnet and xmlrpc has been removed from the bundled gems. If you interested in the maintain them, Please comment your plan to https://github.com/ruby/xmlrpc or https://github.com/ruby/net-telnet. From 59d255b940b7b5fc0f47e474ab6b557379eaf24c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 17:43:07 +0900 Subject: [PATCH 424/878] NEWS.md: made ticket references links [ci skip] --- NEWS.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index f9c70e175b0b85..366c6d454ccb22 100644 --- a/NEWS.md +++ b/NEWS.md @@ -21,13 +21,13 @@ sufficient information, see the ChangeLog file or Redmine * Modified method * Hash#transform_keys now accepts a hash that maps keys to new - keys. [Feature #16274] + keys. [[Feature #16274]] ### Stdlib updates (outstanding ones only) ### Compatibility issues (excluding feature bug fixes) -* Regexp literals are frozen [Feature #8948] [Feature #16377] +* Regexp literals are frozen [[Feature #8948]] [[Feature #16377]] ``` /foo/.frozen? #=> true @@ -46,3 +46,8 @@ sufficient information, see the ChangeLog file or Redmine ### Implementation improvements ### Miscellaneous changes + + +[Feature #8948]: https://bugs.ruby-lang.org/issues/8948 +[Feature #16274]: https://bugs.ruby-lang.org/issues/16274 +[Feature #16377]: https://bugs.ruby-lang.org/issues/16377 From 79f0ed3529c096c1182ccfeb7a4ad316455fc90e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 17:46:52 +0900 Subject: [PATCH 425/878] NEWS.md: reduce headings level [ci skip] As the only h2 did not have its exclusively owned body text, merged it to the first paragraph. Then pulled up h3 and deeper headings. --- NEWS.md | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/NEWS.md b/NEWS.md index 366c6d454ccb22..1c0feb6560da2b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,20 +1,18 @@ # NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) -This document is a list of user visible feature changes made between -releases except for bug fixes. +This document is a list of user visible feature changes since the + **2.7.0** release, except for bug fixes. Note that each entry is kept so brief that no reason behind or reference information is supplied with. For a full list of changes with all sufficient information, see the ChangeLog file or Redmine (e.g. `https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER`). -## Changes since the 2.7.0 release +## Language changes -### Language changes +## Command line options -### Command line options - -### Core classes updates (outstanding ones only) +## Core classes updates (outstanding ones only) * Hash @@ -23,9 +21,9 @@ sufficient information, see the ChangeLog file or Redmine * Hash#transform_keys now accepts a hash that maps keys to new keys. [[Feature #16274]] -### Stdlib updates (outstanding ones only) +## Stdlib updates (outstanding ones only) -### Compatibility issues (excluding feature bug fixes) +## Compatibility issues (excluding feature bug fixes) * Regexp literals are frozen [[Feature #8948]] [[Feature #16377]] @@ -39,13 +37,13 @@ sufficient information, see the ChangeLog file or Redmine If you interested in the maintain them, Please comment your plan to https://github.com/ruby/xmlrpc or https://github.com/ruby/net-telnet. -### Stdlib compatibility issues (excluding feature bug fixes) +## Stdlib compatibility issues (excluding feature bug fixes) -### C API updates +## C API updates -### Implementation improvements +## Implementation improvements -### Miscellaneous changes +## Miscellaneous changes [Feature #8948]: https://bugs.ruby-lang.org/issues/8948 From eb96e4e98150435f1473afcef20d231f80724b47 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 18:14:47 +0900 Subject: [PATCH 426/878] Made glob option keyword IDs static --- dir.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dir.c b/dir.c index 56dfe614d5abd3..6734559a0bd629 100644 --- a/dir.c +++ b/dir.c @@ -2755,10 +2755,12 @@ dir_globs(long argc, const VALUE *argv, VALUE base, int flags) static void dir_glob_options(VALUE opt, VALUE *base, int *flags) { - ID kw[2]; + static ID kw[2]; VALUE args[2]; - kw[0] = rb_intern("base"); - if (flags) kw[1] = rb_intern("flags"); + if (!kw[0]) { + kw[0] = rb_intern_const("base"); + kw[1] = rb_intern_const("flags"); + } rb_get_kwargs(opt, kw, 0, flags ? 2 : 1, args); if (args[0] == Qundef || NIL_P(args[0])) { *base = Qnil; From 979b32d76bfdd4ccf7ef708f2a120f47d5c563ec Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 18:46:19 +0900 Subject: [PATCH 427/878] Removed useless sorts of lists generated from literals --- test/ruby/test_dir.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 1bb228fd452b0c..29d5bc15404311 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -137,13 +137,13 @@ def test_close def test_glob assert_equal((%w(. ..) + ("a".."z").to_a).map{|f| File.join(@root, f) }, Dir.glob(File.join(@root, "*"), File::FNM_DOTMATCH).sort) - assert_equal([@root] + ("a".."z").map {|f| File.join(@root, f) }.sort, + assert_equal([@root] + ("a".."z").map {|f| File.join(@root, f) }, Dir.glob([@root, File.join(@root, "*")]).sort) assert_raise_with_message(ArgumentError, /nul-separated/) do Dir.glob(@root + "\0\0\0" + File.join(@root, "*")) end - assert_equal(("a".."z").step(2).map {|f| File.join(File.join(@root, f), "") }.sort, + assert_equal(("a".."z").step(2).map {|f| File.join(File.join(@root, f), "") }, Dir.glob(File.join(@root, "*/")).sort) assert_equal([File.join(@root, '//a')], Dir.glob(@root + '//a')) @@ -154,7 +154,7 @@ def test_glob assert_equal([], Dir.glob(File.join(@root, '[a-\\'))) assert_equal([File.join(@root, "a")], Dir.glob(File.join(@root, 'a\\'))) - assert_equal(("a".."f").map {|f| File.join(@root, f) }.sort, Dir.glob(File.join(@root, '[abc/def]')).sort) + assert_equal(("a".."f").map {|f| File.join(@root, f) }, Dir.glob(File.join(@root, '[abc/def]')).sort) open(File.join(@root, "}}{}"), "wb") {} open(File.join(@root, "}}a"), "wb") {} @@ -339,7 +339,7 @@ def test_symlink assert_equal([*"a".."z", *"symlink-a".."symlink-z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }.sort, Dir.glob(File.join(@root, "*/")).sort) - assert_equal([@root + "/", *[*"a".."z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }.sort], + assert_equal([@root + "/", *[*"a".."z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }], Dir.glob(File.join(@root, "**/")).sort) end From 28b290f7f4cb332dab3ddf3132e1916d413ea65c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 19 Jan 2020 09:48:33 +0900 Subject: [PATCH 428/878] Stop test-bundled-gems on macOS for now --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3797bf626591bb..d03abf40e607dd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - test_task: [ "check", "test-bundler", "test-bundled-gems" ] + test_task: [ "check", "test-bundler" ] # "test-bundled-gems" fail-fast: false if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: From b5a2e734daf3bd761e85f139a34718e36a4ac426 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 19 Jan 2020 09:48:56 +0900 Subject: [PATCH 429/878] * 2020-01-19 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 18b5bce59dbe25..7480a9c625c9ba 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" From 496f295f91bc7cd1d15ff05fd593b5a3cf56d726 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 20:46:55 +0900 Subject: [PATCH 430/878] Test bundled gems with timeout --- tool/test-bundled-gems.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index e97e6c19a566e2..c7b7adedc3928f 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -1,4 +1,5 @@ require 'rbconfig' +require 'timeout' allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || '' allowed_failures = allowed_failures.split(',').reject(&:empty?) @@ -13,7 +14,17 @@ test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake}" puts test_command - system test_command + pid = Process.spawn(test_command, "#{/mingw|mswin/ =~ RUBY_PLATFORM ? 'new_' : ''}pgroup": true) + {nil => 60, INT: 30, TERM: 10, KILL: nil}.each do |sig, sec| + if sig + puts "Sending #{sig} signal" + Process.kill("-#{sig}", pid) + end + begin + break Timeout.timeout(sec) {Process.wait(pid)} + rescue Timeout::Error + end + end unless $?.success? puts "Tests failed with exit code #{$?.exitstatus}" From edf2cedc9c54c48a16f2e6e7cc44d02df8c0603c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 19 Jan 2020 11:02:18 +0900 Subject: [PATCH 431/878] Allow rexml to fail on macOS of Github Actions And revert "Stop test-bundled-gems on macOS for now", 28b290f7f4cb332dab3ddf3132e1916d413ea65c. --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d03abf40e607dd..4a4b5a3717d41f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - test_task: [ "check", "test-bundler" ] # "test-bundled-gems" + test_task: [ "check", "test-bundler", "test-bundled-gems" ] fail-fast: false if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: @@ -61,7 +61,7 @@ jobs: RUBY_TESTOPTS: "-q --tty=no" # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved # rss needs to add workaround for the non rexml environment - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss,rexml" - name: Leaked Globals run: make -C build -s leaked-globals - uses: k0kubun/action-slack@v2.0.0 From af6563f0242487781038f6e5304fb375102aff66 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 19 Jan 2020 12:49:40 +0900 Subject: [PATCH 432/878] Fix typo s/test_ruby2_keywords_hash!/test_ruby2_keywords_hash/ In #2818, `Hash.ruby2_keywords!` has renamed to `Hash.ruby2_keywords_hash`. --- test/ruby/test_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 2c449739f16318..98ddbef1eb9b19 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1772,7 +1772,7 @@ def test_ruby2_keywords_hash? assert_raise(TypeError) { Hash.ruby2_keywords_hash?(1) } end - def test_ruby2_keywords_hash! + def test_ruby2_keywords_hash hash = {k: 1} assert_equal(false, Hash.ruby2_keywords_hash?(hash)) hash = Hash.ruby2_keywords_hash(hash) From 2f1081a451f21ca017cc9fdc585883e5c6ebf618 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Jan 2020 00:21:11 +0900 Subject: [PATCH 433/878] Sort globbed results by default [Feature #8709] Sort the results which matched single wildcard or character set in binary ascending order, unless `sort: false` is given. The order of an Array of pattern strings and braces are not affected. --- NEWS.md | 8 ++ dir.c | 242 +++++++++++++++++++++++++++++++++++++----- test/ruby/test_dir.rb | 101 ++++++++++++------ 3 files changed, 294 insertions(+), 57 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1c0feb6560da2b..a53f4f22a489ad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,13 @@ sufficient information, see the ChangeLog file or Redmine ## Core classes updates (outstanding ones only) +* Dir + + * Modified method + + * Dir.glob and Dir.[] now sort the results by default, and + accept `sort:` keyword option. [[Feature #8709]] + * Hash * Modified method @@ -46,6 +53,7 @@ sufficient information, see the ChangeLog file or Redmine ## Miscellaneous changes +[Feature #8709]: https://bugs.ruby-lang.org/issues/8709 [Feature #8948]: https://bugs.ruby-lang.org/issues/8948 [Feature #16274]: https://bugs.ruby-lang.org/issues/16274 [Feature #16377]: https://bugs.ruby-lang.org/issues/16377 diff --git a/dir.c b/dir.c index 6734559a0bd629..d54ba646e439af 100644 --- a/dir.c +++ b/dir.c @@ -219,6 +219,7 @@ typedef enum { #else #define FNM_SHORTNAME 0 #endif +#define FNM_GLOB_NOSORT 0x40 #define FNM_NOMATCH 1 #define FNM_ERROR 2 @@ -1350,21 +1351,34 @@ sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc) #define sys_warning(val, enc) \ ((flags & GLOB_VERBOSE) ? sys_enc_warning_in(RUBY_FUNCTION_NAME_STRING, (val), (enc)) :(void)0) -static inline void * -glob_alloc_n(size_t x, size_t y) +static inline size_t +glob_alloc_size(size_t x, size_t y) { size_t z; if (rb_mul_size_overflow(x, y, SSIZE_MAX, &z)) { rb_memerror(); /* or...? */ } else { - return malloc(z); + return z; } } +static inline void * +glob_alloc_n(size_t x, size_t y) +{ + return malloc(glob_alloc_size(x, y)); +} + +static inline void * +glob_realloc_n(void *p, size_t x, size_t y) +{ + return realloc(p, glob_alloc_size(x, y)); +} + #define GLOB_ALLOC(type) ((type *)malloc(sizeof(type))) #define GLOB_ALLOC_N(type, n) ((type *)glob_alloc_n(sizeof(type), n)) #define GLOB_REALLOC(ptr, size) realloc((ptr), (size)) +#define GLOB_REALLOC_N(ptr, n) glob_realloc_n(ptr, sizeof(*(ptr)), n) #define GLOB_FREE(ptr) free(ptr) #define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status)) @@ -2016,8 +2030,17 @@ rb_glob_error(const char *path, VALUE a, const void *enc, int error) return status; } +typedef struct rb_dirent { + long d_namlen; + const char *d_name; +#ifdef _WIN32 + const char *d_altname; +#endif + uint8_t d_type; +} rb_dirent_t; + static inline int -dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct dirent *dp, int flags) +dirent_match(const char *pat, rb_encoding *enc, const char *name, const rb_dirent_t *dp, int flags) { if (fnmatch(pat, enc, name, flags) == 0) return 1; #ifdef _WIN32 @@ -2042,7 +2065,7 @@ struct push_glob_args { struct dirent_brace_args { const char *name; - const struct dirent *dp; + const rb_dirent_t *dp; int flags; }; @@ -2105,6 +2128,154 @@ static int push_caller(const char *path, VALUE val, void *enc); static int ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc, VALUE var); +static const size_t rb_dirent_name_offset = + offsetof(rb_dirent_t, d_type) + sizeof(uint8_t); + +static rb_dirent_t * +dirent_copy(const struct dirent *dp, rb_dirent_t *rdp) +{ + if (!dp) return NULL; + size_t namlen = NAMLEN(dp); + const size_t altlen = +#ifdef _WIN32 + dp->d_altlen ? dp->d_altlen + 1 : +#endif + 0; + rb_dirent_t *newrdp = rdp; + if (!rdp && !(newrdp = malloc(rb_dirent_name_offset + namlen + 1 + altlen))) + return NULL; + newrdp->d_namlen = namlen; + if (!rdp) { + char *name = (char *)newrdp + rb_dirent_name_offset; + memcpy(name, dp->d_name, namlen); + name[namlen] = '\0'; +#ifdef _WIN32 + newrdp->d_altname = NULL; + if (altlen) { + char *const altname = name + namlen + 1; + memcpy(altname, dp->d_altname, altlen - 1); + altname[altlen - 1] = '\0'; + newrdp->d_altname = altname; + } +#endif + newrdp->d_name = name; + } + else { + newrdp->d_name = dp->d_name; +#ifdef _WIN32 + newrdp->d_altname = dp->d_altname; +#endif + } +#ifdef DT_UNKNOWN + newrdp->d_type = dp->d_type; +#else + newrdp->d_type = 0; +#endif + return newrdp; +} + +typedef union { + struct { + DIR *dirp; + rb_dirent_t ent; + } nosort; + struct { + size_t count, idx; + rb_dirent_t **entries; + } sort; +} ruby_glob_entries_t; + +static int +glob_sort_cmp(const void *a, const void *b, void *e) +{ + const rb_dirent_t *ent1 = *(void **)a; + const rb_dirent_t *ent2 = *(void **)b; + return strcmp(ent1->d_name, ent2->d_name); +} + +static void +glob_dir_finish(ruby_glob_entries_t *ent, int flags) +{ + if (flags & FNM_GLOB_NOSORT) { + closedir(ent->nosort.dirp); + ent->nosort.dirp = NULL; + } + else if (ent->sort.entries) { + for (size_t i = 0, count = ent->sort.count; i < count;) { + GLOB_FREE(ent->sort.entries[i++]); + } + GLOB_FREE(ent->sort.entries); + ent->sort.entries = NULL; + ent->sort.count = ent->sort.idx = 0; + } +} + +static ruby_glob_entries_t * +glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc) +{ + MEMZERO(ent, ruby_glob_entries_t, 1); + if (flags & FNM_GLOB_NOSORT) { + ent->nosort.dirp = dirp; + } + else { + void *newp; + struct dirent *dp; + size_t count = 0, capacity = 0; + ent->sort.count = 0; + ent->sort.idx = 0; + ent->sort.entries = 0; +#ifdef _WIN32 + if ((capacity = dirp->nfiles) > 0) { + if (!(newp = GLOB_ALLOC_N(rb_dirent_t, capacity))) { + closedir(dirp); + return NULL; + } + ent->sort.entries = newp; + } +#endif + while ((dp = READDIR(dirp, enc)) != NULL) { + rb_dirent_t *rdp = dirent_copy(dp, NULL); + if (!rdp) { + nomem: + glob_dir_finish(ent, 0); + closedir(dirp); + return NULL; + } + if (count >= capacity) { + capacity += 256; + if (!(newp = GLOB_REALLOC_N(ent->sort.entries, capacity))) + goto nomem; + ent->sort.entries = newp; + } + ent->sort.entries[count++] = rdp; + ent->sort.count = count; + } + closedir(dirp); + if (count < capacity) { + if (!(newp = GLOB_REALLOC_N(ent->sort.entries, count))) + goto nomem; + ent->sort.entries = newp; + } + ruby_qsort(ent->sort.entries, ent->sort.count, sizeof(ent->sort.entries[0]), + glob_sort_cmp, NULL); + } + return ent; +} + +static rb_dirent_t * +glob_getent(ruby_glob_entries_t *ent, int flags, rb_encoding *enc) +{ + if (flags & FNM_GLOB_NOSORT) { + return dirent_copy(READDIR(ent->nosort.dirp, enc), &ent->nosort.ent); + } + else if (ent->sort.idx < ent->sort.count) { + return ent->sort.entries[ent->sort.idx++]; + } + else { + return NULL; + } +} + static int glob_helper( int fd, @@ -2217,7 +2388,7 @@ glob_helper( if (pathtype == path_noent) return 0; if (magical || recursive) { - struct dirent *dp; + rb_dirent_t *dp; DIR *dirp; # if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH char *plainname = 0; @@ -2256,7 +2427,18 @@ glob_helper( if (is_case_sensitive(dirp, path) == 0) flags |= FNM_CASEFOLD; # endif - while ((dp = READDIR(dirp, enc)) != NULL) { + ruby_glob_entries_t globent; + if (!glob_opendir(&globent, dirp, flags, enc)) { + status = 0; + if (funcs->error) { + status = (*funcs->error)(path, arg, enc, ENOMEM); + } + else { + sys_warning(path, enc); + } + return status; + } + while ((dp = glob_getent(&globent, flags, enc)) != NULL) { char *buf; rb_pathtype_t new_pathtype = path_unknown; const char *name; @@ -2265,7 +2447,7 @@ glob_helper( IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil); name = dp->d_name; - namlen = NAMLEN(dp); + namlen = dp->d_namlen; if (recursive && name[0] == '.') { ++dotfile; if (namlen == 1) { @@ -2360,7 +2542,7 @@ glob_helper( if (status) break; } - closedir(dirp); + glob_dir_finish(&globent, flags); } else if (plain) { struct glob_pattern **copy_beg, **copy_end, **cur2; @@ -2753,15 +2935,16 @@ dir_globs(long argc, const VALUE *argv, VALUE base, int flags) } static void -dir_glob_options(VALUE opt, VALUE *base, int *flags) +dir_glob_options(VALUE opt, VALUE *base, int *sort, int *flags) { - static ID kw[2]; - VALUE args[2]; + static ID kw[3]; + VALUE args[3]; if (!kw[0]) { kw[0] = rb_intern_const("base"); - kw[1] = rb_intern_const("flags"); + kw[1] = rb_intern_const("sort"); + kw[2] = rb_intern_const("flags"); } - rb_get_kwargs(opt, kw, 0, flags ? 2 : 1, args); + rb_get_kwargs(opt, kw, 0, flags ? 3 : 2, args); if (args[0] == Qundef || NIL_P(args[0])) { *base = Qnil; } @@ -2775,14 +2958,13 @@ dir_glob_options(VALUE opt, VALUE *base, int *flags) if (!RSTRING_LEN(args[0])) args[0] = Qnil; *base = args[0]; } - if (flags && args[1] != Qundef) { - *flags = NUM2INT(args[1]); - } + if (sort && args[1] == Qfalse) *sort |= FNM_GLOB_NOSORT; + if (flags && args[2] != Qundef) *flags = NUM2INT(args[2]); } /* * call-seq: - * Dir[ string [, string ...] [, base: path] ] -> array + * Dir[ string [, string ...] [, base: path] [, sort: true] ] -> array * * Equivalent to calling * Dir.glob([string,...], 0). @@ -2792,18 +2974,19 @@ static VALUE dir_s_aref(int argc, VALUE *argv, VALUE obj) { VALUE opts, base; + int sort = 0; argc = rb_scan_args(argc, argv, "*:", NULL, &opts); - dir_glob_options(opts, &base, NULL); + dir_glob_options(opts, &base, &sort, NULL); if (argc == 1) { - return rb_push_glob(argv[0], base, 0); + return rb_push_glob(argv[0], base, sort); } - return dir_globs(argc, argv, base, 0); + return dir_globs(argc, argv, base, sort); } /* * call-seq: - * Dir.glob( pattern, [flags], [base: path] ) -> array - * Dir.glob( pattern, [flags], [base: path] ) { |filename| block } -> nil + * Dir.glob( pattern, [flags], [base: path] [, sort: true] ) -> array + * Dir.glob( pattern, [flags], [base: path] [, sort: true] ) { |filename| block } -> nil * * Expands +pattern+, which is a pattern string or an Array of pattern * strings, and returns an array containing the matching filenames. @@ -2816,10 +2999,14 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj) * case, you will need to prepend the base directory name if you want real * paths. * + * The results which matched single wildcard or character set are sorted in + * binary ascending order, unless false is given as the optional +sort+ + * keyword argument. The order of an Array of pattern strings and braces + * are preserved. + * * Note that the pattern is not a regexp, it's closer to a shell glob. * See File::fnmatch for the meaning of the +flags+ parameter. - * Case sensitivity depends on your system (File::FNM_CASEFOLD is ignored), - * as does the order in which the results are returned. + * Case sensitivity depends on your system (File::FNM_CASEFOLD is ignored). * * *:: * Matches any file. Can be restricted by other values in the glob. @@ -2892,14 +3079,15 @@ static VALUE dir_s_glob(int argc, VALUE *argv, VALUE obj) { VALUE str, rflags, ary, opts, base; - int flags; + int flags, sort = 0; argc = rb_scan_args(argc, argv, "11:", &str, &rflags, &opts); if (argc == 2) flags = NUM2INT(rflags); else flags = 0; - dir_glob_options(opts, &base, &flags); + dir_glob_options(opts, &base, &sort, &flags); + flags |= sort; ary = rb_check_array_type(str); if (NIL_P(ary)) { diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 29d5bc15404311..bab23302f73159 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -136,15 +136,17 @@ def test_close def test_glob assert_equal((%w(. ..) + ("a".."z").to_a).map{|f| File.join(@root, f) }, - Dir.glob(File.join(@root, "*"), File::FNM_DOTMATCH).sort) + Dir.glob(File.join(@root, "*"), File::FNM_DOTMATCH)) assert_equal([@root] + ("a".."z").map {|f| File.join(@root, f) }, - Dir.glob([@root, File.join(@root, "*")]).sort) + Dir.glob([@root, File.join(@root, "*")])) + assert_equal([@root] + ("a".."z").map {|f| File.join(@root, f) }, + Dir.glob([@root, File.join(@root, "*")], sort: false).sort) assert_raise_with_message(ArgumentError, /nul-separated/) do Dir.glob(@root + "\0\0\0" + File.join(@root, "*")) end assert_equal(("a".."z").step(2).map {|f| File.join(File.join(@root, f), "") }, - Dir.glob(File.join(@root, "*/")).sort) + Dir.glob(File.join(@root, "*/"))) assert_equal([File.join(@root, '//a')], Dir.glob(@root + '//a')) FileUtils.touch(File.join(@root, "{}")) @@ -154,7 +156,7 @@ def test_glob assert_equal([], Dir.glob(File.join(@root, '[a-\\'))) assert_equal([File.join(@root, "a")], Dir.glob(File.join(@root, 'a\\'))) - assert_equal(("a".."f").map {|f| File.join(@root, f) }, Dir.glob(File.join(@root, '[abc/def]')).sort) + assert_equal(("a".."f").map {|f| File.join(@root, f) }, Dir.glob(File.join(@root, '[abc/def]'))) open(File.join(@root, "}}{}"), "wb") {} open(File.join(@root, "}}a"), "wb") {} @@ -184,7 +186,7 @@ def test_glob_recursive dirs = ["a/.x", "a/b/.y"] FileUtils.mkdir_p(dirs) dirs.map {|dir| open("#{dir}/z", "w") {}} - assert_equal([], Dir.glob("a/**/z").sort, bug8283) + assert_equal([], Dir.glob("a/**/z"), bug8283) assert_equal(["a/.x/z"], Dir.glob("a/**/.x/z"), bug8283) assert_equal(["a/.x/z"], Dir.glob("a/.x/**/z"), bug8283) assert_equal(["a/b/.y/z"], Dir.glob("a/**/.y/z"), bug8283) @@ -202,6 +204,9 @@ def test_glob_recursive_directory bug15540 = '[ruby-core:91110] [Bug #15540]' assert_equal(["c/d/a/", "c/d/a/b/", "c/d/a/b/c/", "c/e/a/", "c/e/a/b/", "c/e/a/b/c/"], Dir.glob('c/{d,e}/a/**/'), bug15540) + + assert_equal(["c/e/a/", "c/e/a/b/", "c/e/a/b/c/", "c/d/a/", "c/d/a/b/", "c/d/a/b/c/"], + Dir.glob('c/{e,d}/a/**/')) end end @@ -213,6 +218,17 @@ def test_glob_starts_with_brace end end + def test_glob_order + Dir.chdir(@root) do + assert_equal(["#{@root}/a", "#{@root}/b"], Dir.glob("#{@root}/[ba]")) + assert_equal(["#{@root}/b", "#{@root}/a"], Dir.glob(%W"#{@root}/b #{@root}/a")) + assert_equal(["#{@root}/b", "#{@root}/a"], Dir.glob("#{@root}/{b,a}")) + end + assert_equal(["a", "b"], Dir.glob("[ba]", base: @root)) + assert_equal(["b", "a"], Dir.glob(%W"b a", base: @root)) + assert_equal(["b", "a"], Dir.glob("{b,a}", base: @root)) + end + if Process.const_defined?(:RLIMIT_NOFILE) def test_glob_too_may_open_files assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}", chdir: @root) @@ -237,21 +253,38 @@ def test_glob_base Dir.mkdir(File.join(@root, "a/dir")) dirs = @dirs + %w[a/dir/] dirs.sort! - assert_equal(files, Dir.glob("*/*.c", base: @root).sort) - assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: ".").sort}) - assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.glob("*.c", base: "a").sort}) - assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: "").sort}) - assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: nil).sort}) - assert_equal(@dirs, Dir.glob("*/", base: @root).sort) - assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: ".").sort}) - assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("*/", base: "a").sort}) - assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: "").sort}) - assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: nil).sort}) - assert_equal(dirs, Dir.glob("**/*/", base: @root).sort) - assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: ".").sort}) - assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("**/*/", base: "a").sort}) - assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: "").sort}) - assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: nil).sort}) + + assert_equal(files, Dir.glob("*/*.c", base: @root)) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: ".")}) + assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.glob("*.c", base: "a")}) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: "")}) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: nil)}) + assert_equal(@dirs, Dir.glob("*/", base: @root)) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: ".")}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("*/", base: "a")}) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: "")}) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: nil)}) + assert_equal(dirs, Dir.glob("**/*/", base: @root)) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: ".")}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("**/*/", base: "a")}) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: "")}) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: nil)}) + + assert_equal(files, Dir.glob("*/*.c", base: @root, sort: false).sort) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: ".", sort: false).sort}) + assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.glob("*.c", base: "a", sort: false).sort}) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: "", sort: false).sort}) + assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: nil, sort: false).sort}) + assert_equal(@dirs, Dir.glob("*/", base: @root)) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: ".", sort: false).sort}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("*/", base: "a", sort: false).sort}) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: "", sort: false).sort}) + assert_equal(@dirs, Dir.chdir(@root) {Dir.glob("*/", base: nil, sort: false).sort}) + assert_equal(dirs, Dir.glob("**/*/", base: @root)) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: ".", sort: false).sort}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.glob("**/*/", base: "a", sort: false).sort}) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: "", sort: false).sort}) + assert_equal(dirs, Dir.chdir(@root) {Dir.glob("**/*/", base: nil, sort: false).sort}) end def test_glob_base_dir @@ -260,12 +293,20 @@ def test_glob_base_dir Dir.mkdir(File.join(@root, "a/dir")) dirs = @dirs + %w[a/dir/] dirs.sort! - assert_equal(files, Dir.open(@root) {|d| Dir.glob("*/*.c", base: d)}.sort) + + assert_equal(files, Dir.open(@root) {|d| Dir.glob("*/*.c", base: d)}) assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*.c", base: d)}}) - assert_equal(@dirs, Dir.open(@root) {|d| Dir.glob("*/", base: d).sort}) - assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*/", base: d).sort}}) - assert_equal(dirs, Dir.open(@root) {|d| Dir.glob("**/*/", base: d).sort}) - assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("**/*/", base: d).sort}}) + assert_equal(@dirs, Dir.open(@root) {|d| Dir.glob("*/", base: d)}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*/", base: d)}}) + assert_equal(dirs, Dir.open(@root) {|d| Dir.glob("**/*/", base: d)}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("**/*/", base: d)}}) + + assert_equal(files, Dir.open(@root) {|d| Dir.glob("*/*.c", base: d, sort: false).sort}) + assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*.c", base: d, sort: false).sort}}) + assert_equal(@dirs, Dir.open(@root) {|d| Dir.glob("*/", base: d, sort: false).sort}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*/", base: d, sort: false).sort}}) + assert_equal(dirs, Dir.open(@root) {|d| Dir.glob("**/*/", base: d, sort: false).sort}) + assert_equal(%w[dir/], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("**/*/", base: d, sort: false).sort}}) end def assert_entries(entries, children_only = false) @@ -337,10 +378,10 @@ def test_symlink end assert_equal([*"a".."z", *"symlink-a".."symlink-z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }.sort, - Dir.glob(File.join(@root, "*/")).sort) + Dir.glob(File.join(@root, "*/"))) assert_equal([@root + "/", *[*"a".."z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }], - Dir.glob(File.join(@root, "**/")).sort) + Dir.glob(File.join(@root, "**/"))) end def test_glob_metachar @@ -424,8 +465,8 @@ def test_symlinks_not_resolved Dir.mkdir('some-dir') File.write('some-dir/foo', 'some content') - assert_equal [ 'dir-symlink', 'some-dir' ], Dir['*'].sort - assert_equal [ 'dir-symlink', 'some-dir', 'some-dir/foo' ], Dir['**/*'].sort + assert_equal [ 'dir-symlink', 'some-dir' ], Dir['*'] + assert_equal [ 'dir-symlink', 'some-dir', 'some-dir/foo' ], Dir['**/*'] end end end @@ -471,7 +512,7 @@ def test_glob_gc_for_fd ensure fs.clear end - list = Dir.glob("*").sort + list = Dir.glob("*") assert_not_empty(list) assert_equal([*"a".."z"], list) end; From 0ab93e098f1f31c8479a730b99e994f59d6e00c3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 19 Jan 2020 20:55:06 +0900 Subject: [PATCH 434/878] NEWS.md: set code format explicitly [ci skip] It is not set by default in the Github viewer. --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index a53f4f22a489ad..4485a64df49cd3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -34,7 +34,7 @@ sufficient information, see the ChangeLog file or Redmine * Regexp literals are frozen [[Feature #8948]] [[Feature #16377]] - ``` + ```ruby /foo/.frozen? #=> true ``` From 2d61684e7c334ae4c5eb845c782d5fabeffdea67 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 19 Jan 2020 21:15:23 +0900 Subject: [PATCH 435/878] README.md: removed the badge for Cygwin [ci skip] The workflow for Cygwin has been removed at 3344f811074e1e6119eec23684013457dab4f8b0. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 34e85c36ec0b1f..140f40b20b51b9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) [![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) -[![Actions Status](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Cygwin") [![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS") [![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") [![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") From 884897dbe20674d3a741cbfacac8cbca862675d0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 19 Jan 2020 21:21:28 +0900 Subject: [PATCH 436/878] README.ja.md: removed the badge for Cygwin [ci skip] The workflow for Cygwin has been removed at 3344f811074e1e6119eec23684013457dab4f8b0. --- README.ja.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.ja.md b/README.ja.md index 8d5a3691a76f86..b0ca1b3b671ffd 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,6 +1,5 @@ [![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) [![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) -[![Actions Status](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Cygwin") [![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS") [![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") [![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") From bdef392ec66168578053fabf8a81de48fd9e980c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 20 Jan 2020 09:30:17 +0900 Subject: [PATCH 437/878] Fixed double closedir In the case that shinking the entries buffer to the exact size failed, `dirp` is already closed. Found by mame with Coverity Scan. --- dir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index d54ba646e439af..0957800070e3e3 100644 --- a/dir.c +++ b/dir.c @@ -2252,8 +2252,10 @@ glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc) } closedir(dirp); if (count < capacity) { - if (!(newp = GLOB_REALLOC_N(ent->sort.entries, count))) - goto nomem; + if (!(newp = GLOB_REALLOC_N(ent->sort.entries, count))) { + glob_dir_finish(ent, 0); + return NULL; + } ent->sort.entries = newp; } ruby_qsort(ent->sort.entries, ent->sort.count, sizeof(ent->sort.entries[0]), From f31b90f2b99b04dc9e003436a39fd08732eef004 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 20 Jan 2020 09:50:03 +0900 Subject: [PATCH 438/878] * 2020-01-20 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 7480a9c625c9ba..a192f4b124f312 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" From 9f99760dafac6eaa53287470b8ff59b1be0bf6d6 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Mon, 20 Jan 2020 16:53:31 +0900 Subject: [PATCH 439/878] Get rid of use of special variables Use `"\n"` and `IO#fileno` instead of `$/` and `$.` respectively. [Feature #14240] --- ext/ripper/tools/preproc.rb | 12 ++++++------ template/encdb.h.tmpl | 8 ++++---- template/transdb.h.tmpl | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb index 7639a901dfdc6c..b838a78db71cfd 100644 --- a/ext/ripper/tools/preproc.rb +++ b/ext/ripper/tools/preproc.rb @@ -45,7 +45,7 @@ def prelude(f, out) while line = f.gets case line when /\A%%/ - out << '%%' << $/ + out << "%%\n" return when /\A%token/ out << line.sub(/<\w+>/, '') @@ -79,15 +79,15 @@ def grammar(f, out) while line = f.gets case line when %r - out << DSL.new($2, ($1 || "").split(",")).generate << $/ + out << DSL.new($2, ($1 || "").split(",")).generate << "\n" when %r - out << '#if 0' << $/ + out << "#if 0\n" when %r - out << '#endif' << $/ + out << "#endif\n" when %r<%\*/> - out << $/ + out << "\n" when /\A%%/ - out << '%%' << $/ + out << "%%\n" return else out << line diff --git a/template/encdb.h.tmpl b/template/encdb.h.tmpl index 06afb5dbe1f2cc..b3bd54548ab99f 100644 --- a/template/encdb.h.tmpl +++ b/template/encdb.h.tmpl @@ -58,7 +58,7 @@ encdirs.each do |encdir| else name = $1 end - check_duplication(defs, $1, fn, $.) + check_duplication(defs, $1, fn, f.lineno) next if BUILTIN_ENCODINGS[name] encodings << $1 count += 1 @@ -71,18 +71,18 @@ encdirs.each do |encdir| when /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/ raise ArgumentError, '%s:%d: ENC_REPLICATE: %s is not defined yet. (replica %s)' % - [fn, $., $2, $1] unless defs[$2.upcase] + [fn, f.lineno, $2, $1] unless defs[$2.upcase] count += 1 when /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/ raise ArgumentError, '%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' % - [fn, $., $2, $1] unless defs[$2.upcase] + [fn, f.lineno, $2, $1] unless defs[$2.upcase] when /^ENC_DUMMY\w*\(\s*"([^"]+)"/ count += 1 else next end - check_duplication(defs, $1, fn, $.) + check_duplication(defs, $1, fn, f.lineno) lines << line.sub(/;.*/m, "").chomp + ";" if line end end diff --git a/template/transdb.h.tmpl b/template/transdb.h.tmpl index 16565dd63852dd..990a8639d0e017 100644 --- a/template/transdb.h.tmpl +++ b/template/transdb.h.tmpl @@ -44,9 +44,9 @@ transdirs.each do |transdir| from_to = "%s to %s" % [$1, $2] if converters[from_to] raise ArgumentError, '%s:%d: transcode "%s" is already registered at %s:%d' % - [path, $., from_to, *converters[from_to].values_at(3, 4)] + [path, f.lineno, from_to, *converters[from_to].values_at(3, 4)] else - converters[from_to] = [$1, $2, fn[0..-3], path, $.] + converters[from_to] = [$1, $2, fn[0..-3], path, f.lineno] converter_list << from_to end end From b17797a6940cb196c9893edc088828b49772554c Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 17 Jan 2020 13:44:07 +0900 Subject: [PATCH 440/878] [ruby/reline] Implement vi_to_next_char https://github.com/ruby/reline/commit/066ecb0a21 --- lib/reline/line_editor.rb | 14 ++++++++++++-- test/reline/test_key_actor_vi.rb | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 1387bfa8766c65..6890fa544a0204 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -2087,12 +2087,17 @@ def finish @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg) } end - private def search_next_char(key, arg) + private def vi_to_next_char(key, arg: 1) + @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, true) } + end + + private def search_next_char(key, arg, need_prev_char = false) if key.instance_of?(String) inputed_char = key else inputed_char = key.chr end + prev_total = nil total = nil found = false @line.byteslice(@byte_pointer..-1).grapheme_clusters.each do |mbchar| @@ -2110,13 +2115,18 @@ def finish end end width = Reline::Unicode.get_mbchar_width(mbchar) + prev_total = total total = [total.first + mbchar.bytesize, total.last + width] end end - if found and total + if not need_prev_char and found and total byte_size, width = total @byte_pointer += byte_size @cursor += width + elsif need_prev_char and found and prev_total + byte_size, width = prev_total + @byte_pointer += byte_size + @cursor += width end @waiting_proc = nil end diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index b8ab160ff40e5f..d23bdb776988bb 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -633,6 +633,24 @@ def test_vi_next_char assert_cursor_max(6) end + def test_vi_to_next_char + input_keys("abcdef\C-[0") + assert_line('abcdef') + assert_byte_pointer_size('') + assert_cursor(0) + assert_cursor_max(6) + input_keys('tz') + assert_line('abcdef') + assert_byte_pointer_size('') + assert_cursor(0) + assert_cursor_max(6) + input_keys('te') + assert_line('abcdef') + assert_byte_pointer_size('abc') + assert_cursor(3) + assert_cursor_max(6) + end + def test_vi_delete_next_char input_keys("abc\C-[h") assert_byte_pointer_size('a') From 3b407abe9b8da640dc07617d3dacac0057ca597f Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 17 Jan 2020 20:17:23 +0900 Subject: [PATCH 441/878] [ruby/reline] Implement vi_prev_char and vi_to_prev_char https://github.com/ruby/reline/commit/0ad3ee63fa --- lib/reline/line_editor.rb | 48 ++++++++++++++++++++++++++++++++ test/reline/test_key_actor_vi.rb | 36 ++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 6890fa544a0204..9518a054fd1bae 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -2131,6 +2131,54 @@ def finish @waiting_proc = nil end + private def vi_prev_char(key, arg: 1) + @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg) } + end + + private def vi_to_prev_char(key, arg: 1) + @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg, true) } + end + + private def search_prev_char(key, arg, need_next_char = false) + if key.instance_of?(String) + inputed_char = key + else + inputed_char = key.chr + end + prev_total = nil + total = nil + found = false + @line.byteslice(0..@byte_pointer).grapheme_clusters.reverse_each do |mbchar| + # total has [byte_size, cursor] + unless total + # skip cursor point + width = Reline::Unicode.get_mbchar_width(mbchar) + total = [mbchar.bytesize, width] + else + if inputed_char == mbchar + arg -= 1 + if arg.zero? + found = true + break + end + end + width = Reline::Unicode.get_mbchar_width(mbchar) + prev_total = total + total = [total.first + mbchar.bytesize, total.last + width] + end + end + if not need_next_char and found and total + byte_size, width = total + @byte_pointer -= byte_size + @cursor -= width + elsif need_next_char and found and prev_total + byte_size, width = prev_total + @byte_pointer -= byte_size + @cursor -= width + end + @waiting_proc = nil + end + private def vi_join_lines(key, arg: 1) if @is_multiline and @buffer_of_lines.size > @line_index + 1 @cursor = calculate_width(@line) diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index d23bdb776988bb..00d34536d0184b 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -651,6 +651,42 @@ def test_vi_to_next_char assert_cursor_max(6) end + def test_vi_prev_char + input_keys("abcdef\C-[") + assert_line('abcdef') + assert_byte_pointer_size('abcde') + assert_cursor(5) + assert_cursor_max(6) + input_keys('Fz') + assert_line('abcdef') + assert_byte_pointer_size('abcde') + assert_cursor(5) + assert_cursor_max(6) + input_keys('Fa') + assert_line('abcdef') + assert_byte_pointer_size('') + assert_cursor(0) + assert_cursor_max(6) + end + + def test_vi_to_prev_char + input_keys("abcdef\C-[") + assert_line('abcdef') + assert_byte_pointer_size('abcde') + assert_cursor(5) + assert_cursor_max(6) + input_keys('Tz') + assert_line('abcdef') + assert_byte_pointer_size('abcde') + assert_cursor(5) + assert_cursor_max(6) + input_keys('Ta') + assert_line('abcdef') + assert_byte_pointer_size('a') + assert_cursor(1) + assert_cursor_max(6) + end + def test_vi_delete_next_char input_keys("abc\C-[h") assert_byte_pointer_size('a') From f451bb5406878e1ac9ce9d37952f171837d0cb09 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Fri, 17 Jan 2020 19:30:28 +0100 Subject: [PATCH 442/878] [ruby/irb] Fix compatibility with rails before 5.2 Rails before 5.2 added Array#append as an alias to Array#<< , so that it expects only one argument. However ruby-2.5 added Array#append as an alias to Array#push which takes any number of arguments. If irb completion is used in `rails c` (for example "IO.") it fails with: irb/completion.rb:206:in `<<': wrong number of arguments (given 3, expected 1) (ArgumentError) Using Array#push instead of Array#append fixes compatibility. https://github.com/ruby/irb/commit/5b7bbf9c34 --- lib/irb/completion.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 3536e8ec87387f..474d13cdbbb8fe 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -203,7 +203,7 @@ def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace sep = $2 message = Regexp.quote($3) - gv = eval("global_variables", bind).collect{|m| m.to_s}.append("true", "false", "nil") + gv = eval("global_variables", bind).collect{|m| m.to_s}.push("true", "false", "nil") lv = eval("local_variables", bind).collect{|m| m.to_s} iv = eval("instance_variables", bind).collect{|m| m.to_s} cv = eval("self.class.constants", bind).collect{|m| m.to_s} From 51a8055d7db8a6ae35a9f624700c0910ec20aeb8 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Thu, 16 Jan 2020 13:13:35 +0900 Subject: [PATCH 443/878] [ruby/irb] Add newline_before_multiline_output https://github.com/ruby/irb/commit/9eb1801a66 --- lib/irb.rb | 8 +++++++- lib/irb/context.rb | 20 ++++++++++++++++++++ test/irb/test_context.rb | 31 +++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/lib/irb.rb b/lib/irb.rb index bcd6599af961ac..3e08877e76cbd7 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -736,7 +736,13 @@ def prompt(prompt, ltype, indent, line_no) # :nodoc: end def output_value # :nodoc: - printf @context.return_format, @context.inspect_last_value + str = @context.inspect_last_value + multiline_p = str.each_line.take(2).length > 1 + if multiline_p && @context.newline_before_multiline_output? + printf @context.return_format, "\n#{str}" + else + printf @context.return_format, str + end end # Outputs the local variables to this current session, including diff --git a/lib/irb/context.rb b/lib/irb/context.rb index 686738cd40faf9..218f7c60378b31 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -133,6 +133,11 @@ def initialize(irb, workspace = nil, input_method = nil) if @echo_on_assignment.nil? @echo_on_assignment = false end + + @newline_before_multiline_output = IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT] + if @newline_before_multiline_output.nil? + @newline_before_multiline_output = true + end end # The top-level workspace, see WorkSpace#main @@ -253,6 +258,20 @@ def main # a = "omg" # #=> omg attr_accessor :echo_on_assignment + # Whether a newline is put before multiline output. + # + # Uses IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT] if available, + # or defaults to +true+. + # + # "abc\ndef" + # #=> + # abc + # def + # IRB.CurrentContext.newline_before_multiline_output = false + # "abc\ndef" + # #=> abc + # def + attr_accessor :newline_before_multiline_output # Whether verbose messages are displayed or not. # # A copy of the default IRB.conf[:VERBOSE] @@ -287,6 +306,7 @@ def main alias ignore_eof? ignore_eof alias echo? echo alias echo_on_assignment? echo_on_assignment + alias newline_before_multiline_output? newline_before_multiline_output # Returns whether messages are displayed or not. def verbose? diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb index 693ebbeaea71a9..8a6521bf69409a 100644 --- a/test/irb/test_context.rb +++ b/test/irb/test_context.rb @@ -216,5 +216,36 @@ def test_echo_on_assignment_conf assert(irb.context.echo?, "echo? should be true by default") assert(irb.context.echo_on_assignment?, "echo_on_assignment? should be true when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to true") end + + def test_multiline_output_on_default_inspector + main = Object.new + def main.inspect + "abc\ndef" + end + input = TestInputMethod.new([ + "self" + ]) + irb = IRB::Irb.new(IRB::WorkSpace.new(main), input) + irb.context.return_format = "=> %s\n" + + # The default + irb.context.newline_before_multiline_output = true + out, err = capture_io do + irb.eval_input + end + assert_empty err + assert_equal("=> \nabc\ndef\n", + out) + + # No newline before multiline output + input.reset + irb.context.newline_before_multiline_output = false + out, err = capture_io do + irb.eval_input + end + assert_empty err + assert_equal("=> abc\ndef\n", + out) + end end end From 93ca212ddac5ac49134f2058c24db3948b6695c6 Mon Sep 17 00:00:00 2001 From: Kenta Murata Date: Mon, 20 Jan 2020 09:38:52 +0900 Subject: [PATCH 444/878] [ruby/irb] [ruby/irb] Rewrite an expression to detect multiline https://github.com/ruby/irb/commit/ed5cf375a6 https://github.com/ruby/irb/commit/5b7bbf9c34 --- lib/irb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb.rb b/lib/irb.rb index 3e08877e76cbd7..ac868d9405d1f1 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -737,7 +737,7 @@ def prompt(prompt, ltype, indent, line_no) # :nodoc: def output_value # :nodoc: str = @context.inspect_last_value - multiline_p = str.each_line.take(2).length > 1 + multiline_p = /\A.*\Z/ !~ str if multiline_p && @context.newline_before_multiline_output? printf @context.return_format, "\n#{str}" else From 2943ebd240bba9c50b1f2a245a9f9186c2255706 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 21 Jan 2020 09:30:30 +0900 Subject: [PATCH 445/878] [ruby/reline] Implement vi_change_meta https://github.com/ruby/reline/commit/8538e0e10f --- lib/reline/line_editor.rb | 12 ++++++++++++ test/reline/test_key_actor_vi.rb | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 9518a054fd1bae..9ee361ec786800 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1922,6 +1922,18 @@ def finish end private def vi_change_meta(key) + @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff| + if byte_pointer_diff > 0 + @line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff) + elsif byte_pointer_diff < 0 + @line, cut = byteslice!(@line, @byte_pointer + byte_pointer_diff, -byte_pointer_diff) + end + copy_for_vi(cut) + @cursor += cursor_diff if cursor_diff < 0 + @cursor_max -= cursor_diff.abs + @byte_pointer += byte_pointer_diff if byte_pointer_diff < 0 + @config.editing_mode = :vi_insert + } end private def vi_delete_meta(key) diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index 00d34536d0184b..c6337baea7d1ae 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -1214,4 +1214,27 @@ def test_vi_delete_meta assert_cursor_max(11) assert_line('aaa ddd eee') end + + def test_vi_change_meta + input_keys("aaa bbb ccc ddd eee\C-[02w") + assert_byte_pointer_size('aaa bbb ') + assert_cursor(8) + assert_cursor_max(19) + assert_line('aaa bbb ccc ddd eee') + input_keys('cwaiueo ') + assert_byte_pointer_size('aaa bbb aiueo ') + assert_cursor(14) + assert_cursor_max(21) + assert_line('aaa bbb aiueo ddd eee') + input_keys("\C-[") + assert_byte_pointer_size('aaa bbb aiueo') + assert_cursor(13) + assert_cursor_max(21) + assert_line('aaa bbb aiueo ddd eee') + input_keys('cb') + assert_byte_pointer_size('aaa bbb ') + assert_cursor(8) + assert_cursor_max(16) + assert_line('aaa bbb ddd eee') + end end From 32fb6c8c117d018fd8e7887c955ab3ea22f6c420 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 21 Jan 2020 09:53:46 +0900 Subject: [PATCH 446/878] * 2020-01-21 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index a192f4b124f312..93b24a6ec8b55c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" From 97d75639a9970ce3868ba91a57be1856a3957711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 21 Jan 2020 14:21:15 +0900 Subject: [PATCH 447/878] VALUE is narrower than rb_serial_t VALUE and rb_serial_t do not agree with their width. We have to be consistent. Assigning an rb_serial_t value to a VALUE variable is practically a problem on a ILP32 environment. --- vm_method.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm_method.c b/vm_method.c index 877198cee1c91e..900096629d72f2 100644 --- a/vm_method.c +++ b/vm_method.c @@ -62,7 +62,7 @@ static struct { static void rb_class_clear_method_cache(VALUE klass, VALUE arg) { - VALUE old_serial = *(rb_serial_t *)arg; + rb_serial_t old_serial = *(rb_serial_t *)arg; if (RCLASS_SERIAL(klass) > old_serial) { return; } From 8113f3fee4a962321b6107e58496afc6733c299c Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 21 Jan 2020 16:58:00 +0900 Subject: [PATCH 448/878] add default break points --- common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.mk b/common.mk index 4cb305ffc77092..86ec9c58dc10bf 100644 --- a/common.mk +++ b/common.mk @@ -1210,6 +1210,8 @@ benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY run.gdb: echo set breakpoint pending on > run.gdb + echo b rb_assert_failure >> run.gdb + echo b rb_bug >> run.gdb echo b ruby_debug_breakpoint >> run.gdb echo '# handle SIGINT nostop' >> run.gdb echo '# handle SIGPIPE nostop' >> run.gdb From 1de7941ff845ade36cc17c1325dc3453dab75f90 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Tue, 21 Jan 2020 18:04:20 +0900 Subject: [PATCH 449/878] DocumentRoot is optional since 2.3.0 https://github.com/ruby/ruby/commit/0b9d86f29be8e3d4fa0958bf3db41907e21ad1a0 --- lib/un.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/un.rb b/lib/un.rb index 4a15a37394e5eb..628260a7fa3625 100644 --- a/lib/un.rb +++ b/lib/un.rb @@ -22,7 +22,7 @@ # ruby -run -e touch -- [OPTION] FILE # ruby -run -e wait_writable -- [OPTION] FILE # ruby -run -e mkmf -- [OPTION] EXTNAME [OPTION] -# ruby -run -e httpd -- [OPTION] DocumentRoot +# ruby -run -e httpd -- [OPTION] [DocumentRoot] # ruby -run -e help [COMMAND] require "fileutils" @@ -304,7 +304,7 @@ def mkmf ## # Run WEBrick HTTP server. # -# ruby -run -e httpd -- [OPTION] DocumentRoot +# ruby -run -e httpd -- [OPTION] [DocumentRoot] # # --bind-address=ADDR address to bind # --port=NUM listening port number From d1166c6d3942303b812c475129a84f1025b1db1f Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Sat, 18 Jan 2020 18:46:37 +0100 Subject: [PATCH 450/878] Reline: Use a more robust detection of MinTTY The previous detection per get_screen_size fails when stdout is passed to a pipe. That is the case when running ruby tests in parallel ("-j" switch). In this case Reline believes that it's running on MinTTY and the tests are running with ANSI IOGate instead of the Windows adapter on MINGW. So parallel test results were different to that of a single process. This commit fixes these differencies. The code is taken from git sources and translated to ruby. NtQueryObject() is replaced by GetFileInformationByHandleEx(), because NtQueryObject() is undocumented and is more difficult to use: https://github.com/git-for-windows/git/blob/c5a03b1e29c69f3f06c8fabd92493edb73469176/compat/winansi.c#L558 --- lib/reline.rb | 3 +-- lib/reline/windows.rb | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/lib/reline.rb b/lib/reline.rb index 606dd4645b7d14..ee4d1c4180d06e 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -415,8 +415,7 @@ def self.line_editor if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/ require 'reline/windows' - if Reline::Windows.get_screen_size == [0, 0] - # Maybe Mintty on Cygwin + if Reline::Windows.msys_tty? require 'reline/ansi' Reline::IOGate = Reline::ANSI else diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb index 4fbf243c371a0f..74b62233e5bd9e 100644 --- a/lib/reline/windows.rb +++ b/lib/reline/windows.rb @@ -72,6 +72,8 @@ def call(*args) STD_INPUT_HANDLE = -10 STD_OUTPUT_HANDLE = -11 WINDOW_BUFFER_SIZE_EVENT = 0x04 + FILE_TYPE_PIPE = 0x0003 + FILE_NAME_INFO = 2 @@getwch = Win32API.new('msvcrt', '_getwch', [], 'I') @@kbhit = Win32API.new('msvcrt', '_kbhit', [], 'I') @@GetKeyState = Win32API.new('user32', 'GetKeyState', ['L'], 'L') @@ -84,9 +86,36 @@ def call(*args) @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE) @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L') @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L') + @@GetFileType = Win32API.new('kernel32', 'GetFileType', ['L'], 'L') + @@GetFileInformationByHandleEx = Win32API.new('kernel32', 'GetFileInformationByHandleEx', ['L', 'I', 'P', 'L'], 'I') + @@input_buf = [] @@output_buf = [] + def self.msys_tty?(io=@@hConsoleInputHandle) + # check if fd is a pipe + if @@GetFileType.call(io) != FILE_TYPE_PIPE + return false + end + + bufsize = 1024 + p_buffer = "\0" * bufsize + res = @@GetFileInformationByHandleEx.call(io, FILE_NAME_INFO, p_buffer, bufsize - 2) + return false if res == 0 + + # get pipe name: p_buffer layout is: + # struct _FILE_NAME_INFO { + # DWORD FileNameLength; + # WCHAR FileName[1]; + # } FILE_NAME_INFO + len = p_buffer[0, 4].unpack("L")[0] + name = p_buffer[4, len].encode(Encoding::UTF_8, Encoding::UTF_16LE, invalid: :replace) + + # Check if this could be a MSYS2 pty pipe ('\msys-XXXX-ptyN-XX') + # or a cygwin pty pipe ('\cygwin-XXXX-ptyN-XX') + name =~ /(msys-|cygwin-).*-pty/ ? true : false + end + def self.getwch unless @@input_buf.empty? return @@input_buf.shift From b0ca1fc21bbb9dac65a3b3f7b5935e691ece1501 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Sat, 18 Jan 2020 21:22:24 +0100 Subject: [PATCH 451/878] Reline: Fix changed test results due to change to UTF-8 on Windows In commit f8ea2860b0cac1aec79978e6c44168802958e8af the Reline encoding for native windows console was changed to hardcoded UTF-8. This caused failures in reline and readline tests, but they were hidden, because parallel ruby tests incorrectly used Reline::ANSI as IOGate. Tests failures were raised in single process mode, but not with -j switch. This patch corrects encodings on native Windows console. --- test/readline/test_readline.rb | 16 ++++++++++++---- test/readline/test_readline_history.rb | 8 ++++++++ test/reline/test_history.rb | 6 +++++- test/reline/test_reline.rb | 22 +++++++++++++--------- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index b77e3a0ead34bc..a4b7cb4cc7c5ae 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -238,7 +238,7 @@ def test_completion_encoding append_character = Readline.completion_append_character Readline.completion_append_character = "" completion_case_fold = Readline.completion_case_fold - locale = Encoding.find("locale") + locale = get_default_internal_encoding if locale == Encoding::UTF_8 enc1 = Encoding::EUC_JP else @@ -545,7 +545,7 @@ def test_using_quoting_detection_proc_with_multibyte_input saved_completer_quote_characters = Readline.completer_quote_characters saved_completer_word_break_characters = Readline.completer_word_break_characters return unless Readline.respond_to?(:quoting_detection_proc=) - unless Encoding.find("locale") == Encoding::UTF_8 + unless Encoding.find("external") == Encoding::UTF_8 return if assert_under_utf8 skip 'this test needs UTF-8 locale' end @@ -595,7 +595,7 @@ def test_simple_completion Readline.output = null Readline.completion_proc = ->(text) do ['abcde', 'abc12'].map { |i| - i.encode(Encoding.default_external) + i.encode(get_default_internal_encoding) } end w.write("a\t\n") @@ -620,7 +620,7 @@ def test_completion_with_completion_append_character Readline.completion_append_character = '!' Readline.completion_proc = ->(text) do ['abcde'].map { |i| - i.encode(Encoding.default_external) + i.encode(get_default_internal_encoding) } end w.write("a\t\n") @@ -790,4 +790,12 @@ def setup use_lib_reline super end + + def get_default_internal_encoding + if RUBY_PLATFORM =~ /mswin|mingw/ + Encoding.default_internal || Encoding::UTF_8 + else + super + end + end end diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 34ab745eb0b224..509f1d687efc25 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -275,4 +275,12 @@ def setup use_lib_reline super end + + def get_default_internal_encoding + if RUBY_PLATFORM =~ /mswin|mingw/ + Encoding.default_internal || Encoding::UTF_8 + else + super + end + end end diff --git a/test/reline/test_history.rb b/test/reline/test_history.rb index 260b6e85280c62..13d3d2f90b17fe 100644 --- a/test/reline/test_history.rb +++ b/test/reline/test_history.rb @@ -268,6 +268,10 @@ def assert_external_string_equal(expected, actual) end def get_default_internal_encoding - return Encoding.default_internal || Encoding.find("locale") + if RUBY_PLATFORM =~ /mswin|mingw/ + Encoding.default_internal || Encoding::UTF_8 + else + Encoding.default_internal || Encoding.find("locale") + end end end diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb index 274f1aa6baefe5..d6a6e21cebdb89 100644 --- a/test/reline/test_reline.rb +++ b/test/reline/test_reline.rb @@ -21,15 +21,15 @@ def test_completion_append_character Reline.completion_append_character = "a".encode(Encoding::ASCII) assert_equal("a", Reline.completion_append_character) - assert_equal(Encoding::default_external, Reline.completion_append_character.encoding) + assert_equal(get_reline_encoding, Reline.completion_append_character.encoding) Reline.completion_append_character = "ba".encode(Encoding::ASCII) assert_equal("b", Reline.completion_append_character) - assert_equal(Encoding::default_external, Reline.completion_append_character.encoding) + assert_equal(get_reline_encoding, Reline.completion_append_character.encoding) Reline.completion_append_character = "cba".encode(Encoding::ASCII) assert_equal("c", Reline.completion_append_character) - assert_equal(Encoding::default_external, Reline.completion_append_character.encoding) + assert_equal(get_reline_encoding, Reline.completion_append_character.encoding) Reline.completion_append_character = nil assert_equal(nil, Reline.completion_append_character) @@ -40,7 +40,7 @@ def test_basic_word_break_characters Reline.basic_word_break_characters = "[".encode(Encoding::ASCII) assert_equal("[", Reline.basic_word_break_characters) - assert_equal(Encoding::default_external, Reline.basic_word_break_characters.encoding) + assert_equal(get_reline_encoding, Reline.basic_word_break_characters.encoding) end def test_completer_word_break_characters @@ -48,7 +48,7 @@ def test_completer_word_break_characters Reline.completer_word_break_characters = "[".encode(Encoding::ASCII) assert_equal("[", Reline.completer_word_break_characters) - assert_equal(Encoding::default_external, Reline.completer_word_break_characters.encoding) + assert_equal(get_reline_encoding, Reline.completer_word_break_characters.encoding) end def test_basic_quote_characters @@ -56,7 +56,7 @@ def test_basic_quote_characters Reline.basic_quote_characters = "`".encode(Encoding::ASCII) assert_equal("`", Reline.basic_quote_characters) - assert_equal(Encoding::default_external, Reline.basic_quote_characters.encoding) + assert_equal(get_reline_encoding, Reline.basic_quote_characters.encoding) end def test_completer_quote_characters @@ -64,7 +64,7 @@ def test_completer_quote_characters Reline.completer_quote_characters = "`".encode(Encoding::ASCII) assert_equal("`", Reline.completer_quote_characters) - assert_equal(Encoding::default_external, Reline.completer_quote_characters.encoding) + assert_equal(get_reline_encoding, Reline.completer_quote_characters.encoding) end def test_filename_quote_characters @@ -72,7 +72,7 @@ def test_filename_quote_characters Reline.filename_quote_characters = "\'".encode(Encoding::ASCII) assert_equal("\'", Reline.filename_quote_characters) - assert_equal(Encoding::default_external, Reline.filename_quote_characters.encoding) + assert_equal(get_reline_encoding, Reline.filename_quote_characters.encoding) end def test_special_prefixes @@ -80,7 +80,7 @@ def test_special_prefixes Reline.special_prefixes = "\'".encode(Encoding::ASCII) assert_equal("\'", Reline.special_prefixes) - assert_equal(Encoding::default_external, Reline.special_prefixes.encoding) + assert_equal(get_reline_encoding, Reline.special_prefixes.encoding) end def test_completion_case_fold @@ -267,4 +267,8 @@ def test_read_escaped_key def test_may_req_ambiguous_char_width # TODO in Reline::Core end + + def get_reline_encoding + RUBY_PLATFORM =~ /mswin|mingw/ ? Encoding::UTF_8 : Encoding::default_external + end end From 25f2005a638570cce832d218a451072057610f06 Mon Sep 17 00:00:00 2001 From: Xia Xionjun Date: Tue, 21 Jan 2020 22:41:45 +0900 Subject: [PATCH 452/878] fix load error with EAGAIN This is a fix related to the following issue. rails/rails#33464 Not only in rails apps, some little ruby app with only 2 or 3 ruby files reproduce the problem during many years. When I edit linux ruby files by vs code via samba on windows, and then I execute the ruby files on linux, "require_relative" will sometimes not work properly. My solution is to wait a monument if the required relative file is busy. --- io.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) mode change 100644 => 100755 io.c diff --git a/io.c b/io.c old mode 100644 new mode 100755 index 294abfe6b057b6..51d92a942ff591 --- a/io.c +++ b/io.c @@ -312,13 +312,31 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) int ret; static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */ + static const int retry_interval = 0; + static const int retry_max_count = 10000; + + int retry_count = 0; + int e; + #ifdef O_CLOEXEC /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ flags |= O_CLOEXEC; #elif defined O_NOINHERIT flags |= O_NOINHERIT; #endif - ret = open(pathname, flags, mode); + + while (1) { + ret = open(pathname, flags, mode); + e = errno; + + if (ret != -1 || e != EAGAIN || retry_count >= retry_max_count) { + break; + } + + retry_count++; + sleep(retry_interval); + } + if (ret < 0) return ret; if (ret <= 2 || o_cloexec_state == 0) { rb_maygvl_fd_fix_cloexec(ret); From 5798d35ff66e468ebf296c4069ede275d7fb0ec9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 21 Jan 2020 22:45:10 +0900 Subject: [PATCH 453/878] Also check EWOULDBLOCK as well as EAGAIN --- io.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/io.c b/io.c index 51d92a942ff591..201ec9bede62fc 100755 --- a/io.c +++ b/io.c @@ -316,7 +316,6 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) static const int retry_max_count = 10000; int retry_count = 0; - int e; #ifdef O_CLOEXEC /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ @@ -325,15 +324,11 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) flags |= O_NOINHERIT; #endif - while (1) { - ret = open(pathname, flags, mode); - e = errno; - - if (ret != -1 || e != EAGAIN || retry_count >= retry_max_count) { - break; - } + while ((ret = open(pathname, flags, mode)) == -1) { + int e = errno; + if (e != EAGAIN && e != EWOULDBLOCK) break; + if (retry_count++ >= retry_max_count) break; - retry_count++; sleep(retry_interval); } From 913dc64eb6bbc85a05c67f341da2b596f678f09f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 22 Jan 2020 08:54:49 +0900 Subject: [PATCH 454/878] Drop executable bit set by 25f2005a638570cce832d218a451072057610f06 --- io.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 io.c diff --git a/io.c b/io.c old mode 100755 new mode 100644 From e51b6aa81dcad4f07021fbd986050e1995770855 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 22 Jan 2020 08:55:17 +0900 Subject: [PATCH 455/878] * 2020-01-22 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 93b24a6ec8b55c..b42238ba5cb5bb 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" From cdaae38f79345bfb4604c98f915c6e12593b6a57 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 22 Jan 2020 13:44:41 +0900 Subject: [PATCH 456/878] Use gem name to specify --- tool/sync_default_gems.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 38117602acfe70..7044f1e21c211a 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -62,7 +62,7 @@ fileutils: 'ruby/fileutils', fiddle: 'ruby/fiddle', stringio: 'ruby/stringio', - ioconsole: 'ruby/io-console', + "io-console": 'ruby/io-console', csv: 'ruby/csv', webrick: 'ruby/webrick', dbm: 'ruby/dbm', @@ -89,11 +89,11 @@ pstore: "ruby/pstore", delegate: "ruby/delegate", benchmark: "ruby/benchmark", - netpop: "ruby/net-pop", - netsmtp: "ruby/net-smtp", + "net-pop": "ruby/net-pop", + "net-smtp": "ruby/net-smtp", cgi: "ruby/cgi", readline: "ruby/readline", - readlineext: "ruby/readline-ext", + "readline-ext": "ruby/readline-ext", observer: "ruby/observer", timeout: "ruby/timeout", yaml: "ruby/yaml", @@ -166,7 +166,7 @@ def sync_default_gems(gem) cp_r("#{upstream}/test/stringio", "test") cp_r("#{upstream}/stringio.gemspec", "ext/stringio") `git checkout ext/stringio/depend ext/stringio/README.md` - when "ioconsole" + when "io-console" rm_rf(%w[ext/io/console test/io/console]) cp_r("#{upstream}/ext/io/console", "ext/io") cp_r("#{upstream}/test/io/console", "test/io") @@ -252,13 +252,13 @@ def sync_default_gems(gem) cp_r("#{upstream}/openssl.gemspec", "ext/openssl") cp_r("#{upstream}/HISTORY.md", "ext/openssl") `git checkout ext/openssl/depend` - when "netpop" + when "net-pop" sync_lib "net-pop" mv "lib/net-pop.gemspec", "lib/net/pop" - when "netsmtp" + when "net-smtp" sync_lib "net-smtp" mv "lib/net-smtp.gemspec", "lib/net/smtp" - when "readlineext" + when "readline-ext" sync_lib "readline-ext" mv "lib/readline-ext.gemspec", "ext/readline" when "did_you_mean" From 9e3bfed53ced0ce2970710338863f811759c8d67 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 22 Jan 2020 16:02:10 +0900 Subject: [PATCH 457/878] Added usage documentation for sync_default_gems --- tool/sync_default_gems.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 7044f1e21c211a..03db90eb45c911 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -1,5 +1,13 @@ # sync following repositories to ruby repository # +# Usage: +# git clone from the upstream repository and copy from the upstream repository with cp -rf. It's lost the git commits. +# $ ruby tool/sync_default_gems.rb rubygems +# pick the single commit from the upstream repository. +# $ ruby tool/sync_default_gems.rb rubygems 97e9768612 +# pick the commits range from the upstream repository +# $ ruby tool/sync_default_gems.rb rubygems 97e9768612..9e53702832 +# # * https://github.com/rubygems/rubygems # * https://github.com/rubygems/bundler # * https://github.com/ruby/rdoc From c90fc55a1f4630aae862e2d409c933edea3a5d5d Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 22 Jan 2020 16:04:38 +0900 Subject: [PATCH 458/878] Drop executable bit of *.{yml,h,mk.tmpl} --- benchmark/fiber_chain.yml | 0 ext/fiddle/win32/fficonfig.h | 0 ext/fiddle/win32/libffi.mk.tmpl | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 benchmark/fiber_chain.yml mode change 100755 => 100644 ext/fiddle/win32/fficonfig.h mode change 100755 => 100644 ext/fiddle/win32/libffi.mk.tmpl diff --git a/benchmark/fiber_chain.yml b/benchmark/fiber_chain.yml old mode 100755 new mode 100644 diff --git a/ext/fiddle/win32/fficonfig.h b/ext/fiddle/win32/fficonfig.h old mode 100755 new mode 100644 diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl old mode 100755 new mode 100644 From 461db352c22c0ffb5c0db295238f97f44168e6cc Mon Sep 17 00:00:00 2001 From: 0x005c <52650857+0x005c@users.noreply.github.com> Date: Wed, 8 Jan 2020 20:40:08 +0900 Subject: [PATCH 459/878] Rename RUBY_MARK_NO_PIN_UNLESS_NULL to RUBY_MARK_MOVABLE_UNLESS_NULL --- gc.h | 2 +- iseq.c | 2 +- proc.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gc.h b/gc.h index 750d87819b1f1f..6568079c54e539 100644 --- a/gc.h +++ b/gc.h @@ -59,7 +59,7 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr) #define RUBY_GC_INFO if(0)printf #endif -#define RUBY_MARK_NO_PIN_UNLESS_NULL(ptr) do { \ +#define RUBY_MARK_MOVABLE_UNLESS_NULL(ptr) do { \ VALUE markobj = (ptr); \ if (RTEST(markobj)) {rb_gc_mark_movable(markobj);} \ } while (0) diff --git a/iseq.c b/iseq.c index 2f40efc77b6842..a294f08527d8b3 100644 --- a/iseq.c +++ b/iseq.c @@ -314,7 +314,7 @@ rb_iseq_mark(const rb_iseq_t *iseq) rb_gc_mark_movable(body->location.label); rb_gc_mark_movable(body->location.base_label); rb_gc_mark_movable(body->location.pathobj); - RUBY_MARK_NO_PIN_UNLESS_NULL((VALUE)body->parent_iseq); + RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)body->parent_iseq); if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) { const struct rb_iseq_param_keyword *const keyword = body->param.keyword; diff --git a/proc.c b/proc.c index 5434e8daa7cbc0..01efab7d70f5fa 100644 --- a/proc.c +++ b/proc.c @@ -66,18 +66,18 @@ block_mark(const struct rb_block *block) case block_type_ifunc: { const struct rb_captured_block *captured = &block->as.captured; - RUBY_MARK_NO_PIN_UNLESS_NULL(captured->self); - RUBY_MARK_NO_PIN_UNLESS_NULL((VALUE)captured->code.val); + RUBY_MARK_MOVABLE_UNLESS_NULL(captured->self); + RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)captured->code.val); if (captured->ep && captured->ep[VM_ENV_DATA_INDEX_ENV] != Qundef /* cfunc_proc_t */) { - RUBY_MARK_NO_PIN_UNLESS_NULL(VM_ENV_ENVVAL(captured->ep)); + RUBY_MARK_MOVABLE_UNLESS_NULL(VM_ENV_ENVVAL(captured->ep)); } } break; case block_type_symbol: - RUBY_MARK_NO_PIN_UNLESS_NULL(block->as.symbol); + RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.symbol); break; case block_type_proc: - RUBY_MARK_NO_PIN_UNLESS_NULL(block->as.proc); + RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.proc); break; } } From e91c39f1c0f7d5e670266d9593d533fd444957f6 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 17 Jan 2020 11:36:52 -0800 Subject: [PATCH 460/878] Remove special handling of $SAFE and related C-APIs These were all deprecated in Ruby 2.7. --- NEWS.md | 2 + bootstraptest/test_proc.rb | 13 ---- common.mk | 34 --------- include/ruby/ruby.h | 36 --------- inits.c | 1 - safe.c | 145 ------------------------------------- 6 files changed, 2 insertions(+), 229 deletions(-) delete mode 100644 safe.c diff --git a/NEWS.md b/NEWS.md index 4485a64df49cd3..51d9dc7cade398 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,8 @@ sufficient information, see the ChangeLog file or Redmine ## Language changes +* $SAFE is now a normal global variable with no special behavior. [Feature #16131] + ## Command line options ## Core classes updates (outstanding ones only) diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb index 1e384411dcc1fe..6d2c557c3c5db3 100644 --- a/bootstraptest/test_proc.rb +++ b/bootstraptest/test_proc.rb @@ -224,19 +224,6 @@ def m(&b) Proc.new{|a, *b| [a, b]}.call(1, 2, 3), ] } -assert_equal %q{1}, %q{ - pr = proc{ - $SAFE - } - $SAFE = 1 - pr.call -} -assert_equal %q{[1, 1]}, %q{ - pr = proc{ - $SAFE += 1 - } - [pr.call, $SAFE] -} assert_equal %q{1}, %q{ def m(&b) b diff --git a/common.mk b/common.mk index 86ec9c58dc10bf..b685e8fa4caee6 100644 --- a/common.mk +++ b/common.mk @@ -127,7 +127,6 @@ COMMONOBJS = array.$(OBJEXT) \ regparse.$(OBJEXT) \ regsyntax.$(OBJEXT) \ ruby.$(OBJEXT) \ - safe.$(OBJEXT) \ signal.$(OBJEXT) \ sprintf.$(OBJEXT) \ st.$(OBJEXT) \ @@ -3570,39 +3569,6 @@ ruby.$(OBJEXT): {$(VPATH)}thread_native.h ruby.$(OBJEXT): {$(VPATH)}util.h ruby.$(OBJEXT): {$(VPATH)}vm_core.h ruby.$(OBJEXT): {$(VPATH)}vm_opts.h -safe.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -safe.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -safe.$(OBJEXT): $(CCAN_DIR)/list/list.h -safe.$(OBJEXT): $(CCAN_DIR)/str/str.h -safe.$(OBJEXT): $(hdrdir)/ruby.h -safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h -safe.$(OBJEXT): $(top_srcdir)/internal/array.h -safe.$(OBJEXT): $(top_srcdir)/internal/compilers.h -safe.$(OBJEXT): $(top_srcdir)/internal/gc.h -safe.$(OBJEXT): $(top_srcdir)/internal/imemo.h -safe.$(OBJEXT): $(top_srcdir)/internal/serial.h -safe.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -safe.$(OBJEXT): $(top_srcdir)/internal/stdbool.h -safe.$(OBJEXT): $(top_srcdir)/internal/vm.h -safe.$(OBJEXT): $(top_srcdir)/internal/warnings.h -safe.$(OBJEXT): {$(VPATH)}assert.h -safe.$(OBJEXT): {$(VPATH)}config.h -safe.$(OBJEXT): {$(VPATH)}defines.h -safe.$(OBJEXT): {$(VPATH)}id.h -safe.$(OBJEXT): {$(VPATH)}intern.h -safe.$(OBJEXT): {$(VPATH)}internal.h -safe.$(OBJEXT): {$(VPATH)}method.h -safe.$(OBJEXT): {$(VPATH)}missing.h -safe.$(OBJEXT): {$(VPATH)}node.h -safe.$(OBJEXT): {$(VPATH)}ruby_assert.h -safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h -safe.$(OBJEXT): {$(VPATH)}safe.c -safe.$(OBJEXT): {$(VPATH)}st.h -safe.$(OBJEXT): {$(VPATH)}subst.h -safe.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -safe.$(OBJEXT): {$(VPATH)}thread_native.h -safe.$(OBJEXT): {$(VPATH)}vm_core.h -safe.$(OBJEXT): {$(VPATH)}vm_opts.h setproctitle.$(OBJEXT): $(hdrdir)/ruby.h setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h setproctitle.$(OBJEXT): {$(VPATH)}assert.h diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index ada86dab958355..6086b46348f7f5 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -626,42 +626,6 @@ VALUE rb_get_path(VALUE); VALUE rb_get_path_no_checksafe(VALUE); #define FilePathStringValue(v) ((v) = rb_get_path(v)) -/* Remove in 3.0 */ -#define RUBY_SAFE_LEVEL_MAX 1 -void rb_secure(int); -int rb_safe_level(void); -void rb_set_safe_level(int); -#if GCC_VERSION_SINCE(4,4,0) -int ruby_safe_level_2_error(void) __attribute__((error("$SAFE=2 to 4 are obsolete"))); -int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 are obsolete"))); -# ifdef RUBY_EXPORT -# define ruby_safe_level_2_warning() ruby_safe_level_2_error() -# endif -# if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) -# define RUBY_SAFE_LEVEL_INVALID_P(level) \ - __extension__(\ - __builtin_choose_expr(\ - __builtin_constant_p(level), \ - ((level) < 0 || RUBY_SAFE_LEVEL_MAX < (level)), 0)) -# define RUBY_SAFE_LEVEL_CHECK(level, type) \ - __extension__(__builtin_choose_expr(RUBY_SAFE_LEVEL_INVALID_P(level), ruby_safe_level_2_##type(), (level))) -# else -/* in gcc 4.8 or earlier, __builtin_choose_expr() does not consider - * __builtin_constant_p(variable) a constant expression. - */ -# define RUBY_SAFE_LEVEL_INVALID_P(level) \ - __extension__(__builtin_constant_p(level) && \ - ((level) < 0 || RUBY_SAFE_LEVEL_MAX < (level))) -# define RUBY_SAFE_LEVEL_CHECK(level, type) \ - (RUBY_SAFE_LEVEL_INVALID_P(level) ? ruby_safe_level_2_##type() : (level)) -# endif -# define rb_secure(level) rb_secure(RUBY_SAFE_LEVEL_CHECK(level, warning)) -# define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error)) -#endif -void rb_set_safe_level_force(int); -void rb_secure_update(VALUE); -NORETURN(void rb_insecure_operation(void)); - VALUE rb_errinfo(void); void rb_set_errinfo(VALUE); diff --git a/inits.c b/inits.c index b313d1dd108963..91c916deece06e 100644 --- a/inits.c +++ b/inits.c @@ -37,7 +37,6 @@ rb_call_inits(void) CALL(String); CALL(Exception); CALL(eval); - CALL(safe); CALL(jump); CALL(Numeric); CALL(Bignum); diff --git a/safe.c b/safe.c deleted file mode 100644 index a6b4905337e05f..00000000000000 --- a/safe.c +++ /dev/null @@ -1,145 +0,0 @@ -/********************************************************************** - - safe.c - - - $Author$ - created at: Tue Sep 23 09:44:32 JST 2008 - - Copyright (C) 2008 Yukihiro Matsumoto - -**********************************************************************/ - -#define SAFE_LEVEL_MAX RUBY_SAFE_LEVEL_MAX - -#include "ruby/ruby.h" -#include "vm_core.h" - -/* $SAFE accessor */ - -#undef rb_secure -#undef rb_set_safe_level -#undef ruby_safe_level_2_warning - -int -ruby_safe_level_2_warning(void) -{ - rb_warn("rb_safe_level_2_warning will be removed in Ruby 3.0"); - return 2; -} - -int -rb_safe_level(void) -{ - rb_warn("rb_safe_level will be removed in Ruby 3.0"); - return GET_VM()->safe_level_; -} - -void -rb_set_safe_level_force(int safe) -{ - rb_warn("rb_set_safe_level_force will be removed in Ruby 3.0"); - GET_VM()->safe_level_ = safe; -} - -void -rb_set_safe_level(int level) -{ - rb_vm_t *vm = GET_VM(); - - rb_warn("rb_set_safe_level will be removed in Ruby 3.0"); - if (level > SAFE_LEVEL_MAX) { - rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete"); - } - else if (level < 0) { - rb_raise(rb_eArgError, "$SAFE should be >= 0"); - } - else { - int line; - const char *path = rb_source_location_cstr(&line); - - if (0) fprintf(stderr, "%s:%d $SAFE %d -> %d\n", - path ? path : "-", line, vm->safe_level_, level); - - vm->safe_level_ = level; - } -} - -static VALUE -safe_getter(ID _x, VALUE *_y) -{ - rb_warn("$SAFE will become a normal global variable in Ruby 3.0"); - return INT2NUM(GET_VM()->safe_level_); -} - -static void -safe_setter(VALUE val, ID _x, VALUE *_y) -{ - int level = NUM2INT(val); - rb_vm_t *vm = GET_VM(); - - rb_warn("$SAFE will become a normal global variable in Ruby 3.0"); - if (level > SAFE_LEVEL_MAX) { - rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete"); - } - else if (level < 0) { - rb_raise(rb_eArgError, "$SAFE should be >= 0"); - } - else { - int line; - const char *path = rb_source_location_cstr(&line); - - if (0) fprintf(stderr, "%s:%d $SAFE %d -> %d\n", - path ? path : "-", line, vm->safe_level_, level); - - vm->safe_level_ = level; - } -} - -void -rb_secure(int level) -{ - rb_warn("rb_secure will be removed in Ruby 3.0"); - if (level <= GET_VM()->safe_level_) { - ID caller_name = rb_frame_callee(); - if (caller_name) { - rb_raise(rb_eSecurityError, "Insecure operation `%"PRIsVALUE"' at level %d", - rb_id2str(caller_name), GET_VM()->safe_level_); - } - else { - rb_raise(rb_eSecurityError, "Insecure operation at level %d", - GET_VM()->safe_level_); - } - } -} - -void -rb_secure_update(VALUE obj) -{ - rb_warn("rb_secure_update will be removed in Ruby 3.0"); -} - -void -rb_insecure_operation(void) -{ - rb_warn("rb_insecure_operation will be removed in Ruby 3.0"); - ID caller_name = rb_frame_callee(); - if (caller_name) { - rb_raise(rb_eSecurityError, "Insecure operation - %"PRIsVALUE, - rb_id2str(caller_name)); - } - else { - rb_raise(rb_eSecurityError, "Insecure operation: -r"); - } -} - -void -rb_check_safe_obj(VALUE x) -{ - rb_warn("rb_check_safe_obj will be removed in Ruby 3.0"); -} - -void -Init_safe(void) -{ - rb_define_virtual_variable("$SAFE", safe_getter, safe_setter); -} From 90f5c3c1ea34c992dc0f36593bf6141695dfdf67 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 23 Jan 2020 02:10:07 +0900 Subject: [PATCH 461/878] * 2020-01-23 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index b42238ba5cb5bb..424b059c60001f 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" From 28d31ead34baff1c4abc0d7d902ef4bc1d576fb2 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 21 Jan 2020 16:14:10 -0800 Subject: [PATCH 462/878] Fix pp when passed a empty ruby2_keywords-flagged hash as array element This causes problems because the hash is passed to a block not accepting keywords. Because the hash is empty and keyword flagged, it is removed before calling the block. This doesn't cause an ArgumentError because it is a block and not a lambda. Just like any other block not passed required arguments, arguments not passed are set to nil. Issues like this are a strong reason not to have ruby2_keywords by default. Fixes [Bug #16519] --- lib/pp.rb | 2 +- test/test_pp.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/pp.rb b/lib/pp.rb index 81a9a1629ce31d..dede0d15172cfb 100644 --- a/lib/pp.rb +++ b/lib/pp.rb @@ -223,7 +223,7 @@ def seplist(list, sep=nil, iter_method=:each) # :yield: element else sep.call end - yield(*v) + yield(*v, **{}) } end diff --git a/test/test_pp.rb b/test/test_pp.rb index 3262417fba62ea..026b2ac9f7811b 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -176,6 +176,10 @@ def test_hash assert_equal("{1=>1}", PP.singleline_pp({ 1 => 1}, ''.dup)) # [ruby-core:02699] assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, ''.dup)) end + + def test_hash_in_array + assert_equal("[{}]", PP.singleline_pp([->(*a){a.last}.ruby2_keywords.call(**{})], ''.dup)) + end end class PPDelegateTest < Test::Unit::TestCase From e18b817b1f0a4c318f1f0fe54fceaa5cbc85e8ab Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Wed, 22 Jan 2020 09:18:08 -0800 Subject: [PATCH 463/878] Make taint warnings non-verbose instead of verbose --- error.c | 4 ++-- ext/pathname/pathname.c | 4 ++-- hash.c | 2 +- object.c | 14 +++++++------- string.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/error.c b/error.c index 1690658b8c3a0b..1702a709b4c70c 100644 --- a/error.c +++ b/error.c @@ -3035,14 +3035,14 @@ rb_check_frozen(VALUE obj) void rb_error_untrusted(VALUE obj) { - rb_warning("rb_error_untrusted is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_error_untrusted is deprecated and will be removed in Ruby 3.2."); } #undef rb_check_trusted void rb_check_trusted(VALUE obj) { - rb_warning("rb_check_trusted is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_check_trusted is deprecated and will be removed in Ruby 3.2."); } void diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 15f80d487ebc0e..e511560500cb1c 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -138,7 +138,7 @@ path_freeze(VALUE self) static VALUE path_taint(VALUE self) { - rb_warning("Pathname#taint is deprecated and will be removed in Ruby 3.2."); + rb_warn("Pathname#taint is deprecated and will be removed in Ruby 3.2."); return self; } @@ -151,7 +151,7 @@ path_taint(VALUE self) static VALUE path_untaint(VALUE self) { - rb_warning("Pathname#untaint is deprecated and will be removed in Ruby 3.2."); + rb_warn("Pathname#untaint is deprecated and will be removed in Ruby 3.2."); return self; } diff --git a/hash.c b/hash.c index a1b57cee248d5e..6823bae8281718 100644 --- a/hash.c +++ b/hash.c @@ -4968,7 +4968,7 @@ env_fetch(int argc, VALUE *argv, VALUE _) int rb_env_path_tainted(void) { - rb_warning("rb_env_path_tainted is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_env_path_tainted is deprecated and will be removed in Ruby 3.2."); return 0; } diff --git a/object.c b/object.c index 0080c351a68a3a..bfce958a72ea3c 100644 --- a/object.c +++ b/object.c @@ -1216,7 +1216,7 @@ rb_obj_dummy1(VALUE _x, VALUE _y) VALUE rb_obj_tainted(VALUE obj) { - rb_warning("Object#tainted? is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#tainted? is deprecated and will be removed in Ruby 3.2."); return Qfalse; } @@ -1230,7 +1230,7 @@ rb_obj_tainted(VALUE obj) VALUE rb_obj_taint(VALUE obj) { - rb_warning("Object#taint is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#taint is deprecated and will be removed in Ruby 3.2."); return obj; } @@ -1245,7 +1245,7 @@ rb_obj_taint(VALUE obj) VALUE rb_obj_untaint(VALUE obj) { - rb_warning("Object#untaint is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#untaint is deprecated and will be removed in Ruby 3.2."); return obj; } @@ -1259,7 +1259,7 @@ rb_obj_untaint(VALUE obj) VALUE rb_obj_untrusted(VALUE obj) { - rb_warning("Object#untrusted? is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#untrusted? is deprecated and will be removed in Ruby 3.2."); return Qfalse; } @@ -1273,7 +1273,7 @@ rb_obj_untrusted(VALUE obj) VALUE rb_obj_untrust(VALUE obj) { - rb_warning("Object#untrust is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#untrust is deprecated and will be removed in Ruby 3.2."); return obj; } @@ -1288,7 +1288,7 @@ rb_obj_untrust(VALUE obj) VALUE rb_obj_trust(VALUE obj) { - rb_warning("Object#trust is deprecated and will be removed in Ruby 3.2."); + rb_warn("Object#trust is deprecated and will be removed in Ruby 3.2."); return obj; } @@ -1299,7 +1299,7 @@ rb_obj_trust(VALUE obj) void rb_obj_infect(VALUE victim, VALUE carrier) { - rb_warning("rb_obj_infect is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_obj_infect is deprecated and will be removed in Ruby 3.2."); } /** diff --git a/string.c b/string.c index ca425e97808154..b4b365ad4bf372 100644 --- a/string.c +++ b/string.c @@ -910,14 +910,14 @@ rb_enc_str_new_static(const char *ptr, long len, rb_encoding *enc) VALUE rb_tainted_str_new(const char *ptr, long len) { - rb_warning("rb_tainted_str_new is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_tainted_str_new is deprecated and will be removed in Ruby 3.2."); return rb_str_new(ptr, len); } VALUE rb_tainted_str_new_cstr(const char *ptr) { - rb_warning("rb_tainted_str_new_cstr is deprecated and will be removed in Ruby 3.2."); + rb_warn("rb_tainted_str_new_cstr is deprecated and will be removed in Ruby 3.2."); return rb_str_new_cstr(ptr); } From 425b2064d394639101854c83a061a0918b33b857 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 14 Jul 2019 13:06:22 +0900 Subject: [PATCH 464/878] [ruby/readline-ext] Include ruby/assert.h in ruby/ruby.h so that assertions can be there https://github.com/ruby/readline-ext/commit/4d44c12832 --- ext/readline/depend | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/readline/depend b/ext/readline/depend index 2dde7fca58f088..7ebc6119c5a878 100644 --- a/ext/readline/depend +++ b/ext/readline/depend @@ -1,6 +1,7 @@ # AUTOGENERATED DEPENDENCIES START readline.o: $(RUBY_EXTCONF_H) readline.o: $(arch_hdrdir)/ruby/config.h +readline.o: $(hdrdir)/ruby.h readline.o: $(hdrdir)/ruby/assert.h readline.o: $(hdrdir)/ruby/backward.h readline.o: $(hdrdir)/ruby/defines.h From a737f0cea5dd3a26389c0042d312ff7252de88bb Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 3 Dec 2019 12:36:01 +0900 Subject: [PATCH 465/878] Stop using minitest dependent methods --- test/readline/test_readline.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index a4b7cb4cc7c5ae..debac82f8c0520 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -434,8 +434,8 @@ def test_modify_text_in_pre_input_hook def test_input_metachar skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) # test will pass on Windows reline, but not readline - skip "Won't pass on mingw readline.so using 8.0.001" if mingw? and defined?(TestReadline) and kind_of?(TestReadline) - skip 'Needs GNU Readline 6 or later' if windows? and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' + skip "Won't pass on mingw readline.so using 8.0.001" if /mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) + skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' bug6601 = '[ruby-core:45682]' Readline::HISTORY << "hello" wo = nil @@ -684,7 +684,7 @@ def test_completion_quote_character_after_completion # http://rubyci.s3.amazonaws.com/solaris11s-sunc/ruby-trunk/log/20181228T102505Z.fail.html.gz skip 'This test does not succeed on Oracle Developer Studio for now' end - skip 'Needs GNU Readline 6 or later' if windows? and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' + skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' Readline.completion_proc = -> (_) { [] } Readline.completer_quote_characters = "'\"" @@ -731,7 +731,7 @@ def with_temp_stdio Tempfile.create("test_readline_stdin") {|stdin| Tempfile.create("test_readline_stdout") {|stdout| yield stdin, stdout - if windows? + if /mswin|mingw/ =~ RUBY_PLATFORM # needed since readline holds refs to tempfiles, can't delete on Windows Readline.input = STDIN Readline.output = STDOUT From f09c1cf0e932095cd507e68126427a773713a92f Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 3 Dec 2019 12:46:14 +0900 Subject: [PATCH 466/878] Skip a test that uses assert_ruby_status if it doesn't exist --- test/readline/test_readline.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index debac82f8c0520..0d807b25edd1d8 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -483,6 +483,7 @@ def test_input_metachar_multibyte def test_refresh_line skip "Only when refresh_line exists" unless Readline.respond_to?(:refresh_line) + skip unless respond_to?(:assert_ruby_status) bug6232 = '[ruby-core:43957] [Bug #6232] refresh_line after set_screen_size' with_temp_stdio do |stdin, stdout| replace_stdio(stdin.path, stdout.path) do From 0d3e4b8a79dcbc25ab63819e1c05f31424560835 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 3 Dec 2019 12:46:55 +0900 Subject: [PATCH 467/878] Use omit instead of skip --- test/readline/test_readline.rb | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 0d807b25edd1d8..45197724ea531f 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -27,7 +27,7 @@ def teardown end def test_readline - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) with_temp_stdio do |stdin, stdout| stdin.write("hello\n") stdin.close @@ -65,8 +65,8 @@ def test_readline # line_buffer # point def test_line_buffer__point - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) - skip "GNU Readline has special behaviors" if defined?(Reline) and Readline == Reline + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "GNU Readline has special behaviors" if defined?(Reline) and Readline == Reline begin Readline.line_buffer Readline.point @@ -154,7 +154,7 @@ def test_completion_case_fold end def test_completion_proc_empty_result - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) with_temp_stdio do |stdin, stdout| stdin.write("first\t") stdin.flush @@ -233,7 +233,7 @@ def test_completion_append_character end def test_completion_encoding - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) bug5941 = '[Bug #5941]' append_character = Readline.completion_append_character Readline.completion_append_character = "" @@ -261,7 +261,7 @@ def test_completion_encoding end or begin return if assert_under_utf8 - skip("missing test for locale #{locale.name}") + omit("missing test for locale #{locale.name}") end expected = results[0][0...1] Readline.completion_case_fold = false @@ -335,7 +335,7 @@ def test_pre_input_hook end def test_point - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) assert_equal(0, Readline.point) Readline.insert_text('12345') assert_equal(5, Readline.point) @@ -350,7 +350,7 @@ def test_point end def test_insert_text - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) str = "test_insert_text" assert_equal(0, Readline.point) assert_equal(Readline, Readline.insert_text(str)) @@ -381,7 +381,7 @@ def test_insert_text end def test_delete_text - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) str = "test_insert_text" assert_equal(0, Readline.point) assert_equal(Readline, Readline.insert_text(str)) @@ -401,7 +401,7 @@ def test_delete_text end def test_modify_text_in_pre_input_hook - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) with_temp_stdio {|stdin, stdout| begin stdin.write("world\n") @@ -432,10 +432,10 @@ def test_modify_text_in_pre_input_hook end def test_input_metachar - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) # test will pass on Windows reline, but not readline - skip "Won't pass on mingw readline.so using 8.0.001" if /mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) - skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' + omit "Won't pass on mingw readline.so using 8.0.001" if /mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) + omit 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' bug6601 = '[ruby-core:45682]' Readline::HISTORY << "hello" wo = nil @@ -452,10 +452,10 @@ def test_input_metachar end def test_input_metachar_multibyte - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) unless Encoding.find("locale") == Encoding::UTF_8 return if assert_under_utf8 - skip 'this test needs UTF-8 locale' + omit 'this test needs UTF-8 locale' end bug6602 = '[ruby-core:45683]' Readline::HISTORY << "\u3042\u3093" @@ -482,8 +482,8 @@ def test_input_metachar_multibyte end def test_refresh_line - skip "Only when refresh_line exists" unless Readline.respond_to?(:refresh_line) - skip unless respond_to?(:assert_ruby_status) + omit "Only when refresh_line exists" unless Readline.respond_to?(:refresh_line) + omit unless respond_to?(:assert_ruby_status) bug6232 = '[ruby-core:43957] [Bug #6232] refresh_line after set_screen_size' with_temp_stdio do |stdin, stdout| replace_stdio(stdin.path, stdout.path) do @@ -548,7 +548,7 @@ def test_using_quoting_detection_proc_with_multibyte_input return unless Readline.respond_to?(:quoting_detection_proc=) unless Encoding.find("external") == Encoding::UTF_8 return if assert_under_utf8 - skip 'this test needs UTF-8 locale' + omit 'this test needs UTF-8 locale' end passed_text = nil @@ -586,7 +586,7 @@ def test_using_quoting_detection_proc_with_multibyte_input end def test_simple_completion - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) line = nil @@ -609,8 +609,8 @@ def test_simple_completion end def test_completion_with_completion_append_character - skip "Skip Editline" if /EditLine/n.match(Readline::VERSION) - skip "Readline.completion_append_character is not implemented" unless Readline.respond_to?(:completion_append_character=) + omit "Skip Editline" if /EditLine/n.match(Readline::VERSION) + omit "Readline.completion_append_character is not implemented" unless Readline.respond_to?(:completion_append_character=) line = nil append_character = Readline.completion_append_character @@ -683,9 +683,9 @@ def test_completion_quote_character_after_completion return unless Readline.respond_to?(:completion_quote_character) if /solaris/i =~ RUBY_PLATFORM # http://rubyci.s3.amazonaws.com/solaris11s-sunc/ruby-trunk/log/20181228T102505Z.fail.html.gz - skip 'This test does not succeed on Oracle Developer Studio for now' + omit 'This test does not succeed on Oracle Developer Studio for now' end - skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' + omit 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0' Readline.completion_proc = -> (_) { [] } Readline.completer_quote_characters = "'\"" @@ -768,7 +768,7 @@ def assert_under_utf8 return false if ENV['LC_ALL'] == 'UTF-8' loc = caller_locations(1, 1)[0].base_label.to_s assert_separately([{"LC_ALL"=>"UTF-8"}, "-r", __FILE__], < Date: Tue, 3 Dec 2019 12:54:24 +0900 Subject: [PATCH 468/878] Check DONT_RUN_RELINE_TEST envvar --- test/readline/helper.rb | 18 ++++++++++-------- test/readline/test_readline.rb | 2 +- test/readline/test_readline_history.rb | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/test/readline/helper.rb b/test/readline/helper.rb index ee157722f13951..d5f02573ec76a3 100644 --- a/test/readline/helper.rb +++ b/test/readline/helper.rb @@ -3,18 +3,20 @@ ReadlineSo = Readline rescue LoadError end -require "reline" def use_ext_readline # Use ext/readline as Readline Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) Object.const_set(:Readline, ReadlineSo) end -def use_lib_reline # Use lib/reline as Readline - Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') - Reline.const_set('IOGate', Reline::GeneralIO) - Reline.send(:core).config.instance_variable_set(:@test_mode, true) - Reline.send(:core).config.reset - Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) - Object.const_set(:Readline, Reline) +unless ENV['DONT_RUN_RELINE_TEST'] + require "reline" + def use_lib_reline # Use lib/reline as Readline + Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') + Reline.const_set('IOGate', Reline::GeneralIO) + Reline.send(:core).config.instance_variable_set(:@test_mode, true) + Reline.send(:core).config.reset + Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) + Object.const_set(:Readline, Reline) + end end diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 45197724ea531f..d2e2cdd4a00f41 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -799,4 +799,4 @@ def get_default_internal_encoding super end end -end +end if defined?(Reline) diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 509f1d687efc25..98fef655e10e18 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -283,4 +283,4 @@ def get_default_internal_encoding super end end -end +end if defined?(Reline) From be6931f7f7d2eed46226f0cc452de64cdeec0dab Mon Sep 17 00:00:00 2001 From: Yuta Iwama Date: Thu, 23 Jan 2020 17:23:17 +0900 Subject: [PATCH 469/878] Add #verify_hostname= and #verify_hostname to skip hostname verification (#2858) According to https://github.com/ruby/openssl/pull/60, > Currently an user who wants to do the hostname verification needs to call SSLSocket#post_connection_check explicitly after the TLS connection is established. if an user who wants to skip the hostname verification, SSLSocket#post_connection_check doesn't need to be called https://bugs.ruby-lang.org/issues/16555 --- lib/net/http.rb | 14 +++++++++++--- test/net/http/test_https.rb | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/lib/net/http.rb b/lib/net/http.rb index 88a174a248f31b..de9963d18cebcd 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -844,6 +844,7 @@ def use_ssl=(flag) :@verify_callback, :@verify_depth, :@verify_mode, + :@verify_hostname, ] SSL_ATTRIBUTES = [ :ca_file, @@ -859,6 +860,7 @@ def use_ssl=(flag) :verify_callback, :verify_depth, :verify_mode, + :verify_hostname, ] # Sets path of a CA certification file in PEM format. @@ -908,6 +910,10 @@ def use_ssl=(flag) # OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER are acceptable. attr_accessor :verify_mode + # Sets to check the server certificate is valid for the hostname. + # See OpenSSL::SSL::SSLContext#verify_hostname= + attr_accessor :verify_hostname + # Returns the X.509 certificates the server presented. def peer_cert if not use_ssl? or not @socket @@ -986,9 +992,11 @@ def connect ssl_parameters = Hash.new iv_list = instance_variables SSL_IVNAMES.each_with_index do |ivname, i| - if iv_list.include?(ivname) and + if iv_list.include?(ivname) value = instance_variable_get(ivname) - ssl_parameters[SSL_ATTRIBUTES[i]] = value if value + unless value.nil? + ssl_parameters[SSL_ATTRIBUTES[i]] = value + end end end @ssl_context = OpenSSL::SSL::SSLContext.new @@ -1007,7 +1015,7 @@ def connect s.session = @ssl_session end ssl_socket_connect(s, @open_timeout) - if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE + if (@ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE) && @ssl_context.verify_hostname s.post_connection_check(@address) end D "SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}" diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb index 17fabb62d5feda..204bfb7ad3763e 100644 --- a/test/net/http/test_https.rb +++ b/test/net/http/test_https.rb @@ -204,6 +204,29 @@ def test_verify_none skip $! end + def test_skip_hostname_verfiction + TestNetHTTPUtils.clean_http_proxy_env do + http = Net::HTTP.new('invalid_servername', config('port')) + http.ipaddr = config('host') + http.use_ssl = true + http.cert_store = TEST_STORE + http.verify_hostname = false + assert_nothing_raised { http.start } + end + end + + def test_fail_if_verify_hostname_is_true + TestNetHTTPUtils.clean_http_proxy_env do + http = Net::HTTP.new('invalid_servername', config('port')) + http.ipaddr = config('host') + http.use_ssl = true + http.cert_store = TEST_STORE + http.verify_hostname = true + @log_tester = lambda { |_| } + assert_raise(OpenSSL::SSL::SSLError) { http.start } + end + end + def test_certificate_verify_failure http = Net::HTTP.new("localhost", config("port")) http.use_ssl = true From 0ea759eac9234afc47e8fb1bcacfe9ee12c8ffb6 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 23 Jan 2020 10:59:26 +0100 Subject: [PATCH 470/878] Add more direct test for pp with a ruby2_keywords Hash --- test/test_pp.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_pp.rb b/test/test_pp.rb index 026b2ac9f7811b..cd16af6394fa6a 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -179,6 +179,7 @@ def test_hash def test_hash_in_array assert_equal("[{}]", PP.singleline_pp([->(*a){a.last}.ruby2_keywords.call(**{})], ''.dup)) + assert_equal("[{}]", PP.singleline_pp([Hash.ruby2_keywords_hash({})], ''.dup)) end end From aefb13eb631cc5cd784fe2fc10f1f333a2c5e68c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 23 Jan 2020 21:42:05 +0900 Subject: [PATCH 471/878] Added rb_warn_deprecated_to_remove Warn the deprecation and future removal, with obeying the warning flag. --- error.c | 18 ++++++++++++++++-- ext/pathname/pathname.c | 4 ++-- hash.c | 2 +- internal/error.h | 1 + object.c | 14 +++++++------- string.c | 4 ++-- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/error.c b/error.c index 1702a709b4c70c..b9ec8427e65214 100644 --- a/error.c +++ b/error.c @@ -389,6 +389,20 @@ rb_warn_deprecated(const char *fmt, const char *suggest, ...) rb_write_warning_str(mesg); } +void +rb_warn_deprecated_to_remove(const char *fmt, const char *removal, ...) +{ + if (NIL_P(ruby_verbose)) return; + if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) return; + va_list args; + va_start(args, removal); + VALUE mesg = warning_string(0, fmt, args); + va_end(args); + rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1); + rb_str_catf(mesg, " is deprecated and will be removed in Ruby %s\n", removal); + rb_write_warning_str(mesg); +} + static inline int end_with_asciichar(VALUE str, int c) { @@ -3035,14 +3049,14 @@ rb_check_frozen(VALUE obj) void rb_error_untrusted(VALUE obj) { - rb_warn("rb_error_untrusted is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_error_untrusted", "3.2"); } #undef rb_check_trusted void rb_check_trusted(VALUE obj) { - rb_warn("rb_check_trusted is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_check_trusted", "3.2"); } void diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index e511560500cb1c..86b22cae628ae2 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -138,7 +138,7 @@ path_freeze(VALUE self) static VALUE path_taint(VALUE self) { - rb_warn("Pathname#taint is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Pathname#taint", "3.2"); return self; } @@ -151,7 +151,7 @@ path_taint(VALUE self) static VALUE path_untaint(VALUE self) { - rb_warn("Pathname#untaint is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Pathname#untaint", "3.2"); return self; } diff --git a/hash.c b/hash.c index 6823bae8281718..32df430b6d12d4 100644 --- a/hash.c +++ b/hash.c @@ -4968,7 +4968,7 @@ env_fetch(int argc, VALUE *argv, VALUE _) int rb_env_path_tainted(void) { - rb_warn("rb_env_path_tainted is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_env_path_tainted", "3.2"); return 0; } diff --git a/internal/error.h b/internal/error.h index cb2f23d26297de..ebedc9bc1ee66f 100644 --- a/internal/error.h +++ b/internal/error.h @@ -52,6 +52,7 @@ NORETURN(void rb_async_bug_errno(const char *,int)); const char *rb_builtin_type_name(int t); const char *rb_builtin_class_name(VALUE x); PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3); +PRINTF_ARGS(void rb_warn_deprecated_to_remove(const char *fmt, const char *removal, ...), 1, 3); VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); diff --git a/object.c b/object.c index bfce958a72ea3c..166fdae7e1b36d 100644 --- a/object.c +++ b/object.c @@ -1216,7 +1216,7 @@ rb_obj_dummy1(VALUE _x, VALUE _y) VALUE rb_obj_tainted(VALUE obj) { - rb_warn("Object#tainted? is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#tainted?", "3.2"); return Qfalse; } @@ -1230,7 +1230,7 @@ rb_obj_tainted(VALUE obj) VALUE rb_obj_taint(VALUE obj) { - rb_warn("Object#taint is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#taint", "3.2"); return obj; } @@ -1245,7 +1245,7 @@ rb_obj_taint(VALUE obj) VALUE rb_obj_untaint(VALUE obj) { - rb_warn("Object#untaint is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#untaint", "3.2"); return obj; } @@ -1259,7 +1259,7 @@ rb_obj_untaint(VALUE obj) VALUE rb_obj_untrusted(VALUE obj) { - rb_warn("Object#untrusted? is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#untrusted?", "3.2"); return Qfalse; } @@ -1273,7 +1273,7 @@ rb_obj_untrusted(VALUE obj) VALUE rb_obj_untrust(VALUE obj) { - rb_warn("Object#untrust is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#untrust", "3.2"); return obj; } @@ -1288,7 +1288,7 @@ rb_obj_untrust(VALUE obj) VALUE rb_obj_trust(VALUE obj) { - rb_warn("Object#trust is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("Object#trust", "3.2"); return obj; } @@ -1299,7 +1299,7 @@ rb_obj_trust(VALUE obj) void rb_obj_infect(VALUE victim, VALUE carrier) { - rb_warn("rb_obj_infect is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_obj_infect", "3.2"); } /** diff --git a/string.c b/string.c index b4b365ad4bf372..cdd987da1990c3 100644 --- a/string.c +++ b/string.c @@ -910,14 +910,14 @@ rb_enc_str_new_static(const char *ptr, long len, rb_encoding *enc) VALUE rb_tainted_str_new(const char *ptr, long len) { - rb_warn("rb_tainted_str_new is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_tainted_str_new", "3.2"); return rb_str_new(ptr, len); } VALUE rb_tainted_str_new_cstr(const char *ptr) { - rb_warn("rb_tainted_str_new_cstr is deprecated and will be removed in Ruby 3.2."); + rb_warn_deprecated_to_remove("rb_tainted_str_new_cstr", "3.2"); return rb_str_new_cstr(ptr); } From 27ac1c615d2a2884435a162403e2833716abf436 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 23 Jan 2020 21:49:58 +0900 Subject: [PATCH 472/878] Revert pathname, rb_warn_deprecated* are not public API --- ext/pathname/pathname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 86b22cae628ae2..e511560500cb1c 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -138,7 +138,7 @@ path_freeze(VALUE self) static VALUE path_taint(VALUE self) { - rb_warn_deprecated_to_remove("Pathname#taint", "3.2"); + rb_warn("Pathname#taint is deprecated and will be removed in Ruby 3.2."); return self; } @@ -151,7 +151,7 @@ path_taint(VALUE self) static VALUE path_untaint(VALUE self) { - rb_warn_deprecated_to_remove("Pathname#untaint", "3.2"); + rb_warn("Pathname#untaint is deprecated and will be removed in Ruby 3.2."); return self; } From 109183c2c0902a0af735b2660737e1724307b264 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 23 Jan 2020 22:03:13 +0900 Subject: [PATCH 473/878] Guarded the examples for deprecated "taint" --- spec/ruby/library/stringio/append_spec.rb | 8 +++-- spec/ruby/library/stringio/reopen_spec.rb | 40 +++++++++++++--------- spec/ruby/library/stringio/shared/write.rb | 8 +++-- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/spec/ruby/library/stringio/append_spec.rb b/spec/ruby/library/stringio/append_spec.rb index c46dc59ee5689f..b35d17ed31e5aa 100644 --- a/spec/ruby/library/stringio/append_spec.rb +++ b/spec/ruby/library/stringio/append_spec.rb @@ -36,9 +36,11 @@ end end - it "does not taint self when the passed argument is tainted" do - (@io << "test".taint) - @io.tainted?.should be_false + ruby_version_is ""..."2.8" do + it "does not taint self when the passed argument is tainted" do + (@io << "test".taint) + @io.tainted?.should be_false + end end it "updates self's position" do diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb index 34e38a63b44a73..64fd0a8c0283ad 100644 --- a/spec/ruby/library/stringio/reopen_spec.rb +++ b/spec/ruby/library/stringio/reopen_spec.rb @@ -23,13 +23,15 @@ @io.string.should == "reopened, another time" end - # NOTE: WEIRD! - it "does not taint self when the passed Object was tainted" do - @io.reopen("reopened".taint, IO::RDONLY) - @io.tainted?.should be_false - - @io.reopen("reopened".taint, IO::WRONLY) - @io.tainted?.should be_false + ruby_version_is ""..."2.8" do + # NOTE: WEIRD! + it "does not taint self when the passed Object was tainted" do + @io.reopen("reopened".taint, IO::RDONLY) + @io.tainted?.should be_false + + @io.reopen("reopened".taint, IO::WRONLY) + @io.tainted?.should be_false + end end it "tries to convert the passed Object to a String using #to_str" do @@ -90,13 +92,15 @@ str.should == "" end - # NOTE: WEIRD! - it "does not taint self when the passed Object was tainted" do - @io.reopen("reopened".taint, "r") - @io.tainted?.should be_false + ruby_version_is ""..."2.8" do + # NOTE: WEIRD! + it "does not taint self when the passed Object was tainted" do + @io.reopen("reopened".taint, "r") + @io.tainted?.should be_false - @io.reopen("reopened".taint, "w") - @io.tainted?.should be_false + @io.reopen("reopened".taint, "w") + @io.tainted?.should be_false + end end it "tries to convert the passed Object to a String using #to_str" do @@ -160,10 +164,12 @@ @io.string.should == "reopened" end - # NOTE: WEIRD! - it "does not taint self when the passed Object was tainted" do - @io.reopen("reopened".taint) - @io.tainted?.should be_false + ruby_version_is ""..."2.8" do + # NOTE: WEIRD! + it "does not taint self when the passed Object was tainted" do + @io.reopen("reopened".taint) + @io.tainted?.should be_false + end end it "resets self's position to 0" do diff --git a/spec/ruby/library/stringio/shared/write.rb b/spec/ruby/library/stringio/shared/write.rb index 28683e3cb18175..dc5e1442ec1ba8 100644 --- a/spec/ruby/library/stringio/shared/write.rb +++ b/spec/ruby/library/stringio/shared/write.rb @@ -52,9 +52,11 @@ end end - it "does not taint self when the passed argument is tainted" do - @io.send(@method, "test".taint) - @io.tainted?.should be_false + ruby_version_is ""..."2.8" do + it "does not taint self when the passed argument is tainted" do + @io.send(@method, "test".taint) + @io.tainted?.should be_false + end end end From 2bde7919a0a8302c344e9bb9ddc217958fcbd3c7 Mon Sep 17 00:00:00 2001 From: zverok Date: Sun, 19 Jan 2020 13:49:15 +0200 Subject: [PATCH 474/878] Clarify const_source_location docs --- object.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/object.c b/object.c index 166fdae7e1b36d..8acb80c35e51d4 100644 --- a/object.c +++ b/object.c @@ -2762,8 +2762,8 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) * mod.const_source_location(sym, inherit=true) -> [String, Integer] * mod.const_source_location(str, inherit=true) -> [String, Integer] * - * Returns the Ruby source filename and line number containing first definition - * of constant specified. If the named constant is not found, +nil+ is returned. + * Returns the Ruby source filename and line number containing the definition + * of the constant specified. If the named constant is not found, +nil+ is returned. * If the constant is found, but its source location can not be extracted * (constant is defined in C code), empty array is returned. * @@ -2773,28 +2773,32 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) * # test.rb: * class A * C1 = 1 + * C2 = 2 * end * * module M - * C2 = 2 + * C3 = 3 * end * * class B < A * include M - * C3 = 3 + * C4 = 4 * end * * class A # continuation of A definition + * C2 = 8 # constant redefinition; warned yet allowed * end * - * p B.const_source_location('C3') # => ["test.rb", 11] - * p B.const_source_location('C2') # => ["test.rb", 6] + * p B.const_source_location('C4') # => ["test.rb", 11] + * p B.const_source_location('C3') # => ["test.rb", 6] * p B.const_source_location('C1') # => ["test.rb", 2] * - * p B.const_source_location('C2', false) # => nil -- don't lookup in ancestors + * p B.const_source_location('C3', false) # => nil -- don't lookup in ancestors + * + * p A.const_source_location('C2') # => ["test.rb", 16] -- actual (last) definition place * - * p Object.const_source_location('B') # => ["test.rb", 9] - * p Object.const_source_location('A') # => ["test.rb", 1] -- note it is first entry, not "continuation" + * p Object.const_source_location('B') # => ["test.rb", 9] -- top-level constant could be looked through Object + * p Object.const_source_location('A') # => ["test.rb", 1] -- class reopening is NOT considered new definition * * p B.const_source_location('A') # => ["test.rb", 1] -- because Object is in ancestors * p M.const_source_location('A') # => ["test.rb", 1] -- Object is not ancestor, but additionally checked for modules From 6551a25a1951525f27c54c18207f95b6d253cbb9 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 24 Jan 2020 02:22:58 +0900 Subject: [PATCH 475/878] * 2020-01-24 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 424b059c60001f..5b6d98e4f7a184 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" From f8a8f055123bc81fc13fa295b936504196df0da4 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Wed, 22 Jan 2020 18:12:34 -0800 Subject: [PATCH 476/878] Remove empty keyword splats when calling even when using ruby2_keywords Keeping empty keyword splats for ruby2_keywords methods was necessary in 2.7 to prevent the final positional hash being treated as keywords. Now that keyword argument separation has been committed, the final positional hash is never treated as keywords, so there is no need to keep empty keyword splats when using ruby2_keywords. --- test/ruby/test_keyword.rb | 8 ++++---- test/test_pp.rb | 2 +- vm_args.c | 36 +++++++++--------------------------- 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 02745a1dfecda6..75991ca0b49e02 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -2339,10 +2339,10 @@ def method_missing(*args) assert_equal([[1, h1, 1], {}], o.foo_bar_mod(1, **h1)) assert_equal([1, h1, 1], o.foo_baz_mod(1, **h1)) - assert_equal([[h1, {}, 1], {}], o.foo_mod(:bar, h1, **{})) - assert_equal([h1, {}, 1], o.foo_mod(:baz, h1, **{})) - assert_equal([[h1, {}, 1], {}], o.foo_bar_mod(h1, **{})) - assert_equal([h1, {}, 1], o.foo_baz_mod(h1, **{})) + assert_equal([[h1, 1], {}], o.foo_mod(:bar, h1, **{})) + assert_equal([h1, 1], o.foo_mod(:baz, h1, **{})) + assert_equal([[h1, 1], {}], o.foo_bar_mod(h1, **{})) + assert_equal([h1, 1], o.foo_baz_mod(h1, **{})) assert_equal([[1, h1, 1], {}], o.foo_mod(:bar, 1, h1)) assert_equal([1, h1, 1], o.foo_mod(:baz, 1, h1)) diff --git a/test/test_pp.rb b/test/test_pp.rb index cd16af6394fa6a..3434c2b04c4f3a 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -178,7 +178,7 @@ def test_hash end def test_hash_in_array - assert_equal("[{}]", PP.singleline_pp([->(*a){a.last}.ruby2_keywords.call(**{})], ''.dup)) + assert_equal("[{}]", PP.singleline_pp([->(*a){a.last.clear}.ruby2_keywords.call(a: 1)], ''.dup)) assert_equal("[{}]", PP.singleline_pp([Hash.ruby2_keywords_hash({})], ''.dup)) end end diff --git a/vm_args.c b/vm_args.c index 5bed9711de3152..256ab5b7f4d8bf 100644 --- a/vm_args.c +++ b/vm_args.c @@ -452,7 +452,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co VALUE keyword_hash = Qnil; VALUE * const orig_sp = ec->cfp->sp; unsigned int i; - int remove_empty_keyword_hash = 1; VALUE flag_keyword_hash = 0; vm_check_canary(ec, orig_sp); @@ -503,10 +502,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co args->kw_argv = NULL; } - if (kw_flag && iseq->body->param.flags.ruby2_keywords) { - remove_empty_keyword_hash = 0; - } - if (ci->flag & VM_CALL_ARGS_SPLAT) { VALUE rest_last = 0; int len; @@ -521,9 +516,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co (((struct RHash *)rest_last)->basic.flags & RHASH_PASS_AS_KEYWORDS)) { rest_last = rb_hash_dup(rest_last); kw_flag |= VM_CALL_KW_SPLAT; - if (iseq->body->param.flags.ruby2_keywords) { - remove_empty_keyword_hash = 0; - } } else { rest_last = 0; @@ -532,17 +524,12 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co if (kw_flag & VM_CALL_KW_SPLAT) { if (len > 0 && ignore_keyword_hash_p(rest_last, iseq)) { - if (remove_empty_keyword_hash) { - arg_rest_dup(args); - rb_ary_pop(args->rest); - given_argc--; - kw_flag &= ~VM_CALL_KW_SPLAT; - } - else { - flag_keyword_hash = rest_last; - } + arg_rest_dup(args); + rb_ary_pop(args->rest); + given_argc--; + kw_flag &= ~VM_CALL_KW_SPLAT; } - else if (!remove_empty_keyword_hash && rest_last) { + else if (iseq->body->param.flags.ruby2_keywords && rest_last) { flag_keyword_hash = rest_last; } else if (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) { @@ -557,16 +544,11 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co if (kw_flag & VM_CALL_KW_SPLAT) { VALUE last_arg = args->argv[args->argc-1]; if (ignore_keyword_hash_p(last_arg, iseq)) { - if (remove_empty_keyword_hash) { - args->argc--; - given_argc--; - kw_flag &= ~VM_CALL_KW_SPLAT; - } - else { - flag_keyword_hash = last_arg; - } + args->argc--; + given_argc--; + kw_flag &= ~VM_CALL_KW_SPLAT; } - else if (!remove_empty_keyword_hash) { + else if (iseq->body->param.flags.ruby2_keywords) { flag_keyword_hash = last_arg; } else if (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) { From 6b86549df8f6d48eeab3c7b48b3fd9ee02f744ba Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 24 Jan 2020 09:46:34 +0900 Subject: [PATCH 477/878] [DOC] fixed line numbers [ci skip] Fix up the example of const_source_location at 2bde7919a0a8302c344e9bb9ddc217958fcbd3c7. --- object.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/object.c b/object.c index 8acb80c35e51d4..e15b17fa003028 100644 --- a/object.c +++ b/object.c @@ -2771,16 +2771,16 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) * by default). * * # test.rb: - * class A + * class A # line 1 * C1 = 1 * C2 = 2 * end * - * module M + * module M # line 6 * C3 = 3 * end * - * class B < A + * class B < A # line 10 * include M * C4 = 4 * end @@ -2789,15 +2789,15 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) * C2 = 8 # constant redefinition; warned yet allowed * end * - * p B.const_source_location('C4') # => ["test.rb", 11] - * p B.const_source_location('C3') # => ["test.rb", 6] + * p B.const_source_location('C4') # => ["test.rb", 12] + * p B.const_source_location('C3') # => ["test.rb", 7] * p B.const_source_location('C1') # => ["test.rb", 2] * * p B.const_source_location('C3', false) # => nil -- don't lookup in ancestors * * p A.const_source_location('C2') # => ["test.rb", 16] -- actual (last) definition place * - * p Object.const_source_location('B') # => ["test.rb", 9] -- top-level constant could be looked through Object + * p Object.const_source_location('B') # => ["test.rb", 10] -- top-level constant could be looked through Object * p Object.const_source_location('A') # => ["test.rb", 1] -- class reopening is NOT considered new definition * * p B.const_source_location('A') # => ["test.rb", 1] -- because Object is in ancestors From db82c680cdc1cf282e5792ca682ed719ae5879db Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Fri, 24 Jan 2020 10:29:33 +0900 Subject: [PATCH 478/878] doc/make-cheetsheet.md: Added --- doc/make-cheetsheet.md | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 doc/make-cheetsheet.md diff --git a/doc/make-cheetsheet.md b/doc/make-cheetsheet.md new file mode 100644 index 00000000000000..5b085369176d7f --- /dev/null +++ b/doc/make-cheetsheet.md @@ -0,0 +1,89 @@ +# How to use "configure" and "make" commands for Ruby + +This is for developers of Ruby. +If you are a user of Ruby, please see README.md. + +## In-place build + +``` +$ autoconf +$ ./configure --prefix=$PWD/local +$ make +$ make install +$ ./local/bin/ruby -e 'puts "Hello"' +Hello +``` + +## Out-of-place build + +``` +$ autoconf +$ mkdir ../ruby-build +$ cd ../ruby-build +$ ../ruby-src/configure --prefix=$PWD/local +$ make +$ make install +$ ./local/bin/ruby -e 'puts "Hello"' +Hello +``` + +## How to run the whole test suite + +``` +$ make check +``` + +It runs (about) three test suites: + +* `make test` (a test suite for the interpreter core) +* `make test-all` : (for all builtin classes and libraries) +* `make test-spec` : (a conformance test suite for Ruby implementations) + +## How to run the test suite with log + +``` +$ make test OPTS=-v + +$ make test-all TESTS=-v + +$ make test-spec MSPECOPT=-Vfs +``` + +## How to run a part of the test suite + +``` +# Runs a directory +$ make test-all TESTS=test/rubygems +$ make test-all TESTS=rubygems + +# Runs a file +$ make test-all TESTS=test/ruby/test_foo.rb +$ make test-all TESTS=ruby/foo + +# Runs a test whose name includes test_bar +$ make test-all TESTS="test/ruby/test_foo.rb -n /test_bar/" +``` + +## How to measure coverage of C and Ruby code + +You need to be able to use gcc (gcov) and lcov visualizer. + +``` +$ autoconf +$ ./configure --enable-gcov +$ make +$ make update-coverage +$ rm -f test-coverage.dat +$ make test-all COVERAGE=true +$ make lcov +$ open lcov-out/index.html +``` + +If you need only C code coverage, you can remove `COVERAGE=true` from the above process. +You can also use `gcov` command directly to get per-file coverage. + +If you need only Ruby code coverage, you can remove `--enable-gcov`. +Note that `test-coverage.dat` accumlates all runs of `make test-all`. +Make sure that you remove the file if you want to measure one test run. + +You can see the coverage result of CI: https://rubyci.org/coverage From 3b9f36d6c6a4e02bf6c9bc99e953d5e558ee2fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 23 Jan 2020 11:59:37 +0900 Subject: [PATCH 479/878] pass appropriate libc path The same as https://github.com/ruby/ruby/pull/2686, but for musl libc. Musl is not named as libc.so.6 so the `ldd` hack implemented some lines below does not work. --- test/fiddle/helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index 57ded4951f6ce2..348131e4480f38 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -17,6 +17,10 @@ end libc_so = File.join(libdir, "libc.so") libm_so = File.join(libdir, "libm.so") +when /linux-musl/ + Dir.glob('/lib/ld-musl-*.so.1') do |ld| + libc_so = libm_so = ld + end when /linux/ libdir = '/lib' case RbConfig::SIZEOF['void*'] From 50925b64099df2021f7cdf652f7e807808cb1482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 23 Jan 2020 12:14:19 +0900 Subject: [PATCH 480/878] reroute musl unistd.h weirdness Musl is (of course) not glibc. Its confstr(3) does not understand _CS_GNU_LIBC_VERSION. That's fair. Problem is, its unistd.h has that constant defined for unknown reason. We cannot blindly say the libc is glibc by looking at it. Instead we have to kick it, then see if it quacks like a duck. See https://git.musl-libc.org/cgit/musl/tree/include/unistd.h --- test/ruby/test_m17n_comb.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index cfb8bff882d45d..49141790f0c008 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -751,8 +751,14 @@ def crypt_supports_des_crypt? # glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312 # we use this check to test strict and non-strict behavior separately #11045 strict_crypt = if defined? Etc::CS_GNU_LIBC_VERSION - glibcver = Etc.confstr(Etc::CS_GNU_LIBC_VERSION).scan(/\d+/).map(&:to_i) - (glibcver <=> [2, 16]) >= 0 + begin + confstr = Etc.confstr(Etc::CS_GNU_LIBC_VERSION) + rescue Errno::EINVAL + false + else + glibcver = confstr.scan(/\d+/).map(&:to_i) + (glibcver <=> [2, 16]) >= 0 + end end def test_str_crypt From a19228f878d955eaf2cce086bcf53f46fdf894b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 23 Jan 2020 15:33:42 +0900 Subject: [PATCH 481/878] brace the fact that lchmod(2) can EOPNOTSUPP Musl libc has this function as a tiny wrapper of fchmodat(3posix). On the other hand Linux kernel does not support changing modes of a symlink. The operation always fails with EOPNOTSUPP. This fchmodat behaviour is defined in POSIX. We have to take care of such exceptions. --- lib/fileutils.rb | 3 ++- test/pathname/test_pathname.rb | 2 +- test/ruby/test_notimp.rb | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/fileutils.rb b/lib/fileutils.rb index a7ad65ae5e988c..04788e26ca9c55 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1345,6 +1345,7 @@ def chmod(mode) else File.chmod mode, path() end + rescue Errno::EOPNOTSUPP end def chown(uid, gid) @@ -1439,7 +1440,7 @@ def copy_metadata(path) if st.symlink? begin File.lchmod mode, path - rescue NotImplementedError + rescue NotImplementedError, Errno::EOPNOTSUPP end else File.chmod mode, path diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index 792510bdfb2d31..2ce32a6c120821 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -818,7 +818,7 @@ def test_lchmod old = path.lstat.mode begin path.lchmod(0444) - rescue NotImplementedError + rescue NotImplementedError, Errno::EOPNOTSUPP next end assert_equal(0444, path.lstat.mode & 0777) diff --git a/test/ruby/test_notimp.rb b/test/ruby/test_notimp.rb index b069154cfc3fb0..e13db692b50ddc 100644 --- a/test/ruby/test_notimp.rb +++ b/test/ruby/test_notimp.rb @@ -13,11 +13,11 @@ def test_respond_to_fork def test_respond_to_lchmod assert_include(File.methods, :lchmod) - if /linux/ =~ RUBY_PLATFORM - assert_equal(false, File.respond_to?(:lchmod)) - end - if /freebsd/ =~ RUBY_PLATFORM + case RUBY_PLATFORM + when /freebsd/, /linux-musl/ assert_equal(true, File.respond_to?(:lchmod)) + when /linux/ + assert_equal(false, File.respond_to?(:lchmod)) end end @@ -57,9 +57,14 @@ def test_call_lchmod File.open(f, "w") {} File.symlink f, g newmode = 0444 - File.lchmod newmode, "#{d}/g" - snew = File.lstat(g) - assert_equal(newmode, snew.mode & 0777) + begin + File.lchmod newmode, "#{d}/g" + rescue Errno::EOPNOTSUPP + skip $! + else + snew = File.lstat(g) + assert_equal(newmode, snew.mode & 0777) + end } end end From 80bbc7f402ee641c06840e06ecc7184648ca8c2a Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 24 Jan 2020 15:16:13 +0900 Subject: [PATCH 482/878] Add #verify_hostname= and #verify_hostname to skip hostname verification [Feature #16555] https://github.com/ruby/ruby/pull/2858 --- NEWS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.md b/NEWS.md index 51d9dc7cade398..f6bd2a4bb22c1a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -32,6 +32,13 @@ sufficient information, see the ChangeLog file or Redmine ## Stdlib updates (outstanding ones only) +* Net::HTTP + + * New method + + * Add #verify_hostname= and #verify_hostname to skip hostname verification + [[Feature #16555]] + ## Compatibility issues (excluding feature bug fixes) * Regexp literals are frozen [[Feature #8948]] [[Feature #16377]] From 5bb1c81a3373c9044525fb6c9273d5762c8b8ab8 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Thu, 23 Jan 2020 22:23:23 -0600 Subject: [PATCH 483/878] rename make-cheetsheet.md [ci skip] --- doc/{make-cheetsheet.md => make_cheatsheet.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{make-cheetsheet.md => make_cheatsheet.md} (100%) diff --git a/doc/make-cheetsheet.md b/doc/make_cheatsheet.md similarity index 100% rename from doc/make-cheetsheet.md rename to doc/make_cheatsheet.md From 9af7d048b6e2f5221dfb7bb757fd6cb5d5757124 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 24 Jan 2020 15:59:45 +0900 Subject: [PATCH 484/878] Fix a typo [ci skip] --- doc/make_cheatsheet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/make_cheatsheet.md b/doc/make_cheatsheet.md index 5b085369176d7f..29648e8174eff2 100644 --- a/doc/make_cheatsheet.md +++ b/doc/make_cheatsheet.md @@ -83,7 +83,7 @@ If you need only C code coverage, you can remove `COVERAGE=true` from the above You can also use `gcov` command directly to get per-file coverage. If you need only Ruby code coverage, you can remove `--enable-gcov`. -Note that `test-coverage.dat` accumlates all runs of `make test-all`. +Note that `test-coverage.dat` accumulates all runs of `make test-all`. Make sure that you remove the file if you want to measure one test run. You can see the coverage result of CI: https://rubyci.org/coverage From c1d8829ef515ee51fadeadd7dd022b5c47a71cdd Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 24 Jan 2020 12:13:41 -0800 Subject: [PATCH 485/878] Do not autosplat when calling proc with empty keyword splat With the removal of the splatted argument when using an empty keyword splat, the autosplat code considered an empty keyword splat the same as no argument at all. However, that results in autosplat behavior changing dependent on the content of the splatted hash, which is not what anyone would expect or want. This change always skips an autosplat if keywords were provided. Fixes [Bug #16560] --- test/ruby/test_proc.rb | 20 ++++++++++++++++++++ vm_args.c | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index af4cf11623c444..4177707ddd85b6 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1087,6 +1087,26 @@ def test_proc_args_pos_unleashed assert_equal([1,2,[3],4,5], r, "[ruby-core:19485]") end + def test_proc_autosplat + def self.a(arg, kw) + yield arg + yield arg, **kw + yield arg, kw + end + + arr = [] + a([1,2,3], {}) do |arg1, arg2=0| + arr << [arg1, arg2] + end + assert_equal([[1, 2], [[1, 2, 3], 0], [[1, 2, 3], {}]], arr) + + arr = [] + a([1,2,3], a: 1) do |arg1, arg2=0| + arr << [arg1, arg2] + end + assert_equal([[1, 2], [[1, 2, 3], {a: 1}], [[1, 2, 3], {a: 1}]], arr) + end + def test_proc_single_arg_with_keywords_accepted_and_yielded def self.a yield [], **{a: 1} diff --git a/vm_args.c b/vm_args.c index 256ab5b7f4d8bf..13d4e4a5450451 100644 --- a/vm_args.c +++ b/vm_args.c @@ -445,9 +445,9 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co { const int min_argc = iseq->body->param.lead_num + iseq->body->param.post_num; const int max_argc = (iseq->body->param.flags.has_rest == FALSE) ? min_argc + iseq->body->param.opt_num : UNLIMITED_ARGUMENTS; - int opt_pc = 0; int given_argc; unsigned int kw_flag = ci->flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT); + int opt_pc = 0, allow_autosplat = !kw_flag; struct args_info args_body, *args; VALUE keyword_hash = Qnil; VALUE * const orig_sp = ec->cfp->sp; @@ -573,6 +573,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co break; /* do nothing special */ case arg_setup_block: if (given_argc == (keyword_hash == Qnil ? 1 : 2) && + allow_autosplat && (min_argc > 0 || iseq->body->param.opt_num > 1 || iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) && !iseq->body->param.flags.ambiguous_param0 && From 92a30acbfb0813dcf551f907791bf82954a17475 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 25 Jan 2020 06:04:34 +0900 Subject: [PATCH 486/878] * 2020-01-25 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 5b6d98e4f7a184..146ceeeeda14ae 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" From 2b2821acd39530c6c786e34f304e9e018a31e5c4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 20 Jan 2020 00:29:40 +0900 Subject: [PATCH 487/878] Recheck elements type after `to_str` conversion https://hackerone.com/reports/244786 --- array.c | 6 ++++-- test/ruby/test_array.rb | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/array.c b/array.c index 16321e186d838e..0af73715de6f81 100644 --- a/array.c +++ b/array.c @@ -2286,7 +2286,7 @@ recursive_join(VALUE obj, VALUE argp, int recur) return Qnil; } -static void +static long ary_join_0(VALUE ary, VALUE sep, long max, VALUE result) { long i; @@ -2295,10 +2295,12 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result) if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0)); for (i=0; i 0 && !NIL_P(sep)) rb_str_buf_append(result, sep); rb_str_buf_append(result, val); } + return i; } static void @@ -2374,7 +2376,7 @@ rb_ary_join(VALUE ary, VALUE sep) int first; result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10); rb_enc_associate(result, rb_usascii_encoding()); - ary_join_0(ary, sep, i, result); + i = ary_join_0(ary, sep, i, result); first = i == 0; ary_join_1(ary, ary, sep, i, result, &first); return result; diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 476cf795f00eb1..c3b842e9507f57 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2447,6 +2447,16 @@ def (a = Object.new).to_ary assert_equal("12345", [1,[2,[3,4],5]].join) end + def test_join_recheck_elements_type + x = Struct.new(:ary).new + def x.to_str + ary[2] = [0, 1, 2] + "z" + end + (x.ary = ["a", "b", "c", x]) + assert_equal("ab012z", x.ary.join("")) + end + def test_to_a2 klass = Class.new(Array) a = klass.new.to_a From 0c436bbfbf3b28fab8abfcbda9b8f388fa22290a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 20 Jan 2020 00:41:56 +0900 Subject: [PATCH 488/878] Recheck array length after `to_str` conversion https://hackerone.com/reports/244787 --- array.c | 4 +++- test/ruby/test_array.rb | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/array.c b/array.c index 0af73715de6f81..7925b26e075949 100644 --- a/array.c +++ b/array.c @@ -2374,7 +2374,9 @@ rb_ary_join(VALUE ary, VALUE sep) if (NIL_P(tmp) || tmp != val) { int first; - result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10); + long n = RARRAY_LEN(ary); + if (i > n) i = n; + result = rb_str_buf_new(len + (n-i)*10); rb_enc_associate(result, rb_usascii_encoding()); i = ary_join_0(ary, sep, i, result); first = i == 0; diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index c3b842e9507f57..fcfda92487567a 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2457,6 +2457,17 @@ def x.to_str assert_equal("ab012z", x.ary.join("")) end + def test_join_recheck_array_length + x = Struct.new(:ary).new + def x.to_str + ary.clear + ary[0] = "b" + "z" + end + x.ary = Array.new(1023) {"a"*1} << x + assert_equal("b", x.ary.join("")) + end + def test_to_a2 klass = Class.new(Array) a = klass.new.to_a From b4711a0fa0d0a8d9a01ac4f9ac1051f192b93cf2 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 25 Jan 2020 14:14:05 +0900 Subject: [PATCH 489/878] test/rinda/test_rinda.rb: Increase the timeout Attempts to fix a occational failure on Solaris with sunc https://rubyci.org/logs/rubyci.s3.amazonaws.com/solaris11-sunc/ruby-master/log/20200124T160008Z.fail.html.gz ``` 1) Error: Rinda::TestRingServer#test_do_reply: Timeout::Error: timeout ``` --- test/rinda/test_rinda.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 22966532b7b42a..615bba6623ba49 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -638,7 +638,7 @@ def teardown end def test_do_reply - with_timeout(10) {_test_do_reply} + with_timeout(30) {_test_do_reply} end def _test_do_reply @@ -654,14 +654,14 @@ def _test_do_reply @rs.do_reply - wait_for(10) {called} + wait_for(30) {called} assert_same @ts, called end def test_do_reply_local skip 'timeout-based test becomes unstable with --jit-wait' if RubyVM::MJIT.enabled? - with_timeout(10) {_test_do_reply_local} + with_timeout(30) {_test_do_reply_local} end def _test_do_reply_local @@ -675,7 +675,7 @@ def _test_do_reply_local @rs.do_reply - wait_for(10) {called} + wait_for(30) {called} assert_same @ts, called end From 4396ced07dca5599c022a7e86e8f046915982087 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 25 Jan 2020 19:48:10 +0900 Subject: [PATCH 490/878] spec/ruby/core/process/times_spec.rb: add an output code for debugging --- spec/ruby/core/process/times_spec.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/ruby/core/process/times_spec.rb b/spec/ruby/core/process/times_spec.rb index 35a7f5b34c003f..28896a96ff6e10 100644 --- a/spec/ruby/core/process/times_spec.rb +++ b/spec/ruby/core/process/times_spec.rb @@ -23,7 +23,14 @@ times = 1000.times.map { Process.times } times.count { |t| !('%.6f' % t.utime).end_with?('000') }.should > 0 - times.count { |t| !('%.6f' % t.stime).end_with?('000') }.should > 0 + n = times.count { |t| !('%.6f' % t.stime).end_with?('000') } + if n == 0 + # temporal debugging code for FreeBSD: https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd11zfs/ruby-master/log/20200125T093004Z.fail.html.gz + puts "DEBUG OUTPUT" + p(*times) + puts "DEBUG OUTPUT END" + end + n.should > 0 end end end From da2d6ca8f180a1d88f08fa09812ab3b333cc5c9d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 26 Jan 2020 07:37:50 +0900 Subject: [PATCH 491/878] Show the repository name before update task --- tool/sync_default_gems.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 03db90eb45c911..c065b9c4688a1f 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -374,8 +374,11 @@ def sync_lib(repo) end def update_default_gems(gem) + author, repository = $repositories[gem.to_sym].split('/') + puts "Update #{author}/#{repository}" + unless File.exist?("../../#{author}/#{repository}") mkdir_p("../../#{author}") `git clone git@github.com:#{author}/#{repository}.git ../../#{author}/#{repository}` From aacd918340e20e4556a6369c3f5933226b0bb093 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 26 Jan 2020 07:40:56 +0900 Subject: [PATCH 492/878] Do not use `git pull` because origin/master was already fetched. --- tool/sync_default_gems.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index c065b9c4688a1f..07deee6c644fd8 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -391,12 +391,11 @@ def update_default_gems(gem) `git co ruby-core/master` `git branch ruby-core` end - `git co ruby-core` `git fetch ruby-core master --no-tags` + `git co ruby-core` `git rebase ruby-core/master` `git co master` - `git stash` - `git pull --rebase` + `git rebase origin/master` end end From af64d3bc6ead0778e8265fec4b0aea4d487b7b9c Mon Sep 17 00:00:00 2001 From: git Date: Sun, 26 Jan 2020 07:42:09 +0900 Subject: [PATCH 493/878] * 2020-01-26 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 146ceeeeda14ae..088a1a8af0ac5b 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" From 8f4beec15291b1fae80be42685c61a6e5f9ce369 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sat, 25 Jan 2020 23:50:10 +0900 Subject: [PATCH 494/878] Always refer to Reline::IOGate.encoding --- lib/reline.rb | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/reline.rb b/lib/reline.rb index ee4d1c4180d06e..bcb3af58bf780a 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -38,49 +38,51 @@ class Core attr_accessor :ambiguous_width attr_accessor :last_incremental_search attr_reader :output - attr_reader :encoding - def initialize(encoding) - @encoding = encoding + def initialize self.output = STDOUT yield self @completion_quote_character = nil end + def encoding + Reline::IOGate.encoding + end + def completion_append_character=(val) if val.nil? @completion_append_character = nil elsif val.size == 1 - @completion_append_character = val.encode(@encoding) + @completion_append_character = val.encode(Reline::IOGate.encoding) elsif val.size > 1 - @completion_append_character = val[0].encode(@encoding) + @completion_append_character = val[0].encode(Reline::IOGate.encoding) else @completion_append_character = nil end end def basic_word_break_characters=(v) - @basic_word_break_characters = v.encode(@encoding) + @basic_word_break_characters = v.encode(Reline::IOGate.encoding) end def completer_word_break_characters=(v) - @completer_word_break_characters = v.encode(@encoding) + @completer_word_break_characters = v.encode(Reline::IOGate.encoding) end def basic_quote_characters=(v) - @basic_quote_characters = v.encode(@encoding) + @basic_quote_characters = v.encode(Reline::IOGate.encoding) end def completer_quote_characters=(v) - @completer_quote_characters = v.encode(@encoding) + @completer_quote_characters = v.encode(Reline::IOGate.encoding) end def filename_quote_characters=(v) - @filename_quote_characters = v.encode(@encoding) + @filename_quote_characters = v.encode(Reline::IOGate.encoding) end def special_prefixes=(v) - @special_prefixes = v.encode(@encoding) + @special_prefixes = v.encode(Reline::IOGate.encoding) end def completion_case_fold=(v) @@ -203,7 +205,7 @@ def readline(prompt = '', add_hist = false) otio = Reline::IOGate.prep may_req_ambiguous_char_width - line_editor.reset(prompt, encoding: @encoding) + line_editor.reset(prompt, encoding: Reline::IOGate.encoding) if multiline line_editor.multiline_on if block_given? @@ -394,7 +396,7 @@ def self.encoding_system_needs end def self.core - @core ||= Core.new(Reline::IOGate.encoding) { |core| + @core ||= Core.new { |core| core.config = Reline::Config.new core.key_stroke = Reline::KeyStroke.new(core.config) core.line_editor = Reline::LineEditor.new(core.config, Reline::IOGate.encoding) From c257d811862b9e29ccff4305d836077835091112 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 26 Jan 2020 12:55:13 +0900 Subject: [PATCH 495/878] Always use UTF-8 for Reline::GeneralIO on Windows --- lib/reline/general_io.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb index 6281d5fbf67a22..08b9d9c3aecb4f 100644 --- a/lib/reline/general_io.rb +++ b/lib/reline/general_io.rb @@ -2,7 +2,7 @@ class Reline::GeneralIO def self.encoding - Encoding.default_external + RUBY_PLATFORM =~ /mswin|mingw/ ? Encoding::UTF_8 : Encoding::default_external end RAW_KEYSTROKE_CONFIG = {} From 0aa5195262d4193d3accf3e6b9bad236238b816b Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 26 Jan 2020 12:58:25 +0900 Subject: [PATCH 496/878] Use test_mode on Reline::History::Test for encoding --- test/reline/test_history.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/reline/test_history.rb b/test/reline/test_history.rb index 13d3d2f90b17fe..189f2db86d583e 100644 --- a/test/reline/test_history.rb +++ b/test/reline/test_history.rb @@ -2,6 +2,10 @@ require "reline/history" class Reline::History::Test < Reline::TestCase + def setup + Reline.send(:test_mode) + end + def test_ancestors assert_equal(Reline::History.ancestors.include?(Array), true) end From 29eb1b16028928139dcaa236beb6d351c85f434c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 26 Jan 2020 18:27:40 +0900 Subject: [PATCH 497/878] Moved Array#shuffle and Array#shuffle! to rbinc --- array.c | 56 +++------------------------- array.rb | 36 ++++++++++++++++++ common.mk | 3 ++ inits.c | 1 + spec/ruby/core/array/shuffle_spec.rb | 11 ++++-- 5 files changed, 53 insertions(+), 54 deletions(-) create mode 100755 array.rb diff --git a/array.c b/array.c index 7925b26e075949..42248dbafdb8a7 100644 --- a/array.c +++ b/array.c @@ -29,6 +29,7 @@ #include "ruby/st.h" #include "ruby/util.h" #include "transient_heap.h" +#include "builtin.h" #if !ARRAY_DEBUG # define NDEBUG @@ -5342,39 +5343,11 @@ static ID id_random; #define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1) -/* - * call-seq: - * ary.shuffle! -> ary - * ary.shuffle!(random: rng) -> ary - * - * Shuffles elements in +self+ in place. - * - * a = [ 1, 2, 3 ] #=> [1, 2, 3] - * a.shuffle! #=> [2, 3, 1] - * a #=> [2, 3, 1] - * - * The optional +rng+ argument will be used as the random number generator. - * - * a.shuffle!(random: Random.new(1)) #=> [1, 3, 2] - */ - static VALUE -rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary) +rb_ary_shuffle_bang(rb_execution_context_t *ec, VALUE ary, VALUE randgen) { - VALUE opts, randgen = rb_cRandom; long i, len; - if (OPTHASH_GIVEN_P(opts)) { - VALUE rnd; - ID keyword_ids[1]; - - keyword_ids[0] = id_random; - rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd); - if (rnd != Qundef) { - randgen = rnd; - } - } - rb_check_arity(argc, 0, 0); rb_ary_modify(ary); i = len = RARRAY_LEN(ary); RARRAY_PTR_USE(ary, ptr, { @@ -5392,28 +5365,11 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary) return ary; } - -/* - * call-seq: - * ary.shuffle -> new_ary - * ary.shuffle(random: rng) -> new_ary - * - * Returns a new array with elements of +self+ shuffled. - * - * a = [ 1, 2, 3 ] #=> [1, 2, 3] - * a.shuffle #=> [2, 3, 1] - * a #=> [1, 2, 3] - * - * The optional +rng+ argument will be used as the random number generator. - * - * a.shuffle(random: Random.new(1)) #=> [1, 3, 2] - */ - static VALUE -rb_ary_shuffle(int argc, VALUE *argv, VALUE ary) +rb_ary_shuffle(rb_execution_context_t *ec, VALUE ary, VALUE randgen) { ary = rb_ary_dup(ary); - rb_ary_shuffle_bang(argc, argv, ary); + rb_ary_shuffle_bang(ec, ary, randgen); return ary; } @@ -7047,8 +7003,6 @@ Init_Array(void) rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1); rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1); rb_define_method(rb_cArray, "count", rb_ary_count, -1); - rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, -1); - rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, -1); rb_define_method(rb_cArray, "sample", rb_ary_sample, -1); rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1); rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1); @@ -7074,3 +7028,5 @@ Init_Array(void) id_random = rb_intern("random"); } + +#include "array.rbinc" diff --git a/array.rb b/array.rb new file mode 100755 index 00000000000000..ed5779290f08ca --- /dev/null +++ b/array.rb @@ -0,0 +1,36 @@ +#!/usr/bin/ruby +class Array + # call-seq: + # ary.shuffle! -> ary + # ary.shuffle!(random: rng) -> ary + # + # Shuffles elements in +self+ in place. + # + # a = [ 1, 2, 3 ] #=> [1, 2, 3] + # a.shuffle! #=> [2, 3, 1] + # a #=> [2, 3, 1] + # + # The optional +rng+ argument will be used as the random number generator. + # + # a.shuffle!(random: Random.new(1)) #=> [1, 3, 2] + def shuffle!(random: Random) + __builtin_rb_ary_shuffle_bang(random) + end + + # call-seq: + # ary.shuffle -> new_ary + # ary.shuffle(random: rng) -> new_ary + # + # Returns a new array with elements of +self+ shuffled. + # + # a = [ 1, 2, 3 ] #=> [1, 2, 3] + # a.shuffle #=> [2, 3, 1] + # a #=> [1, 2, 3] + # + # The optional +rng+ argument will be used as the random number generator. + # + # a.shuffle(random: Random.new(1)) #=> [1, 3, 2] + def shuffle(random: Random) + __builtin_rb_ary_shuffle(random); + end +end diff --git a/common.mk b/common.mk index b685e8fa4caee6..f9bef01cf37c2b 100644 --- a/common.mk +++ b/common.mk @@ -1001,6 +1001,7 @@ BUILTIN_RB_SRCS = \ $(srcdir)/pack.rb \ $(srcdir)/trace_point.rb \ $(srcdir)/warning.rb \ + $(srcdir)/array.rb \ $(srcdir)/prelude.rb \ $(srcdir)/gem_prelude.rb \ $(empty) @@ -1601,7 +1602,9 @@ array.$(OBJEXT): $(top_srcdir)/internal/stdbool.h array.$(OBJEXT): $(top_srcdir)/internal/vm.h array.$(OBJEXT): $(top_srcdir)/internal/warnings.h array.$(OBJEXT): {$(VPATH)}array.c +array.$(OBJEXT): {$(VPATH)}array.rbinc array.$(OBJEXT): {$(VPATH)}assert.h +array.$(OBJEXT): {$(VPATH)}builtin.h array.$(OBJEXT): {$(VPATH)}config.h array.$(OBJEXT): {$(VPATH)}debug_counter.h array.$(OBJEXT): {$(VPATH)}defines.h diff --git a/inits.c b/inits.c index 91c916deece06e..39cbe5f8ba421d 100644 --- a/inits.c +++ b/inits.c @@ -83,6 +83,7 @@ rb_call_inits(void) BUILTIN(trace_point); BUILTIN(pack); BUILTIN(warning); + BUILTIN(array); Init_builtin_prelude(); } #undef CALL diff --git a/spec/ruby/core/array/shuffle_spec.rb b/spec/ruby/core/array/shuffle_spec.rb index 7a2fed7d50a23e..106ef05ce272bd 100644 --- a/spec/ruby/core/array/shuffle_spec.rb +++ b/spec/ruby/core/array/shuffle_spec.rb @@ -25,10 +25,13 @@ ArraySpecs::MyArray[1, 2, 3].shuffle.should be_an_instance_of(Array) end - it "attempts coercion via #to_hash" do - obj = mock('hash') - obj.should_receive(:to_hash).once.and_return({}) - [2, 3].shuffle(obj) + ruby_version_is ""..."2.8" do + # keyword argument since 2.8 + it "attempts coercion via #to_hash" do + obj = mock('hash') + obj.should_receive(:to_hash).once.and_return({}) + [2, 3].shuffle(obj) + end end it "calls #rand on the Object passed by the :random key in the arguments Hash" do From d4e1d4e94e866d498ead1f370236df216917a6c7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 26 Jan 2020 18:34:18 +0900 Subject: [PATCH 498/878] Moved Array#sample to rbinc --- array.c | 53 ++--------------------------- array.rb | 27 +++++++++++++++ spec/ruby/core/array/sample_spec.rb | 29 +++++++++------- 3 files changed, 46 insertions(+), 63 deletions(-) diff --git a/array.c b/array.c index 42248dbafdb8a7..c1f8071a218585 100644 --- a/array.c +++ b/array.c @@ -5337,10 +5337,6 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary) return result; } -#define OPTHASH_GIVEN_P(opts) \ - (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1)) -static ID id_random; - #define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1) static VALUE @@ -5373,55 +5369,16 @@ rb_ary_shuffle(rb_execution_context_t *ec, VALUE ary, VALUE randgen) return ary; } - -/* - * call-seq: - * ary.sample -> obj - * ary.sample(random: rng) -> obj - * ary.sample(n) -> new_ary - * ary.sample(n, random: rng) -> new_ary - * - * Choose a random element or +n+ random elements from the array. - * - * The elements are chosen by using random and unique indices into the array - * in order to ensure that an element doesn't repeat itself unless the array - * already contained duplicate elements. - * - * If the array is empty the first form returns +nil+ and the second form - * returns an empty array. - * - * a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] - * a.sample #=> 7 - * a.sample(4) #=> [6, 4, 2, 5] - * - * The optional +rng+ argument will be used as the random number generator. - * - * a.sample(random: Random.new(1)) #=> 6 - * a.sample(4, random: Random.new(1)) #=> [6, 10, 9, 2] - */ - - static VALUE -rb_ary_sample(int argc, VALUE *argv, VALUE ary) +rb_ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE to_array) { - VALUE nv, result; - VALUE opts, randgen = rb_cRandom; + VALUE result; long n, len, i, j, k, idx[10]; long rnds[numberof(idx)]; long memo_threshold; - if (OPTHASH_GIVEN_P(opts)) { - VALUE rnd; - ID keyword_ids[1]; - - keyword_ids[0] = id_random; - rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd); - if (rnd != Qundef) { - randgen = rnd; - } - } len = RARRAY_LEN(ary); - if (rb_check_arity(argc, 0, 1) == 0) { + if (!to_array) { if (len < 2) i = 0; else @@ -5429,7 +5386,6 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) return rb_ary_elt(ary, i); } - nv = argv[0]; n = NUM2LONG(nv); if (n < 0) rb_raise(rb_eArgError, "negative sample number"); if (n > len) n = len; @@ -7003,7 +6959,6 @@ Init_Array(void) rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1); rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1); rb_define_method(rb_cArray, "count", rb_ary_count, -1); - rb_define_method(rb_cArray, "sample", rb_ary_sample, -1); rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1); rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1); rb_define_method(rb_cArray, "combination", rb_ary_combination, 1); @@ -7025,8 +6980,6 @@ Init_Array(void) rb_define_method(rb_cArray, "sum", rb_ary_sum, -1); rb_define_method(rb_cArray, "deconstruct", rb_ary_deconstruct, 0); - - id_random = rb_intern("random"); } #include "array.rbinc" diff --git a/array.rb b/array.rb index ed5779290f08ca..25da88cde8410d 100755 --- a/array.rb +++ b/array.rb @@ -33,4 +33,31 @@ def shuffle!(random: Random) def shuffle(random: Random) __builtin_rb_ary_shuffle(random); end + + # call-seq: + # ary.sample -> obj + # ary.sample(random: rng) -> obj + # ary.sample(n) -> new_ary + # ary.sample(n, random: rng) -> new_ary + # + # Choose a random element or +n+ random elements from the array. + # + # The elements are chosen by using random and unique indices into the array + # in order to ensure that an element doesn't repeat itself unless the array + # already contained duplicate elements. + # + # If the array is empty the first form returns +nil+ and the second form + # returns an empty array. + # + # a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] + # a.sample #=> 7 + # a.sample(4) #=> [6, 4, 2, 5] + # + # The optional +rng+ argument will be used as the random number generator. + # + # a.sample(random: Random.new(1)) #=> 6 + # a.sample(4, random: Random.new(1)) #=> [6, 10, 9, 2] + def sample(n = (ary = false), random: Random) + __builtin_rb_ary_sample(random, n, ary) + end end diff --git a/spec/ruby/core/array/sample_spec.rb b/spec/ruby/core/array/sample_spec.rb index 44be91ba182f5e..87f81999f48e3d 100644 --- a/spec/ruby/core/array/sample_spec.rb +++ b/spec/ruby/core/array/sample_spec.rb @@ -65,21 +65,24 @@ end describe "with options" do - it "calls #to_hash to convert the passed Object" do - obj = mock("array_sample") - obj.should_receive(:to_hash).and_return({}) - obj.should_not_receive(:to_int) - - [1, 2].sample(obj).should be_an_instance_of(Fixnum) - end + ruby_version_is ""..."2.8" do + # keyword argument since 2.8 + it "calls #to_hash to convert the passed Object" do + obj = mock("array_sample") + obj.should_receive(:to_hash).and_return({}) + obj.should_not_receive(:to_int) + + [1, 2].sample(obj).should be_an_instance_of(Fixnum) + end - it "calls #to_int on the first argument and #to_hash on the second when passed Objects" do - count = mock("array_sample_count") - count.should_receive(:to_int).and_return(2) - options = mock("array_sample_options") - options.should_receive(:to_hash).and_return({}) + it "calls #to_int on the first argument and #to_hash on the second when passed Objects" do + count = mock("array_sample_count") + count.should_receive(:to_int).and_return(2) + options = mock("array_sample_options") + options.should_receive(:to_hash).and_return({}) - [1, 2].sample(count, options).size.should == 2 + [1, 2].sample(count, options).size.should == 2 + end end it "calls #rand on the Object passed by the :random key in the arguments Hash" do From 838fa941f157537ebaa98150fab7664bf602f356 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 26 Jan 2020 19:52:16 +0900 Subject: [PATCH 499/878] Add more debug print https://rubyci.org/logs/rubyci.s3.amazonaws.com/unstable11x/ruby-master/log/20200125T032406Z.fail.html.gz ``` IMAPTest#test_connection_closed_without_greeting [/export/home/rubyci/chkbuild-tmp/tmp/build/20200125T032406Z/ruby/test/net/imap/test_imap.rb:485]: [Net::IMAP::Error] exception expected, not #"#", :sock_addr=>["AF_INET6", 48515, "::1", "::1"], :sock_peeraddr=>["AF_INET6", 35223, "::1", "::1"], :e=>#, :server=>#, :port=>48515, :server_addr=>"::1"}>. ``` --- test/net/imap/test_imap.rb | 58 ++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index 33b305e1165912..03692c233ac522 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -472,25 +472,65 @@ def test_connection_closed_during_idle def test_connection_closed_without_greeting server = create_tcp_server port = server.addr[1] - h = {'server before close': server.inspect} # inspect info before close + h = { + server: server, + port: port, + server_created: { + server: server.inspect, + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } + } + net_imap = Class.new(Net::IMAP) do + @@h = h + def tcp_socket(host, port) + @@h[:in_tcp_socket] = { + host: host, + port: port, + server: @@h[:server].inspect, + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } + super + end + end start_server do begin + h[:in_start_server_before_accept] = { + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } sock = server.accept - h[:sock_addr], h[:sock_peeraddr] = sock.addr, sock.peeraddr + h[:in_start_server] = { + sock_addr: sock.addr, + sock_peeraddr: sock.peeraddr, + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } sock.close + h[:in_start_server_sock_closed] = { + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } ensure server.close end end assert_raise(Net::IMAP::Error) do - #begin - Net::IMAP.new(server_addr, :port => port) - #rescue Net::IMAP::Error - # raise Errno::EINVAL - #end + #Net::IMAP.new(server_addr, :port => port) + if true + net_imap.new(server_addr, :port => port) + else + # for testing debug print + begin + net_imap.new(server_addr, :port => port) + rescue Net::IMAP::Error + raise Errno::EINVAL + end + end rescue Errno::EINVAL => e # for debug on OpenCSW - h.merge!({e: e, server: server, port: port, server_addr: server_addr}) - raise(h.inspect) + h[:in_rescue] = { + e: e, + server_addr: server_addr, + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } + require 'pp' + raise(PP.pp(h, +'')) end end From b1eae5e15e16bdb38d9cb3d8498bf3d33e616bfd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 09:38:30 +0900 Subject: [PATCH 500/878] Cleaned an excess semicolon up [ci skip] which has not been removed when translated from C. --- array.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/array.rb b/array.rb index 25da88cde8410d..e1a0fc0168dc79 100755 --- a/array.rb +++ b/array.rb @@ -31,7 +31,7 @@ def shuffle!(random: Random) # # a.shuffle(random: Random.new(1)) #=> [1, 3, 2] def shuffle(random: Random) - __builtin_rb_ary_shuffle(random); + __builtin_rb_ary_shuffle(random) end # call-seq: From ef96981d6f916bce97c24e6a08d52c87def7f989 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 27 Jan 2020 09:54:12 +0900 Subject: [PATCH 501/878] * 2020-01-27 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 088a1a8af0ac5b..7baae748421799 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" From e710e9e886c5b56a6c5f6a034748a498114fc3db Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 10:07:46 +0900 Subject: [PATCH 502/878] Fixed missing dependency on array.rb --- common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common.mk b/common.mk index f9bef01cf37c2b..720a17469b6e0b 100644 --- a/common.mk +++ b/common.mk @@ -2823,6 +2823,7 @@ miniinit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h miniinit.$(OBJEXT): $(top_srcdir)/internal/stdbool.h miniinit.$(OBJEXT): $(top_srcdir)/internal/vm.h miniinit.$(OBJEXT): $(top_srcdir)/internal/warnings.h +miniinit.$(OBJEXT): {$(VPATH)}array.rb miniinit.$(OBJEXT): {$(VPATH)}assert.h miniinit.$(OBJEXT): {$(VPATH)}ast.rb miniinit.$(OBJEXT): {$(VPATH)}builtin.h From 9b55a9649fb1973180559a067cfee0d6f234fef8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 10:10:58 +0900 Subject: [PATCH 503/878] Removed useless "spec"s It is not specific to particular methods that keyword option arguments are coerced to `Hash`es using `to_hash` method. --- spec/ruby/core/array/sample_spec.rb | 20 -------------------- spec/ruby/core/array/shuffle_spec.rb | 9 --------- 2 files changed, 29 deletions(-) diff --git a/spec/ruby/core/array/sample_spec.rb b/spec/ruby/core/array/sample_spec.rb index 87f81999f48e3d..73b6bdf48078fc 100644 --- a/spec/ruby/core/array/sample_spec.rb +++ b/spec/ruby/core/array/sample_spec.rb @@ -65,26 +65,6 @@ end describe "with options" do - ruby_version_is ""..."2.8" do - # keyword argument since 2.8 - it "calls #to_hash to convert the passed Object" do - obj = mock("array_sample") - obj.should_receive(:to_hash).and_return({}) - obj.should_not_receive(:to_int) - - [1, 2].sample(obj).should be_an_instance_of(Fixnum) - end - - it "calls #to_int on the first argument and #to_hash on the second when passed Objects" do - count = mock("array_sample_count") - count.should_receive(:to_int).and_return(2) - options = mock("array_sample_options") - options.should_receive(:to_hash).and_return({}) - - [1, 2].sample(count, options).size.should == 2 - end - end - it "calls #rand on the Object passed by the :random key in the arguments Hash" do obj = mock("array_sample_random") obj.should_receive(:rand).and_return(0.5) diff --git a/spec/ruby/core/array/shuffle_spec.rb b/spec/ruby/core/array/shuffle_spec.rb index 106ef05ce272bd..857062c4c9602a 100644 --- a/spec/ruby/core/array/shuffle_spec.rb +++ b/spec/ruby/core/array/shuffle_spec.rb @@ -25,15 +25,6 @@ ArraySpecs::MyArray[1, 2, 3].shuffle.should be_an_instance_of(Array) end - ruby_version_is ""..."2.8" do - # keyword argument since 2.8 - it "attempts coercion via #to_hash" do - obj = mock('hash') - obj.should_receive(:to_hash).once.and_return({}) - [2, 3].shuffle(obj) - end - end - it "calls #rand on the Object passed by the :random key in the arguments Hash" do obj = mock("array_shuffle_random") obj.should_receive(:rand).at_least(1).times.and_return(0.5) From af899503a646f20d63d4aa2f358894b98f85dab7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 10:46:57 +0900 Subject: [PATCH 504/878] Moved `GC.verify_compaction_references` to gc.rb And fixed a segfault by coercion of `Qundef`, when any keyword argument without `toward:` option is given. --- gc.c | 50 ++++-------------------------------- gc.rb | 18 +++++++++++++ test/ruby/test_gc_compact.rb | 2 ++ 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/gc.c b/gc.c index 59313d35d671ee..5928b2bc68624d 100644 --- a/gc.c +++ b/gc.c @@ -8647,53 +8647,14 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl mjit_gc_exit_hook(); // unlock MJIT here, because `rb_gc()` calls `mjit_gc_start_hook()` again. } -/* - * call-seq: - * GC.verify_compaction_references -> nil - * - * Verify compaction reference consistency. - * - * This method is implementation specific. During compaction, objects that - * were moved are replaced with T_MOVED objects. No object should have a - * reference to a T_MOVED object after compaction. - * - * This function doubles the heap to ensure room to move all objects, - * compacts the heap to make sure everything moves, updates all references, - * then performs a full GC. If any object contains a reference to a T_MOVED - * object, that object should be pushed on the mark stack, and will - * make a SEGV. - */ static VALUE -gc_verify_compaction_references(int argc, VALUE *argv, VALUE mod) +gc_verify_compaction_references(rb_execution_context_t *ec, VALUE mod, VALUE toward, VALUE double_heap) { rb_objspace_t *objspace = &rb_objspace; - int use_toward_empty = FALSE; - int use_double_pages = FALSE; - - if (dont_gc) return Qnil; - - VALUE opt = Qnil; - static ID keyword_ids[2]; - VALUE kwvals[2]; - - kwvals[1] = Qtrue; - - rb_scan_args(argc, argv, "0:", &opt); - - if (!NIL_P(opt)) { - if (!keyword_ids[0]) { - keyword_ids[0] = rb_intern("toward"); - keyword_ids[1] = rb_intern("double_heap"); - } - - rb_get_kwargs(opt, keyword_ids, 0, 2, kwvals); - if (rb_intern("empty") == rb_sym2id(kwvals[0])) { - use_toward_empty = TRUE; - } - if (kwvals[1] != Qundef && RTEST(kwvals[1])) { - use_double_pages = TRUE; - } - } + const ID id_empty = rb_intern("empty"); + const int use_toward_empty = NIL_P(toward) ? FALSE : + (Check_Type(toward, T_SYMBOL), toward == ID2SYM(id_empty)); + const int use_double_pages = RTEST(double_heap); gc_compact(objspace, use_toward_empty, use_double_pages, TRUE); return gc_compact_stats(objspace); @@ -11926,7 +11887,6 @@ Init_GC(void) /* internal methods */ rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency_m, 0); - rb_define_singleton_method(rb_mGC, "verify_compaction_references", gc_verify_compaction_references, -1); rb_define_singleton_method(rb_mGC, "verify_transient_heap_internal_consistency", gc_verify_transient_heap_internal_consistency, 0); #if MALLOC_ALLOCATED_SIZE rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0); diff --git a/gc.rb b/gc.rb index a87f9185f93414..b405b598222b08 100644 --- a/gc.rb +++ b/gc.rb @@ -166,6 +166,24 @@ def self.latest_gc_info hash_or_key = nil def self.compact __builtin_rb_gc_compact end + + # call-seq: + # GC.verify_compaction_references(toward: nil, double_heap: nil) -> nil + # + # Verify compaction reference consistency. + # + # This method is implementation specific. During compaction, objects that + # were moved are replaced with T_MOVED objects. No object should have a + # reference to a T_MOVED object after compaction. + # + # This function doubles the heap to ensure room to move all objects, + # compacts the heap to make sure everything moves, updates all references, + # then performs a full GC. If any object contains a reference to a T_MOVED + # object, that object should be pushed on the mark stack, and will + # make a SEGV. + def self.verify_compaction_references(toward: nil, double_heap: false) + __builtin_gc_verify_compaction_references(toward, double_heap) + end end module ObjectSpace diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb index e93e77527982a8..75d9b01f2c42c5 100644 --- a/test/ruby/test_gc_compact.rb +++ b/test/ruby/test_gc_compact.rb @@ -39,6 +39,8 @@ def test_complex_hash_keys hash = list_of_objects.hash GC.verify_compaction_references(toward: :empty) assert_equal hash, list_of_objects.hash + GC.verify_compaction_references(double_heap: false) + assert_equal hash, list_of_objects.hash end def walk_ast ast From 1ddc719a562b1ee4c3ae6cf4d1f6c386e142b087 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 16:12:15 +0900 Subject: [PATCH 505/878] Check the encoding of `half:` option --- numeric.c | 1 + test/ruby/test_float.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/numeric.c b/numeric.c index 2471f9bd04423e..c8801991489c96 100644 --- a/numeric.c +++ b/numeric.c @@ -233,6 +233,7 @@ rb_num_get_rounding_option(VALUE opts) str = rb_check_string_type(rounding); if (NIL_P(str)) goto invalid; } + rb_must_asciicompat(str); s = RSTRING_PTR(str); switch (RSTRING_LEN(str)) { case 2: diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 7cbf3b5a8f10d8..a94bbce49eea57 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -764,6 +764,9 @@ def test_round_half_invalid assert_raise_with_message(ArgumentError, /xxx/) { 1.0.round(half: "\0xxx") } + assert_raise_with_message(Encoding::CompatibilityError, /ASCII incompatible/) { + 1.0.round(half: "up".force_encoding("utf-16be")) + } end def test_Float From bc8f28fbd05d2dcb14727cb8873d0d761dc65699 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 27 Jan 2020 16:22:53 +0900 Subject: [PATCH 506/878] Fixed a typo, missing "i" [ci skip] --- insns.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/insns.def b/insns.def index bd1bffbe02d8d4..4cf86c63ac198b 100644 --- a/insns.def +++ b/insns.def @@ -375,7 +375,7 @@ concatstrings (...) (VALUE val) /* This instruction can concat UTF-8 and binary strings, resulting in - * Encoding::CompatiblityError. */ + * Encoding::CompatibilityError. */ // attr bool leaf = false; /* has rb_enc_cr_str_buf_cat() */ // attr rb_snum_t sp_inc = 1 - (rb_snum_t)num; { From 0b2c7473ddf683a4af7606e70d01b7216a527366 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 27 Jan 2020 18:58:07 +0900 Subject: [PATCH 507/878] Fix call-seq of GC.verify_compaction_references [ci skip] --- gc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gc.rb b/gc.rb index b405b598222b08..dd5781b603f502 100644 --- a/gc.rb +++ b/gc.rb @@ -168,7 +168,7 @@ def self.compact end # call-seq: - # GC.verify_compaction_references(toward: nil, double_heap: nil) -> nil + # GC.verify_compaction_references(toward: nil, double_heap: false) -> hash # # Verify compaction reference consistency. # From 33d02e6bc7502c5a3f09c59908a8c9f08a474b8d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 28 Jan 2020 09:18:12 +0900 Subject: [PATCH 508/878] Skip empty directories to install [Bug #16596] --- tool/rbinstall.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 28fa95e51cbb2d..e5c34b59087c12 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -261,7 +261,8 @@ def install_recursive(srcdir, dest, options = {}) end for src, d, dir in found if dir - makedirs(d) + next + # makedirs(d) else makedirs(d[/.*(?=\/)/m]) if block_given? From 10842daeb571126a090cb10dedf0cda8c2b7f9a8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 28 Jan 2020 10:01:22 +0900 Subject: [PATCH 509/878] Added RDoc files to parse [Bug #16596] --- lib/racc/.document | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/racc/.document diff --git a/lib/racc/.document b/lib/racc/.document new file mode 100644 index 00000000000000..8ade51b9221030 --- /dev/null +++ b/lib/racc/.document @@ -0,0 +1 @@ +rdoc/*.rdoc From c9c0ae05937b33bdda43f42f71b99873c9491fa3 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 28 Jan 2020 10:05:33 +0900 Subject: [PATCH 510/878] * 2020-01-28 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 7baae748421799..e3255145337053 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" From 8dbd5c76a0ed26d4adb440fee97c3f25ee6bdcf9 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 11:43:01 +0900 Subject: [PATCH 511/878] support multiple run for test/ruby/test_array. test-all supports multiple run with option --repeat-count=2 but test_equal_resize doesn't support it. --- test/ruby/test_array.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index fcfda92487567a..a66d2301d05f03 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2629,18 +2629,17 @@ def o.==(x); :foo; end assert_not_equal([0, 1, 2], [0, 1, 3]) end - A = Array.new(3, &:to_s) - B = A.dup - def test_equal_resize + $test_equal_resize_a = Array.new(3, &:to_s) + $test_equal_resize_b = $test_equal_resize_a.dup o = Object.new def o.==(o) - A.clear - B.clear + $test_equal_resize_a.clear + $test_equal_resize_b.clear true end - A[1] = o - assert_equal(A, B) + $test_equal_resize_a[1] = o + assert_equal($test_equal_resize_a, $test_equal_resize_b) end def test_flatten_error From b17bab7472a0491071c7da9e8b41305d3687a341 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 11:58:09 +0900 Subject: [PATCH 512/878] support multi-run for ruby/test_autoload.rb It requires more cleanup. --- test/ruby/test_autoload.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb index 2e53c9203de489..c23e0cfb1fe0e8 100644 --- a/test/ruby/test_autoload.rb +++ b/test/ruby/test_autoload.rb @@ -445,5 +445,6 @@ def add_autoload(path) def remove_autoload_constant $".replace($" - @autoload_paths) ::Object.class_eval {remove_const(:AutoloadTest)} + TestAutoload.class_eval {remove_const(:AutoloadTest)} if defined? TestAutoload::AutoloadTest end end From 501e7f4959a1193c82adc1b661a85621952121b8 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 12:01:26 +0900 Subject: [PATCH 513/878] support multi-run for ruby/test_basicinstructions.rb cvar should be initialized at first. --- test/ruby/test_basicinstructions.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb index ab32ee54e2a55c..f6b69cc1e57e58 100644 --- a/test/ruby/test_basicinstructions.rb +++ b/test/ruby/test_basicinstructions.rb @@ -428,7 +428,9 @@ def set_gvar_in_another_method end class CVarA - @@cv = 'CVarA@@cv' + def self.setup + @@cv = 'CVarA@@cv' + end def self.cv() @@cv end def self.cv=(v) @@cv = v end class << self @@ -449,6 +451,7 @@ def cvB=(v) @@cv = v end end def test_class_variable + CVarA.setup assert_equal 'CVarA@@cv', CVarA.cv assert_equal 'CVarA@@cv', CVarA.cv2 assert_equal 'CVarA@@cv', CVarA.new.cv From 14759e6907eaecc86ab06a3ddf107426c00cb2c5 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 13:31:22 +0900 Subject: [PATCH 514/878] support multi-run for ruby/test_const.rb need to redef Constants. --- test/ruby/test_const.rb | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb index 1c73b66648110d..51637a21a509eb 100644 --- a/test/ruby/test_const.rb +++ b/test/ruby/test_const.rb @@ -3,20 +3,33 @@ require 'test/unit' class TestConst < Test::Unit::TestCase - TEST1 = 1 - TEST2 = 2 - module Const - TEST3 = 3 - TEST4 = 4 + setup_constants_proc = -> do + remove_const :TEST1 if defined? ::TestConst::TEST1 + remove_const :TEST2 if defined? ::TestConst::TEST2 + remove_const :Const if defined? ::TestConst::Const + remove_const :Const2 if defined? ::TestConst::Const2 + + TEST1 = 1 + TEST2 = 2 + + module Const + TEST3 = 3 + TEST4 = 4 + end + + module Const2 + TEST3 = 6 + TEST4 = 8 + end end - module Const2 - TEST3 = 6 - TEST4 = 8 + define_method :setup_constants do + setup_constants_proc.call end def test_const + setup_constants assert defined?(TEST1) assert_equal 1, TEST1 assert defined?(TEST2) From 5f7be6243a5b0cdbf1abc8967a512e48c2f1489e Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 13:36:46 +0900 Subject: [PATCH 515/878] support multi-run for test/ruby/test_encoding.rb Unique encoding name is required. --- test/ruby/test_encoding.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 019cb2417f228b..024d21b4f3c834 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -56,8 +56,8 @@ def test_find end def test_replicate - assert_instance_of(Encoding, Encoding::UTF_8.replicate('UTF-8-ANOTHER')) - assert_instance_of(Encoding, Encoding::ISO_2022_JP.replicate('ISO-2022-JP-ANOTHER')) + assert_instance_of(Encoding, Encoding::UTF_8.replicate("UTF-8-ANOTHER#{Time.now.to_f}")) + assert_instance_of(Encoding, Encoding::ISO_2022_JP.replicate("ISO-2022-JP-ANOTHER#{Time.now.to_f}")) bug3127 = '[ruby-dev:40954]' assert_raise(TypeError, bug3127) {Encoding::UTF_8.replicate(0)} assert_raise(ArgumentError, bug3127) {Encoding::UTF_8.replicate("\0")} From 962c7abb1373ee1ff7d5ce443b2872deac452b9d Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 13:39:50 +0900 Subject: [PATCH 516/878] support multi-run for test/ruby/test_eval.rb need to remove a Constant. --- test/ruby/test_eval.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index b1cb56217542a1..bf551c6845693d 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -347,6 +347,10 @@ module EvTest assert_equal(55, eval("foo22")) assert_equal(55, foo22) }.call + + self.class.class_eval do + remove_const :EvTest + end end def test_nil_instance_eval_cvar From 251930cea0e935494b1e8cbbe851e63b978dbc80 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 13:43:30 +0900 Subject: [PATCH 517/878] support multi-run for test/ruby/test_iseq.rb need to remove a Constant. --- test/ruby/test_iseq.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb index 7c384c19bd2700..02c396702225ef 100644 --- a/test/ruby/test_iseq.rb +++ b/test/ruby/test_iseq.rb @@ -465,6 +465,11 @@ def q; end attr_reader :i end end; + + # cleanup + ::Object.class_eval do + remove_const :P + end end def collect_from_binary_tracepoint_lines(tracepoint_type, filename) From ac2b945bc0182859ea538dc6b02ad6945a5cf212 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 13:48:36 +0900 Subject: [PATCH 518/878] support multi-run for test/ruby/test_marshal.rb need to remove Constants. --- test/ruby/test_marshal.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index dbeee825da79fe..1d096adb184ae5 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -596,7 +596,8 @@ def test_undumpable_data end def test_unloadable_data - c = eval("class Unloadable\u{23F0 23F3} Date: Tue, 28 Jan 2020 13:58:01 +0900 Subject: [PATCH 519/878] support multi-run for test/ruby/test_method.rb need to restore a method. --- test/ruby/test_method.rb | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 7577a53b7a16be..dd163e104cca66 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -104,6 +104,12 @@ def foo() :changed end assert_raise(TypeError) do um.bind(Base.new) end + + # cleanup + Derived.class_eval do + remove_method :foo + def foo() :derived; end + end end def test_callee @@ -1102,17 +1108,26 @@ def test_to_proc_binding assert_equal([:bar, :foo], b.local_variables.sort, bug11012) end - class MethodInMethodClass - def m1 - def m2 - end + setup_for_test_method_in_method_visibility_should_be_public_proc = -> do + remove_const :MethodInMethodClass if defined? MethodInMethodClass - self.class.send(:define_method, :m3){} # [Bug #11754] + class MethodInMethodClass + def m1 + def m2 + end + self.class.send(:define_method, :m3){} # [Bug #11754] + end + private end - private + end + + define_method :setup_for_test_method_in_method_visibility_should_be_public do + setup_for_test_method_in_method_visibility_should_be_public_proc.call end def test_method_in_method_visibility_should_be_public + setup_for_test_method_in_method_visibility_should_be_public + assert_equal([:m1].sort, MethodInMethodClass.public_instance_methods(false).sort) assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort) From 1bc731cb65cfd9baae718b9a8588e668dd1c75e0 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 14:16:06 +0900 Subject: [PATCH 520/878] support multi-run for test/ruby/test_module.rb add cleanup code in some tests. --- test/ruby/test_module.rb | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 9373c48a9a41be..2e0a14e300276e 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -88,8 +88,11 @@ def user3 private :user3 end - module Other - def other + OtherSetup = -> do + remove_const :Other if defined? ::TestModule::Other + module Other + def other + end end end @@ -223,6 +226,8 @@ def test_ancestors @@class_eval = 'b' def test_class_eval + OtherSetup.call + Other.class_eval("CLASS_EVAL = 1") assert_equal(1, Other::CLASS_EVAL) assert_include(Other.constants, :CLASS_EVAL) @@ -331,6 +336,8 @@ def test_nested_get_bad_class end def test_nested_defined + OtherSetup.call + assert_send([Object, :const_defined?, [self.class.name, 'Other'].join('::')]) assert_send([self.class, :const_defined?, 'User::USER']) assert_not_send([self.class, :const_defined?, 'User::Foo']) @@ -363,6 +370,8 @@ def test_nested_defined_bad_class end def test_const_set + OtherSetup.call + assert_not_operator(Other, :const_defined?, :KOALA) Other.const_set(:KOALA, 99) assert_operator(Other, :const_defined?, :KOALA) @@ -421,6 +430,8 @@ def x end def test_dup + OtherSetup.call + bug6454 = '[ruby-core:45132]' a = Module.new @@ -522,6 +533,11 @@ def test_method_defined_without_include_super assert !c.method_defined?(:userx, false) c.define_method(:userx){} assert c.method_defined?(:userx, false) + + # cleanup + User.class_eval do + remove_const :FOO + end end def module_exec_aux @@ -552,6 +568,14 @@ def dynamically_added_method_2; end def dynamically_added_method_4; end end assert_method_defined?(User, :dynamically_added_method_4) + + # cleanup + User.class_eval do + remove_method :dynamically_added_method_1 + remove_method :dynamically_added_method_2 + remove_method :dynamically_added_method_3 + remove_method :dynamically_added_method_4 + end end def test_module_eval @@ -652,6 +676,10 @@ def test_s_constants c2 = Module.constants assert_equal([:WALTER], c2 - c1) + Object.class_eval do + remove_const :WALTER + end + assert_equal([], Module.constants(true)) assert_equal([], Module.constants(false)) @@ -2152,6 +2180,9 @@ def test_invalid_attr class AttrTest class << self attr_accessor :cattr + def reset + self.cattr = nil + end end attr_accessor :iattr def ivar @@ -2194,6 +2225,8 @@ def test_uninitialized_attr_class assert_warning '' do assert_equal(42, AttrTest.cattr) end + + AttrTest.reset end def test_uninitialized_attr_non_object From 56b0300f24bc2bce6309279e2c07e8a1f08044e4 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 14:21:44 +0900 Subject: [PATCH 521/878] support multi-run for test/ruby/test_proc.rb Mysterious error: `remove_method(:foo) if method_defined?(:foo)` raise an exception `method `foo' not defined in #>` This patch rename the method name foo to foo_arity to solve it. --- test/ruby/test_proc.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 4177707ddd85b6..b00f42d81aa95b 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -59,10 +59,10 @@ def assert_arity(n) Proc.new end meta.class_eval { - remove_method(:foo) if method_defined?(:foo) - define_method(:foo, b) + remove_method(:foo_arity) if method_defined?(:foo_arity) + define_method(:foo_arity, b) } - assert_equal(n, method(:foo).arity) + assert_equal(n, method(:foo_arity).arity) end def test_arity From 9b65bfdc9e5eb8a36fdd464ed7534ed2a9557ea7 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 14:35:38 +0900 Subject: [PATCH 522/878] support multi-run for test/ruby/test_refinement.rb Give up to support multi-run: * test_method_should_use_refinements * test_instance_method_should_use_refinements I hope someone can revisit it. --- test/ruby/test_refinement.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 6fb04de5d64dbc..0db598888ff07d 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -217,6 +217,8 @@ def test_public_send_should_use_refinements assert_raise(NoMethodError) { FooExtClient.public_send_b_on(foo) } end + DONE_TESTS = [] + module MethodIntegerPowEx refine Integer do def pow(*) @@ -225,6 +227,9 @@ def pow(*) end end def test_method_should_use_refinements + skip if DONE_TESTS.include? __method__ # giveup multi-run + DONE_TESTS << __method__ + foo = Foo.new assert_raise(NameError) { foo.method(:z) } assert_equal("FooExt#z", FooExtClient.method_z(foo).call) @@ -246,6 +251,9 @@ def abs end end def test_instance_method_should_use_refinements + skip if DONE_TESTS.include? __method__ # giveup multi-run + DONE_TESTS << __method__ + foo = Foo.new assert_raise(NameError) { Foo.instance_method(:z) } assert_equal("FooExt#z", FooExtClient.instance_method_z(foo).bind(foo).call) From 0f03c1433ef6a17acd64f4dc4a539b4630e975aa Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 14:44:12 +0900 Subject: [PATCH 523/878] support multi-run for test/ruby/test_primitive.rb need to redefine some classes. --- test/ruby/test_primitive.rb | 78 +++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/test/ruby/test_primitive.rb b/test/ruby/test_primitive.rb index 19af44ad32e271..f1db934000dc23 100644 --- a/test/ruby/test_primitive.rb +++ b/test/ruby/test_primitive.rb @@ -26,24 +26,31 @@ def test_lvar assert_equal 4, c end - C = 1 - class A - Const = 1 - class B - Const = 2 - class C - Const = 3 - def const - Const + C_Setup = -> do + remove_const :C if defined? ::TestRubyPrimitive::C + remove_const :A if defined? ::TestRubyPrimitive::A + + C = 1 + class A + Const = 1 + class B + Const = 2 + class C + Const = 3 + def const + Const + end end end end + (1..2).map { + A::B::C::Const + } end - (1..2).map { - A::B::C::Const - } def test_constant + C_Setup.call + assert_equal 1, C assert_equal 1, C assert_equal 1, A::Const @@ -145,42 +152,60 @@ def test_gvar assert_equal 7, ($test_ruby_primitive_gvar = 7) end - class A7 - @@c = 1 - def m - @@c += 1 + A7_Setup = -> do + remove_const :A7 if defined? TestRubyPrimitive::A7 + + class A7 + @@c = 1 + def m + @@c += 1 + end end end def test_cvar_from_instance_method + A7_Setup.call + assert_equal 2, A7.new.m assert_equal 3, A7.new.m assert_equal 4, A7.new.m end - class A8 - @@c = 1 - class << self - def m - @@c += 1 + A8_Setup = -> do + remove_const :A8 if defined? TestRubyPrimitive::A8 + + class A8 + @@c = 1 + class << self + def m + @@c += 1 + end end end end def test_cvar_from_singleton_method + A8_Setup.call + assert_equal 2, A8.m assert_equal 3, A8.m assert_equal 4, A8.m end - class A9 - @@c = 1 - def self.m - @@c += 1 + A9_Setup = -> do + remove_const :A8 if defined? TestRubyPrimitive::A8 + + class A9 + @@c = 1 + def self.m + @@c += 1 + end end end def test_cvar_from_singleton_method2 + A9_Setup.call + assert_equal 2, A9.m assert_equal 3, A9.m assert_equal 4, A9.m @@ -199,6 +224,9 @@ def test_opassign @iv += 2 assert_equal 4, @iv + # init @@cv + @@cv = nil + @@cv ||= 1 assert_equal 1, @@cv @@cv &&= 2 From 4df0819c5d8b7d11e3fa1d2ba45fe7da68a0e064 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 15:15:19 +0900 Subject: [PATCH 524/878] support multi-run for test/ruby/test_settracefunc.rb need to remove Constants. --- test/ruby/test_settracefunc.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index ada7b7596aa7cb..73cf6252585981 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -137,6 +137,10 @@ def test_class assert_equal(["c-call", 9, :set_trace_func, Kernel], events.shift) assert_equal([], events) + + self.class.class_eval do + remove_const :Foo + end end def test_return # [ruby-dev:38701] @@ -362,6 +366,11 @@ def test_thread_trace end assert_equal([], events[:set]) assert_equal([], events[:add]) + + # cleanup + self.class.class_eval do + remove_const :ThreadTraceInnerClass + end end def test_trace_defined_method From 9552262bb2e293efa6e8f535d68623f2ecd13360 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 15:21:26 +0900 Subject: [PATCH 525/878] support multi-run for test/ruby/test_struct.rb Remove Structs to avoid redefinition warnings. --- test/ruby/test_struct.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index a7deb13a08aa26..5f073a33155225 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -23,6 +23,10 @@ def test_struct test.bar = 47 assert_equal(47, test.bar) + + @Struct.class_eval do + remove_const :Test + end end # [ruby-dev:26247] more than 10 struct members causes segmentation fault @@ -325,15 +329,19 @@ def test_error end def test_redefinition_warning - @Struct.new("RedefinitionWarning") + @Struct.new(name = "RedefinitionWarning") e = EnvUtil.verbose_warning do @Struct.new("RedefinitionWarning") end assert_match(/redefining constant #@Struct::RedefinitionWarning/, e) + + @Struct.class_eval do + remove_const name + end end def test_nonascii - struct_test = @Struct.new("R\u{e9}sum\u{e9}", :"r\u{e9}sum\u{e9}") + struct_test = @Struct.new(name = "R\u{e9}sum\u{e9}", :"r\u{e9}sum\u{e9}") assert_equal(@Struct.const_get("R\u{e9}sum\u{e9}"), struct_test, '[ruby-core:24849]') a = struct_test.new(42) assert_equal("#", a.inspect, '[ruby-core:24849]') @@ -343,6 +351,10 @@ def test_nonascii assert_nothing_raised(Encoding::CompatibilityError) do assert_match(/redefining constant #@Struct::R\u{e9}sum\u{e9}/, e) end + + @Struct.class_eval do + remove_const name + end end def test_junk From ab33b3d6915fe40734cdeaac5f2104fa8792c8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 27 Jan 2020 14:34:55 +0900 Subject: [PATCH 526/878] move macros around Would like to edit them in forthcoming commit. --- include/ruby/intern.h | 202 ------------------------------------------ include/ruby/ruby.h | 194 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 194 insertions(+), 202 deletions(-) diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 7854d637642a9c..ecceef3594130a 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -1022,208 +1022,6 @@ VALUE rb_make_exception(int, const VALUE*); RUBY_SYMBOL_EXPORT_END -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -extern "C++" { -#endif - -#if defined(HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P) -# define rb_f_notimplement_p(f) __builtin_types_compatible_p(__typeof__(f),__typeof__(rb_f_notimplement)) -#else -# define rb_f_notimplement_p(f) 0 -#endif - -#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) && !defined(__CYGWIN__) -#if defined(__has_attribute) && __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) -#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - __attribute__((__unused__,__weakref__(#def),__nonnull__ nonnull))static void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity); -#endif -#endif - -#if defined(RB_METHOD_DEFINITION_DECL_C) || defined(__cplusplus) -#ifndef RB_METHOD_DEFINITION_DECL_C -#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - static inline void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity) \ - { \ - def(RB_UNWRAP_MACRO vars,(VALUE(*)(ANYARGS))(func),arity); \ - } -#endif - -#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) -#define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) -#endif - -#define RB_UNWRAP_MACRO(...) __VA_ARGS__ - -#ifdef __cplusplus -#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) template struct def##_tmpl {}; -#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) \ - template <> struct def##_tmpl { \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)funcargs) {::defname(RB_UNWRAP_MACRO vars, func, arity);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, reinterpret_cast(func), arity);} \ - }; -#else -#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) /* nothing */ -#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) /* nothing */ -#endif -#define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) - -#define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \ -RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##0 ,0 ,decl,vars,(VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##1 ,1 ,decl,vars,(VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##2 ,2 ,decl,vars,(VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##3 ,3 ,decl,vars,(VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##4 ,4 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##5 ,5 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##6 ,6 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##7 ,7 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##8 ,8 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##9 ,9 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##10,10,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##11,11,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##12,12,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##13,13,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##14,14,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##15,15,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_M3(def,nonnull,def##m3,decl,vars) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##m2,-2,decl,vars,(VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */ -#ifdef __cplusplus -#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,VALUE*,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(...)) \ - template <> struct def##_tmpl<-1> { \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - }; -#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) /* nothing */ -#else -#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE)) -#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,()) -#endif - -#endif - -#ifdef RB_METHOD_DEFINITION_DECL - -RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (klass, name)) -#ifdef __cplusplus -#define rb_define_method_id(m, n, f, a) rb_define_method_id_tmpl::define(m, n, f) -#else -#define rb_define_method_id_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method_id15,rb_define_method_idm3) -#define rb_define_method_id_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method_id14,rb_define_method_id_choose_prototype15(n)) -#define rb_define_method_id_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method_id13,rb_define_method_id_choose_prototype14(n)) -#define rb_define_method_id_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_method_id12,rb_define_method_id_choose_prototype13(n)) -#define rb_define_method_id_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_method_id11,rb_define_method_id_choose_prototype12(n)) -#define rb_define_method_id_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_method_id10,rb_define_method_id_choose_prototype11(n)) -#define rb_define_method_id_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_method_id9, rb_define_method_id_choose_prototype10(n)) -#define rb_define_method_id_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_method_id8, rb_define_method_id_choose_prototype9(n)) -#define rb_define_method_id_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_method_id7, rb_define_method_id_choose_prototype8(n)) -#define rb_define_method_id_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_method_id6, rb_define_method_id_choose_prototype7(n)) -#define rb_define_method_id_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_method_id5, rb_define_method_id_choose_prototype6(n)) -#define rb_define_method_id_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_method_id4, rb_define_method_id_choose_prototype5(n)) -#define rb_define_method_id_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_method_id3, rb_define_method_id_choose_prototype4(n)) -#define rb_define_method_id_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_method_id2, rb_define_method_id_choose_prototype3(n)) -#define rb_define_method_id_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_method_id1, rb_define_method_id_choose_prototype2(n)) -#define rb_define_method_id_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_method_id0, rb_define_method_id_choose_prototype1(n)) -#define rb_define_method_id_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_method_idm1,rb_define_method_id_choose_prototype0(n)) -#define rb_define_method_id_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_method_idm2,rb_define_method_id_choose_prototypem1(n)) -#define rb_define_method_id_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_method_idm3,rb_define_method_id_choose_prototypem2(n)) -#define rb_define_method_id(klass, mid, func, arity) rb_define_method_id_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif - -RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_protected_method(m, n, f, a) rb_define_protected_method_tmpl::define(m, n, f) -#else -#define rb_define_protected_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_protected_method15,rb_define_protected_methodm3) -#define rb_define_protected_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_protected_method14,rb_define_protected_method_choose_prototype15(n)) -#define rb_define_protected_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_protected_method13,rb_define_protected_method_choose_prototype14(n)) -#define rb_define_protected_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_protected_method12,rb_define_protected_method_choose_prototype13(n)) -#define rb_define_protected_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_protected_method11,rb_define_protected_method_choose_prototype12(n)) -#define rb_define_protected_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_protected_method10,rb_define_protected_method_choose_prototype11(n)) -#define rb_define_protected_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_protected_method9, rb_define_protected_method_choose_prototype10(n)) -#define rb_define_protected_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_protected_method8, rb_define_protected_method_choose_prototype9(n)) -#define rb_define_protected_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_protected_method7, rb_define_protected_method_choose_prototype8(n)) -#define rb_define_protected_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_protected_method6, rb_define_protected_method_choose_prototype7(n)) -#define rb_define_protected_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_protected_method5, rb_define_protected_method_choose_prototype6(n)) -#define rb_define_protected_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_protected_method4, rb_define_protected_method_choose_prototype5(n)) -#define rb_define_protected_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_protected_method3, rb_define_protected_method_choose_prototype4(n)) -#define rb_define_protected_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_protected_method2, rb_define_protected_method_choose_prototype3(n)) -#define rb_define_protected_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_protected_method1, rb_define_protected_method_choose_prototype2(n)) -#define rb_define_protected_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_protected_method0, rb_define_protected_method_choose_prototype1(n)) -#define rb_define_protected_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_protected_methodm1,rb_define_protected_method_choose_prototype0(n)) -#define rb_define_protected_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_protected_methodm2,rb_define_protected_method_choose_prototypem1(n)) -#define rb_define_protected_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_protected_methodm3,rb_define_protected_method_choose_prototypem2(n)) -#define rb_define_protected_method(klass, mid, func, arity) rb_define_protected_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif - -RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_private_method(m, n, f, a) rb_define_private_method_tmpl::define(m, n, f) -#else -#define rb_define_private_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_private_method15,rb_define_private_methodm3) -#define rb_define_private_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_private_method14,rb_define_private_method_choose_prototype15(n)) -#define rb_define_private_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_private_method13,rb_define_private_method_choose_prototype14(n)) -#define rb_define_private_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_private_method12,rb_define_private_method_choose_prototype13(n)) -#define rb_define_private_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_private_method11,rb_define_private_method_choose_prototype12(n)) -#define rb_define_private_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_private_method10,rb_define_private_method_choose_prototype11(n)) -#define rb_define_private_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_private_method9, rb_define_private_method_choose_prototype10(n)) -#define rb_define_private_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_private_method8, rb_define_private_method_choose_prototype9(n)) -#define rb_define_private_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_private_method7, rb_define_private_method_choose_prototype8(n)) -#define rb_define_private_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_private_method6, rb_define_private_method_choose_prototype7(n)) -#define rb_define_private_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_private_method5, rb_define_private_method_choose_prototype6(n)) -#define rb_define_private_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_private_method4, rb_define_private_method_choose_prototype5(n)) -#define rb_define_private_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_private_method3, rb_define_private_method_choose_prototype4(n)) -#define rb_define_private_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_private_method2, rb_define_private_method_choose_prototype3(n)) -#define rb_define_private_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_private_method1, rb_define_private_method_choose_prototype2(n)) -#define rb_define_private_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_private_method0, rb_define_private_method_choose_prototype1(n)) -#define rb_define_private_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_private_methodm1,rb_define_private_method_choose_prototype0(n)) -#define rb_define_private_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_private_methodm2,rb_define_private_method_choose_prototypem1(n)) -#define rb_define_private_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_private_methodm3,rb_define_private_method_choose_prototypem2(n)) -#define rb_define_private_method(klass, mid, func, arity) rb_define_private_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif - -RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_singleton_method(m, n, f, a) rb_define_singleton_method_tmpl::define(m, n, f) -#else -#define rb_define_singleton_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_singleton_method15,rb_define_singleton_methodm3) -#define rb_define_singleton_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_singleton_method14,rb_define_singleton_method_choose_prototype15(n)) -#define rb_define_singleton_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_singleton_method13,rb_define_singleton_method_choose_prototype14(n)) -#define rb_define_singleton_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_singleton_method12,rb_define_singleton_method_choose_prototype13(n)) -#define rb_define_singleton_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_singleton_method11,rb_define_singleton_method_choose_prototype12(n)) -#define rb_define_singleton_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_singleton_method10,rb_define_singleton_method_choose_prototype11(n)) -#define rb_define_singleton_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_singleton_method9, rb_define_singleton_method_choose_prototype10(n)) -#define rb_define_singleton_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_singleton_method8, rb_define_singleton_method_choose_prototype9(n)) -#define rb_define_singleton_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_singleton_method7, rb_define_singleton_method_choose_prototype8(n)) -#define rb_define_singleton_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_singleton_method6, rb_define_singleton_method_choose_prototype7(n)) -#define rb_define_singleton_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_singleton_method5, rb_define_singleton_method_choose_prototype6(n)) -#define rb_define_singleton_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_singleton_method4, rb_define_singleton_method_choose_prototype5(n)) -#define rb_define_singleton_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_singleton_method3, rb_define_singleton_method_choose_prototype4(n)) -#define rb_define_singleton_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_singleton_method2, rb_define_singleton_method_choose_prototype3(n)) -#define rb_define_singleton_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_singleton_method1, rb_define_singleton_method_choose_prototype2(n)) -#define rb_define_singleton_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_singleton_method0, rb_define_singleton_method_choose_prototype1(n)) -#define rb_define_singleton_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_singleton_methodm1,rb_define_singleton_method_choose_prototype0(n)) -#define rb_define_singleton_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_singleton_methodm2,rb_define_singleton_method_choose_prototypem1(n)) -#define rb_define_singleton_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_singleton_methodm3,rb_define_singleton_method_choose_prototypem2(n)) -#define rb_define_singleton_method(klass, mid, func, arity) rb_define_singleton_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif - -#endif - #if defined(__cplusplus) #if 0 { /* satisfy cc-mode */ diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6086b46348f7f5..e96ac407474cb0 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2661,6 +2661,200 @@ RUBY_SYMBOL_EXPORT_END extern "C++" { #endif +#if defined(HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P) +# define rb_f_notimplement_p(f) __builtin_types_compatible_p(__typeof__(f),__typeof__(rb_f_notimplement)) +#else +# define rb_f_notimplement_p(f) 0 +#endif + +#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) && !defined(__CYGWIN__) +#if defined(__has_attribute) && __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) +#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ + __attribute__((__unused__,__weakref__(#def),__nonnull__ nonnull))static void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity); +#endif +#endif + +#if defined(RB_METHOD_DEFINITION_DECL_C) || defined(__cplusplus) +#ifndef RB_METHOD_DEFINITION_DECL_C +#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ + static inline void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity) \ + { \ + def(RB_UNWRAP_MACRO vars,(VALUE(*)(ANYARGS))(func),arity); \ + } +#endif + +#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) +#define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) +#endif + +#define RB_UNWRAP_MACRO(...) __VA_ARGS__ + +#ifdef __cplusplus +#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) template struct def##_tmpl {}; +#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) \ + template <> struct def##_tmpl { \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)funcargs) {::defname(RB_UNWRAP_MACRO vars, func, arity);} \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, reinterpret_cast(func), arity);} \ + }; +#else +#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) /* nothing */ +#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) /* nothing */ +#endif +#define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ + RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) + +#define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \ +RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##0 ,0 ,decl,vars,(VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##1 ,1 ,decl,vars,(VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##2 ,2 ,decl,vars,(VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##3 ,3 ,decl,vars,(VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##4 ,4 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##5 ,5 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##6 ,6 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##7 ,7 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##8 ,8 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##9 ,9 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##10,10,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##11,11,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##12,12,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##13,13,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##14,14,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##15,15,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_M3(def,nonnull,def##m3,decl,vars) \ +RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##m2,-2,decl,vars,(VALUE,VALUE)) \ +RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */ +#ifdef __cplusplus +#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,VALUE*,VALUE)) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE)) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE,VALUE)) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(...)) \ + template <> struct def##_tmpl<-1> { \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ + static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ + }; +#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) /* nothing */ +#else +#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE)) +#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) \ + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,()) +#endif + +#endif + +#ifdef RB_METHOD_DEFINITION_DECL + +RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (klass, name)) +#ifdef __cplusplus +#define rb_define_method_id(m, n, f, a) rb_define_method_id_tmpl::define(m, n, f) +#else +#define rb_define_method_id_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method_id15,rb_define_method_idm3) +#define rb_define_method_id_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method_id14,rb_define_method_id_choose_prototype15(n)) +#define rb_define_method_id_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method_id13,rb_define_method_id_choose_prototype14(n)) +#define rb_define_method_id_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_method_id12,rb_define_method_id_choose_prototype13(n)) +#define rb_define_method_id_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_method_id11,rb_define_method_id_choose_prototype12(n)) +#define rb_define_method_id_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_method_id10,rb_define_method_id_choose_prototype11(n)) +#define rb_define_method_id_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_method_id9, rb_define_method_id_choose_prototype10(n)) +#define rb_define_method_id_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_method_id8, rb_define_method_id_choose_prototype9(n)) +#define rb_define_method_id_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_method_id7, rb_define_method_id_choose_prototype8(n)) +#define rb_define_method_id_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_method_id6, rb_define_method_id_choose_prototype7(n)) +#define rb_define_method_id_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_method_id5, rb_define_method_id_choose_prototype6(n)) +#define rb_define_method_id_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_method_id4, rb_define_method_id_choose_prototype5(n)) +#define rb_define_method_id_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_method_id3, rb_define_method_id_choose_prototype4(n)) +#define rb_define_method_id_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_method_id2, rb_define_method_id_choose_prototype3(n)) +#define rb_define_method_id_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_method_id1, rb_define_method_id_choose_prototype2(n)) +#define rb_define_method_id_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_method_id0, rb_define_method_id_choose_prototype1(n)) +#define rb_define_method_id_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_method_idm1,rb_define_method_id_choose_prototype0(n)) +#define rb_define_method_id_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_method_idm2,rb_define_method_id_choose_prototypem1(n)) +#define rb_define_method_id_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_method_idm3,rb_define_method_id_choose_prototypem2(n)) +#define rb_define_method_id(klass, mid, func, arity) rb_define_method_id_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); +#endif + +RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const char *name), (klass, name)) +#ifdef __cplusplus +#define rb_define_protected_method(m, n, f, a) rb_define_protected_method_tmpl::define(m, n, f) +#else +#define rb_define_protected_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_protected_method15,rb_define_protected_methodm3) +#define rb_define_protected_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_protected_method14,rb_define_protected_method_choose_prototype15(n)) +#define rb_define_protected_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_protected_method13,rb_define_protected_method_choose_prototype14(n)) +#define rb_define_protected_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_protected_method12,rb_define_protected_method_choose_prototype13(n)) +#define rb_define_protected_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_protected_method11,rb_define_protected_method_choose_prototype12(n)) +#define rb_define_protected_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_protected_method10,rb_define_protected_method_choose_prototype11(n)) +#define rb_define_protected_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_protected_method9, rb_define_protected_method_choose_prototype10(n)) +#define rb_define_protected_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_protected_method8, rb_define_protected_method_choose_prototype9(n)) +#define rb_define_protected_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_protected_method7, rb_define_protected_method_choose_prototype8(n)) +#define rb_define_protected_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_protected_method6, rb_define_protected_method_choose_prototype7(n)) +#define rb_define_protected_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_protected_method5, rb_define_protected_method_choose_prototype6(n)) +#define rb_define_protected_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_protected_method4, rb_define_protected_method_choose_prototype5(n)) +#define rb_define_protected_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_protected_method3, rb_define_protected_method_choose_prototype4(n)) +#define rb_define_protected_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_protected_method2, rb_define_protected_method_choose_prototype3(n)) +#define rb_define_protected_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_protected_method1, rb_define_protected_method_choose_prototype2(n)) +#define rb_define_protected_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_protected_method0, rb_define_protected_method_choose_prototype1(n)) +#define rb_define_protected_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_protected_methodm1,rb_define_protected_method_choose_prototype0(n)) +#define rb_define_protected_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_protected_methodm2,rb_define_protected_method_choose_prototypem1(n)) +#define rb_define_protected_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_protected_methodm3,rb_define_protected_method_choose_prototypem2(n)) +#define rb_define_protected_method(klass, mid, func, arity) rb_define_protected_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); +#endif + +RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const char *name), (klass, name)) +#ifdef __cplusplus +#define rb_define_private_method(m, n, f, a) rb_define_private_method_tmpl::define(m, n, f) +#else +#define rb_define_private_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_private_method15,rb_define_private_methodm3) +#define rb_define_private_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_private_method14,rb_define_private_method_choose_prototype15(n)) +#define rb_define_private_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_private_method13,rb_define_private_method_choose_prototype14(n)) +#define rb_define_private_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_private_method12,rb_define_private_method_choose_prototype13(n)) +#define rb_define_private_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_private_method11,rb_define_private_method_choose_prototype12(n)) +#define rb_define_private_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_private_method10,rb_define_private_method_choose_prototype11(n)) +#define rb_define_private_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_private_method9, rb_define_private_method_choose_prototype10(n)) +#define rb_define_private_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_private_method8, rb_define_private_method_choose_prototype9(n)) +#define rb_define_private_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_private_method7, rb_define_private_method_choose_prototype8(n)) +#define rb_define_private_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_private_method6, rb_define_private_method_choose_prototype7(n)) +#define rb_define_private_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_private_method5, rb_define_private_method_choose_prototype6(n)) +#define rb_define_private_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_private_method4, rb_define_private_method_choose_prototype5(n)) +#define rb_define_private_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_private_method3, rb_define_private_method_choose_prototype4(n)) +#define rb_define_private_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_private_method2, rb_define_private_method_choose_prototype3(n)) +#define rb_define_private_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_private_method1, rb_define_private_method_choose_prototype2(n)) +#define rb_define_private_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_private_method0, rb_define_private_method_choose_prototype1(n)) +#define rb_define_private_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_private_methodm1,rb_define_private_method_choose_prototype0(n)) +#define rb_define_private_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_private_methodm2,rb_define_private_method_choose_prototypem1(n)) +#define rb_define_private_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_private_methodm3,rb_define_private_method_choose_prototypem2(n)) +#define rb_define_private_method(klass, mid, func, arity) rb_define_private_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); +#endif + +RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const char *name), (klass, name)) +#ifdef __cplusplus +#define rb_define_singleton_method(m, n, f, a) rb_define_singleton_method_tmpl::define(m, n, f) +#else +#define rb_define_singleton_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_singleton_method15,rb_define_singleton_methodm3) +#define rb_define_singleton_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_singleton_method14,rb_define_singleton_method_choose_prototype15(n)) +#define rb_define_singleton_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_singleton_method13,rb_define_singleton_method_choose_prototype14(n)) +#define rb_define_singleton_method_choose_prototype12(n) rb_define_method_if_constexpr((n)==12,rb_define_singleton_method12,rb_define_singleton_method_choose_prototype13(n)) +#define rb_define_singleton_method_choose_prototype11(n) rb_define_method_if_constexpr((n)==11,rb_define_singleton_method11,rb_define_singleton_method_choose_prototype12(n)) +#define rb_define_singleton_method_choose_prototype10(n) rb_define_method_if_constexpr((n)==10,rb_define_singleton_method10,rb_define_singleton_method_choose_prototype11(n)) +#define rb_define_singleton_method_choose_prototype9(n) rb_define_method_if_constexpr((n)== 9,rb_define_singleton_method9, rb_define_singleton_method_choose_prototype10(n)) +#define rb_define_singleton_method_choose_prototype8(n) rb_define_method_if_constexpr((n)== 8,rb_define_singleton_method8, rb_define_singleton_method_choose_prototype9(n)) +#define rb_define_singleton_method_choose_prototype7(n) rb_define_method_if_constexpr((n)== 7,rb_define_singleton_method7, rb_define_singleton_method_choose_prototype8(n)) +#define rb_define_singleton_method_choose_prototype6(n) rb_define_method_if_constexpr((n)== 6,rb_define_singleton_method6, rb_define_singleton_method_choose_prototype7(n)) +#define rb_define_singleton_method_choose_prototype5(n) rb_define_method_if_constexpr((n)== 5,rb_define_singleton_method5, rb_define_singleton_method_choose_prototype6(n)) +#define rb_define_singleton_method_choose_prototype4(n) rb_define_method_if_constexpr((n)== 4,rb_define_singleton_method4, rb_define_singleton_method_choose_prototype5(n)) +#define rb_define_singleton_method_choose_prototype3(n) rb_define_method_if_constexpr((n)== 3,rb_define_singleton_method3, rb_define_singleton_method_choose_prototype4(n)) +#define rb_define_singleton_method_choose_prototype2(n) rb_define_method_if_constexpr((n)== 2,rb_define_singleton_method2, rb_define_singleton_method_choose_prototype3(n)) +#define rb_define_singleton_method_choose_prototype1(n) rb_define_method_if_constexpr((n)== 1,rb_define_singleton_method1, rb_define_singleton_method_choose_prototype2(n)) +#define rb_define_singleton_method_choose_prototype0(n) rb_define_method_if_constexpr((n)== 0,rb_define_singleton_method0, rb_define_singleton_method_choose_prototype1(n)) +#define rb_define_singleton_method_choose_prototypem1(n) rb_define_method_if_constexpr((n)==-1,rb_define_singleton_methodm1,rb_define_singleton_method_choose_prototype0(n)) +#define rb_define_singleton_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_singleton_methodm2,rb_define_singleton_method_choose_prototypem1(n)) +#define rb_define_singleton_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_singleton_methodm3,rb_define_singleton_method_choose_prototypem2(n)) +#define rb_define_singleton_method(klass, mid, func, arity) rb_define_singleton_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); +#endif + +#endif + #ifdef RB_METHOD_DEFINITION_DECL RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *name), (klass, name)) From 01825e8bffde9f4517e60878f8a829f91c361d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 11:43:33 +0900 Subject: [PATCH 527/878] template metaprogramming instead of macros C++ (and myself) hates macros. If we could do the same thing in both preprocessor and template, we shall choose template. This particular part of the ruby header is one of such situations. --- include/ruby/backward/cxxanyargs.hpp | 186 ++++++++++++++++++++++++++- include/ruby/ruby.h | 12 +- 2 files changed, 189 insertions(+), 9 deletions(-) diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 3585f678b8d77a..b2491956d7fda6 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -11,6 +11,8 @@ /// meant to be a backwards compatibility shim. Please stick to /// C++ 98 and never use newer features, like `constexpr`. +extern "C++" { + /// @brief The main namespace. /// @note The name "ruby" might already be taken, but that must not be a /// problem because namespaces are allowed to reopen. @@ -433,7 +435,189 @@ rb_ivar_foreach(VALUE q, int_type *w, VALUE e) } /// @} -}}} + +/// @brief Driver for *_define_method +/// +/// ::rb_define_method function for instance takes a pointer to ANYARGS-ed +/// functions, which in fact varies 18 different prototypes. We still need to +/// preserve ANYARGS for storages but why not check the consistencies if +/// possible. In C++ a function has its own prototype, which is a compile-time +/// constant (static type) by nature. We can list up all the possible input +/// types and provide warnings for other cases. This is such attempt. +namespace define_method { + +/// @brief Template metaprogramming to generate function prototypes. +/// @tparam T Type of method id (`ID` or `const char*` in practice). +/// @tparam F Definition driver e.g. ::rb_define_method. +template +struct driver { + + /// @brief Defines a method + /// @tparam N Arity of the function. + /// @tparam U The function in question + template + struct engine { + + /* :TODO: Following deprecation attribute renders tons of warnings (one + * per every method definitions), which is annoying. Of course + * annoyance is the core feature of deprecation warnings... But that + * could be too much, especially when the warnings happen inside of + * machine-generated programs. And SWIG is known to do such thing. + * The new (granular) API was introduced in API version 2.7. As of + * this writing the version is 2.8. Let's warn this later, some time + * during 3.x. Hopefully codes in old (ANYARGS-ed) format should be + * less than now. */ +#if (RUBY_API_VERSION_MAJOR * 100 + RUBY_API_VERSION_MINOR) >= 301 + RUBY_CXX_DEPRECATED("use of ANYARGS is deprecated") +#endif + /// @brief Defines klass#mid as func, whose arity is N. + /// @param[in] klass Where the method lives. + /// @param[in] mid Name of the method to define. + /// @param[in] func Function that implements klass#mid. + /// @deprecated Pass corrctly typed function instead. + static inline void + define(VALUE klass, T mid, type func) + { + F(klass, mid, func, N); + } + + /// @brief Defines klass#mid as func, whose arity is N. + /// @param[in] klass Where the method lives. + /// @param[in] mid Name of the method to define. + /// @param[in] func Function that implements klass#mid. + static inline void + define(VALUE klass, T mid, U func) + { + F(klass, mid, reinterpret_cast(func), N); + } + }; + + /// @cond INTERNAL_MACRO + template struct specific : public engine {}; + template struct specific<15, b> : public engine<15, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<14, b> : public engine<14, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<13, b> : public engine<13, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<12, b> : public engine<12, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<11, b> : public engine<11, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<10, b> : public engine<10, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 9, b> : public engine< 9, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 8, b> : public engine< 8, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 7, b> : public engine< 7, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 6, b> : public engine< 6, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 5, b> : public engine< 5, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 4, b> : public engine< 4, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 3, b> : public engine< 3, VALUE(*)(VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {}; + template struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {}; + template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; + template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)> { + using engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)>::define; + static inline void define(VALUE c, T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } + static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } + static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(c, m, reinterpret_cast(f), -1); } + }; + template struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {}; + /// @endcond +}; + +/* We could perhaps merge this struct into the one above using variadic + * template parameters if we could assume C++11, but sadly we cannot. */ +template +struct driver0 { + template + struct engine { + RUBY_CXX_DEPRECATED("use of ANYARGS is deprecated") + static inline void + define(T mid, type func) + { + F(mid, func, N); + } + static inline void + define(T mid, U func) + { + F(mid, reinterpret_cast(func), N); + } + }; + /// @cond INTERNAL_MACRO + template struct specific : public engine {}; + template struct specific<15, b> : public engine<15, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<14, b> : public engine<14, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<13, b> : public engine<13, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<12, b> : public engine<12, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<11, b> : public engine<11, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific<10, b> : public engine<10, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 9, b> : public engine< 9, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 8, b> : public engine< 8, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 7, b> : public engine< 7, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 6, b> : public engine< 6, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 5, b> : public engine< 5, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 4, b> : public engine< 4, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 3, b> : public engine< 3, VALUE(*)(VALUE, VALUE, VALUE, VALUE)> {}; + template struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {}; + template struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {}; + template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; + template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)> { + using engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)>::define; + static inline void define(T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } + static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } + static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(m, reinterpret_cast(f), -1); } + }; + template struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {}; + /// @endcond +}; + +/// @brief Dispatches appropriate driver for ::rb_define_method +struct rb_define_method : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_method_id +struct rb_define_method_id : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_private_method +struct rb_define_private_method : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_protected_method +struct rb_define_protected_method : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_singleton_method +struct rb_define_singleton_method : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_module_function +struct rb_define_module_function : public driver {}; + +/// @brief Dispatches appropriate driver for ::rb_define_global_function +struct rb_define_global_function : public driver0 {}; + +/// @brief Defines klass\#mid. +/// @param klass Where the method lives. +/// @copydetails #rb_define_global_function +#define rb_define_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_method::specific::define(klass, mid, func) + +/// @copydoc #rb_define_method +#define rb_define_method_id(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_method_id::specific::define(klass, mid, func) + +/// @brief Defines klass\#mid and makes it private. +/// @copydetails #rb_define_method +#define rb_define_private_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_private_method::specific::define(klass, mid, func) + +/// @brief Defines klass\#mid and makes it protected. +/// @copydetails #rb_define_method +#define rb_define_protected_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_protected_method::specific::define(klass, mid, func) + +/// @brief Defines klass.mid. +/// @copydetails #rb_define_method +#define rb_define_singleton_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_singleton_method::specific::define(klass, mid, func) + +/// @brief Defines klass\#mid and makes it a module function. +/// @copydetails #rb_define_method +#define rb_define_module_function(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_module_function::specific::define(klass, mid, func) + +/// @brief Defines ::rb_cKerbel \#mid. +/// @param mid Name of the defining method. +/// @param func Implementation of \#mid. +/// @param arity Arity of \#mid. +#define rb_define_global_function(mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_global_function::specific::define(mid, func) + +}}}}} using namespace ruby::backward::cxxanyargs; #endif // RUBY_BACKWARD_CXXANYARGS_HPP diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index e96ac407474cb0..9b3a2bcf81243d 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2654,12 +2654,8 @@ void ruby_sig_finalize(void); RUBY_SYMBOL_EXPORT_END #if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -extern "C++" { -#endif +#include "backward/cxxanyargs.hpp" +#else #if defined(HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P) # define rb_f_notimplement_p(f) __builtin_types_compatible_p(__typeof__(f),__typeof__(rb_f_notimplement)) @@ -2937,6 +2933,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), #endif +#endif /* __cplusplus */ + #if defined(RUBY_DEVEL) && RUBY_DEVEL && (!defined(__cplusplus) || defined(RB_METHOD_DEFINITION_DECL)) # define RUBY_METHOD_FUNC(func) (func) #else @@ -2944,8 +2942,6 @@ RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), #endif #ifdef __cplusplus -#include "backward/cxxanyargs.hpp" - #if 0 { /* satisfy cc-mode */ #endif From 31fc34c969e2342e24fa52519d7b0a3b950a43e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 13:29:13 +0900 Subject: [PATCH 528/878] delete unreachable branch Case of __cplusplus is handled in cxxanyargs.hpp now. These deleted codes no longer reachable. --- include/ruby/ruby.h | 72 ++------------------------------------------- 1 file changed, 2 insertions(+), 70 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 9b3a2bcf81243d..5f5a6c8abd89db 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2670,38 +2670,17 @@ RUBY_SYMBOL_EXPORT_END #endif #endif -#if defined(RB_METHOD_DEFINITION_DECL_C) || defined(__cplusplus) -#ifndef RB_METHOD_DEFINITION_DECL_C -#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - static inline void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity) \ - { \ - def(RB_UNWRAP_MACRO vars,(VALUE(*)(ANYARGS))(func),arity); \ - } -#endif - +#if defined(RB_METHOD_DEFINITION_DECL_C) #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) #define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) #endif #define RB_UNWRAP_MACRO(...) __VA_ARGS__ -#ifdef __cplusplus -#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) template struct def##_tmpl {}; -#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) \ - template <> struct def##_tmpl { \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)funcargs) {::defname(RB_UNWRAP_MACRO vars, func, arity);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, reinterpret_cast(func), arity);} \ - }; -#else -#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) /* nothing */ -#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) /* nothing */ -#endif #define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) + RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) #define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \ -RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) \ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##0 ,0 ,decl,vars,(VALUE)) \ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##1 ,1 ,decl,vars,(VALUE,VALUE)) \ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##2 ,2 ,decl,vars,(VALUE,VALUE,VALUE)) \ @@ -2721,34 +2700,16 @@ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##15,15,decl,vars,(VALUE,VALUE,VALUE, RB_METHOD_DEFINITION_DECL_M3(def,nonnull,def##m3,decl,vars) \ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##m2,-2,decl,vars,(VALUE,VALUE)) \ RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */ -#ifdef __cplusplus -#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,VALUE*,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE,VALUE)) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(...)) \ - template <> struct def##_tmpl<-1> { \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(...)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \ - }; -#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) /* nothing */ -#else #define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE)) #define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) \ RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,()) -#endif #endif #ifdef RB_METHOD_DEFINITION_DECL RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (klass, name)) -#ifdef __cplusplus -#define rb_define_method_id(m, n, f, a) rb_define_method_id_tmpl::define(m, n, f) -#else #define rb_define_method_id_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method_id15,rb_define_method_idm3) #define rb_define_method_id_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method_id14,rb_define_method_id_choose_prototype15(n)) #define rb_define_method_id_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method_id13,rb_define_method_id_choose_prototype14(n)) @@ -2769,12 +2730,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (kla #define rb_define_method_id_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_method_idm2,rb_define_method_id_choose_prototypem1(n)) #define rb_define_method_id_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_method_idm3,rb_define_method_id_choose_prototypem2(n)) #define rb_define_method_id(klass, mid, func, arity) rb_define_method_id_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_protected_method(m, n, f, a) rb_define_protected_method_tmpl::define(m, n, f) -#else #define rb_define_protected_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_protected_method15,rb_define_protected_methodm3) #define rb_define_protected_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_protected_method14,rb_define_protected_method_choose_prototype15(n)) #define rb_define_protected_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_protected_method13,rb_define_protected_method_choose_prototype14(n)) @@ -2795,12 +2752,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const #define rb_define_protected_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_protected_methodm2,rb_define_protected_method_choose_prototypem1(n)) #define rb_define_protected_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_protected_methodm3,rb_define_protected_method_choose_prototypem2(n)) #define rb_define_protected_method(klass, mid, func, arity) rb_define_protected_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_private_method(m, n, f, a) rb_define_private_method_tmpl::define(m, n, f) -#else #define rb_define_private_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_private_method15,rb_define_private_methodm3) #define rb_define_private_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_private_method14,rb_define_private_method_choose_prototype15(n)) #define rb_define_private_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_private_method13,rb_define_private_method_choose_prototype14(n)) @@ -2821,12 +2774,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const c #define rb_define_private_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_private_methodm2,rb_define_private_method_choose_prototypem1(n)) #define rb_define_private_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_private_methodm3,rb_define_private_method_choose_prototypem2(n)) #define rb_define_private_method(klass, mid, func, arity) rb_define_private_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_singleton_method(m, n, f, a) rb_define_singleton_method_tmpl::define(m, n, f) -#else #define rb_define_singleton_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_singleton_method15,rb_define_singleton_methodm3) #define rb_define_singleton_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_singleton_method14,rb_define_singleton_method_choose_prototype15(n)) #define rb_define_singleton_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_singleton_method13,rb_define_singleton_method_choose_prototype14(n)) @@ -2847,16 +2796,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const #define rb_define_singleton_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_singleton_methodm2,rb_define_singleton_method_choose_prototypem1(n)) #define rb_define_singleton_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_singleton_methodm3,rb_define_singleton_method_choose_prototypem2(n)) #define rb_define_singleton_method(klass, mid, func, arity) rb_define_singleton_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif - -#endif - -#ifdef RB_METHOD_DEFINITION_DECL RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_method(m, n, f, a) rb_define_method_tmpl::define(m, n, f) -#else #define rb_define_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method15,rb_define_methodm3) #define rb_define_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method14,rb_define_method_choose_prototype15(n)) #define rb_define_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method13,rb_define_method_choose_prototype14(n)) @@ -2877,12 +2818,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *nam #define rb_define_method_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_methodm2,rb_define_method_choose_prototypem1(n)) #define rb_define_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_methodm3,rb_define_method_choose_prototypem2(n)) #define rb_define_method(klass, mid, func, arity) rb_define_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif RB_METHOD_DEFINITION_DECL(rb_define_module_function, (2,3), (VALUE klass, const char *name), (klass, name)) -#ifdef __cplusplus -#define rb_define_module_function(m, n, f, a) rb_define_module_function_tmpl::define(m, n, f) -#else #define rb_define_module_function_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_module_function15,rb_define_module_functionm3) #define rb_define_module_function_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_module_function14,rb_define_module_function_choose_prototype15(n)) #define rb_define_module_function_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_module_function13,rb_define_module_function_choose_prototype14(n)) @@ -2903,12 +2840,8 @@ RB_METHOD_DEFINITION_DECL(rb_define_module_function, (2,3), (VALUE klass, const #define rb_define_module_function_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_module_functionm2,rb_define_module_function_choose_prototypem1(n)) #define rb_define_module_function_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_module_functionm3,rb_define_module_function_choose_prototypem2(n)) #define rb_define_module_function(klass, mid, func, arity) rb_define_module_function_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -#endif RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), (name)) -#ifdef __cplusplus -#define rb_define_global_function(n, f, a) rb_define_global_function_tmpl::define(n, f) -#else #define rb_define_global_function_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_global_function15,rb_define_global_functionm3) #define rb_define_global_function_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_global_function14,rb_define_global_function_choose_prototype15(n)) #define rb_define_global_function_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_global_function13,rb_define_global_function_choose_prototype14(n)) @@ -2929,7 +2862,6 @@ RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), #define rb_define_global_function_choose_prototypem2(n) rb_define_method_if_constexpr((n)==-2,rb_define_global_functionm2,rb_define_global_function_choose_prototypem1(n)) #define rb_define_global_function_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_global_functionm3,rb_define_global_function_choose_prototypem2(n)) #define rb_define_global_function(mid, func, arity) rb_define_global_function_choose_prototypem3((arity),(func))((mid),(func),(arity)); -#endif #endif From 0a2e0db483883b5fe24233d6f83d38fd7c6db657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 13:54:15 +0900 Subject: [PATCH 529/878] delete RB_METHOD_DEFINITION_DECL_1 This macro is no longer useful. Just expand it. --- include/ruby/ruby.h | 83 ++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 50 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 5f5a6c8abd89db..dc1eb29e0c2fa2 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2663,53 +2663,36 @@ RUBY_SYMBOL_EXPORT_END # define rb_f_notimplement_p(f) 0 #endif -#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) && !defined(__CYGWIN__) -#if defined(__has_attribute) && __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) -#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \ - __attribute__((__unused__,__weakref__(#def),__nonnull__ nonnull))static void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity); -#endif -#endif - -#if defined(RB_METHOD_DEFINITION_DECL_C) #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) #define rb_define_method_if_constexpr(x, t, f) __builtin_choose_expr(__builtin_choose_expr(__builtin_constant_p(x),(x),0),(t),(f)) #endif -#define RB_UNWRAP_MACRO(...) __VA_ARGS__ - -#define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) - -#define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##0 ,0 ,decl,vars,(VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##1 ,1 ,decl,vars,(VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##2 ,2 ,decl,vars,(VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##3 ,3 ,decl,vars,(VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##4 ,4 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##5 ,5 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##6 ,6 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##7 ,7 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##8 ,8 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##9 ,9 ,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##10,10,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##11,11,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##12,12,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##13,13,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##14,14,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##15,15,decl,vars,(VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_M3(def,nonnull,def##m3,decl,vars) \ -RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##m2,-2,decl,vars,(VALUE,VALUE)) \ -RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */ -#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE)) -#define RB_METHOD_DEFINITION_DECL_M3(def,nonnull,defname,decl,vars) \ - RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,()) - -#endif - -#ifdef RB_METHOD_DEFINITION_DECL - -RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (klass, name)) +#if defined(__has_attribute) && __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) +#define RB_METHOD_DEFINITION_DECL(def, nonnull, ...) \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## m3(__VA_ARGS__, VALUE(*)(ANYARGS), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## m2(__VA_ARGS__, VALUE(*)(VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## m1(__VA_ARGS__, VALUE(*)(int, union { VALUE *x; const VALUE *y; } __attribute__((__transparent_union__)), VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 0(__VA_ARGS__, VALUE(*)(VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 1(__VA_ARGS__, VALUE(*)(VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 2(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 3(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 4(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 5(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 6(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 7(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 8(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 9(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 10(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 11(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 12(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 13(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 14(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \ +__attribute__((__unused__, __weakref__(#def), __nonnull__ nonnull)) static void def ## 15(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); +#endif + +#if defined(RB_METHOD_DEFINITION_DECL) && !defined(_WIN32) && !defined(__CYGWIN__) + +RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), VALUE klass, ID name) #define rb_define_method_id_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method_id15,rb_define_method_idm3) #define rb_define_method_id_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method_id14,rb_define_method_id_choose_prototype15(n)) #define rb_define_method_id_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method_id13,rb_define_method_id_choose_prototype14(n)) @@ -2731,7 +2714,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_method_id, (3), (VALUE klass, ID name), (kla #define rb_define_method_id_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_method_idm3,rb_define_method_id_choose_prototypem2(n)) #define rb_define_method_id(klass, mid, func, arity) rb_define_method_id_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const char *name), (klass, name)) +RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), VALUE klass, const char *name) #define rb_define_protected_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_protected_method15,rb_define_protected_methodm3) #define rb_define_protected_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_protected_method14,rb_define_protected_method_choose_prototype15(n)) #define rb_define_protected_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_protected_method13,rb_define_protected_method_choose_prototype14(n)) @@ -2753,7 +2736,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_protected_method, (2,3), (VALUE klass, const #define rb_define_protected_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_protected_methodm3,rb_define_protected_method_choose_prototypem2(n)) #define rb_define_protected_method(klass, mid, func, arity) rb_define_protected_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const char *name), (klass, name)) +RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), VALUE klass, const char *name) #define rb_define_private_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_private_method15,rb_define_private_methodm3) #define rb_define_private_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_private_method14,rb_define_private_method_choose_prototype15(n)) #define rb_define_private_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_private_method13,rb_define_private_method_choose_prototype14(n)) @@ -2775,7 +2758,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_private_method, (2,3), (VALUE klass, const c #define rb_define_private_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_private_methodm3,rb_define_private_method_choose_prototypem2(n)) #define rb_define_private_method(klass, mid, func, arity) rb_define_private_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const char *name), (klass, name)) +RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), VALUE klass, const char *name) #define rb_define_singleton_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_singleton_method15,rb_define_singleton_methodm3) #define rb_define_singleton_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_singleton_method14,rb_define_singleton_method_choose_prototype15(n)) #define rb_define_singleton_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_singleton_method13,rb_define_singleton_method_choose_prototype14(n)) @@ -2797,7 +2780,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_singleton_method, (2,3), (VALUE klass, const #define rb_define_singleton_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_singleton_methodm3,rb_define_singleton_method_choose_prototypem2(n)) #define rb_define_singleton_method(klass, mid, func, arity) rb_define_singleton_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *name), (klass, name)) +RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), VALUE klass, const char *name) #define rb_define_method_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_method15,rb_define_methodm3) #define rb_define_method_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_method14,rb_define_method_choose_prototype15(n)) #define rb_define_method_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_method13,rb_define_method_choose_prototype14(n)) @@ -2819,7 +2802,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_method, (2,3), (VALUE klass, const char *nam #define rb_define_method_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_methodm3,rb_define_method_choose_prototypem2(n)) #define rb_define_method(klass, mid, func, arity) rb_define_method_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_module_function, (2,3), (VALUE klass, const char *name), (klass, name)) +RB_METHOD_DEFINITION_DECL(rb_define_module_function, (2,3), VALUE klass, const char *name) #define rb_define_module_function_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_module_function15,rb_define_module_functionm3) #define rb_define_module_function_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_module_function14,rb_define_module_function_choose_prototype15(n)) #define rb_define_module_function_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_module_function13,rb_define_module_function_choose_prototype14(n)) @@ -2841,7 +2824,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_module_function, (2,3), (VALUE klass, const #define rb_define_module_function_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_module_functionm3,rb_define_module_function_choose_prototypem2(n)) #define rb_define_module_function(klass, mid, func, arity) rb_define_module_function_choose_prototypem3((arity),(func))((klass),(mid),(func),(arity)); -RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), (name)) +RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), const char *name) #define rb_define_global_function_choose_prototype15(n) rb_define_method_if_constexpr((n)==15,rb_define_global_function15,rb_define_global_functionm3) #define rb_define_global_function_choose_prototype14(n) rb_define_method_if_constexpr((n)==14,rb_define_global_function14,rb_define_global_function_choose_prototype15(n)) #define rb_define_global_function_choose_prototype13(n) rb_define_method_if_constexpr((n)==13,rb_define_global_function13,rb_define_global_function_choose_prototype14(n)) @@ -2863,7 +2846,7 @@ RB_METHOD_DEFINITION_DECL(rb_define_global_function, (1,2), (const char *name), #define rb_define_global_function_choose_prototypem3(n, f) rb_define_method_if_constexpr(rb_f_notimplement_p(f),rb_define_global_functionm3,rb_define_global_function_choose_prototypem2(n)) #define rb_define_global_function(mid, func, arity) rb_define_global_function_choose_prototypem3((arity),(func))((mid),(func),(arity)); -#endif +#endif /* ! _WIN32 && ! __CYGWIN__ */ #endif /* __cplusplus */ From 03df02e8716fa698c3dbc3fae0af80baa2096ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 16:49:00 +0900 Subject: [PATCH 530/878] fix typo Add missing `*`. --- include/ruby/backward/cxxanyargs.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index b2491956d7fda6..09ad97621043b8 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -510,8 +510,8 @@ struct driver { template struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {}; template struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {}; template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; - template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)> { - using engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)>::define; + template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { + using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; static inline void define(VALUE c, T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(c, m, reinterpret_cast(f), -1); } @@ -556,8 +556,8 @@ struct driver0 { template struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {}; template struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {}; template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; - template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)> { - using engine<-1, VALUE(*)(int argc, VALUE argv, VALUE self)>::define; + template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { + using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; static inline void define(T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(m, reinterpret_cast(f), -1); } From 7cf5d547e422134d506d37a179f64be9e98b105c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 16:52:56 +0900 Subject: [PATCH 531/878] delete duplicated function overload The `using engine<...snip...>::define;` line already defines this function. We don't have to repeat. --- include/ruby/backward/cxxanyargs.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 09ad97621043b8..16529f8db23abe 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -512,7 +512,6 @@ struct driver { template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; - static inline void define(VALUE c, T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(c, m, reinterpret_cast(f), -1); } }; @@ -558,7 +557,6 @@ struct driver0 { template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; - static inline void define(T m, VALUE(*f)(int argc, VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(m, reinterpret_cast(f), -1); } }; From 3c3eb418f9ce05740e5ca506b9cd5fe5cabc4bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 17:02:30 +0900 Subject: [PATCH 532/878] improved support for rb_f_notimplement rb_f_notimplement should be accepted for all possible arities. Test provided for that. --- ext/-test-/cxxanyargs/cxxanyargs.cpp | 30 ++++++++++++++++++++++++++++ include/ruby/backward/cxxanyargs.hpp | 20 +++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index efe35fa359c51d..eef2387650081e 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -383,6 +383,12 @@ namespace test_rb_define_method { rb_define_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_method(self, "mv", (VALUE (*)(...))(mv), -1); + // rb_f_notimplement + rb_define_method(self, "m1", rb_f_notimplement, 1); + rb_define_method(self, "m2", rb_f_notimplement, 2); + rb_define_method(self, "ma", rb_f_notimplement, -2); + rb_define_method(self, "mv", rb_f_notimplement, -1); + return self; } } @@ -433,6 +439,12 @@ namespace test_rb_define_module_function { rb_define_module_function(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_module_function(self, "mv", (VALUE (*)(...))(mv), -1); + // rb_f_notimplement + rb_define_module_function(self, "m1", rb_f_notimplement, 1); + rb_define_module_function(self, "m2", rb_f_notimplement, 2); + rb_define_module_function(self, "ma", rb_f_notimplement, -2); + rb_define_module_function(self, "mv", rb_f_notimplement, -1); + return self; } } @@ -483,6 +495,12 @@ namespace test_rb_define_singleton_method { rb_define_singleton_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_singleton_method(self, "mv", (VALUE (*)(...))(mv), -1); + // rb_f_notimplement + rb_define_singleton_method(self, "m1", rb_f_notimplement, 1); + rb_define_singleton_method(self, "m2", rb_f_notimplement, 2); + rb_define_singleton_method(self, "ma", rb_f_notimplement, -2); + rb_define_singleton_method(self, "mv", rb_f_notimplement, -1); + return self; } } @@ -533,6 +551,12 @@ namespace test_rb_define_protected_method { rb_define_protected_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_protected_method(self, "mv", (VALUE (*)(...))(mv), -1); + // rb_f_notimplement + rb_define_protected_method(self, "m1", rb_f_notimplement, 1); + rb_define_protected_method(self, "m2", rb_f_notimplement, 2); + rb_define_protected_method(self, "ma", rb_f_notimplement, -2); + rb_define_protected_method(self, "mv", rb_f_notimplement, -1); + return self; } } @@ -583,6 +607,12 @@ namespace test_rb_define_private_method { rb_define_private_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_private_method(self, "mv", (VALUE (*)(...))(mv), -1); + // rb_f_notimplement + rb_define_private_method(self, "m1", rb_f_notimplement, 1); + rb_define_private_method(self, "m2", rb_f_notimplement, 2); + rb_define_private_method(self, "ma", rb_f_notimplement, -2); + rb_define_private_method(self, "mv", rb_f_notimplement, -1); + return self; } } diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 16529f8db23abe..31758c14e57f67 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -446,6 +446,9 @@ rb_ivar_foreach(VALUE q, int_type *w, VALUE e) /// types and provide warnings for other cases. This is such attempt. namespace define_method { +/// @brief type of rb_f_notimplement +typedef VALUE notimpl_type(int, const VALUE *, VALUE, VALUE); + /// @brief Template metaprogramming to generate function prototypes. /// @tparam T Type of method id (`ID` or `const char*` in practice). /// @tparam F Definition driver e.g. ::rb_define_method. @@ -490,6 +493,16 @@ struct driver { { F(klass, mid, reinterpret_cast(func), N); } + + /// @brief Defines klass#mid as func, whose arity is N. + /// @param[in] klass Where the method lives. + /// @param[in] mid Name of the method to define. + /// @param[in] func Function that implements klass#mid. + static inline void + define(VALUE klass, T mid, notimpl_type func) + { + F(klass, mid, reinterpret_cast(func), N); + } }; /// @cond INTERNAL_MACRO @@ -513,7 +526,6 @@ struct driver { template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast(f), -1); } - static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(c, m, reinterpret_cast(f), -1); } }; template struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {}; /// @endcond @@ -536,6 +548,11 @@ struct driver0 { { F(mid, reinterpret_cast(func), N); } + static inline void + define(T mid, notimpl_type func) + { + F(mid, reinterpret_cast(func), N); + } }; /// @cond INTERNAL_MACRO template struct specific : public engine {}; @@ -557,7 +574,6 @@ struct driver0 { template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; - static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(m, reinterpret_cast(f), -1); } }; template struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {}; From 16592d6b69dc2538f419edcbd4c91ebb917db5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 17:05:43 +0900 Subject: [PATCH 533/878] add test for rb_define_method_id was missing. --- ext/-test-/cxxanyargs/cxxanyargs.cpp | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index eef2387650081e..1a79913a13c56d 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -393,6 +393,62 @@ namespace test_rb_define_method { } } +namespace test_rb_define_method_id { + static VALUE + m1(VALUE, VALUE) + { + return Qnil; + } + + static VALUE + m2(VALUE, VALUE, VALUE) + { + return Qnil; + } + + static VALUE + ma(VALUE, VALUE) + { + return Qnil; + } + + static VALUE + mv(int, VALUE*, VALUE) + { + return Qnil; + } + + VALUE + test(VALUE self) + { + // No cast + rb_define_method_id(self, rb_intern("m1"), m1, 1); + rb_define_method_id(self, rb_intern("m2"), m2, 2); + rb_define_method_id(self, rb_intern("ma"), ma, -2); + rb_define_method_id(self, rb_intern("mv"), mv, -1); + + // Cast by RUBY_METHOD_FUNC + rb_define_method_id(self, rb_intern("m1"), RUBY_METHOD_FUNC(m1), 1); + rb_define_method_id(self, rb_intern("m2"), RUBY_METHOD_FUNC(m2), 2); + rb_define_method_id(self, rb_intern("ma"), RUBY_METHOD_FUNC(ma), -2); + rb_define_method_id(self, rb_intern("mv"), RUBY_METHOD_FUNC(mv), -1); + + // Explicit cast instead of RUBY_METHOD_FUNC + rb_define_method_id(self, rb_intern("m1"), (VALUE (*)(...))(m1), 1); + rb_define_method_id(self, rb_intern("m2"), (VALUE (*)(...))(m2), 2); + rb_define_method_id(self, rb_intern("ma"), (VALUE (*)(...))(ma), -2); + rb_define_method_id(self, rb_intern("mv"), (VALUE (*)(...))(mv), -1); + + // rb_f_notimplement + rb_define_method_id(self, rb_intern("m1"), rb_f_notimplement, 1); + rb_define_method_id(self, rb_intern("m2"), rb_f_notimplement, 2); + rb_define_method_id(self, rb_intern("ma"), rb_f_notimplement, -2); + rb_define_method_id(self, rb_intern("mv"), rb_f_notimplement, -1); + + return self; + } +} + namespace test_rb_define_module_function { static VALUE m1(VALUE, VALUE) From bbe3420cce30de74b8c4a4f21adecf57a7d52395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 17:08:20 +0900 Subject: [PATCH 534/878] add test for rb_define_global_function was missing. --- ext/-test-/cxxanyargs/cxxanyargs.cpp | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index 1a79913a13c56d..a9f2d9ab7c6b85 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -673,6 +673,62 @@ namespace test_rb_define_private_method { } } +namespace test_rb_define_global_function { + static VALUE + m1(VALUE, VALUE) + { + return Qnil; + } + + static VALUE + m2(VALUE, VALUE, VALUE) + { + return Qnil; + } + + static VALUE + ma(VALUE, VALUE) + { + return Qnil; + } + + static VALUE + mv(int, VALUE*, VALUE) + { + return Qnil; + } + + VALUE + test(VALUE self) + { + // No cast + rb_define_global_function("m1", m1, 1); + rb_define_global_function("m2", m2, 2); + rb_define_global_function("ma", ma, -2); + rb_define_global_function("mv", mv, -1); + + // Cast by RUBY_METHOD_FUNC + rb_define_global_function("m1", RUBY_METHOD_FUNC(m1), 1); + rb_define_global_function("m2", RUBY_METHOD_FUNC(m2), 2); + rb_define_global_function("ma", RUBY_METHOD_FUNC(ma), -2); + rb_define_global_function("mv", RUBY_METHOD_FUNC(mv), -1); + + // Explicit cast instead of RUBY_METHOD_FUNC + rb_define_global_function("m1", (VALUE (*)(...))(m1), 1); + rb_define_global_function("m2", (VALUE (*)(...))(m2), 2); + rb_define_global_function("ma", (VALUE (*)(...))(ma), -2); + rb_define_global_function("mv", (VALUE (*)(...))(mv), -1); + + // rb_f_notimplement + rb_define_global_function("m1", rb_f_notimplement, 1); + rb_define_global_function("m2", rb_f_notimplement, 2); + rb_define_global_function("ma", rb_f_notimplement, -2); + rb_define_global_function("mv", rb_f_notimplement, -1); + + return self; + } +} + extern "C" void Init_cxxanyargs(void) { @@ -698,8 +754,10 @@ Init_cxxanyargs(void) test(rb_hash_foreach); test(rb_ivar_foreach); test(rb_define_method); + test(rb_define_method_id); test(rb_define_module_function); test(rb_define_singleton_method); test(rb_define_protected_method); test(rb_define_private_method); + test(rb_define_global_function); } From 83d6487ae5c5df6c463373b36ccf1bee3f91d386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 28 Jan 2020 17:20:16 +0900 Subject: [PATCH 535/878] fix rb_define_global_function to take const VALUE* It was unable for rb_define_global_function to take VALUE(*)(int argc, const VLAUE *argv, VALUE self) -style function. Test added. --- ext/-test-/cxxanyargs/cxxanyargs.cpp | 70 ++++++++++++++++++++++++++++ include/ruby/backward/cxxanyargs.hpp | 2 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index a9f2d9ab7c6b85..812c6d7e60649e 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -362,6 +362,12 @@ namespace test_rb_define_method { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -370,24 +376,28 @@ namespace test_rb_define_method { rb_define_method(self, "m2", m2, 2); rb_define_method(self, "ma", ma, -2); rb_define_method(self, "mv", mv, -1); + rb_define_method(self, "mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_method(self, "m1", RUBY_METHOD_FUNC(m1), 1); rb_define_method(self, "m2", RUBY_METHOD_FUNC(m2), 2); rb_define_method(self, "ma", RUBY_METHOD_FUNC(ma), -2); rb_define_method(self, "mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_method(self, "mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_method(self, "m1", (VALUE (*)(...))(m1), 1); rb_define_method(self, "m2", (VALUE (*)(...))(m2), 2); rb_define_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_method(self, "mv", (VALUE (*)(...))(mv), -1); + rb_define_method(self, "mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_method(self, "m1", rb_f_notimplement, 1); rb_define_method(self, "m2", rb_f_notimplement, 2); rb_define_method(self, "ma", rb_f_notimplement, -2); rb_define_method(self, "mv", rb_f_notimplement, -1); + rb_define_method(self, "mc", rb_f_notimplement, -1); return self; } @@ -418,6 +428,12 @@ namespace test_rb_define_method_id { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -426,24 +442,28 @@ namespace test_rb_define_method_id { rb_define_method_id(self, rb_intern("m2"), m2, 2); rb_define_method_id(self, rb_intern("ma"), ma, -2); rb_define_method_id(self, rb_intern("mv"), mv, -1); + rb_define_method_id(self, rb_intern("mc"), mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_method_id(self, rb_intern("m1"), RUBY_METHOD_FUNC(m1), 1); rb_define_method_id(self, rb_intern("m2"), RUBY_METHOD_FUNC(m2), 2); rb_define_method_id(self, rb_intern("ma"), RUBY_METHOD_FUNC(ma), -2); rb_define_method_id(self, rb_intern("mv"), RUBY_METHOD_FUNC(mv), -1); + rb_define_method_id(self, rb_intern("mc"), RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_method_id(self, rb_intern("m1"), (VALUE (*)(...))(m1), 1); rb_define_method_id(self, rb_intern("m2"), (VALUE (*)(...))(m2), 2); rb_define_method_id(self, rb_intern("ma"), (VALUE (*)(...))(ma), -2); rb_define_method_id(self, rb_intern("mv"), (VALUE (*)(...))(mv), -1); + rb_define_method_id(self, rb_intern("mc"), (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_method_id(self, rb_intern("m1"), rb_f_notimplement, 1); rb_define_method_id(self, rb_intern("m2"), rb_f_notimplement, 2); rb_define_method_id(self, rb_intern("ma"), rb_f_notimplement, -2); rb_define_method_id(self, rb_intern("mv"), rb_f_notimplement, -1); + rb_define_method_id(self, rb_intern("mc"), rb_f_notimplement, -1); return self; } @@ -474,6 +494,12 @@ namespace test_rb_define_module_function { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -482,24 +508,28 @@ namespace test_rb_define_module_function { rb_define_module_function(self, "m2", m2, 2); rb_define_module_function(self, "ma", ma, -2); rb_define_module_function(self, "mv", mv, -1); + rb_define_module_function(self, "mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_module_function(self, "m1", RUBY_METHOD_FUNC(m1), 1); rb_define_module_function(self, "m2", RUBY_METHOD_FUNC(m2), 2); rb_define_module_function(self, "ma", RUBY_METHOD_FUNC(ma), -2); rb_define_module_function(self, "mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_module_function(self, "mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_module_function(self, "m1", (VALUE (*)(...))(m1), 1); rb_define_module_function(self, "m2", (VALUE (*)(...))(m2), 2); rb_define_module_function(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_module_function(self, "mv", (VALUE (*)(...))(mv), -1); + rb_define_module_function(self, "mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_module_function(self, "m1", rb_f_notimplement, 1); rb_define_module_function(self, "m2", rb_f_notimplement, 2); rb_define_module_function(self, "ma", rb_f_notimplement, -2); rb_define_module_function(self, "mv", rb_f_notimplement, -1); + rb_define_module_function(self, "mc", rb_f_notimplement, -1); return self; } @@ -530,6 +560,12 @@ namespace test_rb_define_singleton_method { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -538,24 +574,28 @@ namespace test_rb_define_singleton_method { rb_define_singleton_method(self, "m2", m2, 2); rb_define_singleton_method(self, "ma", ma, -2); rb_define_singleton_method(self, "mv", mv, -1); + rb_define_singleton_method(self, "mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_singleton_method(self, "m1", RUBY_METHOD_FUNC(m1), 1); rb_define_singleton_method(self, "m2", RUBY_METHOD_FUNC(m2), 2); rb_define_singleton_method(self, "ma", RUBY_METHOD_FUNC(ma), -2); rb_define_singleton_method(self, "mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_singleton_method(self, "mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_singleton_method(self, "m1", (VALUE (*)(...))(m1), 1); rb_define_singleton_method(self, "m2", (VALUE (*)(...))(m2), 2); rb_define_singleton_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_singleton_method(self, "mv", (VALUE (*)(...))(mv), -1); + rb_define_singleton_method(self, "mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_singleton_method(self, "m1", rb_f_notimplement, 1); rb_define_singleton_method(self, "m2", rb_f_notimplement, 2); rb_define_singleton_method(self, "ma", rb_f_notimplement, -2); rb_define_singleton_method(self, "mv", rb_f_notimplement, -1); + rb_define_singleton_method(self, "mc", rb_f_notimplement, -1); return self; } @@ -586,6 +626,12 @@ namespace test_rb_define_protected_method { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -594,24 +640,28 @@ namespace test_rb_define_protected_method { rb_define_protected_method(self, "m2", m2, 2); rb_define_protected_method(self, "ma", ma, -2); rb_define_protected_method(self, "mv", mv, -1); + rb_define_protected_method(self, "mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_protected_method(self, "m1", RUBY_METHOD_FUNC(m1), 1); rb_define_protected_method(self, "m2", RUBY_METHOD_FUNC(m2), 2); rb_define_protected_method(self, "ma", RUBY_METHOD_FUNC(ma), -2); rb_define_protected_method(self, "mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_protected_method(self, "mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_protected_method(self, "m1", (VALUE (*)(...))(m1), 1); rb_define_protected_method(self, "m2", (VALUE (*)(...))(m2), 2); rb_define_protected_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_protected_method(self, "mv", (VALUE (*)(...))(mv), -1); + rb_define_protected_method(self, "mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_protected_method(self, "m1", rb_f_notimplement, 1); rb_define_protected_method(self, "m2", rb_f_notimplement, 2); rb_define_protected_method(self, "ma", rb_f_notimplement, -2); rb_define_protected_method(self, "mv", rb_f_notimplement, -1); + rb_define_protected_method(self, "mc", rb_f_notimplement, -1); return self; } @@ -642,6 +692,12 @@ namespace test_rb_define_private_method { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -650,24 +706,28 @@ namespace test_rb_define_private_method { rb_define_private_method(self, "m2", m2, 2); rb_define_private_method(self, "ma", ma, -2); rb_define_private_method(self, "mv", mv, -1); + rb_define_private_method(self, "mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_private_method(self, "m1", RUBY_METHOD_FUNC(m1), 1); rb_define_private_method(self, "m2", RUBY_METHOD_FUNC(m2), 2); rb_define_private_method(self, "ma", RUBY_METHOD_FUNC(ma), -2); rb_define_private_method(self, "mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_private_method(self, "mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_private_method(self, "m1", (VALUE (*)(...))(m1), 1); rb_define_private_method(self, "m2", (VALUE (*)(...))(m2), 2); rb_define_private_method(self, "ma", (VALUE (*)(...))(ma), -2); rb_define_private_method(self, "mv", (VALUE (*)(...))(mv), -1); + rb_define_private_method(self, "mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_private_method(self, "m1", rb_f_notimplement, 1); rb_define_private_method(self, "m2", rb_f_notimplement, 2); rb_define_private_method(self, "ma", rb_f_notimplement, -2); rb_define_private_method(self, "mv", rb_f_notimplement, -1); + rb_define_private_method(self, "mc", rb_f_notimplement, -1); return self; } @@ -698,6 +758,12 @@ namespace test_rb_define_global_function { return Qnil; } + static VALUE + mc(int, const VALUE*, VALUE) + { + return Qnil; + } + VALUE test(VALUE self) { @@ -706,24 +772,28 @@ namespace test_rb_define_global_function { rb_define_global_function("m2", m2, 2); rb_define_global_function("ma", ma, -2); rb_define_global_function("mv", mv, -1); + rb_define_global_function("mc", mc, -1); // Cast by RUBY_METHOD_FUNC rb_define_global_function("m1", RUBY_METHOD_FUNC(m1), 1); rb_define_global_function("m2", RUBY_METHOD_FUNC(m2), 2); rb_define_global_function("ma", RUBY_METHOD_FUNC(ma), -2); rb_define_global_function("mv", RUBY_METHOD_FUNC(mv), -1); + rb_define_global_function("mc", RUBY_METHOD_FUNC(mc), -1); // Explicit cast instead of RUBY_METHOD_FUNC rb_define_global_function("m1", (VALUE (*)(...))(m1), 1); rb_define_global_function("m2", (VALUE (*)(...))(m2), 2); rb_define_global_function("ma", (VALUE (*)(...))(ma), -2); rb_define_global_function("mv", (VALUE (*)(...))(mv), -1); + rb_define_global_function("mc", (VALUE (*)(...))(mc), -1); // rb_f_notimplement rb_define_global_function("m1", rb_f_notimplement, 1); rb_define_global_function("m2", rb_f_notimplement, 2); rb_define_global_function("ma", rb_f_notimplement, -2); rb_define_global_function("mv", rb_f_notimplement, -1); + rb_define_global_function("mc", rb_f_notimplement, -1); return self; } diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 31758c14e57f67..0acbc9544343bf 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -574,7 +574,7 @@ struct driver0 { template struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {}; template struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> { using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define; - static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self, VALUE)) { F(m, reinterpret_cast(f), -1); } + static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast(f), -1); } }; template struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {}; /// @endcond From 151533e4bc9dff8efefb251dd25b1d57d3082d19 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 17:53:20 +0900 Subject: [PATCH 536/878] support multi-run for test/ruby/test_autoload.rb Another test defines Object::A, but it will fail 2nd test. --- test/ruby/test_autoload.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb index c23e0cfb1fe0e8..b3ccf183ecd04b 100644 --- a/test/ruby/test_autoload.rb +++ b/test/ruby/test_autoload.rb @@ -66,6 +66,8 @@ def test_autoload_p end def test_autoload_with_unqualified_file_name # [ruby-core:69206] + Object.send(:remove_const, :A) if Object.const_defined?(:A) + lp = $LOAD_PATH.dup lf = $LOADED_FEATURES.dup From 20c1c240145b7db66014020e233b23d12574efae Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 18:13:58 +0900 Subject: [PATCH 537/878] Minitest::Unit.current_repeat_count This method returns loop counter for multi-run (0 start). --- tool/lib/minitest/unit.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tool/lib/minitest/unit.rb b/tool/lib/minitest/unit.rb index 8ac0f146bd96da..8569b2c495aaf4 100644 --- a/tool/lib/minitest/unit.rb +++ b/tool/lib/minitest/unit.rb @@ -867,6 +867,10 @@ def test_count # :nodoc: ## # Runner for a given +type+ (eg, test vs bench). + def self.current_repeat_count + @@current_repeat_count + end + def _run_anything type suites = TestCase.send "#{type}_suites" return if suites.empty? @@ -880,7 +884,7 @@ def _run_anything type sync = output.respond_to? :"sync=" # stupid emacs old_sync, output.sync = output.sync, true if sync - count = 0 + @@current_repeat_count = 0 begin start = Time.now @@ -891,15 +895,15 @@ def _run_anything type test_count += @test_count assertion_count += @assertion_count t = Time.now - start - count += 1 + @@current_repeat_count += 1 unless @repeat_count puts puts end puts "Finished%s %ss in %.6fs, %.4f tests/s, %.4f assertions/s.\n" % - [(@repeat_count ? "(#{count}/#{@repeat_count}) " : ""), type, + [(@repeat_count ? "(#{@@current_repeat_count}/#{@repeat_count}) " : ""), type, t, @test_count.fdiv(t), @assertion_count.fdiv(t)] - end while @repeat_count && count < @repeat_count && + end while @repeat_count && @@current_repeat_count < @repeat_count && report.empty? && failures.zero? && errors.zero? output.sync = old_sync if sync From dd64c34682bfcb976ec6fb0c6182fb09d9d790d3 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 18:15:14 +0900 Subject: [PATCH 538/878] support multi-run for test/ruby/test_time.rb ruby/test_time_tz.rb (not sure only this file affects) changes TZ and it seems to change internal state. This internal state change fails test_2038 and test_timegm on 2nd time execution. At this time I have no idea how to fix this issue, so I skips these tests on 2nd trial. You can try this failure with the following command without this patch. $ make test-all TESTS='--repeat-count=2 ruby/require ruby/time ruby/time_tz' --- test/ruby/test_time.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 3cf7f2b145136c..0ff09f3fcba53b 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -108,6 +108,10 @@ def test_timegm assert_equal(78796800, Time.utc(1972, 7, 1, 0, 0, 0).tv_sec) assert_equal(78796801, Time.utc(1972, 7, 1, 0, 0, 1).tv_sec) assert_equal(946684800, Time.utc(2000, 1, 1, 0, 0, 0).tv_sec) + + # Giveup to try 2nd test because some state is changed. + skip if Minitest::Unit.current_repeat_count > 0 + assert_equal(0x7fffffff, Time.utc(2038, 1, 19, 3, 14, 7).tv_sec) assert_equal(0x80000000, Time.utc(2038, 1, 19, 3, 14, 8).tv_sec) else @@ -1133,6 +1137,9 @@ def test_1970 end def test_2038 + # Giveup to try 2nd test because some state is changed. + skip if Minitest::Unit.current_repeat_count > 0 + if no_leap_seconds? assert_equal(0x80000000, Time.utc(2038, 1, 19, 3, 14, 8).tv_sec) end From 471a9693118d0e6897b50dbbd935a237ad637398 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 18:20:06 +0900 Subject: [PATCH 539/878] use Minitest::Unit.current_repeat_count to skip multi-run. --- test/ruby/test_refinement.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 0db598888ff07d..c6707ff54cda23 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -217,8 +217,6 @@ def test_public_send_should_use_refinements assert_raise(NoMethodError) { FooExtClient.public_send_b_on(foo) } end - DONE_TESTS = [] - module MethodIntegerPowEx refine Integer do def pow(*) @@ -227,8 +225,7 @@ def pow(*) end end def test_method_should_use_refinements - skip if DONE_TESTS.include? __method__ # giveup multi-run - DONE_TESTS << __method__ + skip if Minitest::Unit.current_repeat_count > 0 foo = Foo.new assert_raise(NameError) { foo.method(:z) } @@ -251,8 +248,7 @@ def abs end end def test_instance_method_should_use_refinements - skip if DONE_TESTS.include? __method__ # giveup multi-run - DONE_TESTS << __method__ + skip if Minitest::Unit.current_repeat_count > 0 foo = Foo.new assert_raise(NameError) { Foo.instance_method(:z) } From 4d132fa130e16eeb4af4177cfaccc00e05e2f864 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 28 Jan 2020 17:56:14 +0900 Subject: [PATCH 540/878] srand() should not run in tests. test_rand.rb calls srand() several times, however it change global rand-sequence (and --seeds doesn't have meaning). This patch makes such tests run in other processes. --- test/ruby/test_rand.rb | 70 +++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 939d17bdf7dc36..0808c1ef2a30b2 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -2,28 +2,35 @@ require 'test/unit' class TestRand < Test::Unit::TestCase + def teardown + raise if srand == 0 + end def assert_random_int(ws, m, init = 0) - srand(init) - rnds = [Random.new(init)] - rnds2 = [rnds[0].dup] - rnds3 = [rnds[0].dup] - ws.each_with_index do |w, i| - w = w.to_i - assert_equal(w, rand(m)) - rnds.each do |rnd| - assert_equal(w, rnd.rand(m)) - end - rnds2.each do |rnd| - r=rnd.rand(i...(m+i)) - assert_equal(w+i, r) - end - rnds3.each do |rnd| - r=rnd.rand(i..(m+i-1)) - assert_equal(w+i, r) + # call srand in another process + assert_separately [], %Q{ + m = #{m} + srand(#{init}) + rnds = [Random.new(#{init})] + rnds2 = [rnds[0].dup] + rnds3 = [rnds[0].dup] + #{ws.inspect}.each_with_index do |w, i| + w = w.to_i + assert_equal(w, rand(m)) + rnds.each do |rnd| + assert_equal(w, rnd.rand(m)) + end + rnds2.each do |rnd| + r=rnd.rand(i...(m+i)) + assert_equal(w+i, r) + end + rnds3.each do |rnd| + r=rnd.rand(i..(m+i-1)) + assert_equal(w+i, r) + end + rnds << Marshal.load(Marshal.dump(rnds[-1])) + rnds2 << Marshal.load(Marshal.dump(rnds2[-1])) end - rnds << Marshal.load(Marshal.dump(rnds[-1])) - rnds2 << Marshal.load(Marshal.dump(rnds2[-1])) - end + } end def test_mt @@ -122,6 +129,7 @@ def test_0x10000 end def test_types + assert_separately [], <<-EOT srand(0) rnd = Random.new(0) assert_equal(44, rand(100.0)) @@ -154,9 +162,11 @@ def o.to_int; 100; end assert_equal(47, rnd.rand(o)) assert_equal(64, rand(o)) assert_equal(64, rnd.rand(o)) + EOT end def test_srand + assert_separately [], <<-EOT srand assert_kind_of(Integer, rand(2)) assert_kind_of(Integer, Random.new.rand(2)) @@ -167,13 +177,16 @@ def test_srand assert_equal(w.to_i, rand(0x100000000)) assert_equal(w.to_i, rnd.rand(0x100000000)) } + EOT end def test_shuffle + assert_separately [], <<-EOT srand(0) result = [*1..5].shuffle assert_equal([*1..5], result.sort) assert_equal(result, [*1..5].shuffle(random: Random.new(0))) + EOT end def test_big_seed @@ -239,6 +252,7 @@ def test_random_dup end def test_random_state + assert_separately [], <<-EOT state = < Date: Tue, 28 Jan 2020 18:29:42 +0900 Subject: [PATCH 541/878] remove debug code. --- test/ruby/test_rand.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 0808c1ef2a30b2..218bed7607ac7b 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -2,9 +2,6 @@ require 'test/unit' class TestRand < Test::Unit::TestCase - def teardown - raise if srand == 0 - end def assert_random_int(ws, m, init = 0) # call srand in another process assert_separately [], %Q{ From 17715153e5cb651b91eab097c561add7ffd2eb97 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 28 Jan 2020 22:22:29 +0900 Subject: [PATCH 542/878] Revert "Added RDoc files to parse [Bug #16596]" This reverts commit 10842daeb571126a090cb10dedf0cda8c2b7f9a8, because it has no effect and the rdoc file has been installed to lib/racc/rdoc directory. --- lib/racc/.document | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lib/racc/.document diff --git a/lib/racc/.document b/lib/racc/.document deleted file mode 100644 index 8ade51b9221030..00000000000000 --- a/lib/racc/.document +++ /dev/null @@ -1 +0,0 @@ -rdoc/*.rdoc From fb41246ddb2dd3c1b4595cd7e27ed3710def3fc8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 28 Jan 2020 23:00:13 +0900 Subject: [PATCH 543/878] Stop parsing copyright notices as document [ci skip] --- lib/racc/compat.rb | 2 ++ lib/racc/debugflags.rb | 2 ++ lib/racc/exception.rb | 3 +++ lib/racc/grammar.rb | 3 +++ lib/racc/grammarfileparser.rb | 2 ++ lib/racc/info.rb | 3 +++ lib/racc/iset.rb | 2 ++ lib/racc/logfilegenerator.rb | 2 ++ lib/racc/parserfilegenerator.rb | 3 +++ lib/racc/sourcetext.rb | 2 ++ lib/racc/state.rb | 3 +++ lib/racc/statetransitiontable.rb | 2 ++ 12 files changed, 29 insertions(+) diff --git a/lib/racc/compat.rb b/lib/racc/compat.rb index ccb033e2e09899..fad03128aa8e28 100644 --- a/lib/racc/compat.rb +++ b/lib/racc/compat.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 14fa1118eb3a23e85265e4f7afe2d5a297d69f9c $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of the GNU LGPL, see the file "COPYING". # +#++ unless Object.method_defined?(:__send) class Object diff --git a/lib/racc/debugflags.rb b/lib/racc/debugflags.rb index 1b5d2fe54c02ae..3df96f294d3f13 100644 --- a/lib/racc/debugflags.rb +++ b/lib/racc/debugflags.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 74ff4369ce53c7f45cfc2644ce907785104ebf6e $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of LGPL, see the file "COPYING". # +#++ module Racc diff --git a/lib/racc/exception.rb b/lib/racc/exception.rb index 0069ca34435726..83170b3adf30cb 100644 --- a/lib/racc/exception.rb +++ b/lib/racc/exception.rb @@ -1,3 +1,4 @@ +#-- # # $Id: ebb9798ad0b211e031670a12a1ab154678c1c8f3 $ # @@ -6,6 +7,8 @@ # This program is free software. # You can distribute/modify this program under the same terms of ruby. # see the file "COPYING". +# +#++ module Racc class Error < StandardError; end diff --git a/lib/racc/grammar.rb b/lib/racc/grammar.rb index 123f1f18348cce..1ef3d56a031e68 100644 --- a/lib/racc/grammar.rb +++ b/lib/racc/grammar.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 3fcabd58bef02540bf78e8142469681cb9f975c2 $ # @@ -6,6 +7,8 @@ # This program is free software. # You can distribute/modify this program under the same terms of ruby. # see the file "COPYING". +# +#++ require 'racc/compat' require 'racc/iset' diff --git a/lib/racc/grammarfileparser.rb b/lib/racc/grammarfileparser.rb index 5e7081f00a6a65..e85e06ca228340 100644 --- a/lib/racc/grammarfileparser.rb +++ b/lib/racc/grammarfileparser.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 63bd084db2dce8a2c9760318faae6104717cead7 $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of the GNU LGPL, see the file "COPYING". # +#++ require 'racc' require 'racc/compat' diff --git a/lib/racc/info.rb b/lib/racc/info.rb index b7db7b6c9bfc72..d35ce2dceac932 100644 --- a/lib/racc/info.rb +++ b/lib/racc/info.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 8ab2cb5341529fe5e35956bb1a1f42ec9b9c6f5a $ # @@ -6,6 +7,8 @@ # This program is free software. # You can distribute/modify this program under the same terms of ruby. # see the file "COPYING". +# +#++ module Racc VERSION = '1.4.16' diff --git a/lib/racc/iset.rb b/lib/racc/iset.rb index 245bad8b50c5d6..cfe3657724f8bd 100644 --- a/lib/racc/iset.rb +++ b/lib/racc/iset.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 31aa4331c08dfd4609c06eb5f94b7ef38dc708e1 $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of the GNU LGPL, see the file "COPYING". # +#++ module Racc diff --git a/lib/racc/logfilegenerator.rb b/lib/racc/logfilegenerator.rb index 68593c41f6eb5f..e54af8786d7040 100644 --- a/lib/racc/logfilegenerator.rb +++ b/lib/racc/logfilegenerator.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 5e9d0a01b5d56fd9cdc3d5cb078b1a3e1bbaf779 $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of the GNU LGPL, see the file "COPYING". # +#++ module Racc diff --git a/lib/racc/parserfilegenerator.rb b/lib/racc/parserfilegenerator.rb index ee1262db29e82a..068c902e9cac48 100644 --- a/lib/racc/parserfilegenerator.rb +++ b/lib/racc/parserfilegenerator.rb @@ -1,3 +1,4 @@ +#-- # # $Id: fff07ebfd582f8dbc845e424908cb9f41f8bf42f $ # @@ -6,6 +7,8 @@ # This program is free software. # You can distribute/modify this program under the same terms of ruby. # see the file "COPYING". +# +#++ require 'enumerator' require 'racc/compat' diff --git a/lib/racc/sourcetext.rb b/lib/racc/sourcetext.rb index b33ba292916fb0..6944ac7541fa06 100644 --- a/lib/racc/sourcetext.rb +++ b/lib/racc/sourcetext.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 3b2d89d9ada2f5fcb043837dcc5c9631856d5b70 $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of LGPL, see the file "COPYING". # +#++ module Racc diff --git a/lib/racc/state.rb b/lib/racc/state.rb index 51b1d8366447b0..50852d9130ebf9 100644 --- a/lib/racc/state.rb +++ b/lib/racc/state.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 6bd3136439c94cb8d928917f5e0de9c593181527 $ # @@ -6,6 +7,8 @@ # This program is free software. # You can distribute/modify this program under the same terms of ruby. # see the file "COPYING". +# +#++ require 'racc/iset' require 'racc/statetransitiontable' diff --git a/lib/racc/statetransitiontable.rb b/lib/racc/statetransitiontable.rb index 23df4102ec957d..dc525bbafa0941 100644 --- a/lib/racc/statetransitiontable.rb +++ b/lib/racc/statetransitiontable.rb @@ -1,3 +1,4 @@ +#-- # # $Id: 4c5f4311663b6d03050953d64d6a0e7905ff2216 $ # @@ -8,6 +9,7 @@ # the GNU LGPL, Lesser General Public License version 2.1. # For details of LGPL, see the file "COPYING". # +#++ require 'racc/parser' From 338c5b8c1dc061e9f8d21f6d9f5ac053c4497383 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 28 Jan 2020 23:40:25 +0900 Subject: [PATCH 544/878] Extract a function, ruby_reset_timezone(). Initial implementation of ruby_reset_timezone() assigns ruby_tz_uptodate_p to false. --- hash.c | 6 +++--- internal/time.h | 1 + time.c | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hash.c b/hash.c index 32df430b6d12d4..8eb07a54ddd348 100644 --- a/hash.c +++ b/hash.c @@ -35,6 +35,7 @@ #include "internal/object.h" #include "internal/proc.h" #include "internal/symbol.h" +#include "internal/time.h" #include "internal/vm.h" #include "probes.h" #include "ruby/st.h" @@ -4758,7 +4759,6 @@ env_str_new2(const char *ptr) } static const char TZ_ENV[] = "TZ"; -extern bool ruby_tz_uptodate_p; static rb_encoding * env_encoding_for(const char *name, const char *ptr) @@ -4843,7 +4843,7 @@ env_delete(VALUE name) * This hack might works only on Linux glibc. */ if (ENVMATCH(nam, TZ_ENV)) { - ruby_tz_uptodate_p = FALSE; + ruby_reset_timezone(); } if (val) { @@ -5275,7 +5275,7 @@ env_aset(VALUE nm, VALUE val) RB_GC_GUARD(nm); } else if (ENVMATCH(name, TZ_ENV)) { - ruby_tz_uptodate_p = FALSE; + ruby_reset_timezone(); } return val; } diff --git a/internal/time.h b/internal/time.h index ef3d64e967bdab..8f848992211398 100644 --- a/internal/time.h +++ b/internal/time.h @@ -29,6 +29,7 @@ struct timeval rb_time_timeval(VALUE); RUBY_SYMBOL_EXPORT_BEGIN /* time.c (export) */ void ruby_reset_leap_second_info(void); +void ruby_reset_timezone(void); RUBY_SYMBOL_EXPORT_END #endif /* INTERNAL_TIME_H */ diff --git a/time.c b/time.c index b5d1aee375ab8d..7339547527f121 100644 --- a/time.c +++ b/time.c @@ -683,6 +683,12 @@ static VALUE tm_from_time(VALUE klass, VALUE time); bool ruby_tz_uptodate_p; +void +ruby_reset_timezone(void) +{ + ruby_tz_uptodate_p = false; +} + static void update_tz(void) { From 29e31e72fb5a14194a78ec974c4ba56c33ad8d45 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Wed, 29 Jan 2020 00:01:57 +0900 Subject: [PATCH 545/878] ruby_reset_timezone resets leap_second_info. [Bug #15177] --- test/ruby/test_time_tz.rb | 10 +++------- time.c | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb index 83482eac65783b..a95f9e74b409b1 100644 --- a/test/ruby/test_time_tz.rb +++ b/test/ruby/test_time_tz.rb @@ -219,7 +219,6 @@ def test_pacific_kiritimati def test_right_utc with_tz(tz="right/UTC") { - ::Bug::Time.reset_leap_second_info assert_time_constructor(tz, "2008-12-31 23:59:59 UTC", :utc, [2008,12,31,23,59,59]) assert_time_constructor(tz, "2008-12-31 23:59:60 UTC", :utc, [2008,12,31,23,59,60]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2008,12,31,24,0,0]) @@ -229,25 +228,23 @@ def test_right_utc def test_right_utc_switching with_tz("UTC") { # ensure no leap second timezone - ::Bug::Time.reset_leap_second_info assert_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) with_tz(tz="right/UTC") { assert_time_constructor(tz, "2008-12-31 23:59:59 UTC", :utc, [2008,12,31,23,59,59]) - assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2008,12,31,23,59,60]) + assert_time_constructor(tz, "2008-12-31 23:59:60 UTC", :utc, [2008,12,31,23,59,60]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2008,12,31,24,0,0]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2009,1,1,0,0,0]) - assert_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) + assert_not_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) } } with_tz("right/UTC") { - ::Bug::Time.reset_leap_second_info assert_not_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) with_tz(tz="UTC") { assert_time_constructor(tz, "2008-12-31 23:59:59 UTC", :utc, [2008,12,31,23,59,59]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2008,12,31,23,59,60]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2008,12,31,24,0,0]) assert_time_constructor(tz, "2009-01-01 00:00:00 UTC", :utc, [2009,1,1,0,0,0]) - assert_not_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) + assert_equal(4102444800, Time.utc(2100,1,1,0,0,0).to_i) } } end if has_right_tz @@ -376,7 +373,6 @@ def self.gen_zdump_test(data) mesg = "#{mesg_utc}.localtime" define_method(gen_test_name(tz)) { with_tz(tz) { - ::Bug::Time.reset_leap_second_info t = nil assert_nothing_raised(mesg) { t = Time.utc(*u) } assert_equal(expected_utc, time_to_s(t), mesg_utc) diff --git a/time.c b/time.c index 7339547527f121..fcc5f522e11953 100644 --- a/time.c +++ b/time.c @@ -682,11 +682,13 @@ static int leap_year_p(long y); static VALUE tm_from_time(VALUE klass, VALUE time); bool ruby_tz_uptodate_p; +void ruby_reset_leap_second_info(void); void ruby_reset_timezone(void) { ruby_tz_uptodate_p = false; + ruby_reset_leap_second_info(); } static void From 7342867fc9a7025187ea18ddbf2bc972a120d962 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 29 Jan 2020 00:02:33 +0900 Subject: [PATCH 546/878] * 2020-01-29 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index e3255145337053..e1b690f26444cc 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 29 #include "ruby/version.h" From 7882c43fc306c1100be8e1648f3d1caa48d50a8a Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 00:49:53 +0900 Subject: [PATCH 547/878] refactoring: use Proc and Constant. --- test/ruby/test_const.rb | 9 +++------ test/ruby/test_method.rb | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb index 51637a21a509eb..f6b9ea83d3c02d 100644 --- a/test/ruby/test_const.rb +++ b/test/ruby/test_const.rb @@ -4,7 +4,7 @@ class TestConst < Test::Unit::TestCase - setup_constants_proc = -> do + Constants_Setup = -> do remove_const :TEST1 if defined? ::TestConst::TEST1 remove_const :TEST2 if defined? ::TestConst::TEST2 remove_const :Const if defined? ::TestConst::Const @@ -24,12 +24,9 @@ module Const2 end end - define_method :setup_constants do - setup_constants_proc.call - end - def test_const - setup_constants + Constants_Setup.call + assert defined?(TEST1) assert_equal 1, TEST1 assert defined?(TEST2) diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index dd163e104cca66..563011a03f051e 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -1108,7 +1108,7 @@ def test_to_proc_binding assert_equal([:bar, :foo], b.local_variables.sort, bug11012) end - setup_for_test_method_in_method_visibility_should_be_public_proc = -> do + MethodInMethodClass_Setup = -> do remove_const :MethodInMethodClass if defined? MethodInMethodClass class MethodInMethodClass @@ -1121,12 +1121,8 @@ def m2 end end - define_method :setup_for_test_method_in_method_visibility_should_be_public do - setup_for_test_method_in_method_visibility_should_be_public_proc.call - end - def test_method_in_method_visibility_should_be_public - setup_for_test_method_in_method_visibility_should_be_public + MethodInMethodClass_Setup.call assert_equal([:m1].sort, MethodInMethodClass.public_instance_methods(false).sort) assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort) From e7571f163b791d8ca5df389ba97e7d4acadbf480 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 00:50:25 +0900 Subject: [PATCH 548/878] restore $LOADED_FEATURES. Dir.tmpdir can return same directory because of rand() value, so we shouldn't rely on different name. --- test/ruby/test_require.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 05dc18cd174544..7e53a02fb81e84 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -199,6 +199,7 @@ def test_require_twice end def assert_syntax_error_backtrace + loaded_features = $LOADED_FEATURES.dup Dir.mktmpdir do |tmp| req = File.join(tmp, "test.rb") File.write(req, ",\n") @@ -208,6 +209,7 @@ def assert_syntax_error_backtrace assert_not_nil(bt = e.backtrace, "no backtrace") assert_not_empty(bt.find_all {|b| b.start_with? __FILE__}, proc {bt.inspect}) end + $LOADED_FEATURES.replace loaded_features end def test_require_syntax_error @@ -381,6 +383,8 @@ def test_load_ospath def test_relative load_path = $:.dup + loaded_featrures = $LOADED_FEATURES.dup + $:.delete(".") Dir.mktmpdir do |tmp| Dir.chdir(tmp) do @@ -400,6 +404,7 @@ def test_relative end ensure $:.replace(load_path) if load_path + $LOADED_FEATURES.replace loaded_featrures end def test_relative_symlink From 0cfba9cdd9c18b0245b088ed5b460f0d6f90d586 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 00:55:11 +0900 Subject: [PATCH 549/878] Revert "remove debug code." This reverts commit 65768c80beb64a14c3e918f8ed5e41e9349025d0. --- test/ruby/test_rand.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 218bed7607ac7b..0808c1ef2a30b2 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -2,6 +2,9 @@ require 'test/unit' class TestRand < Test::Unit::TestCase + def teardown + raise if srand == 0 + end def assert_random_int(ws, m, init = 0) # call srand in another process assert_separately [], %Q{ From 650f152d2f5ed929c76cd7e7cf17270e53ac346c Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 00:55:27 +0900 Subject: [PATCH 550/878] Revert "srand() should not run in tests." This reverts commit 4d132fa130e16eeb4af4177cfaccc00e05e2f864. There are discussions about using srand() in tests. I'll write a ticket about it and continue to discuss. --- test/ruby/test_rand.rb | 70 +++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 0808c1ef2a30b2..939d17bdf7dc36 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -2,35 +2,28 @@ require 'test/unit' class TestRand < Test::Unit::TestCase - def teardown - raise if srand == 0 - end def assert_random_int(ws, m, init = 0) - # call srand in another process - assert_separately [], %Q{ - m = #{m} - srand(#{init}) - rnds = [Random.new(#{init})] - rnds2 = [rnds[0].dup] - rnds3 = [rnds[0].dup] - #{ws.inspect}.each_with_index do |w, i| - w = w.to_i - assert_equal(w, rand(m)) - rnds.each do |rnd| - assert_equal(w, rnd.rand(m)) - end - rnds2.each do |rnd| - r=rnd.rand(i...(m+i)) - assert_equal(w+i, r) - end - rnds3.each do |rnd| - r=rnd.rand(i..(m+i-1)) - assert_equal(w+i, r) - end - rnds << Marshal.load(Marshal.dump(rnds[-1])) - rnds2 << Marshal.load(Marshal.dump(rnds2[-1])) + srand(init) + rnds = [Random.new(init)] + rnds2 = [rnds[0].dup] + rnds3 = [rnds[0].dup] + ws.each_with_index do |w, i| + w = w.to_i + assert_equal(w, rand(m)) + rnds.each do |rnd| + assert_equal(w, rnd.rand(m)) end - } + rnds2.each do |rnd| + r=rnd.rand(i...(m+i)) + assert_equal(w+i, r) + end + rnds3.each do |rnd| + r=rnd.rand(i..(m+i-1)) + assert_equal(w+i, r) + end + rnds << Marshal.load(Marshal.dump(rnds[-1])) + rnds2 << Marshal.load(Marshal.dump(rnds2[-1])) + end end def test_mt @@ -129,7 +122,6 @@ def test_0x10000 end def test_types - assert_separately [], <<-EOT srand(0) rnd = Random.new(0) assert_equal(44, rand(100.0)) @@ -162,11 +154,9 @@ def o.to_int; 100; end assert_equal(47, rnd.rand(o)) assert_equal(64, rand(o)) assert_equal(64, rnd.rand(o)) - EOT end def test_srand - assert_separately [], <<-EOT srand assert_kind_of(Integer, rand(2)) assert_kind_of(Integer, Random.new.rand(2)) @@ -177,16 +167,13 @@ def test_srand assert_equal(w.to_i, rand(0x100000000)) assert_equal(w.to_i, rnd.rand(0x100000000)) } - EOT end def test_shuffle - assert_separately [], <<-EOT srand(0) result = [*1..5].shuffle assert_equal([*1..5], result.sort) assert_equal(result, [*1..5].shuffle(random: Random.new(0))) - EOT end def test_big_seed @@ -252,7 +239,6 @@ def test_random_dup end def test_random_state - assert_separately [], <<-EOT state = < Date: Wed, 29 Jan 2020 01:26:51 +0900 Subject: [PATCH 551/878] fix test cleanup. should remove pathname. --- test/ruby/test_exception.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 086f250a3b1b62..9d7ffd882559b0 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -974,10 +974,12 @@ def test_warning_warn_circular_require_backtrace t.puts "require '#{basename}'" t.close $LOAD_PATH.push(File.dirname(t)) - warning = capture_warning_warn {require basename} + warning = capture_warning_warn { + assert require(basename) + } ensure $LOAD_PATH.pop - $LOADED_FEATURES.delete(t) + $LOADED_FEATURES.delete(t.path) end assert_equal(1, warning.size) assert_match(/circular require/, warning.first) From 0ad0e638872a07eafb87989681b05d24d9e0c87f Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 28 Jan 2020 18:01:59 +0100 Subject: [PATCH 552/878] Fix version guard in __dir__ spec --- spec/ruby/core/kernel/__dir___spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/ruby/core/kernel/__dir___spec.rb b/spec/ruby/core/kernel/__dir___spec.rb index e2bcc6e65ac258..64b439161fbeff 100644 --- a/spec/ruby/core/kernel/__dir___spec.rb +++ b/spec/ruby/core/kernel/__dir___spec.rb @@ -12,7 +12,7 @@ end end - ruby_version_is ""..."2.7" do + ruby_version_is ""..."2.8" do context "when used in eval with top level binding" do it "returns the real name of the directory containing the currently-executing file" do eval("__dir__", binding).should == File.realpath(File.dirname(__FILE__)) @@ -20,7 +20,7 @@ end end - ruby_version_is "2.7" do + ruby_version_is "2.8" do context "when used in eval with top level binding" do it "returns nil" do eval("__dir__", binding).should == nil From fe8573f31ab4b48d0c3214dbf15ba66a192c078a Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 28 Jan 2020 18:12:24 +0100 Subject: [PATCH 553/878] Run specs against the latest release of 2.4 --- .travis.yml | 2 +- spec/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5199c7992c887..882bcb8fcd7636 100644 --- a/.travis.yml +++ b/.travis.yml @@ -365,7 +365,7 @@ env: - &rubyspec name: Check ruby/spec version guards on Ruby 2.4 language: ruby - rvm: 2.4.6 + rvm: 2.4.9 before_install: install: before_script: chmod -R u+w spec/ruby diff --git a/spec/README.md b/spec/README.md index 1b2e4d5f534c0e..c67aedbb802ffd 100644 --- a/spec/README.md +++ b/spec/README.md @@ -66,7 +66,7 @@ See `spec/ruby/CONTRIBUTING.md` for more documentation about guards. To verify specs are compatible with older Ruby versions: ``` cd spec/ruby -$RUBY_MANAGER use 2.4.6 +$RUBY_MANAGER use 2.4.9 ../mspec/bin/mspec -j ``` From 766f8a7a60f32ab27c2faaa9120f47f00a5e646d Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 28 Jan 2020 09:26:02 -0800 Subject: [PATCH 554/878] Fix some spec breakage on 2.7 related to keyword arguments These specs were probably added in the commit to fully separate keyword arguments after the release of 2.7.0, but apparently not tested on 2.7 before hand. The enclosing ruby_version guard for these specs limits them to 2.7. --- spec/ruby/language/method_spec.rb | 32 ++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb index f98e8569f8a661..0209ca21c9d644 100644 --- a/spec/ruby/language/method_spec.rb +++ b/spec/ruby/language/method_spec.rb @@ -1363,7 +1363,9 @@ def m(*, **k) k end h = mock("keyword splat") h.should_receive(:to_hash).and_return({a: 1}) - m(h).should == {} + suppress_keyword_warning do + m(h).should == {a: 1} + end end evaluate <<-ruby do @@ -1375,28 +1377,34 @@ def m(a = nil, **k) [a, k] end m(a: 1).should == [nil, {a: 1}] m("a" => 1, a: 1).should == [nil, {"a" => 1, a: 1}] m({ "a" => 1 }, a: 1).should == [{"a" => 1}, {a: 1}] - ->{m({a: 1}, {})}.should raise_error(ArgumentError) + suppress_keyword_warning do + m({a: 1}, {}).should == [{a: 1}, {}] + end h = {"a" => 1, b: 2} - m(h).should == [{"a" => 1, b: 2}, {}] + suppress_keyword_warning do + m(h).should == [{"a" => 1}, {b: 2}] + end h.should == {"a" => 1, b: 2} h = {"a" => 1} m(h).first.should == h h = {} - r = m(h) - r.first.should == {} - r.last.should == {} + suppress_keyword_warning do + m(h).should == [nil, {}] + end hh = {} h = mock("keyword splat empty hash") - h.should_not_receive(:to_hash) - m(h).should == [{}, {}] + h.should_receive(:to_hash).and_return({a: 1}) + suppress_keyword_warning do + m(h).should == [nil, {a: 1}] + end h = mock("keyword splat") - h.should_not_receive(:to_hash) - m(h).should == [{"a" => 1, a: 2}, {}] + h.should_receive(:to_hash).and_return({"a" => 1}) + m(h).should == [h, {}] end evaluate <<-ruby do @@ -1412,7 +1420,9 @@ def m(*a, **k) [a, k] end m(a: 1).should == [[], {a: 1}] m("a" => 1, a: 1).should == [[], {"a" => 1, a: 1}] m({ "a" => 1 }, a: 1).should == [[{"a" => 1}], {a: 1}] - m({a: 1}, {}).should == [[{a: 1}, {}], {}] + suppress_keyword_warning do + m({a: 1}, {}).should == [[{a: 1}], {}] + end m({a: 1}, {"a" => 1}).should == [[{a: 1}, {"a" => 1}], {}] bo = BasicObject.new From 6321a685826f6459a6ef4aeaa18080f07494ee99 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 28 Jan 2020 18:37:42 +0100 Subject: [PATCH 555/878] Run specs on Ruby 2.7 too to make sure they keep passing * With keyword argument changes, it's more likely to break only 2.7 and not other versions. * A few specs were broken on 2.7.0 recently, this should catch them earlier. --- .travis.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 882bcb8fcd7636..6d1d1ebd0491da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -362,7 +362,7 @@ env: -Wunused-variable' - LDFLAGS=-Wno-unused-command-line-argument - - &rubyspec + - &rubyspec24 name: Check ruby/spec version guards on Ruby 2.4 language: ruby rvm: 2.4.9 @@ -374,6 +374,18 @@ env: after_failure: - echo "ruby/spec failed on Ruby 2.4. This is likely because of a missing ruby_version_is guard, please add it. See spec/README.md." + - &rubyspec27 + name: Check ruby/spec version guards on Ruby 2.7 + language: ruby + rvm: 2.7.0 + before_install: + install: + before_script: chmod -R u+w spec/ruby + # -j randomly hangs. + script: ruby -C spec/ruby ../mspec/bin/mspec . + after_failure: + - echo "ruby/spec failed on Ruby 2.7. This is likely because of a missing ruby_version_is guard, please add it. See spec/README.md." + - &baseruby name: "BASERUBY: Ruby 2.2" <<: *gcc-8 @@ -425,7 +437,8 @@ matrix: - <<: *pedanticism - <<: *assertions - <<: *baseruby - - <<: *rubyspec + - <<: *rubyspec24 + - <<: *rubyspec27 - <<: *dependency # Build every commit (Allowed Failures): - <<: *ASAN From ed377cc9aaf1ccbede19ddc6c464f5fbf3cabc34 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 28 Jan 2020 20:47:46 +0100 Subject: [PATCH 556/878] Update to ruby/mspec@9bce874 --- spec/mspec/lib/mspec/runner/context.rb | 2 ++ spec/mspec/lib/mspec/utils/warnings.rb | 7 +++++++ spec/mspec/tool/sync/sync-rubyspec.rb | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spec/mspec/lib/mspec/runner/context.rb b/spec/mspec/lib/mspec/runner/context.rb index 5f6c9c8ae92954..d55b0dcd9e1eec 100644 --- a/spec/mspec/lib/mspec/runner/context.rb +++ b/spec/mspec/lib/mspec/runner/context.rb @@ -28,6 +28,7 @@ def initialize(mod, options = nil) @pre = {} @post = {} @examples = [] + @state = nil @parent = nil @parents = [self] @children = [] @@ -127,6 +128,7 @@ def after(what, &block) # Creates an ExampleState instance for the block and stores it # in a list of examples to evaluate unless the example is filtered. def it(desc, &block) + raise "nested #it" if @state example = ExampleState.new(self, desc, block) MSpec.actions :add, example return if MSpec.guarded? diff --git a/spec/mspec/lib/mspec/utils/warnings.rb b/spec/mspec/lib/mspec/utils/warnings.rb index 7c2bc6fe88159a..1cf83b6d22f50a 100644 --- a/spec/mspec/lib/mspec/utils/warnings.rb +++ b/spec/mspec/lib/mspec/utils/warnings.rb @@ -16,6 +16,10 @@ def warn(*messages) end def Warning.warn(message) + # Suppress any warning inside the method to prevent recursion + verbose = $VERBOSE + $VERBOSE = nil + if Thread.current[:in_mspec_complain_matcher] return $stderr.write(message) end @@ -52,9 +56,12 @@ def Warning.warn(message) when /env\/shared\/key\.rb:\d+: warning: ENV\.index is deprecated; use ENV\.key/ when /exponent(_spec)?\.rb:\d+: warning: in a\*\*b, b may be too big/ when /enumerator\/(new_spec|initialize_spec)\.rb:\d+: warning: Enumerator\.new without a block is deprecated/ + when /Pattern matching is experimental, and the behavior may change in future versions of Ruby!/ else $stderr.write message end + ensure + $VERBOSE = verbose end else $VERBOSE = nil unless ENV['OUTPUT_WARNINGS'] diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index 74881c1a774b5f..d78277414e2226 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -157,7 +157,8 @@ def rebase_commits(impl) def test_new_specs require "yaml" Dir.chdir(SOURCE_REPO) do - versions = YAML.load_file("#{MSPEC_REPO}/.travis.yml").fetch("rvm") + workflow = YAML.load_file(".github/workflows/ci.yml") + versions = workflow.dig("jobs", "test", "strategy", "matrix", "ruby") versions = versions.grep(/^\d+\./) # Test on MRI min_version, max_version = versions.minmax From 809f0b8a1357f14f9645210d4812f4400c8d397e Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 28 Jan 2020 20:47:48 +0100 Subject: [PATCH 557/878] Update to ruby/spec@f8a2d54 --- spec/ruby/.mspec.constants | 4 + spec/ruby/.rubocop.yml | 1 + spec/ruby/core/array/deconstruct_spec.rb | 11 + spec/ruby/core/array/element_set_spec.rb | 47 + spec/ruby/core/array/fill_spec.rb | 9 + spec/ruby/core/array/intersection_spec.rb | 88 +- spec/ruby/core/array/shared/intersection.rb | 84 ++ spec/ruby/core/array/shared/join.rb | 14 + spec/ruby/core/array/slice_spec.rb | 12 + spec/ruby/core/array/values_at_spec.rb | 7 + ...{spaceship_spec.rb => comparision_spec.rb} | 2 +- spec/ruby/core/enumerator/each_spec.rb | 6 +- spec/ruby/core/enumerator/lazy/eager_spec.rb | 29 + spec/ruby/core/enumerator/new_spec.rb | 38 + spec/ruby/core/enumerator/produce_spec.rb | 36 + .../core/enumerator/yielder/to_proc_spec.rb | 18 + .../destination_encoding_name_spec.rb | 23 - .../exception/destination_encoding_spec.rb | 23 - spec/ruby/core/exception/error_bytes_spec.rb | 12 - spec/ruby/core/exception/error_char_spec.rb | 12 - spec/ruby/core/exception/initialize_spec.rb | 1 - .../core/exception/readagain_bytes_spec.rb | 12 - .../exception/source_encoding_name_spec.rb | 23 - .../core/exception/source_encoding_spec.rb | 23 - spec/ruby/core/hash/deconstruct_keys_spec.rb | 25 + .../core/integer/element_reference_spec.rb | 85 ++ .../ruby/core/kernel/caller_locations_spec.rb | 28 + spec/ruby/core/kernel/printf_spec.rb | 8 +- spec/ruby/core/kernel/warn_spec.rb | 2 +- spec/ruby/core/marshal/dump_spec.rb | 3 - spec/ruby/core/marshal/shared/load.rb | 6 +- spec/ruby/core/range/bsearch_spec.rb | 200 +++- spec/ruby/core/range/each_spec.rb | 22 + spec/ruby/core/range/equal_value_spec.rb | 6 + spec/ruby/core/range/inspect_spec.rb | 7 + spec/ruby/core/range/last_spec.rb | 6 + spec/ruby/core/range/max_spec.rb | 6 + spec/ruby/core/range/min_spec.rb | 7 + .../core/range/shared/cover_and_include.rb | 7 + spec/ruby/core/range/shared/equal_value.rb | 8 + spec/ruby/core/range/size_spec.rb | 7 + spec/ruby/core/range/step_spec.rb | 96 ++ spec/ruby/core/range/to_a_spec.rb | 6 + spec/ruby/core/range/to_s_spec.rb | 7 + spec/ruby/core/string/capitalize_spec.rb | 18 + spec/ruby/core/string/downcase_spec.rb | 12 + spec/ruby/core/string/shared/length.rb | 13 + spec/ruby/core/string/split_spec.rb | 18 + spec/ruby/core/string/swapcase_spec.rb | 18 + spec/ruby/core/string/upcase_spec.rb | 18 + .../ruby/core/struct/deconstruct_keys_spec.rb | 70 ++ spec/ruby/core/struct/deconstruct_spec.rb | 12 + spec/ruby/core/struct/hash_spec.rb | 16 + .../core/thread/backtrace_locations_spec.rb | 37 + spec/ruby/core/time/inspect_spec.rb | 15 + spec/ruby/language/alias_spec.rb | 5 + spec/ruby/language/comment_spec.rb | 15 + .../ruby/language/numbered_parameters_spec.rb | 87 ++ spec/ruby/language/numbers_spec.rb | 4 + spec/ruby/language/pattern_matching_spec.rb | 966 ++++++++++++++++++ spec/ruby/language/predefined_spec.rb | 31 + spec/ruby/language/range_spec.rb | 7 + spec/ruby/language/rescue_spec.rb | 10 + spec/ruby/library/English/alias_spec.rb | 14 + .../library/digest/md5/shared/constants.rb | 1 + .../library/digest/sha1/shared/constants.rb | 3 +- .../library/digest/sha256/shared/constants.rb | 1 + .../library/digest/sha384/shared/constants.rb | 1 + .../library/digest/sha512/shared/constants.rb | 1 + spec/ruby/library/openssl/digest_spec.rb | 63 ++ .../rexml/element/delete_attribute_spec.rb | 1 - spec/ruby/optional/capi/ext/kernel_spec.c | 8 + spec/ruby/optional/capi/ext/object_spec.c | 38 + spec/ruby/optional/capi/hash_spec.rb | 2 +- spec/ruby/optional/capi/kernel_spec.rb | 14 + spec/ruby/optional/capi/object_spec.rb | 79 ++ 76 files changed, 2451 insertions(+), 224 deletions(-) create mode 100644 spec/ruby/core/array/deconstruct_spec.rb create mode 100644 spec/ruby/core/array/shared/intersection.rb rename spec/ruby/core/complex/{spaceship_spec.rb => comparision_spec.rb} (96%) create mode 100644 spec/ruby/core/enumerator/lazy/eager_spec.rb create mode 100644 spec/ruby/core/enumerator/produce_spec.rb create mode 100644 spec/ruby/core/enumerator/yielder/to_proc_spec.rb delete mode 100644 spec/ruby/core/exception/destination_encoding_name_spec.rb delete mode 100644 spec/ruby/core/exception/destination_encoding_spec.rb delete mode 100644 spec/ruby/core/exception/error_bytes_spec.rb delete mode 100644 spec/ruby/core/exception/error_char_spec.rb delete mode 100644 spec/ruby/core/exception/initialize_spec.rb delete mode 100644 spec/ruby/core/exception/readagain_bytes_spec.rb delete mode 100644 spec/ruby/core/exception/source_encoding_name_spec.rb delete mode 100644 spec/ruby/core/exception/source_encoding_spec.rb create mode 100644 spec/ruby/core/hash/deconstruct_keys_spec.rb create mode 100644 spec/ruby/core/struct/deconstruct_keys_spec.rb create mode 100644 spec/ruby/core/struct/deconstruct_spec.rb create mode 100644 spec/ruby/language/comment_spec.rb create mode 100644 spec/ruby/language/numbered_parameters_spec.rb create mode 100644 spec/ruby/language/pattern_matching_spec.rb create mode 100644 spec/ruby/library/English/alias_spec.rb create mode 100644 spec/ruby/library/openssl/digest_spec.rb diff --git a/spec/ruby/.mspec.constants b/spec/ruby/.mspec.constants index e88e58989f2977..d7e09ca2d99e97 100644 --- a/spec/ruby/.mspec.constants +++ b/spec/ruby/.mspec.constants @@ -55,6 +55,7 @@ DefSpecsLambdaVisibility DefineMethodByProcClass DefineMethodSpecClass DefineSingletonMethodSpecClass +Delegator DescArray DescObjectTest Digest @@ -148,6 +149,7 @@ Readline ReceiverClass RegexpSpecsSubclass RegexpSpecsSubclassTwo +Reline RescueInClassExample Resolv SHA1Constants @@ -161,6 +163,7 @@ SecondClass SecureRandom Set Shellwords +SimpleDelegator SingleForwardable Singleton Socket @@ -188,6 +191,7 @@ TimeoutError UDPSocket UNIXServer UNIXSocket +URI UnaryMinusTest UnicodeNormalize UnloadableDumpableDir diff --git a/spec/ruby/.rubocop.yml b/spec/ruby/.rubocop.yml index 5dc6b96473ae18..c522f6325a2c68 100644 --- a/spec/ruby/.rubocop.yml +++ b/spec/ruby/.rubocop.yml @@ -114,6 +114,7 @@ Style/Lambda: Exclude: - 'language/lambda_spec.rb' - 'language/proc_spec.rb' + - 'language/numbered_parameters_spec.rb' - 'core/kernel/lambda_spec.rb' Style/EmptyLambdaParameter: diff --git a/spec/ruby/core/array/deconstruct_spec.rb b/spec/ruby/core/array/deconstruct_spec.rb new file mode 100644 index 00000000000000..2b07152dfc3243 --- /dev/null +++ b/spec/ruby/core/array/deconstruct_spec.rb @@ -0,0 +1,11 @@ +require_relative '../../spec_helper' + +ruby_version_is "2.7" do + describe "Array#deconstruct" do + it "returns self" do + array = [1] + + array.deconstruct.should equal array + end + end +end diff --git a/spec/ruby/core/array/element_set_spec.rb b/spec/ruby/core/array/element_set_spec.rb index 9375ff9b801c66..f58f0ffdc436b4 100644 --- a/spec/ruby/core/array/element_set_spec.rb +++ b/spec/ruby/core/array/element_set_spec.rb @@ -396,6 +396,14 @@ def obj.to_ary() [1, 2, 3] end a.should == [1, 2, 3, 8, 4, 5] end + it "inserts at the end if m > the array size" do + a = [1, 2, 3] + a[3..3] = [4] + a.should == [1, 2, 3, 4] + a[5..7] = [6] + a.should == [1, 2, 3, 4, nil, 6] + end + describe "Range subclasses" do before :each do @range_incl = ArraySpecs::MyRange.new(1, 2) @@ -425,6 +433,45 @@ def obj.to_ary() [1, 2, 3] end end end +ruby_version_is "2.6" do + describe "Array#[]= with [m..]" do + + it "just sets the section defined by range to nil even if the rhs is nil" do + a = [1, 2, 3, 4, 5] + a[eval("(2..)")] = nil + a.should == [1, 2, nil] + end + + it "just sets the section defined by range to nil if m and n < 0 and the rhs is nil" do + a = [1, 2, 3, 4, 5] + a[eval("(-3..)")] = nil + a.should == [1, 2, nil] + end + + it "replaces the section defined by range" do + a = [6, 5, 4, 3, 2, 1] + a[eval("(3...)")] = 9 + a.should == [6, 5, 4, 9] + a[eval("(2..)")] = [7, 7, 7] + a.should == [6, 5, 7, 7, 7] + end + + it "replaces the section if m and n < 0" do + a = [1, 2, 3, 4, 5] + a[eval("(-3..)")] = [7, 8, 9] + a.should == [1, 2, 7, 8, 9] + end + + it "inserts at the end if m > the array size" do + a = [1, 2, 3] + a[eval("(3..)")] = [4] + a.should == [1, 2, 3, 4] + a[eval("(5..)")] = [6] + a.should == [1, 2, 3, 4, nil, 6] + end + end +end + describe "Array#[] after a shift" do it "works for insertion" do a = [1,2] diff --git a/spec/ruby/core/array/fill_spec.rb b/spec/ruby/core/array/fill_spec.rb index 1c1beef25e223d..0f44d3c01050f9 100644 --- a/spec/ruby/core/array/fill_spec.rb +++ b/spec/ruby/core/array/fill_spec.rb @@ -314,4 +314,13 @@ def obj.<=>(rhs); rhs == self ? 0 : nil end def obj.<=>(rhs); rhs == self ? 0 : nil end -> { [].fill('a', obj..obj) }.should raise_error(TypeError) end + + ruby_version_is "2.6" do + it "works with endless ranges" do + [1, 2, 3, 4].fill('x', eval("(1..)")).should == [1, 'x', 'x', 'x'] + [1, 2, 3, 4].fill('x', eval("(3...)")).should == [1, 2, 3, 'x'] + [1, 2, 3, 4].fill(eval("(1..)")) { |x| x + 2 }.should == [1, 3, 4, 5] + [1, 2, 3, 4].fill(eval("(3...)")) { |x| x + 2 }.should == [1, 2, 3, 5] + end + end end diff --git a/spec/ruby/core/array/intersection_spec.rb b/spec/ruby/core/array/intersection_spec.rb index 7bf2ec4dbecd15..27d90f1e44e273 100644 --- a/spec/ruby/core/array/intersection_spec.rb +++ b/spec/ruby/core/array/intersection_spec.rb @@ -1,87 +1,21 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' +require_relative 'shared/intersection' describe "Array#&" do - it "creates an array with elements common to both arrays (intersection)" do - ([] & []).should == [] - ([1, 2] & []).should == [] - ([] & [1, 2]).should == [] - ([ 1, 3, 5 ] & [ 1, 2, 3 ]).should == [1, 3] - end - - it "creates an array with no duplicates" do - ([ 1, 1, 3, 5 ] & [ 1, 2, 3 ]).uniq!.should == nil - end - - it "creates an array with elements in order they are first encountered" do - ([ 1, 2, 3, 2, 5 ] & [ 5, 2, 3, 4 ]).should == [2, 3, 5] - end - - it "does not modify the original Array" do - a = [1, 1, 3, 5] - (a & [1, 2, 3]).should == [1, 3] - a.should == [1, 1, 3, 5] - end - - it "properly handles recursive arrays" do - empty = ArraySpecs.empty_recursive_array - (empty & empty).should == empty - - (ArraySpecs.recursive_array & []).should == [] - ([] & ArraySpecs.recursive_array).should == [] - - (ArraySpecs.recursive_array & ArraySpecs.recursive_array).should == [1, 'two', 3.0, ArraySpecs.recursive_array] - end + it_behaves_like :array_intersection, :& +end - it "tries to convert the passed argument to an Array using #to_ary" do - obj = mock('[1,2,3]') - obj.should_receive(:to_ary).and_return([1, 2, 3]) - ([1, 2] & obj).should == ([1, 2]) - end +ruby_version_is "2.7" do + describe "Array#intersection" do + it_behaves_like :array_intersection, :intersection - it "determines equivalence between elements in the sense of eql?" do - not_supported_on :opal do - ([5.0, 4.0] & [5, 4]).should == [] + it "accepts multiple arguments" do + [1, 2, 3, 4].intersection([1, 2, 3], [2, 3, 4]).should == [2, 3] end - str = "x" - ([str] & [str.dup]).should == [str] - - obj1 = mock('1') - obj2 = mock('2') - obj1.stub!(:hash).and_return(0) - obj2.stub!(:hash).and_return(0) - obj1.should_receive(:eql?).at_least(1).and_return(true) - obj2.stub!(:eql?).and_return(true) - - ([obj1] & [obj2]).should == [obj1] - ([obj1, obj1, obj2, obj2] & [obj2]).should == [obj1] - - obj1 = mock('3') - obj2 = mock('4') - obj1.stub!(:hash).and_return(0) - obj2.stub!(:hash).and_return(0) - obj1.should_receive(:eql?).at_least(1).and_return(false) - - ([obj1] & [obj2]).should == [] - ([obj1, obj1, obj2, obj2] & [obj2]).should == [obj2] - end - - it "does return subclass instances for Array subclasses" do - (ArraySpecs::MyArray[1, 2, 3] & []).should be_an_instance_of(Array) - (ArraySpecs::MyArray[1, 2, 3] & ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array) - ([] & ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array) - end - - it "does not call to_ary on array subclasses" do - ([5, 6] & ArraySpecs::ToAryArray[1, 2, 5, 6]).should == [5, 6] - end - - it "properly handles an identical item even when its #eql? isn't reflexive" do - x = mock('x') - x.stub!(:hash).and_return(42) - x.stub!(:eql?).and_return(false) # Stubbed for clarity and latitude in implementation; not actually sent by MRI. - - ([x] & [x]).should == [x] + it "preserves elements order from original array" do + [1, 2, 3, 4].intersection([3, 2, 1]).should == [1, 2, 3] + end end end diff --git a/spec/ruby/core/array/shared/intersection.rb b/spec/ruby/core/array/shared/intersection.rb new file mode 100644 index 00000000000000..49849b08c2311e --- /dev/null +++ b/spec/ruby/core/array/shared/intersection.rb @@ -0,0 +1,84 @@ +describe :array_intersection, shared: true do + it "creates an array with elements common to both arrays (intersection)" do + [].send(@method, []).should == [] + [1, 2].send(@method, []).should == [] + [].send(@method, [1, 2]).should == [] + [ 1, 3, 5 ].send(@method, [ 1, 2, 3 ]).should == [1, 3] + end + + it "creates an array with no duplicates" do + [ 1, 1, 3, 5 ].send(@method, [ 1, 2, 3 ]).uniq!.should == nil + end + + it "creates an array with elements in order they are first encountered" do + [ 1, 2, 3, 2, 5 ].send(@method, [ 5, 2, 3, 4 ]).should == [2, 3, 5] + end + + it "does not modify the original Array" do + a = [1, 1, 3, 5] + a.send(@method, [1, 2, 3]).should == [1, 3] + a.should == [1, 1, 3, 5] + end + + it "properly handles recursive arrays" do + empty = ArraySpecs.empty_recursive_array + empty.send(@method, empty).should == empty + + ArraySpecs.recursive_array.send(@method, []).should == [] + [].send(@method, ArraySpecs.recursive_array).should == [] + + ArraySpecs.recursive_array.send(@method, ArraySpecs.recursive_array).should == [1, 'two', 3.0, ArraySpecs.recursive_array] + end + + it "tries to convert the passed argument to an Array using #to_ary" do + obj = mock('[1,2,3]') + obj.should_receive(:to_ary).and_return([1, 2, 3]) + [1, 2].send(@method, obj).should == ([1, 2]) + end + + it "determines equivalence between elements in the sense of eql?" do + not_supported_on :opal do + [5.0, 4.0].send(@method, [5, 4]).should == [] + end + + str = "x" + [str].send(@method, [str.dup]).should == [str] + + obj1 = mock('1') + obj2 = mock('2') + obj1.stub!(:hash).and_return(0) + obj2.stub!(:hash).and_return(0) + obj1.should_receive(:eql?).at_least(1).and_return(true) + obj2.stub!(:eql?).and_return(true) + + [obj1].send(@method, [obj2]).should == [obj1] + [obj1, obj1, obj2, obj2].send(@method, [obj2]).should == [obj1] + + obj1 = mock('3') + obj2 = mock('4') + obj1.stub!(:hash).and_return(0) + obj2.stub!(:hash).and_return(0) + obj1.should_receive(:eql?).at_least(1).and_return(false) + + [obj1].send(@method, [obj2]).should == [] + [obj1, obj1, obj2, obj2].send(@method, [obj2]).should == [obj2] + end + + it "does return subclass instances for Array subclasses" do + ArraySpecs::MyArray[1, 2, 3].send(@method, []).should be_an_instance_of(Array) + ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array) + [].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array) + end + + it "does not call to_ary on array subclasses" do + [5, 6].send(@method, ArraySpecs::ToAryArray[1, 2, 5, 6]).should == [5, 6] + end + + it "properly handles an identical item even when its #eql? isn't reflexive" do + x = mock('x') + x.stub!(:hash).and_return(42) + x.stub!(:eql?).and_return(false) # Stubbed for clarity and latitude in implementation; not actually sent by MRI. + + [x].send(@method, [x]).should == [x] + end +end diff --git a/spec/ruby/core/array/shared/join.rb b/spec/ruby/core/array/shared/join.rb index 5e7193de8a8512..c443d9a628a8c1 100644 --- a/spec/ruby/core/array/shared/join.rb +++ b/spec/ruby/core/array/shared/join.rb @@ -113,6 +113,20 @@ class << obj; undef :to_s; end -> { ary_utf8_bad_binary.send(@method) }.should raise_error(EncodingError) end + + ruby_version_is "2.7" do + context "when $, is not nil" do + before do + suppress_warning do + $, = '*' + end + end + + it "warns" do + -> { [].join }.should complain(/warning: \$, is set to non-nil value/) + end + end + end end describe :array_join_with_string_separator, shared: true do diff --git a/spec/ruby/core/array/slice_spec.rb b/spec/ruby/core/array/slice_spec.rb index 16220bdf0d4490..2e9cfd39b3e86c 100644 --- a/spec/ruby/core/array/slice_spec.rb +++ b/spec/ruby/core/array/slice_spec.rb @@ -153,6 +153,18 @@ def to.to_int() -2 end it "raises a #{frozen_error_class} on a frozen array" do -> { ArraySpecs.frozen_array.slice!(0, 0) }.should raise_error(frozen_error_class) end + + ruby_version_is "2.6" do + it "works with endless ranges" do + a = [1, 2, 3] + a.slice!(eval("(1..)")).should == [2, 3] + a.should == [1] + + a = [1, 2, 3] + a.slice!(eval("(2...)")).should == [3] + a.should == [1, 2] + end + end end describe "Array#slice" do diff --git a/spec/ruby/core/array/values_at_spec.rb b/spec/ruby/core/array/values_at_spec.rb index 13860150bb0897..f6801335f89255 100644 --- a/spec/ruby/core/array/values_at_spec.rb +++ b/spec/ruby/core/array/values_at_spec.rb @@ -60,4 +60,11 @@ def to.to_int() -2 end it "does not return subclass instance on Array subclasses" do ArraySpecs::MyArray[1, 2, 3].values_at(0, 1..2, 1).should be_an_instance_of(Array) end + + ruby_version_is "2.6" do + it "works when given endless ranges" do + [1, 2, 3, 4].values_at(eval("(1..)")).should == [2, 3, 4] + [1, 2, 3, 4].values_at(eval("(3...)")).should == [4] + end + end end diff --git a/spec/ruby/core/complex/spaceship_spec.rb b/spec/ruby/core/complex/comparision_spec.rb similarity index 96% rename from spec/ruby/core/complex/spaceship_spec.rb rename to spec/ruby/core/complex/comparision_spec.rb index 7b2849a86a4ef2..2a437afb719afd 100644 --- a/spec/ruby/core/complex/spaceship_spec.rb +++ b/spec/ruby/core/complex/comparision_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' describe "Complex#<=>" do - ruby_version_is '2.7' do + ruby_version_is "2.7" do it "returns nil if either self or argument has imaginary part" do (Complex(5, 1) <=> Complex(2)).should be_nil (Complex(1) <=> Complex(2, 1)).should be_nil diff --git a/spec/ruby/core/enumerator/each_spec.rb b/spec/ruby/core/enumerator/each_spec.rb index d88c09cdb5c061..99ac3120afbbe1 100644 --- a/spec/ruby/core/enumerator/each_spec.rb +++ b/spec/ruby/core/enumerator/each_spec.rb @@ -40,10 +40,10 @@ def object_each_with_arguments.each_with_arguments(arg, *args) end it "calls the method given in the constructor until it's exhausted" do - each = mock('each') - each.should_receive(:each).and_yield(1).and_yield(2).and_yield(3) + each = mock('peach') + each.should_receive(:peach).and_yield(1).and_yield(2).and_yield(3) acc = [] - each.to_enum.each {|e| acc << e } + each.to_enum(:peach).each {|e| acc << e } acc.should == [1,2,3] end diff --git a/spec/ruby/core/enumerator/lazy/eager_spec.rb b/spec/ruby/core/enumerator/lazy/eager_spec.rb new file mode 100644 index 00000000000000..30ba2dfe0e9218 --- /dev/null +++ b/spec/ruby/core/enumerator/lazy/eager_spec.rb @@ -0,0 +1,29 @@ +require_relative '../../../spec_helper' + +ruby_version_is "2.7" do + describe "Enumerator::Lazy#eager" do + it "returns a non-lazy Enumerator converted from the lazy enumerator" do + enum = [1, 2, 3].lazy + + enum.class.should == Enumerator::Lazy + enum.eager.class.should == Enumerator + end + + it "does not enumerate an enumerator" do + ScratchPad.record [] + + sequence = [1, 2, 3] + enum_lazy = Enumerator::Lazy.new(sequence) do |yielder, value| + yielder << value + ScratchPad << value + end + + ScratchPad.recorded.should == [] + enum = enum_lazy.eager + ScratchPad.recorded.should == [] + + enum.map { |i| i }.should == [1, 2, 3] + ScratchPad.recorded.should == [1, 2, 3] + end + end +end diff --git a/spec/ruby/core/enumerator/new_spec.rb b/spec/ruby/core/enumerator/new_spec.rb index 170809dbc18a4f..15e42d247ef6f2 100644 --- a/spec/ruby/core/enumerator/new_spec.rb +++ b/spec/ruby/core/enumerator/new_spec.rb @@ -38,4 +38,42 @@ def each end enum.to_a.should == [:bar] end + + context "when passed a block" do + it "defines iteration with block, yielder argument and calling << method" do + enum = Enumerator.new do |yielder| + a = 1 + + loop do + yielder << a + a = a + 1 + end + end + + enum.take(3).should == [1, 2, 3] + end + + it "defines iteration with block, yielder argument and calling yield method" do + enum = Enumerator.new do |yielder| + a = 1 + + loop do + yielder.yield(a) + a = a + 1 + end + end + + enum.take(3).should == [1, 2, 3] + end + + ruby_version_is "2.7" do + it "defines iteration with block, yielder argument and treating it as a proc" do + enum = Enumerator.new do |yielder| + "a\nb\nc".each_line(&yielder) + end + + enum.to_a.should == ["a\n", "b\n", "c"] + end + end + end end diff --git a/spec/ruby/core/enumerator/produce_spec.rb b/spec/ruby/core/enumerator/produce_spec.rb new file mode 100644 index 00000000000000..f6f1dcd4299d45 --- /dev/null +++ b/spec/ruby/core/enumerator/produce_spec.rb @@ -0,0 +1,36 @@ +require_relative '../../spec_helper' + +ruby_version_is "2.7" do + describe "Enumerator.produce" do + it "creates an infinite enumerator" do + enum = Enumerator.produce(0) { |prev| prev + 1 } + enum.take(5).should == [0, 1, 2, 3, 4] + end + + it "terminates iteration when block raises StopIteration exception" do + enum = Enumerator.produce(0) do | prev| + raise StopIteration if prev >= 2 + prev + 1 + end + + enum.to_a.should == [0, 1, 2] + end + + context "when initial value skipped" do + it "uses nil instead" do + ScratchPad.record [] + enum = Enumerator.produce { |prev| ScratchPad << prev; (prev || 0) + 1 } + + enum.take(3).should == [1, 2, 3] + ScratchPad.recorded.should == [nil, 1, 2] + end + + it "starts enumerable from result of first block call" do + array = "a\nb\nc\nd".lines + lines = Enumerator.produce { array.shift }.take_while { |s| s } + + lines.should == ["a\n", "b\n", "c\n", "d"] + end + end + end +end diff --git a/spec/ruby/core/enumerator/yielder/to_proc_spec.rb b/spec/ruby/core/enumerator/yielder/to_proc_spec.rb new file mode 100644 index 00000000000000..0ed16458533086 --- /dev/null +++ b/spec/ruby/core/enumerator/yielder/to_proc_spec.rb @@ -0,0 +1,18 @@ +require_relative '../../../spec_helper' + +ruby_version_is "2.7" do + describe "Enumerator::Yielder#to_proc" do + it "returns a Proc object that takes an argument and yields it to the block" do + ScratchPad.record [] + y = Enumerator::Yielder.new { |*args| ScratchPad << args; "foobar" } + + callable = y.to_proc + callable.class.should == Proc + + result = callable.call(1, 2) + ScratchPad.recorded.should == [[1, 2]] + + result.should == "foobar" + end + end +end diff --git a/spec/ruby/core/exception/destination_encoding_name_spec.rb b/spec/ruby/core/exception/destination_encoding_name_spec.rb deleted file mode 100644 index a9e6474974a037..00000000000000 --- a/spec/ruby/core/exception/destination_encoding_name_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::UndefinedConversionError#destination_encoding_name" do - it "returns the destination encoding name" do - ec = Encoding::Converter.new("ISO-8859-1", "EUC-JP") - begin - ec.convert("\xa0") - rescue Encoding::UndefinedConversionError => e - e.destination_encoding_name.should == "EUC-JP" - end - end -end - -describe "Encoding::InvalidByteSequenceError#destination_encoding_name" do - it "returns the destination encoding name" do - ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1") - begin - ec.convert("\xa0") - rescue Encoding::InvalidByteSequenceError => e - e.destination_encoding_name.should == "UTF-8" - end - end -end diff --git a/spec/ruby/core/exception/destination_encoding_spec.rb b/spec/ruby/core/exception/destination_encoding_spec.rb deleted file mode 100644 index 5709c31e55a6e2..00000000000000 --- a/spec/ruby/core/exception/destination_encoding_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::UndefinedConversionError#destination_encoding" do - it "returns the destination encoding" do - ec = Encoding::Converter.new("ISO-8859-1", "EUC-JP") - begin - ec.convert("\xa0") - rescue Encoding::UndefinedConversionError => e - e.destination_encoding.should == Encoding::EUC_JP - end - end -end - -describe "Encoding::InvalidByteSequenceError#destination_encoding" do - it "returns the destination encoding" do - ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1") - begin - ec.convert("\xa0") - rescue Encoding::InvalidByteSequenceError => e - e.destination_encoding.should == Encoding::UTF_8 - end - end -end diff --git a/spec/ruby/core/exception/error_bytes_spec.rb b/spec/ruby/core/exception/error_bytes_spec.rb deleted file mode 100644 index 66dd4b62c19bbd..00000000000000 --- a/spec/ruby/core/exception/error_bytes_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::InvalidByteSequenceError#error_bytes" do - it "returns the error bytes" do - ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1") - begin - ec.convert("\xa0") - rescue Encoding::InvalidByteSequenceError => e - e.error_bytes.should == "\xA0".force_encoding("ASCII-8BIT") - end - end -end diff --git a/spec/ruby/core/exception/error_char_spec.rb b/spec/ruby/core/exception/error_char_spec.rb deleted file mode 100644 index f95ae2a6ceeaac..00000000000000 --- a/spec/ruby/core/exception/error_char_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::UndefinedConversionError#error_char" do - it "returns the error char" do - ec = Encoding::Converter.new("ISO-8859-1", "EUC-JP") - begin - ec.convert("\xa0") - rescue Encoding::UndefinedConversionError => e - e.error_char.should == "\u00A0" - end - end -end diff --git a/spec/ruby/core/exception/initialize_spec.rb b/spec/ruby/core/exception/initialize_spec.rb deleted file mode 100644 index e724feaa3947d4..00000000000000 --- a/spec/ruby/core/exception/initialize_spec.rb +++ /dev/null @@ -1 +0,0 @@ -require_relative '../../spec_helper' diff --git a/spec/ruby/core/exception/readagain_bytes_spec.rb b/spec/ruby/core/exception/readagain_bytes_spec.rb deleted file mode 100644 index 0f1e24f1cf9ac9..00000000000000 --- a/spec/ruby/core/exception/readagain_bytes_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::InvalidByteSequenceError#readagain_bytes" do - it "returns the next byte" do - begin - "abc\xa4def".encode("ISO-8859-1", "EUC-JP") - rescue Encoding::InvalidByteSequenceError => e - e.error_bytes.should == "\xA4".force_encoding("ASCII-8BIT") - e.readagain_bytes.should == 'd' - end - end -end diff --git a/spec/ruby/core/exception/source_encoding_name_spec.rb b/spec/ruby/core/exception/source_encoding_name_spec.rb deleted file mode 100644 index 6f5dbd01aacf6e..00000000000000 --- a/spec/ruby/core/exception/source_encoding_name_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::UndefinedConversionError#source_encoding_name" do - it "returns the source encoding name" do - ec = Encoding::Converter.new("ISO-8859-1", "EUC-JP") - begin - ec.convert("\xa0") - rescue Encoding::UndefinedConversionError => e - e.source_encoding_name.should == "UTF-8" - end - end -end - -describe "Encoding::InvalidByteSequenceError#source_encoding_name" do - it "returns the source encoding name" do - ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1") - begin - ec.convert("\xa0") - rescue Encoding::InvalidByteSequenceError => e - e.source_encoding_name.should == "EUC-JP" - end - end -end diff --git a/spec/ruby/core/exception/source_encoding_spec.rb b/spec/ruby/core/exception/source_encoding_spec.rb deleted file mode 100644 index fac38e75f4f584..00000000000000 --- a/spec/ruby/core/exception/source_encoding_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require_relative '../../spec_helper' - -describe "Encoding::UndefinedConversionError#source_encoding" do - it "returns the source encoding" do - ec = Encoding::Converter.new("ISO-8859-1", "EUC-JP") - begin - ec.convert("\xa0") - rescue Encoding::UndefinedConversionError => e - e.source_encoding.should == Encoding::UTF_8 - end - end -end - -describe "Encoding::InvalidByteSequenceError#source_encoding" do - it "returns the source encoding" do - ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1") - begin - ec.convert("\xa0") - rescue Encoding::InvalidByteSequenceError => e - e.source_encoding.should == Encoding::EUC_JP - end - end -end diff --git a/spec/ruby/core/hash/deconstruct_keys_spec.rb b/spec/ruby/core/hash/deconstruct_keys_spec.rb new file mode 100644 index 00000000000000..b2657326160549 --- /dev/null +++ b/spec/ruby/core/hash/deconstruct_keys_spec.rb @@ -0,0 +1,25 @@ +require_relative '../../spec_helper' + +ruby_version_is "2.7" do + describe "Hash#deconstruct_keys" do + it "returns self" do + hash = {a: 1, b: 2} + + hash.deconstruct_keys([:a, :b]).should equal hash + end + + it "requires one argument" do + -> { + {a: 1}.deconstruct_keys + }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/) + end + + it "ignores argument" do + hash = {a: 1, b: 2} + + hash.deconstruct_keys([:a]).should == {a: 1, b: 2} + hash.deconstruct_keys(0 ).should == {a: 1, b: 2} + hash.deconstruct_keys('' ).should == {a: 1, b: 2} + end + end +end diff --git a/spec/ruby/core/integer/element_reference_spec.rb b/spec/ruby/core/integer/element_reference_spec.rb index 99283fac3488fc..4c236a11e79b2f 100644 --- a/spec/ruby/core/integer/element_reference_spec.rb +++ b/spec/ruby/core/integer/element_reference_spec.rb @@ -78,6 +78,91 @@ it "returns 0 when passed a Float in the range of a Bignum" do 3[bignum_value.to_f].should == 0 end + + ruby_version_is "2.7" do + context "when index and length passed" do + it "returns specified number of bits from specified position" do + 0b101001101[2, 4].should == 0b0011 + 0b101001101[2, 5].should == 0b10011 + 0b101001101[2, 7].should == 0b1010011 + end + + it "ensures n[i, len] equals to (n >> i) & ((1 << len) - 1)" do + n = 0b101001101; i = 2; len = 4 + n[i, len].should == (n >> i) & ((1 << len) - 1) + end + + it "moves start position to the most significant bits when negative index passed" do + 0b000001[-1, 4].should == 0b10 + 0b000001[-2, 4].should == 0b100 + 0b000001[-3, 4].should == 0b1000 + end + + it "ignores negative length" do + 0b101001101[1, -1].should == 0b10100110 + 0b101001101[2, -1].should == 0b1010011 + 0b101001101[3, -1].should == 0b101001 + + 0b101001101[3, -5].should == 0b101001 + 0b101001101[3, -15].should == 0b101001 + 0b101001101[3, -125].should == 0b101001 + end + end + + context "when range passed" do + it "returns bits specified by range" do + 0b101001101[2..5].should == 0b0011 + 0b101001101[2..6].should == 0b10011 + 0b101001101[2..8].should == 0b1010011 + end + + it "ensures n[i..j] equals to (n >> i) & ((1 << (j - i + 1)) - 1)" do + n = 0b101001101; i = 2; j = 5 + n[i..j].should == (n >> i) & ((1 << (j - i + 1)) - 1) + end + + it "ensures n[i..] equals to (n >> i)" do + eval("0b101001101[3..]").should == 0b101001101 >> 3 + end + + it "moves lower boundary to the most significant bits when negative value passed" do + 0b000001[-1, 4].should == 0b10 + 0b000001[-2, 4].should == 0b100 + 0b000001[-3, 4].should == 0b1000 + end + + it "ignores negative upper boundary" do + 0b101001101[1..-1].should == 0b10100110 + 0b101001101[1..-2].should == 0b10100110 + 0b101001101[1..-3].should == 0b10100110 + end + + it "ignores upper boundary smaller than lower boundary" do + 0b101001101[4..1].should == 0b10100 + 0b101001101[4..2].should == 0b10100 + 0b101001101[4..3].should == 0b10100 + end + + it "raises FloatDomainError if any boundary is infinity" do + -> { 0x0001[3..Float::INFINITY] }.should raise_error(FloatDomainError, /Infinity/) + -> { 0x0001[-Float::INFINITY..3] }.should raise_error(FloatDomainError, /-Infinity/) + end + + context "when passed (..i)" do + it "returns 0 if all i bits equal 0" do + eval("0b10000[..1]").should == 0 + eval("0b10000[..2]").should == 0 + eval("0b10000[..3]").should == 0 + end + + it "raises ArgumentError if any of i bit equals 1" do + -> { + eval("0b111110[..3]") + }.should raise_error(ArgumentError, /The beginless range for Integer#\[\] results in infinity/) + end + end + end + end end context "bignum" do diff --git a/spec/ruby/core/kernel/caller_locations_spec.rb b/spec/ruby/core/kernel/caller_locations_spec.rb index 4de6c2ffd6d1e3..8f9429845d3674 100644 --- a/spec/ruby/core/kernel/caller_locations_spec.rb +++ b/spec/ruby/core/kernel/caller_locations_spec.rb @@ -22,6 +22,30 @@ locations.length.should == 1 end + it "can be called with a range" do + locations1 = caller_locations(0) + locations2 = caller_locations(2..4) + locations1[2..4].map(&:to_s).should == locations2.map(&:to_s) + end + + it "can be called with a range whose end is negative" do + locations1 = caller_locations(0) + locations2 = caller_locations(2..-1) + locations3 = caller_locations(2..-2) + locations1[2..-1].map(&:to_s).should == locations2.map(&:to_s) + locations1[2..-2].map(&:to_s).should == locations3.map(&:to_s) + end + + it "must return nil if omitting more locations than available" do + caller_locations(100).should == nil + caller_locations(100..-1).should == nil + end + + it "must return [] if omitting exactly the number of locations available" do + omit = caller_locations(0).length + caller_locations(omit).should == [] + end + it 'returns the locations as Thread::Backtrace::Location instances' do locations = KernelSpecs::CallerLocationsTest.locations @@ -29,4 +53,8 @@ location.kind_of?(Thread::Backtrace::Location).should == true end end + + it "must return the same locations when called with 1..-1 and when called with no arguments" do + caller_locations.map(&:to_s).should == caller_locations(1..-1).map(&:to_s) + end end diff --git a/spec/ruby/core/kernel/printf_spec.rb b/spec/ruby/core/kernel/printf_spec.rb index 4592c08aaf7f1d..d1743dbcde4fa6 100644 --- a/spec/ruby/core/kernel/printf_spec.rb +++ b/spec/ruby/core/kernel/printf_spec.rb @@ -1,7 +1,6 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' require_relative 'shared/sprintf' -require "stringio" describe "Kernel#printf" do it "is a private method" do @@ -32,8 +31,14 @@ object.should_receive(:write).with("string") Kernel.printf(object, "%s", "string") end +end +describe "Kernel.printf" do describe "formatting" do + before :each do + require "stringio" + end + context "io is specified" do it_behaves_like :kernel_sprintf, -> format, *args { io = StringIO.new @@ -45,7 +50,6 @@ context "io is not specified" do it_behaves_like :kernel_sprintf, -> format, *args { stdout = $stdout - begin $stdout = io = StringIO.new Kernel.printf(format, *args) diff --git a/spec/ruby/core/kernel/warn_spec.rb b/spec/ruby/core/kernel/warn_spec.rb index 2a404a2a35d062..b0672997f6e309 100644 --- a/spec/ruby/core/kernel/warn_spec.rb +++ b/spec/ruby/core/kernel/warn_spec.rb @@ -111,7 +111,7 @@ -> { w.f4(obj, 2) }.should output(nil, %r|core/kernel/fixtures/classes.rb:#{w.f2_call_lineno}: warning: to_s called|) end - it "does not prepend caller information if line number is too big" do + it "does not prepend caller information if the uplevel argument is too large" do w = KernelSpecs::WarnInNestedCall.new -> { w.f4("foo", 100) }.should output(nil, "warning: foo\n") end diff --git a/spec/ruby/core/marshal/dump_spec.rb b/spec/ruby/core/marshal/dump_spec.rb index ea021991a8dc18..4ffc586364193e 100644 --- a/spec/ruby/core/marshal/dump_spec.rb +++ b/spec/ruby/core/marshal/dump_spec.rb @@ -556,13 +556,10 @@ def obj.foo; end end describe "when passed a StringIO" do - it "should raise an error" do require "stringio" - -> { Marshal.dump(StringIO.new) }.should raise_error(TypeError) end - end it "raises a TypeError if marshalling a Method instance" do diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb index 78fc9fb2860025..85e645507f6b26 100644 --- a/spec/ruby/core/marshal/shared/load.rb +++ b/spec/ruby/core/marshal/shared/load.rb @@ -1,6 +1,5 @@ # -*- encoding: binary -*- require_relative '../fixtures/marshal_data' -require 'stringio' describe :marshal_load, shared: true do before :all do @@ -410,8 +409,9 @@ end it "loads a string through StringIO stream" do - obj = "This is a string which should be unmarshalled through StringIO stream!" - Marshal.send(@method, StringIO.new(Marshal.dump(obj))).should == obj + require 'stringio' + obj = "This is a string which should be unmarshalled through StringIO stream!" + Marshal.send(@method, StringIO.new(Marshal.dump(obj))).should == obj end it "loads a string with an ivar" do diff --git a/spec/ruby/core/range/bsearch_spec.rb b/spec/ruby/core/range/bsearch_spec.rb index 009cafb00e3cd2..38ccd351705984 100644 --- a/spec/ruby/core/range/bsearch_spec.rb +++ b/spec/ruby/core/range/bsearch_spec.rb @@ -81,6 +81,19 @@ [1, 2].should include(result) end end + + it "returns nil for empty ranges" do + (0...0).bsearch { true }.should == nil + (0...0).bsearch { false }.should == nil + (0...0).bsearch { 1 }.should == nil + (0...0).bsearch { 0 }.should == nil + (0...0).bsearch { -1 }.should == nil + + (4..2).bsearch { true }.should == nil + (4..2).bsearch { 1 }.should == nil + (4..2).bsearch { 0 }.should == nil + (4..2).bsearch { -1 }.should == nil + end end context "with Float values" do @@ -94,13 +107,46 @@ end it "returns minimum element if the block returns true for every element" do - (-0.2..4.8).bsearch { |x| x < 4 }.should == -0.2 + (-0.2..4.8).bsearch { |x| x < 5 }.should == -0.2 end it "returns the smallest element for which block returns true" do (0..4.2).bsearch { |x| x >= 2 }.should == 2 (-1.2..4.3).bsearch { |x| x >= 1 }.should == 1 end + + it "returns a boundary element if appropriate" do + (1.0..3.0).bsearch { |x| x >= 3.0 }.should == 3.0 + (1.0...3.0).bsearch { |x| x >= 3.0.prev_float }.should == 3.0.prev_float + (1.0..3.0).bsearch { |x| x >= 1.0 }.should == 1.0 + (1.0...3.0).bsearch { |x| x >= 1.0 }.should == 1.0 + end + + it "works with infinity bounds" do + inf = Float::INFINITY + (0..inf).bsearch { |x| x == inf }.should == inf + (0...inf).bsearch { |x| x == inf }.should == nil + (-inf..0).bsearch { |x| x == -inf }.should == nil + (-inf...0).bsearch { |x| x == -inf }.should == nil + (inf..inf).bsearch { |x| true }.should == inf + (inf...inf).bsearch { |x| true }.should == nil + (-inf..-inf).bsearch { |x| true }.should == -inf + (-inf...-inf).bsearch { |x| true }.should == nil + (inf..0).bsearch { true }.should == nil + (inf...0).bsearch { true }.should == nil + (0..-inf).bsearch { true }.should == nil + (0...-inf).bsearch { true }.should == nil + (inf..-inf).bsearch { true }.should == nil + (inf...-inf).bsearch { true }.should == nil + (0..inf).bsearch { |x| x >= 3 }.should == 3.0 + (0...inf).bsearch { |x| x >= 3 }.should == 3.0 + (-inf..0).bsearch { |x| x >= -3 }.should == -3.0 + (-inf...0).bsearch { |x| x >= -3 }.should == -3.0 + (-inf..inf).bsearch { |x| x >= 3 }.should == 3.0 + (-inf...inf).bsearch { |x| x >= 3 }.should == 3.0 + (0..inf).bsearch { |x| x >= Float::MAX }.should == Float::MAX + (0...inf).bsearch { |x| x >= Float::MAX }.should == Float::MAX + end end context "with a block returning negative, zero, positive numbers" do @@ -130,7 +176,157 @@ it "returns an element at an index for which block returns 0" do result = (0.1..4.9).bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 } result.should >= 1 - result.should <= 2 + result.should <= 3 + end + + it "returns an element at an index for which block returns 0 (small numbers)" do + result = (0.1..0.3).bsearch { |x| x < 0.1 ? 1 : x > 0.3 ? -1 : 0 } + result.should >= 0.1 + result.should <= 0.3 + end + + it "returns a boundary element if appropriate" do + (1.0..3.0).bsearch { |x| 3.0 - x }.should == 3.0 + (1.0...3.0).bsearch { |x| 3.0.prev_float - x }.should == 3.0.prev_float + (1.0..3.0).bsearch { |x| 1.0 - x }.should == 1.0 + (1.0...3.0).bsearch { |x| 1.0 - x }.should == 1.0 + end + + it "works with infinity bounds" do + inf = Float::INFINITY + (0..inf).bsearch { |x| x == inf ? 0 : -1 }.should == nil + (0...inf).bsearch { |x| x == inf ? 0 : -1 }.should == nil + (-inf...0).bsearch { |x| x == -inf ? 0 : 1 }.should == nil + (-inf..0).bsearch { |x| x == -inf ? 0 : 1 }.should == nil + (inf..inf).bsearch { 0 }.should == inf + (inf...inf).bsearch { 0 }.should == nil + (-inf..-inf).bsearch { 0 }.should == -inf + (-inf...-inf).bsearch { 0 }.should == nil + (inf..0).bsearch { 0 }.should == nil + (inf...0).bsearch { 0 }.should == nil + (0..-inf).bsearch { 0 }.should == nil + (0...-inf).bsearch { 0 }.should == nil + (inf..-inf).bsearch { 0 }.should == nil + (inf...-inf).bsearch { 0 }.should == nil + (-inf..inf).bsearch { |x| 3 - x }.should == 3.0 + (-inf...inf).bsearch { |x| 3 - x }.should == 3.0 + (0...inf).bsearch { |x| x >= Float::MAX ? 0 : 1 }.should == Float::MAX + end + end + end + + ruby_version_is "2.6" do + context "with endless ranges and Integer values" do + context "with a block returning true or false" do + it "returns minimum element if the block returns true for every element" do + eval("(-2..)").bsearch { |x| true }.should == -2 + end + + it "returns the smallest element for which block returns true" do + eval("(0..)").bsearch { |x| x >= 2 }.should == 2 + eval("(-1..)").bsearch { |x| x >= 1 }.should == 1 + end + end + + context "with a block returning negative, zero, positive numbers" do + it "returns nil if the block returns less than zero for every element" do + eval("(0..)").bsearch { |x| -1 }.should be_nil + end + + it "returns nil if the block never returns zero" do + eval("(0..)").bsearch { |x| x > 5 ? -1 : 1 }.should be_nil + end + + it "accepts -Float::INFINITY from the block" do + eval("(0..)").bsearch { |x| -Float::INFINITY }.should be_nil + end + + it "returns an element at an index for which block returns 0.0" do + result = eval("(0..)").bsearch { |x| x < 2 ? 1.0 : x > 2 ? -1.0 : 0.0 } + result.should == 2 + end + + it "returns an element at an index for which block returns 0" do + result = eval("(0..)").bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 } + [1, 2].should include(result) + end + end + end + + context "with endless ranges and Float values" do + context "with a block returning true or false" do + it "returns nil if the block returns false for every element" do + eval("(0.1..)").bsearch { |x| x < 0.0 }.should be_nil + eval("(0.1...)").bsearch { |x| x < 0.0 }.should be_nil + end + + it "returns nil if the block returns nil for every element" do + eval("(-0.0..)").bsearch { |x| nil }.should be_nil + eval("(-0.0...)").bsearch { |x| nil }.should be_nil + end + + it "returns minimum element if the block returns true for every element" do + eval("(-0.2..)").bsearch { |x| true }.should == -0.2 + eval("(-0.2...)").bsearch { |x| true }.should == -0.2 + end + + it "returns the smallest element for which block returns true" do + eval("(0..)").bsearch { |x| x >= 2 }.should == 2 + eval("(-1.2..)").bsearch { |x| x >= 1 }.should == 1 + end + + it "works with infinity bounds" do + inf = Float::INFINITY + eval("(inf..)").bsearch { |x| true }.should == inf + eval("(inf...)").bsearch { |x| true }.should == nil + eval("(-inf..)").bsearch { |x| true }.should == -inf + eval("(-inf...)").bsearch { |x| true }.should == -inf + end + end + + context "with a block returning negative, zero, positive numbers" do + it "returns nil if the block returns less than zero for every element" do + eval("(-2.0..)").bsearch { |x| -1 }.should be_nil + eval("(-2.0...)").bsearch { |x| -1 }.should be_nil + end + + it "returns nil if the block returns greater than zero for every element" do + eval("(0.3..)").bsearch { |x| 1 }.should be_nil + eval("(0.3...)").bsearch { |x| 1 }.should be_nil + end + + it "returns nil if the block never returns zero" do + eval("(0.2..)").bsearch { |x| x < 2 ? 1 : -1 }.should be_nil + end + + it "accepts (+/-)Float::INFINITY from the block" do + eval("(0.1..)").bsearch { |x| Float::INFINITY }.should be_nil + eval("(-5.0..)").bsearch { |x| -Float::INFINITY }.should be_nil + end + + it "returns an element at an index for which block returns 0.0" do + result = eval("(0.0..)").bsearch { |x| x < 2 ? 1.0 : x > 2 ? -1.0 : 0.0 } + result.should == 2 + end + + it "returns an element at an index for which block returns 0" do + result = eval("(0.1..)").bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 } + result.should >= 1 + result.should <= 3 + end + + it "works with infinity bounds" do + inf = Float::INFINITY + eval("(inf..)").bsearch { |x| 1 }.should == nil + eval("(inf...)").bsearch { |x| 1 }.should == nil + eval("(inf..)").bsearch { |x| x == inf ? 0 : 1 }.should == inf + eval("(inf...)").bsearch { |x| x == inf ? 0 : 1 }.should == nil + eval("(-inf..)").bsearch { |x| x == -inf ? 0 : -1 }.should == -inf + eval("(-inf...)").bsearch { |x| x == -inf ? 0 : -1 }.should == -inf + eval("(-inf..)").bsearch { |x| 3 - x }.should == 3 + eval("(-inf...)").bsearch { |x| 3 - x }.should == 3 + eval("(0.0...)").bsearch { 0 }.should != inf + end end end end diff --git a/spec/ruby/core/range/each_spec.rb b/spec/ruby/core/range/each_spec.rb index 110b0602d083e8..8935d86829038e 100644 --- a/spec/ruby/core/range/each_spec.rb +++ b/spec/ruby/core/range/each_spec.rb @@ -32,6 +32,28 @@ a.should == [x, y] end + ruby_version_is "2.6" do + it "works with endless ranges" do + a = [] + eval("(-2..)").each { |x| break if x > 2; a << x } + a.should == [-2, -1, 0, 1, 2] + + a = [] + eval("(-2...)").each { |x| break if x > 2; a << x } + a.should == [-2, -1, 0, 1, 2] + end + + it "works with String endless ranges" do + a = [] + eval("('A'..)").each { |x| break if x > "D"; a << x } + a.should == ["A", "B", "C", "D"] + + a = [] + eval("('A'...)").each { |x| break if x > "D"; a << x } + a.should == ["A", "B", "C", "D"] + end + end + it "raises a TypeError if the first element does not respond to #succ" do -> { (0.5..2.4).each { |i| i } }.should raise_error(TypeError) diff --git a/spec/ruby/core/range/equal_value_spec.rb b/spec/ruby/core/range/equal_value_spec.rb index 889557fc2a6e60..43d5e0e38a95c7 100644 --- a/spec/ruby/core/range/equal_value_spec.rb +++ b/spec/ruby/core/range/equal_value_spec.rb @@ -7,4 +7,10 @@ it "returns true if the endpoints are ==" do (0..1).should == (0..1.0) end + + ruby_version_is "2.6" do + it "returns true if the endpoints are == for endless ranges" do + eval("(1.0..)").should == eval("(1.0..)") + end + end end diff --git a/spec/ruby/core/range/inspect_spec.rb b/spec/ruby/core/range/inspect_spec.rb index 837f7e69abd419..d1072531e930f7 100644 --- a/spec/ruby/core/range/inspect_spec.rb +++ b/spec/ruby/core/range/inspect_spec.rb @@ -12,6 +12,13 @@ (0.5..2.4).inspect.should == "0.5..2.4" end + ruby_version_is "2.6" do + it "works for endless ranges" do + eval("(1..)").inspect.should == "1.." + eval("(0.1...)").inspect.should == "0.1..." + end + end + ruby_version_is ''...'2.7' do it "returns a tainted string if either end is tainted" do (("a".taint)..."c").inspect.tainted?.should be_true diff --git a/spec/ruby/core/range/last_spec.rb b/spec/ruby/core/range/last_spec.rb index c7e629e62ce0ae..54884ba4d69961 100644 --- a/spec/ruby/core/range/last_spec.rb +++ b/spec/ruby/core/range/last_spec.rb @@ -46,4 +46,10 @@ it "raises a TypeError when passed a String" do -> { (2..3).last("1") }.should raise_error(TypeError) end + + ruby_version_is "2.6" do + it "raises a RangeError when called on an endless range" do + -> { eval("(1..)").last }.should raise_error(RangeError) + end + end end diff --git a/spec/ruby/core/range/max_spec.rb b/spec/ruby/core/range/max_spec.rb index faac0a2032e54f..728053cefdcad7 100644 --- a/spec/ruby/core/range/max_spec.rb +++ b/spec/ruby/core/range/max_spec.rb @@ -45,6 +45,12 @@ time_end = Time.now + 1.0 -> { (time_start...time_end).max }.should raise_error(TypeError) end + + ruby_version_is "2.6" do + it "raises RangeError when called on an endless range" do + -> { eval("(1..)").max }.should raise_error(RangeError) + end + end end describe "Range#max given a block" do diff --git a/spec/ruby/core/range/min_spec.rb b/spec/ruby/core/range/min_spec.rb index 424bd1dc872251..f1dff73e6d6b10 100644 --- a/spec/ruby/core/range/min_spec.rb +++ b/spec/ruby/core/range/min_spec.rb @@ -72,4 +72,11 @@ ('z'..'l').min {|x,y| x <=> y}.should be_nil (7...7).min {|x,y| x <=> y}.should be_nil end + + ruby_version_is "2.6" do + it "returns the start point for endless ranges" do + eval("(1..)").min.should == 1 + eval("(1.0...)").min.should == 1.0 + end + end end diff --git a/spec/ruby/core/range/shared/cover_and_include.rb b/spec/ruby/core/range/shared/cover_and_include.rb index a19e2c6eadef9e..b308524310f407 100644 --- a/spec/ruby/core/range/shared/cover_and_include.rb +++ b/spec/ruby/core/range/shared/cover_and_include.rb @@ -19,6 +19,13 @@ (0.5...2.4).send(@method, 2.4).should == false end + ruby_version_is "2.6" do + it "returns true if other is an element of self for endless ranges" do + eval("(1..)").send(@method, 2.4).should == true + eval("(0.5...)").send(@method, 2.4).should == true + end + end + it "compares values using <=>" do rng = (1..5) m = mock("int") diff --git a/spec/ruby/core/range/shared/equal_value.rb b/spec/ruby/core/range/shared/equal_value.rb index 9d8bb133511034..8872b4efc0a81a 100644 --- a/spec/ruby/core/range/shared/equal_value.rb +++ b/spec/ruby/core/range/shared/equal_value.rb @@ -42,4 +42,12 @@ b = RangeSpecs::MyRange.new(RangeSpecs::Xs.new(3), RangeSpecs::Xs.new(5)) a.send(@method, b).should == true end + + ruby_version_is "2.6" do + it "works for endless Ranges" do + eval("(1..)").send(@method, eval("(1..)")).should == true + eval("(0.5...)").send(@method, eval("(0.5...)")).should == true + eval("(1..)").send(@method, eval("(1...)")).should == false + end + end end diff --git a/spec/ruby/core/range/size_spec.rb b/spec/ruby/core/range/size_spec.rb index 09759940ddcc1e..b687342b7259ee 100644 --- a/spec/ruby/core/range/size_spec.rb +++ b/spec/ruby/core/range/size_spec.rb @@ -24,6 +24,13 @@ (-Float::INFINITY..Float::INFINITY).size.should == Float::INFINITY end + ruby_version_is "2.6" do + it 'returns Float::INFINITY for endless ranges' do + eval("(1..)").size.should == Float::INFINITY + eval("(0.5...)").size.should == Float::INFINITY + end + end + it "returns nil if first and last are not Numeric" do (:a..:z).size.should be_nil ('a'..'z').size.should be_nil diff --git a/spec/ruby/core/range/step_spec.rb b/spec/ruby/core/range/step_spec.rb index d564e4a5cd7178..d83868a0fb70d1 100644 --- a/spec/ruby/core/range/step_spec.rb +++ b/spec/ruby/core/range/step_spec.rb @@ -274,6 +274,102 @@ end end + ruby_version_is "2.6" do + describe "with an endless range" do + describe "and Integer values" do + it "yield Integer values incremented by 1 when not passed a step" do + eval("(-2..)").step { |x| break if x > 2; ScratchPad << x } + ScratchPad.recorded.should eql([-2, -1, 0, 1, 2]) + + ScratchPad.record [] + eval("(-2...)").step { |x| break if x > 2; ScratchPad << x } + ScratchPad.recorded.should eql([-2, -1, 0, 1, 2]) + end + + it "yields Integer values incremented by an Integer step" do + eval("(-5..)").step(2) { |x| break if x > 3; ScratchPad << x } + ScratchPad.recorded.should eql([-5, -3, -1, 1, 3]) + + ScratchPad.record [] + eval("(-5...)").step(2) { |x| break if x > 3; ScratchPad << x } + ScratchPad.recorded.should eql([-5, -3, -1, 1, 3]) + end + + it "yields Float values incremented by a Float step" do + eval("(-2..)").step(1.5) { |x| break if x > 1.0; ScratchPad << x } + ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])\ + + ScratchPad.record [] + eval("(-2..)").step(1.5) { |x| break if x > 1.0; ScratchPad << x } + ScratchPad.recorded.should eql([-2.0, -0.5, 1.0]) + end + end + + describe "and Float values" do + it "yields Float values incremented by 1 and less than end when not passed a step" do + eval("(-2.0..)").step { |x| break if x > 1.5; ScratchPad << x } + ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0]) + + ScratchPad.record [] + eval("(-2.0...)").step { |x| break if x > 1.5; ScratchPad << x } + ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0]) + end + + it "yields Float values incremented by an Integer step" do + eval("(-5.0..)").step(2) { |x| break if x > 3.5; ScratchPad << x } + ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0]) + + ScratchPad.record [] + eval("(-5.0...)").step(2) { |x| break if x > 3.5; ScratchPad << x } + ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0]) + end + + it "yields Float values incremented by a Float step" do + eval("(-1.0..)").step(0.5) { |x| break if x > 0.6; ScratchPad << x } + ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5]) + + ScratchPad.record [] + eval("(-1.0...)").step(0.5) { |x| break if x > 0.6; ScratchPad << x } + ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5]) + end + + it "handles infinite values at the start" do + eval("(-Float::INFINITY..)").step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 } + ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY]) + + ScratchPad.record [] + eval("(-Float::INFINITY...)").step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 } + ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY]) + end + end + + describe "and String values" do + it "yields String values incremented by #succ and less than or equal to end when not passed a step" do + eval("('A'..)").step { |x| break if x > "D"; ScratchPad << x } + ScratchPad.recorded.should == ["A", "B", "C", "D"] + + ScratchPad.record [] + eval("('A'...)").step { |x| break if x > "D"; ScratchPad << x } + ScratchPad.recorded.should == ["A", "B", "C", "D"] + end + + it "yields String values incremented by #succ called Integer step times" do + eval("('A'..)").step(2) { |x| break if x > "F"; ScratchPad << x } + ScratchPad.recorded.should == ["A", "C", "E"] + + ScratchPad.record [] + eval("('A'...)").step(2) { |x| break if x > "F"; ScratchPad << x } + ScratchPad.recorded.should == ["A", "C", "E"] + end + + it "raises a TypeError when passed a Float step" do + -> { eval("('A'..)").step(2.0) { } }.should raise_error(TypeError) + -> { eval("('A'...)").step(2.0) { } }.should raise_error(TypeError) + end + end + end + end + describe "when no block is given" do describe "returned Enumerator" do describe "size" do diff --git a/spec/ruby/core/range/to_a_spec.rb b/spec/ruby/core/range/to_a_spec.rb index 15f0b44a9ceb13..b0067f0e07e915 100644 --- a/spec/ruby/core/range/to_a_spec.rb +++ b/spec/ruby/core/range/to_a_spec.rb @@ -19,4 +19,10 @@ it "works with Ranges of Symbols" do (:A..:z).to_a.size.should == 58 end + + ruby_version_is "2.6" do + it "throws an exception for endless ranges" do + -> { eval("(1..)").to_a }.should raise_error(RangeError) + end + end end diff --git a/spec/ruby/core/range/to_s_spec.rb b/spec/ruby/core/range/to_s_spec.rb index 7392aa9890cfb6..ccbc5d8e7eb250 100644 --- a/spec/ruby/core/range/to_s_spec.rb +++ b/spec/ruby/core/range/to_s_spec.rb @@ -11,6 +11,13 @@ (0.5..2.4).to_s.should == "0.5..2.4" end + ruby_version_is "2.6" do + it "can show endless ranges" do + eval("(1..)").to_s.should == "1.." + eval("(1.0...)").to_s.should == "1.0..." + end + end + ruby_version_is ''...'2.7' do it "returns a tainted string if either end is tainted" do (("a".taint)..."c").to_s.tainted?.should be_true diff --git a/spec/ruby/core/string/capitalize_spec.rb b/spec/ruby/core/string/capitalize_spec.rb index 41dd63f63e4e4b..376db3aa721a4b 100644 --- a/spec/ruby/core/string/capitalize_spec.rb +++ b/spec/ruby/core/string/capitalize_spec.rb @@ -93,6 +93,12 @@ a.should == "Hello" end + it "modifies self in place for non-ascii-compatible encodings" do + a = "heLLo".encode("utf-16le") + a.capitalize! + a.should == "Hello".encode("utf-16le") + end + describe "full Unicode case mapping" do it "modifies self in place for all of Unicode with no option" do a = "äöÜ" @@ -106,6 +112,12 @@ a.should == "Ss" end + it "works for non-ascii-compatible encodings" do + a = "äöü".encode("utf-16le") + a.capitalize! + a.should == "Äöü".encode("utf-16le") + end + it "updates string metadata" do capitalized = "ßeT" capitalized.capitalize! @@ -123,6 +135,12 @@ a.capitalize!(:ascii) a.should == "ßet" end + + it "works for non-ascii-compatible encodings" do + a = "aBc".encode("utf-16le") + a.capitalize!(:ascii) + a.should == "Abc".encode("utf-16le") + end end describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do diff --git a/spec/ruby/core/string/downcase_spec.rb b/spec/ruby/core/string/downcase_spec.rb index 84e94ee1042981..a78b6de373ac10 100644 --- a/spec/ruby/core/string/downcase_spec.rb +++ b/spec/ruby/core/string/downcase_spec.rb @@ -88,6 +88,12 @@ a.should == "hello" end + it "modifies self in place for non-ascii-compatible encodings" do + a = "HeLlO".encode("utf-16le") + a.downcase! + a.should == "hello".encode("utf-16le") + end + describe "full Unicode case mapping" do it "modifies self in place for all of Unicode with no option" do a = "ÄÖÜ" @@ -112,6 +118,12 @@ a.downcase!(:ascii) a.should == "cÅr" end + + it "works for non-ascii-compatible encodings" do + a = "ABC".encode("utf-16le") + a.downcase!(:ascii) + a.should == "abc".encode("utf-16le") + end end describe "full Unicode case mapping adapted for Turkic languages" do diff --git a/spec/ruby/core/string/shared/length.rb b/spec/ruby/core/string/shared/length.rb index f387fb251cde1b..b9eae5170fadf6 100644 --- a/spec/ruby/core/string/shared/length.rb +++ b/spec/ruby/core/string/shared/length.rb @@ -23,4 +23,17 @@ str.force_encoding('BINARY').send(@method).should == 12 end + + it "returns the correct length after force_encoding(BINARY)" do + utf8 = "あ" + ascii = "a" + concat = utf8 + ascii + + concat.encoding.should == Encoding::UTF_8 + concat.bytesize.should == 4 + + concat.size.should == 2 + concat.force_encoding(Encoding::ASCII_8BIT) + concat.size.should == 4 + end end diff --git a/spec/ruby/core/string/split_spec.rb b/spec/ruby/core/string/split_spec.rb index cfb030ad8d05f9..8a740b04caaaa3 100644 --- a/spec/ruby/core/string/split_spec.rb +++ b/spec/ruby/core/string/split_spec.rb @@ -84,6 +84,24 @@ $; = old_fs end end + + ruby_version_is "2.7" do + context "when $; is not nil" do + before do + suppress_warning do + @old_value, $; = $;, 'foobar' + end + end + + after do + $; = @old_value + end + + it "warns" do + -> { "".split }.should complain(/warning: \$; is set to non-nil value/) + end + end + end end it "ignores leading and continuous whitespace when string is a single space" do diff --git a/spec/ruby/core/string/swapcase_spec.rb b/spec/ruby/core/string/swapcase_spec.rb index c1a1608a817576..b5d9b2045141c2 100644 --- a/spec/ruby/core/string/swapcase_spec.rb +++ b/spec/ruby/core/string/swapcase_spec.rb @@ -86,6 +86,12 @@ a.should == "CyBeR_pUnK11" end + it "modifies self in place for non-ascii-compatible encodings" do + a = "cYbEr_PuNk11".encode("utf-16le") + a.swapcase! + a.should == "CyBeR_pUnK11".encode("utf-16le") + end + describe "full Unicode case mapping" do it "modifies self in place for all of Unicode with no option" do a = "äÖü" @@ -93,6 +99,12 @@ a.should == "ÄöÜ" end + it "works for non-ascii-compatible encodings" do + a = "äÖü".encode("utf-16le") + a.swapcase! + a.should == "ÄöÜ".encode("utf-16le") + end + it "updates string metadata" do swapcased = "Aßet" swapcased.swapcase! @@ -110,6 +122,12 @@ a.swapcase!(:ascii) a.should == "AßET" end + + it "works for non-ascii-compatible encodings" do + a = "aBc".encode("utf-16le") + a.swapcase!(:ascii) + a.should == "AbC".encode("utf-16le") + end end describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do diff --git a/spec/ruby/core/string/upcase_spec.rb b/spec/ruby/core/string/upcase_spec.rb index eb7d708fe0d8ad..4857079a84ba79 100644 --- a/spec/ruby/core/string/upcase_spec.rb +++ b/spec/ruby/core/string/upcase_spec.rb @@ -85,6 +85,12 @@ a.should == "HELLO" end + it "modifies self in place for non-ascii-compatible encodings" do + a = "HeLlO".encode("utf-16le") + a.upcase! + a.should == "HELLO".encode("utf-16le") + end + describe "full Unicode case mapping" do it "modifies self in place for all of Unicode with no option" do a = "äöü" @@ -92,6 +98,12 @@ a.should == "ÄÖÜ" end + it "works for non-ascii-compatible encodings" do + a = "äöü".encode("utf-16le") + a.upcase! + a.should == "ÄÖÜ".encode("utf-16le") + end + it "updates string metadata for self" do upcased = "aßet" upcased.upcase! @@ -109,6 +121,12 @@ a.upcase!(:ascii) a.should == "AßET" end + + it "works for non-ascii-compatible encodings" do + a = "abc".encode("utf-16le") + a.upcase!(:ascii) + a.should == "ABC".encode("utf-16le") + end end describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do diff --git a/spec/ruby/core/struct/deconstruct_keys_spec.rb b/spec/ruby/core/struct/deconstruct_keys_spec.rb new file mode 100644 index 00000000000000..41b9c31e02a477 --- /dev/null +++ b/spec/ruby/core/struct/deconstruct_keys_spec.rb @@ -0,0 +1,70 @@ +require_relative '../../spec_helper' + +ruby_version_is "2.7" do + describe "Struct#deconstruct_keys" do + it "returns a hash of attributes" do + struct = Struct.new(:x, :y) + s = struct.new(1, 2) + + s.deconstruct_keys([:x, :y]).should == {x: 1, y: 2} + end + + it "requires one argument" do + struct = Struct.new(:x) + obj = struct.new(1) + + -> { + obj.deconstruct_keys + }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/) + end + + it "returns only specified keys" do + struct = Struct.new(:x, :y, :z) + s = struct.new(1, 2, 3) + + s.deconstruct_keys([:x, :y]).should == {x: 1, y: 2} + s.deconstruct_keys([:x] ).should == {x: 1} + s.deconstruct_keys([] ).should == {} + end + + it "accepts string attribute names" do + struct = Struct.new(:x, :y) + s = struct.new(1, 2) + + s.deconstruct_keys(['x', 'y']).should == {'x' => 1, 'y' => 2} + end + + it "accepts argument position number as well but returns them as keys" do + struct = Struct.new(:x, :y, :z) + s = struct.new(10, 20, 30) + + s.deconstruct_keys([0, 1, 2]).should == {0 => 10, 1 => 20, 2 => 30} + s.deconstruct_keys([0, 1] ).should == {0 => 10, 1 => 20} + s.deconstruct_keys([0] ).should == {0 => 10} + end + + it "ignores not existing attribute names" do + struct = Struct.new(:x, :y) + s = struct.new(1, 2) + + s.deconstruct_keys([:a, :b, :c]).should == {} + end + + it "accepts nil argument and return all the attributes" do + struct = Struct.new(:x, :y) + obj = struct.new(1, 2) + + obj.deconstruct_keys(nil).should == {x: 1, y: 2} + end + + it "raise TypeError if passed anything accept nil or array" do + struct = Struct.new(:x, :y) + s = struct.new(1, 2) + + -> { s.deconstruct_keys('x') }.should raise_error(TypeError, /expected Array or nil/) + -> { s.deconstruct_keys(1) }.should raise_error(TypeError, /expected Array or nil/) + -> { s.deconstruct_keys(:x) }.should raise_error(TypeError, /expected Array or nil/) + -> { s.deconstruct_keys({}) }.should raise_error(TypeError, /expected Array or nil/) + end + end +end diff --git a/spec/ruby/core/struct/deconstruct_spec.rb b/spec/ruby/core/struct/deconstruct_spec.rb new file mode 100644 index 00000000000000..7518a40987eaa0 --- /dev/null +++ b/spec/ruby/core/struct/deconstruct_spec.rb @@ -0,0 +1,12 @@ +require_relative '../../spec_helper' + +ruby_version_is "2.7" do + describe "Struct#deconstruct" do + it "returns an array of attribute values" do + struct = Struct.new(:x, :y) + s = struct.new(1, 2) + + s.deconstruct.should == [1, 2] + end + end +end diff --git a/spec/ruby/core/struct/hash_spec.rb b/spec/ruby/core/struct/hash_spec.rb index 71e8ccbd3a5892..5ed4ace489d6a2 100644 --- a/spec/ruby/core/struct/hash_spec.rb +++ b/spec/ruby/core/struct/hash_spec.rb @@ -19,6 +19,22 @@ car.hash.should == similar_car.hash end + it "returns different hashes for structs with different values" do + s1 = StructClasses::Ruby.new('2.7.0', 'linux') + s2 = StructClasses::Ruby.new('2.7.0', 'macos') + s1.hash.should_not == s2.hash + end + + ruby_version_is "2.5" do + it "returns different hashes for structs with different values when using keyword_init: true" do + key = :"1 non symbol member" + struct_class = Struct.new(key, keyword_init: true) + t1 = struct_class.new(key => 1) + t2 = struct_class.new(key => 2) + t1.hash.should_not == t2.hash + end + end + it "allows for overriding methods in an included module" do mod = Module.new do def hash diff --git a/spec/ruby/core/thread/backtrace_locations_spec.rb b/spec/ruby/core/thread/backtrace_locations_spec.rb index 66947f8ea61b1c..211858899c8ec8 100644 --- a/spec/ruby/core/thread/backtrace_locations_spec.rb +++ b/spec/ruby/core/thread/backtrace_locations_spec.rb @@ -19,6 +19,43 @@ locations.each { |loc| loc.should be_an_instance_of(Thread::Backtrace::Location) } end + it "can be called with a number of locations to omit" do + locations1 = Thread.current.backtrace_locations + locations2 = Thread.current.backtrace_locations(2) + locations1[2..-1].length.should == locations2.length + locations1[2..-1].map(&:to_s).should == locations2.map(&:to_s) + end + + it "can be called with a maximum number of locations to return as second parameter" do + locations1 = Thread.current.backtrace_locations + locations2 = Thread.current.backtrace_locations(2, 3) + locations1[2..4].map(&:to_s).should == locations2.map(&:to_s) + end + + it "can be called with a range" do + locations1 = Thread.current.backtrace_locations + locations2 = Thread.current.backtrace_locations(2..4) + locations1[2..4].map(&:to_s).should == locations2.map(&:to_s) + end + + it "can be called with a range whose end is negative" do + locations1 = Thread.current.backtrace_locations + locations2 = Thread.current.backtrace_locations(2..-1) + locations3 = Thread.current.backtrace_locations(2..-2) + locations1[2..-1].map(&:to_s).should == locations2.map(&:to_s) + locations1[2..-2].map(&:to_s).should == locations3.map(&:to_s) + end + + it "returns nil if omitting more locations than available" do + Thread.current.backtrace_locations(100).should == nil + Thread.current.backtrace_locations(100..-1).should == nil + end + + it "returns [] if omitting exactly the number of locations available" do + omit = Thread.current.backtrace_locations.length + Thread.current.backtrace_locations(omit).should == [] + end + it "without argument is the same as showing all locations with 0..-1" do Thread.current.backtrace_locations.map(&:to_s).should == Thread.current.backtrace_locations(0..-1).map(&:to_s) end diff --git a/spec/ruby/core/time/inspect_spec.rb b/spec/ruby/core/time/inspect_spec.rb index 01e1dfdaa69340..85133838e280de 100644 --- a/spec/ruby/core/time/inspect_spec.rb +++ b/spec/ruby/core/time/inspect_spec.rb @@ -3,4 +3,19 @@ describe "Time#inspect" do it_behaves_like :inspect, :inspect + + ruby_version_is "2.7" do + it "preserves milliseconds" do + t = Time.utc(2007, 11, 1, 15, 25, 0, 123456) + t.inspect.should == "2007-11-01 15:25:00.123456 UTC" + end + + it "formats nanoseconds as a Rational" do + t = Time.utc(2007, 11, 1, 15, 25, 0, 123456.789) + t.nsec.should == 123456789 + t.strftime("%N").should == "123456789" + + t.inspect.should == "2007-11-01 15:25:00 8483885939586761/68719476736000000 UTC" + end + end end diff --git a/spec/ruby/language/alias_spec.rb b/spec/ruby/language/alias_spec.rb index 79348f70c3c4e6..13f5c49513f08b 100644 --- a/spec/ruby/language/alias_spec.rb +++ b/spec/ruby/language/alias_spec.rb @@ -255,4 +255,9 @@ def test_with_check(*args) code = '$a = 1; $b = 2; alias $b $a; p [$a, $b]; $b = 3; p [$a, $b]' ruby_exe(code).should == "[1, 1]\n[3, 3]\n" end + + it "supports aliasing twice the same global variables" do + code = '$a = 1; alias $b $a; alias $b $a; p [$a, $b]' + ruby_exe(code).should == "[1, 1]\n" + end end diff --git a/spec/ruby/language/comment_spec.rb b/spec/ruby/language/comment_spec.rb new file mode 100644 index 00000000000000..690e844dc0e36c --- /dev/null +++ b/spec/ruby/language/comment_spec.rb @@ -0,0 +1,15 @@ +require_relative '../spec_helper' + +describe "The comment" do + ruby_version_is "2.7" do + it "can be placed between fluent dot now" do + code = <<~CODE + 10 + # some comment + .to_s + CODE + + eval(code).should == '10' + end + end +end diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb new file mode 100644 index 00000000000000..e7b2204d4a985c --- /dev/null +++ b/spec/ruby/language/numbered_parameters_spec.rb @@ -0,0 +1,87 @@ +require_relative '../spec_helper' + +ruby_version_is "2.7" do + describe "Numbered parameters" do + it "provides default parameters _1, _2, ... in a block" do + -> { _1 }.call("a").should == "a" + proc { _1 }.call("a").should == "a" + lambda { _1 }.call("a").should == "a" + ["a"].map { _1 }.should == ["a"] + end + + it "assigns nil to not passed parameters" do + proc { [_1, _2] }.call("a").should == ["a", nil] + proc { [_1, _2] }.call("a", "b").should == ["a", "b"] + end + + it "supports variables _1-_9 only for the first 9 passed parameters" do + block = proc { [_1, _2, _3, _4, _5, _6, _7, _8, _9] } + result = block.call(1, 2, 3, 4, 5, 6, 7, 8, 9) + result.should == [1, 2, 3, 4, 5, 6, 7, 8, 9] + end + + it "does not support more than 9 parameters" do + -> { + proc { [_10] }.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) + }.should raise_error(NameError, /undefined local variable or method `_10'/) + end + + it "can not be used in both outer and nested blocks at the same time" do + -> { + eval("-> { _1; -> { _2 } }") + }.should raise_error(SyntaxError, /numbered parameter is already used in.+ outer block here/m) + end + + it "can be overwritten with local variable" do + suppress_warning do + eval <<~CODE + _1 = 0 + proc { _1 }.call("a").should == 0 + CODE + end + end + + it "warns when numbered parameter is overriten with local variable" do + -> { + eval("_1 = 0") + }.should complain(/warning: `_1' is reserved for numbered parameter; consider another name/) + end + + it "raises SyntaxError when block parameters are specified explicitly" do + -> { eval("-> () { _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + -> { eval("-> (x) { _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + + -> { eval("proc { || _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + -> { eval("proc { |x| _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + + -> { eval("lambda { || _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + -> { eval("lambda { |x| _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + + -> { eval("['a'].map { || _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + -> { eval("['a'].map { |x| _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/) + end + + it "affects block arity" do + -> { _1 }.arity.should == 1 + -> { _2 }.arity.should == 2 + -> { _3 }.arity.should == 3 + -> { _4 }.arity.should == 4 + -> { _5 }.arity.should == 5 + -> { _6 }.arity.should == 6 + -> { _7 }.arity.should == 7 + -> { _8 }.arity.should == 8 + -> { _9 }.arity.should == 9 + + -> { _9 }.arity.should == 9 + proc { _9 }.arity.should == 9 + lambda { _9 }.arity.should == 9 + end + + it "does not work in methods" do + obj = Object.new + def obj.foo; _1 end + + -> { obj.foo("a") }.should raise_error(ArgumentError, /wrong number of arguments/) + end + end +end diff --git a/spec/ruby/language/numbers_spec.rb b/spec/ruby/language/numbers_spec.rb index c82a630632ee06..418bc60fa635d8 100644 --- a/spec/ruby/language/numbers_spec.rb +++ b/spec/ruby/language/numbers_spec.rb @@ -45,6 +45,10 @@ eval('-3r').should == Rational(-3, 1) end + it "can be a float literal with trailing 'r' to represent a Rational" do + eval('0.0174532925199432957r').should == Rational(174532925199432957, 10000000000000000000) + end + it "can be an bignum literal with trailing 'r' to represent a Rational" do eval('1111111111111111111111111111111111111111111111r').should == Rational(1111111111111111111111111111111111111111111111, 1) eval('-1111111111111111111111111111111111111111111111r').should == Rational(-1111111111111111111111111111111111111111111111, 1) diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb new file mode 100644 index 00000000000000..6a6de506ff4d3f --- /dev/null +++ b/spec/ruby/language/pattern_matching_spec.rb @@ -0,0 +1,966 @@ +require_relative '../spec_helper' + +ruby_version_is "2.7" do + describe "Pattern matching" do + # TODO: Remove excessive eval calls when support of previous version + # Ruby 2.6 will be dropped + + before do + ScratchPad.record [] + end + + it "can be standalone in operator that deconstructs value" do + eval(<<-RUBY).should == [0, 1] + [0, 1] in [a, b] + [a, b] + RUBY + end + + it "extends case expression with case/in construction" do + eval(<<~RUBY).should == :bar + case [0, 1] + in [0] + :foo + in [0, 1] + :bar + end + RUBY + end + + it "allows using then operator" do + eval(<<~RUBY).should == :bar + case [0, 1] + in [0] then :foo + in [0, 1] then :bar + end + RUBY + end + + it "warns about pattern matching is experimental feature" do + -> { + eval <<~RUBY + case 0 + in 0 + end + RUBY + }.should complain(/warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!/) + end + + it "binds variables" do + eval(<<~RUBY).should == 1 + case [0, 1] + in [0, a] + a + end + RUBY + end + + it "cannot mix in and when operators" do + -> { + eval <<~RUBY + case [] + when 1 == 1 + in [] + end + RUBY + }.should raise_error(SyntaxError, /syntax error, unexpected `in'/) + + -> { + eval <<~RUBY + case [] + in [] + when 1 == 1 + end + RUBY + }.should raise_error(SyntaxError, /syntax error, unexpected `when'/) + end + + it "checks patterns until the first matching" do + eval(<<~RUBY).should == :bar + case [0, 1] + in [0] + :foo + in [0, 1] + :bar + in [0, 1] + :baz + end + RUBY + end + + it "executes else clause if no pattern matches" do + eval(<<~RUBY).should == false + case [0, 1] + in [0] + true + else + false + end + RUBY + end + + it "raises NoMatchingPatternError if no pattern matches and no else clause" do + -> { + eval <<~RUBY + case [0, 1] + in [0] + end + RUBY + }.should raise_error(NoMatchingPatternError, /\[0, 1\]/) + end + + it "does not allow calculation or method calls in a pattern" do + -> { + eval <<~RUBY + case 0 + in 1 + 1 + true + end + RUBY + }.should raise_error(SyntaxError, /unexpected/) + end + + describe "guards" do + it "supports if guard" do + eval(<<~RUBY).should == false + case 0 + in 0 if false + true + else + false + end + RUBY + + eval(<<~RUBY).should == true + case 0 + in 0 if true + true + else + false + end + RUBY + end + + it "supports unless guard" do + eval(<<~RUBY).should == false + case 0 + in 0 unless true + true + else + false + end + RUBY + + eval(<<~RUBY).should == true + case 0 + in 0 unless false + true + else + false + end + RUBY + end + + it "makes bound variables visible in guard" do + eval(<<~RUBY).should == true + case [0, 1] + in [a, 1] if a >= 0 + true + end + RUBY + end + + it "does not evaluate guard if pattern does not match" do + eval <<~RUBY + case 0 + in 1 if (ScratchPad << :foo) || true + else + end + RUBY + + ScratchPad.recorded.should == [] + end + + it "takes guards into account when there are several matching patterns" do + eval(<<~RUBY).should == :bar + case 0 + in 0 if false + :foo + in 0 if true + :bar + end + RUBY + end + + it "executes else clause if no guarded pattern matches" do + eval(<<~RUBY).should == false + case 0 + in 0 if false + true + else + false + end + RUBY + end + + it "raises NoMatchingPatternError if no guarded pattern matches and no else clause" do + -> { + eval <<~RUBY + case [0, 1] + in [0, 1] if false + end + RUBY + }.should raise_error(NoMatchingPatternError, /\[0, 1\]/) + end + end + + describe "value pattern" do + it "matches an object such that pattern === object" do + eval(<<~RUBY).should == true + case 0 + in 0 + true + end + RUBY + + eval(<<~RUBY).should == true + case 0 + in (-1..1) + true + end + RUBY + + eval(<<~RUBY).should == true + case 0 + in Integer + true + end + RUBY + + eval(<<~RUBY).should == true + case "0" + in /0/ + true + end + RUBY + + eval(<<~RUBY).should == true + case "0" + in ->(s) { s == "0" } + true + end + RUBY + end + + it "allows string literal with interpolation" do + x = "x" + + eval(<<~RUBY).should == true + case "x" + in "#{x + ""}" + true + end + RUBY + end + end + + describe "variable pattern" do + it "matches a value and binds variable name to this value" do + eval(<<~RUBY).should == 0 + case 0 + in a + a + end + RUBY + end + + it "makes bounded variable visible outside a case statement scope" do + eval(<<~RUBY).should == 0 + case 0 + in a + end + + a + RUBY + end + + it "create local variables even if a pattern doesn't match" do + eval(<<~RUBY).should == [0, nil, nil] + case 0 + in a + in b + in c + end + + [a, b, c] + RUBY + end + + it "allow using _ name to drop values" do + eval(<<~RUBY).should == 0 + case [0, 1] + in [a, _] + a + end + RUBY + end + + it "supports using _ in a pattern several times" do + eval(<<~RUBY).should == 2 + case [0, 1, 2] + in [0, _, _] + _ + end + RUBY + end + + it "supports using any name with _ at the beginning in a pattern several times" do + eval(<<~RUBY).should == 2 + case [0, 1, 2] + in [0, _x, _x] + _x + end + RUBY + + eval(<<~RUBY).should == 2 + case {a: 0, b: 1, c: 2} + in {a: 0, b: _x, c: _x} + _x + end + RUBY + end + + it "does not support using variable name (except _) several times" do + -> { + eval <<~RUBY + case [0] + in [a, a] + end + RUBY + }.should raise_error(SyntaxError, /duplicated variable name/) + end + + it "supports existing variables in a pattern specified with ^ operator" do + a = 0 + + eval(<<~RUBY).should == true + case 0 + in ^a + true + end + RUBY + end + + it "allows applying ^ operator to bound variables" do + eval(<<~RUBY).should == 1 + case [1, 1] + in [n, ^n] + n + end + RUBY + + eval(<<~RUBY).should == false + case [1, 2] + in [n, ^n] + true + else + false + end + RUBY + end + + it "requires bound variable to be specified in a pattern before ^ operator when it relies on a bound variable" do + -> { + eval <<~RUBY + case [1, 2] + in [^n, n] + true + else + false + end + RUBY + }.should raise_error(SyntaxError, /n: no such local variable/) + end + end + + describe "alternative pattern" do + it "matches if any of patterns matches" do + eval(<<~RUBY).should == true + case 0 + in 0 | 1 | 2 + true + end + RUBY + end + + it "does not support variable binding" do + -> { + eval <<~RUBY + case [0, 1] + in [0, 0] | [0, a] + end + RUBY + }.should raise_error(SyntaxError, /illegal variable in alternative pattern/) + end + end + + describe "AS pattern" do + it "binds a variable to a value if pattern matches" do + eval(<<~RUBY).should == 0 + case 0 + in Integer => n + n + end + RUBY + end + + it "can be used as a nested pattern" do + eval(<<~RUBY).should == [2, 3] + case [1, [2, 3]] + in [1, Array => ary] + ary + end + RUBY + end + end + + describe "Array pattern" do + it "supports form Constant(pat, pat, ...)" do + eval(<<~RUBY).should == true + case [0, 1, 2] + in Array(0, 1, 2) + true + end + RUBY + end + + it "supports form Constant[pat, pat, ...]" do + eval(<<~RUBY).should == true + case [0, 1, 2] + in Array[0, 1, 2] + true + end + RUBY + end + + it "supports form [pat, pat, ...]" do + eval(<<~RUBY).should == true + case [0, 1, 2] + in [0, 1, 2] + true + end + RUBY + end + + it "supports form pat, pat, ..." do + eval(<<~RUBY).should == true + case [0, 1, 2] + in 0, 1, 2 + true + end + RUBY + + eval(<<~RUBY).should == 1 + case [0, 1, 2] + in 0, a, 2 + a + end + RUBY + + eval(<<~RUBY).should == [1, 2] + case [0, 1, 2] + in 0, *rest + rest + end + RUBY + end + + it "matches an object with #deconstruct method which returns an array and each element in array matches element in pattern" do + obj = Object.new + def obj.deconstruct; [0, 1] end + + eval(<<~RUBY).should == true + case obj + in [Integer, Integer] + true + end + RUBY + end + + it "does not match object if Constant === object returns false" do + eval(<<~RUBY).should == false + case [0, 1, 2] + in String[0, 1, 2] + true + else + false + end + RUBY + end + + it "does not match object without #deconstruct method" do + obj = Object.new + + eval(<<~RUBY).should == false + case obj + in Object[] + true + else + false + end + RUBY + end + + it "raises TypeError if #deconstruct method does not return array" do + obj = Object.new + def obj.deconstruct; "" end + + -> { + eval <<~RUBY + case obj + in Object[] + else + end + RUBY + }.should raise_error(TypeError, /deconstruct must return Array/) + end + + it "does not match object if elements of array returned by #deconstruct method does not match elements in pattern" do + obj = Object.new + def obj.deconstruct; [1] end + + eval(<<~RUBY).should == false + case obj + in Object[0] + true + else + false + end + RUBY + end + + it "binds variables" do + eval(<<~RUBY).should == [0, 1, 2] + case [0, 1, 2] + in [a, b, c] + [a, b, c] + end + RUBY + end + + it "binds variable even if patter matches only partially" do + a = nil + + eval(<<~RUBY).should == 0 + case [0, 1, 2] + in [a, 1, 3] + else + end + + a + RUBY + end + + it "supports splat operator *rest" do + eval(<<~RUBY).should == [1, 2] + case [0, 1, 2] + in [0, *rest] + rest + end + RUBY + end + + it "does not match partially by default" do + eval(<<~RUBY).should == false + case [0, 1, 2, 3] + in [1, 2] + true + else + false + end + RUBY + end + + it "does match partially from the array beginning if list + , syntax used" do + eval(<<~RUBY).should == true + case [0, 1, 2, 3] + in [0, 1,] + true + end + RUBY + + eval(<<~RUBY).should == true + case [0, 1, 2, 3] + in 0, 1,; + true + end + RUBY + end + + it "matches [] with []" do + eval(<<~RUBY).should == true + case [] + in [] + true + end + RUBY + end + + it "matches anything with *" do + eval(<<~RUBY).should == true + case [0, 1] + in *; + true + end + RUBY + end + end + + describe "Hash pattern" do + it "supports form Constant(id: pat, id: pat, ...)" do + eval(<<~RUBY).should == true + case {a: 0, b: 1} + in Hash(a: 0, b: 1) + true + end + RUBY + end + + it "supports form Constant[id: pat, id: pat, ...]" do + eval(<<~RUBY).should == true + case {a: 0, b: 1} + in Hash[a: 0, b: 1] + true + end + RUBY + end + + it "supports form {id: pat, id: pat, ...}" do + eval(<<~RUBY).should == true + case {a: 0, b: 1} + in {a: 0, b: 1} + true + end + RUBY + end + + it "supports form id: pat, id: pat, ..." do + eval(<<~RUBY).should == true + case {a: 0, b: 1} + in a: 0, b: 1 + true + end + RUBY + + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in a: a, b: b + [a, b] + end + RUBY + + eval(<<~RUBY).should == { b: 1, c: 2 } + case {a: 0, b: 1, c: 2} + in a: 0, **rest + rest + end + RUBY + end + + it "supports a: which means a: a" do + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in Hash(a:, b:) + [a, b] + end + RUBY + + a = b = nil + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in Hash[a:, b:] + [a, b] + end + RUBY + + a = b = nil + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in {a:, b:} + [a, b] + end + RUBY + + a = nil + eval(<<~RUBY).should == [0, {b: 1, c: 2}] + case {a: 0, b: 1, c: 2} + in {a:, **rest} + [a, rest] + end + RUBY + + a = b = nil + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in a:, b: + [a, b] + end + RUBY + end + + it "can mix key (a:) and key-value (a: b) declarations" do + eval(<<~RUBY).should == [0, 1] + case {a: 0, b: 1} + in Hash(a:, b: x) + [a, x] + end + RUBY + end + + it "supports 'string': key literal" do + eval(<<~RUBY).should == true + case {a: 0} + in {"a": 0} + true + end + RUBY + end + + it "does not support non-symbol keys" do + -> { + eval <<~RUBY + case {a: 1} + in {"a" => 1} + end + RUBY + }.should raise_error(SyntaxError, /unexpected/) + end + + it "does not support string interpolation in keys" do + x = "a" + + -> { + eval <<~'RUBY' + case {a: 1} + in {"#{x}": 1} + end + RUBY + }.should raise_error(SyntaxError, /symbol literal with interpolation is not allowed/) + end + + it "raise SyntaxError when keys duplicate in pattern" do + -> { + eval <<~RUBY + case {a: 1} + in {a: 1, b: 2, a: 3} + end + RUBY + }.should raise_error(SyntaxError, /duplicated key name/) + end + + it "matches an object with #deconstruct_keys method which returns a Hash with equal keys and each value in Hash matches value in pattern" do + obj = Object.new + def obj.deconstruct_keys(*); {a: 1} end + + eval(<<~RUBY).should == true + case obj + in {a: 1} + true + end + RUBY + end + + it "does not match object if Constant === object returns false" do + eval(<<~RUBY).should == false + case {a: 1} + in String[a: 1] + true + else + false + end + RUBY + end + + it "does not match object without #deconstruct_keys method" do + obj = Object.new + + eval(<<~RUBY).should == false + case obj + in Object[a: 1] + true + else + false + end + RUBY + end + + it "does not match object if #deconstruct_keys method does not return Hash" do + obj = Object.new + def obj.deconstruct_keys(*); "" end + + -> { + eval <<~RUBY + case obj + in Object[a: 1] + end + RUBY + }.should raise_error(TypeError, /deconstruct_keys must return Hash/) + end + + it "does not match object if #deconstruct_keys method returns Hash with non-symbol keys" do + obj = Object.new + def obj.deconstruct_keys(*); {"a" => 1} end + + eval(<<~RUBY).should == false + case obj + in Object[a: 1] + true + else + false + end + RUBY + end + + it "does not match object if elements of Hash returned by #deconstruct_keys method does not match values in pattern" do + obj = Object.new + def obj.deconstruct_keys(*); {a: 1} end + + eval(<<~RUBY).should == false + case obj + in Object[a: 2] + true + else + false + end + RUBY + end + + it "passes keys specified in pattern as arguments to #deconstruct_keys method" do + obj = Object.new + + def obj.deconstruct_keys(*args) + ScratchPad << args + {a: 1, b: 2, c: 3} + end + + eval <<~RUBY + case obj + in Object[a: 1, b: 2, c: 3] + end + RUBY + + ScratchPad.recorded.should == [[[:a, :b, :c]]] + end + + it "passes keys specified in pattern to #deconstruct_keys method if pattern contains double splat operator **" do + obj = Object.new + + def obj.deconstruct_keys(*args) + ScratchPad << args + {a: 1, b: 2, c: 3} + end + + eval <<~RUBY + case obj + in Object[a: 1, b: 2, **] + end + RUBY + + ScratchPad.recorded.should == [[[:a, :b]]] + end + + it "passes nil to #deconstruct_keys method if pattern contains double splat operator **rest" do + obj = Object.new + + def obj.deconstruct_keys(*args) + ScratchPad << args + {a: 1, b: 2} + end + + eval <<~RUBY + case obj + in Object[a: 1, **rest] + end + RUBY + + ScratchPad.recorded.should == [[nil]] + end + + it "binds variables" do + eval(<<~RUBY).should == [0, 1, 2] + case {a: 0, b: 1, c: 2} + in {a: x, b: y, c: z} + [x, y, z] + end + RUBY + end + + it "binds variable even if pattern matches only partially" do + x = nil + + eval(<<~RUBY).should == 0 + case {a: 0, b: 1} + in {a: x, b: 2} + else + end + + x + RUBY + end + + it "supports double splat operator **rest" do + eval(<<~RUBY).should == {b: 1, c: 2} + case {a: 0, b: 1, c: 2} + in {a: 0, **rest} + rest + end + RUBY + end + + it "treats **nil like there should not be any other keys in a matched Hash" do + eval(<<~RUBY).should == true + case {a: 1, b: 2} + in {a: 1, b: 2, **nil} + true + end + RUBY + + eval(<<~RUBY).should == false + case {a: 1, b: 2} + in {a: 1, **nil} + true + else + false + end + RUBY + end + + it "can match partially" do + eval(<<~RUBY).should == true + case {a: 1, b: 2} + in {a: 1} + true + end + RUBY + end + + it "matches {} with {}" do + eval(<<~RUBY).should == true + case {} + in {} + true + end + RUBY + end + + it "matches anything with **" do + eval(<<~RUBY).should == true + case {a: 1} + in **; + true + end + RUBY + end + end + end +end diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb index cec6bc852c452c..6f902eb822d70f 100644 --- a/spec/ruby/language/predefined_spec.rb +++ b/spec/ruby/language/predefined_spec.rb @@ -398,6 +398,19 @@ def bar $!.should == nil end + it "should be cleared when an exception is rescued even when a non-local return from block" do + [ 1 ].each do + begin + raise StandardError.new('err') + rescue => e + $!.should == e + return + end + end + + $!.should == nil + end + it "should not be cleared when an exception is not rescued" do e = StandardError.new begin @@ -633,6 +646,12 @@ def bar it "raises TypeError if assigned a non-String" do -> { $, = Object.new }.should raise_error(TypeError) end + + ruby_version_is "2.7" do + it "warns if assigned non-nil" do + -> { $, = "_" }.should complain(/warning: `\$,' is deprecated/) + end + end end describe "Predefined global $." do @@ -662,6 +681,18 @@ def bar end end +describe "Predefined global $;" do + after :each do + $; = nil + end + + ruby_version_is "2.7" do + it "warns if assigned non-nil" do + -> { $; = "_" }.should complain(/warning: `\$;' is deprecated/) + end + end +end + describe "Predefined global $_" do it "is set to the last line read by e.g. StringIO#gets" do stdin = StringIO.new("foo\nbar\n", "r") diff --git a/spec/ruby/language/range_spec.rb b/spec/ruby/language/range_spec.rb index c720c5b98e481d..c0f90f84d61aa4 100644 --- a/spec/ruby/language/range_spec.rb +++ b/spec/ruby/language/range_spec.rb @@ -16,4 +16,11 @@ eval("(1...)").should == Range.new(1, nil, true) end end + + ruby_version_is "2.7" do + it "creates beginless ranges" do + eval("(..1)").should == Range.new(nil, 1) + eval("(...1)").should == Range.new(nil, 1, true) + end + end end diff --git a/spec/ruby/language/rescue_spec.rb b/spec/ruby/language/rescue_spec.rb index a912e1743161e9..aae16bbefbac6c 100644 --- a/spec/ruby/language/rescue_spec.rb +++ b/spec/ruby/language/rescue_spec.rb @@ -481,5 +481,15 @@ class RescueInClassExample a = raise(Exception) rescue 1 }.should raise_error(Exception) end + + ruby_version_is "2.7" do + it "rescues with multiple assignment" do + + a, b = raise rescue [1, 2] + + a.should == 1 + b.should == 2 + end + end end end diff --git a/spec/ruby/library/English/alias_spec.rb b/spec/ruby/library/English/alias_spec.rb new file mode 100644 index 00000000000000..78ccfb4398983b --- /dev/null +++ b/spec/ruby/library/English/alias_spec.rb @@ -0,0 +1,14 @@ +require_relative '../../spec_helper' +require 'English' + +describe "English" do + it "aliases $! to $ERROR_INFO and $ERROR_INFO still returns an Exception with a backtrace" do + exception = (1 / 0 rescue $ERROR_INFO) + exception.should be_kind_of(Exception) + exception.backtrace.should be_kind_of(Array) + end + + it "aliases $@ to $ERROR_POSITION and $ERROR_POSITION still returns a backtrace" do + (1 / 0 rescue $ERROR_POSITION).should be_kind_of(Array) + end +end diff --git a/spec/ruby/library/digest/md5/shared/constants.rb b/spec/ruby/library/digest/md5/shared/constants.rb index fdfae56d63e05b..e807b96f9fc449 100644 --- a/spec/ruby/library/digest/md5/shared/constants.rb +++ b/spec/ruby/library/digest/md5/shared/constants.rb @@ -12,5 +12,6 @@ module MD5Constants Digest = "\2473\267qw\276\364\343\345\320\304\350\313\314\217n" BlankHexdigest = "d41d8cd98f00b204e9800998ecf8427e" Hexdigest = "a733b77177bef4e3e5d0c4e8cbcc8f6e" + Base64digest = "pzO3cXe+9OPl0MToy8yPbg==" end diff --git a/spec/ruby/library/digest/sha1/shared/constants.rb b/spec/ruby/library/digest/sha1/shared/constants.rb index add86b1dd3029d..169438747f4642 100644 --- a/spec/ruby/library/digest/sha1/shared/constants.rb +++ b/spec/ruby/library/digest/sha1/shared/constants.rb @@ -12,6 +12,7 @@ module SHA1Constants BlankDigest = "\3329\243\356^kK\r2U\277\357\225`\030\220\257\330\a\t" Digest = "X!\255b\323\035\352\314a|q\344+\376\317\361V9\324\343" BlankHexdigest = "da39a3ee5e6b4b0d3255bfef95601890afd80709" - Hexdigest = "e907d2ba21c6c74bc0efd76e44d11fb9bbb7a75e" + Hexdigest = "5821ad62d31deacc617c71e42bfecff15639d4e3" + Base64digest = "WCGtYtMd6sxhfHHkK/7P8VY51OM=" end diff --git a/spec/ruby/library/digest/sha256/shared/constants.rb b/spec/ruby/library/digest/sha256/shared/constants.rb index dd5b48dca9c09e..351679f34402a1 100644 --- a/spec/ruby/library/digest/sha256/shared/constants.rb +++ b/spec/ruby/library/digest/sha256/shared/constants.rb @@ -13,5 +13,6 @@ module SHA256Constants Digest = "\230b\265\344_\337\357\337\242\004\314\311A\211jb\350\373\254\370\365M\230B\002\372\020j\as\270\376" BlankHexdigest = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" Hexdigest = "9862b5e45fdfefdfa204ccc941896a62e8fbacf8f54d984202fa106a0773b8fe" + Base64digest = "mGK15F/f79+iBMzJQYlqYuj7rPj1TZhCAvoQagdzuP4=" end diff --git a/spec/ruby/library/digest/sha384/shared/constants.rb b/spec/ruby/library/digest/sha384/shared/constants.rb index 3697384fc339fb..2050f03f2bc601 100644 --- a/spec/ruby/library/digest/sha384/shared/constants.rb +++ b/spec/ruby/library/digest/sha384/shared/constants.rb @@ -14,5 +14,6 @@ module SHA384Constants Digest = "B&\266:\314\216z\361!TD\001{`\355\323\320MW%\270\272\0034n\034\026g\a\217\"\333s\202\275\002Y*\217]\207u\f\034\244\231\266f" BlankHexdigest = "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" Hexdigest = "4226b63acc8e7af1215444017b60edd3d04d5725b8ba03346e1c1667078f22db7382bd02592a8f5d87750c1ca499b666" + Base64digest = "Qia2OsyOevEhVEQBe2Dt09BNVyW4ugM0bhwWZwePIttzgr0CWSqPXYd1DBykmbZm" end diff --git a/spec/ruby/library/digest/sha512/shared/constants.rb b/spec/ruby/library/digest/sha512/shared/constants.rb index 80f5b7bc1dda1d..2765a1ec16cb65 100644 --- a/spec/ruby/library/digest/sha512/shared/constants.rb +++ b/spec/ruby/library/digest/sha512/shared/constants.rb @@ -13,5 +13,6 @@ module SHA512Constants Digest = "\241\231\232\365\002z\241\331\242\310=\367F\272\004\326\331g\315n\251Q\222\250\374E\257\254=\325\225\003SM\350\244\234\220\233=\031\230A;\000\203\233\340\323t\333\271\222w\266\307\2678\344\255j\003\216\300" BlankHexdigest = "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" Hexdigest = "a1999af5027aa1d9a2c83df746ba04d6d967cd6ea95192a8fc45afac3dd59503534de8a49c909b3d1998413b00839be0d374dbb99277b6c7b738e4ad6a038ec0" + Base64digest = "oZma9QJ6odmiyD33RroE1tlnzW6pUZKo/EWvrD3VlQNTTeiknJCbPRmYQTsAg5vg03TbuZJ3tse3OOStagOOwA==" end diff --git a/spec/ruby/library/openssl/digest_spec.rb b/spec/ruby/library/openssl/digest_spec.rb new file mode 100644 index 00000000000000..b8e82d073f25b2 --- /dev/null +++ b/spec/ruby/library/openssl/digest_spec.rb @@ -0,0 +1,63 @@ +require_relative '../../spec_helper' +require_relative '../../library/digest/sha1/shared/constants' +require_relative '../../library/digest/sha256/shared/constants' +require_relative '../../library/digest/sha384/shared/constants' +require_relative '../../library/digest/sha512/shared/constants' +require 'openssl' + +describe "OpenSSL::Digest" do + + describe ".digest" do + it "returns a SHA1 digest" do + OpenSSL::Digest.digest('sha1', SHA1Constants::Contents).should == SHA1Constants::Digest + end + + it "returns a SHA256 digest" do + OpenSSL::Digest.digest('sha256', SHA256Constants::Contents).should == SHA256Constants::Digest + end + + it "returns a SHA384 digest" do + OpenSSL::Digest.digest('sha384', SHA384Constants::Contents).should == SHA384Constants::Digest + end + + it "returns a SHA512 digest" do + OpenSSL::Digest.digest('sha512', SHA512Constants::Contents).should == SHA512Constants::Digest + end + end + + describe ".hexdigest" do + it "returns a SHA1 hexdigest" do + OpenSSL::Digest.hexdigest('sha1', SHA1Constants::Contents).should == SHA1Constants::Hexdigest + end + + it "returns a SHA256 hexdigest" do + OpenSSL::Digest.hexdigest('sha256', SHA256Constants::Contents).should == SHA256Constants::Hexdigest + end + + it "returns a SHA384 hexdigest" do + OpenSSL::Digest.hexdigest('sha384', SHA384Constants::Contents).should == SHA384Constants::Hexdigest + end + + it "returns a SHA512 hexdigest" do + OpenSSL::Digest.hexdigest('sha512', SHA512Constants::Contents).should == SHA512Constants::Hexdigest + end + end + + describe ".base64digest" do + it "returns a SHA1 base64digest" do + OpenSSL::Digest.base64digest('sha1', SHA1Constants::Contents).should == SHA1Constants::Base64digest + end + + it "returns a SHA256 base64digest" do + OpenSSL::Digest.base64digest('sha256', SHA256Constants::Contents).should == SHA256Constants::Base64digest + end + + it "returns a SHA384 base64digest" do + OpenSSL::Digest.base64digest('sha384', SHA384Constants::Contents).should == SHA384Constants::Base64digest + end + + it "returns a SHA512 base64digest" do + OpenSSL::Digest.base64digest('sha512', SHA512Constants::Contents).should == SHA512Constants::Base64digest + end + end +end diff --git a/spec/ruby/library/rexml/element/delete_attribute_spec.rb b/spec/ruby/library/rexml/element/delete_attribute_spec.rb index 9d8669e405f8d1..dab20468c4b305 100644 --- a/spec/ruby/library/rexml/element/delete_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/delete_attribute_spec.rb @@ -40,4 +40,3 @@ end end end - diff --git a/spec/ruby/optional/capi/ext/kernel_spec.c b/spec/ruby/optional/capi/ext/kernel_spec.c index e98ae35067df87..c5bb4a1d9ae2a2 100644 --- a/spec/ruby/optional/capi/ext/kernel_spec.c +++ b/spec/ruby/optional/capi/ext/kernel_spec.c @@ -305,6 +305,13 @@ static VALUE kernel_spec_rb_funcall_with_block(VALUE self, VALUE obj, VALUE meth return rb_funcall_with_block(obj, SYM2ID(method), 0, NULL, block); } +static VALUE kernel_spec_rb_funcall_many_args(VALUE self, VALUE obj, VALUE method) { + return rb_funcall(obj, SYM2ID(method), 15, + INT2FIX(15), INT2FIX(14), INT2FIX(13), INT2FIX(12), INT2FIX(11), + INT2FIX(10), INT2FIX(9), INT2FIX(8), INT2FIX(7), INT2FIX(6), + INT2FIX(5), INT2FIX(4), INT2FIX(3), INT2FIX(2), INT2FIX(1)); +} + void Init_kernel_spec(void) { VALUE cls = rb_define_class("CApiKernelSpecs", rb_cObject); rb_define_method(cls, "rb_block_given_p", kernel_spec_rb_block_given_p, 0); @@ -342,6 +349,7 @@ void Init_kernel_spec(void) { rb_define_method(cls, "rb_make_backtrace", kernel_spec_rb_make_backtrace, 0); rb_define_method(cls, "rb_obj_method", kernel_spec_rb_obj_method, 2); rb_define_method(cls, "rb_funcall3", kernel_spec_rb_funcall3, 2); + rb_define_method(cls, "rb_funcall_many_args", kernel_spec_rb_funcall_many_args, 2); rb_define_method(cls, "rb_funcall_with_block", kernel_spec_rb_funcall_with_block, 3); } diff --git a/spec/ruby/optional/capi/ext/object_spec.c b/spec/ruby/optional/capi/ext/object_spec.c index cd32050f14e575..2151e37e5c4aaa 100644 --- a/spec/ruby/optional/capi/ext/object_spec.c +++ b/spec/ruby/optional/capi/ext/object_spec.c @@ -345,6 +345,40 @@ static VALUE object_spec_rb_class_inherited_p(VALUE self, VALUE mod, VALUE arg) return rb_class_inherited_p(mod, arg); } +static VALUE speced_allocator(VALUE klass) { + VALUE flags = 0; + VALUE instance; + if (rb_class_inherited_p(klass, rb_cString)) { + flags = T_STRING; + } else if (rb_class_inherited_p(klass, rb_cArray)) { + flags = T_ARRAY; + } else { + flags = T_OBJECT; + } + instance = rb_newobj_of(klass, flags); + rb_iv_set(instance, "@from_custom_allocator", Qtrue); + return instance; +} + +static VALUE define_alloc_func(VALUE self, VALUE klass) { + rb_define_alloc_func(klass, speced_allocator); + return Qnil; +} + +static VALUE undef_alloc_func(VALUE self, VALUE klass) { + rb_undef_alloc_func(klass); + return Qnil; +} + +static VALUE speced_allocator_p(VALUE self, VALUE klass) { + rb_alloc_func_t allocator = rb_get_alloc_func(klass); + return (allocator == speced_allocator) ? Qtrue : Qfalse; +} + +static VALUE custom_alloc_func_p(VALUE self, VALUE klass) { + rb_alloc_func_t allocator = rb_get_alloc_func(klass); + return allocator ? Qtrue : Qfalse; +} void Init_object_spec(void) { VALUE cls = rb_define_class("CApiObjectSpecs", rb_cObject); @@ -412,6 +446,10 @@ void Init_object_spec(void) { rb_define_method(cls, "rb_ivar_defined", object_spec_rb_ivar_defined, 2); rb_define_method(cls, "rb_copy_generic_ivar", object_spec_rb_copy_generic_ivar, 2); rb_define_method(cls, "rb_free_generic_ivar", object_spec_rb_free_generic_ivar, 1); + rb_define_method(cls, "rb_define_alloc_func", define_alloc_func, 1); + rb_define_method(cls, "rb_undef_alloc_func", undef_alloc_func, 1); + rb_define_method(cls, "speced_allocator?", speced_allocator_p, 1); + rb_define_method(cls, "custom_alloc_func?", custom_alloc_func_p, 1); } #ifdef __cplusplus diff --git a/spec/ruby/optional/capi/hash_spec.rb b/spec/ruby/optional/capi/hash_spec.rb index 90d9c534563c69..df2becb2b4a951 100644 --- a/spec/ruby/optional/capi/hash_spec.rb +++ b/spec/ruby/optional/capi/hash_spec.rb @@ -260,7 +260,7 @@ def h.to_hash; 42; end hash_code = @s.compute_a_hash_code(53) hash_code.should be_an_instance_of(Integer) hash_code.should == @s.compute_a_hash_code(53) - @s.compute_a_hash_code(90) == @s.compute_a_hash_code(90) + @s.compute_a_hash_code(90).should == @s.compute_a_hash_code(90) end end end diff --git a/spec/ruby/optional/capi/kernel_spec.rb b/spec/ruby/optional/capi/kernel_spec.rb index 32cdd3f4218ad7..c6fddc3f64a3e1 100644 --- a/spec/ruby/optional/capi/kernel_spec.rb +++ b/spec/ruby/optional/capi/kernel_spec.rb @@ -578,6 +578,20 @@ def method_private; :method_private end end end + describe 'rb_funcall' do + before :each do + @obj = Object.new + class << @obj + def many_args(*args) + args + end + end + end + + it "can call a public method with 10 arguments" do + @s.rb_funcall_many_args(@obj, :many_args).should == 15.downto(1).to_a + end + end describe 'rb_funcall_with_block' do before :each do @obj = Object.new diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb index 30abe715e7b442..e5f9c83a79db7c 100644 --- a/spec/ruby/optional/capi/object_spec.rb +++ b/spec/ruby/optional/capi/object_spec.rb @@ -110,6 +110,11 @@ def six(a, b, *c, &d); end @o.rb_respond_to(ObjectTest.new, :foo).should == true @o.rb_respond_to(ObjectTest.new, :bar).should == false end + + it "can be used with primitives" do + @o.rb_respond_to(true, :object_id).should == true + @o.rb_respond_to(14, :succ).should == true + end end describe "rb_obj_respond_to" do @@ -887,4 +892,78 @@ def reach end end end + + describe "allocator accessors" do + describe "rb_define_alloc_func" do + it "sets up the allocator" do + klass = Class.new + @o.rb_define_alloc_func(klass) + obj = klass.allocate + obj.class.should.equal?(klass) + obj.should have_instance_variable(:@from_custom_allocator) + end + + it "sets up the allocator for a subclass of String" do + klass = Class.new(String) + @o.rb_define_alloc_func(klass) + obj = klass.allocate + obj.class.should.equal?(klass) + obj.should have_instance_variable(:@from_custom_allocator) + obj.should == "" + end + + it "sets up the allocator for a subclass of Array" do + klass = Class.new(Array) + @o.rb_define_alloc_func(klass) + obj = klass.allocate + obj.class.should.equal?(klass) + obj.should have_instance_variable(:@from_custom_allocator) + obj.should == [] + end + end + + describe "rb_get_alloc_func" do + it "gets the allocator that is defined directly on a class" do + klass = Class.new + @o.rb_define_alloc_func(klass) + @o.speced_allocator?(Object).should == false + @o.speced_allocator?(klass).should == true + end + + it "gets the allocator that is inherited" do + parent = Class.new + @o.rb_define_alloc_func(parent) + klass = Class.new(parent) + @o.speced_allocator?(Object).should == false + @o.speced_allocator?(klass).should == true + end + end + + describe "rb_undef_alloc_func" do + it "makes rb_get_alloc_func() return NULL for a class without a custom allocator" do + klass = Class.new + @o.rb_undef_alloc_func(klass) + @o.custom_alloc_func?(klass).should == false + end + + it "undefs the allocator for the class" do + klass = Class.new + @o.rb_define_alloc_func(klass) + @o.speced_allocator?(klass).should == true + @o.rb_undef_alloc_func(klass) + @o.custom_alloc_func?(klass).should == false + end + + it "undefs the allocator for a class that inherits a allocator" do + parent = Class.new + @o.rb_define_alloc_func(parent) + klass = Class.new(parent) + @o.speced_allocator?(klass).should == true + @o.rb_undef_alloc_func(klass) + @o.custom_alloc_func?(klass).should == false + + @o.speced_allocator?(parent).should == true + end + end + end end From 7d02441f0d6e5c9d0a73a024519eba4f69e36dce Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Tue, 28 Jan 2020 16:11:53 -0500 Subject: [PATCH 558/878] Fix file dependency in make --- common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.mk b/common.mk index 720a17469b6e0b..59d11a968c466e 100644 --- a/common.mk +++ b/common.mk @@ -2491,6 +2491,7 @@ hash.$(OBJEXT): $(hdrdir)/ruby.h hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h hash.$(OBJEXT): $(top_srcdir)/internal/array.h hash.$(OBJEXT): $(top_srcdir)/internal/bignum.h +hash.$(OBJEXT): $(top_srcdir)/internal/bits.h hash.$(OBJEXT): $(top_srcdir)/internal/class.h hash.$(OBJEXT): $(top_srcdir)/internal/compilers.h hash.$(OBJEXT): $(top_srcdir)/internal/cont.h @@ -2504,6 +2505,7 @@ hash.$(OBJEXT): $(top_srcdir)/internal/static_assert.h hash.$(OBJEXT): $(top_srcdir)/internal/stdbool.h hash.$(OBJEXT): $(top_srcdir)/internal/string.h hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h +hash.$(OBJEXT): $(top_srcdir)/internal/time.h hash.$(OBJEXT): $(top_srcdir)/internal/vm.h hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h hash.$(OBJEXT): {$(VPATH)}assert.h From 30236965057ed7b58b6f83b3103ccace67fbc2d7 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 29 Jan 2020 08:30:39 +0900 Subject: [PATCH 559/878] Fix a typo [ci skip] --- include/ruby/backward/cxxanyargs.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 0acbc9544343bf..431d719dde5987 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -625,7 +625,7 @@ struct rb_define_global_function : public driver0::define(klass, mid, func) -/// @brief Defines ::rb_cKerbel \#mid. +/// @brief Defines ::rb_mKernel \#mid. /// @param mid Name of the defining method. /// @param func Implementation of \#mid. /// @param arity Arity of \#mid. From 98f6c74b429f9e8afccb000da4a50920479dffd6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 29 Jan 2020 10:12:35 +0900 Subject: [PATCH 560/878] Isolate the PRNG for tmpdir/tempfile To get rid of conflicts affected by `srand`. --- lib/tmpdir.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index ea1d380ef17135..c61365577e348d 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -110,6 +110,14 @@ def tmpdir UNUSABLE_CHARS = [File::SEPARATOR, File::ALT_SEPARATOR, File::PATH_SEPARATOR, ":"].uniq.join("").freeze + class << (RANDOM = Random.new) + MAX = 36**6 # < 0x100000000 + def next + rand(MAX).to_s(36) + end + end + private_constant :RANDOM + def create(basename, tmpdir=nil, max_try: nil, **opts) origdir = tmpdir tmpdir ||= tmpdir() @@ -123,7 +131,7 @@ def create(basename, tmpdir=nil, max_try: nil, **opts) suffix &&= suffix.delete(UNUSABLE_CHARS) begin t = Time.now.strftime("%Y%m%d") - path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"\ + path = "#{prefix}#{t}-#{$$}-#{RANDOM.next}"\ "#{n ? %[-#{n}] : ''}#{suffix||''}" path = File.join(tmpdir, path) yield(path, n, opts, origdir) From 46173eeb64245ff533dafddd3d74338763c0bb35 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 13:07:56 +0900 Subject: [PATCH 561/878] support multi-run for test/ruby/enc/test_regex_casefold.rb should not mutate test data. --- test/ruby/enc/test_regex_casefold.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/enc/test_regex_casefold.rb b/test/ruby/enc/test_regex_casefold.rb index 2b252bd441c243..ec5dc7f220c5e5 100644 --- a/test/ruby/enc/test_regex_casefold.rb +++ b/test/ruby/enc/test_regex_casefold.rb @@ -11,7 +11,7 @@ class TestCaseFold < Test::Unit::TestCase def check_downcase_properties(expected, start, *flags) assert_equal expected, start.downcase(*flags) - temp = start + temp = start.dup assert_equal expected, temp.downcase!(*flags) assert_equal expected, expected.downcase(*flags) temp = expected From 7b4b01424fe7448133c63e9415edf075a3c760b9 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 29 Jan 2020 14:01:00 +0900 Subject: [PATCH 562/878] skip SEGV (BUG) tests if ENV['RUBY_ON_BUG'] is given. This environment variable can show additional message on BUG. --- test/ruby/test_rubyoptions.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index cac420422d542b..0aa253a74f8d79 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -718,6 +718,8 @@ module SEGVTest end def assert_segv(args, message=nil) + skip if ENV['RUBY_ON_BUG'] + test_stdin = "" opt = SEGVTest::ExecOptions.dup list = SEGVTest::ExpectedStderrList From d142b37bdc05986f5caec8981550e97cfb7b1ce0 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Wed, 29 Jan 2020 14:58:43 +0900 Subject: [PATCH 563/878] Add more debug print https://rubyci.org/logs/rubyci.s3.amazonaws.com/solaris11s-sunc/ruby-master/log/20200129T022510Z.fail.html.gz --- test/net/imap/test_imap.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index 03692c233ac522..6c6a65755225cb 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -489,7 +489,16 @@ def tcp_socket(host, port) server: @@h[:server].inspect, t: Process.clock_gettime(Process::CLOCK_MONOTONIC), } - super + #super + s = Socket.tcp(host, port, :connect_timeout => @open_timeout) + @@h[:in_tcp_socket_2] = { + s: s.inspect, + local_address: s.local_address, + remote_address: s.remote_address, + t: Process.clock_gettime(Process::CLOCK_MONOTONIC), + } + s.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, true) + s end end start_server do @@ -523,7 +532,7 @@ def tcp_socket(host, port) raise Errno::EINVAL end end - rescue Errno::EINVAL => e # for debug on OpenCSW + rescue SystemCallError => e # for debug on OpenCSW h[:in_rescue] = { e: e, server_addr: server_addr, From 5d124a3b68982e779946804b5b9578c403c6bdf2 Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 28 Jan 2020 03:21:02 +0900 Subject: [PATCH 564/878] [ruby/reline] Support GNOME style Home/End key sequences [Bug #16510] https://github.com/ruby/reline/commit/788f0df845 --- lib/reline/ansi.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 395721ea81275a..33b74f51afa98b 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -15,6 +15,8 @@ def self.encoding [27, 91, 52, 126] => :ed_move_to_end, # End [27, 91, 72] => :ed_move_to_beg, # Home [27, 91, 70] => :ed_move_to_end, # End + [27, 79, 72] => :ed_move_to_beg, # Home + [27, 79, 70] => :ed_move_to_end, # End [27, 32] => :em_set_mark, # M- [24, 24] => :em_exchange_mark, # C-x C-x TODO also add Windows [27, 91, 49, 59, 53, 67] => :em_next_word, # Ctrl+→ From f7f8dc5fd47bcd79e8e46cd321ad0dec9e0ec5cd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 30 Jan 2020 11:31:48 +0900 Subject: [PATCH 565/878] Unnamed groups are not captured when named groups are used --- tool/transform_mjit_header.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/transform_mjit_header.rb b/tool/transform_mjit_header.rb index 5f89446c818391..ed837486a7fdec 100644 --- a/tool/transform_mjit_header.rb +++ b/tool/transform_mjit_header.rb @@ -105,7 +105,7 @@ def self.decl_name_of(decl) su2_regex = /{([^{}]|#{su1_regex})*}/ su3_regex = /{([^{}]|#{su2_regex})*}/ # 3 nested structs/unions is probably enough reduced_decl.gsub!(su3_regex, '') # remove structs/unions in the header - id_seq_regex = /\s*(#{ident_regex}(\s+|\s*[*]+\s*))*/ + id_seq_regex = /\s*(?:#{ident_regex}(?:\s+|\s*[*]+\s*))*/ # Process function header: match = /\A#{id_seq_regex}(?#{ident_regex})\s*\(/.match(reduced_decl) return match[:name] if match From 16c5cbe42247fcf253f2dde71f112c707c7dd4fa Mon Sep 17 00:00:00 2001 From: git Date: Thu, 30 Jan 2020 11:35:06 +0900 Subject: [PATCH 566/878] * 2020-01-30 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index e1b690f26444cc..8be513e422a06c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" From e6334fd45064cb720399bf6aa75116ec62a88357 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 30 Jan 2020 12:04:15 +0900 Subject: [PATCH 567/878] Unnamed groups are not captured when named groups are used --- lib/net/ftp.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index d1e545c0c8c055..1f6879d765a040 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1044,7 +1044,7 @@ def writable? TIME_PARSER = ->(value, local = false) { unless /\A(?\d{4})(?\d{2})(?\d{2}) (?\d{2})(?\d{2})(?\d{2}) - (\.(?\d+))?/x =~ value + (?:\.(?\d+))?/x =~ value raise FTPProtoError, "invalid time-val: #{value}" end usec = fractions.to_i * 10 ** (6 - fractions.to_s.size) @@ -1369,7 +1369,7 @@ def parse227(resp) # :nodoc: if !resp.start_with?("227") raise FTPReplyError, resp end - if m = /\((?\d+(,\d+){3}),(?\d+,\d+)\)/.match(resp) + if m = /\((?\d+(?:,\d+){3}),(?\d+,\d+)\)/.match(resp) return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"]) else raise FTPProtoError, resp @@ -1385,9 +1385,9 @@ def parse228(resp) # :nodoc: if !resp.start_with?("228") raise FTPReplyError, resp end - if m = /\(4,4,(?\d+(,\d+){3}),2,(?\d+,\d+)\)/.match(resp) + if m = /\(4,4,(?\d+(?:,\d+){3}),2,(?\d+,\d+)\)/.match(resp) return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"]) - elsif m = /\(6,16,(?\d+(,(\d+)){15}),2,(?\d+,\d+)\)/.match(resp) + elsif m = /\(6,16,(?\d+(?:,\d+){15}),2,(?\d+,\d+)\)/.match(resp) return parse_pasv_ipv6_host(m["host"]), parse_pasv_port(m["port"]) else raise FTPProtoError, resp From 3893a8dd42fb3bbd71750648c3c0de118955a6ea Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 30 Jan 2020 17:47:09 +0900 Subject: [PATCH 568/878] Optimized branches in pattern matching --- compile.c | 107 +++++++++++++++++++++++------------------------------- 1 file changed, 46 insertions(+), 61 deletions(-) diff --git a/compile.c b/compile.c index 0eb94da3e0d47a..39c6bc1aaf1cce 100644 --- a/compile.c +++ b/compile.c @@ -5485,8 +5485,10 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no return COMPILE_OK; } +static int iseq_compile_pattern_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *unmatched, int in_alt_pattern); + static int -iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int in_alt_pattern) +iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *matched, LABEL *unmatched, int in_alt_pattern) { const int line = nd_line(node); @@ -5539,12 +5541,11 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c * end * end * true - * goto fin + * goto matched * type_error: * FrozenCore.raise TypeError * match_failed: - * false - * fin: + * goto unmatched */ struct rb_ary_pattern_info *apinfo = node->nd_apinfo; const NODE *args = apinfo->pre_args; @@ -5555,11 +5556,10 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c const int use_rest_num = apinfo->rest_arg && (NODE_NAMED_REST_P(apinfo->rest_arg) || (!NODE_NAMED_REST_P(apinfo->rest_arg) && post_args_num > 0)); - LABEL *match_failed, *type_error, *fin; + LABEL *match_failed, *type_error; int i; match_failed = NEW_LABEL(line); type_error = NEW_LABEL(line); - fin = NEW_LABEL(line); if (use_rest_num) { ADD_INSN1(ret, line, putobject, INT2FIX(0)); /* allocate stack for rest_num */ @@ -5594,9 +5594,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c ADD_INSN(ret, line, dup); ADD_INSN1(ret, line, putobject, INT2FIX(i)); ADD_SEND(ret, line, idAREF, INT2FIX(1)); - iseq_compile_pattern_each(iseq, ret, args->nd_head, in_alt_pattern); + CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_alt_pattern)); args = args->nd_next; - ADD_INSNL(ret, line, branchunless, match_failed); } if (apinfo->rest_arg) { @@ -5610,8 +5609,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c ADD_INSN1(ret, line, setn, INT2FIX(4)); ADD_SEND(ret, line, idAREF, INT2FIX(2)); - iseq_compile_pattern_each(iseq, ret, apinfo->rest_arg, in_alt_pattern); - ADD_INSNL(ret, line, branchunless, match_failed); + CHECK(iseq_compile_pattern_match(iseq, ret, apinfo->rest_arg, match_failed, in_alt_pattern)); } else { if (post_args_num > 0) { @@ -5634,17 +5632,15 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c ADD_SEND(ret, line, idPLUS, INT2FIX(1)); ADD_SEND(ret, line, idAREF, INT2FIX(1)); - iseq_compile_pattern_each(iseq, ret, args->nd_head, in_alt_pattern); + CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_alt_pattern)); args = args->nd_next; - ADD_INSNL(ret, line, branchunless, match_failed); } ADD_INSN(ret, line, pop); if (use_rest_num) { ADD_INSN(ret, line, pop); } - ADD_INSN1(ret, line, putobject, Qtrue); - ADD_INSNL(ret, line, jump, fin); + ADD_INSNL(ret, line, jump, matched); ADD_LABEL(ret, type_error); ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); @@ -5657,8 +5653,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c if (use_rest_num) { ADD_INSN(ret, line, pop); } - ADD_INSN1(ret, line, putobject, Qfalse); - ADD_LABEL(ret, fin); + ADD_INSNL(ret, line, jump, unmatched); break; } @@ -5717,19 +5712,17 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c * end * end * true - * goto fin + * goto matched * type_error: * FrozenCore.raise TypeError * match_failed: - * false - * fin: + * goto unmatched */ - LABEL *match_failed, *type_error, *fin; + LABEL *match_failed, *type_error; VALUE keys = Qnil; match_failed = NEW_LABEL(line); type_error = NEW_LABEL(line); - fin = NEW_LABEL(line); if (node->nd_pkwargs && !node->nd_pkwrestarg) { const NODE *kw_args = node->nd_pkwargs->nd_head; @@ -5796,8 +5789,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c ADD_INSN(match_values, line, dup); ADD_INSN1(match_values, line, putobject, key); ADD_SEND(match_values, line, node->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1)); - iseq_compile_pattern_each(iseq, match_values, value_node, in_alt_pattern); - ADD_INSNL(match_values, line, branchunless, match_failed); + CHECK(iseq_compile_pattern_match(iseq, match_values, value_node, match_failed, in_alt_pattern)); args = args->nd_next->nd_next; } ADD_SEQ(ret, match_values); @@ -5817,14 +5809,12 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } else { ADD_INSN(ret, line, dup); - iseq_compile_pattern_each(iseq, ret, node->nd_pkwrestarg, in_alt_pattern); - ADD_INSNL(ret, line, branchunless, match_failed); + CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_pkwrestarg, match_failed, in_alt_pattern)); } } ADD_INSN(ret, line, pop); - ADD_INSN1(ret, line, putobject, Qtrue); - ADD_INSNL(ret, line, jump, fin); + ADD_INSNL(ret, line, jump, matched); ADD_LABEL(ret, type_error); ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); @@ -5834,9 +5824,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c ADD_LABEL(ret, match_failed); ADD_INSN(ret, line, pop); - ADD_INSN1(ret, line, putobject, Qfalse); - - ADD_LABEL(ret, fin); + ADD_INSNL(ret, line, jump, unmatched); break; } case NODE_LIT: @@ -5861,6 +5849,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c case NODE_COLON3: CHECK(COMPILE(ret, "case in literal", node)); ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE)); + ADD_INSNL(ret, line, branchif, matched); + ADD_INSNL(ret, line, jump, unmatched); break; case NODE_LASGN: { struct rb_iseq_constant_body *const body = iseq->body; @@ -5877,7 +5867,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq)); - ADD_INSN1(ret, line, putobject, Qtrue); + ADD_INSNL(ret, line, jump, matched); break; } case NODE_DASGN: @@ -5902,16 +5892,14 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c return COMPILE_NG; } ADD_SETLOCAL(ret, line, ls - idx, lv); - ADD_INSN1(ret, line, putobject, Qtrue); + ADD_INSNL(ret, line, jump, matched); break; } case NODE_IF: case NODE_UNLESS: { - LABEL *match_failed, *fin; - match_failed = NEW_LABEL(line); - fin = NEW_LABEL(line); - iseq_compile_pattern_each(iseq, ret, node->nd_body, in_alt_pattern); - ADD_INSNL(ret, line, branchunless, match_failed); + LABEL *match_failed; + match_failed = unmatched; + CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_body, unmatched, in_alt_pattern)); CHECK(COMPILE(ret, "case in if", node->nd_cond)); if (nd_type(node) == NODE_IF) { ADD_INSNL(ret, line, branchunless, match_failed); @@ -5919,13 +5907,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c else { ADD_INSNL(ret, line, branchif, match_failed); } - ADD_INSN1(ret, line, putobject, Qtrue); - ADD_INSNL(ret, line, jump, fin); - - ADD_LABEL(ret, match_failed); - ADD_INSN1(ret, line, putobject, Qfalse); - - ADD_LABEL(ret, fin); + ADD_INSNL(ret, line, jump, matched); break; } case NODE_HASH: { @@ -5941,16 +5923,12 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } ADD_INSN(ret, line, dup); - iseq_compile_pattern_each(iseq, ret, n->nd_head, in_alt_pattern); - ADD_INSNL(ret, line, branchunless, match_failed); - iseq_compile_pattern_each(iseq, ret, n->nd_next->nd_head, in_alt_pattern); - ADD_INSNL(ret, line, jump, fin); + CHECK(iseq_compile_pattern_match(iseq, ret, n->nd_head, match_failed, in_alt_pattern)); + CHECK(iseq_compile_pattern_each(iseq, ret, n->nd_next->nd_head, matched, match_failed, in_alt_pattern)); ADD_LABEL(ret, match_failed); ADD_INSN(ret, line, pop); - ADD_INSN1(ret, line, putobject, Qfalse); - - ADD_LABEL(ret, fin); + ADD_INSNL(ret, line, jump, unmatched); break; } case NODE_OR: { @@ -5959,16 +5937,12 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c fin = NEW_LABEL(line); ADD_INSN(ret, line, dup); - iseq_compile_pattern_each(iseq, ret, node->nd_1st, TRUE); - ADD_INSNL(ret, line, branchif, match_succeeded); - iseq_compile_pattern_each(iseq, ret, node->nd_2nd, TRUE); - ADD_INSNL(ret, line, jump, fin); - + CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_1st, match_succeeded, fin, TRUE)); ADD_LABEL(ret, match_succeeded); ADD_INSN(ret, line, pop); - ADD_INSN1(ret, line, putobject, Qtrue); - + ADD_INSNL(ret, line, jump, matched); ADD_LABEL(ret, fin); + CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_2nd, matched, unmatched, TRUE)); break; } default: @@ -5977,6 +5951,15 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c return COMPILE_OK; } +static int +iseq_compile_pattern_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *unmatched, int in_alt_pattern) +{ + LABEL *fin = NEW_LABEL(nd_line(node)); + CHECK(iseq_compile_pattern_each(iseq, ret, node, fin, unmatched, in_alt_pattern)); + ADD_LABEL(ret, fin); + return COMPILE_OK; +} + static int compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped) { @@ -6031,9 +6014,11 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no pattern = node->nd_head; if (pattern) { - ADD_INSN (cond_seq, nd_line(pattern), dup); - iseq_compile_pattern_each(iseq, cond_seq, pattern, FALSE); - ADD_INSNL(cond_seq, nd_line(pattern), branchif, l1); + int pat_line = nd_line(pattern); + LABEL *next_pat = NEW_LABEL(pat_line); + ADD_INSN (cond_seq, pat_line, dup); + CHECK(iseq_compile_pattern_each(iseq, cond_seq, pattern, l1, next_pat, FALSE)); + ADD_LABEL(cond_seq, next_pat); } else { COMPILE_ERROR(ERROR_ARGS "unexpected node"); From 9bcf4f3db26249772c983896ebbc9ff41f4614db Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 21 Jan 2020 11:47:04 +0900 Subject: [PATCH 569/878] delegate.rb: fixed keyword arguments in DelegateClass `Delegator.delegating_block` should delegate keyword arguments separately. [ruby-core:96949] --- lib/delegate.rb | 2 +- test/test_delegate.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/delegate.rb b/lib/delegate.rb index 0bbe211a0553e8..b7d48effb4ac4b 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -334,7 +334,7 @@ def Delegator.delegating_block(mid) # :nodoc: lambda do |*args, &block| target = self.__getobj__ target.__send__(mid, *args, &block) - end + end.ruby2_keywords end # diff --git a/test/test_delegate.rb b/test/test_delegate.rb index 80bf41638ac7cc..9c477438881651 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -343,4 +343,12 @@ def o.bar; 1; end assert_equal(1, delegate.bar) assert_raise(NoMethodError, /undefined method `foo' for/) { delegate.foo } end + + def test_keyword_argument + k = EnvUtil.labeled_class("Target") do + def test(a, k:) [a, k]; end + end + a = DelegateClass(k).new(k.new) + assert_equal([1, 0], a.test(1, k: 0)) + end end From 18e7f9000dc3695b9db02ae153d41bd1efa01d6e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 29 Jan 2020 17:24:39 -0800 Subject: [PATCH 570/878] Use `rb_gc_mark` when marking globals I think global references should either be 0 or valid heap pointers. `rb_gc_mark_maybe` checks to see if the pointer is a valid heap pointer, but I believe we already know they are valid addresses --- variable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variable.c b/variable.c index 1db061454b2aab..ed84b85e86e097 100644 --- a/variable.c +++ b/variable.c @@ -397,7 +397,7 @@ void rb_gvar_val_marker(VALUE *var) { VALUE data = (VALUE)var; - if (data) rb_gc_mark_maybe(data); + if (data) rb_gc_mark(data); } VALUE From 8e769a5b40200d5b66975e68016d09b47424c10a Mon Sep 17 00:00:00 2001 From: git Date: Fri, 31 Jan 2020 01:23:43 +0900 Subject: [PATCH 571/878] * 2020-01-31 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 8be513e422a06c..6c30aa2a0e0a10 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" From 53adb53c9aea5da98ed3e470983b2cbfe367cb7d Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 31 Jan 2020 02:46:05 +0900 Subject: [PATCH 572/878] Ignore expected errors on compiling C++ source [Bug #16331] BSD make can run parallel more aggressively than GNU make. It communicate with other make process through -J option in MAKEFLAGS environment variable to notify a build failure happend in an other pararell make process. https://www.freebsd.org/cgi/man.cgi?make It usually works well but ext/-test-/cxxanyargs/Makefile has two targets which are expected to fail (failure.o and failurem1.o). Additional note: To test and debug this issue, following command will speed up it. `make -f exts.mk -j8 clean all` --- ext/-test-/cxxanyargs/depend | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend index 02113b6c265ef2..f7826b29c935b5 100644 --- a/ext/-test-/cxxanyargs/depend +++ b/ext/-test-/cxxanyargs/depend @@ -1,6 +1,7 @@ $(TARGET_SO) $(STATIC_LIB): $(FAILURES:.cpp=.failed) .SUFFIXES: .failed +.IGNORE: failure.o failurem1.o .cpp.failed: $(Q)$(RUBY) -rfileutils \ From 39a1959d289ecba5e61431deaef239123c3f0fcc Mon Sep 17 00:00:00 2001 From: Florian Heinle Date: Thu, 30 Jan 2020 12:45:21 +0100 Subject: [PATCH 573/878] Fix wrong return value in proc documentation. --- proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proc.c b/proc.c index 01efab7d70f5fa..47f4e668b570d8 100644 --- a/proc.c +++ b/proc.c @@ -3759,7 +3759,7 @@ proc_ruby2_keywords(VALUE procval) * * p = proc {|x, y| x } * l = lambda {|x, y| x } - * [[1, 2], [3, 4]].map(&p) #=> [1, 2] + * [[1, 2], [3, 4]].map(&p) #=> [1, 3] * [[1, 2], [3, 4]].map(&l) # ArgumentError: wrong number of arguments (given 1, expected 2) * * The only exception is dynamic method definition: even if defined by From 9aed421d70df65dcada8f529197166166f50357e Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 31 Jan 2020 06:34:49 +0900 Subject: [PATCH 574/878] Support nmake --- ext/-test-/cxxanyargs/depend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend index f7826b29c935b5..e786fd11fa5141 100644 --- a/ext/-test-/cxxanyargs/depend +++ b/ext/-test-/cxxanyargs/depend @@ -1,7 +1,9 @@ $(TARGET_SO) $(STATIC_LIB): $(FAILURES:.cpp=.failed) .SUFFIXES: .failed +!INDEF COMSPEC .IGNORE: failure.o failurem1.o +!ENDIF .cpp.failed: $(Q)$(RUBY) -rfileutils \ From ca2888fb3d23d702738873f5c0f956575fd3c5d3 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 31 Jan 2020 08:00:56 +0900 Subject: [PATCH 575/878] Move .IGNORE in extconf.rb --- ext/-test-/cxxanyargs/depend | 3 --- ext/-test-/cxxanyargs/extconf.rb | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend index e786fd11fa5141..02113b6c265ef2 100644 --- a/ext/-test-/cxxanyargs/depend +++ b/ext/-test-/cxxanyargs/depend @@ -1,9 +1,6 @@ $(TARGET_SO) $(STATIC_LIB): $(FAILURES:.cpp=.failed) .SUFFIXES: .failed -!INDEF COMSPEC -.IGNORE: failure.o failurem1.o -!ENDIF .cpp.failed: $(Q)$(RUBY) -rfileutils \ diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb index d2a740b989e7c0..97b09ce5834211 100644 --- a/ext/-test-/cxxanyargs/extconf.rb +++ b/ext/-test-/cxxanyargs/extconf.rb @@ -27,5 +27,6 @@ $cleanfiles << "$(FAILURES:.cpp=.failed)" create_makefile("-test-/cxxanyargs") do |mk| mk << "FAILURES #{['=', failures].join(' ')}\n" + mk << ".IGNORE: $(FAILURES:.cpp=.o)\n" unless $mswin end end From 52dc0632faa8450af90e37ef3c2c9f30d06951a1 Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Mon, 27 Jan 2020 14:47:24 +0100 Subject: [PATCH 576/878] Avoid allocating a temporary empty string in String#slice! --- string.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/string.c b/string.c index cdd987da1990c3..4ae804b83c32be 100644 --- a/string.c +++ b/string.c @@ -215,6 +215,8 @@ str_make_independent(VALUE str) /* symbols for [up|down|swap]case/capitalize options */ static VALUE sym_ascii, sym_turkic, sym_lithuanian, sym_fold; +static VALUE empty_string; + static rb_encoding * get_actual_encoding(const int encidx, VALUE str) { @@ -4887,13 +4889,13 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str) rb_check_arity(argc, 1, 2); for (i=0; i Date: Fri, 31 Jan 2020 12:11:21 +0900 Subject: [PATCH 577/878] Removed type-punning pointer casts around `st_data_t` --- gc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gc.c b/gc.c index 5928b2bc68624d..a9400b521acac6 100644 --- a/gc.c +++ b/gc.c @@ -2548,14 +2548,14 @@ make_io_zombie(rb_objspace_t *objspace, VALUE obj) static void obj_free_object_id(rb_objspace_t *objspace, VALUE obj) { - VALUE id; + st_data_t o = (st_data_t)obj, id; GC_ASSERT(FL_TEST(obj, FL_SEEN_OBJ_ID)); FL_UNSET(obj, FL_SEEN_OBJ_ID); - if (st_delete(objspace->obj_to_id_tbl, (st_data_t *)&obj, &id)) { + if (st_delete(objspace->obj_to_id_tbl, &o, &id)) { GC_ASSERT(id); - st_delete(objspace->id_to_obj_tbl, (st_data_t *)&id, NULL); + st_delete(objspace->id_to_obj_tbl, &id, NULL); } else { rb_bug("Object ID seen, but not in mapping table: %s\n", obj_info(obj)); @@ -5760,8 +5760,10 @@ static int allrefs_add(struct allrefs *data, VALUE obj) { struct reflist *refs; + st_data_t r; - if (st_lookup(data->references, obj, (st_data_t *)&refs)) { + if (st_lookup(data->references, obj, &r)) { + refs = (struct reflist *)r; reflist_add(refs, data->root_obj); return 0; } @@ -7568,7 +7570,6 @@ gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj) case T_MOVED: case T_ZOMBIE: return FALSE; - break; case T_SYMBOL: if (DYNAMIC_SYM_P(obj) && (RSYMBOL(obj)->id & ~ID_SCOPE_MASK)) { return FALSE; @@ -7598,7 +7599,6 @@ gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj) } } return !RVALUE_PINNED(obj); - break; default: rb_bug("gc_is_moveable_obj: unreachable (%d)", (int)BUILTIN_TYPE(obj)); @@ -7641,14 +7641,14 @@ gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, VALUE moved_list) rb_mv_generic_ivar((VALUE)src, (VALUE)dest); } - VALUE id; + st_data_t srcid = (st_data_t)src, id; /* If the source object's object_id has been seen, we need to update * the object to object id mapping. */ - if (st_lookup(objspace->obj_to_id_tbl, (VALUE)src, &id)) { + if (st_lookup(objspace->obj_to_id_tbl, srcid, &id)) { gc_report(4, objspace, "Moving object with seen id: %p -> %p\n", (void *)src, (void *)dest); - st_delete(objspace->obj_to_id_tbl, (st_data_t *)&src, 0); - st_insert(objspace->obj_to_id_tbl, (VALUE)dest, id); + st_delete(objspace->obj_to_id_tbl, &srcid, 0); + st_insert(objspace->obj_to_id_tbl, (st_data_t)dest, id); } /* Move the object */ @@ -10008,14 +10008,15 @@ objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t old_size) found:; { - st_data_t key = (st_data_t)info->file; + st_data_t key = (st_data_t)info->file, d; size_t *data; if (malloc_info_file_table == NULL) { malloc_info_file_table = st_init_numtable_with_size(1024); } - if (st_lookup(malloc_info_file_table, key, (st_data_t *)&data)) { + if (st_lookup(malloc_info_file_table, key, &d)) { /* hit */ + data = (size_t *)d; } else { data = malloc(xmalloc2_size(2, sizeof(size_t))); From 4942adf68cd2d8ab0a3ca64a787bdf55e119b337 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 31 Jan 2020 12:52:22 +0900 Subject: [PATCH 578/878] Return the makefile content Block for `create_makefile` is expected to return the content of the makefile. --- ext/-test-/cxxanyargs/extconf.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb index 97b09ce5834211..08d8c83010eabf 100644 --- a/ext/-test-/cxxanyargs/extconf.rb +++ b/ext/-test-/cxxanyargs/extconf.rb @@ -28,5 +28,6 @@ create_makefile("-test-/cxxanyargs") do |mk| mk << "FAILURES #{['=', failures].join(' ')}\n" mk << ".IGNORE: $(FAILURES:.cpp=.o)\n" unless $mswin + mk end end From cdd75d4e7f0402a0537c516b7331a036347b0fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 12:01:39 +0900 Subject: [PATCH 579/878] support C++ std::nullptr_t C++ keyword `nullptr` represents a null pointer (note also that NULL is an integer in C++ due to its design flaw). Its type is `std::nullptr_t`, defined in standard header. Why not support it when the backend implementation can take a null pointer as an argument. --- configure.ac | 11 ++ ext/-test-/cxxanyargs/cxxanyargs.cpp | 122 ++++++++++++++++++++ include/ruby/backward/cxxanyargs.hpp | 166 ++++++++++++++++++++++++++- win32/Makefile.sub | 3 + 4 files changed, 301 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 548849d612b715..b0e09a5f857b03 100644 --- a/configure.ac +++ b/configure.ac @@ -1437,6 +1437,17 @@ AS_IF([test "$rb_cv_CentOS6_CXX_workaround" != no],[ AC_DEFINE([RUBY_CXX_DEPRECATED(msg)], [__attribute__((__deprecated__(msg)))])]) +AC_CACHE_CHECK([for std::nullptr_t], rb_cv_CXX_nullptr, [ + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [@%:@include ], + [static std::nullptr_t const *const conftest = nullptr;])], + [rb_cv_CXX_nullptr=yes], + [rb_cv_CXX_nullptr=no]) + AC_LANG_POP()]) +AS_IF([test "$rb_cv_CXX_nullptr" != no],[AC_DEFINE(HAVE_NULLPTR)]) + if_i386=${universal_binary+[defined __i386__]} RUBY_FUNC_ATTRIBUTE(__stdcall__, FUNC_STDCALL, rb_cv_func_stdcall, ${if_i386}) RUBY_FUNC_ATTRIBUTE(__cdecl__, FUNC_CDECL, rb_cv_func_cdecl, ${if_i386}) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index 812c6d7e60649e..b0d48e04780e6d 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -36,6 +36,18 @@ namespace test_rb_define_virtual_variable { RUBY_METHOD_FUNC(getter), reinterpret_cast(setter)); // old rb_define_virtual_variable("test", getter, setter); // new + +#ifdef HAVE_NULLPTR + rb_define_virtual_variable("test", nullptr, reinterpret_cast(setter)); + rb_define_virtual_variable("test", nullptr, setter); + + rb_define_virtual_variable("test", RUBY_METHOD_FUNC(getter), nullptr); + rb_define_virtual_variable("test", getter, nullptr); + + // It doesn't make any sense for both function pointers be nullptr at + // the same time. +#endif + return self; } } @@ -62,6 +74,18 @@ struct test_rb_define_hooked_variable { RUBY_METHOD_FUNC(getter), reinterpret_cast(setter)); // old rb_define_hooked_variable("test", &v, getter, setter); // new + +#ifdef HAVE_NULLPTR + rb_define_hooked_variable("test", &v, nullptr, reinterpret_cast(setter)); + rb_define_hooked_variable("test", &v, nullptr, setter); + + rb_define_hooked_variable("test", &v, RUBY_METHOD_FUNC(getter), nullptr); + rb_define_hooked_variable("test", &v, getter, nullptr); + + // It doesn't make any sense for both function pointers be nullptr at + // the same time. +#endif + return self; } }; @@ -83,6 +107,10 @@ namespace test_rb_iterate { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + rb_iterate(iter, self, nullptr, self); +#endif + rb_iterate(iter, self, RUBY_METHOD_FUNC(block), self); // old return rb_iterate(iter, self, block, self); // new } @@ -100,6 +128,11 @@ namespace test_rb_block_call { { const ID mid = rb_intern("each"); const VALUE argv[] = { Qundef }; + +#ifdef HAVE_NULLPTR + rb_block_call(self, mid, 0, argv, nullptr, self); +#endif + rb_block_call(self, mid, 0, argv, RUBY_METHOD_FUNC(block), self); // old return rb_block_call(self, mid, 0, argv, block, self); // new } @@ -121,6 +154,11 @@ namespace test_rb_rescue { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + rb_rescue(RUBY_METHOD_FUNC(begin), self, nullptr, self); + return rb_rescue(begin, self, nullptr, self); +#endif + rb_rescue(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self); // old return rb_rescue(begin, self, rescue, self); // new } @@ -142,6 +180,11 @@ namespace test_rb_rescue2 { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + rb_rescue2(RUBY_METHOD_FUNC(begin), self, nullptr, self, rb_eStandardError, rb_eFatal, 0); + rb_rescue2(begin, self, nullptr, self, rb_eStandardError, rb_eFatal, 0); +#endif + rb_rescue2(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self, rb_eStandardError, rb_eFatal, 0); // old return rb_rescue2(begin, self, rescue, self, rb_eStandardError, rb_eFatal, 0); // new @@ -164,6 +207,11 @@ namespace test_rb_ensure { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + rb_ensure(RUBY_METHOD_FUNC(begin), self, nullptr, self); + rb_ensure(begin, self, nullptr, self); +#endif + rb_ensure(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(ensure), self); // old return rb_ensure(begin, self, ensure, self); // new } @@ -180,6 +228,11 @@ namespace test_rb_catch { test(VALUE self) { static const char *zero = 0; + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a catcher. +#endif + rb_catch(zero, RUBY_METHOD_FUNC(catcher), self); // old return rb_catch(zero, catcher, self); // new } @@ -195,6 +248,10 @@ namespace test_rb_catch_obj { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a catcher. +#endif + rb_catch_obj(self, RUBY_METHOD_FUNC(catcher), self); // old return rb_catch_obj(self, catcher, self); // new } @@ -210,6 +267,10 @@ namespace test_rb_fiber_new { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a fiber. +#endif + rb_fiber_new(RUBY_METHOD_FUNC(fiber), self); // old return rb_fiber_new(fiber, self); // new } @@ -225,6 +286,10 @@ namespace test_rb_proc_new { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a proc. +#endif + rb_fiber_new(RUBY_METHOD_FUNC(proc), self); // old return rb_fiber_new(proc, self); // new } @@ -244,6 +309,11 @@ struct test_rb_thread_create { test(VALUE self) { v = self; + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a thread. +#endif + rb_thread_create(RUBY_METHOD_FUNC(thread), &v); // old return rb_thread_create(thread, &v); // new } @@ -262,6 +332,11 @@ namespace test_st_foreach { { st_data_t data = 0; st_table *st = st_init_numtable(); + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as an iterator. +#endif + st_foreach(st, reinterpret_cast(iter), data); // old st_foreach(st, iter, data); // new return self; @@ -280,6 +355,11 @@ namespace test_st_foreach_check { { st_data_t data = 0; st_table *st = st_init_numtable(); + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as an iterator. +#endif + st_foreach_check(st, reinterpret_cast(iter), data, data); // old st_foreach_check(st, iter, data, data); // new return self; @@ -298,6 +378,11 @@ namespace test_st_foreach_safe { { st_data_t data = 0; st_table *st = st_init_numtable(); + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as an iterator. +#endif + st_foreach_safe(st, reinterpret_cast(iter), data); // old st_foreach_safe(st, iter, data); // new return self; @@ -315,6 +400,11 @@ namespace test_rb_hash_foreach { test(VALUE self) { VALUE h = rb_hash_new(); + +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as an iterator. +#endif + rb_hash_foreach(h, reinterpret_cast(iter), self); // old rb_hash_foreach(h, iter, self); // new return self; @@ -331,6 +421,10 @@ namespace test_rb_ivar_foreach { VALUE test(VALUE self) { +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as an iterator. +#endif + rb_ivar_foreach(self, reinterpret_cast(iter), self); // old rb_ivar_foreach(self, iter, self); // new return self; @@ -399,6 +493,10 @@ namespace test_rb_define_method { rb_define_method(self, "mv", rb_f_notimplement, -1); rb_define_method(self, "mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -465,6 +563,10 @@ namespace test_rb_define_method_id { rb_define_method_id(self, rb_intern("mv"), rb_f_notimplement, -1); rb_define_method_id(self, rb_intern("mc"), rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -531,6 +633,10 @@ namespace test_rb_define_module_function { rb_define_module_function(self, "mv", rb_f_notimplement, -1); rb_define_module_function(self, "mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -597,6 +703,10 @@ namespace test_rb_define_singleton_method { rb_define_singleton_method(self, "mv", rb_f_notimplement, -1); rb_define_singleton_method(self, "mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -663,6 +773,10 @@ namespace test_rb_define_protected_method { rb_define_protected_method(self, "mv", rb_f_notimplement, -1); rb_define_protected_method(self, "mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -729,6 +843,10 @@ namespace test_rb_define_private_method { rb_define_private_method(self, "mv", rb_f_notimplement, -1); rb_define_private_method(self, "mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } @@ -795,6 +913,10 @@ namespace test_rb_define_global_function { rb_define_global_function("mv", rb_f_notimplement, -1); rb_define_global_function("mc", rb_f_notimplement, -1); +#ifdef HAVE_NULLPTR + // It doesn't make any sense at all to pass nullptr as a method. +#endif + return self; } } diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 431d719dde5987..132956ec3d187b 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -13,6 +13,10 @@ extern "C++" { +#ifdef HAVE_NULLPTR +#include +#endif + /// @brief The main namespace. /// @note The name "ruby" might already be taken, but that must not be a /// problem because namespaces are allowed to reopen. @@ -46,6 +50,9 @@ typedef void void_type(ANYARGS); /// @brief ANYARGS-ed function type, int variant. typedef int int_type(ANYARGS); +/// @brief single-argumented function type. +typedef VALUE onearg_type(VALUE); + /// @name Hooking global variables /// @{ @@ -95,6 +102,58 @@ rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e) ::rb_define_virtual_variable(q, r, e); } +#ifdef HAVE_NULLPTR +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Getter function. +/// @param[in] e Setter function. +/// @see rb_define_hooked_variable() +inline void +rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, std::nullptr_t e) +{ + ::rb_define_virtual_variable(q, w, e); +} + +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Getter function. +/// @param[in] e Setter function. +/// @see rb_define_hooked_variable() +/// @deprecated Use glanular typed overload instead. +inline void +rb_define_virtual_variable(const char *q, type *w, std::nullptr_t e) +{ + rb_gvar_getter_t *r = reinterpret_cast(w); + ::rb_define_virtual_variable(q, r, e); +} + +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Getter function. +/// @param[in] e Setter function. +/// @see rb_define_hooked_variable() +inline void +rb_define_virtual_variable(const char *q, std::nullptr_t w, rb_gvar_setter_t *e) +{ + ::rb_define_virtual_variable(q, w, e); +} + +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Getter function. +/// @param[in] e Setter function. +/// @see rb_define_hooked_variable() +/// @deprecated Use glanular typed overload instead. +inline void +rb_define_virtual_variable(const char *q, std::nullptr_t w, void_type *e) +{ + rb_gvar_setter_t *r = reinterpret_cast(e); + ::rb_define_virtual_variable(q, w, r); +} +#endif + RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. @@ -144,6 +203,62 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r) ::rb_define_hooked_variable(q, w, t, r); } +#ifdef HAVE_NULLPTR +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Variable storage. +/// @param[in] e Getter function. +/// @param[in] r Setter function. +/// @see rb_define_virtual_variable() +inline void +rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, std::nullptr_t r) +{ + ::rb_define_hooked_variable(q, w, e, r); +} + +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Variable storage. +/// @param[in] e Getter function. +/// @param[in] r Setter function. +/// @see rb_define_virtual_variable() +/// @deprecated Use glanular typed overload instead. +inline void +rb_define_hooked_variable(const char *q, VALUE *w, type *e, std::nullptr_t r) +{ + rb_gvar_getter_t *y = reinterpret_cast(e); + ::rb_define_hooked_variable(q, w, y, r); +} + +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Variable storage. +/// @param[in] e Getter function. +/// @param[in] r Setter function. +/// @see rb_define_virtual_variable() +inline void +rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, rb_gvar_setter_t *r) +{ + ::rb_define_hooked_variable(q, w, e, r); +} + +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") +/// @brief Define a function-backended global variable. +/// @param[in] q Name of the variable. +/// @param[in] w Variable storage. +/// @param[in] e Getter function. +/// @param[in] r Setter function. +/// @see rb_define_virtual_variable() +/// @deprecated Use glanular typed overload instead. +inline void +rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, void_type *r) +{ + rb_gvar_setter_t *y = reinterpret_cast(r); + ::rb_define_hooked_variable(q, w, e, y); +} +#endif + /// @} /// @name Exceptions and tag jumps /// @{ @@ -159,12 +274,28 @@ RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @deprecated This function is obsolated since long before 2.x era. Do not /// use it any longer. rb_block_call() is provided instead. inline VALUE -rb_iterate(VALUE(*q)(VALUE), VALUE w, type *e, VALUE r) +rb_iterate(onearg_type *q, VALUE w, type *e, VALUE r) { rb_block_call_func_t t = reinterpret_cast(e); return ::rb_iterate(q, w, t, r); } +#ifdef HAVE_NULLPTR +/// @brief Old way to implement iterators. +/// @param[in] q A function that can yield. +/// @param[in] w Passed to `q`. +/// @param[in] e What is to be yielded. +/// @param[in] r Passed to `e`. +/// @return The return value of `q`. +/// @deprecated This function is obsolated since long before 2.x era. Do not +/// use it any longer. rb_block_call() is provided instead. +inline VALUE +rb_iterate(onearg_type *q, VALUE w, std::nullptr_t e, VALUE r) +{ + return ::rb_iterate(q, w, e, r); +} +#endif + RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Call a method with a block. /// @param[in] q The self. @@ -183,6 +314,22 @@ rb_block_call(VALUE q, ID w, int e, const VALUE *r, type *t, VALUE y) return ::rb_block_call(q, w, e, r, u, y); } +#ifdef HAVE_NULLPTR +/// @brief Call a method with a block. +/// @param[in] q The self. +/// @param[in] w The method. +/// @param[in] e The # of elems of `r` +/// @param[in] r The arguments. +/// @param[in] t What is to be yielded. +/// @param[in] y Passed to `t` +/// @return Return value of `q#w(*r,&t)` +inline VALUE +rb_block_call(VALUE q, ID w, int e, const VALUE *r, std::nullptr_t t, VALUE y) +{ + return ::rb_block_call(q, w, e, r, t, y); +} +#endif + RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `rescue` clause. /// @param[in] q A function that can raise. @@ -274,6 +421,23 @@ rb_catch(const char *q, type *w, VALUE e) return ::rb_catch(q, r, e); } +#ifdef HAVE_NULLPTR +/// @brief An equivalent of `Kernel#catch`. +/// @param[in] q The "tag" string. +/// @param[in] w A function that can throw. +/// @param[in] e Passed to `w`. +/// @return What was thrown. +/// @see rb_block_call() +/// @see rb_protect() +/// @see rb_rb_catch_obj() +/// @see rb_rescue() +inline VALUE +rb_catch(const char *q, std::nullptr_t w, VALUE e) +{ + return ::rb_catch(q, w, e); +} +#endif + RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `Kernel#catch`. /// @param[in] q The "tag" object. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 326bd7fa7a2917..ea5789fd3e9d4d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -851,6 +851,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_QSORT_S !endif #define HAVE_TYPE_NET_LUID 1 +!if $(MSC_VER) >= 1600 +#define HAVE_NULLPTR 1 +!endif #define SETPGRP_VOID 1 #define RSHIFT(x,y) ((x)>>(int)y) #define HAVE_RB_FD_INIT 1 From f31dc8a45877f6db810fa5177270789baefeee0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 13:10:55 +0900 Subject: [PATCH 580/878] a bit terse Doxygen comments [ci skip] Creative use of `@copydoc` Doxygen command and abusing its half-broken C parser let us delete some lines of documentations, while preserving document coverages. --- include/ruby/backward/cxxanyargs.hpp | 202 +++++---------------------- 1 file changed, 35 insertions(+), 167 deletions(-) diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 132956ec3d187b..7eaaa632a41764 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -22,36 +22,27 @@ extern "C++" { /// problem because namespaces are allowed to reopen. namespace ruby { -/// @brief Backwards compatibility layer. +/// Backwards compatibility layer. namespace backward { -/// @brief Provides ANYARGS deprecation warnings. -/// -/// In C, ANYARGS means there is no function prototype. Literally anything, -/// even including nothing, can be a valid ANYARGS. So passing a correctly -/// prototyped function pointer to an ANYARGS-ed function parameter is valid, -/// at the same time passing an ANYARGS-ed function pointer to a granular typed -/// function parameter is also valid. However on the other hand in C++, -/// ANYARGS doesn't actually mean any number of arguments. C++'s ANYARGS means -/// _variadic_ number of arguments. This is incompatible with ordinal, correct -/// function prototypes. +/// Provides ANYARGS deprecation warnings. In C, ANYARGS means there is no +/// function prototype. Literally anything, even including nothing, can be a +/// valid ANYARGS. So passing a correctly prototyped function pointer to an +/// ANYARGS-ed function parameter is valid, at the same time passing an +/// ANYARGS-ed function pointer to a granular typed function parameter is also +/// valid. However on the other hand in C++, ANYARGS doesn't actually mean any +/// number of arguments. C++'s ANYARGS means _variadic_ number of arguments. +/// This is incompatible with ordinal, correct function prototypes. /// /// Luckily, function prototypes being distinct each other means they can be /// overloaded. We can provide a compatibility layer for older Ruby APIs which /// used to have ANYARGS. This namespace includes such attempts. namespace cxxanyargs { -/// @brief ANYARGS-ed function type. -typedef VALUE type(ANYARGS); - -/// @brief ANYARGS-ed function type, void variant. -typedef void void_type(ANYARGS); - -/// @brief ANYARGS-ed function type, int variant. -typedef int int_type(ANYARGS); - -/// @brief single-argumented function type. -typedef VALUE onearg_type(VALUE); +typedef VALUE type(ANYARGS); ///< ANYARGS-ed function type. +typedef void void_type(ANYARGS); ///< ANYARGS-ed function type, void variant. +typedef int int_type(ANYARGS); ///< ANYARGS-ed function type, int variant. +typedef VALUE onearg_type(VALUE); ///< Single-argumented function type. /// @name Hooking global variables /// @{ @@ -73,13 +64,6 @@ rb_define_virtual_variable(const char *q, type *w, void_type *e) } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @note Both functions can be nullptr. -/// @see rb_define_hooked_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, void_type *e) { @@ -88,13 +72,6 @@ rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, void_type *e) } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @note Both functions can be nullptr. -/// @see rb_define_hooked_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e) { @@ -103,11 +80,6 @@ rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e) } #ifdef HAVE_NULLPTR -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @see rb_define_hooked_variable() inline void rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, std::nullptr_t e) { @@ -115,12 +87,6 @@ rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, std::nullptr_t e) } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @see rb_define_hooked_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_virtual_variable(const char *q, type *w, std::nullptr_t e) { @@ -128,11 +94,6 @@ rb_define_virtual_variable(const char *q, type *w, std::nullptr_t e) ::rb_define_virtual_variable(q, r, e); } -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @see rb_define_hooked_variable() inline void rb_define_virtual_variable(const char *q, std::nullptr_t w, rb_gvar_setter_t *e) { @@ -140,12 +101,6 @@ rb_define_virtual_variable(const char *q, std::nullptr_t w, rb_gvar_setter_t *e) } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Getter function. -/// @param[in] e Setter function. -/// @see rb_define_hooked_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_virtual_variable(const char *q, std::nullptr_t w, void_type *e) { @@ -172,14 +127,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, void_type *r) } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @note Both functions can be nullptr. -/// @see rb_define_virtual_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, void_type *r) { @@ -188,14 +135,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, void_typ } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @note Both functions can be nullptr. -/// @see rb_define_virtual_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r) { @@ -204,12 +143,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r) } #ifdef HAVE_NULLPTR -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @see rb_define_virtual_variable() inline void rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, std::nullptr_t r) { @@ -217,13 +150,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, std::nul } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @see rb_define_virtual_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_hooked_variable(const char *q, VALUE *w, type *e, std::nullptr_t r) { @@ -231,12 +157,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, std::nullptr_t r) ::rb_define_hooked_variable(q, w, y, r); } -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @see rb_define_virtual_variable() inline void rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, rb_gvar_setter_t *r) { @@ -244,13 +164,6 @@ rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, rb_gvar_set } RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") -/// @brief Define a function-backended global variable. -/// @param[in] q Name of the variable. -/// @param[in] w Variable storage. -/// @param[in] e Getter function. -/// @param[in] r Setter function. -/// @see rb_define_virtual_variable() -/// @deprecated Use glanular typed overload instead. inline void rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, void_type *r) { @@ -281,14 +194,6 @@ rb_iterate(onearg_type *q, VALUE w, type *e, VALUE r) } #ifdef HAVE_NULLPTR -/// @brief Old way to implement iterators. -/// @param[in] q A function that can yield. -/// @param[in] w Passed to `q`. -/// @param[in] e What is to be yielded. -/// @param[in] r Passed to `e`. -/// @return The return value of `q`. -/// @deprecated This function is obsolated since long before 2.x era. Do not -/// use it any longer. rb_block_call() is provided instead. inline VALUE rb_iterate(onearg_type *q, VALUE w, std::nullptr_t e, VALUE r) { @@ -315,14 +220,6 @@ rb_block_call(VALUE q, ID w, int e, const VALUE *r, type *t, VALUE y) } #ifdef HAVE_NULLPTR -/// @brief Call a method with a block. -/// @param[in] q The self. -/// @param[in] w The method. -/// @param[in] e The # of elems of `r` -/// @param[in] r The arguments. -/// @param[in] t What is to be yielded. -/// @param[in] y Passed to `t` -/// @return Return value of `q#w(*r,&t)` inline VALUE rb_block_call(VALUE q, ID w, int e, const VALUE *r, std::nullptr_t t, VALUE y) { @@ -422,15 +319,6 @@ rb_catch(const char *q, type *w, VALUE e) } #ifdef HAVE_NULLPTR -/// @brief An equivalent of `Kernel#catch`. -/// @param[in] q The "tag" string. -/// @param[in] w A function that can throw. -/// @param[in] e Passed to `w`. -/// @return What was thrown. -/// @see rb_block_call() -/// @see rb_protect() -/// @see rb_rb_catch_obj() -/// @see rb_rescue() inline VALUE rb_catch(const char *q, std::nullptr_t w, VALUE e) { @@ -600,17 +488,16 @@ rb_ivar_foreach(VALUE q, int_type *w, VALUE e) /// @} -/// @brief Driver for *_define_method -/// -/// ::rb_define_method function for instance takes a pointer to ANYARGS-ed -/// functions, which in fact varies 18 different prototypes. We still need to -/// preserve ANYARGS for storages but why not check the consistencies if -/// possible. In C++ a function has its own prototype, which is a compile-time -/// constant (static type) by nature. We can list up all the possible input -/// types and provide warnings for other cases. This is such attempt. +/// Driver for *_define_method. ::rb_define_method function for instance takes +/// a pointer to ANYARGS-ed functions, which in fact varies 18 different +/// prototypes. We still need to preserve ANYARGS for storages but why not +/// check the consistencies if possible. In C++ a function has its own +/// prototype, which is a compile-time constant (static type) by nature. We +/// can list up all the possible input types and provide warnings for other +/// cases. This is such attempt. namespace define_method { -/// @brief type of rb_f_notimplement +/// Type of ::rb_f_notimplement(). typedef VALUE notimpl_type(int, const VALUE *, VALUE, VALUE); /// @brief Template metaprogramming to generate function prototypes. @@ -637,10 +524,7 @@ struct driver { #if (RUBY_API_VERSION_MAJOR * 100 + RUBY_API_VERSION_MINOR) >= 301 RUBY_CXX_DEPRECATED("use of ANYARGS is deprecated") #endif - /// @brief Defines klass#mid as func, whose arity is N. - /// @param[in] klass Where the method lives. - /// @param[in] mid Name of the method to define. - /// @param[in] func Function that implements klass#mid. + /// @copydoc define(VALUE klass, T mid, U func) /// @deprecated Pass corrctly typed function instead. static inline void define(VALUE klass, T mid, type func) @@ -658,10 +542,7 @@ struct driver { F(klass, mid, reinterpret_cast(func), N); } - /// @brief Defines klass#mid as func, whose arity is N. - /// @param[in] klass Where the method lives. - /// @param[in] mid Name of the method to define. - /// @param[in] func Function that implements klass#mid. + /// @copydoc define(VALUE klass, T mid, U func) static inline void define(VALUE klass, T mid, notimpl_type func) { @@ -744,49 +625,36 @@ struct driver0 { /// @endcond }; -/// @brief Dispatches appropriate driver for ::rb_define_method -struct rb_define_method : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_method_id -struct rb_define_method_id : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_private_method -struct rb_define_private_method : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_protected_method -struct rb_define_protected_method : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_singleton_method -struct rb_define_singleton_method : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_module_function -struct rb_define_module_function : public driver {}; - -/// @brief Dispatches appropriate driver for ::rb_define_global_function -struct rb_define_global_function : public driver0 {}; +struct rb_define_method : public driver {}; ///< Dispatches appropriate driver for ::rb_define_method. +struct rb_define_method_id : public driver {}; ///< Dispatches appropriate driver for ::rb_define_method_id. +struct rb_define_private_method : public driver {}; ///< Dispatches appropriate driver for ::rb_define_private_method. +struct rb_define_protected_method : public driver {}; ///< Dispatches appropriate driver for ::rb_define_protected_method. +struct rb_define_singleton_method : public driver {}; ///< Dispatches appropriate driver for ::rb_define_singleton_method. +struct rb_define_module_function : public driver {}; ///< Dispatches appropriate driver for ::rb_define_module_function. +struct rb_define_global_function : public driver0 {}; ///< Dispatches appropriate driver for ::rb_define_global_function. /// @brief Defines klass\#mid. /// @param klass Where the method lives. -/// @copydetails #rb_define_global_function +/// @copydetails #rb_define_global_function(mid, func, arity) #define rb_define_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_method::specific::define(klass, mid, func) -/// @copydoc #rb_define_method +/// @copydoc #rb_define_method(klass, mid, func, arity) #define rb_define_method_id(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_method_id::specific::define(klass, mid, func) /// @brief Defines klass\#mid and makes it private. -/// @copydetails #rb_define_method +/// @copydetails #rb_define_method(klass, mid, func, arity) #define rb_define_private_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_private_method::specific::define(klass, mid, func) /// @brief Defines klass\#mid and makes it protected. /// @copydetails #rb_define_method #define rb_define_protected_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_protected_method::specific::define(klass, mid, func) -/// @brief Defines klass.mid. +/// @brief Defines klass.mid.(klass, mid, func, arity) /// @copydetails #rb_define_method #define rb_define_singleton_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_singleton_method::specific::define(klass, mid, func) /// @brief Defines klass\#mid and makes it a module function. -/// @copydetails #rb_define_method +/// @copydetails #rb_define_method(klass, mid, func, arity) #define rb_define_module_function(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_module_function::specific::define(klass, mid, func) /// @brief Defines ::rb_mKernel \#mid. From 0dd6f020fcffd26cb89ee9eda59b15483e160f45 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 31 Jan 2020 14:24:07 +0900 Subject: [PATCH 581/878] Make `empty_string` a fake string --- string.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/string.c b/string.c index 4ae804b83c32be..9088cec03dec03 100644 --- a/string.c +++ b/string.c @@ -215,7 +215,13 @@ str_make_independent(VALUE str) /* symbols for [up|down|swap]case/capitalize options */ static VALUE sym_ascii, sym_turkic, sym_lithuanian, sym_fold; -static VALUE empty_string; +static const struct RString empty_fake_string = { + { + T_STRING | STR_FAKESTR | + ENC_CODERANGE_7BIT | (ENCINDEX_US_ASCII << ENCODING_SHIFT) + } +}; +#define empty_string ((VALUE)&empty_fake_string) static rb_encoding * get_actual_encoding(const int encidx, VALUE str) @@ -4885,16 +4891,13 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str) { VALUE result; VALUE buf[3]; - int i; rb_check_arity(argc, 1, 2); - for (i=0; i Date: Fri, 31 Jan 2020 16:53:04 +0900 Subject: [PATCH 582/878] Improve `String#slice!` performance Instead of searching twice to extract and to delete, extract and delete the found position at the first search. This makes faster nearly twice, for regexps and strings. | |compare-ruby|built-ruby| |:-------------|-----------:|---------:| |regexp-short | 2.143M| 3.918M| |regexp-long | 105.162k| 205.410k| |string-short | 3.789M| 7.964M| |string-long | 1.301M| 2.457M| --- benchmark/string_slice.yml | 11 +++++ string.c | 84 +++++++++++++++++++++++++++++++------- 2 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 benchmark/string_slice.yml diff --git a/benchmark/string_slice.yml b/benchmark/string_slice.yml new file mode 100644 index 00000000000000..fc2393c5d17aa6 --- /dev/null +++ b/benchmark/string_slice.yml @@ -0,0 +1,11 @@ +prelude: | + long_string = "x"*1000+"-hår" +benchmark: + regexp-short: | + "x-hår".slice!(/-(.)(.)(.)/, 3) + regexp-long: | + long_string.dup.slice!(/-(.)(.)(.)/, 3) + string-short: | + "x-hår".slice!("r") + string-long: | + long_string.dup.slice!("r") diff --git a/string.c b/string.c index 9088cec03dec03..12f5d014f44ff0 100644 --- a/string.c +++ b/string.c @@ -215,14 +215,6 @@ str_make_independent(VALUE str) /* symbols for [up|down|swap]case/capitalize options */ static VALUE sym_ascii, sym_turkic, sym_lithuanian, sym_fold; -static const struct RString empty_fake_string = { - { - T_STRING | STR_FAKESTR | - ENC_CODERANGE_7BIT | (ENCINDEX_US_ASCII << ENCODING_SHIFT) - } -}; -#define empty_string ((VALUE)&empty_fake_string) - static rb_encoding * get_actual_encoding(const int encidx, VALUE str) { @@ -4889,16 +4881,78 @@ rb_str_insert(VALUE str, VALUE idx, VALUE str2) static VALUE rb_str_slice_bang(int argc, VALUE *argv, VALUE str) { - VALUE result; - VALUE buf[3]; + VALUE result = Qnil; + VALUE indx; + long beg, len = 1; + char *p; rb_check_arity(argc, 1, 2); - MEMCPY(buf, argv, VALUE, argc); str_modify_keep_cr(str); - result = rb_str_aref_m(argc, buf, str); - if (!NIL_P(result)) { - buf[argc] = empty_string; - rb_str_aset_m(argc+1, buf, str); + indx = argv[0]; + if (RB_TYPE_P(indx, T_REGEXP)) { + if (rb_reg_search(indx, str, 0, 0) < 0) return Qnil; + VALUE match = rb_backref_get(); + struct re_registers *regs = RMATCH_REGS(match); + int nth = 0; + if (argc > 1 && (nth = rb_reg_backref_number(match, argv[1])) < 0) { + if ((nth += regs->num_regs) <= 0) return Qnil; + } + else if (nth >= regs->num_regs) return Qnil; + beg = BEG(nth); + len = END(nth) - beg; + subseq: + result = rb_str_new_with_class(str, RSTRING_PTR(str)+beg, len); + rb_enc_cr_str_copy_for_substr(result, str); + } + else if (argc == 2) { + beg = NUM2LONG(indx); + len = NUM2LONG(argv[1]); + num_index: + if (!(p = rb_str_subpos(str, beg, &len))) return Qnil; + beg = p - RSTRING_PTR(str); + goto subseq; + } + else if (FIXNUM_P(indx)) { + beg = FIX2LONG(indx); + if (!(p = rb_str_subpos(str, beg, &len))) return Qnil; + if (!len) return Qnil; + beg = p - RSTRING_PTR(str); + goto subseq; + } + else if (RB_TYPE_P(indx, T_STRING)) { + beg = rb_str_index(str, indx, 0); + if (beg == -1) return Qnil; + len = RSTRING_LEN(indx); + result = rb_str_dup(indx); + } + else { + switch (rb_range_beg_len(indx, &beg, &len, str_strlen(str, NULL), 0)) { + case Qnil: + return Qnil; + case Qfalse: + beg = NUM2LONG(indx); + goto num_index; + default: + goto num_index; + } + } + + if (len > 0) { + if (beg == 0) { + rb_str_drop_bytes(str, len); + } + else { + char *sptr = RSTRING_PTR(str); + long slen = RSTRING_LEN(str); + if (beg + len > slen) /* pathological check */ + len = slen - beg; + memmove(sptr + beg, + sptr + beg + len, + slen - (beg + len)); + slen -= len; + STR_SET_LEN(str, slen); + TERM_FILL(&sptr[slen], TERM_LEN(str)); + } } return result; } From fac4385f01bdd389f336b8c34cb72cd031658bd3 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 1 Feb 2020 00:04:45 +0900 Subject: [PATCH 583/878] compile.c: remove a unused variable --- compile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compile.c b/compile.c index 39c6bc1aaf1cce..eb36f57e0ffacc 100644 --- a/compile.c +++ b/compile.c @@ -5912,9 +5912,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } case NODE_HASH: { NODE *n; - LABEL *match_failed, *fin; + LABEL *match_failed; match_failed = NEW_LABEL(line); - fin = NEW_LABEL(line); n = node->nd_head; if (! (nd_type(n) == NODE_LIST && n->nd_alen == 2)) { From 4d43cc1a5308f3b72b61d0c909fe268fe354acfa Mon Sep 17 00:00:00 2001 From: git Date: Sat, 1 Feb 2020 00:05:24 +0900 Subject: [PATCH 584/878] * 2020-02-01 [ci skip] --- version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.h b/version.h index 6c30aa2a0e0a10..48f3d8f0934045 100644 --- a/version.h +++ b/version.h @@ -5,8 +5,8 @@ #define RUBY_PATCHLEVEL -1 #define RUBY_RELEASE_YEAR 2020 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" From adc303131187654d8ce83f3db17eefa3d5bae26c Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sat, 1 Feb 2020 00:36:58 +0900 Subject: [PATCH 585/878] README*.md: `defines.h` moved [ci skip] at 2b592580bf65040373b55ff2ccc3b59a0a231a18 --- README.ja.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.ja.md b/README.ja.md index b0ca1b3b671ffd..bee6433c6238b7 100644 --- a/README.ja.md +++ b/README.ja.md @@ -102,7 +102,7 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス 環境によってはデフォルトのCコンパイラ用オプションが付きます． `configure` オプションで `optflags=..` `warnflags=..` 等で上書きできます． -3. (必要ならば)`defines.h` を編集する +3. (必要ならば)`include/ruby/defines.h` を編集する 多分，必要無いと思います． diff --git a/README.md b/README.md index 140f40b20b51b9..378f48f8d76edb 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ in the mail body (not subject) to the address environment. Specify `optflags=..` and `warnflags=..` as necessary to override them. -4. Edit `defines.h` if you need. Usually this step will not be needed. +4. Edit `include/ruby/defines.h` if you need. Usually this step will not be needed. 5. Remove comment mark(`#`) before the module names from `ext/Setup` (or add module names if not present), if you want to link modules statically. From 600a715c9bde99fe2e9a669465d78833445273e8 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 1 Feb 2020 11:14:04 +0900 Subject: [PATCH 586/878] Merge the current master branch of rubygems/rubygems. Just started to develop RubyGems 3.2.0. --- lib/rubygems.rb | 156 ++-- lib/rubygems/basic_specification.rb | 8 +- lib/rubygems/command.rb | 6 +- lib/rubygems/command_manager.rb | 1 + lib/rubygems/commands/help_command.rb | 2 +- lib/rubygems/commands/info_command.rb | 13 +- lib/rubygems/commands/install_command.rb | 6 +- lib/rubygems/commands/list_command.rb | 15 +- lib/rubygems/commands/pristine_command.rb | 12 +- lib/rubygems/commands/search_command.rb | 14 +- lib/rubygems/commands/setup_command.rb | 19 +- lib/rubygems/commands/sources_command.rb | 6 +- lib/rubygems/commands/update_command.rb | 37 +- lib/rubygems/deprecate.rb | 18 +- lib/rubygems/doctor.rb | 2 + lib/rubygems/exceptions.rb | 13 +- lib/rubygems/gem_runner.rb | 10 +- lib/rubygems/installer.rb | 38 +- lib/rubygems/installer_test_case.rb | 4 +- lib/rubygems/installer_uninstaller_utils.rb | 24 + lib/rubygems/package.rb | 3 +- lib/rubygems/query_utils.rb | 362 ++++++++ lib/rubygems/remote_fetcher.rb | 14 - .../request_set/gem_dependency_api.rb | 2 +- lib/rubygems/resolver/api_set.rb | 2 +- lib/rubygems/resolver/api_specification.rb | 2 +- lib/rubygems/security.rb | 8 +- lib/rubygems/security/signer.rb | 2 +- lib/rubygems/server.rb | 2 +- lib/rubygems/specification.rb | 33 +- lib/rubygems/specification_policy.rb | 3 +- lib/rubygems/test_case.rb | 58 +- lib/rubygems/uninstaller.rb | 36 +- lib/rubygems/user_interaction.rb | 8 - lib/rubygems/version.rb | 2 +- test/rubygems/test_deprecate.rb | 18 + test/rubygems/test_gem.rb | 79 +- test/rubygems/test_gem_command_manager.rb | 41 +- .../test_gem_commands_build_command.rb | 2 +- .../test_gem_commands_pristine_command.rb | 37 +- .../test_gem_commands_query_command.rb | 857 ------------------ .../test_gem_commands_setup_command.rb | 37 + .../test_gem_commands_sources_command.rb | 40 +- .../test_gem_commands_update_command.rb | 54 +- test/rubygems/test_gem_config_file.rb | 7 - .../rubygems/test_gem_dependency_installer.rb | 2 +- test/rubygems/test_gem_doctor.rb | 28 + test/rubygems/test_gem_gem_runner.rb | 30 + test/rubygems/test_gem_installer.rb | 74 +- test/rubygems/test_gem_remote_fetcher.rb | 25 +- test/rubygems/test_gem_request_set.rb | 52 ++ test/rubygems/test_gem_specification.rb | 13 +- test/rubygems/test_gem_uninstaller.rb | 104 +++ test/rubygems/test_gem_version.rb | 2 +- 54 files changed, 1236 insertions(+), 1207 deletions(-) create mode 100644 lib/rubygems/installer_uninstaller_utils.rb create mode 100644 lib/rubygems/query_utils.rb delete mode 100644 test/rubygems/test_gem_commands_query_command.rb diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 57cb70cc2b8030..f7380c7154be91 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ require 'rbconfig' module Gem - VERSION = "3.1.2".freeze + VERSION = "3.2.0.pre1".freeze end # Must be first since it unloads the prelude from 1.9.2 @@ -26,27 +26,27 @@ module Gem # For user documentation, see: # # * gem help and gem help [command] -# * {RubyGems User Guide}[http://guides.rubygems.org/] -# * {Frequently Asked Questions}[http://guides.rubygems.org/faqs] +# * {RubyGems User Guide}[https://guides.rubygems.org/] +# * {Frequently Asked Questions}[https://guides.rubygems.org/faqs] # # For gem developer documentation see: # -# * {Creating Gems}[http://guides.rubygems.org/make-your-own-gem] +# * {Creating Gems}[https://guides.rubygems.org/make-your-own-gem] # * Gem::Specification # * Gem::Version for version dependency notes # # Further RubyGems documentation can be found at: # -# * {RubyGems Guides}[http://guides.rubygems.org] -# * {RubyGems API}[http://www.rubydoc.info/github/rubygems/rubygems] (also available from +# * {RubyGems Guides}[https://guides.rubygems.org] +# * {RubyGems API}[https://www.rubydoc.info/github/rubygems/rubygems] (also available from # gem server) # # == RubyGems Plugins # -# As of RubyGems 1.3.2, RubyGems will load plugins installed in gems or +# RubyGems will load plugins in the latest version of each installed gem or # $LOAD_PATH. Plugins must be named 'rubygems_plugin' (.rb, .so, etc) and -# placed at the root of your gem's #require_path. Plugins are discovered via -# Gem::find_files and then loaded. +# placed at the root of your gem's #require_path. Plugins are installed at a +# special location and loaded on boot. # # For an example plugin, see the {Graph gem}[https://github.com/seattlerb/graph] # which adds a `gem graph` command. @@ -148,6 +148,7 @@ module Gem doc extensions gems + plugins specifications ].freeze @@ -409,8 +410,6 @@ def self.paths=(env) ## # The path where gems are to be installed. - #-- - # FIXME deprecate these once everything else has been done -ebh def self.dir paths.home @@ -424,6 +423,10 @@ def self.spec_cache_dir paths.spec_cache_dir end + def self.plugins_dir + File.join(dir, "plugins") + end + ## # Quietly ensure the Gem directory +dir+ contains all the proper # subdirectories. If we can't create a directory due to a permission @@ -573,50 +576,6 @@ def self.find_home private_class_method :find_home - # TODO: remove in RubyGems 4.0 - - ## - # Zlib::GzipReader wrapper that unzips +data+. - - def self.gunzip(data) - Gem::Util.gunzip data - end - - class << self - - extend Gem::Deprecate - deprecate :gunzip, "Gem::Util.gunzip", 2018, 12 - - end - - ## - # Zlib::GzipWriter wrapper that zips +data+. - - def self.gzip(data) - Gem::Util.gzip data - end - - class << self - - extend Gem::Deprecate - deprecate :gzip, "Gem::Util.gzip", 2018, 12 - - end - - ## - # A Zlib::Inflate#inflate wrapper - - def self.inflate(data) - Gem::Util.inflate data - end - - class << self - - extend Gem::Deprecate - deprecate :inflate, "Gem::Util.inflate", 2018, 12 - - end - ## # Top level install helper method. Allows you to install gems interactively: # @@ -1018,10 +977,27 @@ def self.suffix_pattern @suffix_pattern ||= "{#{suffixes.join(',')}}" end + ## + # Regexp for require-able path suffixes. + def self.suffix_regexp @suffix_regexp ||= /#{Regexp.union(suffixes)}\z/ end + ## + # Glob pattern for require-able plugin suffixes. + + def self.plugin_suffix_pattern + @plugin_suffix_pattern ||= "_plugin#{suffix_pattern}" + end + + ## + # Regexp for require-able plugin suffixes. + + def self.plugin_suffix_regexp + @plugin_suffix_regexp ||= /_plugin#{suffix_regexp}\z/ + end + ## # Suffixes for require-able paths. @@ -1120,35 +1096,17 @@ def self.load_plugin_files(plugins) # :nodoc: end ## - # Find the 'rubygems_plugin' files in the latest installed gems and load - # them + # Find rubygems plugin files in the standard location and load them def self.load_plugins - # Remove this env var by at least 3.0 - if ENV['RUBYGEMS_LOAD_ALL_PLUGINS'] - load_plugin_files find_files('rubygems_plugin', false) - else - load_plugin_files find_latest_files('rubygems_plugin', false) - end + load_plugin_files Gem::Util.glob_files_in_dir("*#{Gem.plugin_suffix_pattern}", plugins_dir) end ## # Find all 'rubygems_plugin' files in $LOAD_PATH and load them def self.load_env_plugins - path = "rubygems_plugin" - - files = [] - glob = "#{path}#{Gem.suffix_pattern}" - $LOAD_PATH.each do |load_path| - globbed = Gem::Util.glob_files_in_dir(glob, load_path) - - globbed.each do |load_path_file| - files << load_path_file if File.file?(load_path_file.tap(&Gem::UNTAINT)) - end - end - - load_plugin_files files + load_plugin_files find_files_from_load_path("rubygems_plugin") end ## @@ -1223,18 +1181,6 @@ def self.use_gemdeps(path = nil) end end - class << self - - ## - # TODO remove with RubyGems 4.0 - - alias detect_gemdeps use_gemdeps # :nodoc: - - extend Gem::Deprecate - deprecate :detect_gemdeps, "Gem.use_gemdeps", 2018, 12 - - end - ## # The SOURCE_DATE_EPOCH environment variable (or, if that's not set, the current time), converted to Time object. # This is used throughout RubyGems for enabling reproducible builds. @@ -1366,23 +1312,23 @@ def clear_default_specs MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/".freeze - autoload :BundlerVersionFinder, 'rubygems/bundler_version_finder' - autoload :ConfigFile, 'rubygems/config_file' - autoload :Dependency, 'rubygems/dependency' - autoload :DependencyList, 'rubygems/dependency_list' - autoload :Installer, 'rubygems/installer' - autoload :Licenses, 'rubygems/util/licenses' - autoload :PathSupport, 'rubygems/path_support' - autoload :Platform, 'rubygems/platform' - autoload :RequestSet, 'rubygems/request_set' - autoload :Requirement, 'rubygems/requirement' - autoload :Resolver, 'rubygems/resolver' - autoload :Source, 'rubygems/source' - autoload :SourceList, 'rubygems/source_list' - autoload :SpecFetcher, 'rubygems/spec_fetcher' - autoload :Specification, 'rubygems/specification' - autoload :Util, 'rubygems/util' - autoload :Version, 'rubygems/version' + autoload :BundlerVersionFinder, File.expand_path('rubygems/bundler_version_finder', __dir__) + autoload :ConfigFile, File.expand_path('rubygems/config_file', __dir__) + autoload :Dependency, File.expand_path('rubygems/dependency', __dir__) + autoload :DependencyList, File.expand_path('rubygems/dependency_list', __dir__) + autoload :Installer, File.expand_path('rubygems/installer', __dir__) + autoload :Licenses, File.expand_path('rubygems/util/licenses', __dir__) + autoload :PathSupport, File.expand_path('rubygems/path_support', __dir__) + autoload :Platform, File.expand_path('rubygems/platform', __dir__) + autoload :RequestSet, File.expand_path('rubygems/request_set', __dir__) + autoload :Requirement, File.expand_path('rubygems/requirement', __dir__) + autoload :Resolver, File.expand_path('rubygems/resolver', __dir__) + autoload :Source, File.expand_path('rubygems/source', __dir__) + autoload :SourceList, File.expand_path('rubygems/source_list', __dir__) + autoload :SpecFetcher, File.expand_path('rubygems/spec_fetcher', __dir__) + autoload :Specification, File.expand_path('rubygems/specification', __dir__) + autoload :Util, File.expand_path('rubygems/util', __dir__) + autoload :Version, File.expand_path('rubygems/version', __dir__) require "rubygems/specification" end diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index c6d63ac473a878..a4bd11cae30d46 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -274,12 +274,18 @@ def source_paths # Return all files in this gem that match for +glob+. def matches_for_glob(glob) # TODO: rename? - # TODO: do we need these?? Kill it glob = File.join(self.lib_dirs_glob, glob) Dir[glob].map { |f| f.tap(&Gem::UNTAINT) } # FIX our tests are broken, run w/ SAFE=1 end + ## + # Returns the list of plugins in this spec. + + def plugins + matches_for_glob("rubygems#{Gem.plugin_suffix_pattern}") + end + ## # Returns a string usable in Dir.glob to match all requirable paths # for this spec. diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb index c1e5e13c5a0a0c..d9a0700b95884e 100644 --- a/lib/rubygems/command.rb +++ b/lib/rubygems/command.rb @@ -466,6 +466,10 @@ def add_extra_args(args) result end + def deprecated? + false + end + private def option_is_deprecated?(option) @@ -646,7 +650,7 @@ def wrap(text, width) # :doc: http://localhost:8808/ with info about installed gems Further information: - http://guides.rubygems.org + https://guides.rubygems.org HELP # :startdoc: diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index 8ad723be55878d..03b859e501a6bf 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -176,6 +176,7 @@ def process_args(args, build_args=nil) cmd_name = args.shift.downcase cmd = find_command cmd_name cmd.invoke_with_build_args args, build_args + cmd.deprecation_warning if cmd.deprecated? end end diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb index 9f14e22f901da1..259e8b56229467 100644 --- a/lib/rubygems/commands/help_command.rb +++ b/lib/rubygems/commands/help_command.rb @@ -38,7 +38,7 @@ class Gem::Commands::HelpCommand < Gem::Command * Create a gem: - See http://guides.rubygems.org/make-your-own-gem/ + See https://guides.rubygems.org/make-your-own-gem/ * See information about RubyGems: diff --git a/lib/rubygems/commands/info_command.rb b/lib/rubygems/commands/info_command.rb index 6a737b178bfb66..a64843405e0bf4 100644 --- a/lib/rubygems/commands/info_command.rb +++ b/lib/rubygems/commands/info_command.rb @@ -1,14 +1,19 @@ # frozen_string_literal: true require 'rubygems/command' -require 'rubygems/commands/query_command' +require 'rubygems/query_utils' -class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand +class Gem::Commands::InfoCommand < Gem::Command + + include Gem::QueryUtils def initialize - super "info", "Show information for the given gem" + super "info", "Show information for the given gem", + :name => //, :domain => :local, :details => false, :versions => true, + :installed => nil, :version => Gem::Requirement.default + + add_query_options - remove_option('--name-matches') remove_option('-d') defaults[:details] = true diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 753ff33eb51ee5..6f9a8d2a08f6eb 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -218,7 +218,7 @@ def install_gems # :nodoc: gem_version ||= options[:version] domain = options[:domain] domain = :local unless options[:suggest_alternate] - supress_suggestions = (domain == :local) + suppress_suggestions = (domain == :local) begin install_gem gem_name, gem_version @@ -226,11 +226,11 @@ def install_gems # :nodoc: alert_error "Error installing #{gem_name}:\n\t#{e.message}" exit_code |= 1 rescue Gem::GemNotFoundException => e - show_lookup_failure e.name, e.version, e.errors, supress_suggestions + show_lookup_failure e.name, e.version, e.errors, suppress_suggestions exit_code |= 2 rescue Gem::UnsatisfiableDependencyError => e - show_lookup_failure e.name, e.version, e.errors, supress_suggestions, + show_lookup_failure e.name, e.version, e.errors, suppress_suggestions, "'#{gem_name}' (#{gem_version})" exit_code |= 2 diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb index cd21543537776a..f94038920f6d73 100644 --- a/lib/rubygems/commands/list_command.rb +++ b/lib/rubygems/commands/list_command.rb @@ -1,17 +1,20 @@ # frozen_string_literal: true require 'rubygems/command' -require 'rubygems/commands/query_command' +require 'rubygems/query_utils' ## -# An alternate to Gem::Commands::QueryCommand that searches for gems starting -# with the supplied argument. +# Searches for gems starting with the supplied argument. -class Gem::Commands::ListCommand < Gem::Commands::QueryCommand +class Gem::Commands::ListCommand < Gem::Command + + include Gem::QueryUtils def initialize - super 'list', 'Display local gems whose name matches REGEXP' + super 'list', 'Display local gems whose name matches REGEXP', + :name => //, :domain => :local, :details => false, :versions => true, + :installed => nil, :version => Gem::Requirement.default - remove_option('--name-matches') + add_query_options end def arguments # :nodoc: diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb index 2248a821c8de9e..d10060923ffcc0 100644 --- a/lib/rubygems/commands/pristine_command.rb +++ b/lib/rubygems/commands/pristine_command.rb @@ -40,6 +40,11 @@ def initialize options[:only_executables] = value end + add_option('--only-plugins', + 'Only restore plugins') do |value, options| + options[:only_plugins] = value + end + add_option('-E', '--[no-]env-shebang', 'Rewrite executables with a shebang', 'of /usr/bin/env') do |value, options| @@ -126,14 +131,14 @@ def execute end end - unless spec.extensions.empty? or options[:extensions] or options[:only_executables] + unless spec.extensions.empty? or options[:extensions] or options[:only_executables] or options[:only_plugins] say "Skipped #{spec.full_name}, it needs to compile an extension" next end gem = spec.cache_file - unless File.exist? gem or options[:only_executables] + unless File.exist? gem or options[:only_executables] or options[:only_plugins] require 'rubygems/remote_fetcher' say "Cached gem for #{spec.full_name} not found, attempting to fetch..." @@ -172,6 +177,9 @@ def execute if options[:only_executables] installer = Gem::Installer.for_spec(spec, installer_options) installer.generate_bin + elsif options[:only_plugins] + installer = Gem::Installer.for_spec(spec) + installer.generate_plugins else installer = Gem::Installer.at(gem, installer_options) installer.install diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb index c9cb1f2d43b023..65ee25167ce4e3 100644 --- a/lib/rubygems/commands/search_command.rb +++ b/lib/rubygems/commands/search_command.rb @@ -1,15 +1,17 @@ # frozen_string_literal: true require 'rubygems/command' -require 'rubygems/commands/query_command' +require 'rubygems/query_utils' -class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand +class Gem::Commands::SearchCommand < Gem::Command - def initialize - super 'search', 'Display remote gems whose name matches REGEXP' + include Gem::QueryUtils - remove_option '--name-matches' + def initialize + super 'search', 'Display remote gems whose name matches REGEXP', + :name => //, :domain => :remote, :details => false, :versions => true, + :installed => nil, :version => Gem::Requirement.default - defaults[:domain] = :remote + add_query_options end def arguments # :nodoc: diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 579776df7ea583..d67caca91cde67 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -20,7 +20,8 @@ def initialize :force => true, :site_or_vendor => 'sitelibdir', :destdir => '', :prefix => '', :previous_version => '', - :regenerate_binstubs => true + :regenerate_binstubs => true, + :regenerate_plugins => true add_option '--previous-version=VERSION', 'Previous version of RubyGems', @@ -89,6 +90,11 @@ def initialize options[:regenerate_binstubs] = value end + add_option '--[no-]regenerate-plugins', + 'Regenerate gem plugins' do |value, options| + options[:regenerate_plugins] = value + end + add_option '-f', '--[no-]force', 'Forcefully overwrite binstubs' do |value, options| options[:force] = value @@ -181,6 +187,7 @@ def execute say "RubyGems #{Gem::VERSION} installed" regenerate_binstubs if options[:regenerate_binstubs] + regenerate_plugins if options[:regenerate_plugins] uninstall_old_gemcutter @@ -626,6 +633,16 @@ def regenerate_binstubs command.invoke(*args) end + def regenerate_plugins + require "rubygems/commands/pristine_command" + say "Regenerating plugins" + + args = %w[--all --only-plugins --silent] + + command = Gem::Commands::PristineCommand.new + command.invoke(*args) + end + private def target_bin_path(bin_dir, bin_file) diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb index feab23237db4b4..ca9d425232004c 100644 --- a/lib/rubygems/commands/sources_command.rb +++ b/lib/rubygems/commands/sources_command.rb @@ -136,7 +136,7 @@ def description # :nodoc: its history: * http://gems.rubyforge.org (RubyGems 1.3.6 and earlier) -* http://rubygems.org (RubyGems 1.3.7 through 1.8.25) +* https://rubygems.org/ (RubyGems 1.3.7 through 1.8.25) * https://rubygems.org (RubyGems 2.0.1 and newer) Since all of these sources point to the same set of gems you only need one @@ -153,8 +153,8 @@ def description # :nodoc: To remove a source use the --remove argument: - $ gem sources --remove http://rubygems.org - http://rubygems.org removed from sources + $ gem sources --remove https://rubygems.org/ + https://rubygems.org/ removed from sources EOF end diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index e8031a259d630e..7031ac0dd02633 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -73,8 +73,6 @@ def check_latest_rubygems(version) # :nodoc: say "Latest version already installed. Done." terminate_interaction end - - options[:user_install] = false end def check_update_arguments # :nodoc: @@ -90,9 +88,10 @@ def execute return end - hig = highest_installed_gems - - gems_to_update = which_to_update hig, options[:args].uniq + gems_to_update = which_to_update( + highest_installed_gems, + options[:args].uniq + ) if options[:explain] say "Gems to update:" @@ -137,6 +136,9 @@ def fetch_remote_gems(spec) # :nodoc: def highest_installed_gems # :nodoc: hig = {} # highest installed gems + # Get only gem specifications installed as --user-install + Gem::Specification.dirs = Gem.user_dir if options[:user_install] + Gem::Specification.each do |spec| if hig[spec.name].nil? or hig[spec.name].version < spec.version hig[spec.name] = spec @@ -168,11 +170,34 @@ def install_rubygems(version) # :nodoc: Dir.chdir update_dir do say "Installing RubyGems #{version}" - installed = system Gem.ruby, '--disable-gems', 'setup.rb', *args + installed = preparing_gem_layout_for(version) do + system Gem.ruby, '--disable-gems', 'setup.rb', *args + end + say "RubyGems system software updated" if installed end end + def preparing_gem_layout_for(version) + if Gem::Version.new(version) >= Gem::Version.new("3.2.a") + yield + else + require "tmpdir" + tmpdir = Dir.mktmpdir + FileUtils.mv Gem.plugins_dir, tmpdir + + status = yield + + if status + FileUtils.rm_rf tmpdir + else + FileUtils.mv File.join(tmpdir, "plugins"), Gem.plugins_dir + end + + status + end + end + def rubygems_target_version version = options[:system] update_latest = version == true diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb index 8accfb6174510a..19c0aa0752a541 100644 --- a/lib/rubygems/deprecate.rb +++ b/lib/rubygems/deprecate.rb @@ -65,6 +65,22 @@ def deprecate(name, repl, year, month) end end - module_function :deprecate, :skip_during + # Deprecation method to deprecate Rubygems commands + def deprecate_command(year, month) + class_eval do + define_method "deprecated?" do + true + end + + define_method "deprecation_warning" do + msg = [ "#{self.command} command is deprecated", + ". It will be removed on or after %4d-%02d-01.\n" % [year, month], + ] + + alert_warning "#{msg.join}" unless Gem::Deprecate.skip + end + end + end + module_function :deprecate, :deprecate_command, :skip_during end diff --git a/lib/rubygems/doctor.rb b/lib/rubygems/doctor.rb index 661ae5a4e10d43..cb800f11ece842 100644 --- a/lib/rubygems/doctor.rb +++ b/lib/rubygems/doctor.rb @@ -26,6 +26,7 @@ class Gem::Doctor ['doc', ''], ['extensions', ''], ['gems', ''], + ['plugins', ''], ].freeze missing = @@ -112,6 +113,7 @@ def doctor_child(sub_directory, extension) # :nodoc: next if installed_specs.include? basename next if /^rubygems-\d/ =~ basename next if 'specifications' == sub_directory and 'default' == basename + next if 'plugins' == sub_directory and Gem.plugin_suffix_regexp =~ basename type = File.directory?(child) ? 'directory' : 'file' diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 3924f9dde6fe1d..ac1e8b49cf8c46 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -5,18 +5,7 @@ ## # Base exception class for RubyGems. All exception raised by RubyGems are a # subclass of this one. -class Gem::Exception < RuntimeError - - ## - #-- - # TODO: remove in RubyGems 4, nobody sets this - - attr_accessor :source_exception # :nodoc: - - extend Gem::Deprecate - deprecate :source_exception, :none, 2018, 12 - -end +class Gem::Exception < RuntimeError; end class Gem::CommandLineError < Gem::Exception; end diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb index 4159d81389ce48..80aebd579a08b0 100644 --- a/lib/rubygems/gem_runner.rb +++ b/lib/rubygems/gem_runner.rb @@ -26,13 +26,9 @@ class Gem::GemRunner - def initialize(options={}) - if !options.empty? && !Gem::Deprecate.skip - Kernel.warn "NOTE: passing options to Gem::GemRunner.new is deprecated with no replacement. It will be removed on or after 2016-10-01." - end - - @command_manager_class = options[:command_manager] || Gem::CommandManager - @config_file_class = options[:config_file] || Gem::ConfigFile + def initialize + @command_manager_class = Gem::CommandManager + @config_file_class = Gem::ConfigFile end ## diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index ad39ec81bfbe2e..2ba92482ccae4c 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -6,6 +6,7 @@ #++ require 'rubygems/command' +require 'rubygems/installer_uninstaller_utils' require 'rubygems/exceptions' require 'rubygems/deprecate' require 'rubygems/package' @@ -43,6 +44,8 @@ class Gem::Installer include Gem::UserInteraction + include Gem::InstallerUninstallerUtils + ## # Filename of the gem being installed. @@ -180,15 +183,7 @@ def initialize(package, options={}) require 'fileutils' @options = options - if package.is_a? String - security_policy = options[:security_policy] - @package = Gem::Package.new package, security_policy - if $VERBOSE - warn "constructing an Installer object with a string is deprecated. Please use Gem::Installer.at (called from: #{caller.first})" - end - else - @package = package - end + @package = package process_options @@ -330,6 +325,7 @@ def install end generate_bin + generate_plugins unless @options[:install_as_default] write_spec @@ -520,7 +516,17 @@ def generate_bin # :nodoc: else generate_bin_symlink filename, @bin_dir end + end + end + def generate_plugins # :nodoc: + latest = Gem::Specification.latest_spec_for(spec.name) + return if latest && latest.version > spec.version + + if spec.plugins.empty? + remove_plugins_for(spec) + else + regenerate_plugins_for(spec) end end @@ -810,7 +816,7 @@ def windows_stub_script(bindir, bin_file_name) ruby_exe = "ruby.exe" if ruby_exe.empty? if File.exist?(File.join bindir, ruby_exe) - # stub & ruby.exe withing same folder. Portable + # stub & ruby.exe within same folder. Portable <<-TEXT @ECHO OFF @"%~dp0#{ruby_exe}" "%~dpn0" %* @@ -844,18 +850,6 @@ def build_extensions builder.build_extensions end - ## - # Logs the build +output+ in +build_dir+, then raises Gem::Ext::BuildError. - # - # TODO: Delete this for RubyGems 4. It remains for API compatibility - - def extension_build_error(build_dir, output, backtrace = nil) # :nodoc: - builder = Gem::Ext::Builder.new spec, @build_args - - builder.build_error build_dir, output, backtrace - end - deprecate :extension_build_error, :none, 2018, 12 - ## # Reads the file index and extracts each file into the gem directory. # diff --git a/lib/rubygems/installer_test_case.rb b/lib/rubygems/installer_test_case.rb index f48466d3ea4b11..5a3ce75c26758a 100644 --- a/lib/rubygems/installer_test_case.rb +++ b/lib/rubygems/installer_test_case.rb @@ -171,10 +171,10 @@ def setup_base_user_installer ## # Sets up the base @gem, builds it and returns an installer for it. # - def util_setup_installer + def util_setup_installer(&block) @gem = setup_base_gem - util_setup_gem + util_setup_gem(&block) end ## diff --git a/lib/rubygems/installer_uninstaller_utils.rb b/lib/rubygems/installer_uninstaller_utils.rb new file mode 100644 index 00000000000000..b8436f4f0ab2e6 --- /dev/null +++ b/lib/rubygems/installer_uninstaller_utils.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +## +# Helper methods for both Gem::Installer and Gem::Uninstaller + +module Gem::InstallerUninstallerUtils + + def regenerate_plugins_for(spec) + spec.plugins.each do |plugin| + plugin_script_path = File.join Gem.plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}" + + File.open plugin_script_path, 'wb' do |file| + file.puts "require '#{plugin}'" + end + + verbose plugin_script_path + end + end + + def remove_plugins_for(spec) + FileUtils.rm_f Gem::Util.glob_files_in_dir("#{spec.name}#{Gem.plugin_suffix_pattern}", Gem.plugins_dir) + end + +end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index 813ab9da33faae..b944a050a39013 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -8,7 +8,8 @@ # Example using a Gem::Package # # Builds a .gem file given a Gem::Specification. A .gem file is a tarball -# which contains a data.tar.gz and metadata.gz, and possibly signatures. +# which contains a data.tar.gz, metadata.gz, checksums.yaml.gz and possibly +# signatures. # # require 'rubygems' # require 'rubygems/package' diff --git a/lib/rubygems/query_utils.rb b/lib/rubygems/query_utils.rb new file mode 100644 index 00000000000000..3bc5ccfaa22ac8 --- /dev/null +++ b/lib/rubygems/query_utils.rb @@ -0,0 +1,362 @@ +# frozen_string_literal: true + +require 'rubygems/local_remote_options' +require 'rubygems/spec_fetcher' +require 'rubygems/version_option' +require 'rubygems/text' + +module Gem::QueryUtils + + include Gem::Text + include Gem::LocalRemoteOptions + include Gem::VersionOption + + def add_query_options + add_option('-i', '--[no-]installed', + 'Check for installed gem') do |value, options| + options[:installed] = value + end + + add_option('-I', 'Equivalent to --no-installed') do |value, options| + options[:installed] = false + end + + add_version_option command, "for use with --installed" + + add_option('-d', '--[no-]details', + 'Display detailed information of gem(s)') do |value, options| + options[:details] = value + end + + add_option('--[no-]versions', + 'Display only gem names') do |value, options| + options[:versions] = value + options[:details] = false unless value + end + + add_option('-a', '--all', + 'Display all gem versions') do |value, options| + options[:all] = value + end + + add_option('-e', '--exact', + 'Name of gem(s) to query on matches the', + 'provided STRING') do |value, options| + options[:exact] = value + end + + add_option('--[no-]prerelease', + 'Display prerelease versions') do |value, options| + options[:prerelease] = value + end + + add_local_remote_options + end + + def defaults_str # :nodoc: + "--local --name-matches // --no-details --versions --no-installed" + end + + def description # :nodoc: + <<-EOF +The query command is the basis for the list and search commands. + +You should really use the list and search commands instead. This command +is too hard to use. + EOF + end + + def execute + gem_names = Array(options[:name]) + + if !args.empty? + gem_names = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i } + end + + terminate_interaction(check_installed_gems(gem_names)) if check_installed_gems? + + gem_names.each { |n| show_gems(n) } + end + + private + + def check_installed_gems(gem_names) + exit_code = 0 + + if args.empty? && !gem_name? + alert_error "You must specify a gem name" + exit_code = 4 + elsif gem_names.count > 1 + alert_error "You must specify only ONE gem!" + exit_code = 4 + else + installed = installed?(gem_names.first, options[:version]) + installed = !installed unless options[:installed] + + say(installed) + exit_code = 1 if !installed + end + + exit_code + end + + def check_installed_gems? + !options[:installed].nil? + end + + def gem_name? + !options[:name].source.empty? + end + + def prerelease + options[:prerelease] + end + + def show_prereleases? + prerelease.nil? || prerelease + end + + def args + options[:args].to_a + end + + def display_header(type) + if (ui.outs.tty? and Gem.configuration.verbose) or both? + say + say "*** #{type} GEMS ***" + say + end + end + + #Guts of original execute + def show_gems(name) + show_local_gems(name) if local? + show_remote_gems(name) if remote? + end + + def show_local_gems(name, req = Gem::Requirement.default) + display_header("LOCAL") + + specs = Gem::Specification.find_all do |s| + s.name =~ name and req =~ s.version + end + + dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req } + specs.select! do |s| + dep.match?(s.name, s.version, show_prereleases?) + end + + spec_tuples = specs.map do |spec| + [spec.name_tuple, spec] + end + + output_query_results(spec_tuples) + end + + def show_remote_gems(name) + display_header("REMOTE") + + fetcher = Gem::SpecFetcher.fetcher + + spec_tuples = if name.respond_to?(:source) && name.source.empty? + fetcher.detect(specs_type) { true } + else + fetcher.detect(specs_type) do |name_tuple| + name === name_tuple.name + end + end + + output_query_results(spec_tuples) + end + + def specs_type + if options[:all] + if options[:prerelease] + :complete + else + :released + end + elsif options[:prerelease] + :prerelease + else + :latest + end + end + + ## + # Check if gem +name+ version +version+ is installed. + + def installed?(name, req = Gem::Requirement.default) + Gem::Specification.any? { |s| s.name =~ name and req =~ s.version } + end + + def output_query_results(spec_tuples) + output = [] + versions = Hash.new { |h,name| h[name] = [] } + + spec_tuples.each do |spec_tuple, source| + versions[spec_tuple.name] << [spec_tuple, source] + end + + versions = versions.sort_by do |(n,_),_| + n.downcase + end + + output_versions output, versions + + say output.join(options[:details] ? "\n\n" : "\n") + end + + def output_versions(output, versions) + versions.each do |gem_name, matching_tuples| + matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse + + platforms = Hash.new { |h,version| h[version] = [] } + + matching_tuples.each do |n, _| + platforms[n.version] << n.platform if n.platform + end + + seen = {} + + matching_tuples.delete_if do |n,_| + if seen[n.version] + true + else + seen[n.version] = true + false + end + end + + output << clean_text(make_entry(matching_tuples, platforms)) + end + end + + def entry_details(entry, detail_tuple, specs, platforms) + return unless options[:details] + + name_tuple, spec = detail_tuple + + spec = spec.fetch_spec(name_tuple)if spec.respond_to?(:fetch_spec) + + entry << "\n" + + spec_platforms entry, platforms + spec_authors entry, spec + spec_homepage entry, spec + spec_license entry, spec + spec_loaded_from entry, spec, specs + spec_summary entry, spec + end + + def entry_versions(entry, name_tuples, platforms, specs) + return unless options[:versions] + + list = + if platforms.empty? or options[:details] + name_tuples.map { |n| n.version }.uniq + else + platforms.sort.reverse.map do |version, pls| + out = version.to_s + + if options[:domain] == :local + default = specs.any? do |s| + !s.is_a?(Gem::Source) && s.version == version && s.default_gem? + end + out = "default: #{out}" if default + end + + if pls != [Gem::Platform::RUBY] + platform_list = [pls.delete(Gem::Platform::RUBY), *pls.sort].compact + out = platform_list.unshift(out).join(' ') + end + + out + end + end + + entry << " (#{list.join ', '})" + end + + def make_entry(entry_tuples, platforms) + detail_tuple = entry_tuples.first + + name_tuples, specs = entry_tuples.flatten.partition do |item| + Gem::NameTuple === item + end + + entry = [name_tuples.first.name] + + entry_versions(entry, name_tuples, platforms, specs) + entry_details(entry, detail_tuple, specs, platforms) + + entry.join + end + + def spec_authors(entry, spec) + authors = "Author#{spec.authors.length > 1 ? 's' : ''}: ".dup + authors << spec.authors.join(', ') + entry << format_text(authors, 68, 4) + end + + def spec_homepage(entry, spec) + return if spec.homepage.nil? or spec.homepage.empty? + + entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4) + end + + def spec_license(entry, spec) + return if spec.license.nil? or spec.license.empty? + + licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: ".dup + licenses << spec.licenses.join(', ') + entry << "\n" << format_text(licenses, 68, 4) + end + + def spec_loaded_from(entry, spec, specs) + return unless spec.loaded_from + + if specs.length == 1 + default = spec.default_gem? ? ' (default)' : nil + entry << "\n" << " Installed at#{default}: #{spec.base_dir}" + else + label = 'Installed at' + specs.each do |s| + version = s.version.to_s + version << ', default' if s.default_gem? + entry << "\n" << " #{label} (#{version}): #{s.base_dir}" + label = ' ' * label.length + end + end + end + + def spec_platforms(entry, platforms) + non_ruby = platforms.any? do |_, pls| + pls.any? { |pl| pl != Gem::Platform::RUBY } + end + + return unless non_ruby + + if platforms.length == 1 + title = platforms.values.length == 1 ? 'Platform' : 'Platforms' + entry << " #{title}: #{platforms.values.sort.join(', ')}\n" + else + entry << " Platforms:\n" + + sorted_platforms = platforms.sort_by { |version,| version } + + sorted_platforms.each do |version, pls| + label = " #{version}: " + data = format_text pls.sort.join(', '), 68, label.length + data[0, label.length] = label + entry << data << "\n" + end + end + end + + def spec_summary(entry, spec) + summary = truncate_text(spec.summary, "the summary for #{spec.full_name}") + entry << "\n\n" << format_text(summary, 68, 4) + end + +end diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb index 2ed619f1bc6f7a..b37ebc15fdd11e 100644 --- a/lib/rubygems/remote_fetcher.rb +++ b/lib/rubygems/remote_fetcher.rb @@ -7,7 +7,6 @@ require 'rubygems/uri_parsing' require 'rubygems/user_interaction' require 'resolv' -require 'rubygems/deprecate' ## # RemoteFetcher handles the details of fetching gems and gem information from @@ -16,8 +15,6 @@ class Gem::RemoteFetcher include Gem::UserInteraction - extend Gem::Deprecate - include Gem::UriParsing ## @@ -309,17 +306,6 @@ def cache_update_path(uri, path = nil, update = true) data end - ## - # Returns the size of +uri+ in bytes. - - def fetch_size(uri) - response = fetch_path(uri, nil, true) - - response['content-length'].to_i - end - - deprecate :fetch_size, :none, 2019, 12 - ## # Performs a Net::HTTP request of type +request_class+ on +uri+ returning # a Net::HTTP response object. request maintains a table of persistent diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index b7a8ee6f4f5ca9..ef3f302ea8e7ec 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -235,7 +235,7 @@ def add_dependencies(groups, dependencies) # :nodoc: return unless (groups & @without_groups).empty? dependencies.each do |dep| - @set.gem dep.name, *dep.requirement + @set.gem dep.name, *dep.requirement.as_list end end diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb index 6fd91e3b7300ac..135f1b08aa332f 100644 --- a/lib/rubygems/resolver/api_set.rb +++ b/lib/rubygems/resolver/api_set.rb @@ -23,7 +23,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set ## # Creates a new APISet that will retrieve gems from +uri+ using the RubyGems # API URL +dep_uri+ which is described at - # http://guides.rubygems.org/rubygems-org-api + # https://guides.rubygems.org/rubygems-org-api def initialize(dep_uri = 'https://rubygems.org/api/v1/dependencies') super() diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb index 9bbc09578865cc..4052846e993ca3 100644 --- a/lib/rubygems/resolver/api_specification.rb +++ b/lib/rubygems/resolver/api_specification.rb @@ -11,7 +11,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification # Creates an APISpecification for the given +set+ from the rubygems.org # +api_data+. # - # See http://guides.rubygems.org/rubygems-org-api/#misc_methods for the + # See https://guides.rubygems.org/rubygems-org-api/#misc_methods for the # format of the +api_data+. def initialize(set, api_data) diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb index 7b0a0b3c6af193..4529c087721317 100644 --- a/lib/rubygems/security.rb +++ b/lib/rubygems/security.rb @@ -62,11 +62,11 @@ # # $ tar tf your-gem-1.0.gem # metadata.gz -# metadata.gz.sum # metadata.gz.sig # metadata signature # data.tar.gz -# data.tar.gz.sum # data.tar.gz.sig # data signature +# checksums.yaml.gz +# checksums.yaml.gz.sig # checksums signature # # === Manually signing gems # @@ -161,6 +161,8 @@ # -K, --private-key KEY Key for --sign or --build # -s, --sign CERT Signs CERT with the key from -K # and the certificate from -C +# -d, --days NUMBER_OF_DAYS Days before the certificate expires +# -R, --re-sign Re-signs the certificate from -C with the key from -K # # We've already covered the --build option, and the # --add, --list, and --remove commands @@ -265,7 +267,7 @@ # 2. Grab the public key from the gemspec # # gem spec some_signed_gem-1.0.gem cert_chain | \ -# ruby -ryaml -e 'puts YAML.load_documents($stdin)' > public_key.crt +# ruby -ryaml -e 'puts YAML.load($stdin)' > public_key.crt # # 3. Generate a SHA1 hash of the data.tar.gz # diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb index 5e4ba6ebba4075..8fb1b1ddc1f1ad 100644 --- a/lib/rubygems/security/signer.rb +++ b/lib/rubygems/security/signer.rb @@ -39,7 +39,7 @@ class Gem::Security::Signer }.freeze ## - # Attemps to re-sign an expired cert with a given private key + # Attempts to re-sign an expired cert with a given private key def self.re_sign_cert(expired_cert, expired_cert_path, private_key) return unless expired_cert.not_after < Time.now diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb index 97923ef698af04..83d7cf5abc866d 100644 --- a/lib/rubygems/server.rb +++ b/lib/rubygems/server.rb @@ -661,7 +661,7 @@ def root(req, res) "only_one_executable" => true, "full_name" => "rubygems-#{Gem::VERSION}", "has_deps" => false, - "homepage" => "http://guides.rubygems.org/", + "homepage" => "https://guides.rubygems.org/", "name" => 'rubygems', "ri_installed" => true, "summary" => "RubyGems itself", diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 5321edfcc3bf4c..ad43a63e80ee0b 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -384,6 +384,7 @@ def licenses=(licenses) # "mailing_list_uri" => "https://groups.example.com/bestgemever", # "source_code_uri" => "https://example.com/user/bestgemever", # "wiki_uri" => "https://example.com/user/bestgemever/wiki" + # "funding_uri" => "https://example.com/donate" # } # # These links will be used on your gem's page on rubygems.org and must pass @@ -1086,6 +1087,13 @@ def self.latest_specs(prerelease = false) _latest_specs Gem::Specification._all, prerelease end + ## + # Return the latest installed spec for gem +name+. + + def self.latest_spec_for(name) + latest_specs(true).find { |installed_spec| installed_spec.name == name } + end + def self._latest_specs(specs, prerelease = false) # :nodoc: result = Hash.new { |h,k| h[k] = {} } native = {} @@ -1752,10 +1760,11 @@ def dependencies # # [depending_gem, dependency, [list_of_gems_that_satisfy_dependency]] - def dependent_gems + def dependent_gems(check_dev=true) out = [] Gem::Specification.each do |spec| - spec.dependencies.each do |dep| + deps = check_dev ? spec.dependencies : spec.runtime_dependencies + deps.each do |dep| if self.satisfies_requirement?(dep) sats = [] find_all_satisfiers(dep) do |sat| @@ -1847,29 +1856,23 @@ def executable=(o) end ## - # Sets executables to +value+, ensuring it is an array. Don't - # use this, push onto the array instead. + # Sets executables to +value+, ensuring it is an array. def executables=(value) - # TODO: warn about setting instead of pushing @executables = Array(value) end ## - # Sets extensions to +extensions+, ensuring it is an array. Don't - # use this, push onto the array instead. + # Sets extensions to +extensions+, ensuring it is an array. def extensions=(extensions) - # TODO: warn about setting instead of pushing @extensions = Array extensions end ## - # Sets extra_rdoc_files to +files+, ensuring it is an array. Don't - # use this, push onto the array instead. + # Sets extra_rdoc_files to +files+, ensuring it is an array. def extra_rdoc_files=(files) - # TODO: warn about setting instead of pushing @extra_rdoc_files = Array files end @@ -2245,11 +2248,9 @@ def raise_if_conflicts # :nodoc: end ## - # Sets rdoc_options to +value+, ensuring it is an array. Don't - # use this, push onto the array instead. + # Sets rdoc_options to +value+, ensuring it is an array. def rdoc_options=(options) - # TODO: warn about setting instead of pushing @rdoc_options = Array options end @@ -2268,11 +2269,9 @@ def require_path=(path) end ## - # Set requirements to +req+, ensuring it is an array. Don't - # use this, push onto the array instead. + # Set requirements to +req+, ensuring it is an array. def requirements=(req) - # TODO: warn about setting instead of pushing @requirements = Array req end diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb index c3c496db9b52b2..a50fafbc823596 100644 --- a/lib/rubygems/specification_policy.rb +++ b/lib/rubygems/specification_policy.rb @@ -18,6 +18,7 @@ class Gem::SpecificationPolicy mailing_list_uri source_code_uri wiki_uri + funding_uri ].freeze # :nodoc: def initialize(specification) @@ -421,7 +422,7 @@ def error(statement) # :nodoc: end def help_text # :nodoc: - "See http://guides.rubygems.org/specification-reference/ for help" + "See https://guides.rubygems.org/specification-reference/ for help" end end diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 206497c6512980..691985dcd28c65 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -169,20 +169,24 @@ def vendordir(value) # original value when the block ends # def bindir(value) - bindir = RbConfig::CONFIG['bindir'] + with_clean_path_to_ruby do + bindir = RbConfig::CONFIG['bindir'] - if value - RbConfig::CONFIG['bindir'] = value - else - RbConfig::CONFIG.delete 'bindir' - end + if value + RbConfig::CONFIG['bindir'] = value + else + RbConfig::CONFIG.delete 'bindir' + end - yield - ensure - if bindir - RbConfig::CONFIG['bindir'] = bindir - else - RbConfig::CONFIG.delete 'bindir' + begin + yield + ensure + if bindir + RbConfig::CONFIG['bindir'] = bindir + else + RbConfig::CONFIG.delete 'bindir' + end + end end end @@ -321,6 +325,11 @@ def setup @tempdir.tap(&Gem::UNTAINT) end + @orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE + Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE + Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE, + File.join(@tempdir, 'system-gemrc') + @gemhome = File.join @tempdir, 'gemhome' @userhome = File.join @tempdir, 'userhome' ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache' @@ -331,7 +340,7 @@ def setup ruby end - @git = ENV['GIT'] || 'git' + @git = ENV['GIT'] || (win_platform? ? 'git.exe' : 'git') Gem.ensure_gem_subdirectories @gemhome @@ -442,6 +451,10 @@ def teardown ENV.replace(@orig_env) + Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE + Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE, + @orig_SYSTEM_WIDE_CONFIG_FILE + Gem.ruby = @orig_ruby if @orig_ruby if Gem.java_platform? @@ -562,7 +575,7 @@ def in_path?(executable) # :nodoc: def install_gem(spec, options = {}) require 'rubygems/installer' - gem = File.join @tempdir, "gems", "#{spec.full_name}.gem" + gem = spec.cache_file unless File.exist? gem use_ui Gem::MockGemUi.new do @@ -571,7 +584,7 @@ def install_gem(spec, options = {}) end end - gem = File.join(@tempdir, File.basename(spec.cache_file)).tap(&Gem::UNTAINT) + gem = File.join(@tempdir, File.basename(gem)).tap(&Gem::UNTAINT) end Gem::Installer.at(gem, options.merge({:wrappers => true})).install @@ -667,8 +680,6 @@ def quick_gem(name, version='2') yield(s) if block_given? end - Gem::Specification.map # HACK: force specs to (re-)load before we write - written_path = write_file spec.spec_file do |io| io.write spec.to_ruby_for_cache end @@ -833,9 +844,6 @@ def util_spec(name, version = 2, deps = nil, *files) # :yields: specification util_build_gem spec - cache_file = File.join @tempdir, 'gems', "#{spec.full_name}.gem" - FileUtils.mkdir_p File.dirname cache_file - FileUtils.mv spec.cache_file, cache_file FileUtils.rm spec.spec_file end @@ -1247,6 +1255,16 @@ def self.rubybin end end + def with_clean_path_to_ruby + orig_ruby = Gem.ruby + + Gem.instance_variable_set :@ruby, nil + + yield + ensure + Gem.instance_variable_set :@ruby, orig_ruby + end + class << self # :nodoc: diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb index 20b437d4723d65..17664234293a93 100644 --- a/lib/rubygems/uninstaller.rb +++ b/lib/rubygems/uninstaller.rb @@ -7,6 +7,7 @@ require 'fileutils' require 'rubygems' +require 'rubygems/installer_uninstaller_utils' require 'rubygems/dependency_list' require 'rubygems/rdoc' require 'rubygems/user_interaction' @@ -23,6 +24,8 @@ class Gem::Uninstaller include Gem::UserInteraction + include Gem::InstallerUninstallerUtils + ## # The directory a gem's executables will be installed into @@ -158,8 +161,11 @@ def uninstall_gem(spec) end remove_executables @spec + remove_plugins @spec remove @spec + regenerate_plugins + Gem.post_uninstall_hooks.each do |hook| hook.call self end @@ -168,11 +174,10 @@ def uninstall_gem(spec) end ## - # Removes installed executables and batch files (windows only) for - # +gemspec+. + # Removes installed executables and batch files (windows only) for +spec+. def remove_executables(spec) - return if spec.nil? or spec.executables.empty? + return if spec.executables.empty? executables = spec.executables.clone @@ -231,10 +236,6 @@ def remove_all(list) ## # spec:: the spec of the gem to be uninstalled - # list:: the list of all such gems - # - # Warning: this method modifies the +list+ parameter. Once it has - # uninstalled a gem, it is removed from that list. def remove(spec) unless path_ok?(@gem_home, spec) or @@ -274,6 +275,25 @@ def remove(spec) Gem::Specification.reset end + ## + # Remove any plugin wrappers for +spec+. + + def remove_plugins(spec) # :nodoc: + return if spec.plugins.empty? + + remove_plugins_for(spec) + end + + ## + # Regenerates plugin wrappers after removal. + + def regenerate_plugins + latest = Gem::Specification.latest_spec_for(@spec.name) + return if latest.nil? + + regenerate_plugins_for(latest) + end + ## # Is +spec+ in +gem_dir+? @@ -317,7 +337,7 @@ def ask_if_ok(spec) # :nodoc: s.name == spec.name && s.full_name != spec.full_name end - spec.dependent_gems.each do |dep_spec, dep, satlist| + spec.dependent_gems(@check_dev).each do |dep_spec, dep, satlist| unless siblings.any? { |s| s.satisfies_requirement? dep } msg << "#{dep_spec.name}-#{dep_spec.version} depends on #{dep}" end diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb index 93f528a763348f..f5bdd84150a89a 100644 --- a/lib/rubygems/user_interaction.rb +++ b/lib/rubygems/user_interaction.rb @@ -358,14 +358,6 @@ def alert_error(statement, question=nil) ask(question) if question end - ## - # Display a debug message on the same location as error messages. - - def debug(statement) - @errs.puts statement - end - deprecate :debug, :none, 2018, 12 - ## # Terminate the application with exit code +status+, running any exit # handlers that might have been defined. diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb index 6524faf5c838cc..b1faedcda21b2b 100644 --- a/lib/rubygems/version.rb +++ b/lib/rubygems/version.rb @@ -151,7 +151,7 @@ class Gem::Version - autoload :Requirement, 'rubygems/requirement' + autoload :Requirement, File.expand_path('requirement', __dir__) include Comparable diff --git a/test/rubygems/test_deprecate.rb b/test/rubygems/test_deprecate.rb index b92bd1c3dae0ad..f5cd83ee8908c3 100644 --- a/test/rubygems/test_deprecate.rb +++ b/test/rubygems/test_deprecate.rb @@ -77,4 +77,22 @@ def test_deprecated_method_outputs_a_warning assert_match(/on or after 2099-03-01/, err) end + def test_deprecate_command + require 'rubygems/command' + foo_command = Class.new(Gem::Command) do + extend Gem::Deprecate + + deprecate_command(2099, 4) + + def execute + puts "pew pew!" + end + end + + Gem::Commands.send(:const_set, :FooCommand, foo_command) + assert Gem::Commands::FooCommand.new("foo").deprecated? + ensure + Gem::Commands.send(:remove_const, :FooCommand) + end + end diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 6d223b7d69c0a3..2890e13dfb5dc0 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -11,12 +11,6 @@ raise "rubygems/bundler tests do not work correctly if there is #{ File.join(Dir.tmpdir, "Gemfile") }" end -# TODO: push this up to test_case.rb once battle tested - -$LOAD_PATH.map! do |path| - path.dup.tap(&Gem::UNTAINT) -end - class TestGem < Gem::TestCase PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant @@ -161,10 +155,8 @@ def test_self_install_permissions_with_format_executable def test_self_install_permissions_with_format_executable_and_non_standard_ruby_install_name Gem::Installer.exec_format = nil - with_clean_path_to_ruby do - ruby_install_name 'ruby27' do - assert_self_install_permissions(format_executable: true) - end + ruby_install_name 'ruby27' do + assert_self_install_permissions(format_executable: true) end ensure Gem::Installer.exec_format = nil @@ -1024,21 +1016,17 @@ def test_self_refresh_keeps_loaded_specs_activated end def test_self_ruby_escaping_spaces_in_path - with_clean_path_to_ruby do - with_bindir_and_exeext("C:/Ruby 1.8/bin", ".exe") do - ruby_install_name "ruby" do - assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby - end + with_bindir_and_exeext("C:/Ruby 1.8/bin", ".exe") do + ruby_install_name "ruby" do + assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby end end end def test_self_ruby_path_without_spaces - with_clean_path_to_ruby do - with_bindir_and_exeext("C:/Ruby18/bin", ".exe") do - ruby_install_name "ruby" do - assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby - end + with_bindir_and_exeext("C:/Ruby18/bin", ".exe") do + ruby_install_name "ruby" do + assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby end end end @@ -1090,7 +1078,7 @@ def test_self_ruby_version_with_non_mri_implementations util_restore_RUBY_VERSION end - def test_self_ruby_version_with_prerelease + def test_self_ruby_version_with_svn_prerelease util_set_RUBY_VERSION '2.6.0', -1, 63539, 'ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]' assert_equal Gem::Version.new('2.6.0.preview2'), Gem.ruby_version @@ -1098,6 +1086,14 @@ def test_self_ruby_version_with_prerelease util_restore_RUBY_VERSION end + def test_self_ruby_version_with_git_prerelease + util_set_RUBY_VERSION '2.7.0', -1, 'b563439274a402e33541f5695b1bfd4ac1085638', 'ruby 2.7.0preview3 (2019-11-23 master b563439274) [x86_64-linux]' + + assert_equal Gem::Version.new('2.7.0.preview3'), Gem.ruby_version + ensure + util_restore_RUBY_VERSION + end + def test_self_ruby_version_with_non_mri_implementations_with_mri_prerelase_compatibility util_set_RUBY_VERSION '2.6.0', -1, 63539, 'weirdjruby 9.2.0.0 (2.6.0preview2) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]', 'weirdjruby', '9.2.0.0' @@ -1106,7 +1102,7 @@ def test_self_ruby_version_with_non_mri_implementations_with_mri_prerelase_compa util_restore_RUBY_VERSION end - def test_self_ruby_version_with_trunk + def test_self_ruby_version_with_svn_trunk util_set_RUBY_VERSION '1.9.2', -1, 23493, 'ruby 1.9.2dev (2009-05-20 trunk 23493) [x86_64-linux]' assert_equal Gem::Version.new('1.9.2.dev'), Gem.ruby_version @@ -1114,6 +1110,14 @@ def test_self_ruby_version_with_trunk util_restore_RUBY_VERSION end + def test_self_ruby_version_with_git_master + util_set_RUBY_VERSION '2.7.0', -1, '5de284ec78220e75643f89b454ce999da0c1c195', 'ruby 2.7.0dev (2019-12-23T01:37:30Z master 5de284ec78) [x86_64-linux]' + + assert_equal Gem::Version.new('2.7.0.dev'), Gem.ruby_version + ensure + util_restore_RUBY_VERSION + end + def test_self_rubygems_version assert_equal Gem::Version.new(Gem::VERSION), Gem.rubygems_version end @@ -1470,7 +1474,6 @@ def test_load_plugins install_gem foo2 end - Gem.searcher = nil Gem::Specification.reset gem 'foo' @@ -1904,15 +1907,19 @@ def test_platform_defaults end def ruby_install_name(name) - orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name'] - RbConfig::CONFIG['ruby_install_name'] = name + with_clean_path_to_ruby do + orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['ruby_install_name'] = name - yield - ensure - if orig_RUBY_INSTALL_NAME - RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME - else - RbConfig::CONFIG.delete 'ruby_install_name' + begin + yield + ensure + if orig_RUBY_INSTALL_NAME + RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME + else + RbConfig::CONFIG.delete 'ruby_install_name' + end + end end end @@ -1924,16 +1931,6 @@ def with_bindir_and_exeext(bindir, exeext) end end - def with_clean_path_to_ruby - orig_ruby = Gem.ruby - - Gem.instance_variable_set :@ruby, nil - - yield - ensure - Gem.instance_variable_set :@ruby, orig_ruby - end - def with_plugin(path) test_plugin_path = File.expand_path("test/rubygems/plugin/#{path}", PROJECT_DIR) diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index 45be9f01be3e70..c6aaff291a7bbf 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -224,26 +224,34 @@ def test_process_args_query end #check defaults - @command_manager.process_args %w[query] + Gem::Deprecate.skip_during do + @command_manager.process_args %w[query] + end assert_equal(//, check_options[:name]) assert_equal :local, check_options[:domain] assert_equal false, check_options[:details] #check settings check_options = nil - @command_manager.process_args %w[query --name foobar --local --details] + Gem::Deprecate.skip_during do + @command_manager.process_args %w[query --name foobar --local --details] + end assert_equal(/foobar/i, check_options[:name]) assert_equal :local, check_options[:domain] assert_equal true, check_options[:details] #remote domain check_options = nil - @command_manager.process_args %w[query --remote] + Gem::Deprecate.skip_during do + @command_manager.process_args %w[query --remote] + end assert_equal :remote, check_options[:domain] #both (local/remote) domains check_options = nil - @command_manager.process_args %w[query --both] + Gem::Deprecate.skip_during do + @command_manager.process_args %w[query --both] + end assert_equal :both, check_options[:domain] end @@ -268,4 +276,29 @@ def test_process_args_update assert_equal Dir.pwd, check_options[:install_dir] end + def test_deprecated_command + require 'rubygems/command' + foo_command = Class.new(Gem::Command) do + extend Gem::Deprecate + + deprecate_command(2099, 4) + + def execute + say "pew pew!" + end + end + + Gem::Commands.send(:const_set, :FooCommand, foo_command) + @command_manager.register_command(:foo, foo_command.new("foo")) + + use_ui @ui do + @command_manager.process_args(%w[foo]) + end + + assert_equal "pew pew!\n", @ui.output + assert_equal("WARNING: foo command is deprecated. It will be removed on or after 2099-04-01.\n", @ui.error) + ensure + Gem::Commands.send(:remove_const, :FooCommand) + end + end diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index 50c447e2ebf893..a2e8f284eb2393 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -147,7 +147,7 @@ def test_execute_strict_with_warnings error = @ui.error.split "\n" assert_equal "WARNING: licenses is empty, but is recommended. Use a license identifier from", error.shift assert_equal "http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.", error.shift - assert_equal "WARNING: See http://guides.rubygems.org/specification-reference/ for help", error.shift + assert_equal "WARNING: See https://guides.rubygems.org/specification-reference/ for help", error.shift assert_equal [], error gem_file = File.join @tempdir, File.basename(@gem.cache_file) diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb index e872a809577667..4ebe1efecb47ac 100644 --- a/test/rubygems/test_gem_commands_pristine_command.rb +++ b/test/rubygems/test_gem_commands_pristine_command.rb @@ -215,7 +215,6 @@ def test_execute_no_extension io.write "# extconf.rb\nrequire 'mkmf'; create_makefile 'a'" end - util_build_gem a install_gem a @cmd.options[:args] = %w[a] @@ -491,6 +490,42 @@ def test_execute_only_executables refute File.exist? gem_lib end + def test_execute_only_plugins + a = util_spec 'a' do |s| + s.executables = %w[foo] + s.files = %w[bin/foo lib/a.rb lib/rubygems_plugin.rb] + end + write_file File.join(@tempdir, 'lib', 'a.rb') do |fp| + fp.puts "puts __FILE__" + end + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |fp| + fp.puts "puts __FILE__" + end + write_file File.join(@tempdir, 'bin', 'foo') do |fp| + fp.puts "#!/usr/bin/ruby" + end + + install_gem a + + gem_lib = File.join @gemhome, 'gems', a.full_name, 'lib', 'a.rb' + gem_plugin = File.join @gemhome, 'plugins', 'a_plugin.rb' + gem_exec = File.join @gemhome, 'bin', 'foo' + + FileUtils.rm gem_exec + FileUtils.rm gem_plugin + FileUtils.rm gem_lib + + @cmd.handle_options %w[--all --only-plugins] + + use_ui @ui do + @cmd.execute + end + + refute File.exist? gem_exec + assert File.exist? gem_plugin + refute File.exist? gem_lib + end + def test_execute_bindir a = util_spec 'a' do |s| s.name = "test_gem" diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb deleted file mode 100644 index 6183e592e9a597..00000000000000 --- a/test/rubygems/test_gem_commands_query_command.rb +++ /dev/null @@ -1,857 +0,0 @@ -# frozen_string_literal: true -require 'rubygems/test_case' -require 'rubygems/commands/query_command' - -module TestGemCommandsQueryCommandSetup - def setup - super - - @cmd = Gem::Commands::QueryCommand.new - - @specs = add_gems_to_fetcher - @stub_ui = Gem::MockGemUi.new - @stub_fetcher = Gem::FakeFetcher.new - - @stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do - raise Gem::RemoteFetcher::FetchError - end - end -end - -class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase - - include TestGemCommandsQueryCommandSetup - - def test_execute - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_all - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r --all] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_all_prerelease - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r --all --prerelease] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_details - spec_fetcher do |fetcher| - fetcher.spec 'a', 2 do |s| - s.summary = 'This is a lot of text. ' * 4 - s.authors = ['Abraham Lincoln', 'Hirohito'] - s.homepage = 'http://a.example.com/' - end - - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r -d] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2) - Authors: Abraham Lincoln, Hirohito - Homepage: http://a.example.com/ - - This is a lot of text. This is a lot of text. This is a lot of text. - This is a lot of text. - -pl (1) - Platform: i386-linux - Author: A User - Homepage: http://example.com - - this is a summary - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_details_cleans_text - spec_fetcher do |fetcher| - fetcher.spec 'a', 2 do |s| - s.summary = 'This is a lot of text. ' * 4 - s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] - s.homepage = "http://a.example.com/\x03" - end - - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r -d] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2) - Authors: Abraham Lincoln ., . Hirohito - Homepage: http://a.example.com/. - - This is a lot of text. This is a lot of text. This is a lot of text. - This is a lot of text. - -pl (1) - Platform: i386-linux - Author: A User - Homepage: http://example.com - - this is a summary - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_details_truncates_summary - spec_fetcher do |fetcher| - fetcher.spec 'a', 2 do |s| - s.summary = 'This is a lot of text. ' * 10_000 - s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] - s.homepage = "http://a.example.com/\x03" - end - - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r -d] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2) - Authors: Abraham Lincoln ., . Hirohito - Homepage: http://a.example.com/. - - Truncating the summary for a-2 to 100,000 characters: -#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te - -pl (1) - Platform: i386-linux - Author: A User - Homepage: http://example.com - - this is a summary - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_installed - @cmd.handle_options %w[-n a --installed] - - assert_raises Gem::MockGemUi::SystemExitException do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "true\n", @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_installed_inverse - @cmd.handle_options %w[-n a --no-installed] - - e = assert_raises Gem::MockGemUi::TermError do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "false\n", @stub_ui.output - assert_equal '', @stub_ui.error - - assert_equal 1, e.exit_code - end - - def test_execute_installed_inverse_not_installed - @cmd.handle_options %w[-n not_installed --no-installed] - - assert_raises Gem::MockGemUi::SystemExitException do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "true\n", @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_installed_no_name - @cmd.handle_options %w[--installed] - - e = assert_raises Gem::MockGemUi::TermError do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal '', @stub_ui.output - assert_equal "ERROR: You must specify a gem name\n", @stub_ui.error - - assert_equal 4, e.exit_code - end - - def test_execute_installed_not_installed - @cmd.handle_options %w[-n not_installed --installed] - - e = assert_raises Gem::MockGemUi::TermError do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "false\n", @stub_ui.output - assert_equal '', @stub_ui.error - - assert_equal 1, e.exit_code - end - - def test_execute_installed_version - @cmd.handle_options %w[-n a --installed --version 2] - - assert_raises Gem::MockGemUi::SystemExitException do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "true\n", @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_installed_version_not_installed - @cmd.handle_options %w[-n c --installed --version 2] - - e = assert_raises Gem::MockGemUi::TermError do - use_ui @stub_ui do - @cmd.execute - end - end - - assert_equal "false\n", @stub_ui.output - assert_equal '', @stub_ui.error - - assert_equal 1, e.exit_code - end - - def test_execute_local - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.options[:domain] = :local - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_local_notty - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[] - - @stub_ui.outs.tty = false - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_local_quiet - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.options[:domain] = :local - Gem.configuration.verbose = false - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_no_versions - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r --no-versions] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a -pl - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_notty - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-r] - - @stub_ui.outs.tty = false - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF -a (2) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_prerelease - @cmd.handle_options %w[-r --prerelease] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (3.a) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_prerelease_local - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-l --prerelease] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_no_prerelease_local - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[-l --no-prerelease] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_remote - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.options[:domain] = :remote - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_remote_notty - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[] - - @stub_ui.outs.tty = false - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF -a (3.a, 2, 1) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_remote_quiet - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.options[:domain] = :remote - Gem.configuration.verbose = false - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF -a (2) -pl (1 i386-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_make_entry - a_2_name = @specs['a-2'].original_name - - @stub_fetcher.data.delete \ - "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz" - - a2 = @specs['a-2'] - entry_tuples = [ - [Gem::NameTuple.new(a2.name, a2.version, a2.platform), - Gem.sources.first], - ] - - platforms = { a2.version => [a2.platform] } - - entry = @cmd.send :make_entry, entry_tuples, platforms - - assert_equal 'a (2)', entry - end - - # Test for multiple args handling! - def test_execute_multiple_args - spec_fetcher do |fetcher| - fetcher.legacy_platform - end - - @cmd.handle_options %w[a pl] - - use_ui @stub_ui do - @cmd.execute - end - - assert_match %r%^a %, @stub_ui.output - assert_match %r%^pl %, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_show_gems - @cmd.options[:name] = // - @cmd.options[:domain] = :remote - - use_ui @stub_ui do - @cmd.send :show_gems, /a/i - end - - assert_match %r%^a %, @stub_ui.output - refute_match %r%^pl %, @stub_ui.output - assert_empty @stub_ui.error - end - - private - - def add_gems_to_fetcher - spec_fetcher do |fetcher| - fetcher.spec 'a', 1 - fetcher.spec 'a', 2 - fetcher.spec 'a', '3.a' - end - end - -end - -class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase - - include TestGemCommandsQueryCommandSetup - - def test_execute_platform - spec_fetcher do |fetcher| - fetcher.spec 'a', 1 - fetcher.spec 'a', 1 do |s| - s.platform = 'x86-linux' - end - - fetcher.spec 'a', 2 do |s| - s.platform = 'universal-darwin' - end - end - - @cmd.handle_options %w[-r -a] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -a (2 universal-darwin, 1 ruby x86-linux) - EOF - - assert_equal expected, @stub_ui.output - assert_equal '', @stub_ui.error - end - - def test_execute_show_default_gems - spec_fetcher { |fetcher| fetcher.spec 'a', 2 } - - a1 = new_default_spec 'a', 1 - install_default_specs a1 - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (2, default: 1) -EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_show_default_gems_with_platform - a1 = new_default_spec 'a', 1 - a1.platform = 'java' - install_default_specs a1 - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (default: 1 java) -EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_default_details - spec_fetcher do |fetcher| - fetcher.spec 'a', 2 - end - - a1 = new_default_spec 'a', 1 - install_default_specs a1 - - @cmd.handle_options %w[-l -d] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (2, 1) - Author: A User - Homepage: http://example.com - Installed at (2): #{@gemhome} - (1, default): #{a1.base_dir} - - this is a summary - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_local_details - spec_fetcher do |fetcher| - fetcher.spec 'a', 1 do |s| - s.platform = 'x86-linux' - end - - fetcher.spec 'a', 2 do |s| - s.summary = 'This is a lot of text. ' * 4 - s.authors = ['Abraham Lincoln', 'Hirohito'] - s.homepage = 'http://a.example.com/' - s.platform = 'universal-darwin' - end - - fetcher.legacy_platform - end - - @cmd.handle_options %w[-l -d] - - use_ui @stub_ui do - @cmd.execute - end - - str = @stub_ui.output - - str.gsub!(/\(\d\): [^\n]*/, "-") - str.gsub!(/at: [^\n]*/, "at: -") - - expected = <<-EOF - -*** LOCAL GEMS *** - -a (2, 1) - Platforms: - 1: x86-linux - 2: universal-darwin - Authors: Abraham Lincoln, Hirohito - Homepage: http://a.example.com/ - Installed at - - - - - This is a lot of text. This is a lot of text. This is a lot of text. - This is a lot of text. - -pl (1) - Platform: i386-linux - Author: A User - Homepage: http://example.com - Installed at: - - - this is a summary - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_exact_remote - spec_fetcher do |fetcher| - fetcher.spec 'coolgem-omg', 3 - fetcher.spec 'coolgem', '4.2.1' - fetcher.spec 'wow_coolgem', 1 - end - - @cmd.handle_options %w[--remote --exact coolgem] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** REMOTE GEMS *** - -coolgem (4.2.1) - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_exact_local - spec_fetcher do |fetcher| - fetcher.spec 'coolgem-omg', 3 - fetcher.spec 'coolgem', '4.2.1' - fetcher.spec 'wow_coolgem', 1 - end - - @cmd.handle_options %w[--exact coolgem] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -coolgem (4.2.1) - EOF - - assert_equal expected, @stub_ui.output - end - - def test_execute_exact_multiple - spec_fetcher do |fetcher| - fetcher.spec 'coolgem-omg', 3 - fetcher.spec 'coolgem', '4.2.1' - fetcher.spec 'wow_coolgem', 1 - - fetcher.spec 'othergem-omg', 3 - fetcher.spec 'othergem', '1.2.3' - fetcher.spec 'wow_othergem', 1 - end - - @cmd.handle_options %w[--exact coolgem othergem] - - use_ui @stub_ui do - @cmd.execute - end - - expected = <<-EOF - -*** LOCAL GEMS *** - -coolgem (4.2.1) - -*** LOCAL GEMS *** - -othergem (1.2.3) - EOF - - assert_equal expected, @stub_ui.output - end - - private - - def add_gems_to_fetcher - spec_fetcher do |fetcher| - fetcher.download 'a', 1 - fetcher.download 'a', 2 - fetcher.download 'a', '3.a' - end - end - -end diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index c63f7177c77cf7..9dc88d582a73f2 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -98,6 +98,18 @@ def gem_install(name) File.join @gemhome, 'bin', name end + def gem_install_with_plugin(name) + gem = util_spec name do |s| + s.files = %W[lib/rubygems_plugin.rb] + end + write_file File.join @tempdir, 'lib', 'rubygems_plugin.rb' do |f| + f.puts "require '#{gem.plugins.first}'" + end + install_gem gem + + File.join Gem.plugins_dir, "#{name}_plugin.rb" + end + def test_execute_regenerate_binstubs gem_bin_path = gem_install 'a' write_file gem_bin_path do |io| @@ -123,6 +135,31 @@ def test_execute_no_regenerate_binstubs assert_equal "I changed it!\n", File.read(gem_bin_path) end + def test_execute_regenerate_plugins + gem_plugin_path = gem_install_with_plugin 'a' + write_file gem_plugin_path do |io| + io.puts 'I changed it!' + end + + @cmd.options[:document] = [] + @cmd.execute + + assert_match %r{\Arequire}, File.read(gem_plugin_path) + end + + def test_execute_no_regenerate_plugins + gem_plugin_path = gem_install_with_plugin 'a' + write_file gem_plugin_path do |io| + io.puts 'I changed it!' + end + + @cmd.options[:document] = [] + @cmd.options[:regenerate_plugins] = false + @cmd.execute + + assert_equal "I changed it!\n", File.read(gem_plugin_path) + end + def test_execute_informs_about_installed_executables use_ui @ui do @cmd.execute diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb index b63fbce81fa569..3a0899245b1685 100644 --- a/test/rubygems/test_gem_commands_sources_command.rb +++ b/test/rubygems/test_gem_commands_sources_command.rb @@ -247,7 +247,7 @@ def test_execute_add_redundant_source_trailing_slash end def test_execute_add_http_rubygems_org - http_rubygems_org = 'http://rubygems.org' + http_rubygems_org = 'http://rubygems.org/' spec_fetcher do |fetcher| fetcher.spec 'a', 1 @@ -284,6 +284,44 @@ def test_execute_add_http_rubygems_org assert_empty @ui.error end + def test_execute_add_https_rubygems_org + https_rubygems_org = 'https://rubygems.org/' + + spec_fetcher do |fetcher| + fetcher.spec 'a', 1 + end + + specs = Gem::Specification.map do |spec| + [spec.name, spec.version, spec.original_platform] + end + + specs_dump_gz = StringIO.new + Zlib::GzipWriter.wrap specs_dump_gz do |io| + Marshal.dump specs, io + end + + @fetcher.data["#{https_rubygems_org}/specs.#{@marshal_version}.gz"] = + specs_dump_gz.string + + @cmd.handle_options %W[--add #{https_rubygems_org}] + + ui = Gem::MockGemUi.new "n" + + use_ui ui do + assert_raises Gem::MockGemUi::TermError do + @cmd.execute + end + end + + assert_equal [@gem_repo], Gem.sources + + expected = <<-EXPECTED + EXPECTED + + assert_equal expected, @ui.output + assert_empty @ui.error + end + def test_execute_add_bad_uri @cmd.handle_options %w[--add beta-gems.example.com] diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb index 37f990ea1a5598..340c658b9dcb8e 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -159,6 +159,44 @@ def test_execute_system_specific assert_empty out end + def test_execute_system_specific_older_than_3_2_removes_plugins_dir + spec_fetcher do |fetcher| + fetcher.download 'rubygems-update', 3.1 do |s| + s.files = %w[setup.rb] + end + end + + @cmd.options[:args] = [] + @cmd.options[:system] = "3.1" + + FileUtils.mkdir_p Gem.plugins_dir + write_file File.join(Gem.plugins_dir, 'a_plugin.rb') + + @cmd.execute + + refute_path_exists Gem.plugins_dir, "Plugins folder not removed when updating rubygems to pre-3.2" + end + + def test_execute_system_specific_newer_than_or_equal_to_3_2_leaves_plugins_dir_alone + spec_fetcher do |fetcher| + fetcher.download 'rubygems-update', 3.2 do |s| + s.files = %w[setup.rb] + end + end + + @cmd.options[:args] = [] + @cmd.options[:system] = "3.2" + + FileUtils.mkdir_p Gem.plugins_dir + plugin_file = File.join(Gem.plugins_dir, 'a_plugin.rb') + write_file plugin_file + + @cmd.execute + + assert_path_exists Gem.plugins_dir, "Plugin folder removed when updating rubygems to post-3.2" + assert_path_exists plugin_file, "Plugin removed when updating rubygems to post-3.2" + end + def test_execute_system_specifically_to_latest_version spec_fetcher do |fetcher| fetcher.download 'rubygems-update', 8 do |s| @@ -359,10 +397,10 @@ def test_execute_up_to_date end def test_execute_user_install - spec_fetcher do |fetcher| - fetcher.download 'a', 2 - fetcher.spec 'a', 1 - end + a = util_spec "a", 1 + b = util_spec "b", 1 + install_gem_user(a) + install_gem(b) @cmd.handle_options %w[--user-install] @@ -373,7 +411,13 @@ def test_execute_user_install installer = @cmd.installer user_install = installer.instance_variable_get :@user_install - assert user_install, 'user_install must be set on the installer' + assert user_install, "user_install must be set on the installer" + + out = @ui.output.split "\n" + assert_equal "Updating installed gems", out.shift + assert_equal "Updating a", out.shift + assert_equal "Gems updated: a", out.shift + assert_empty out end def test_fetch_remote_gems diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb index 492a0c5a054d4b..8ea8fa61e5992c 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -11,10 +11,6 @@ def setup @cfg_args = %W[--config-file #{@temp_conf}] - @orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE - Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE - Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE, - File.join(@tempdir, 'system-gemrc') Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear Gem::ConfigFile::PLATFORM_DEFAULTS.clear @@ -27,9 +23,6 @@ def setup def teardown Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear Gem::ConfigFile::PLATFORM_DEFAULTS.clear - Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE - Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE, - @orig_SYSTEM_WIDE_CONFIG_FILE ENV['GEMRC'] = @env_gemrc diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index 22f3a9158f7cce..487b8290bb7898 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -440,7 +440,7 @@ def test_install_dependency_existing_extension e1 = util_spec 'e', '1', nil, 'extconf.rb' do |s| s.extensions << 'extconf.rb' end - e1_gem = File.join @tempdir, 'gems', "#{e1.full_name}.gem" + e1_gem = e1.cache_file _, f1_gem = util_gem 'f', '1', 'e' => nil diff --git a/test/rubygems/test_gem_doctor.rb b/test/rubygems/test_gem_doctor.rb index a0e3a18d7f9019..75d406ac88b3d3 100644 --- a/test/rubygems/test_gem_doctor.rb +++ b/test/rubygems/test_gem_doctor.rb @@ -153,6 +153,34 @@ def test_doctor_child_missing assert true # count end + def test_doctor_badly_named_plugins + gem 'a' + + Gem.use_paths @gemhome.to_s + + FileUtils.mkdir_p Gem.plugins_dir + bad_plugin = File.join(Gem.plugins_dir, "a_badly_named_file.rb") + write_file bad_plugin + + doctor = Gem::Doctor.new @gemhome + + capture_io do + use_ui @ui do + doctor.doctor + end + end + + # refute_path_exists bad_plugin + + expected = <<-OUTPUT +Checking #{@gemhome} +Removed file plugins/a_badly_named_file.rb + + OUTPUT + + assert_equal expected, @ui.output + end + def test_gem_repository_eh doctor = Gem::Doctor.new @gemhome diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb index efde71dce69c06..71b792c95791a0 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -67,4 +67,34 @@ def test_extract_build_args assert_equal %w[--foo], args end + def test_info_succeeds + args = %w[info] + + use_ui @ui do + assert_nil @runner.run(args) + end + + assert_empty @ui.error + end + + def test_list_succeeds + args = %w[list] + + use_ui @ui do + assert_nil @runner.run(args) + end + + assert_empty @ui.error + end + + def test_search_succeeds + args = %w[search] + + use_ui @ui do + assert_nil @runner.run(args) + end + + assert_empty @ui.error + end + end diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 731a1ac01de48e..eaeff4a8fc92fc 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -744,6 +744,70 @@ def test_generate_bin_uses_default_shebang assert_match(/#{default_shebang}/, shebang_line) end + def test_generate_plugins + installer = util_setup_installer do |spec| + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io| + io.write "puts __FILE__" + end + + spec.files += %w[lib/rubygems_plugin.rb] + end + + build_rake_in do + installer.install + end + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + + FileUtils.rm plugin_path + + installer.generate_plugins + + assert File.exist?(plugin_path), 'plugin not written' + end + + def test_keeps_plugins_up_to_date + # NOTE: version a-2 is already installed by setup hooks + + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io| + io.write "puts __FILE__" + end + + build_rake_in do + util_setup_installer do |spec| + spec.version = '1' + spec.files += %w[lib/rubygems_plugin.rb] + end.install + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + refute File.exist?(plugin_path), 'old version installed while newer version without plugin also installed, but plugin written' + + util_setup_installer do |spec| + spec.version = '2' + spec.files += %w[lib/rubygems_plugin.rb] + end.install + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + assert File.exist?(plugin_path), 'latest version reinstalled, but plugin not written' + assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content' + + util_setup_installer do |spec| + spec.version = '3' + spec.files += %w[lib/rubygems_plugin.rb] + end.install + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + assert File.exist?(plugin_path), 'latest version installed, but plugin removed' + assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content' + + util_setup_installer do |spec| + spec.version = '4' + end.install + + refute File.exist?(plugin_path), 'new version installed without a plugin while older version with a plugin installed, but plugin not removed' + end + end + def test_initialize spec = util_spec 'a' do |s| s.platform = Gem::Platform.new 'mswin32' @@ -940,7 +1004,13 @@ def test_install_creates_binstub_that_understand_version end def test_install_creates_binstub_that_prefers_user_installed_gem_to_default - install_default_gems new_default_spec('default', '2') + default_spec = new_default_spec('default', '2', nil, 'exe/executable') + default_spec.executables = 'executable' + install_default_gems default_spec + + exe = File.join @gemhome, 'bin', 'executable' + + assert_path_exists exe, "default gem's executable not installed" installer = util_setup_installer do |spec| spec.name = 'default' @@ -958,8 +1028,6 @@ def test_install_creates_binstub_that_prefers_user_installed_gem_to_default end end - exe = File.join @gemhome, 'bin', 'executable' - e = assert_raises RuntimeError do instance_eval File.read(exe) end diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 76a66af867c4e5..7f773febbce1f1 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -153,20 +153,18 @@ def test_self_fetcher_with_proxy assert_equal proxy_uri, fetcher.instance_variable_get(:@proxy).to_s end - def test_fetch_size_bad_uri + def test_fetch_path_bad_uri fetcher = Gem::RemoteFetcher.new nil @fetcher = fetcher e = assert_raises ArgumentError do - Gem::Deprecate.skip_during do - fetcher.fetch_size 'gems.example.com/yaml' - end + @fetcher.fetch_path("gems.example.com/yaml", nil, true) end assert_equal 'uri scheme is invalid: nil', e.message end - def test_fetch_size_socket_error + def test_fetch_path_socket_error fetcher = Gem::RemoteFetcher.new nil @fetcher = fetcher def fetcher.request(uri, request_class, last_modified = nil) @@ -175,9 +173,7 @@ def fetcher.request(uri, request_class, last_modified = nil) uri = 'http://gems.example.com/yaml' e = assert_raises Gem::RemoteFetcher::FetchError do - Gem::Deprecate.skip_during do - fetcher.fetch_size uri - end + @fetcher.fetch_path(uri, nil, true) end assert_equal "SocketError: oops (#{uri})", e.message @@ -186,9 +182,8 @@ def fetcher.request(uri, request_class, last_modified = nil) def test_no_proxy use_ui @stub_ui do assert_data_from_server @fetcher.fetch_path(@server_uri) - Gem::Deprecate.skip_during do - assert_equal SERVER_DATA.size, @fetcher.fetch_size(@server_uri) - end + response = @fetcher.fetch_path(@server_uri, nil, true) + assert_equal SERVER_DATA.size, response['content-length'].to_i end end @@ -917,7 +912,6 @@ def test_ssl_connection end def test_ssl_client_cert_auth_connection - skip 'openssl is missing' unless defined?(OpenSSL::SSL) skip 'openssl in jruby fails' if java_platform? ssl_server = self.class.start_ssl_server({ @@ -935,8 +929,6 @@ def test_ssl_client_cert_auth_connection end def test_do_not_allow_invalid_client_cert_auth_connection - skip 'openssl is missing' unless defined?(OpenSSL::SSL) - ssl_server = self.class.start_ssl_server({ :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT}) @@ -1083,9 +1075,6 @@ def proxy_server_port DIR = File.expand_path(File.dirname(__FILE__)) def start_ssl_server(config = {}) - raise MiniTest::Skip, 'openssl not installed' unless - defined?(OpenSSL::SSL) - null_logger = NilLog.new server = WEBrick::HTTPServer.new({ :Port => 0, @@ -1109,8 +1098,8 @@ def start_ssl_server(config = {}) begin server.start rescue Exception => ex - abort ex.message puts "ERROR during server thread: #{ex.message}" + raise ensure server.shutdown end diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb index ac344015e7cebb..fb718294710f52 100644 --- a/test/rubygems/test_gem_request_set.rb +++ b/test/rubygems/test_gem_request_set.rb @@ -183,6 +183,58 @@ def test_install_from_gemdeps_lockfile assert_path_exists File.join @gemhome, 'specifications', 'b-1.gemspec' end + def test_install_from_gemdeps_complex_dependencies + quick_gem("z", 1) + quick_gem("z", "1.0.1") + quick_gem("z", "1.0.2") + quick_gem("z", "1.0.3") + quick_gem("z", 2) + + spec_fetcher do |fetcher| + fetcher.download "z", 1 + end + + rs = Gem::RequestSet.new + installed = [] + + File.open 'Gemfile.lock', 'w' do |io| + io.puts <<-LOCKFILE +GEM + remote: #{@gem_repo} + specs: + z (1) + +PLATFORMS + #{Gem::Platform::RUBY} + +DEPENDENCIES + z (~> 1.0, >= 1.0.1) + LOCKFILE + end + + File.open 'testo.gemspec', 'w' do |io| + io.puts <<-LOCKFILE +Gem::Specification.new do |spec| + spec.name = 'testo' + spec.version = '1.0.0' + spec.add_dependency('z', '~> 1.0', '>= 1.0.1') +end + LOCKFILE + end + + File.open 'Gemfile', 'w' do |io| + io.puts("gemspec") + end + + rs.install_from_gemdeps :gemdeps => 'Gemfile' do |req, installer| + installed << req.full_name + end + + assert_includes installed, 'z-1.0.3' + + assert_path_exists File.join @gemhome, 'specifications', 'z-1.0.3.gemspec' + end + def test_install_from_gemdeps_version_mismatch spec_fetcher do |fetcher| fetcher.gem 'a', 2 diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index dbd45a31fd6b89..b7df8b71fd20b7 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -2784,7 +2784,7 @@ def test_validate_dependencies add_runtime_dependency 'l', '~> 1.2', '> 1.2.3' #{w}: open-ended dependency on o (>= 0) is not recommended use a bounded requirement, such as '~> x.y' -#{w}: See http://guides.rubygems.org/specification-reference/ for help +#{w}: See https://guides.rubygems.org/specification-reference/ for help EXPECTED assert_equal expected, @ui.error, 'warning' @@ -2816,7 +2816,7 @@ def test_validate_dependencies_duplicates end assert_equal <<-EXPECTED, @ui.error -#{w}: See http://guides.rubygems.org/specification-reference/ for help +#{w}: See https://guides.rubygems.org/specification-reference/ for help EXPECTED end end @@ -2927,7 +2927,7 @@ def test_validate_error end end - assert_match 'See http://guides.rubygems.org/specification-reference/ for help', @ui.error + assert_match 'See https://guides.rubygems.org/specification-reference/ for help', @ui.error end def test_validate_executables @@ -3100,7 +3100,7 @@ def test_validate_homepage assert_equal '"ftp://rubygems.org" is not a valid HTTP URI', e.message - @a1.homepage = 'http://rubygems.org' + @a1.homepage = 'https://rubygems.org/' assert_equal true, @a1.validate @a1.homepage = 'https://rubygems.org' @@ -3430,7 +3430,7 @@ def test_validate_warning @a1.validate end - assert_match 'See http://guides.rubygems.org/specification-reference/ for help', @ui.error + assert_match 'See https://guides.rubygems.org/specification-reference/ for help', @ui.error end def test_version @@ -3532,7 +3532,8 @@ def test_metadata_validates_ok s.metadata = { "one" => "two", "home" => "three", - "homepage_uri" => "https://example.com/user/repo" + "homepage_uri" => "https://example.com/user/repo", + "funding_uri" => "https://example.com/donate" } end diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb index bf5ef5b4a265c2..df8dfd9a957265 100644 --- a/test/rubygems/test_gem_uninstaller.rb +++ b/test/rubygems/test_gem_uninstaller.rb @@ -169,6 +169,41 @@ def test_remove_symlinked_gem_home end end + def test_remove_plugins + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io| + io.write "puts __FILE__" + end + + @spec.files += %w[lib/rubygems_plugin.rb] + + Gem::Installer.at(Gem::Package.build(@spec)).install + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + assert File.exist?(plugin_path), 'plugin not written' + + Gem::Uninstaller.new(nil).remove_plugins @spec + + refute File.exist?(plugin_path), 'plugin not removed' + end + + def test_regenerate_plugins_for + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io| + io.write "puts __FILE__" + end + + @spec.files += %w[lib/rubygems_plugin.rb] + + Gem::Installer.at(Gem::Package.build(@spec)).install + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + assert File.exist?(plugin_path), 'plugin not written' + + FileUtils.rm plugin_path + Gem::Uninstaller.new(nil).regenerate_plugins_for @spec + + assert File.exist?(plugin_path), 'plugin not regenerated' + end + def test_path_ok_eh uninstaller = Gem::Uninstaller.new nil @@ -524,6 +559,35 @@ def test_uninstall_prompt_includes_dep_type assert_match %r!Successfully uninstalled q-1!, lines.last end + def test_uninstall_prompt_only_lists_the_dependents_that_prevented_uninstallation + quick_gem 'r', '1' do |s| + s.add_development_dependency 'q', '= 1' + end + + quick_gem 's', '1' do |s| + s.add_dependency 'q', '= 1' + end + + quick_gem 'q', '1' + + un = Gem::Uninstaller.new('q', :check_dev => false) + ui = Gem::MockGemUi.new("y\n") + + use_ui ui do + un.uninstall + end + + lines = ui.output.split("\n") + lines.shift + + assert_match %r!You have requested to uninstall the gem:!, lines.shift + lines.shift + lines.shift + + assert_match %r!s-1 depends on q \(= 1\)!, lines.shift + assert_match %r!Successfully uninstalled q-1!, lines.last + end + def test_uninstall_no_permission uninstaller = Gem::Uninstaller.new @spec.name, :executables => true @@ -542,4 +606,44 @@ def test_uninstall_no_permission end end + def test_uninstall_keeps_plugins_up_to_date + write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io| + io.write "puts __FILE__" + end + + plugin_path = File.join Gem.plugins_dir, 'a_plugin.rb' + + @spec.version = '1' + Gem::Installer.at(Gem::Package.build(@spec)).install + + refute File.exist?(plugin_path), 'version without plugin installed, but plugin written' + + @spec.files += %w[lib/rubygems_plugin.rb] + @spec.version = '2' + Gem::Installer.at(Gem::Package.build(@spec)).install + + assert File.exist?(plugin_path), 'version with plugin installed, but plugin not written' + assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content' + + @spec.version = '3' + Gem::Installer.at(Gem::Package.build(@spec)).install + + assert File.exist?(plugin_path), 'version with plugin installed, but plugin removed' + assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version installed, but plugin updated' + + Gem::Uninstaller.new('a', :version => '1', :executables => true).uninstall + + assert File.exist?(plugin_path), 'plugin removed when old version uninstalled' + assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version uninstalled, but plugin updated' + + Gem::Uninstaller.new('a', version: '3', :executables => true).uninstall + + assert File.exist?(plugin_path), 'plugin removed when old version uninstalled and another version with plugin still present' + assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'latest version uninstalled, but plugin not updated to previous version' + + Gem::Uninstaller.new('a', version: '2', :executables => true).uninstall + + refute File.exist?(plugin_path), 'last version uninstalled, but plugin still present' + end + end diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb index 1deecc0eed2bee..30b9376e305c27 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -236,7 +236,7 @@ def assert_approximate_equal(expected, version) assert_equal expected, v(version).approximate_recommendation end - # Assert that the "approximate" recommendation for +version+ satifies +version+. + # Assert that the "approximate" recommendation for +version+ satisfies +version+. def assert_approximate_satisfies_itself(version) gem_version = v(version) From f8df531bbf4ae662fe6de2cf210a274c97d76bf3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 1 Feb 2020 11:23:34 +0900 Subject: [PATCH 587/878] Gem::Installer.new(String, options) is obsoleted. Explicitly converted to Gem::Package from String instance. --- tool/rbinstall.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index e5c34b59087c12..d13607f4b7afa1 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -904,7 +904,8 @@ def install_default_gem(dir, srcdir) Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) silent = Gem::SilentUI.new gems.each do |gem| - inst = Gem::Installer.new(gem, options) + package = Gem::Package.new(gem) + inst = Gem::Installer.new(package, options) inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) begin Gem::DefaultUserInteraction.use_ui(silent) {inst.install} From 563f177aa41519db655359576386d438e3694c48 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 1 Feb 2020 11:31:46 +0900 Subject: [PATCH 588/878] UnpackedInstaller on rbinstall.rb is inherited from Gem::Installer. It also needs to explicitly convert from String to Gem::Package with initialization. --- tool/rbinstall.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index d13607f4b7afa1..341adbf76571cd 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -724,7 +724,8 @@ def extract_files(destination_dir, pattern = "*") end def initialize(spec, *options) - super(spec.loaded_from, *options) + package = Gem::Package.new(spec.loaded_from) + super(package, *options) @package.extend(DirPackage).spec = spec end From 7cff2f458575237bc9f673a2001f56b5924920c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Sat, 1 Feb 2020 14:02:05 +0900 Subject: [PATCH 589/878] fix delete unnecessary return Was my mistake to put return here. --- ext/-test-/cxxanyargs/cxxanyargs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp index b0d48e04780e6d..30790696db0fa3 100644 --- a/ext/-test-/cxxanyargs/cxxanyargs.cpp +++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp @@ -156,7 +156,7 @@ namespace test_rb_rescue { { #ifdef HAVE_NULLPTR rb_rescue(RUBY_METHOD_FUNC(begin), self, nullptr, self); - return rb_rescue(begin, self, nullptr, self); + rb_rescue(begin, self, nullptr, self); #endif rb_rescue(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self); // old From a7e1e310dc828b209852af5535d3a38b704de2c9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 17:03:59 +0900 Subject: [PATCH 590/878] [ruby/irb] Exclude useless files from RDoc --- lib/irb/.document | 1 + lib/irb/lc/.document | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) create mode 100644 lib/irb/.document delete mode 100644 lib/irb/lc/.document diff --git a/lib/irb/.document b/lib/irb/.document new file mode 100644 index 00000000000000..3b0d6fa4ed6c1e --- /dev/null +++ b/lib/irb/.document @@ -0,0 +1 @@ +**/*.rb diff --git a/lib/irb/lc/.document b/lib/irb/lc/.document deleted file mode 100644 index 524bb9430b46b0..00000000000000 --- a/lib/irb/lc/.document +++ /dev/null @@ -1,4 +0,0 @@ -# hide help-message files which contain usage information -error.rb -ja/encoding_aliases.rb -ja/error.rb From 7f6bd6bb1c2220d2d7c17b77abf52fb4af548001 Mon Sep 17 00:00:00 2001 From: Taha Husain Date: Fri, 31 Jan 2020 13:04:33 +0530 Subject: [PATCH 591/878] fix rdoc formatting [ci skip] --- doc/NEWS-2.7.0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/NEWS-2.7.0 b/doc/NEWS-2.7.0 index 28f6c652de0969..1e845552de8c29 100644 --- a/doc/NEWS-2.7.0 +++ b/doc/NEWS-2.7.0 @@ -135,8 +135,7 @@ sufficient information, see the ChangeLog file or Redmine ==== Numbered parameters -* Numbered parameters as default block parameters are introduced. - [Feature #4475] +* Numbered parameters as default block parameters are introduced. [Feature #4475] [1, 2, 10].map { _1.to_s(16) } #=> ["1", "2", "a"] [[1, 2], [3, 4]].map { _1 + _2 } #=> [3, 7] From ab35876444f57e1a04f2053fa3ca69400f3f4d72 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 22:54:58 +0900 Subject: [PATCH 592/878] Explicitly set the encoding of ChangeLog file to UTF-8 [ci skip] --- tool/lib/vcs.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index c01c01da8eeeeb..a036d298f8f65a 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -636,6 +636,7 @@ def format_changelog(path, arg) cmd << date cmd.concat(arg) File.open(path, 'w') do |w| + w.print "-*- coding: utf-8 -*-\n\n" cmd_pipe(env, cmd, chdir: @srcdir) do |r| while s = r.gets("\ncommit ") if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '') From a2e215fea4aee398bc903176c4419b4425c98c60 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 23:24:43 +0900 Subject: [PATCH 593/878] Removed useless shebang and executable bit [ci skip] --- array.rb | 1 - 1 file changed, 1 deletion(-) mode change 100755 => 100644 array.rb diff --git a/array.rb b/array.rb old mode 100755 new mode 100644 index e1a0fc0168dc79..a49ab9823e196e --- a/array.rb +++ b/array.rb @@ -1,4 +1,3 @@ -#!/usr/bin/ruby class Array # call-seq: # ary.shuffle! -> ary From b68fc08092c7e41fb4cd34a00a59f2bfe8854720 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 23:11:23 +0900 Subject: [PATCH 594/878] Indent ChangeLog contents [ci skip] Separate each entries more obviously as `page-delimiter' works fine. --- tool/lib/vcs.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index a036d298f8f65a..63a1b70dca222e 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -639,19 +639,21 @@ def format_changelog(path, arg) w.print "-*- coding: utf-8 -*-\n\n" cmd_pipe(env, cmd, chdir: @srcdir) do |r| while s = r.gets("\ncommit ") + h, s = s.split(/^$/, 2) + h.gsub!(/^(?:Author|Date): /, ' \&') if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '') fix = $1 - h, s = s.split(/^$/, 2) s = s.lines fix.each_line do |x| if %r[^ +(\d+)s/(.+)/(.*)/] =~ x s[$1.to_i][$2] = $3 end end - s = [h, s.join('')].join('') + s = s.join('') end s.gsub!(/ +\n/, "\n") - w.print s + s.sub!(/^Notes:/, ' \&') + w.print h, s end end end From 37e0f55c5a317b2b974997ee28131705222484b7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 16:26:35 +0900 Subject: [PATCH 595/878] [ruby/irb] Reformat LICENSE.txt [ci skip] To be valid as an ordered list. https://github.com/ruby/irb/commit/078205e57d --- BSDL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BSDL b/BSDL index a009caefea81f2..66d93598aa32e9 100644 --- a/BSDL +++ b/BSDL @@ -4,10 +4,10 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE From 7e2ed7d1aaee74b6d1df82f8f97677c513b3878b Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 29 Jan 2020 00:21:25 +0900 Subject: [PATCH 596/878] [ruby/irb] Add a new easter egg: dancing ruby https://github.com/ruby/irb/commit/e37dc7e58e --- lib/irb.rb | 1 + lib/irb/completion.rb | 6 +- lib/irb/easter-egg.rb | 137 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 5 deletions(-) create mode 100644 lib/irb/easter-egg.rb diff --git a/lib/irb.rb b/lib/irb.rb index ac868d9405d1f1..de5af30abe7a9b 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -21,6 +21,7 @@ require "irb/color" require "irb/version" +require "irb/easter-egg" # IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby # expressions read from the standard input. diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 474d13cdbbb8fe..1897b4928f3671 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -268,11 +268,7 @@ def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace PerfectMatchedProc = ->(matched) { RDocRIDriver ||= RDoc::RI::Driver.new if matched =~ /\A(?:::)?RubyVM/ and not ENV['RUBY_YES_I_AM_NOT_A_NORMAL_USER'] - File.open(File.join(__dir__, 'ruby_logo.aa')) do |f| - RDocRIDriver.page do |io| - IO.copy_stream(f, io) - end - end + IRB.send(:easter_egg) return end namespace = retrieve_completion_data(matched, doc_namespace: true) diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb new file mode 100644 index 00000000000000..10468bcd92ccca --- /dev/null +++ b/lib/irb/easter-egg.rb @@ -0,0 +1,137 @@ +require "reline" + +module IRB + class << self + class Vec + def initialize(x, y, z) + @x, @y, @z = x, y, z + end + + attr_reader :x, :y, :z + + def sub(other) + Vec.new(@x - other.x, @y - other.y, @z - other.z) + end + + def dot(other) + @x*other.x + @y*other.y + @z*other.z + end + + def cross(other) + ox, oy, oz = other.x, other.y, other.z + Vec.new(@y*oz-@z*oy, @z*ox-@x*oz, @x*oy-@y*ox) + end + + def normalize + r = Math.sqrt(self.dot(self)) + Vec.new(@x / r, @y / r, @z / r) + end + end + + class Canvas + def initialize((h, w)) + @data = (0..h-2).map { [0] * w } + @scale = [w / 2.0, h-2].min + @center = Complex(w / 2, h-2) + end + + def line((x1, y1), (x2, y2)) + p1 = Complex(x1, y1) / 2 * @scale + @center + p2 = Complex(x2, y2) / 2 * @scale + @center + line0(p1, p2) + end + + private def line0(p1, p2) + mid = (p1 + p2) / 2 + if (p1 - p2).abs < 1 + x, y = mid.rect + @data[y / 2][x] |= (y % 2 > 1 ? 2 : 1) + else + line0(p1, mid) + line0(p2, mid) + end + end + + def draw + @data.each {|row| row.fill(0) } + yield + @data.map {|row| row.map {|n| " ',;"[n] }.join }.join("\n") + end + end + + class RubyModel + def initialize + @faces = init_ruby_model + end + + def init_ruby_model + cap_vertices = (0..5).map {|i| Vec.new(*Complex.polar(1, i * Math::PI / 3).rect, 1) } + middle_vertices = (0..5).map {|i| Vec.new(*Complex.polar(2, (i + 0.5) * Math::PI / 3).rect, 0) } + bottom_vertex = Vec.new(0, 0, -2) + + faces = [cap_vertices] + 6.times do |j| + i = j-1 + faces << [cap_vertices[i], middle_vertices[i], cap_vertices[j]] + faces << [cap_vertices[j], middle_vertices[i], middle_vertices[j]] + faces << [middle_vertices[i], bottom_vertex, middle_vertices[j]] + end + + faces + end + + def render_frame(i) + angle = i / 10.0 + dir = Vec.new(*Complex.polar(1, angle).rect, Math.sin(angle)).normalize + dir2 = Vec.new(*Complex.polar(1, angle - Math::PI/2).rect, 0) + up = dir.cross(dir2) + nm = dir.cross(up) + @faces.each do |vertices| + v0, v1, v2, = vertices + if v1.sub(v0).cross(v2.sub(v0)).dot(dir) > 0 + points = vertices.map {|p| [nm.dot(p), up.dot(p)] } + (points + [points[0]]).each_cons(2) do |p1, p2| + yield p1, p2 + end + end + end + end + end + + private def easter_egg(type = nil) + type ||= [:logo, :dancing].sample + case type + when :logo + File.open(File.join(__dir__, 'ruby_logo.aa')) do |f| + require "rdoc" + RDoc::RI::Driver.new.page do |io| + IO.copy_stream(f, io) + end + end + when :dancing + begin + canvas = Canvas.new(Reline.get_screen_size) + Reline::IOGate.set_winch_handler do + canvas = Canvas.new(Reline.get_screen_size) + end + ruby_model = RubyModel.new + print "\e[?1049h" + (0..).each do |i| + buff = canvas.draw do + ruby_model.render_frame(i) do |p1, p2| + canvas.line(p1, p2) + end + end + buff[0, 20] = "\e[0mPress Ctrl+C to stop\e[31m\e[1m" + print "\e[H" + buff + sleep 0.05 + end + ensure + print "\e[0m\e[?1049l" + end + end + end + end +end + +IRB.send(:easter_egg, ARGV[0]&.to_sym) if $0 == __FILE__ From ac1f4fa469cfcced9639dd1b148abe37a957c8e7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 1 Feb 2020 16:27:03 +0900 Subject: [PATCH 597/878] [ruby/irb] Exclude useless files from RDoc https://github.com/ruby/irb/commit/8f1ab2400c --- lib/irb/irb.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb/irb.gemspec b/lib/irb/irb.gemspec index c3208954c5d854..c910bbb5c55da8 100644 --- a/lib/irb/irb.gemspec +++ b/lib/irb/irb.gemspec @@ -17,6 +17,7 @@ Gem::Specification.new do |spec| spec.license = "BSD-2-Clause" spec.files = [ + ".document", "Gemfile", "LICENSE.txt", "README.md", @@ -52,7 +53,6 @@ Gem::Specification.new do |spec| "lib/irb/init.rb", "lib/irb/input-method.rb", "lib/irb/inspector.rb", - "lib/irb/lc/.document", "lib/irb/lc/error.rb", "lib/irb/lc/help-message", "lib/irb/lc/ja/encoding_aliases.rb", From 16d4774da1f0c5f5a78dff752780e77ebdf9b2f8 Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 31 Jan 2020 04:24:44 +0900 Subject: [PATCH 598/878] [ruby/reline] Fix Reline::Windows#scroll_down I mistook Right and Bottom. https://github.com/ruby/reline/commit/8be401c5f5 --- lib/reline/windows.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb index 74b62233e5bd9e..2492dffd271023 100644 --- a/lib/reline/windows.rb +++ b/lib/reline/windows.rb @@ -238,7 +238,7 @@ def self.erase_after_cursor def self.scroll_down(val) return if val.zero? - scroll_rectangle = [0, val, get_screen_size.first, get_screen_size.last].pack('s4') + scroll_rectangle = [0, val, get_screen_size.last, get_screen_size.first].pack('s4') destination_origin = 0 # y * 65536 + x fill = [' '.ord, 0].pack('SS') @@ScrollConsoleScreenBuffer.call(@@hConsoleHandle, scroll_rectangle, nil, destination_origin, fill) From 06c37fa5b4834c81470213a04dc73a63e69e9776 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sat, 1 Feb 2020 02:59:46 +0900 Subject: [PATCH 599/878] [ruby/reline] Bypass cursor down when a char is rendered at eol on Windows A newline is automatically inserted if a character is rendered at eol on Windows command prompt. https://github.com/ruby/reline/commit/4bfea07e4a --- lib/reline/ansi.rb | 4 ++++ lib/reline/general_io.rb | 4 ++++ lib/reline/line_editor.rb | 14 +++++++++++--- lib/reline/windows.rb | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 33b74f51afa98b..33bb1e465018cf 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -5,6 +5,10 @@ def self.encoding Encoding.default_external end + def self.win? + false + end + RAW_KEYSTROKE_CONFIG = { [27, 91, 65] => :ed_prev_history, # ↑ [27, 91, 66] => :ed_next_history, # ↓ diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb index 08b9d9c3aecb4f..85f1f13eed3bd7 100644 --- a/lib/reline/general_io.rb +++ b/lib/reline/general_io.rb @@ -5,6 +5,10 @@ def self.encoding RUBY_PLATFORM =~ /mswin|mingw/ ? Encoding::UTF_8 : Encoding::default_external end + def self.win? + false + end + RAW_KEYSTROKE_CONFIG = {} @@buf = [] diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 9ee361ec786800..c68847d1d47228 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -507,12 +507,20 @@ def rerender Reline::IOGate.move_cursor_column(0) visual_lines.each_with_index do |line, index| if line.nil? - Reline::IOGate.erase_after_cursor - move_cursor_down(1) - Reline::IOGate.move_cursor_column(0) + if Reline::IOGate.win? and calculate_width(visual_lines[index - 1], true) == Reline::IOGate.get_screen_size.last + # A newline is automatically inserted if a character is rendered at eol on command prompt. + else + Reline::IOGate.erase_after_cursor + move_cursor_down(1) + Reline::IOGate.move_cursor_column(0) + end next end @output.print line + if Reline::IOGate.win? and calculate_width(line, true) == Reline::IOGate.get_screen_size.last + # A newline is automatically inserted if a character is rendered at eol on command prompt. + @rest_height -= 1 if @rest_height > 0 + end @output.flush if @first_prompt @first_prompt = false diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb index 2492dffd271023..22a009ea66f0a5 100644 --- a/lib/reline/windows.rb +++ b/lib/reline/windows.rb @@ -5,6 +5,10 @@ def self.encoding Encoding::UTF_8 end + def self.win? + true + end + RAW_KEYSTROKE_CONFIG = { [224, 72] => :ed_prev_history, # ↑ [224, 80] => :ed_next_history, # ↓ From f5806eb2067f905d71bdce0553dcfeb8585d1371 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 2 Feb 2020 04:56:02 +0900 Subject: [PATCH 600/878] * 2020-02-02 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 48f3d8f0934045..f820e15f4a9b4b 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" From fae537259da3dd61fb62ae65d382a0ddc7c215dc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 2 Feb 2020 23:09:25 +0900 Subject: [PATCH 601/878] Removed no longer used variable `last_hash` 1. By substituting `n_var` with its initializer, `0 < n_var` is equivalent to `argc > argi + n_trail`. 2. As `argi` is non-negative, so `argi + n_trail >= n_trail`, and the above expression is equivalent to `argc > n_trail`. 3. Therefore, `f_last` is always false, and `last_hash` is no longer used. --- class.c | 7 +------ include/ruby/ruby.h | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/class.c b/class.c index 46f7cc307383ea..16b4a44e5fa3ac 100644 --- a/class.c +++ b/class.c @@ -1964,7 +1964,6 @@ struct rb_scan_args_t { int n_mand; int argi; VALUE hash; - VALUE last_hash; }; static void @@ -2065,11 +2064,7 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) var = va_arg(vargs, VALUE *); if (0 < n_var) { - if (var) { - int f_last = (arg->argc == arg->n_trail); - *var = rb_ary_new4(n_var - f_last, &arg->argv[argi]); - if (f_last) rb_ary_push(*var, arg->last_hash); - } + if (var) *var = rb_ary_new4(n_var, &arg->argv[argi]); argi += n_var; } else { diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index dc1eb29e0c2fa2..3402d7351530ff 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2482,7 +2482,7 @@ rb_scan_args_set(int argc, const VALUE *argv, # endif { int i, argi = 0, vari = 0; - VALUE *var, hash = Qnil, last_hash = 0; + VALUE *var, hash = Qnil; const int n_mand = n_lead + n_trail; if (f_hash && argc > 0 && rb_keyword_given_p()) { @@ -2517,11 +2517,7 @@ rb_scan_args_set(int argc, const VALUE *argv, var = vars[vari++]; if (0 < n_var) { - if (var) { - int f_last = (argc == n_trail); - *var = rb_ary_new4(n_var-f_last, &argv[argi]); - if (f_last) rb_ary_push(*var, last_hash); - } + if (var) *var = rb_ary_new4(n_var, &argv[argi]); argi += n_var; } else { From 9a446fd7ba73d9b74765a04fa745798af50c6d2e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 3 Feb 2020 08:44:51 +0900 Subject: [PATCH 602/878] `struct rb_scan_args_t::vargs` is never used --- class.c | 1 - 1 file changed, 1 deletion(-) diff --git a/class.c b/class.c index 16b4a44e5fa3ac..7cb31b6447072f 100644 --- a/class.c +++ b/class.c @@ -1954,7 +1954,6 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V struct rb_scan_args_t { int argc; const VALUE *argv; - va_list vargs; int f_var; int f_hash; int f_block; From d9552cbd5a85e76a4a2b9869cbcbb6d4dd7d257d Mon Sep 17 00:00:00 2001 From: git Date: Mon, 3 Feb 2020 10:27:09 +0900 Subject: [PATCH 603/878] * 2020-02-03 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index f820e15f4a9b4b..185e4da28ad413 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" From 0fa43b0c1b0126ed714733486eb20f70bec953f8 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 3 Feb 2020 11:51:10 +0900 Subject: [PATCH 604/878] test/rubygems/test_gem_remote_fetcher.rb: Remove a duplicated test https://rubyci.org/logs/rubyci.s3.amazonaws.com/ubuntu1604/ruby-master/log/20200203T003005Z.log.html.gz ``` /home/hsbt/chkbuild/tmp/build/20200203T003005Z/ruby/test/rubygems/test_gem_remote_fetcher.rb:485: warning: method redefined; discarding old test_fetch_path_socket_error /home/hsbt/chkbuild/tmp/build/20200203T003005Z/ruby/test/rubygems/test_gem_remote_fetcher.rb:167: warning: previous definition of test_fetch_path_socket_error was here ``` --- test/rubygems/test_gem_remote_fetcher.rb | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 7f773febbce1f1..55278afa4e5b95 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -164,21 +164,6 @@ def test_fetch_path_bad_uri assert_equal 'uri scheme is invalid: nil', e.message end - def test_fetch_path_socket_error - fetcher = Gem::RemoteFetcher.new nil - @fetcher = fetcher - def fetcher.request(uri, request_class, last_modified = nil) - raise SocketError, "oops" - end - - uri = 'http://gems.example.com/yaml' - e = assert_raises Gem::RemoteFetcher::FetchError do - @fetcher.fetch_path(uri, nil, true) - end - - assert_equal "SocketError: oops (#{uri})", e.message - end - def test_no_proxy use_ui @stub_ui do assert_data_from_server @fetcher.fetch_path(@server_uri) From 48c851f86846b273fba0692d5eae1eadf8bf9445 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 3 Feb 2020 10:49:17 +0900 Subject: [PATCH 605/878] Moved runtime assignemnts Separate assignemnts of dynamically given runtime values in `rb_scan_args_assign` from parsing statically given format in `rb_scan_args_parse`. --- class.c | 104 ++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/class.c b/class.c index 7cb31b6447072f..a29d1df7c60f65 100644 --- a/class.c +++ b/class.c @@ -1952,8 +1952,7 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V } struct rb_scan_args_t { - int argc; - const VALUE *argv; + int kw_flag; int f_var; int f_hash; int f_block; @@ -1962,30 +1961,15 @@ struct rb_scan_args_t { int n_trail; int n_mand; int argi; - VALUE hash; }; static void -rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, struct rb_scan_args_t *arg) +rb_scan_args_parse(int kw_flag, const char *fmt, struct rb_scan_args_t *arg) { const char *p = fmt; - int keyword_given = 0; - int last_hash_keyword = 0; memset(arg, 0, sizeof(*arg)); - arg->hash = Qnil; - - switch (kw_flag) { - case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS: - keyword_given = rb_keyword_given_p(); - break; - case RB_SCAN_ARGS_KEYWORDS: - keyword_given = 1; - break; - case RB_SCAN_ARGS_LAST_HASH_KEYWORDS: - last_hash_keyword = 1; - break; - } + arg->kw_flag = kw_flag; if (ISDIGIT(*p)) { arg->n_lead = *p - '0'; @@ -2015,42 +1999,49 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st rb_fatal("bad scan arg format: %s", fmt); } arg->n_mand = arg->n_lead + arg->n_trail; +} + +static int +rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *const argv, va_list vargs) +{ + int i, argi = 0; + VALUE *var, hash = Qnil; if (arg->f_hash && argc > 0) { VALUE last = argv[argc - 1]; - - if (keyword_given || (last_hash_keyword && RB_TYPE_P(last, T_HASH))) { - arg->hash = rb_hash_dup(last); + int keyword_given = 0; + switch (arg->kw_flag) { + case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS: + keyword_given = rb_keyword_given_p(); + break; + case RB_SCAN_ARGS_KEYWORDS: + keyword_given = 1; + break; + case RB_SCAN_ARGS_LAST_HASH_KEYWORDS: + keyword_given = RB_TYPE_P(last, T_HASH); + break; + } + if (keyword_given) { + hash = rb_hash_dup(last); argc--; } } - arg->argc = argc; - arg->argv = argv; -} - -static int -rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) -{ - int argi = 0; - int i; - VALUE *var; - - if (arg->argc < arg->n_mand) { - return 1; + if (argc < arg->n_mand) { + goto argc_error; } /* capture leading mandatory arguments */ for (i = arg->n_lead; i-- > 0; ) { var = va_arg(vargs, VALUE *); - if (var) *var = arg->argv[argi]; + if (var) *var = argv[argi]; argi++; } /* capture optional arguments */ for (i = arg->n_opt; i-- > 0; ) { var = va_arg(vargs, VALUE *); - if (argi < arg->argc - arg->n_trail) { - if (var) *var = arg->argv[argi]; + if (argi < argc - arg->n_trail) { + if (var) *var = argv[argi]; argi++; } else { @@ -2059,11 +2050,11 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) } /* capture variable length arguments */ if (arg->f_var) { - int n_var = arg->argc - argi - arg->n_trail; + int n_var = argc - argi - arg->n_trail; var = va_arg(vargs, VALUE *); if (0 < n_var) { - if (var) *var = rb_ary_new4(n_var, &arg->argv[argi]); + if (var) *var = rb_ary_new4(n_var, &argv[argi]); argi += n_var; } else { @@ -2073,13 +2064,13 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) /* capture trailing mandatory arguments */ for (i = arg->n_trail; i-- > 0; ) { var = va_arg(vargs, VALUE *); - if (var) *var = arg->argv[argi]; + if (var) *var = argv[argi]; argi++; } /* capture an option hash - phase 2: assignment */ if (arg->f_hash) { var = va_arg(vargs, VALUE *); - if (var) *var = arg->hash; + if (var) *var = hash; } /* capture iterator block */ if (arg->f_block) { @@ -2092,42 +2083,43 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs) } } - if (argi < arg->argc) return 1; + if (argi < argc) { + argc_error: + return -(argc + 1); + } - return 0; + return argc; } #undef rb_scan_args int rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) { - int error; va_list vargs; struct rb_scan_args_t arg; - rb_scan_args_parse(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, argc, argv, fmt, &arg); + rb_scan_args_parse(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, fmt, &arg); va_start(vargs,fmt); - error = rb_scan_args_assign(&arg, vargs); + argc = rb_scan_args_assign(&arg, argc, argv, vargs); va_end(vargs); - if (error) { - rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); + if (argc < 0) { + rb_error_arity(-1-argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); } - return arg.argc; + return argc; } int rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...) { - int error; va_list vargs; struct rb_scan_args_t arg; - rb_scan_args_parse(kw_flag, argc, argv, fmt, &arg); + rb_scan_args_parse(kw_flag, fmt, &arg); va_start(vargs,fmt); - error = rb_scan_args_assign(&arg, vargs); + argc = rb_scan_args_assign(&arg, argc, argv, vargs); va_end(vargs); - if (error) { - rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); + if (argc < 0) { + rb_error_arity(-1-argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); } - return arg.argc; + return argc; } int From 0ab7f2f2220cb40aa4c25f858b60eb9b4e9cb477 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 3 Feb 2020 13:07:34 +0900 Subject: [PATCH 606/878] Make `rb_scan_args_kw` inline too --- class.c | 15 ++------------- include/ruby/ruby.h | 44 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/class.c b/class.c index a29d1df7c60f65..c2abce12bb4239 100644 --- a/class.c +++ b/class.c @@ -2009,19 +2009,7 @@ rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *con if (arg->f_hash && argc > 0) { VALUE last = argv[argc - 1]; - int keyword_given = 0; - switch (arg->kw_flag) { - case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS: - keyword_given = rb_keyword_given_p(); - break; - case RB_SCAN_ARGS_KEYWORDS: - keyword_given = 1; - break; - case RB_SCAN_ARGS_LAST_HASH_KEYWORDS: - keyword_given = RB_TYPE_P(last, T_HASH); - break; - } - if (keyword_given) { + if (rb_scan_args_keyword_p(arg->kw_flag, last)) { hash = rb_hash_dup(last); argc--; } @@ -2107,6 +2095,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) return argc; } +#undef rb_scan_args_kw int rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...) { diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 3402d7351530ff..79ba9006dff988 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2293,6 +2293,20 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base); PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4); int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); +static inline int +rb_scan_args_keyword_p(int kw_flag, VALUE last) +{ + switch (kw_flag) { + case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS: + return rb_keyword_given_p(); + case RB_SCAN_ARGS_KEYWORDS: + return 1; + case RB_SCAN_ARGS_LAST_HASH_KEYWORDS: + return RB_TYPE_P(last, T_HASH); + } + return 0; +} + #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && defined(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__) # define rb_scan_args(argc,argvp,fmt,...) \ __builtin_choose_expr(__builtin_constant_p(fmt), \ @@ -2300,6 +2314,12 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \ ((VALUE*[]){__VA_ARGS__})), \ rb_scan_args(argc,argvp,fmt,##__VA_ARGS__)) +# define rb_scan_args_kw(kw_flag,argc,argvp,fmt,...) \ + __builtin_choose_expr(__builtin_constant_p(fmt), \ + rb_scan_args_kw0(kw_flag,argc,argvp,fmt, \ + (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \ + ((VALUE*[]){__VA_ARGS__})), \ + rb_scan_args_kw(kw_flag,argc,argvp,fmt,##__VA_ARGS__)) # if HAVE_ATTRIBUTE_ERRORFUNC ERRORFUNC(("bad scan arg format"), void rb_scan_args_bad_format(const char*)); ERRORFUNC(("variable argument length doesn't match"), void rb_scan_args_length_mismatch(const char*,int)); @@ -2457,7 +2477,16 @@ rb_scan_args_end_idx(const char *fmt) /* NOTE: Use `char *fmt` instead of `const char *fmt` because of clang's bug*/ /* https://bugs.llvm.org/show_bug.cgi?id=38095 */ # define rb_scan_args0(argc, argv, fmt, varc, vars) \ - rb_scan_args_set(argc, argv, \ + rb_scan_args_set(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, argc, argv, \ + rb_scan_args_n_lead(fmt), \ + rb_scan_args_n_opt(fmt), \ + rb_scan_args_n_trail(fmt), \ + rb_scan_args_f_var(fmt), \ + rb_scan_args_f_hash(fmt), \ + rb_scan_args_f_block(fmt), \ + (rb_scan_args_verify(fmt, varc), vars), (char *)fmt, varc) +# define rb_scan_args_kw0(kw_flag, argc, argv, fmt, varc, vars) \ + rb_scan_args_set(kw_flag, argc, argv, \ rb_scan_args_n_lead(fmt), \ rb_scan_args_n_opt(fmt), \ rb_scan_args_n_trail(fmt), \ @@ -2466,13 +2495,13 @@ rb_scan_args_end_idx(const char *fmt) rb_scan_args_f_block(fmt), \ (rb_scan_args_verify(fmt, varc), vars), (char *)fmt, varc) ALWAYS_INLINE(static int -rb_scan_args_set(int argc, const VALUE *argv, +rb_scan_args_set(int kw_flag, int argc, const VALUE *argv, int n_lead, int n_opt, int n_trail, int f_var, int f_hash, int f_block, VALUE *vars[], char *fmt, int varc)); inline int -rb_scan_args_set(int argc, const VALUE *argv, +rb_scan_args_set(int kw_flag, int argc, const VALUE *argv, int n_lead, int n_opt, int n_trail, int f_var, int f_hash, int f_block, VALUE *vars[], RB_UNUSED_VAR(char *fmt), RB_UNUSED_VAR(int varc)) @@ -2485,9 +2514,12 @@ rb_scan_args_set(int argc, const VALUE *argv, VALUE *var, hash = Qnil; const int n_mand = n_lead + n_trail; - if (f_hash && argc > 0 && rb_keyword_given_p()) { - hash = rb_hash_dup(argv[argc - 1]); - argc--; + if (f_hash && argc > 0) { + VALUE last = argv[argc - 1]; + if (rb_scan_args_keyword_p(kw_flag, last)) { + hash = rb_hash_dup(last); + argc--; + } } if (argc < n_mand) { From db69c5098781087c954e5fc0aaf3079a66f6d6d5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 3 Feb 2020 14:19:02 +0900 Subject: [PATCH 607/878] Parenthesized macro arguments --- include/ruby/ruby.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 79ba9006dff988..db2124f019c489 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2331,37 +2331,37 @@ ERRORFUNC(("variable argument length doesn't match"), void rb_scan_args_length_m # define rb_scan_args_isdigit(c) ((unsigned char)((c)-'0')<10) # define rb_scan_args_count_end(fmt, ofs, vari) \ - (fmt[ofs] ? -1 : (vari)) + ((fmt)[ofs] ? -1 : (vari)) # define rb_scan_args_count_block(fmt, ofs, vari) \ - (fmt[ofs]!='&' ? \ + ((fmt)[ofs]!='&' ? \ rb_scan_args_count_end(fmt, ofs, vari) : \ - rb_scan_args_count_end(fmt, ofs+1, vari+1)) + rb_scan_args_count_end(fmt, (ofs)+1, (vari)+1)) # define rb_scan_args_count_hash(fmt, ofs, vari) \ - (fmt[ofs]!=':' ? \ + ((fmt)[ofs]!=':' ? \ rb_scan_args_count_block(fmt, ofs, vari) : \ - rb_scan_args_count_block(fmt, ofs+1, vari+1)) + rb_scan_args_count_block(fmt, (ofs)+1, (vari)+1)) # define rb_scan_args_count_trail(fmt, ofs, vari) \ - (!rb_scan_args_isdigit(fmt[ofs]) ? \ + (!rb_scan_args_isdigit((fmt)[ofs]) ? \ rb_scan_args_count_hash(fmt, ofs, vari) : \ - rb_scan_args_count_hash(fmt, ofs+1, vari+(fmt[ofs]-'0'))) + rb_scan_args_count_hash(fmt, (ofs)+1, (vari)+((fmt)[ofs]-'0'))) # define rb_scan_args_count_var(fmt, ofs, vari) \ - (fmt[ofs]!='*' ? \ + ((fmt)[ofs]!='*' ? \ rb_scan_args_count_trail(fmt, ofs, vari) : \ - rb_scan_args_count_trail(fmt, ofs+1, vari+1)) + rb_scan_args_count_trail(fmt, (ofs)+1, (vari)+1)) # define rb_scan_args_count_opt(fmt, ofs, vari) \ - (!rb_scan_args_isdigit(fmt[ofs]) ? \ + (!rb_scan_args_isdigit((fmt)[ofs]) ? \ rb_scan_args_count_var(fmt, ofs, vari) : \ - rb_scan_args_count_var(fmt, ofs+1, vari+fmt[ofs]-'0')) + rb_scan_args_count_var(fmt, (ofs)+1, (vari)+(fmt)[ofs]-'0')) # define rb_scan_args_count_lead(fmt, ofs, vari) \ - (!rb_scan_args_isdigit(fmt[ofs]) ? \ - rb_scan_args_count_var(fmt, ofs, vari) : \ - rb_scan_args_count_opt(fmt, ofs+1, vari+fmt[ofs]-'0')) + (!rb_scan_args_isdigit((fmt)[ofs]) ? \ + rb_scan_args_count_var(fmt, ofs, vari) : \ + rb_scan_args_count_opt(fmt, (ofs)+1, (vari)+(fmt)[ofs]-'0')) # define rb_scan_args_count(fmt) rb_scan_args_count_lead(fmt, 0, 0) From a635c93fdebeda6347b8654af1a191e214ad7ccf Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 3 Feb 2020 16:57:41 +0900 Subject: [PATCH 608/878] support MJIT with debug option. VM_CHECK_MODE > 0 with optflags=-O0 can not run JIT tests because of link problems. This patch fix them. --- vm_insnhelper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d69340b071c283..d2b8a636765e77 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -217,7 +217,8 @@ vm_check_frame(VALUE type, static VALUE vm_stack_canary; /* Initialized later */ static bool vm_stack_canary_was_born = false; -static void +#ifndef MJIT_HEADER +MJIT_FUNC_EXPORTED void vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) { const struct rb_control_frame_struct *reg_cfp = ec->cfp; @@ -264,6 +265,8 @@ vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) name, stri, pos, strd); rb_bug("see above."); } +#endif + #else #define vm_check_canary(ec, sp) #define vm_check_frame(a, b, c, d) @@ -4818,7 +4821,8 @@ Init_vm_stack_canary(void) VM_ASSERT(n == 0); } -static void +#ifndef MJIT_HEADER +MJIT_FUNC_EXPORTED void vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c) { /* Because a method has already been called, why not call @@ -4829,6 +4833,7 @@ vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c) rb_bug("dead canary found at %s: %s", insn, str); } +#endif #else void Init_vm_stack_canary(void) { /* nothing to do */ } From 11963da9e8e98821860fbb0c0f2adc118860c814 Mon Sep 17 00:00:00 2001 From: Seiei Miyagi Date: Mon, 3 Feb 2020 17:43:03 +0900 Subject: [PATCH 609/878] Check type of empty keyword [Bug #16603] Co-authored-by: Yusuke Endoh --- compile.c | 2 +- test/ruby/test_keyword.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compile.c b/compile.c index eb36f57e0ffacc..9de9114c906661 100644 --- a/compile.c +++ b/compile.c @@ -4253,7 +4253,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popp FLUSH_CHUNK(); const NODE *kw = node->nd_next->nd_head; - int empty_kw = nd_type(kw) == NODE_LIT; /* foo( ..., **{}, ...) */ + int empty_kw = nd_type(kw) == NODE_LIT && RB_TYPE_P(kw->nd_lit, T_HASH); /* foo( ..., **{}, ...) */ int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */ int last_kw = !node->nd_next->nd_next; /* foo( ..., **kw) */ int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */ diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 75991ca0b49e02..db7d696644f7c3 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -4076,4 +4076,10 @@ def bar(x, y) mock.new.foo end end + + def test_splat_fixnum + bug16603 = '[ruby-core:97047] [Bug #16603]' + assert_raise(TypeError, bug16603) { p(**42) } + assert_raise(TypeError, bug16603) { p(k:1, **42) } + end end From f2552216d43040cd42bbb9fd484eab6c70856fe6 Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Mon, 3 Feb 2020 12:29:37 +0100 Subject: [PATCH 610/878] Fix SimpleDelegator respond_to? regression In 2.6, SimpleDelegator would always use the target `respond_to?` In 2.7.0 it doesn't if the target does not inherit from Object. This breaks compatibility for delegated objects that inherit from BasicObject and redefine `respond_to?`. --- lib/delegate.rb | 9 ++++++++- test/test_delegate.rb | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/delegate.rb b/lib/delegate.rb index b7d48effb4ac4b..e3b3488c1613d5 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -103,13 +103,20 @@ def respond_to_missing?(m, include_private) r end + KERNEL_RESPOND_TO = ::Kernel.instance_method(:respond_to?) + private_constant :KERNEL_RESPOND_TO + # Handle BasicObject instances private def target_respond_to?(target, m, include_private) case target when Object target.respond_to?(m, include_private) else - ::Kernel.instance_method(:respond_to?).bind_call(target, m, include_private) + if KERNEL_RESPOND_TO.bind_call(target, :respond_to?) + target.respond_to?(m, include_private) + else + KERNEL_RESPOND_TO.bind_call(target, m, include_private) + end end end diff --git a/test/test_delegate.rb b/test/test_delegate.rb index 9c477438881651..4a3445f1212e81 100644 --- a/test/test_delegate.rb +++ b/test/test_delegate.rb @@ -344,6 +344,20 @@ def o.bar; 1; end assert_raise(NoMethodError, /undefined method `foo' for/) { delegate.foo } end + def test_basicobject_respond_to + o = BasicObject.new + def o.bar + nil + end + + def o.respond_to?(method, include_private=false) + return false if method == :bar + ::Kernel.instance_method(:respond_to?).bind_call(self, method, include_private) + end + delegate = SimpleDelegator.new(o) + refute delegate.respond_to?(:bar) + end + def test_keyword_argument k = EnvUtil.labeled_class("Target") do def test(a, k:) [a, k]; end From e7739b600fd3658eaec6ded7190fa997a7dd2d2d Mon Sep 17 00:00:00 2001 From: git Date: Tue, 4 Feb 2020 01:16:41 +0900 Subject: [PATCH 611/878] * 2020-02-04 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 185e4da28ad413..13e6bc815930d9 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" From a4fca28b805cc8714cad1107424d97b822bf6414 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Wed, 29 Jan 2020 15:23:03 +0100 Subject: [PATCH 612/878] Fix description of Encoding.default_(in|ex)ternal Data written to files is not transcoded per default, but only when default_internal is set. The default for default_internal is nil and doesn't depend on the source file encoding. --- encoding.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/encoding.c b/encoding.c index c50a470d05d113..c77d3519b40fd7 100644 --- a/encoding.c +++ b/encoding.c @@ -1475,7 +1475,7 @@ rb_enc_default_external(void) * encoding may not be valid. Be sure to check String#valid_encoding?. * * File data written to disk will be transcoded to the default external - * encoding when written. + * encoding when written, if default_internal is not nil. * * The default external encoding is initialized by the locale or -E option. */ @@ -1560,8 +1560,7 @@ rb_enc_default_internal(void) * The script encoding (__ENCODING__), not default_internal, is used as the * encoding of created strings. * - * Encoding::default_internal is initialized by the source file's - * internal_encoding or -E option. + * Encoding::default_internal is initialized with -E option or nil otherwise. */ static VALUE get_default_internal(VALUE klass) From 7c165bd7d9451cc5c9fc833807ca071d7012e138 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 26 Jan 2020 16:37:34 +0300 Subject: [PATCH 613/878] Fix linkage of popen_deadlock test DEBUG: BUILDSTDERR: /usr/bin/ld: infinite_loop_dlsym.o: in function `native_loop_dlsym': DEBUG: BUILDSTDERR: /builddir/build/BUILD/ruby-2.7.0/ext/-test-/popen_deadlock/infinite_loop_dlsym.c:16: undefined reference to `dlsym' DEBUG: BUILDSTDERR: collect2: error: ld returned 1 exit status Ruby was built with LibreSSL. --- ext/-test-/popen_deadlock/extconf.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/-test-/popen_deadlock/extconf.rb b/ext/-test-/popen_deadlock/extconf.rb index 24a7d799310f96..6b6ee7a6b811cf 100644 --- a/ext/-test-/popen_deadlock/extconf.rb +++ b/ext/-test-/popen_deadlock/extconf.rb @@ -1,5 +1,6 @@ # frozen_string_literal: false case RUBY_PLATFORM when /solaris/i, /linux/i + $LDFLAGS << " -ldl" create_makefile("-test-/popen_deadlock/infinite_loop_dlsym") end From 7a51d979cf9c98209b7c1b1d54016348e8124904 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Mon, 27 Jan 2020 13:15:46 +0100 Subject: [PATCH 614/878] Fix inaccuracy in encoding tests These tests assume Encoding.find('locale') == Encoding.find('external') and fail if they are distinct. --- test/readline/test_readline.rb | 2 +- test/ruby/test_rubyoptions.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index d2e2cdd4a00f41..0c65d52087e2c0 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -546,7 +546,7 @@ def test_using_quoting_detection_proc_with_multibyte_input saved_completer_quote_characters = Readline.completer_quote_characters saved_completer_word_break_characters = Readline.completer_word_break_characters return unless Readline.respond_to?(:quoting_detection_proc=) - unless Encoding.find("external") == Encoding::UTF_8 + unless get_default_internal_encoding == Encoding::UTF_8 return if assert_under_utf8 omit 'this test needs UTF-8 locale' end diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 0aa253a74f8d79..890f4c9b4ec680 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -285,7 +285,7 @@ def test_encoding /unknown encoding name - test_ruby_test_rubyoptions_foobarbazqux \(RuntimeError\)/) if /mswin|mingw|aix|android/ =~ RUBY_PLATFORM && - (str = "\u3042".force_encoding(Encoding.find("locale"))).valid_encoding? + (str = "\u3042".force_encoding(Encoding.find("external"))).valid_encoding? # This result depends on locale because LANG=C doesn't affect locale # on Windows. # On AIX, the source encoding of stdin with LANG=C is ISO-8859-1, @@ -838,11 +838,11 @@ def test_unmatching_glob def test_command_line_glob_nonascii bug10555 = '[ruby-dev:48752] [Bug #10555]' name = "\u{3042}.txt" - expected = name.encode("locale") rescue "?.txt" + expected = name.encode("external") rescue "?.txt" with_tmpchdir do |dir| open(name, "w") {} assert_in_out_err(["-e", "puts ARGV", "?.txt"], "", [expected], [], - bug10555, encoding: "locale") + bug10555, encoding: "external") end end @@ -877,7 +877,7 @@ def test_command_line_glob_noncodepage with_tmpchdir do |dir| Ougai.each {|f| open(f, "w") {}} assert_in_out_err(["-Eutf-8", "-e", "puts ARGV", "*"], "", Ougai, encoding: "utf-8") - ougai = Ougai.map {|f| f.encode("locale", replace: "?")} + ougai = Ougai.map {|f| f.encode("external", replace: "?")} assert_in_out_err(["-e", "puts ARGV", "*.txt"], "", ougai) end end From 9cdc964d075fc3d21b8ce8456ac88f57a5183ec0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 4 Feb 2020 14:41:52 +0900 Subject: [PATCH 615/878] Do not warn CR inside string literal --- parse.y | 14 ++++++++------ test/ruby/test_syntax.rb | 9 +++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/parse.y b/parse.y index c0d4639509c7ee..11ef0f77cb27e7 100644 --- a/parse.y +++ b/parse.y @@ -6260,11 +6260,6 @@ parser_cr(struct parser_params *p, int c) p->lex.pcur++; c = '\n'; } - else if (!p->cr_seen) { - p->cr_seen = TRUE; - /* carried over with p->lex.nextline for nextc() */ - rb_warn0("encountered \\r in middle of line, treated as a mere space"); - } return c; } @@ -8833,7 +8828,14 @@ parser_yylex(struct parser_params *p) return 0; /* white spaces */ - case ' ': case '\t': case '\f': case '\r': + case '\r': + if (!p->cr_seen) { + p->cr_seen = TRUE; + /* carried over with p->lex.nextline for nextc() */ + rb_warn0("encountered \\r in middle of line, treated as a mere space"); + } + /* fall through */ + case ' ': case '\t': case '\f': case '\13': /* '\v' */ space_seen = 1; #ifdef RIPPER diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 5591b7cb31f87b..f92966fda963a5 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -949,9 +949,14 @@ def test__END___cr def test_warning_for_cr feature8699 = '[ruby-core:56240] [Feature #8699]' - assert_warning(/encountered \\r/, feature8699) do - eval("\r""__id__\r") + s = assert_warning(/encountered \\r/, feature8699) do + eval("'\r'\r") end + assert_equal("\r", s) + s = assert_warning('') do + eval("'\r'\r\n") + end + assert_equal("\r", s) end def test_unexpected_fraction From 7d6903dc476f982e7b432adbeef3a3d9372a309f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 4 Feb 2020 15:21:49 +0900 Subject: [PATCH 616/878] Add the loaded feature after no exception raised Retrying after rescued `require` should try to load the same library again. [Bug #16607] --- load.c | 3 +-- test/ruby/test_require.rb | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/load.c b/load.c index 70a04756c668bd..0cb0dd3cfa8dd7 100644 --- a/load.c +++ b/load.c @@ -1014,7 +1014,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) result = 0; } else if (!*ftptr) { - rb_provide_feature(path); result = TAG_RETURN; } else { @@ -1029,7 +1028,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); break; } - rb_provide_feature(path); result = TAG_RETURN; } } @@ -1063,6 +1061,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) rb_exc_raise(ec->errinfo); } + if (result == TAG_RETURN) rb_provide_feature(path); ec->errinfo = errinfo; RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname)); diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 7e53a02fb81e84..000ae99fed112d 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -216,6 +216,13 @@ def test_require_syntax_error assert_syntax_error_backtrace {|req| require req} end + def test_require_syntax_error_rescued + assert_syntax_error_backtrace do |req| + assert_raise_with_message(SyntaxError, /unexpected/) {require req} + require req + end + end + def test_load_syntax_error assert_syntax_error_backtrace {|req| load req} end From 0529fead361c05754550e39daaa54076a04df6a3 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 4 Feb 2020 19:29:27 +0900 Subject: [PATCH 617/878] assert_separately uses their own pipe instead of stdout --- tool/lib/test/unit/core_assertions.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 00555d6e32cfa3..6742e5043b3259 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,11 +110,13 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o file ||= loc.path line ||= loc.lineno end + res_p, res_c = IO.pipe + opt[res_c.fileno] = res_c.fileno src = < marshal_error ignore_stderr = nil end From 9b9a621ae35bd6aefe78ff8a22874d8036ddd883 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 4 Feb 2020 20:54:48 +0900 Subject: [PATCH 618/878] On Windows it cannot receive fd except 0..2 --- tool/lib/test/unit/core_assertions.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 6742e5043b3259..7ff986127f994d 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,11 +110,16 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o file ||= loc.path line ||= loc.lineno end - res_p, res_c = IO.pipe - opt[res_c.fileno] = res_c.fileno + if /mswin|mingw/ =~ RUBY_PLATFORM + res_fd = 1 # STDOUT + else + res_p, res_c = IO.pipe + opt[res_c.fileno] = res_c.fileno + res_fd = res_c.fileno + end src = < marshal_error ignore_stderr = nil end From 3c7a09ece8f5ddab2a0e71918dc976cd1cd0ec92 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Tue, 4 Feb 2020 20:54:20 +0900 Subject: [PATCH 619/878] Add call-seq to Pathname#open from File.open before: ``` open(p1 = v1, p2 = v2, p3 = v3) ``` --- ext/pathname/pathname.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index e511560500cb1c..6b51b15f103f9c 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -657,6 +657,13 @@ path_make_link(VALUE self, VALUE old) } /* + * call-seq: + * pathname.open() + * pathname.open(mode="r" [, opt]) -> file + * pathname.open([mode [, perm]] [, opt]) -> file + * pathname.open(mode="r" [, opt]) {|file| block } -> obj + * pathname.open([mode [, perm]] [, opt]) {|file| block } -> obj + * * Opens the file for reading or writing. * * See File.open. From 390a9d3b725a4ea7852f2cabf066b78855869472 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 4 Feb 2020 21:51:57 +0900 Subject: [PATCH 620/878] just use STDOUT --- tool/lib/test/unit/core_assertions.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 7ff986127f994d..8911fadae378fc 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,16 +110,14 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o file ||= loc.path line ||= loc.lineno end - if /mswin|mingw/ =~ RUBY_PLATFORM - res_fd = 1 # STDOUT - else + if /mswin|mingw/ !~ RUBY_PLATFORM res_p, res_c = IO.pipe opt[res_c.fileno] = res_c.fileno res_fd = res_c.fileno end src = < Date: Wed, 5 Feb 2020 08:47:47 +0900 Subject: [PATCH 621/878] Get rid of nested string interpolations to be editor-friendly --- tool/lib/test/unit/core_assertions.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 8911fadae378fc..aa5c7d618d77cf 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,14 +110,16 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o file ||= loc.path line ||= loc.lineno end - if /mswin|mingw/ !~ RUBY_PLATFORM + if /mswin|mingw/ =~ RUBY_PLATFORM + res_out = "STDOUT" + else res_p, res_c = IO.pipe opt[res_c.fileno] = res_c.fileno - res_fd = res_c.fileno + res_out = "IO.new(#{res_c.fileno}, 'w')" end src = < Date: Wed, 5 Feb 2020 09:30:12 +0900 Subject: [PATCH 622/878] Fixed FD leaks --- tool/lib/test/unit/core_assertions.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index aa5c7d618d77cf..b19c3e5d5243e0 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -139,6 +139,7 @@ class Test::Unit::Runner res_c.close print stdout res = Marshal.load(res_p.read.unpack("m")[0]) + res_p.close else res = Marshal.load(stdout.unpack("m")[0]) end From 0226d72e953733759414aa3ffbecfe7eed195858 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 5 Feb 2020 09:35:29 +0900 Subject: [PATCH 623/878] Fixed the output from separated test in parallel test To output to the STDOUT of the parent process according to the parallel test protocol, should send to the `MiniTest::Unit.output` instead of each own STDOUT. --- tool/lib/test/unit/core_assertions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index b19c3e5d5243e0..3eecf45ace2e76 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -137,7 +137,7 @@ class Test::Unit::Runner begin if res_c res_c.close - print stdout + MiniTest::Unit.output.print stdout res = Marshal.load(res_p.read.unpack("m")[0]) res_p.close else From 940cd3b916063338d83f8308086b6e89b1504900 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 5 Feb 2020 09:42:29 +0900 Subject: [PATCH 624/878] * 2020-02-05 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 13e6bc815930d9..ded50fdf7aa012 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" From 26ffd6e409fad94b3a24420156ab4b2897732cbc Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Wed, 15 Jan 2020 14:40:01 +0100 Subject: [PATCH 625/878] Increase the frozen_strings table initial size It was set to 1000 in a4a2b9be7a55bb61d17cf9673ed0d2a93bb52d31. However on ruby-2.7.0p0, there are much more than 1k frozen string right after boot: ``` $ ruby -robjspace -e 'p ObjectSpace.each_object(String).select { |s| s.frozen? && ObjectSpace.dump(s).include?(%{"fstring":true})}.uniq.count' 5948 ``` --- vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm.c b/vm.c index e772d3b1124413..fae2b6812738e1 100644 --- a/vm.c +++ b/vm.c @@ -3344,7 +3344,7 @@ Init_vm_objects(void) /* initialize mark object array, hash */ vm->mark_object_ary = rb_ary_tmp_new(128); vm->loading_table = st_init_strtable(); - vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 1000); + vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000); } /* top self */ From d16f4220dadb7388f3328b8e7886d1dee40b60e3 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 6 Feb 2020 10:38:41 +0900 Subject: [PATCH 626/878] * 2020-02-06 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index ded50fdf7aa012..65a6755ad88edc 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" From 7c20a2c83cc50ef33d1095be8806ddacb0f8b321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 4 Feb 2020 11:47:04 +0900 Subject: [PATCH 627/878] emacs mode addition Now that we have C++ header files, why not let their indents follow our way. --- .dir-locals.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.dir-locals.el b/.dir-locals.el index 7c32d1f7ee2445..8f4b96445ceeea 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -24,6 +24,8 @@ (c-mode . ((c-file-style . "ruby"))) + (c++-mode . ((c-file-style . "ruby"))) + (change-log-mode . ((buffer-file-coding-system . us-ascii) (indent-tabs-mode . t) From 3b69552a5ca1fb814fd7279edd970be458a907f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Sat, 21 Dec 2019 17:14:20 +0900 Subject: [PATCH 628/878] add predefined macros for Doxygen Predefined macros are practices not very well recommended, but can be better than having no documents at all. Without those predefined macros, Doxygen confused for instace PUREFUNC(int foo()) to be a declaration of PUREFUNC, not foo. --- template/Doxyfile.tmpl | 46 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/template/Doxyfile.tmpl b/template/Doxyfile.tmpl index a16e43bc65ecdd..59c184b6be9312 100644 --- a/template/Doxyfile.tmpl +++ b/template/Doxyfile.tmpl @@ -214,12 +214,52 @@ PERLMOD_MAKEVAR_PREFIX = # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = <%=srcdir%> <%=srcdir%>/include INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = \ + ALWAYS_INLINE(_)=_ \ + COLDFUNC= \ + CONSTFUNC(_)=_ \ + DEPRECATED(_)=_ \ + DEPRECATED_BY(__,_)=_ \ + DEPRECATED_TYPE(__,_)=_ \ + ERRORFUNC(__,_)=_ \ + MJIT_FUNC_EXPORTED= \ + MJIT_STATIC=extern \ + MJIT_SYMBOL_EXPORT_BEGIN= \ + MJIT_SYMBOL_EXPORT_END= \ + NOINLINE(_)=_ \ + NORETURN(_)=_ \ + PRINTF_ARGS(_,__,___)=_ \ + PUREFUNC(_)=_ \ + RUBY_EXTERN=extern \ + RUBY_FUNC_EXPORTED= \ + RUBY_FUNC_NONNULL(__,_)=_ \ + RUBY_SYMBOL_EXPORT_BEGIN= \ + RUBY_SYMBOL_EXPORT_END= \ + WARNINGFUNC(__,_)=_ \ + _MSC_VER=1924 \ + __DOXYGEN__ \ + __GNUC_MINOR__=0 \ + __GNUC_PATCHLEVEL__=0 \ + __GNUC__=10 \ + __STDC_VERSION__=201710L \ + __clang__=10 \ + __clang_major__=10 \ + __clang_minor__=0 \ + __clang_patchlevel__=0 \ + __cplusplus=201704L \ + __has_attribute(_)=0 \ + __has_builtin(_)=0 \ + __has_c_attribute(_)=0 \ + __has_cpp_attribute(_)=0 \ + __has_declspec_attribute(_)=0 \ + __has_extension(_)=0 \ + __has_feature(_)=0 \ + __has_warning(_)=0 EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- From 72bbf60f3a6b87a36bebc6b10ae867d8bcb9cadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 30 Jan 2020 17:49:51 +0900 Subject: [PATCH 629/878] do not assume GCC for __builtin_setjmp Namely recent Sun C compiler has this function, and is not a GCC. Meanwhile the code without RUBY_JMP_BUF assumes GCC. We have to define the macro when we detect __builtin_setjmp for non-GCC compilers. --- tool/m4/ruby_setjmp_type.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/m4/ruby_setjmp_type.m4 b/tool/m4/ruby_setjmp_type.m4 index 9da9a88680ca2b..29893543a4e464 100644 --- a/tool/m4/ruby_setjmp_type.m4 +++ b/tool/m4/ruby_setjmp_type.m4 @@ -47,6 +47,6 @@ AS_IF([test x$setjmp_prefix:$setjmp_sigmask = xsig:], [ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)}${setjmp_sigmask}) AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask})]) AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)]) -AS_IF([test x$setjmp_prefix != x__builtin_], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)) +AS_IF([test "(" "$GCC" != yes ")" -o x$setjmp_prefix != x__builtin_], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)) AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)]) ])dnl From 34fd7241e445764837ec9fc700af65a0f73e8ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 15:07:40 +0900 Subject: [PATCH 630/878] fine-grained #ifdef guard for Sparc systems There are cases when sizeof(int) == sizeof(long) == sizeof(size_t). On such cases however int and long are incompatible types in theory. We should not assume typedef long size_t, because on Solaris size_t is actually a typedef of int. This reduces compiler warnings on such situations. --- ruby_atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby_atomic.h b/ruby_atomic.h index 4a6723a92ec97c..d4d56da4249270 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -105,7 +105,7 @@ typedef unsigned int rb_atomic_t; # define ATOMIC_EXCHANGE(var, val) atomic_swap_uint(&(var), (val)) # define ATOMIC_CAS(var, oldval, newval) atomic_cas_uint(&(var), (oldval), (newval)) -# if SIZEOF_SIZE_T == SIZEOF_LONG +# if defined(_LP64) || defined(_I32LPx) # define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val)) # define ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val)) # define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var)) From b223a78a71b9f000315d70987d600661420f9475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 15:25:09 +0900 Subject: [PATCH 631/878] this ternary operator is an undefined behaviour MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let me quote ISO/IEC 9899:2018 section 6.5.15: > Constraints > > The first operand shall have scalar type. > One of the following shall hold for the second and third operands: > — both operands have arithmetic type; > — both operands have the same structure or union type; > — both operands have void type; (snip) Here, `*option` is a const struct rb_compile_option_struct. OTOH `COMPILE_OPTION_DEFAULT` is a struct rb_compile_option_struct, without const. These two are _not_ the "same structure or union type". Hence the expression renders undefined behaviour. COMPILE_OPTION_DEFAULT is not a const because `RubyVM::InstructionSequence.compile_option=` touches its internals on-the-fly. There is no way to meet the constraints quoted above. Using ternary operator here was a mistake at the first place. Let's just replace it with a normal `if` statement. --- iseq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/iseq.c b/iseq.c index a294f08527d8b3..b06f23c33d5b86 100644 --- a/iseq.c +++ b/iseq.c @@ -825,7 +825,12 @@ rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE rea rb_iseq_t *iseq = iseq_alloc(); rb_compile_option_t new_opt; - new_opt = option ? *option : COMPILE_OPTION_DEFAULT; + if (option) { + new_opt = *option; + } + else { + new_opt = COMPILE_OPTION_DEFAULT; + } if (ast && ast->compile_option) rb_iseq_make_compile_option(&new_opt, ast->compile_option); prepare_iseq_build(iseq, name, path, realpath, first_lineno, node ? &node->nd_loc : NULL, node ? nd_node_id(node) : -1, parent, type, &new_opt); From ce4ea956d24eab5089a143bba38126f2b11b55b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 15:53:03 +0900 Subject: [PATCH 632/878] function pointers are not void* The same as 8427fca49bd85205f5a8766292dd893f003c0e48. --- coroutine/ucontext/Context.c | 2 +- mjit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coroutine/ucontext/Context.c b/coroutine/ucontext/Context.c index 2dc3f478e86247..9ba76ee628c787 100644 --- a/coroutine/ucontext/Context.c +++ b/coroutine/ucontext/Context.c @@ -15,7 +15,7 @@ void coroutine_trampoline(void * _start, void * _context) { - coroutine_start start = _start; + coroutine_start start = (coroutine_start)_start; struct coroutine_context * context = _context; start(context->from, context); diff --git a/mjit.c b/mjit.c index 5d1a182b0b7a15..697dd239541060 100644 --- a/mjit.c +++ b/mjit.c @@ -464,7 +464,7 @@ rb_mjit_recompile_iseq(const rb_iseq_t *iseq) CRITICAL_SECTION_START(3, "in rb_mjit_recompile_iseq"); remove_from_list(iseq->body->jit_unit, &active_units); - iseq->body->jit_func = (void *)NOT_ADDED_JIT_ISEQ_FUNC; + iseq->body->jit_func = (mjit_func_t)NOT_ADDED_JIT_ISEQ_FUNC; add_to_list(iseq->body->jit_unit, &stale_units); CRITICAL_SECTION_FINISH(3, "in rb_mjit_recompile_iseq"); From 34f8e75f9305b0da4ef1b0d4fe9ea3c3f31dcc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 31 Jan 2020 16:15:28 +0900 Subject: [PATCH 633/878] rb_vm_t::postponed_job_index shall be rb_atomic_t Pointer to this field is passed to ATOMIC_CAS. We have to use rb_atomic_t for that purpose. --- vm_core.h | 2 +- vm_trace.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vm_core.h b/vm_core.h index a2f6af3c3095ba..d0676ae0306a5b 100644 --- a/vm_core.h +++ b/vm_core.h @@ -642,7 +642,7 @@ typedef struct rb_vm_struct { /* postponed_job (async-signal-safe, NOT thread-safe) */ struct rb_postponed_job_struct *postponed_job_buffer; - int postponed_job_index; + rb_atomic_t postponed_job_index; int src_encoding_index; diff --git a/vm_trace.c b/vm_trace.c index e72c61873990e6..f1aa35d6648c07 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -1559,7 +1559,7 @@ enum postponed_job_register_result { /* Async-signal-safe */ static enum postponed_job_register_result postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm, - unsigned int flags, rb_postponed_job_func_t func, void *data, int max, int expected_index) + unsigned int flags, rb_postponed_job_func_t func, void *data, rb_atomic_t max, rb_atomic_t expected_index) { rb_postponed_job_t *pjob; @@ -1610,7 +1610,7 @@ rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, rb_execution_context_t *ec = GET_EC(); rb_vm_t *vm = rb_ec_vm_ptr(ec); rb_postponed_job_t *pjob; - int i, index; + rb_atomic_t i, index; begin: index = vm->postponed_job_index; @@ -1673,7 +1673,7 @@ rb_postponed_job_flush(rb_vm_t *vm) { EC_PUSH_TAG(ec); if (EC_EXEC_TAG() == TAG_NONE) { - int index; + rb_atomic_t index; struct rb_workqueue_job *wq_job; while ((index = vm->postponed_job_index) > 0) { From 3d83e641b1a6e13e0e0a59c19536e1dde96891f4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 6 Feb 2020 13:36:02 +0900 Subject: [PATCH 634/878] [ruby/spec] Check by Thread#stop? Check if threads are stopped by Thread#stop? instead of the status name. --- spec/ruby/core/mutex/sleep_spec.rb | 16 ++++++++++++---- spec/ruby/core/mutex/unlock_spec.rb | 2 +- .../library/conditionvariable/broadcast_spec.rb | 4 ++-- .../library/conditionvariable/signal_spec.rb | 6 +++--- spec/ruby/library/conditionvariable/wait_spec.rb | 12 ++++++------ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/spec/ruby/core/mutex/sleep_spec.rb b/spec/ruby/core/mutex/sleep_spec.rb index f5e0d53036662c..6638f5a5a2861a 100644 --- a/spec/ruby/core/mutex/sleep_spec.rb +++ b/spec/ruby/core/mutex/sleep_spec.rb @@ -37,7 +37,7 @@ locked = false th = Thread.new { m.lock; locked = true; m.sleep } Thread.pass until locked - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? m.locked?.should be_false th.run th.join @@ -63,15 +63,23 @@ end end Thread.pass until locked - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? th.raise(Exception) th.value.should be_true end it "returns the rounded number of seconds asleep" do m = Mutex.new - m.lock - m.sleep(0.001).should be_kind_of(Integer) + locked = false + th = Thread.start do + m.lock + locked = true + m.sleep + end + Thread.pass until locked + Thread.pass until th.stop? + th.wakeup + th.value.should be_kind_of(Integer) end it "wakes up when requesting sleep times near or equal to zero" do diff --git a/spec/ruby/core/mutex/unlock_spec.rb b/spec/ruby/core/mutex/unlock_spec.rb index c9c3bfe14f735c..d999e6684260c2 100644 --- a/spec/ruby/core/mutex/unlock_spec.rb +++ b/spec/ruby/core/mutex/unlock_spec.rb @@ -17,7 +17,7 @@ # avoid race on mutex.lock Thread.pass until mutex.locked? - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? -> { mutex.unlock }.should raise_error(ThreadError) diff --git a/spec/ruby/library/conditionvariable/broadcast_spec.rb b/spec/ruby/library/conditionvariable/broadcast_spec.rb index a31a0443bd884e..1dccdf4895afe1 100644 --- a/spec/ruby/library/conditionvariable/broadcast_spec.rb +++ b/spec/ruby/library/conditionvariable/broadcast_spec.rb @@ -22,7 +22,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? m.synchronize { cv.broadcast }.should == cv @@ -50,7 +50,7 @@ # wait for all threads to acquire the mutex the first time Thread.pass until m.synchronize { r1.size == threads.size } # wait until all threads are sleeping (ie waiting) - Thread.pass until threads.all? {|th| th.status == "sleep" } + Thread.pass until threads.all?(&:stop?) r2.should be_empty m.synchronize do diff --git a/spec/ruby/library/conditionvariable/signal_spec.rb b/spec/ruby/library/conditionvariable/signal_spec.rb index 04b249a6c6ff05..bcab42154e16da 100644 --- a/spec/ruby/library/conditionvariable/signal_spec.rb +++ b/spec/ruby/library/conditionvariable/signal_spec.rb @@ -22,7 +22,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? m.synchronize { cv.signal }.should == cv @@ -50,7 +50,7 @@ # wait for all threads to acquire the mutex the first time Thread.pass until m.synchronize { r1.size == threads.size } # wait until all threads are sleeping (ie waiting) - Thread.pass until threads.all? {|th| th.status == "sleep" } + Thread.pass until threads.all?(&:stop?) r2.should be_empty 100.times do |i| @@ -85,7 +85,7 @@ # Make sure t1 is waiting for a signal before launching t2. Thread.pass until in_synchronize - Thread.pass until t1.status == 'sleep' + Thread.pass until t1.stop? t2 = Thread.new do m.synchronize do diff --git a/spec/ruby/library/conditionvariable/wait_spec.rb b/spec/ruby/library/conditionvariable/wait_spec.rb index 59d708d7e68187..b6cd12ed4eed53 100644 --- a/spec/ruby/library/conditionvariable/wait_spec.rb +++ b/spec/ruby/library/conditionvariable/wait_spec.rb @@ -26,7 +26,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? m.synchronize { cv.signal } th.join @@ -48,7 +48,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? th.run th.value.should == :success @@ -70,7 +70,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? th.wakeup th.value.should == :success @@ -97,7 +97,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? th.kill th.join @@ -127,7 +127,7 @@ # wait for m to acquire the mutex Thread.pass until in_synchronize # wait until th is sleeping (ie waiting) - Thread.pass while th.status and th.status != "sleep" + Thread.pass until th.stop? m.synchronize { cv.signal @@ -158,7 +158,7 @@ } Thread.pass until m.synchronize { events.size } == n_threads - Thread.pass while threads.any? { |th| th.status and th.status != "sleep" } + Thread.pass until threads.any?(&:stop?) m.synchronize do threads.each { |t| # Cause interactions with the waiting threads. From 32adae431d3f58e4103ca7ea507ee110c18e19c4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 6 Feb 2020 15:40:34 +0900 Subject: [PATCH 635/878] [ruby/spec] Just test that sleep completes --- spec/ruby/core/mutex/sleep_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/core/mutex/sleep_spec.rb b/spec/ruby/core/mutex/sleep_spec.rb index 6638f5a5a2861a..9832e3125e25de 100644 --- a/spec/ruby/core/mutex/sleep_spec.rb +++ b/spec/ruby/core/mutex/sleep_spec.rb @@ -97,7 +97,7 @@ m.lock times.each do |time| # just testing that sleep completes - m.sleep(time).should_not == nil + -> {m.sleep(time)}.should_not raise_error end end end From 739fdb7ff0767ae4a666ca83f61e807c0c6c7115 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 6 Feb 2020 15:42:01 +0900 Subject: [PATCH 636/878] [ruby/spec] Don't care about return values RDoc says nothing about them. Added an example that ConditionVariable#wait can be woken up by ConditionVariable#signal, instead. --- .../conditionvariable/broadcast_spec.rb | 27 ------------------- .../library/conditionvariable/signal_spec.rb | 27 ------------------- .../library/conditionvariable/wait_spec.rb | 7 ++--- 3 files changed, 4 insertions(+), 57 deletions(-) diff --git a/spec/ruby/library/conditionvariable/broadcast_spec.rb b/spec/ruby/library/conditionvariable/broadcast_spec.rb index 1dccdf4895afe1..d88159df234877 100644 --- a/spec/ruby/library/conditionvariable/broadcast_spec.rb +++ b/spec/ruby/library/conditionvariable/broadcast_spec.rb @@ -2,33 +2,6 @@ require 'thread' describe "ConditionVariable#broadcast" do - it "returns self if nothing to broadcast to" do - cv = ConditionVariable.new - cv.broadcast.should == cv - end - - it "returns self if something is waiting for a broadcast" do - m = Mutex.new - cv = ConditionVariable.new - in_synchronize = false - - th = Thread.new do - m.synchronize do - in_synchronize = true - cv.wait(m) - end - end - - # wait for m to acquire the mutex - Thread.pass until in_synchronize - # wait until th is sleeping (ie waiting) - Thread.pass until th.stop? - - m.synchronize { cv.broadcast }.should == cv - - th.join - end - it "releases all threads waiting in line for this resource" do m = Mutex.new cv = ConditionVariable.new diff --git a/spec/ruby/library/conditionvariable/signal_spec.rb b/spec/ruby/library/conditionvariable/signal_spec.rb index bcab42154e16da..11e49095013a08 100644 --- a/spec/ruby/library/conditionvariable/signal_spec.rb +++ b/spec/ruby/library/conditionvariable/signal_spec.rb @@ -2,33 +2,6 @@ require 'thread' describe "ConditionVariable#signal" do - it "returns self if nothing to signal" do - cv = ConditionVariable.new - cv.signal.should == cv - end - - it "returns self if something is waiting for a signal" do - m = Mutex.new - cv = ConditionVariable.new - in_synchronize = false - - th = Thread.new do - m.synchronize do - in_synchronize = true - cv.wait(m) - end - end - - # wait for m to acquire the mutex - Thread.pass until in_synchronize - # wait until th is sleeping (ie waiting) - Thread.pass until th.stop? - - m.synchronize { cv.signal }.should == cv - - th.join - end - it "releases the first thread waiting in line for this resource" do m = Mutex.new cv = ConditionVariable.new diff --git a/spec/ruby/library/conditionvariable/wait_spec.rb b/spec/ruby/library/conditionvariable/wait_spec.rb index b6cd12ed4eed53..b545c6c15e6d80 100644 --- a/spec/ruby/library/conditionvariable/wait_spec.rb +++ b/spec/ruby/library/conditionvariable/wait_spec.rb @@ -11,7 +11,7 @@ cv.wait(o, 1234) end - it "returns self" do + it "can be woken up by ConditionVariable#signal" do m = Mutex.new cv = ConditionVariable.new in_synchronize = false @@ -19,8 +19,9 @@ th = Thread.new do m.synchronize do in_synchronize = true - cv.wait(m).should == cv + cv.wait(m) end + :success end # wait for m to acquire the mutex @@ -29,7 +30,7 @@ Thread.pass until th.stop? m.synchronize { cv.signal } - th.join + th.value.should == :success end it "can be interrupted by Thread#run" do From f1c230f18ba651ce7bd8e8c621ba4282c5b445db Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 6 Feb 2020 20:52:25 +0900 Subject: [PATCH 637/878] Add separated assertion count --- tool/lib/test/unit/core_assertions.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 3eecf45ace2e76..edaf83938f0ad4 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -131,20 +131,21 @@ class Test::Unit::Runner args = args.dup args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"}) stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt) + if res_c + res_c.close + res = res_p.read + res_p.close + else + res = stdout + end abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) assert(!abort, FailDesc[status, nil, stderr]) - self._assertions += stdout[/^assertions=(\d+)/, 1].to_i + self._assertions += res[/^assertions=(\d+)/, 1].to_i begin - if res_c - res_c.close - MiniTest::Unit.output.print stdout - res = Marshal.load(res_p.read.unpack("m")[0]) - res_p.close - else - res = Marshal.load(stdout.unpack("m")[0]) - end + res = Marshal.load(res.unpack1("m")) rescue => marshal_error ignore_stderr = nil + res = nil end if res if bt = res.backtrace From 5fac54a594b475e7b7a07e925c0353e18c685f2b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 6 Feb 2020 20:53:11 +0900 Subject: [PATCH 638/878] Fixed the output from separated test in parallel test Redirect the output of separated child process to `MiniTest::Unit.output`. --- tool/lib/test/unit/core_assertions.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index edaf83938f0ad4..836d712049d417 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,9 +110,12 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o file ||= loc.path line ||= loc.lineno end + capture_stdout = true if /mswin|mingw/ =~ RUBY_PLATFORM res_out = "STDOUT" else + capture_stdout = false + opt[:out] = MiniTest::Unit.output res_p, res_c = IO.pipe opt[res_c.fileno] = res_c.fileno res_out = "IO.new(#{res_c.fileno}, 'w')" @@ -130,7 +133,7 @@ class Test::Unit::Runner eom args = args.dup args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"}) - stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt) + stdout, stderr, status = EnvUtil.invoke_ruby(args, src, capture_stdout, true, **opt) if res_c res_c.close res = res_p.read From e323f50a9c71da2804f66ba6345ef071def60e1e Mon Sep 17 00:00:00 2001 From: aycabta Date: Thu, 6 Feb 2020 21:19:44 +0900 Subject: [PATCH 639/878] Fix readline-ext sync --- tool/sync_default_gems.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 07deee6c644fd8..329f0c1bd0abe6 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -267,8 +267,10 @@ def sync_default_gems(gem) sync_lib "net-smtp" mv "lib/net-smtp.gemspec", "lib/net/smtp" when "readline-ext" - sync_lib "readline-ext" - mv "lib/readline-ext.gemspec", "ext/readline" + rm_rf(%w[ext/readline test/readline]) + cp_r("#{upstream}/ext/readline", "ext") + cp_r("#{upstream}/test/readline", "test") + cp_r("#{upstream}/readline-ext.gemspec", "ext/readline") when "did_you_mean" rm_rf(%w[lib/did_you_mean* test/did_you_mean]) cp_r(Dir.glob("#{upstream}/lib/did_you_mean*"), "lib") From 054d99d95bc9d3c9481be3ea97dd16b39a4ba5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 3 Feb 2020 18:48:44 +0100 Subject: [PATCH 640/878] [rubygems/rubygems] Allow releasing with a rubygems pre version This condition is too restrictive in my opinion. If a user has a pre version of rubygems installed, she should be fully responsible for it, and we shouldn't restrict any functionality. Also, why is a new prerelease disallowed but an old prelease allowed, or why is 2.0.0.rc2 explictly whitelisted? I believe this kind of exceptions are one more reason to actually permit this. https://github.com/rubygems/rubygems/commit/7f77a77620 --- lib/rubygems/commands/push_command.rb | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb index 41e6c7ec30523b..fe8157e502614f 100644 --- a/lib/rubygems/commands/push_command.rb +++ b/lib/rubygems/commands/push_command.rb @@ -79,25 +79,6 @@ def execute def send_gem(name) args = [:post, "api/v1/gems"] - latest_rubygems_version = Gem.latest_rubygems_version - - if latest_rubygems_version < Gem.rubygems_version and - Gem.rubygems_version.prerelease? and - Gem::Version.new('2.0.0.rc.2') != Gem.rubygems_version - alert_error <<-ERROR -You are using a beta release of RubyGems (#{Gem::VERSION}) which is not -allowed to push gems. Please downgrade or upgrade to a release version. - -The latest released RubyGems version is #{latest_rubygems_version} - -You can upgrade or downgrade to the latest release version with: - - gem update --system=#{latest_rubygems_version} - - ERROR - terminate_interaction 1 - end - gem_data = Gem::Package.new(name) unless @host From c6b5881eae28fa1a76514b2de00ef0155c348170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 4 Feb 2020 17:25:56 +0100 Subject: [PATCH 641/878] [rubygems/rubygems] Make non "test_" method private https://github.com/rubygems/rubygems/commit/912d141a35 --- test/rubygems/test_require.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 1437bd8d8c2575..49fe7f96c66815 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -532,6 +532,8 @@ def test_require_bundler_with_bundler_version end end + private + def silence_warnings old_verbose, $VERBOSE = $VERBOSE, false yield From d767da428c28b7b9fec56b383bb32f6f76c6ad26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 4 Feb 2020 17:26:28 +0100 Subject: [PATCH 642/878] [rubygems/rubygems] Fix require issue with file extension priority If `require "a"` is run when two folders have been specified in the -I option including a "a.rb" file and a "a.so" file respectively, the ruby spec says that the ".rb" file should always be preferred. However, the logic we added in https://github.com/rubygems/rubygems/commit/6b81076d9 to make the -I option always beat default gems does not respect this spec, creating a difference from the original ruby-core's require. [the ruby spec says]: https://github.com/ruby/spec/blob/d80a6e2b221d4f17a8cadcac75ef950c59cba901/core/kernel/shared/require.rb#L234-L246 https://github.com/rubygems/rubygems/commit/b3944384f4 --- lib/rubygems/core_ext/kernel_require.rb | 28 +++++------ test/rubygems/test_require.rb | 62 +++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 16 deletions(-) diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 60f4d1871200f3..369f2c743ed600 100644 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -43,18 +43,18 @@ def require(path) # https://github.com/rubygems/rubygems/pull/1868 resolved_path = begin rp = nil - $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp| - safe_lp = lp.dup.tap(&Gem::UNTAINT) - begin - if File.symlink? safe_lp # for backward compatibility - next + Gem.suffixes.each do |s| + $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp| + safe_lp = lp.dup.tap(&Gem::UNTAINT) + begin + if File.symlink? safe_lp # for backward compatibility + next + end + rescue SecurityError + RUBYGEMS_ACTIVATION_MONITOR.exit + raise end - rescue SecurityError - RUBYGEMS_ACTIVATION_MONITOR.exit - raise - end - Gem.suffixes.each do |s| full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}")) if File.file?(full_path) rp = full_path @@ -67,12 +67,8 @@ def require(path) end if resolved_path - begin - RUBYGEMS_ACTIVATION_MONITOR.exit - return gem_original_require(resolved_path) - rescue LoadError - RUBYGEMS_ACTIVATION_MONITOR.enter - end + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(resolved_path) end if spec = Gem.find_unresolved_default_spec(path) diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 49fe7f96c66815..b674ff5f6dd730 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -120,6 +120,24 @@ def test_dash_i_beats_default_gems Object.send :remove_const, :HELLO if Object.const_defined? :HELLO end + def test_dash_i_respects_default_library_extension_priority + skip "extensions don't quite work on jruby" if Gem.java_platform? + + dash_i_ext_arg = util_install_extension_file('a') + dash_i_lib_arg = util_install_ruby_file('a') + + lp = $LOAD_PATH.dup + + begin + $LOAD_PATH.unshift dash_i_lib_arg + $LOAD_PATH.unshift dash_i_ext_arg + assert_require 'a' + assert_match(/a\.rb$/, $LOADED_FEATURES.last) + ensure + $LOAD_PATH.replace lp + end + end + def test_concurrent_require Object.const_set :FILE_ENTERED_LATCH, Latch.new(2) Object.const_set :FILE_EXIT_LATCH, Latch.new(1) @@ -541,4 +559,48 @@ def silence_warnings $VERBOSE = old_verbose end + def util_install_extension_file(name) + spec = quick_gem name + util_build_gem spec + + spec.extensions << "extconf.rb" + write_file File.join(@tempdir, "extconf.rb") do |io| + io.write <<-RUBY + require "mkmf" + create_makefile("#{name}") + RUBY + end + + write_file File.join(@tempdir, "#{name}.c") do |io| + io.write <<-C + #include + void Init_#{name}() { } + C + end + + spec.files += ["extconf.rb", "#{name}.c"] + + so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}") + refute_path_exists so + + path = Gem::Package.build spec + installer = Gem::Installer.at path + installer.install + assert_path_exists so + + spec.gem_dir + end + + def util_install_ruby_file(name) + dir_lib = Dir.mktmpdir("test_require_lib", @tempdir) + dash_i_lib_arg = File.join dir_lib + + a_rb = File.join dash_i_lib_arg, "#{name}.rb" + + FileUtils.mkdir_p File.dirname a_rb + File.open(a_rb, 'w') { |f| f.write "# #{name}.rb" } + + dash_i_lib_arg + end + end From bd0a02d1433b6d9a9dcde38eb9fb2dbc3b1071e9 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 6 Feb 2020 21:54:23 +0900 Subject: [PATCH 643/878] Revert to remove the query command of rubygems. The original commit was https://github.com/rubygems/rubygems/pull/3119 --- lib/rubygems/commands/query_command.rb | 359 +------- .../test_gem_commands_query_command.rb | 861 ++++++++++++++++++ test/rubygems/test_gem_gem_runner.rb | 10 + 3 files changed, 878 insertions(+), 352 deletions(-) create mode 100644 test/rubygems/test_gem_commands_query_command.rb diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 4fb23bc6c1b91b..9d7f1b287f54e6 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -1,15 +1,14 @@ # frozen_string_literal: true require 'rubygems/command' -require 'rubygems/local_remote_options' -require 'rubygems/spec_fetcher' -require 'rubygems/version_option' -require 'rubygems/text' +require 'rubygems/query_utils' +require 'rubygems/deprecate' class Gem::Commands::QueryCommand < Gem::Command - include Gem::Text - include Gem::LocalRemoteOptions - include Gem::VersionOption + extend Gem::Deprecate + deprecate_command(2020, 12) + + include Gem::QueryUtils def initialize(name = 'query', summary = 'Query gem information in local or remote repositories') @@ -17,357 +16,13 @@ def initialize(name = 'query', :name => //, :domain => :local, :details => false, :versions => true, :installed => nil, :version => Gem::Requirement.default - add_option('-i', '--[no-]installed', - 'Check for installed gem') do |value, options| - options[:installed] = value - end - - add_option('-I', 'Equivalent to --no-installed') do |value, options| - options[:installed] = false - end - - add_version_option command, "for use with --installed" - add_option('-n', '--name-matches REGEXP', 'Name of gem(s) to query on matches the', 'provided REGEXP') do |value, options| options[:name] = /#{value}/i end - add_option('-d', '--[no-]details', - 'Display detailed information of gem(s)') do |value, options| - options[:details] = value - end - - add_option('--[no-]versions', - 'Display only gem names') do |value, options| - options[:versions] = value - options[:details] = false unless value - end - - add_option('-a', '--all', - 'Display all gem versions') do |value, options| - options[:all] = value - end - - add_option('-e', '--exact', - 'Name of gem(s) to query on matches the', - 'provided STRING') do |value, options| - options[:exact] = value - end - - add_option('--[no-]prerelease', - 'Display prerelease versions') do |value, options| - options[:prerelease] = value - end - - add_local_remote_options - end - - def defaults_str # :nodoc: - "--local --name-matches // --no-details --versions --no-installed" - end - - def description # :nodoc: - <<-EOF -The query command is the basis for the list and search commands. - -You should really use the list and search commands instead. This command -is too hard to use. - EOF - end - - def execute - gem_names = Array(options[:name]) - - if !args.empty? - gem_names = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i } - end - - terminate_interaction(check_installed_gems(gem_names)) if check_installed_gems? - - gem_names.each { |n| show_gems(n) } - end - - private - - def check_installed_gems(gem_names) - exit_code = 0 - - if args.empty? && !gem_name? - alert_error "You must specify a gem name" - exit_code = 4 - elsif gem_names.count > 1 - alert_error "You must specify only ONE gem!" - exit_code = 4 - else - installed = installed?(gem_names.first, options[:version]) - installed = !installed unless options[:installed] - - say(installed) - exit_code = 1 if !installed - end - - exit_code - end - - def check_installed_gems? - !options[:installed].nil? - end - - def gem_name? - !options[:name].source.empty? - end - - def prerelease - options[:prerelease] - end - - def show_prereleases? - prerelease.nil? || prerelease - end - - def args - options[:args].to_a - end - - def display_header(type) - if (ui.outs.tty? and Gem.configuration.verbose) or both? - say - say "*** #{type} GEMS ***" - say - end - end - - #Guts of original execute - def show_gems(name) - show_local_gems(name) if local? - show_remote_gems(name) if remote? - end - - def show_local_gems(name, req = Gem::Requirement.default) - display_header("LOCAL") - - specs = Gem::Specification.find_all do |s| - s.name =~ name and req =~ s.version - end - - dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req } - specs.select! do |s| - dep.match?(s.name, s.version, show_prereleases?) - end - - spec_tuples = specs.map do |spec| - [spec.name_tuple, spec] - end - - output_query_results(spec_tuples) - end - - def show_remote_gems(name) - display_header("REMOTE") - - fetcher = Gem::SpecFetcher.fetcher - - spec_tuples = if name.respond_to?(:source) && name.source.empty? - fetcher.detect(specs_type) { true } - else - fetcher.detect(specs_type) do |name_tuple| - name === name_tuple.name - end - end - - output_query_results(spec_tuples) - end - - def specs_type - if options[:all] - if options[:prerelease] - :complete - else - :released - end - elsif options[:prerelease] - :prerelease - else - :latest - end - end - - ## - # Check if gem +name+ version +version+ is installed. - - def installed?(name, req = Gem::Requirement.default) - Gem::Specification.any? { |s| s.name =~ name and req =~ s.version } - end - - def output_query_results(spec_tuples) - output = [] - versions = Hash.new { |h,name| h[name] = [] } - - spec_tuples.each do |spec_tuple, source| - versions[spec_tuple.name] << [spec_tuple, source] - end - - versions = versions.sort_by do |(n,_),_| - n.downcase - end - - output_versions output, versions - - say output.join(options[:details] ? "\n\n" : "\n") - end - - def output_versions(output, versions) - versions.each do |gem_name, matching_tuples| - matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse - - platforms = Hash.new { |h,version| h[version] = [] } - - matching_tuples.each do |n, _| - platforms[n.version] << n.platform if n.platform - end - - seen = {} - - matching_tuples.delete_if do |n,_| - if seen[n.version] - true - else - seen[n.version] = true - false - end - end - - output << clean_text(make_entry(matching_tuples, platforms)) - end - end - - def entry_details(entry, detail_tuple, specs, platforms) - return unless options[:details] - - name_tuple, spec = detail_tuple - - spec = spec.fetch_spec(name_tuple)if spec.respond_to?(:fetch_spec) - - entry << "\n" - - spec_platforms entry, platforms - spec_authors entry, spec - spec_homepage entry, spec - spec_license entry, spec - spec_loaded_from entry, spec, specs - spec_summary entry, spec - end - - def entry_versions(entry, name_tuples, platforms, specs) - return unless options[:versions] - - list = - if platforms.empty? or options[:details] - name_tuples.map { |n| n.version }.uniq - else - platforms.sort.reverse.map do |version, pls| - out = version.to_s - - if options[:domain] == :local - default = specs.any? do |s| - !s.is_a?(Gem::Source) && s.version == version && s.default_gem? - end - out = "default: #{out}" if default - end - - if pls != [Gem::Platform::RUBY] - platform_list = [pls.delete(Gem::Platform::RUBY), *pls.sort].compact - out = platform_list.unshift(out).join(' ') - end - - out - end - end - - entry << " (#{list.join ', '})" - end - - def make_entry(entry_tuples, platforms) - detail_tuple = entry_tuples.first - - name_tuples, specs = entry_tuples.flatten.partition do |item| - Gem::NameTuple === item - end - - entry = [name_tuples.first.name] - - entry_versions(entry, name_tuples, platforms, specs) - entry_details(entry, detail_tuple, specs, platforms) - - entry.join - end - - def spec_authors(entry, spec) - authors = "Author#{spec.authors.length > 1 ? 's' : ''}: ".dup - authors << spec.authors.join(', ') - entry << format_text(authors, 68, 4) - end - - def spec_homepage(entry, spec) - return if spec.homepage.nil? or spec.homepage.empty? - - entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4) - end - - def spec_license(entry, spec) - return if spec.license.nil? or spec.license.empty? - - licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: ".dup - licenses << spec.licenses.join(', ') - entry << "\n" << format_text(licenses, 68, 4) - end - - def spec_loaded_from(entry, spec, specs) - return unless spec.loaded_from - - if specs.length == 1 - default = spec.default_gem? ? ' (default)' : nil - entry << "\n" << " Installed at#{default}: #{spec.base_dir}" - else - label = 'Installed at' - specs.each do |s| - version = s.version.to_s - version << ', default' if s.default_gem? - entry << "\n" << " #{label} (#{version}): #{s.base_dir}" - label = ' ' * label.length - end - end - end - - def spec_platforms(entry, platforms) - non_ruby = platforms.any? do |_, pls| - pls.any? { |pl| pl != Gem::Platform::RUBY } - end - - return unless non_ruby - - if platforms.length == 1 - title = platforms.values.length == 1 ? 'Platform' : 'Platforms' - entry << " #{title}: #{platforms.values.sort.join(', ')}\n" - else - entry << " Platforms:\n" - - sorted_platforms = platforms.sort_by { |version,| version } - - sorted_platforms.each do |version, pls| - label = " #{version}: " - data = format_text pls.sort.join(', '), 68, label.length - data[0, label.length] = label - entry << data << "\n" - end - end - end - - def spec_summary(entry, spec) - summary = truncate_text(spec.summary, "the summary for #{spec.full_name}") - entry << "\n\n" << format_text(summary, 68, 4) + add_query_options end end diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb new file mode 100644 index 00000000000000..a25effb54825dc --- /dev/null +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -0,0 +1,861 @@ +# frozen_string_literal: true +require 'rubygems/test_case' +require 'rubygems/commands/query_command' + +module TestGemCommandsQueryCommandSetup + def setup + super + + @cmd = Gem::Commands::QueryCommand.new + + @specs = add_gems_to_fetcher + @stub_ui = Gem::MockGemUi.new + @stub_fetcher = Gem::FakeFetcher.new + + @stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do + raise Gem::RemoteFetcher::FetchError + end + end +end + +class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase + + include TestGemCommandsQueryCommandSetup + + def test_execute + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_all + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r --all] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_all_prerelease + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r --all --prerelease] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_details + spec_fetcher do |fetcher| + fetcher.spec 'a', 2 do |s| + s.summary = 'This is a lot of text. ' * 4 + s.authors = ['Abraham Lincoln', 'Hirohito'] + s.homepage = 'http://a.example.com/' + end + + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r -d] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2) + Authors: Abraham Lincoln, Hirohito + Homepage: http://a.example.com/ + + This is a lot of text. This is a lot of text. This is a lot of text. + This is a lot of text. + +pl (1) + Platform: i386-linux + Author: A User + Homepage: http://example.com + + this is a summary + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_details_cleans_text + spec_fetcher do |fetcher| + fetcher.spec 'a', 2 do |s| + s.summary = 'This is a lot of text. ' * 4 + s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] + s.homepage = "http://a.example.com/\x03" + end + + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r -d] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2) + Authors: Abraham Lincoln ., . Hirohito + Homepage: http://a.example.com/. + + This is a lot of text. This is a lot of text. This is a lot of text. + This is a lot of text. + +pl (1) + Platform: i386-linux + Author: A User + Homepage: http://example.com + + this is a summary + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_details_truncates_summary + spec_fetcher do |fetcher| + fetcher.spec 'a', 2 do |s| + s.summary = 'This is a lot of text. ' * 10_000 + s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] + s.homepage = "http://a.example.com/\x03" + end + + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r -d] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2) + Authors: Abraham Lincoln ., . Hirohito + Homepage: http://a.example.com/. + + Truncating the summary for a-2 to 100,000 characters: +#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te + +pl (1) + Platform: i386-linux + Author: A User + Homepage: http://example.com + + this is a summary + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_installed + @cmd.handle_options %w[-n a --installed] + + assert_raises Gem::MockGemUi::SystemExitException do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "true\n", @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_installed_inverse + @cmd.handle_options %w[-n a --no-installed] + + e = assert_raises Gem::MockGemUi::TermError do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "false\n", @stub_ui.output + assert_equal '', @stub_ui.error + + assert_equal 1, e.exit_code + end + + def test_execute_installed_inverse_not_installed + @cmd.handle_options %w[-n not_installed --no-installed] + + assert_raises Gem::MockGemUi::SystemExitException do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "true\n", @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_installed_no_name + @cmd.handle_options %w[--installed] + + e = assert_raises Gem::MockGemUi::TermError do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal '', @stub_ui.output + assert_equal "ERROR: You must specify a gem name\n", @stub_ui.error + + assert_equal 4, e.exit_code + end + + def test_execute_installed_not_installed + @cmd.handle_options %w[-n not_installed --installed] + + e = assert_raises Gem::MockGemUi::TermError do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "false\n", @stub_ui.output + assert_equal '', @stub_ui.error + + assert_equal 1, e.exit_code + end + + def test_execute_installed_version + @cmd.handle_options %w[-n a --installed --version 2] + + assert_raises Gem::MockGemUi::SystemExitException do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "true\n", @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_installed_version_not_installed + @cmd.handle_options %w[-n c --installed --version 2] + + e = assert_raises Gem::MockGemUi::TermError do + use_ui @stub_ui do + @cmd.execute + end + end + + assert_equal "false\n", @stub_ui.output + assert_equal '', @stub_ui.error + + assert_equal 1, e.exit_code + end + + def test_execute_local + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.options[:domain] = :local + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_local_notty + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[] + + @stub_ui.outs.tty = false + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_local_quiet + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.options[:domain] = :local + Gem.configuration.verbose = false + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_no_versions + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r --no-versions] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a +pl + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_notty + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-r] + + @stub_ui.outs.tty = false + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF +a (2) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_prerelease + @cmd.handle_options %w[-r --prerelease] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (3.a) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_prerelease_local + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-l --prerelease] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_no_prerelease_local + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[-l --no-prerelease] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_remote + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.options[:domain] = :remote + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_remote_notty + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[] + + @stub_ui.outs.tty = false + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF +a (3.a, 2, 1) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_remote_quiet + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.options[:domain] = :remote + Gem.configuration.verbose = false + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF +a (2) +pl (1 i386-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_make_entry + a_2_name = @specs['a-2'].original_name + + @stub_fetcher.data.delete \ + "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz" + + a2 = @specs['a-2'] + entry_tuples = [ + [Gem::NameTuple.new(a2.name, a2.version, a2.platform), + Gem.sources.first], + ] + + platforms = { a2.version => [a2.platform] } + + entry = @cmd.send :make_entry, entry_tuples, platforms + + assert_equal 'a (2)', entry + end + + # Test for multiple args handling! + def test_execute_multiple_args + spec_fetcher do |fetcher| + fetcher.legacy_platform + end + + @cmd.handle_options %w[a pl] + + use_ui @stub_ui do + @cmd.execute + end + + assert_match %r%^a %, @stub_ui.output + assert_match %r%^pl %, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_show_gems + @cmd.options[:name] = // + @cmd.options[:domain] = :remote + + use_ui @stub_ui do + @cmd.send :show_gems, /a/i + end + + assert_match %r%^a %, @stub_ui.output + refute_match %r%^pl %, @stub_ui.output + assert_empty @stub_ui.error + end + + private + + def add_gems_to_fetcher + spec_fetcher do |fetcher| + fetcher.spec 'a', 1 + fetcher.spec 'a', 2 + fetcher.spec 'a', '3.a' + end + end + +end + +class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase + + include TestGemCommandsQueryCommandSetup + + def test_execute_platform + spec_fetcher do |fetcher| + fetcher.spec 'a', 1 + fetcher.spec 'a', 1 do |s| + s.platform = 'x86-linux' + end + + fetcher.spec 'a', 2 do |s| + s.platform = 'universal-darwin' + end + end + + @cmd.handle_options %w[-r -a] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +a (2 universal-darwin, 1 ruby x86-linux) + EOF + + assert_equal expected, @stub_ui.output + assert_equal '', @stub_ui.error + end + + def test_execute_show_default_gems + spec_fetcher { |fetcher| fetcher.spec 'a', 2 } + + a1 = new_default_spec 'a', 1 + install_default_specs a1 + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (2, default: 1) +EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_show_default_gems_with_platform + a1 = new_default_spec 'a', 1 + a1.platform = 'java' + install_default_specs a1 + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (default: 1 java) +EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_default_details + spec_fetcher do |fetcher| + fetcher.spec 'a', 2 + end + + a1 = new_default_spec 'a', 1 + install_default_specs a1 + + @cmd.handle_options %w[-l -d] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (2, 1) + Author: A User + Homepage: http://example.com + Installed at (2): #{@gemhome} + (1, default): #{a1.base_dir} + + this is a summary + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_local_details + spec_fetcher do |fetcher| + fetcher.spec 'a', 1 do |s| + s.platform = 'x86-linux' + end + + fetcher.spec 'a', 2 do |s| + s.summary = 'This is a lot of text. ' * 4 + s.authors = ['Abraham Lincoln', 'Hirohito'] + s.homepage = 'http://a.example.com/' + s.platform = 'universal-darwin' + end + + fetcher.legacy_platform + end + + @cmd.handle_options %w[-l -d] + + use_ui @stub_ui do + @cmd.execute + end + + str = @stub_ui.output + + str.gsub!(/\(\d\): [^\n]*/, "-") + str.gsub!(/at: [^\n]*/, "at: -") + + expected = <<-EOF + +*** LOCAL GEMS *** + +a (2, 1) + Platforms: + 1: x86-linux + 2: universal-darwin + Authors: Abraham Lincoln, Hirohito + Homepage: http://a.example.com/ + Installed at - + - + + This is a lot of text. This is a lot of text. This is a lot of text. + This is a lot of text. + +pl (1) + Platform: i386-linux + Author: A User + Homepage: http://example.com + Installed at: - + + this is a summary + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_exact_remote + spec_fetcher do |fetcher| + fetcher.spec 'coolgem-omg', 3 + fetcher.spec 'coolgem', '4.2.1' + fetcher.spec 'wow_coolgem', 1 + end + + @cmd.handle_options %w[--remote --exact coolgem] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** REMOTE GEMS *** + +coolgem (4.2.1) + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_exact_local + spec_fetcher do |fetcher| + fetcher.spec 'coolgem-omg', 3 + fetcher.spec 'coolgem', '4.2.1' + fetcher.spec 'wow_coolgem', 1 + end + + @cmd.handle_options %w[--exact coolgem] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +coolgem (4.2.1) + EOF + + assert_equal expected, @stub_ui.output + end + + def test_execute_exact_multiple + spec_fetcher do |fetcher| + fetcher.spec 'coolgem-omg', 3 + fetcher.spec 'coolgem', '4.2.1' + fetcher.spec 'wow_coolgem', 1 + + fetcher.spec 'othergem-omg', 3 + fetcher.spec 'othergem', '1.2.3' + fetcher.spec 'wow_othergem', 1 + end + + @cmd.handle_options %w[--exact coolgem othergem] + + use_ui @stub_ui do + @cmd.execute + end + + expected = <<-EOF + +*** LOCAL GEMS *** + +coolgem (4.2.1) + +*** LOCAL GEMS *** + +othergem (1.2.3) + EOF + + assert_equal expected, @stub_ui.output + end + + def test_depprecated + assert @cmd.deprecated? + end + + private + + def add_gems_to_fetcher + spec_fetcher do |fetcher| + fetcher.download 'a', 1 + fetcher.download 'a', 2 + fetcher.download 'a', '3.a' + end + end + +end diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb index 71b792c95791a0..b700a333f461af 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -67,6 +67,16 @@ def test_extract_build_args assert_equal %w[--foo], args end + def test_query_is_deprecated + args = %w[query] + + use_ui @ui do + assert_nil @runner.run(args) + end + + assert_equal "WARNING: query command is deprecated. It will be removed on or after 2020-12-01.\n", @ui.error + end + def test_info_succeeds args = %w[info] From 8c67080381166f97a1153f092f40df699d020a53 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 6 Feb 2020 22:07:39 +0900 Subject: [PATCH 644/878] Revert "[rubygems/rubygems] Fix require issue with file extension priority" This reverts commit d767da428c28b7b9fec56b383bb32f6f76c6ad26. It fails with spec/ruby/core/kernel/require_spec.rb:5 --- lib/rubygems/core_ext/kernel_require.rb | 28 ++++++----- test/rubygems/test_require.rb | 62 ------------------------- 2 files changed, 16 insertions(+), 74 deletions(-) diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 369f2c743ed600..60f4d1871200f3 100644 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -43,18 +43,18 @@ def require(path) # https://github.com/rubygems/rubygems/pull/1868 resolved_path = begin rp = nil - Gem.suffixes.each do |s| - $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp| - safe_lp = lp.dup.tap(&Gem::UNTAINT) - begin - if File.symlink? safe_lp # for backward compatibility - next - end - rescue SecurityError - RUBYGEMS_ACTIVATION_MONITOR.exit - raise + $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp| + safe_lp = lp.dup.tap(&Gem::UNTAINT) + begin + if File.symlink? safe_lp # for backward compatibility + next end + rescue SecurityError + RUBYGEMS_ACTIVATION_MONITOR.exit + raise + end + Gem.suffixes.each do |s| full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}")) if File.file?(full_path) rp = full_path @@ -67,8 +67,12 @@ def require(path) end if resolved_path - RUBYGEMS_ACTIVATION_MONITOR.exit - return gem_original_require(resolved_path) + begin + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(resolved_path) + rescue LoadError + RUBYGEMS_ACTIVATION_MONITOR.enter + end end if spec = Gem.find_unresolved_default_spec(path) diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index b674ff5f6dd730..49fe7f96c66815 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -120,24 +120,6 @@ def test_dash_i_beats_default_gems Object.send :remove_const, :HELLO if Object.const_defined? :HELLO end - def test_dash_i_respects_default_library_extension_priority - skip "extensions don't quite work on jruby" if Gem.java_platform? - - dash_i_ext_arg = util_install_extension_file('a') - dash_i_lib_arg = util_install_ruby_file('a') - - lp = $LOAD_PATH.dup - - begin - $LOAD_PATH.unshift dash_i_lib_arg - $LOAD_PATH.unshift dash_i_ext_arg - assert_require 'a' - assert_match(/a\.rb$/, $LOADED_FEATURES.last) - ensure - $LOAD_PATH.replace lp - end - end - def test_concurrent_require Object.const_set :FILE_ENTERED_LATCH, Latch.new(2) Object.const_set :FILE_EXIT_LATCH, Latch.new(1) @@ -559,48 +541,4 @@ def silence_warnings $VERBOSE = old_verbose end - def util_install_extension_file(name) - spec = quick_gem name - util_build_gem spec - - spec.extensions << "extconf.rb" - write_file File.join(@tempdir, "extconf.rb") do |io| - io.write <<-RUBY - require "mkmf" - create_makefile("#{name}") - RUBY - end - - write_file File.join(@tempdir, "#{name}.c") do |io| - io.write <<-C - #include - void Init_#{name}() { } - C - end - - spec.files += ["extconf.rb", "#{name}.c"] - - so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}") - refute_path_exists so - - path = Gem::Package.build spec - installer = Gem::Installer.at path - installer.install - assert_path_exists so - - spec.gem_dir - end - - def util_install_ruby_file(name) - dir_lib = Dir.mktmpdir("test_require_lib", @tempdir) - dash_i_lib_arg = File.join dir_lib - - a_rb = File.join dash_i_lib_arg, "#{name}.rb" - - FileUtils.mkdir_p File.dirname a_rb - File.open(a_rb, 'w') { |f| f.write "# #{name}.rb" } - - dash_i_lib_arg - end - end From 3d21a75c72586baee75ab9b9c5335c755ee76793 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 7 Feb 2020 11:09:19 +0900 Subject: [PATCH 645/878] No crafted backtrace for SystemExit As SystemExit is ignored, it is just useless. --- tool/lib/test/unit/core_assertions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 836d712049d417..5b65eb9960f794 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -150,7 +150,7 @@ class Test::Unit::Runner ignore_stderr = nil res = nil end - if res + if res and !(SystemExit === res) if bt = res.backtrace bt.each do |l| l.sub!(/\A-:(\d+)/){"#{file}:#{line + $1.to_i}"} @@ -159,7 +159,7 @@ class Test::Unit::Runner else res.set_backtrace(caller) end - raise res unless SystemExit === res + raise res end # really is it succeed? From a3fb97465df3a4b6a7f56a1a915c6239a2a303b9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 7 Feb 2020 12:44:55 +0900 Subject: [PATCH 646/878] Stop auto runner Auto runner should not run in forked processes in separated tests. --- tool/lib/test/unit/core_assertions.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 5b65eb9960f794..86ed37f0788f92 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -104,6 +104,14 @@ def assert_ruby_status(args, test_stdin="", message=nil, **opt) ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV TERM") + def separated_runner(out = nil) + out = out ? IO.new(out, 'w') : STDOUT + at_exit { + out.puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" + } + Test::Unit::Runner.class_variable_set(:@@stop_auto_run, true) + end + def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **opt) unless file and line loc, = caller_locations(1,1) @@ -111,25 +119,19 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o line ||= loc.lineno end capture_stdout = true - if /mswin|mingw/ =~ RUBY_PLATFORM - res_out = "STDOUT" - else + unless /mswin|mingw/ =~ RUBY_PLATFORM capture_stdout = false opt[:out] = MiniTest::Unit.output res_p, res_c = IO.pipe opt[res_c.fileno] = res_c.fileno - res_out = "IO.new(#{res_c.fileno}, 'w')" end src = < Date: Fri, 7 Feb 2020 13:44:34 +0900 Subject: [PATCH 647/878] Removed useless empty lines --- test/ruby/test_process.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index e0cb49b8ef0a13..115c33a0781bb2 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -2260,8 +2260,6 @@ def test_deadlock_by_signal_at_forking pid = fork {Process.kill(:QUIT, parent)} IO.popen([ruby, -'--disable=gems'], -'r+'){} Process.wait(pid) - $stdout.puts - $stdout.flush end INPUT end if defined?(fork) From dedcf62b13bed5452dbc82590b828805b727bb28 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 7 Feb 2020 13:47:11 +0900 Subject: [PATCH 648/878] * 2020-02-07 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 65a6755ad88edc..7c0adfe4c91e44 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" From 6ed1a5e0e62bbdadcf3d0c61fcfe0c5f8d01789b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 7 Feb 2020 13:50:20 +0900 Subject: [PATCH 649/878] Made a test more robust Against changes of the `assert_separately` prologue code. --- test/ruby/test_module.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 2e0a14e300276e..5194a56a8c687f 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -2393,7 +2393,10 @@ def foo; end def test_inspect_segfault bug_10282 = '[ruby-core:65214] [Bug #10282]' - assert_separately [], <<-RUBY + assert_separately [], "#{<<~"begin;"}\n#{<<~'end;'}" + bug_10282 = "#{bug_10282}" + begin; + line = __LINE__ + 2 module ShallowInspect def shallow_inspect "foo" @@ -2410,9 +2413,9 @@ class A A.prepend InspectIsShallow - expect = "#" - assert_equal expect, A.new.method(:inspect).inspect, "#{bug_10282}" - RUBY + expect = "#" + assert_equal expect, A.new.method(:inspect).inspect, bug_10282 + end; end def test_define_method_with_unbound_method From 115fec062ccf7c6d72c8d5f64b7a5d84c9fb2dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Fri, 7 Feb 2020 14:14:05 +0900 Subject: [PATCH 650/878] more on NULL versus functions. Function pointers are not void*. See also ce4ea956d24eab5089a143bba38126f2b11b55b6 8427fca49bd85205f5a8766292dd893f003c0e48 --- dir.c | 4 ++-- dln.c | 3 ++- enc/trans/newline.trans | 10 +++++----- encoding.c | 2 +- ext/-test-/typeddata/typeddata.c | 2 +- range.c | 2 +- st.c | 4 ++-- thread.c | 6 +++--- thread_pthread.c | 2 +- thread_sync.c | 2 +- time.c | 4 ++-- tool/transcode-tblgen.rb | 6 +++--- transcode.c | 2 +- vm.c | 8 ++++---- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dir.c b/dir.c index 0957800070e3e3..ea0edf598212e8 100644 --- a/dir.c +++ b/dir.c @@ -2714,7 +2714,7 @@ ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg) { ruby_glob_funcs_t funcs; funcs.match = func; - funcs.error = NULL; + funcs.error = 0; return ruby_glob0(path, AT_FDCWD, 0, flags & ~GLOB_VERBOSE, &funcs, arg, rb_ascii8bit_encoding()); } @@ -2843,7 +2843,7 @@ ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE flags &= ~GLOB_VERBOSE; args.funcs.match = func; - args.funcs.error = NULL; + args.funcs.error = 0; args.value = arg; args.flags = flags; return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc, Qfalse); diff --git a/dln.c b/dln.c index 78c4c45a1fb27e..2251547c546640 100644 --- a/dln.c +++ b/dln.c @@ -1254,7 +1254,8 @@ static bool dln_incompatible_library_p(void *handle) { void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc"); - return ex && ex != ruby_xmalloc; + void *const fp = (void *)ruby_xmalloc; + return ex && ex != fp; } COMPILER_WARNING_POP #endif diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans index a200ec00a790e9..9e763407f9ebce 100644 --- a/enc/trans/newline.trans +++ b/enc/trans/newline.trans @@ -98,7 +98,7 @@ rb_universal_newline = { 2, /* max_output */ asciicompat_converter, /* asciicompat_type */ 2, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */ - NULL, NULL, NULL, fun_so_universal_newline, + 0, 0, 0, fun_so_universal_newline, universal_newline_finish }; @@ -110,8 +110,8 @@ rb_crlf_newline = { 1, /* max_input */ 2, /* max_output */ asciicompat_converter, /* asciicompat_type */ - 0, NULL, NULL, /* state_size, state_init, state_fini */ - NULL, NULL, NULL, NULL + 0, 0, 0, /* state_size, state_init, state_fini */ + 0, 0, 0, 0 }; static const rb_transcoder @@ -122,8 +122,8 @@ rb_cr_newline = { 1, /* max_input */ 1, /* max_output */ asciicompat_converter, /* asciicompat_type */ - 0, NULL, NULL, /* state_size, state_init, state_fini */ - NULL, NULL, NULL, NULL + 0, 0, 0, /* state_size, state_init, state_fini */ + 0, 0, 0, 0 }; void diff --git a/encoding.c b/encoding.c index c77d3519b40fd7..ca98b8edb0ac9b 100644 --- a/encoding.c +++ b/encoding.c @@ -1966,7 +1966,7 @@ Init_Encoding(void) rb_ary_push(list, enc_new(enc_table.list[i].enc)); } - rb_marshal_define_compat(rb_cEncoding, Qnil, NULL, enc_m_loader); + rb_marshal_define_compat(rb_cEncoding, Qnil, 0, enc_m_loader); } void diff --git a/ext/-test-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c index ae060960cdcdaf..374cbdf58d590f 100644 --- a/ext/-test-/typeddata/typeddata.c +++ b/ext/-test-/typeddata/typeddata.c @@ -2,7 +2,7 @@ static const rb_data_type_t test_data = { "typed_data", - {NULL, ruby_xfree, NULL}, + {0, ruby_xfree, 0}, NULL, NULL, 0/* deferred free */, }; diff --git a/range.c b/range.c index e182934fa35ded..83090168082793 100644 --- a/range.c +++ b/range.c @@ -1569,7 +1569,7 @@ r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val) return TRUE; } - val_max = rb_rescue2(r_call_max, val, NULL, Qnil, rb_eTypeError, (VALUE)0); + val_max = rb_rescue2(r_call_max, val, 0, Qnil, rb_eTypeError, (VALUE)0); if (val_max == Qnil) return FALSE; return r_less(end, val_max) >= 0; diff --git a/st.c b/st.c index 3d95c812d16c1b..9fababe2d028e9 100644 --- a/st.c +++ b/st.c @@ -1721,7 +1721,7 @@ int st_foreach(st_table *tab, st_foreach_callback_func *func, st_data_t arg) { const struct functor f = { func, arg }; - return st_general_foreach(tab, apply_functor, NULL, (st_data_t)&f, FALSE); + return st_general_foreach(tab, apply_functor, 0, (st_data_t)&f, FALSE); } /* See comments for function st_delete_safe. */ @@ -1729,7 +1729,7 @@ int st_foreach_check(st_table *tab, st_foreach_check_callback_func *func, st_data_t arg, st_data_t never ATTRIBUTE_UNUSED) { - return st_general_foreach(tab, func, NULL, arg, TRUE); + return st_general_foreach(tab, func, 0, arg, TRUE); } /* Set up array KEYS by at most SIZE keys of head table TAB entries. diff --git a/thread.c b/thread.c index ee73f364bc4455..f5efe40ab814ff 100644 --- a/thread.c +++ b/thread.c @@ -488,7 +488,7 @@ static void unblock_function_clear(rb_thread_t *th) { rb_native_mutex_lock(&th->interrupt_lock); - th->unblock.func = NULL; + th->unblock.func = 0; rb_native_mutex_unlock(&th->interrupt_lock); } @@ -961,7 +961,7 @@ thread_initialize(VALUE thread, VALUE args) } } else { - return thread_create_core(thread, args, NULL); + return thread_create_core(thread, args, 0); } } @@ -4582,7 +4582,7 @@ thgroup_memsize(const void *ptr) static const rb_data_type_t thgroup_data_type = { "thgroup", - {NULL, RUBY_TYPED_DEFAULT_FREE, thgroup_memsize,}, + {0, RUBY_TYPED_DEFAULT_FREE, thgroup_memsize,}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; diff --git a/thread_pthread.c b/thread_pthread.c index cbe6aa028a19b4..29284ff0f9de85 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -587,7 +587,7 @@ Init_native_thread(rb_thread_t *th) if (r) condattr_monotonic = NULL; } #endif - pthread_key_create(&ruby_native_thread_key, NULL); + pthread_key_create(&ruby_native_thread_key, 0); th->thread_id = pthread_self(); fill_thread_id_str(th); native_thread_init(th); diff --git a/thread_sync.c b/thread_sync.c index efe295e64caf28..7af5172818117c 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -78,7 +78,7 @@ static const char* rb_mutex_unlock_th(rb_mutex_t *mutex, rb_thread_t *th); * */ -#define mutex_mark NULL +#define mutex_mark ((void(*)(void*))0) static size_t rb_mutex_num_waiting(rb_mutex_t *mutex) diff --git a/time.c b/time.c index fcc5f522e11953..61d81e5fa4d1b0 100644 --- a/time.c +++ b/time.c @@ -5314,8 +5314,8 @@ time_mload(VALUE time, VALUE str) get_attr(nano_num, {}); get_attr(nano_den, {}); get_attr(submicro, {}); - get_attr(offset, (offset = rb_rescue(validate_utc_offset, offset, NULL, Qnil))); - get_attr(zone, (zone = rb_rescue(validate_zone_name, zone, NULL, Qnil))); + get_attr(offset, (offset = rb_rescue(validate_utc_offset, offset, 0, Qnil))); + get_attr(zone, (zone = rb_rescue(validate_zone_name, zone, 0, Qnil))); get_attr(year, {}); #undef get_attr diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 156b2de197e9dc..c6b58dbe786f14 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -895,9 +895,9 @@ def transcode_tblgen(from, to, map, valid_encoding=UnspecifiedValidEncoding, #{max_input}, /* max_input */ #{max_output}, /* max_output */ #{ascii_compatibility}, /* asciicompat_type */ - 0, NULL, NULL, /* state_size, state_init, state_fini */ - NULL, NULL, NULL, NULL, - NULL, NULL, NULL + 0, 0, 0, /* state_size, state_init, state_fini */ + 0, 0, 0, 0, + 0, 0, 0 }; End TRANSCODE_GENERATED_TRANSCODER_CODE << transcoder_code diff --git a/transcode.c b/transcode.c index 5cdaaaf61fa5d4..12c35f99df33c2 100644 --- a/transcode.c +++ b/transcode.c @@ -2925,7 +2925,7 @@ econv_memsize(const void *ptr) static const rb_data_type_t econv_data_type = { "econv", - {NULL, econv_free, econv_memsize,}, + {0, econv_free, econv_memsize,}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; diff --git a/vm.c b/vm.c index fae2b6812738e1..f2f160b3f64f52 100644 --- a/vm.c +++ b/vm.c @@ -2383,7 +2383,7 @@ vm_memsize(const void *ptr) static const rb_data_type_t vm_data_type = { "VM", - {NULL, NULL, vm_memsize,}, + {0, 0, vm_memsize,}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; @@ -3666,9 +3666,9 @@ usage_analysis_register_clear(VALUE self) #else -MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_insn)(int insn)) = NULL; -MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_operand)(int insn, int n, VALUE op)) = NULL; -MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_register)(int reg, int isset)) = NULL; +MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_insn)(int insn)) = 0; +MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_operand)(int insn, int n, VALUE op)) = 0; +MAYBE_UNUSED(static void (*ruby_vm_collect_usage_func_register)(int reg, int isset)) = 0; #endif From b64b0f3433b1dafa50ecd12b86567e3df863d57a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 7 Feb 2020 18:10:36 +0900 Subject: [PATCH 651/878] Show unmatched sequence on failure --- test/ruby/test_float.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index a94bbce49eea57..0daa3cca57a3b9 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -892,7 +892,8 @@ def test_step_excl a = rand b = a+rand*1000 s = (b - a) / 10 - assert_equal(10, (a...b).step(s).to_a.length) + seq = (a...b).step(s) + assert_equal(10, seq.to_a.length, seq.inspect) end assert_equal([1.0, 2.9, 4.8, 6.699999999999999], (1.0...6.8).step(1.9).to_a) From 38ed8cbb5f77d0fd67ae4aadc6a978b303d3c0e9 Mon Sep 17 00:00:00 2001 From: "S.H" Date: Fri, 7 Feb 2020 19:35:52 +0900 Subject: [PATCH 652/878] remove warning & support multi-run test for test/psych/visitors/test_to_ruby.rb (#2881) --- test/psych/visitors/test_to_ruby.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb index f342bf0a1a0840..0ebfe9bab06a4b 100644 --- a/test/psych/visitors/test_to_ruby.rb +++ b/test/psych/visitors/test_to_ruby.rb @@ -24,6 +24,7 @@ def test_tz_00_00_loads_without_error end def test_legacy_struct + Struct.send(:remove_const, AWESOME) if Struct.const_defined?(:AWESOME) foo = Struct.new('AWESOME', :bar) assert_equal foo.new('baz'), Psych.load(<<-eoyml) !ruby/struct:AWESOME From 59a40feec27790cbe07955eb00f1bc125c8d95e8 Mon Sep 17 00:00:00 2001 From: "S.H" Date: Fri, 7 Feb 2020 19:36:11 +0900 Subject: [PATCH 653/878] remove warning & support multi-run test for test/psych_test_yaml.rb (#2887) --- test/psych/test_yaml.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb index 5fa759c981b239..88787d35cccec3 100644 --- a/test/psych/test_yaml.rb +++ b/test/psych/test_yaml.rb @@ -1034,6 +1034,7 @@ def test_ranges end def test_ruby_struct + Struct.send(:remove_const, :MyBookStruct) if Struct.const_defined?(:MyBookStruct) # Ruby structures book_struct = Struct::new( "MyBookStruct", :author, :title, :year, :isbn ) assert_to_yaml( From b76a21aa45fff75909a66f8b20fc5856705f7862 Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Tue, 4 Feb 2020 08:45:11 +0000 Subject: [PATCH 654/878] support multi-run test for test/did_you_mean/spell_checking/test_class_name_check.rb --- test/did_you_mean/fixtures/book.rb | 2 +- test/did_you_mean/spell_checking/test_class_name_check.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/did_you_mean/fixtures/book.rb b/test/did_you_mean/fixtures/book.rb index e6644a6263b896..e31e629d434a4e 100644 --- a/test/did_you_mean/fixtures/book.rb +++ b/test/did_you_mean/fixtures/book.rb @@ -1,4 +1,4 @@ class Book - class Cover + class Spine end end diff --git a/test/did_you_mean/spell_checking/test_class_name_check.rb b/test/did_you_mean/spell_checking/test_class_name_check.rb index ffe7a4c31ba657..1b863ee27cc07c 100644 --- a/test/did_you_mean/spell_checking/test_class_name_check.rb +++ b/test/did_you_mean/spell_checking/test_class_name_check.rb @@ -66,7 +66,9 @@ def test_corrections_should_work_from_within_instance_method_on_nested_class end def test_does_not_suggest_user_input - error = assert_raise(NameError) { ::Book::Cover } + Book.send(:remove_const, :Spine) if Book.constants.include?(:Spine) + + error = assert_raise(NameError) { ::Book::Spine } # This is a weird require, but in a multi-threaded condition, a constant may # be loaded between when a NameError occurred and when the spell checker From 07c98537cae5c88cff0496fb8ef985771218fe1f Mon Sep 17 00:00:00 2001 From: "Bernhard F. Brodowsky" Date: Fri, 7 Feb 2020 19:57:15 -0500 Subject: [PATCH 655/878] Clarified documentation in rb_integer_unpack [ci skip] I struggled figuring out which of the pack/unpack functions goes into which direction and the two first sentences were of the documentation were: * Import an integer into a buffer. * Export an integer into a buffer. It sounds like both of them go from a ruby integer to a buffer because both use "into". So I fixed it and went to "Import an integer from a buffer". I find this much more clear. --- bignum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bignum.c b/bignum.c index 78c5681508e28a..e9bb5780b5c13c 100644 --- a/bignum.c +++ b/bignum.c @@ -3611,7 +3611,7 @@ rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t } /* - * Import an integer into a buffer. + * Import an integer from a buffer. * * [words] buffer to import. * [numwords] the size of given buffer as number of words. From c76484c3993532f6c67d7b1889d0edc6b6e28850 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 8 Feb 2020 09:57:34 +0900 Subject: [PATCH 656/878] * 2020-02-08 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 7c0adfe4c91e44..f10d26c18d8673 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 8 #include "ruby/version.h" From 80cbf97918da298ef394ffe9f33167378b57ebbb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 8 Feb 2020 19:48:31 +0900 Subject: [PATCH 657/878] [DOC] Added 2.7.x to the latest stable versions [ci skip] --- spec/ruby/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/README.md b/spec/ruby/README.md index 3163a789028169..b34e6681b1c7a4 100644 --- a/spec/ruby/README.md +++ b/spec/ruby/README.md @@ -29,7 +29,7 @@ ruby/spec is known to be tested in these implementations for every commit: * [Opal](https://github.com/opal/opal/tree/master/spec) ruby/spec describes the behavior of Ruby 2.4 and more recent Ruby versions. -More precisely, every latest stable MRI release should [pass](https://travis-ci.org/ruby/spec) all specs of ruby/spec (2.4.x, 2.5.x, 2.6.x, etc), and those are tested in TravisCI. +More precisely, every latest stable MRI release should [pass](https://travis-ci.org/ruby/spec) all specs of ruby/spec (2.4.x, 2.5.x, 2.6.x, 2.7.x, etc), and those are tested in TravisCI. The specs are synchronized both ways around once a month by @eregon between ruby/spec, MRI, JRuby and TruffleRuby. Each of these repositories has a full copy of the specs under `spec/ruby` to ease editing specs. From 97b583d68b9a26f835cedee3355a07c1452a52b3 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 02:52:47 +0900 Subject: [PATCH 658/878] [ruby/reline] Organize special keys escape sequences https://github.com/ruby/reline/commit/41deb1a3d9 --- lib/reline/ansi.rb | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 33bb1e465018cf..99595294252330 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -10,21 +10,40 @@ def self.win? end RAW_KEYSTROKE_CONFIG = { + # Console (80x25) + [27, 91, 49, 126] => :ed_move_to_beg, # Home + [27, 91, 52, 126] => :ed_move_to_end, # End + [27, 91, 51, 126] => :key_delete, # Del [27, 91, 65] => :ed_prev_history, # ↑ [27, 91, 66] => :ed_next_history, # ↓ [27, 91, 67] => :ed_next_char, # → [27, 91, 68] => :ed_prev_char, # ← - [27, 91, 51, 126] => :key_delete, # Del - [27, 91, 49, 126] => :ed_move_to_beg, # Home - [27, 91, 52, 126] => :ed_move_to_end, # End + + # KDE [27, 91, 72] => :ed_move_to_beg, # Home [27, 91, 70] => :ed_move_to_end, # End + # Del is 0x08 + [27, 71, 65] => :ed_prev_history, # ↑ + [27, 71, 66] => :ed_next_history, # ↓ + [27, 71, 67] => :ed_next_char, # → + [27, 71, 68] => :ed_prev_char, # ← + + # GNOME [27, 79, 72] => :ed_move_to_beg, # Home [27, 79, 70] => :ed_move_to_end, # End + # Del is 0x08 + # Arrow keys are the same of KDE + + # others [27, 32] => :em_set_mark, # M- [24, 24] => :em_exchange_mark, # C-x C-x TODO also add Windows [27, 91, 49, 59, 53, 67] => :em_next_word, # Ctrl+→ [27, 91, 49, 59, 53, 68] => :ed_prev_word, # Ctrl+← + + [27, 79, 65] => :ed_prev_history, # ↑ + [27, 79, 66] => :ed_next_history, # ↓ + [27, 79, 67] => :ed_next_char, # → + [27, 79, 68] => :ed_prev_char, # ← } @@input = STDIN From acb9b73495e7a9b4bf52b33dabf1714834c1d9ae Mon Sep 17 00:00:00 2001 From: git Date: Sun, 9 Feb 2020 02:56:05 +0900 Subject: [PATCH 659/878] * 2020-02-09 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index f10d26c18d8673..1b4455600f6338 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #include "ruby/version.h" From 2173ae7801c90ef5837b388a7b3f832732785aea Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 9 Feb 2020 11:04:53 +0900 Subject: [PATCH 660/878] spec/ruby/core/file/utime_spec.rb: far future timestamp may be trancated Under some Ext4 filesystem settings, a timestamp is limited up to 0x37fffffff (2446-05-10). https://ext4.wiki.kernel.org/index.php/Ext4_Disk_Layout#Inode_Timestamps > Therefore, timestamps should not overflow until May 2446. Actually the spec fails under one of our CI environments, like: ``` 1) File.utime allows Time instances in the far future to set mtime and atime FAILED Expected 2446 == 559444 to be truthy but was false ``` https://rubyci.org/logs/rubyci.s3.amazonaws.com/arch/ruby-master/log/20200208T180002Z.fail.html.gz --- spec/ruby/core/file/utime_spec.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/ruby/core/file/utime_spec.rb b/spec/ruby/core/file/utime_spec.rb index 03adc76efe5c87..9c198af18b40dc 100644 --- a/spec/ruby/core/file/utime_spec.rb +++ b/spec/ruby/core/file/utime_spec.rb @@ -72,11 +72,13 @@ platform_is :linux do platform_is wordsize: 64 do - it "allows Time instances in the far future to set mtime and atime" do + it "allows Time instances in the far future to set mtime and atime (but some filesystems limit it up to 2446-05-10)" do + # https://ext4.wiki.kernel.org/index.php/Ext4_Disk_Layout#Inode_Timestamps + # "Therefore, timestamps should not overflow until May 2446." time = Time.at(1<<44) File.utime(time, time, @file1) - File.atime(@file1).year.should == 559444 - File.mtime(@file1).year.should == 559444 + [559444, 2446].should.include? File.atime(@file1).year + [559444, 2446].should.include? File.mtime(@file1).year end end end From 92c86e39de30e5cd4ec1298204a5c2de52994165 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 9 Feb 2020 12:12:07 +0900 Subject: [PATCH 661/878] Removed a useless guard MSpec requires Ruby 2.4 or more recent. --- spec/mspec/lib/mspec/utils/warnings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/mspec/lib/mspec/utils/warnings.rb b/spec/mspec/lib/mspec/utils/warnings.rb index 1cf83b6d22f50a..fa05c8c677dea4 100644 --- a/spec/mspec/lib/mspec/utils/warnings.rb +++ b/spec/mspec/lib/mspec/utils/warnings.rb @@ -1,6 +1,6 @@ require 'mspec/guards/version' -if RUBY_ENGINE == "ruby" and ruby_version_is("2.4") +if RUBY_ENGINE == "ruby" ruby_version_is "2.4"..."2.5" do # Kernel#warn does not delegate to Warning.warn in 2.4 module Kernel From a28c166f787710227c6aac54befd72778f041485 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 9 Feb 2020 12:53:18 +0900 Subject: [PATCH 662/878] gc.c: make the stack overflow detection earlier under s390x On s390x, TestFiber#test_stack_size fails with SEGV. https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel_zlinux/ruby-master/log/20200205T223421Z.fail.html.gz ``` TestFiber#test_stack_size [/home/chkbuild/build/20200205T223421Z/ruby/test/ruby/test_fiber.rb:356]: pid 23844 killed by SIGABRT (signal 6) (core dumped) | -e:1:in `times': stack level too deep (SystemStackError) | from -e:1:in `rec' | from -e:1:in `block (3 levels) in rec' | from -e:1:in `times' | from -e:1:in `block (2 levels) in rec' | from -e:1:in `times' | from -e:1:in `block in rec' | from -e:1:in `times' | from -e:1:in `rec' | ... 172 levels... | from -e:1:in `block in rec' | from -e:1:in `times' | from -e:1:in `rec' | from -e:1:in `block in
' | -e: [BUG] Segmentation fault at 0x0000000000000000 ``` This change tries a similar fix with ef64ab917eec02491f6bf7233a4031a8c35385e3 and 3ddbba84b5b1f001cd575a48cec56d7ce8e5fbb2. --- gc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gc.c b/gc.c index a9400b521acac6..2c7de4fd17f615 100644 --- a/gc.c +++ b/gc.c @@ -4690,7 +4690,14 @@ stack_check(rb_execution_context_t *ec, int water_mark) #define stack_check(ec, water_mark) FALSE #endif +#ifdef __s390x__ +/* Experimentally make the stack overflow detection earlier under s390x + * https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel_zlinux/ruby-master/log/20200205T223421Z.fail.html.gz + */ +#define STACKFRAME_FOR_CALL_CFUNC 8192 +#else #define STACKFRAME_FOR_CALL_CFUNC 2048 +#endif MJIT_FUNC_EXPORTED int rb_ec_stack_check(rb_execution_context_t *ec) From e077a910b62ef448380c3f9607d740e5c98100b3 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 9 Feb 2020 13:39:24 +0900 Subject: [PATCH 663/878] Fix message of ExceptionForMatrix::ErrOperationNotDefined ``` % RBENV_VERSION=2.6.5 ruby -r matrix -e 'Vector[1]*Vector[2] rescue p($!)' # % RBENV_VERSION=2.7.0 ruby -r matrix -e 'Vector[1]*Vector[2] rescue p($!)' # % RBENV_VERSION=master ruby -r matrix -e 'Vector[1]*Vector[2] rescue p($!)' # ``` --- lib/matrix.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matrix.rb b/lib/matrix.rb index fc0e8ef2f7f88b..81e3f596cad441 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -38,7 +38,7 @@ def initialize(val = nil) class ErrOperationNotDefined < StandardError def initialize(vals) if vals.is_a?(Array) - super("Operation(#{vals[0]}) can\\'t be defined: #{vals[1]} op #{vals[2]}") + super("Operation(#{vals[0]}) can't be defined: #{vals[1]} op #{vals[2]}") else super(vals) end From b7e0831e8f1f84a9440e42a27b2d7b15c65ca9aa Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Sun, 9 Feb 2020 00:59:55 -0600 Subject: [PATCH 664/878] Enhance rdoc for ENV --- hash.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 14 deletions(-) diff --git a/hash.c b/hash.c index 8eb07a54ddd348..aeb6bbeb5c0585 100644 --- a/hash.c +++ b/hash.c @@ -5496,8 +5496,9 @@ env_each_pair(VALUE ehash) * * Similar to ENV.delete_if, but returns +nil+ if no changes were made. * - * Deletes each environment variable for which the block returns a truthy value, - * returning ENV (if any deletions) or +nil+ (if not): + * Yields each environment variable name and its value as a 2-element Array, + * deleting each environment variable for which the block returns a truthy value, + * and returning ENV (if any deletions) or +nil+ (if not): * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') * ENV.reject! { |name, value| name.start_with?('b') } # => ENV * ENV # => {"foo"=>"0"} @@ -5539,9 +5540,20 @@ env_reject_bang(VALUE ehash) * ENV.delete_if { |name, value| block } -> ENV * ENV.delete_if -> Enumerator * - * Deletes every environment variable for which the block evaluates to +true+. + * Yields each environment variable name and its value as a 2-element Array, + * deleting each environment variable for which the block returns a truthy value, + * and returning ENV (regardless or whether any deletions): + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.delete_if { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"foo"=>"0"} + * ENV.delete_if { |name, value| name.start_with?('b') } # => ENV * - * If no block is given an enumerator is returned instead. + * Returns an Enumerator if no block given: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * e = ENV.delete_if # => #"1", "baz"=>"2", "foo"=>"0"}:delete_if!> + * e.each { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"foo"=>"0"} + * e.each { |name, value| name.start_with?('b') } # => ENV */ static VALUE env_delete_if(VALUE ehash) @@ -5553,10 +5565,21 @@ env_delete_if(VALUE ehash) /* * call-seq: - * ENV.values_at(name, ...) -> Array + * ENV.values_at(*names) -> Array + * + * Returns an Array containing the environment variable values associated with + * the given names: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.values_at('foo', 'baz') # => ["0", "2"] * - * Returns an array containing the environment variable values associated with - * the given names. See also ENV.select. + * Returns +nil+ in the Array for each name that is not an ENV name: + * ENV.values_at('foo', 'bat', 'bar', 'bam') # => ["0", nil, "1", nil] + * + * Returns an empty Array if no names given: + * ENV.values_at() # => [] + * + * Raises an exception if any name is invalid. + * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]. */ static VALUE env_values_at(int argc, VALUE *argv, VALUE _) @@ -5578,11 +5601,19 @@ env_values_at(int argc, VALUE *argv, VALUE _) * ENV.filter { |name, value| block } -> Hash * ENV.filter -> Enumerator * - * Returns a copy of the environment for entries where the block returns true. + * ENV.filter is an alias for ENV.select. * - * Returns an Enumerator if no block was given. + * Yields each environment variable name and its value as a 2-element Array, + * returning a Hash of the names and values for which the block returns a truthy value: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.select { |name, value| name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"} + * ENV.filter { |name, value| name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"} * - * ENV.filter is an alias for ENV.select. + * Returns an Enumerator if no block given: + * e = ENV.select # => #"1", "baz"=>"2", "foo"=>"0"}:select> + * e.each { |name, value | name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"} + * e = ENV.filter # => #"1", "baz"=>"2", "foo"=>"0"}:filter> + * e.each { |name, value | name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"} */ static VALUE env_select(VALUE ehash) @@ -5615,9 +5646,35 @@ env_select(VALUE ehash) * ENV.filter! { |name, value| block } -> ENV or nil * ENV.filter! -> Enumerator * - * Equivalent to ENV.keep_if but returns +nil+ if no changes were made. - * * ENV.filter! is an alias for ENV.select!. + * + * Yields each environment variable name and its value as a 2-element Array, + * deleting each entry for which the block returns +false+ or +nil+, + * and returning ENV if any deletions made, or +nil+ otherwise: + * + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.select! { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} + * ENV.select! { |name, value| true } # => nil + * + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.filter! { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} + * ENV.filter! { |name, value| true } # => nil + * + * Returns an Enumerator if no block given: + * + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * e = ENV.select! # => #"1", "baz"=>"2"}:select!> + * e.each { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} + * e.each { |name, value| true } # => nil + * + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * e = ENV.filter! # => #"1", "baz"=>"2"}:filter!> + * e.each { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} + * e.each { |name, value| true } # => nil */ static VALUE env_select_bang(VALUE ehash) @@ -5648,9 +5705,18 @@ env_select_bang(VALUE ehash) * ENV.keep_if { |name, value| block } -> ENV * ENV.keep_if -> Enumerator * - * Deletes every environment variable where the block evaluates to +false+. + * Yields each environment variable name and its value as a 2-element Array, + * deleting each environment variable for which the block returns +false+ or +nil+, + * and returning ENV: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.keep_if { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} * - * Returns an enumerator if no block was given. + * Returns an Enumerator if no block given: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * e = ENV.keep_if # => #"1", "baz"=>"2", "foo"=>"0"}:keep_if> + * e.each { |name, value| name.start_with?('b') } # => ENV + * ENV # => {"bar"=>"1", "baz"=>"2"} */ static VALUE env_keep_if(VALUE ehash) From c47cd4be28840159251b4c66df71e10e979316a0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 9 Feb 2020 15:43:15 +0900 Subject: [PATCH 665/878] Removed duplicated code --- enumerator.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/enumerator.c b/enumerator.c index fa30a59819f8c5..5d5c382faa5777 100644 --- a/enumerator.c +++ b/enumerator.c @@ -3806,35 +3806,6 @@ arith_seq_each(VALUE self) return self; } -static double -arith_seq_float_step_size(double beg, double end, double step, int excl) -{ - double const epsilon = DBL_EPSILON; - double n, err; - - if (step == 0) { - return HUGE_VAL; - } - n = (end - beg) / step; - err = (fabs(beg) + fabs(end) + fabs(end - beg)) / fabs(step) * epsilon; - if (isinf(step)) { - return step > 0 ? beg <= end : beg >= end; - } - if (err > 0.5) err = 0.5; - if (excl) { - if (n <= 0) return 0; - if (n < 1) - n = 0; - else - n = floor(n - err); - } - else { - if (n < 0) return 0; - n = floor(n + err); - } - return n + 1; -} - /* * call-seq: * aseq.size -> num or nil @@ -3868,7 +3839,7 @@ arith_seq_size(VALUE self) ee = NUM2DBL(e); } - n = arith_seq_float_step_size(NUM2DBL(b), ee, NUM2DBL(s), x); + n = ruby_float_step_size(NUM2DBL(b), ee, NUM2DBL(s), x); if (isinf(n)) return DBL2NUM(n); if (POSFIXABLE(n)) return LONG2FIX(n); return rb_dbl2big(n); From aeaf0dc55595b8a5bfdd92007fb85ef13855c632 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 9 Feb 2020 16:56:40 +0900 Subject: [PATCH 666/878] Separate objspace argument for rb_gc_disable and rb_gc_enable --- gc.c | 30 ++++++++++++++++++++++++------ internal/gc.h | 3 +++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/gc.c b/gc.c index 2c7de4fd17f615..779b4b02b19c0d 100644 --- a/gc.c +++ b/gc.c @@ -1095,6 +1095,7 @@ static int gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, static int gc_verify_heap_pages(rb_objspace_t *objspace); static void gc_stress_set(rb_objspace_t *objspace, VALUE flag); +static VALUE gc_disable_no_rest(rb_objspace_t *); static double getrusage_time(void); static inline void gc_prof_setup_new_record(rb_objspace_t *objspace, int reason); @@ -5902,7 +5903,7 @@ gc_marks_check(rb_objspace_t *objspace, st_foreach_callback_func *checker_func, #if RGENGC_ESTIMATE_OLDMALLOC size_t saved_oldmalloc_increase = objspace->rgengc.oldmalloc_increase; #endif - VALUE already_disabled = rb_gc_disable(); + VALUE already_disabled = rb_objspace_gc_disable(objspace); objspace->rgengc.allrefs_table = objspace_allrefs(objspace); @@ -5920,7 +5921,7 @@ gc_marks_check(rb_objspace_t *objspace, st_foreach_callback_func *checker_func, objspace_allrefs_destruct(objspace->rgengc.allrefs_table); objspace->rgengc.allrefs_table = 0; - if (already_disabled == Qfalse) rb_gc_enable(); + if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace); objspace->malloc_params.increase = saved_malloc_increase; #if RGENGC_ESTIMATE_OLDMALLOC objspace->rgengc.oldmalloc_increase = saved_oldmalloc_increase; @@ -8585,7 +8586,7 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl } VALUE moved_list_head; - VALUE disabled = rb_gc_disable(); + VALUE disabled = rb_objspace_gc_disable(objspace); if (use_toward_empty) { moved_list_head = gc_compact_heap(objspace, compare_free_slots); @@ -8596,7 +8597,7 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl heap_eden->freelist = NULL; gc_update_references(objspace); - if (!RTEST(disabled)) rb_gc_enable(); + if (!RTEST(disabled)) rb_objspace_gc_enable(objspace); if (use_verifier) { gc_check_references_for_moved(objspace); @@ -9208,6 +9209,12 @@ VALUE rb_gc_enable(void) { rb_objspace_t *objspace = &rb_objspace; + return rb_objspace_gc_enable(objspace); +} + +VALUE +rb_objspace_gc_enable(rb_objspace_t *objspace) +{ int old = dont_gc; dont_gc = FALSE; @@ -9224,18 +9231,29 @@ VALUE rb_gc_disable_no_rest(void) { rb_objspace_t *objspace = &rb_objspace; + return gc_disable_no_rest(objspace); +} + +static VALUE +gc_disable_no_rest(rb_objspace_t *objspace) +{ int old = dont_gc; dont_gc = TRUE; return old ? Qtrue : Qfalse; } - VALUE rb_gc_disable(void) { rb_objspace_t *objspace = &rb_objspace; + return rb_objspace_gc_disable(objspace); +} + +VALUE +rb_objspace_gc_disable(rb_objspace_t *objspace) +{ gc_rest(objspace); - return rb_gc_disable_no_rest(); + return gc_disable_no_rest(objspace); } static VALUE diff --git a/internal/gc.h b/internal/gc.h index 36b534ed1fdfdf..86a3113b62f888 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -17,6 +17,7 @@ #include "ruby/ruby.h" /* for rb_event_flag_t */ struct rb_execution_context_struct; /* in vm_core.h */ +struct rb_objspace; /* in vm_core.h */ #ifdef NEWOBJ_OF # undef NEWOBJ_OF @@ -60,6 +61,8 @@ extern int ruby_disable_gc; void *ruby_mimmalloc(size_t size) RUBY_ATTR_MALLOC; void ruby_mimfree(void *ptr); void rb_objspace_set_event_hook(const rb_event_flag_t event); +VALUE rb_objspace_gc_enable(struct rb_objspace *); +VALUE rb_objspace_gc_disable(struct rb_objspace *); void ruby_gc_set_params(void); void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj); #if __has_attribute(alloc_align) From 0f05b234fba2d961f1740c094a83f9831c15b210 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 9 Feb 2020 16:41:56 +0900 Subject: [PATCH 667/878] Disable GC until VM objects get initialized [Bug #16616] --- gc.c | 1 + test/ruby/test_thread.rb | 1 + vm.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/gc.c b/gc.c index 779b4b02b19c0d..e7dce9e7a247b8 100644 --- a/gc.c +++ b/gc.c @@ -1623,6 +1623,7 @@ rb_objspace_alloc(void) malloc_limit = gc_params.malloc_limit_min; list_head_init(&objspace->eden_heap.pages); list_head_init(&objspace->tomb_heap.pages); + dont_gc = TRUE; return objspace; } diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index f8127d878609b3..30a3cc784e8179 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -1150,6 +1150,7 @@ def test_stack_size "0 thread_machine_stack_size") assert_operator(h_default[:thread_machine_stack_size], :<=, h_large[:thread_machine_stack_size], "large thread_machine_stack_size") + assert_equal("ok", invoke_rec('print :ok', 1024 * 1024 * 100, nil, false)) end def test_vm_machine_stack_size diff --git a/vm.c b/vm.c index f2f160b3f64f52..8c7abb359953e2 100644 --- a/vm.c +++ b/vm.c @@ -3345,6 +3345,8 @@ Init_vm_objects(void) vm->mark_object_ary = rb_ary_tmp_new(128); vm->loading_table = st_init_strtable(); vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000); + + rb_objspace_gc_enable(vm->objspace); } /* top self */ From e3e96e3faa1683c8ee832cb6da6f9f96d18b0d77 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 9 Feb 2020 20:13:49 +0900 Subject: [PATCH 668/878] Check if bindable against the refined target [Bug #16617] --- common.mk | 1 + proc.c | 5 +++++ test/ruby/test_refinement.rb | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/common.mk b/common.mk index 59d11a968c466e..617d39941a70e3 100644 --- a/common.mk +++ b/common.mk @@ -3224,6 +3224,7 @@ proc.$(OBJEXT): $(top_srcdir)/internal/array.h proc.$(OBJEXT): $(top_srcdir)/internal/class.h proc.$(OBJEXT): $(top_srcdir)/internal/compilers.h proc.$(OBJEXT): $(top_srcdir)/internal/error.h +proc.$(OBJEXT): $(top_srcdir)/internal/eval.h proc.$(OBJEXT): $(top_srcdir)/internal/gc.h proc.$(OBJEXT): $(top_srcdir)/internal/imemo.h proc.$(OBJEXT): $(top_srcdir)/internal/object.h diff --git a/proc.c b/proc.c index 47f4e668b570d8..83ec61d0f52939 100644 --- a/proc.c +++ b/proc.c @@ -14,6 +14,7 @@ #include "internal.h" #include "internal/class.h" #include "internal/error.h" +#include "internal/eval.h" #include "internal/object.h" #include "internal/proc.h" #include "internal/symbol.h" @@ -2366,6 +2367,10 @@ convert_umethod_to_method_components(VALUE method, VALUE recv, VALUE *methclass_ VALUE iclass = data->me->defined_class; VALUE klass = CLASS_OF(recv); + if (RB_TYPE_P(methclass, T_MODULE)) { + VALUE refined_class = rb_refinement_module_get_refined_class(methclass); + if (!NIL_P(refined_class)) methclass = refined_class; + } if (!RB_TYPE_P(methclass, T_MODULE) && methclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, methclass)) { if (FL_TEST(methclass, FL_SINGLETON)) { diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index c6707ff54cda23..1f2a67eeb22c1d 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -2386,6 +2386,25 @@ def test_prepend_refined_module assert_equal(0, Bug13446::GenericEnumerable.new.sum) end + def test_unbound_refine_method + a = EnvUtil.labeled_class("A") do + def foo + self.class + end + end + b = EnvUtil.labeled_class("B") + bar = EnvUtil.labeled_module("R") do + break refine a do + def foo + super + end + end + end + assert_raise(TypeError) do + bar.instance_method(:foo).bind(b.new) + end + end + private def eval_using(mod, s) From 9dcb324fbeaba2aeb51d8cfcf472b86704818f08 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 17:16:53 +0900 Subject: [PATCH 669/878] Revert "[ruby/readline-ext] Include ruby/assert.h in ruby/ruby.h so that assertions can be there" This reverts commit 425b2064d394639101854c83a061a0918b33b857. This cherry-pick was a mistake. --- ext/readline/depend | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/readline/depend b/ext/readline/depend index 7ebc6119c5a878..2dde7fca58f088 100644 --- a/ext/readline/depend +++ b/ext/readline/depend @@ -1,7 +1,6 @@ # AUTOGENERATED DEPENDENCIES START readline.o: $(RUBY_EXTCONF_H) readline.o: $(arch_hdrdir)/ruby/config.h -readline.o: $(hdrdir)/ruby.h readline.o: $(hdrdir)/ruby/assert.h readline.o: $(hdrdir)/ruby/backward.h readline.o: $(hdrdir)/ruby/defines.h From 05711adfb4eb30975860749225ddee3484336654 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 15:33:28 +0900 Subject: [PATCH 670/878] [ruby/readline-ext] Remove unnecessary -I$(top_srcdir) when it's an individual gem https://github.com/ruby/readline-ext/commit/efaca4a5f4 --- ext/readline/extconf.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index fcc62921ae37a9..d3e7872e65f5ae 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -109,5 +109,4 @@ def readline.have_type(type) $defs << "-Drl_hook_func_t=Function" end -$INCFLAGS << " -I$(top_srcdir)" create_makefile("readline") From ac0658e72095a2e70f70635a0e2d8c908e54c41e Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 16:41:07 +0900 Subject: [PATCH 671/878] [ruby/readline-ext] Check TestRelineAsReadline existance https://github.com/ruby/readline-ext/commit/c0a6303168 --- test/readline/test_readline.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 0c65d52087e2c0..93cadbb930925c 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -45,7 +45,7 @@ def test_readline # Work around lack of SecurityError in Reline # test mode with tainted prompt. # Also skip test on Ruby 2.7+, where $SAFE/taint is deprecated. - if RUBY_VERSION < '2.7' && !kind_of?(TestRelineAsReadline) + if RUBY_VERSION < '2.7' && defined?(TestRelineAsReadline) && !kind_of?(TestRelineAsReadline) begin Thread.start { $SAFE = 1 From a629f147cd255b9887ce05a803431e243b925d08 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 17:06:17 +0900 Subject: [PATCH 672/878] [ruby/readline-ext] The ruby/assert.h is adopted by Ruby 2.7 or later https://github.com/ruby/readline-ext/commit/106c31fc1b --- ext/readline/depend | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/readline/depend b/ext/readline/depend index 2dde7fca58f088..144e5401793358 100644 --- a/ext/readline/depend +++ b/ext/readline/depend @@ -1,7 +1,6 @@ # AUTOGENERATED DEPENDENCIES START readline.o: $(RUBY_EXTCONF_H) readline.o: $(arch_hdrdir)/ruby/config.h -readline.o: $(hdrdir)/ruby/assert.h readline.o: $(hdrdir)/ruby/backward.h readline.o: $(hdrdir)/ruby/defines.h readline.o: $(hdrdir)/ruby/encoding.h From fd6746c7a651d4a504073726d56be610e1081b78 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 17:18:41 +0900 Subject: [PATCH 673/878] [ruby/readline-ext] Use require check instead of DONT_RUN_RELINE_TEST env https://github.com/ruby/readline-ext/commit/1df99d1481 --- test/readline/helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/readline/helper.rb b/test/readline/helper.rb index d5f02573ec76a3..1b80327b571d47 100644 --- a/test/readline/helper.rb +++ b/test/readline/helper.rb @@ -9,8 +9,10 @@ def use_ext_readline # Use ext/readline as Readline Object.const_set(:Readline, ReadlineSo) end -unless ENV['DONT_RUN_RELINE_TEST'] +begin require "reline" +rescue LoadError +else def use_lib_reline # Use lib/reline as Readline Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') Reline.const_set('IOGate', Reline::GeneralIO) From 108a2880793867b9270931c508143d6757d6a0f9 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 20:00:58 +0900 Subject: [PATCH 674/878] [ruby/readline-ext] Add spec.extensions https://github.com/ruby/readline-ext/commit/8c33abb13c --- ext/readline/readline-ext.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/readline/readline-ext.gemspec b/ext/readline/readline-ext.gemspec index a611a8ea9a803e..be682eaa4fdda4 100644 --- a/ext/readline/readline-ext.gemspec +++ b/ext/readline/readline-ext.gemspec @@ -8,6 +8,7 @@ Gem::Specification.new do |spec| spec.description = %q{Provides an interface for GNU Readline and Edit Line (libedit).} spec.homepage = "https://github.com/ruby/readline-ext" spec.license = "BSD-2-Clause" + spec.extensions = %w[ext/readline/extconf.rb] spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = spec.homepage From f3471174bb6e8c717c7b57e2a9b3f0e697eae183 Mon Sep 17 00:00:00 2001 From: aycabta Date: Sun, 9 Feb 2020 20:14:32 +0900 Subject: [PATCH 675/878] [ruby/readline-ext] Use rake/extensiokntask to build https://github.com/ruby/readline-ext/commit/b0b5f709bd --- ext/readline/readline-ext.gemspec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/readline/readline-ext.gemspec b/ext/readline/readline-ext.gemspec index be682eaa4fdda4..3b7ec9284cc25f 100644 --- a/ext/readline/readline-ext.gemspec +++ b/ext/readline/readline-ext.gemspec @@ -19,4 +19,8 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] + + spec.add_development_dependency "bundler" + spec.add_development_dependency "rake" + spec.add_development_dependency "rake-compiler" end From 26532c7e7793ecb7bcfaf2ac71425d1f0a84abe5 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 9 Feb 2020 21:40:16 +0900 Subject: [PATCH 676/878] doc/make_cheatsheet.md: add a memo about how to run one rubyspec file --- doc/make_cheatsheet.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/make_cheatsheet.md b/doc/make_cheatsheet.md index 29648e8174eff2..f79d751bdc440e 100644 --- a/doc/make_cheatsheet.md +++ b/doc/make_cheatsheet.md @@ -64,6 +64,10 @@ $ make test-all TESTS=ruby/foo $ make test-all TESTS="test/ruby/test_foo.rb -n /test_bar/" ``` +``` +$ make test-spec MSPECOPT=spec/ruby/core/foo/bar_spec.rb +``` + ## How to measure coverage of C and Ruby code You need to be able to use gcc (gcov) and lcov visualizer. From 6f04f0cc444b74f8fdde3e12bb1c949ba0674450 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 9 Feb 2020 21:40:53 +0900 Subject: [PATCH 677/878] test/ruby/test_thread_queue.rb: add a wait to yield a thread On Arch, sending a signal in a loop seems hardly to yield the execution. ``` 1) Error: TestThreadQueue#test_queue_with_trap: Timeout::Error: execution of assert_in_out_err expired timeout (10 sec) ``` https://rubyci.org/logs/rubyci.s3.amazonaws.com/arch/ruby-master/log/20200209T120002Z.fail.html.gz This change allows the test to pass. --- test/ruby/test_thread_queue.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb index 41e6865ed4fdcc..13c839ab508fe7 100644 --- a/test/ruby/test_thread_queue.rb +++ b/test/ruby/test_thread_queue.rb @@ -572,6 +572,7 @@ def test_queue_with_trap Thread.new{ loop{ Process.kill :INT, $$ + sleep 0.1 } } puts q.pop From 9c5a2fed85f50f1d593da23eea71437a41d5969e Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Sun, 9 Feb 2020 11:12:50 -0500 Subject: [PATCH 678/878] Fix readline build dependency --- ext/readline/depend | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/readline/depend b/ext/readline/depend index 144e5401793358..2dde7fca58f088 100644 --- a/ext/readline/depend +++ b/ext/readline/depend @@ -1,6 +1,7 @@ # AUTOGENERATED DEPENDENCIES START readline.o: $(RUBY_EXTCONF_H) readline.o: $(arch_hdrdir)/ruby/config.h +readline.o: $(hdrdir)/ruby/assert.h readline.o: $(hdrdir)/ruby/backward.h readline.o: $(hdrdir)/ruby/defines.h readline.o: $(hdrdir)/ruby/encoding.h From 2079f436c7d4047cb09af005e9f8eb6fbf256000 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 10 Feb 2020 01:27:54 +0900 Subject: [PATCH 679/878] * 2020-02-10 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1b4455600f6338..10c9e96ca2f413 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h" From 6e5e6a40c4c35aee1cfb7d0effa47354f80baa9e Mon Sep 17 00:00:00 2001 From: NagayamaRyoga Date: Wed, 18 Dec 2019 19:26:02 +0900 Subject: [PATCH 680/878] Deduplicate objects efficiently when dumping iseq to binary We were inefficient in cases where there are a lot of duplicates due to the use of linear search. Use a hash table instead. These cases are not that rare in the wild. [Feature #16505] --- compile.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/compile.c b/compile.c index 9de9114c906661..8b3d83eb937d35 100644 --- a/compile.c +++ b/compile.c @@ -9520,7 +9520,8 @@ struct ibf_header { struct ibf_dump_buffer { VALUE str; - VALUE obj_list; /* [objs] */ + VALUE obj_list; /* [objs] */ + st_table *obj_table; /* obj -> obj number */ }; struct ibf_dump { @@ -9666,25 +9667,26 @@ static VALUE ibf_load_object(const struct ibf_load *load, VALUE object_index); static rb_iseq_t *ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq); static VALUE -ibf_dump_object_list_new(void) +ibf_dump_object_list_new(st_table **obj_table) { VALUE obj_list = rb_ary_tmp_new(1); rb_ary_push(obj_list, Qnil); /* 0th is nil */ + *obj_table = st_init_numtable(); /* need free */ + rb_st_insert(*obj_table, (st_data_t)Qnil, (st_data_t)0); /* 0th is nil */ + return obj_list; } static VALUE ibf_dump_object(struct ibf_dump *dump, VALUE obj) { - VALUE obj_list = dump->current_buffer->obj_list; - long index = RARRAY_LEN(obj_list); - long i; - for (i=0; icurrent_buffer->obj_table, (st_data_t)obj); + if (obj_index < 0) { + obj_index = ibf_table_index(dump->current_buffer->obj_table, (st_data_t)obj); + rb_ary_push(dump->current_buffer->obj_list, obj); } - rb_ary_push(obj_list, obj); - return (VALUE)index; + return obj_index; } static VALUE @@ -10372,7 +10374,7 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) struct ibf_dump_buffer *saved_buffer = dump->current_buffer; struct ibf_dump_buffer buffer; buffer.str = rb_str_new(0, 0); - buffer.obj_list = ibf_dump_object_list_new(); + buffer.obj_list = ibf_dump_object_list_new(&buffer.obj_table); dump->current_buffer = &buffer; #endif @@ -10477,6 +10479,8 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_dump_write_small_value(dump, local_obj_list_offset); ibf_dump_write_small_value(dump, local_obj_list_size); + rb_st_free_table(buffer.obj_table); + return offset; #else return body_offset; @@ -10504,15 +10508,15 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) struct ibf_load_buffer *saved_buffer = load->current_buffer; load->current_buffer = &load->global_buffer; - const ibf_offset_t iseq_start = ibf_load_small_value(load, &reading_pos); - const ibf_offset_t iseq_length_bytes = ibf_load_small_value(load, &reading_pos); - const ibf_offset_t body_offset = ibf_load_small_value(load, &reading_pos); + const ibf_offset_t iseq_start = (ibf_offset_t)ibf_load_small_value(load, &reading_pos); + const ibf_offset_t iseq_length_bytes = (ibf_offset_t)ibf_load_small_value(load, &reading_pos); + const ibf_offset_t body_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos); struct ibf_load_buffer buffer; buffer.buff = load->global_buffer.buff + iseq_start; buffer.size = iseq_length_bytes; - buffer.obj_list_offset = ibf_load_small_value(load, &reading_pos); - buffer.obj_list_size = ibf_load_small_value(load, &reading_pos); + buffer.obj_list_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos); + buffer.obj_list_size = (ibf_offset_t)ibf_load_small_value(load, &reading_pos); buffer.obj_list = rb_ary_tmp_new(buffer.obj_list_size); rb_ary_resize(buffer.obj_list, buffer.obj_list_size); @@ -11338,6 +11342,10 @@ static void ibf_dump_free(void *ptr) { struct ibf_dump *dump = (struct ibf_dump *)ptr; + if (dump->global_buffer.obj_table) { + st_free_table(dump->global_buffer.obj_table); + dump->global_buffer.obj_table = 0; + } if (dump->iseq_table) { st_free_table(dump->iseq_table); dump->iseq_table = 0; @@ -11351,6 +11359,7 @@ ibf_dump_memsize(const void *ptr) struct ibf_dump *dump = (struct ibf_dump *)ptr; size_t size = sizeof(*dump); if (dump->iseq_table) size += st_memsize(dump->iseq_table); + if (dump->global_buffer.obj_table) size += st_memsize(dump->global_buffer.obj_table); return size; } @@ -11364,7 +11373,7 @@ static void ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj) { RB_OBJ_WRITE(dumper_obj, &dump->iseq_list, rb_ary_tmp_new(0)); - RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.obj_list, ibf_dump_object_list_new()); + RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.obj_list, ibf_dump_object_list_new(&dump->global_buffer.obj_table)); RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.str, rb_str_new(0, 0)); dump->iseq_table = st_init_numtable(); /* need free */ From e443f23576686edac795e076ba964cbe1beef62f Mon Sep 17 00:00:00 2001 From: NagayamaRyoga Date: Thu, 6 Feb 2020 21:31:28 +0900 Subject: [PATCH 681/878] compile.c: Drop iseq_list from ibf_dump [Feature #16505] --- compile.c | 53 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/compile.c b/compile.c index 8b3d83eb937d35..65894706e086cb 100644 --- a/compile.c +++ b/compile.c @@ -9525,7 +9525,6 @@ struct ibf_dump_buffer { }; struct ibf_dump { - VALUE iseq_list; /* [iseqs] */ st_table *iseq_table; /* iseq -> iseq number */ struct ibf_dump_buffer global_buffer; struct ibf_dump_buffer *current_buffer; @@ -9647,7 +9646,7 @@ ibf_table_lookup(struct st_table *table, st_data_t key) } static int -ibf_table_index(struct st_table *table, st_data_t key) +ibf_table_find_or_insert(struct st_table *table, st_data_t key) { int index = ibf_table_lookup(table, key); @@ -9683,7 +9682,7 @@ ibf_dump_object(struct ibf_dump *dump, VALUE obj) { int obj_index = ibf_table_lookup(dump->current_buffer->obj_table, (st_data_t)obj); if (obj_index < 0) { - obj_index = ibf_table_index(dump->current_buffer->obj_table, (st_data_t)obj); + obj_index = ibf_table_find_or_insert(dump->current_buffer->obj_table, (st_data_t)obj); rb_ary_push(dump->current_buffer->obj_list, obj); } return obj_index; @@ -9725,12 +9724,7 @@ ibf_dump_iseq(struct ibf_dump *dump, const rb_iseq_t *iseq) return -1; } else { - int iseq_index = ibf_table_lookup(dump->iseq_table, (st_data_t)iseq); - if (iseq_index < 0) { - iseq_index = ibf_table_index(dump->iseq_table, (st_data_t)iseq); - rb_ary_push(dump->iseq_list, (VALUE)iseq); - } - return iseq_index; + return ibf_table_find_or_insert(dump->iseq_table, (st_data_t)iseq); } } @@ -10668,22 +10662,41 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) verify_call_cache(iseq); } +struct ibf_dump_iseq_list_arg +{ + struct ibf_dump *dump; + VALUE offset_list; +}; + +static int +ibf_dump_iseq_list_i(st_data_t key, st_data_t val, st_data_t ptr) +{ + const rb_iseq_t *iseq = (const rb_iseq_t *)key; + struct ibf_dump_iseq_list_arg *args = (struct ibf_dump_iseq_list_arg *)ptr; + + ibf_offset_t offset = ibf_dump_iseq_each(args->dump, iseq); + rb_ary_push(args->offset_list, UINT2NUM(offset)); + + return ST_CONTINUE; +} + static void ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header) { - VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->iseq_list)); - long i; + VALUE offset_list = rb_ary_tmp_new(dump->iseq_table->num_entries); - for (i = 0; i < RARRAY_LEN(dump->iseq_list); i++) { - ibf_offset_t offset = ibf_dump_iseq_each(dump, (rb_iseq_t *)RARRAY_AREF(dump->iseq_list, i)); - rb_ary_push(list, UINT2NUM(offset)); - } + struct ibf_dump_iseq_list_arg args; + args.dump = dump; + args.offset_list = offset_list; + + st_foreach(dump->iseq_table, ibf_dump_iseq_list_i, (st_data_t)&args); - long size = RARRAY_LEN(dump->iseq_list); + st_index_t i; + st_index_t size = dump->iseq_table->num_entries; ibf_offset_t *offsets = ALLOCA_N(ibf_offset_t, size); for (i = 0; i < size; i++) { - offsets[i] = NUM2UINT(RARRAY_AREF(list, i)); + offsets[i] = NUM2UINT(RARRAY_AREF(offset_list, i)); } ibf_dump_align(dump, sizeof(ibf_offset_t)); @@ -11335,7 +11348,8 @@ ibf_dump_mark(void *ptr) struct ibf_dump *dump = (struct ibf_dump *)ptr; rb_gc_mark(dump->global_buffer.str); rb_gc_mark(dump->global_buffer.obj_list); - rb_gc_mark(dump->iseq_list); + + rb_mark_set(dump->iseq_table); } static void @@ -11372,7 +11386,8 @@ static const rb_data_type_t ibf_dump_type = { static void ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj) { - RB_OBJ_WRITE(dumper_obj, &dump->iseq_list, rb_ary_tmp_new(0)); + dump->iseq_table = NULL; + RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.obj_list, ibf_dump_object_list_new(&dump->global_buffer.obj_table)); RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.str, rb_str_new(0, 0)); dump->iseq_table = st_init_numtable(); /* need free */ From a2845adb4958db33e3e190716c2a4a94365f94f2 Mon Sep 17 00:00:00 2001 From: NagayamaRyoga Date: Thu, 6 Feb 2020 21:49:13 +0900 Subject: [PATCH 682/878] compile.c: Drop obj_list from ibf_dump [Feature #16505] --- compile.c | 74 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/compile.c b/compile.c index 65894706e086cb..e57ad4498a9046 100644 --- a/compile.c +++ b/compile.c @@ -9520,7 +9520,6 @@ struct ibf_header { struct ibf_dump_buffer { VALUE str; - VALUE obj_list; /* [objs] */ st_table *obj_table; /* obj -> obj number */ }; @@ -9665,27 +9664,19 @@ static void ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_o static VALUE ibf_load_object(const struct ibf_load *load, VALUE object_index); static rb_iseq_t *ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq); -static VALUE -ibf_dump_object_list_new(st_table **obj_table) +static st_table * +ibf_dump_object_table_new(void) { - VALUE obj_list = rb_ary_tmp_new(1); - rb_ary_push(obj_list, Qnil); /* 0th is nil */ - - *obj_table = st_init_numtable(); /* need free */ - rb_st_insert(*obj_table, (st_data_t)Qnil, (st_data_t)0); /* 0th is nil */ + st_table *obj_table = st_init_numtable(); /* need free */ + st_insert(obj_table, (st_data_t)Qnil, (st_data_t)0); /* 0th is nil */ - return obj_list; + return obj_table; } static VALUE ibf_dump_object(struct ibf_dump *dump, VALUE obj) { - int obj_index = ibf_table_lookup(dump->current_buffer->obj_table, (st_data_t)obj); - if (obj_index < 0) { - obj_index = ibf_table_find_or_insert(dump->current_buffer->obj_table, (st_data_t)obj); - rb_ary_push(dump->current_buffer->obj_list, obj); - } - return obj_index; + return ibf_table_find_or_insert(dump->current_buffer->obj_table, (st_data_t)obj); } static VALUE @@ -10368,7 +10359,7 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) struct ibf_dump_buffer *saved_buffer = dump->current_buffer; struct ibf_dump_buffer buffer; buffer.str = rb_str_new(0, 0); - buffer.obj_list = ibf_dump_object_list_new(&buffer.obj_table); + buffer.obj_table = ibf_dump_object_table_new(); dump->current_buffer = &buffer; #endif @@ -10473,7 +10464,7 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_dump_write_small_value(dump, local_obj_list_offset); ibf_dump_write_small_value(dump, local_obj_list_size); - rb_st_free_table(buffer.obj_table); + st_free_table(buffer.obj_table); // TODO: this leaks in case of exception return offset; #else @@ -11203,7 +11194,7 @@ ibf_load_object_object_header(const struct ibf_load *load, ibf_offset_t *offset) } static ibf_offset_t -ibf_dump_object_object(struct ibf_dump *dump, VALUE obj_list, VALUE obj) +ibf_dump_object_object(struct ibf_dump *dump, VALUE obj) { struct ibf_object_header obj_header; ibf_offset_t current_offset; @@ -11318,28 +11309,48 @@ ibf_load_object(const struct ibf_load *load, VALUE object_index) } } +struct ibf_dump_object_list_arg +{ + struct ibf_dump *dump; + VALUE offset_list; +}; + +static int +ibf_dump_object_list_i(st_data_t key, st_data_t val, st_data_t ptr) +{ + VALUE obj = (VALUE)key; + struct ibf_dump_object_list_arg *args = (struct ibf_dump_object_list_arg *)ptr; + + ibf_offset_t offset = ibf_dump_object_object(args->dump, obj); + rb_ary_push(args->offset_list, UINT2NUM(offset)); + + return ST_CONTINUE; +} + static void ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size) { - VALUE obj_list = dump->current_buffer->obj_list; - VALUE list = rb_ary_tmp_new(RARRAY_LEN(obj_list)); - int i, size; + st_table *obj_table = dump->current_buffer->obj_table; + VALUE offset_list = rb_ary_tmp_new(obj_table->num_entries); + + struct ibf_dump_object_list_arg args; + args.dump = dump; + args.offset_list = offset_list; + + st_foreach(obj_table, ibf_dump_object_list_i, (st_data_t)&args); - for (i=0; inum_entries; + st_index_t i; + for (i=0; iglobal_buffer.str); - rb_gc_mark(dump->global_buffer.obj_list); + rb_mark_set(dump->global_buffer.obj_table); rb_mark_set(dump->iseq_table); } @@ -11386,10 +11397,11 @@ static const rb_data_type_t ibf_dump_type = { static void ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj) { + dump->global_buffer.obj_table = NULL; // GC may run before a value is assigned dump->iseq_table = NULL; - RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.obj_list, ibf_dump_object_list_new(&dump->global_buffer.obj_table)); RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.str, rb_str_new(0, 0)); + dump->global_buffer.obj_table = ibf_dump_object_table_new(); dump->iseq_table = st_init_numtable(); /* need free */ dump->current_buffer = &dump->global_buffer; From f83781c8c109b7f0b8cd6604d8fed6b8c13b8fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 10 Feb 2020 12:10:51 +0900 Subject: [PATCH 683/878] rb_enc_str_asciionly_p expects T_STRING This `str2` variable can be non-string (regexp etc.) but the previous code passed it directly to rb_enc_str_asciionly_p(), which expects its argument be a string. Let's enforce that constraint. --- encoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encoding.c b/encoding.c index ca98b8edb0ac9b..f2e67ff508e4bc 100644 --- a/encoding.c +++ b/encoding.c @@ -919,7 +919,7 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2) if (isstr2 && RSTRING_LEN(str2) == 0) return enc1; isstr1 = RB_TYPE_P(str1, T_STRING); - if (isstr1 && RSTRING_LEN(str1) == 0) + if (isstr1 && isstr2 && RSTRING_LEN(str1) == 0) return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2; if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { return 0; From 442c6de5546b233364c295155953cd0bc17e99e3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 10 Feb 2020 13:28:54 +0900 Subject: [PATCH 684/878] Added commands of test-bundler to cheatsheet. --- doc/make_cheatsheet.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/make_cheatsheet.md b/doc/make_cheatsheet.md index f79d751bdc440e..c9cc636f06b9ef 100644 --- a/doc/make_cheatsheet.md +++ b/doc/make_cheatsheet.md @@ -38,6 +38,7 @@ It runs (about) three test suites: * `make test` (a test suite for the interpreter core) * `make test-all` : (for all builtin classes and libraries) * `make test-spec` : (a conformance test suite for Ruby implementations) +* `make test-bundler` : (a test suite for the bundler examples) ## How to run the test suite with log @@ -66,6 +67,8 @@ $ make test-all TESTS="test/ruby/test_foo.rb -n /test_bar/" ``` $ make test-spec MSPECOPT=spec/ruby/core/foo/bar_spec.rb + +$ make test-bundler BUNDLER_SPECS=commands/exec_spec.rb:58 ``` ## How to measure coverage of C and Ruby code From 6e6844320de989cb88a154e2ac75066ccea1bba2 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 10 Feb 2020 12:15:48 +0900 Subject: [PATCH 685/878] Fixed duplicated warning As `command_rhs` is always a "value expression", `command_asgn` does not need the same check. --- parse.y | 6 ------ test/ruby/test_parse.rb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parse.y b/parse.y index 11ef0f77cb27e7..a436408235bdff 100644 --- a/parse.y +++ b/parse.y @@ -1479,7 +1479,6 @@ stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem command_asgn : lhs '=' command_rhs { /*%%%*/ - value_expr($3); $$ = node_assign(p, $1, $3, &@$); /*% %*/ /*% ripper: assign!($1, $3) %*/ @@ -1487,7 +1486,6 @@ command_asgn : lhs '=' command_rhs | var_lhs tOP_ASGN command_rhs { /*%%%*/ - value_expr($3); $$ = new_op_assign(p, $1, $2, $3, &@$); /*% %*/ /*% ripper: opassign!($1, $2, $3) %*/ @@ -1495,7 +1493,6 @@ command_asgn : lhs '=' command_rhs | primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs { /*%%%*/ - value_expr($6); $$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$); /*% %*/ /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $6) %*/ @@ -1504,7 +1501,6 @@ command_asgn : lhs '=' command_rhs | primary_value call_op tIDENTIFIER tOP_ASGN command_rhs { /*%%%*/ - value_expr($5); $$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$); /*% %*/ /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/ @@ -1512,7 +1508,6 @@ command_asgn : lhs '=' command_rhs | primary_value call_op tCONSTANT tOP_ASGN command_rhs { /*%%%*/ - value_expr($5); $$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$); /*% %*/ /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/ @@ -1528,7 +1523,6 @@ command_asgn : lhs '=' command_rhs | primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs { /*%%%*/ - value_expr($5); $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $5, &@$); /*% %*/ /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $5) %*/ diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index cb379ebe18bff3..1e909bce1bbf52 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -1166,6 +1166,12 @@ def test_cdmarg_after_command_args_and_tlbrace_arg assert_valid_syntax('let () { m(a) do; end }') end + def test_void_value_in_command_rhs + w = "void value expression" + ex = assert_syntax_error("x = return 1", w) + assert_equal(1, ex.message.scan(w).size, "same #{w.inspect} warning should be just once") + end + =begin def test_past_scope_variable assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}} From 912ef0b5593a1e4edca3a0bad8164f66e05e6662 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 10 Feb 2020 14:13:48 +0900 Subject: [PATCH 686/878] Revert "gc.c: make the stack overflow detection earlier under s390x" This reverts commit a28c166f787710227c6aac54befd72778f041485. This change didn't help. According to odaira, the issue was fixed by increasing `ulimit -s`. --- gc.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gc.c b/gc.c index e7dce9e7a247b8..f0de80ca71af9d 100644 --- a/gc.c +++ b/gc.c @@ -4692,14 +4692,7 @@ stack_check(rb_execution_context_t *ec, int water_mark) #define stack_check(ec, water_mark) FALSE #endif -#ifdef __s390x__ -/* Experimentally make the stack overflow detection earlier under s390x - * https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel_zlinux/ruby-master/log/20200205T223421Z.fail.html.gz - */ -#define STACKFRAME_FOR_CALL_CFUNC 8192 -#else #define STACKFRAME_FOR_CALL_CFUNC 2048 -#endif MJIT_FUNC_EXPORTED int rb_ec_stack_check(rb_execution_context_t *ec) From 8474e6ae1f327acb3e137c191078a522682cc946 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 10 Feb 2020 16:00:51 +0900 Subject: [PATCH 687/878] Use github.run_id in notification payload URL --- .github/workflows/macos.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4a4b5a3717d41f..a26475000d924c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -69,7 +69,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index cea26a51c26581..1596adef49129b 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -145,7 +145,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index e7730506d23760..d87f4fbba3745b 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -65,7 +65,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }} " + + "text": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6bf3f291a62e28..a6dbf68c73eadb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -103,7 +103,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + + "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 82cca9353b677a..3e466fd441762c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,7 +80,7 @@ jobs: payload: | { "attachments": [{ - "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + + "text": "${{ matrix.os }} / ${{ matrix.test_task }} " + "() " + "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }} failed", "color": "danger" From 6891fd15805fa0fe1f7e815bfdbf60696b7120ea Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 10 Feb 2020 19:41:07 +0900 Subject: [PATCH 688/878] Don't use upstream ext/readline/depend --- tool/sync_default_gems.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 329f0c1bd0abe6..a353d55580844d 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -271,6 +271,7 @@ def sync_default_gems(gem) cp_r("#{upstream}/ext/readline", "ext") cp_r("#{upstream}/test/readline", "test") cp_r("#{upstream}/readline-ext.gemspec", "ext/readline") + `git checkout ext/readline/depend` when "did_you_mean" rm_rf(%w[lib/did_you_mean* test/did_you_mean]) cp_r(Dir.glob("#{upstream}/lib/did_you_mean*"), "lib") From 2d1cb93d40e45972ace391c5479d8f581501d483 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 10 Feb 2020 20:50:31 +0900 Subject: [PATCH 689/878] Update readline-ext entry at docs --- doc/maintainers.rdoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index bf76fa1b20e2a0..55819deeef9b33 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -124,8 +124,6 @@ Zachary Scott (zzak) Tanaka Akira (akr) [ext/pty] _unmaintained_ -[ext/readline] - TAKAO Kouji (kouji) [ext/ripper] _unmaintained_ [ext/socket] @@ -318,6 +316,10 @@ Zachary Scott (zzak) Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt) https://github.com/ruby/racc https://rubygems.org/gems/racc +[ext/readline] + TAKAO Kouji (kouji) + https://github.com/ruby/readline-ext + http:://rubygems.org/gems/readline-ext [ext/sdbm] Yukihiro Matsumoto (matz) https://github.com/ruby/sdbm From 2dea81f47728b9a28831dd91fc14dafcc3d29271 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Mon, 10 Feb 2020 21:41:15 +0900 Subject: [PATCH 690/878] Don't refer Date in the document for Time. --- time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/time.c b/time.c index 61d81e5fa4d1b0..2b5d451bfcb745 100644 --- a/time.c +++ b/time.c @@ -5697,8 +5697,9 @@ rb_time_zone_abbreviation(VALUE zone, VALUE time) /* * Time is an abstraction of dates and times. Time is stored internally as - * the number of seconds with fraction since the _Epoch_, January 1, 1970 - * 00:00 UTC. Also see the library module Date. The Time class treats GMT + * the number of seconds with fraction since the _Epoch_, + * 1970-01-01 00:00:00 UTC. + * The Time class treats GMT * (Greenwich Mean Time) and UTC (Coordinated Universal Time) as equivalent. * GMT is the older way of referring to these baseline times but persists in * the names of calls on POSIX systems. From d83d61c98b2d6d80a0ffc9aa012a40d2dc39f9b3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 11 Feb 2020 11:08:02 +0900 Subject: [PATCH 691/878] Removed unused variable `generic_iv_tbl_compat` has not been utilized since 14d61a94ff01. --- variable.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/variable.c b/variable.c index ed84b85e86e097..646d60d6eb47bb 100644 --- a/variable.c +++ b/variable.c @@ -44,7 +44,6 @@ static void check_before_mod_set(VALUE, ID, VALUE, const char *); static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t); static VALUE rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility); static st_table *generic_iv_tbl; -static st_table *generic_iv_tbl_compat; struct ivar_update { union { @@ -1007,13 +1006,6 @@ rb_free_generic_ivar(VALUE obj) if (st_delete(generic_iv_tbl, &key, (st_data_t *)&ivtbl)) xfree(ivtbl); - - if (generic_iv_tbl_compat) { - st_table *tbl; - - if (st_delete(generic_iv_tbl_compat, &key, (st_data_t *)&tbl)) - st_free_table(tbl); - } } RUBY_FUNC_EXPORTED size_t From de4caa327bdffb766fb6534b4d18e56c903de7f0 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2020 11:15:06 +0900 Subject: [PATCH 692/878] * 2020-02-11 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 10c9e96ca2f413..7347e773136735 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" From a5d7b8e13d8a648175ec106a1127b4baca2d801d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 10:50:32 +0900 Subject: [PATCH 693/878] Expose assert_normal_exit for weakref --- tool/lib/test/unit/assertions.rb | 106 -------------------------- tool/lib/test/unit/core_assertions.rb | 106 ++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index e2b865899a4ea2..fbade0a3a5f44c 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -52,50 +52,6 @@ def assert_raises(*exp, &b) raise NoMethodError, "use assert_raise", caller end - # :call-seq: - # assert_nothing_raised( *args, &block ) - # - #If any exceptions are given as arguments, the assertion will - #fail if one of those exceptions are raised. Otherwise, the test fails - #if any exceptions are raised. - # - #The final argument may be a failure message. - # - # assert_nothing_raised RuntimeError do - # raise Exception #Assertion passes, Exception is not a RuntimeError - # end - # - # assert_nothing_raised do - # raise Exception #Assertion fails - # end - def assert_nothing_raised(*args) - self._assertions += 1 - if Module === args.last - msg = nil - else - msg = args.pop - end - begin - line = __LINE__; yield - rescue MiniTest::Skip - raise - rescue Exception => e - bt = e.backtrace - as = e.instance_of?(MiniTest::Assertion) - if as - ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o - bt.reject! {|ln| ans =~ ln} - end - if ((args.empty? && !as) || - args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a }) - msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" } - raise MiniTest::Assertion, msg.call, bt - else - raise - end - end - end - # :call-seq: # assert_nothing_thrown( failure_message = nil, &block ) # @@ -354,57 +310,6 @@ def assert_not_all?(obj, m = nil, &blk) # compatibility with test-unit alias pend skip - if defined?(RubyVM::InstructionSequence) - def syntax_check(code, fname, line) - code = code.dup.force_encoding(Encoding::UTF_8) - RubyVM::InstructionSequence.compile(code, fname, fname, line) - :ok - ensure - raise if SyntaxError === $! - end - else - def syntax_check(code, fname, line) - code = code.b - code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) { - "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n" - } - code = code.force_encoding(Encoding::UTF_8) - catch {|tag| eval(code, binding, fname, line - 1)} - end - end - - def prepare_syntax_check(code, fname = nil, mesg = nil, verbose: nil) - fname ||= caller_locations(2, 1)[0] - mesg ||= fname.to_s - verbose, $VERBOSE = $VERBOSE, verbose - case - when Array === fname - fname, line = *fname - when defined?(fname.path) && defined?(fname.lineno) - fname, line = fname.path, fname.lineno - else - line = 1 - end - yield(code, fname, line, message(mesg) { - if code.end_with?("\n") - "```\n#{code}```\n" - else - "```\n#{code}\n```\n""no-newline" - end - }) - ensure - $VERBOSE = verbose - end - - def assert_valid_syntax(code, *args, **opt) - prepare_syntax_check(code, *args, **opt) do |src, fname, line, mesg| - yield if defined?(yield) - assert_nothing_raised(SyntaxError, mesg) do - assert_equal(:ok, syntax_check(src, fname, line), mesg) - end - end - end - def assert_syntax_error(code, error, *args) prepare_syntax_check(code, *args) do |src, fname, line, mesg| yield if defined?(yield) @@ -416,17 +321,6 @@ def assert_syntax_error(code, error, *args) end end - def assert_normal_exit(testsrc, message = '', child_env: nil, **opt) - assert_valid_syntax(testsrc, caller_locations(1, 1)[0]) - if child_env - child_env = [child_env] - else - child_env = [] - end - out, _, status = EnvUtil.invoke_ruby(child_env + %W'-W0', testsrc, true, :merge_to_stdout, **opt) - assert !status.signaled?, FailDesc[status, message, out] - end - def assert_no_warning(pat, msg = nil) result = nil stderr = EnvUtil.verbose_warning { diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 86ed37f0788f92..79f4fd65a516b0 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -94,6 +94,112 @@ def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], end end + if defined?(RubyVM::InstructionSequence) + def syntax_check(code, fname, line) + code = code.dup.force_encoding(Encoding::UTF_8) + RubyVM::InstructionSequence.compile(code, fname, fname, line) + :ok + ensure + raise if SyntaxError === $! + end + else + def syntax_check(code, fname, line) + code = code.b + code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) { + "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n" + } + code = code.force_encoding(Encoding::UTF_8) + catch {|tag| eval(code, binding, fname, line - 1)} + end + end + + # :call-seq: + # assert_nothing_raised( *args, &block ) + # + #If any exceptions are given as arguments, the assertion will + #fail if one of those exceptions are raised. Otherwise, the test fails + #if any exceptions are raised. + # + #The final argument may be a failure message. + # + # assert_nothing_raised RuntimeError do + # raise Exception #Assertion passes, Exception is not a RuntimeError + # end + # + # assert_nothing_raised do + # raise Exception #Assertion fails + # end + def assert_nothing_raised(*args) + self._assertions += 1 + if Module === args.last + msg = nil + else + msg = args.pop + end + begin + line = __LINE__; yield + rescue MiniTest::Skip + raise + rescue Exception => e + bt = e.backtrace + as = e.instance_of?(MiniTest::Assertion) + if as + ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o + bt.reject! {|ln| ans =~ ln} + end + if ((args.empty? && !as) || + args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a }) + msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" } + raise MiniTest::Assertion, msg.call, bt + else + raise + end + end + end + + def prepare_syntax_check(code, fname = nil, mesg = nil, verbose: nil) + fname ||= caller_locations(2, 1)[0] + mesg ||= fname.to_s + verbose, $VERBOSE = $VERBOSE, verbose + case + when Array === fname + fname, line = *fname + when defined?(fname.path) && defined?(fname.lineno) + fname, line = fname.path, fname.lineno + else + line = 1 + end + yield(code, fname, line, message(mesg) { + if code.end_with?("\n") + "```\n#{code}```\n" + else + "```\n#{code}\n```\n""no-newline" + end + }) + ensure + $VERBOSE = verbose + end + + def assert_valid_syntax(code, *args, **opt) + prepare_syntax_check(code, *args, **opt) do |src, fname, line, mesg| + yield if defined?(yield) + assert_nothing_raised(SyntaxError, mesg) do + assert_equal(:ok, syntax_check(src, fname, line), mesg) + end + end + end + + def assert_normal_exit(testsrc, message = '', child_env: nil, **opt) + assert_valid_syntax(testsrc, caller_locations(1, 1)[0]) + if child_env + child_env = [child_env] + else + child_env = [] + end + out, _, status = EnvUtil.invoke_ruby(child_env + %W'-W0', testsrc, true, :merge_to_stdout, **opt) + assert !status.signaled?, FailDesc[status, message, out] + end + def assert_ruby_status(args, test_stdin="", message=nil, **opt) out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, **opt) desc = FailDesc[status, message, out] From 9b2e671944a035af6a079ba91628b04687374377 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 11:32:08 +0900 Subject: [PATCH 694/878] Expose assert_no_memory_leak for weakref --- tool/lib/test/unit/assertions.rb | 45 --------------------------- tool/lib/test/unit/core_assertions.rb | 45 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index fbade0a3a5f44c..907e9186391bcb 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -333,51 +333,6 @@ def assert_no_warning(pat, msg = nil) result end - def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt) - # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail - skip 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? - - require_relative '../../memory_status' - raise MiniTest::Skip, "unsupported platform" unless defined?(Memory::Status) - - token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m" - token_dump = token.dump - token_re = Regexp.quote(token) - envs = args.shift if Array === args and Hash === args.first - args = [ - "--disable=gems", - "-r", File.expand_path("../../../memory_status", __FILE__), - *args, - "-v", "-", - ] - if defined? Memory::NO_MEMORY_LEAK_ENVS then - envs ||= {} - newenvs = envs.merge(Memory::NO_MEMORY_LEAK_ENVS) { |_, _, _| break } - envs = newenvs if newenvs - end - args.unshift(envs) if envs - cmd = [ - 'END {STDERR.puts '"#{token_dump}"'"FINAL=#{Memory::Status.new}"}', - prepare, - 'STDERR.puts('"#{token_dump}"'"START=#{$initial_status = Memory::Status.new}")', - '$initial_size = $initial_status.size', - code, - 'GC.start', - ].join("\n") - _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true, **opt) - before = err.sub!(/^#{token_re}START=(\{.*\})\n/, '') && Memory::Status.parse($1) - after = err.sub!(/^#{token_re}FINAL=(\{.*\})\n/, '') && Memory::Status.parse($1) - assert(status.success?, FailDesc[status, message, err]) - ([:size, (rss && :rss)] & after.members).each do |n| - b = before[n] - a = after[n] - next unless a > 0 and b > 0 - assert_operator(a.fdiv(b), :<, limit, message(message) {"#{n}: #{b} => #{a}"}) - end - rescue LoadError - skip - end - # kernel resolution can limit the minimum time we can measure # [ruby-core:81540] MIN_HZ = MiniTest::Unit::TestCase.windows? ? 67 : 100 diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 79f4fd65a516b0..39964d921ab3cf 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -113,6 +113,51 @@ def syntax_check(code, fname, line) end end + def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt) + # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail + pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? + + require_relative '../../memory_status' + raise MiniTest::Skip, "unsupported platform" unless defined?(Memory::Status) + + token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m" + token_dump = token.dump + token_re = Regexp.quote(token) + envs = args.shift if Array === args and Hash === args.first + args = [ + "--disable=gems", + "-r", File.expand_path("../../../memory_status", __FILE__), + *args, + "-v", "-", + ] + if defined? Memory::NO_MEMORY_LEAK_ENVS then + envs ||= {} + newenvs = envs.merge(Memory::NO_MEMORY_LEAK_ENVS) { |_, _, _| break } + envs = newenvs if newenvs + end + args.unshift(envs) if envs + cmd = [ + 'END {STDERR.puts '"#{token_dump}"'"FINAL=#{Memory::Status.new}"}', + prepare, + 'STDERR.puts('"#{token_dump}"'"START=#{$initial_status = Memory::Status.new}")', + '$initial_size = $initial_status.size', + code, + 'GC.start', + ].join("\n") + _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true, **opt) + before = err.sub!(/^#{token_re}START=(\{.*\})\n/, '') && Memory::Status.parse($1) + after = err.sub!(/^#{token_re}FINAL=(\{.*\})\n/, '') && Memory::Status.parse($1) + assert(status.success?, FailDesc[status, message, err]) + ([:size, (rss && :rss)] & after.members).each do |n| + b = before[n] + a = after[n] + next unless a > 0 and b > 0 + assert_operator(a.fdiv(b), :<, limit, message(message) {"#{n}: #{b} => #{a}"}) + end + rescue LoadError + pend + end + # :call-seq: # assert_nothing_raised( *args, &block ) # From 56f6973b682f7be6ba8a27ea1516f35be09b0574 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 14:05:04 +0900 Subject: [PATCH 695/878] Promote weakref to the default gems --- lib/weakref/version.rb | 3 +++ lib/weakref/weakref.gemspec | 31 +++++++++++++++++++++++++++++++ tool/sync_default_gems.rb | 4 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 lib/weakref/version.rb create mode 100644 lib/weakref/weakref.gemspec diff --git a/lib/weakref/version.rb b/lib/weakref/version.rb new file mode 100644 index 00000000000000..893da807534ce3 --- /dev/null +++ b/lib/weakref/version.rb @@ -0,0 +1,3 @@ +module Weakref + VERSION = "0.1.0" +end diff --git a/lib/weakref/weakref.gemspec b/lib/weakref/weakref.gemspec new file mode 100644 index 00000000000000..22b0785503604a --- /dev/null +++ b/lib/weakref/weakref.gemspec @@ -0,0 +1,31 @@ +lib = File.expand_path("lib", __dir__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require "weakref/version" + +Gem::Specification.new do |spec| + spec.name = "weakref" + spec.version = Weakref::VERSION + spec.authors = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{TODO: Write a short summary, because RubyGems requires one.} + spec.description = %q{TODO: Write a longer description or delete this line.} + spec.homepage = "https://github.com/ruby/weakref" + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = "https://github.com/ruby/weakref" + spec.license = "BSD-2-Clause" + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] + + spec.add_development_dependency "bundler", "~> 2.0" + spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "minitest", "~> 5.0" +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index a353d55580844d..a432a7ad040ef3 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -55,6 +55,7 @@ # * https://github.com/ruby/uri # * https://github.com/ruby/openssl # * https://github.com/ruby/did_you_mean +# * https://github.com/ruby/weakref # require 'fileutils' @@ -107,7 +108,8 @@ yaml: "ruby/yaml", uri: "ruby/uri", openssl: "ruby/openssl", - did_you_mean: "ruby/did_you_mean" + did_you_mean: "ruby/did_you_mean", + weakref: "ruby/weakref", } def sync_default_gems(gem) From 66e636ab24fb980a7d59221bb147a88944e2b3d3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 14:05:34 +0900 Subject: [PATCH 696/878] ignore revision.tmp with in-place build --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 487af950f3a6b1..916c7aaf9e48b6 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,7 @@ lcov*.info /rename2.h /repack /revision.h +/revision.tmp /riscos /rubicon /ruby From 3e788241eaf5ff1c6d8ea12e24cbef76550b7229 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 14:10:49 +0900 Subject: [PATCH 697/878] Update the documentation for weakref --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 55819deeef9b33..7034ed4414d5bc 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -99,8 +99,6 @@ Zachary Scott (zzak) WATANABE Hirofumi (eban) [lib/unicode_normalize.rb, lib/unicode_normalize/*] Martin J. Dürst -[lib/weakref.rb] - _unmaintained_ === Extensions @@ -261,6 +259,9 @@ Zachary Scott (zzak) [lib/yaml.rb, lib/yaml/*] Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt) https://github.com/ruby/yaml +[lib/weakref.rb] + _unmaintained_ + https://github.com/ruby/weakref === Extensions diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 38de1cc75468a5..ef7d130ddbef5e 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -37,7 +37,6 @@ Time:: Extends the Time class with methods for parsing and conversion tmpdir.rb:: Extends the Dir class to manage the OS temporary file path TSort:: Topological sorting using Tarjan's algorithm un.rb:: Utilities to replace common UNIX commands -WeakRef:: Allows a referenced object to be garbage-collected == Extensions @@ -86,6 +85,7 @@ Tracer:: Outputs a source level execution trace of a Ruby program URI:: A Ruby module providing support for Uniform Resource Identifiers WEBrick:: An HTTP server toolkit for Ruby YAML:: Ruby client library for the Psych YAML implementation +WeakRef:: Allows a referenced object to be garbage-collected == Extensions From f905f694ccc1f97c77af78d8d7881aa7c9ddabd3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Feb 2020 14:14:58 +0900 Subject: [PATCH 698/878] Monitor is extention library now --- doc/maintainers.rdoc | 4 ++-- doc/standard_library.rdoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 7034ed4414d5bc..910295f2a71860 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -54,8 +54,6 @@ Zachary Scott (zzak) Kazuki Tsujimoto (ktsj) [lib/mkmf.rb] _unmaintained_ -[lib/monitor.rb] - Shugo Maeda (shugo) [lib/net/ftp.rb] Shugo Maeda (shugo) [lib/net/imap.rb] @@ -114,6 +112,8 @@ Zachary Scott (zzak) Nobuyuki Nakada (nobu) [ext/io/wait] Nobuyuki Nakada (nobu) +[ext/monitor] + Koichi Sasada (ko1) [ext/nkf] NARUSE, Yui (naruse) [ext/objspace] diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index ef7d130ddbef5e..a09eaf6c4c02e4 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -16,7 +16,6 @@ English.rb:: Require 'English.rb' to reference global variables with less crypti ERB:: An easy to use but powerful templating system for Ruby Find:: This module supports top-down traversal of a set of file paths MakeMakefile:: Module used to generate a Makefile for C extensions -Monitor:: Provides an object or module to use safely by more than one thread Net::FTP:: Support for the File Transfer Protocol Net::HTTP:: HTTP client api for Ruby Net::IMAP:: Ruby client api for Internet Message Access Protocol @@ -43,6 +42,7 @@ un.rb:: Utilities to replace common UNIX commands Coverage:: Provides coverage measurement for Ruby Digest:: Provides a framework for message digest libraries IO:: Extensions for Ruby IO class, including #wait and ::console +Monitor:: Provides an object or module to use safely by more than one thread NKF:: Ruby extension for Network Kanji Filter objspace:: Extends ObjectSpace module to add methods for internal statistics Pathname:: Representation of the name of a file or directory on the filesystem From de3883e7823c89ce90d7661ef5bb3b7eb60968db Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 11 Feb 2020 15:52:25 +0900 Subject: [PATCH 699/878] Restart timer thread even after preparation failed If the timer thread is left stopped, memory crash or segfault can happen. --- process.c | 11 +++++++++-- test/ruby/test_process.rb | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/process.c b/process.c index bb895150d8e1c9..725ab0da5bd43e 100644 --- a/process.c +++ b/process.c @@ -2905,13 +2905,20 @@ rb_f_exec(int argc, const VALUE *argv) struct rb_execarg *eargp; #define CHILD_ERRMSG_BUFLEN 80 char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' }; - int err; + int err, state; execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE); eargp = rb_execarg_get(execarg_obj); if (mjit_enabled) mjit_finish(false); // avoid leaking resources, and do not leave files. XXX: JIT-ed handle can leak after exec error is rescued. before_exec(); /* stop timer thread before redirects */ - rb_execarg_parent_start(execarg_obj); + + rb_protect(rb_execarg_parent_start1, execarg_obj, &state); + if (state) { + execarg_parent_end(execarg_obj); + after_exec(); /* restart timer thread */ + rb_jump_tag(state); + } + fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; err = exec_async_signal_safe(eargp, errmsg, sizeof(errmsg)); diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 115c33a0781bb2..53599a63185103 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -2397,6 +2397,15 @@ def test_threading_works_after_exec_fail r.close if r end if defined?(fork) + def test_rescue_exec_fail + assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}") + begin; + assert_raise(Errno::ENOENT) do + exec("", in: "") + end + end; + end + def test_many_args bug11418 = '[ruby-core:70251] [Bug #11418]' assert_in_out_err([], <<-"end;", ["x"]*256, [], bug11418, timeout: 60) From 50065dad7f955cd069e43a83793a7ca3cff96b26 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 9 Feb 2020 19:06:57 -0800 Subject: [PATCH 700/878] Remove rb_eval_cmd This was related to $SAFE, and was deprecated in 2.7. I missed it earlier when removing the other $SAFE-related code. --- include/ruby/intern.h | 1 - vm_eval.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/ruby/intern.h b/include/ruby/intern.h index ecceef3594130a..944f43313fb7d5 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -434,7 +434,6 @@ void rb_alias(VALUE, ID, ID); void rb_attr(VALUE,ID,int,int,int); int rb_method_boundp(VALUE, ID, int); int rb_method_basic_definition_p(VALUE, ID); -VALUE rb_eval_cmd(VALUE, VALUE, int); VALUE rb_eval_cmd_kw(VALUE, VALUE, int); int rb_obj_respond_to(VALUE, ID, int); int rb_respond_to(VALUE, ID); diff --git a/vm_eval.c b/vm_eval.c index 85c317d3ee0b1f..5d89a3d76c6297 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1748,13 +1748,6 @@ rb_eval_cmd_kw(VALUE cmd, VALUE arg, int kw_splat) return val; } -VALUE -rb_eval_cmd(VALUE cmd, VALUE arg, int _level) -{ - rb_warn("rb_eval_cmd will be removed in Ruby 3.0"); - return rb_eval_cmd_kw(cmd, arg, RB_NO_KEYWORDS); -} - /* block eval under the class/module context */ static VALUE From 28bff9dd98030ceb1be9b57bfb1edf1633fd9dad Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2020 01:47:02 +0900 Subject: [PATCH 701/878] * 2020-02-12 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 7347e773136735..81c436afedb67b 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" From ea32715e004dc8f56dc599883d3183d7b2635f81 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 11 Feb 2020 08:49:29 -0800 Subject: [PATCH 702/878] Add backwards compatibility example macro for rb_eval_cmd_kwd [ci skip] --- doc/extension.rdoc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/extension.rdoc b/doc/extension.rdoc index dfa4cb22ca0dfa..fd91a54ebfbeb9 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -1946,6 +1946,7 @@ the *_kw functions introduced in Ruby 2.7. #define rb_proc_call_with_block_kw(p, c, v, b, kw) rb_proc_call_with_block(p, c, v, b) #define rb_method_call_kw(c, v, m, kw) rb_method_call(c, v, m) #define rb_method_call_with_block_kw(c, v, m, b, kw) rb_method_call_with_block(c, v, m, b) + #define rb_eval_cmd_kwd(c, a, kw) rb_eval_cmd(c, a, 0) #endif == Appendix C. Functions available for use in extconf.rb From 7a288df7b85d3565f369b305f225c2cd5baa5905 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 11 Feb 2020 11:56:34 -0800 Subject: [PATCH 703/878] Make yield in singleton class definitions in methods a SyntaxError This behavior was deprecated in 2.7 and scheduled to be removed in 3.0. Calling yield in a class definition outside a method is now a SyntaxError instead of a LocalJumpError, as well. --- NEWS.md | 2 ++ bootstraptest/test_jump.rb | 23 ++++++++++++++--------- compile.c | 13 +++---------- spec/ruby/language/class_spec.rb | 10 +++++++++- test/ruby/test_class.rb | 2 +- 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/NEWS.md b/NEWS.md index f6bd2a4bb22c1a..22943d64a7b0c1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,8 @@ sufficient information, see the ChangeLog file or Redmine * $SAFE is now a normal global variable with no special behavior. [Feature #16131] +* yield in singleton class definitions in methods is now a SyntaxError. [Feature #15575] + ## Command line options ## Core classes updates (outstanding ones only) diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb index 794491586297b8..18a2737ea337a5 100644 --- a/bootstraptest/test_jump.rb +++ b/bootstraptest/test_jump.rb @@ -296,14 +296,19 @@ class << self s.return_eigenclass == class << s; self; end }, '[ruby-core:21379]' -assert_equal "true", %q{ - class Object - def yield_eigenclass - class << self - yield self +assert_match %r{Invalid yield}, %q{ +STDERR.reopen(STDOUT) +begin + eval %q{ + class Object + def yield_eigenclass + class << self + yield self + end end end - end - s = "foo" - s.yield_eigenclass {|c| c == class << s; self; end } -}, '[ruby-dev:40975]' + } +rescue SyntaxError => e + e.message +end +} diff --git a/compile.c b/compile.c index e57ad4498a9046..e9ce106eca48b2 100644 --- a/compile.c +++ b/compile.c @@ -7096,20 +7096,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *node, int poppe } static int -check_yield_place(const rb_iseq_t *iseq, int line) +check_yield_place(const rb_iseq_t *iseq) { - VALUE file; switch (iseq->body->local_iseq->body->type) { case ISEQ_TYPE_TOP: case ISEQ_TYPE_MAIN: - return FALSE; case ISEQ_TYPE_CLASS: - file = rb_iseq_path(iseq); - if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) { - rb_compile_warn(RSTRING_PTR(file), line, - "`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]"); - } - return TRUE; + return FALSE; default: return TRUE; } @@ -7836,7 +7829,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in INIT_ANCHOR(args); - if (check_yield_place(iseq, line) == FALSE) { + if (check_yield_place(iseq) == FALSE) { COMPILE_ERROR(ERROR_ARGS "Invalid yield"); goto ng; } diff --git a/spec/ruby/language/class_spec.rb b/spec/ruby/language/class_spec.rb index 88b7a6a74f1cb2..2b9a4afef7d587 100644 --- a/spec/ruby/language/class_spec.rb +++ b/spec/ruby/language/class_spec.rb @@ -285,7 +285,7 @@ def xyz }.should raise_error(TypeError) end - ruby_version_is ""..."3.0" do + ruby_version_is ""..."2.8" do it "allows accessing the block of the original scope" do suppress_warning do ClassSpecs.sclass_with_block { 123 }.should == 123 @@ -293,6 +293,14 @@ def xyz end end + ruby_version_is "2.8" do + it "does not allow accessing the block of the original scope" do + -> { + ClassSpecs.sclass_with_block { 123 } + }.should raise_error(SyntaxError) + end + end + it "can use return to cause the enclosing method to return" do ClassSpecs.sclass_with_return.should == :inner end diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index ca78473026be9e..82a2e55634850d 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -312,7 +312,7 @@ def test_invalid_return_from_class_definition end def test_invalid_yield_from_class_definition - assert_raise(LocalJumpError) { + assert_raise(SyntaxError) { EnvUtil.suppress_warning {eval("class C; yield; end")} } end From 155ab9caa6bbdeae2377bd9c18f11fc83d938217 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Feb 2020 11:47:08 +0900 Subject: [PATCH 704/878] Removed unnecessary conversion Paths in `rb_execarg_t` should have been converted already. --- process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/process.c b/process.c index 725ab0da5bd43e..51c131eff8a09a 100644 --- a/process.c +++ b/process.c @@ -2736,8 +2736,6 @@ rb_execarg_parent_start1(VALUE execarg_obj) int fd2; if (NIL_P(fd2v)) { struct open_struct open_data; - FilePathValue(vpath); - vpath = rb_str_encode_ospath(vpath); again: open_data.fname = vpath; open_data.oflags = flags; From 985d1b9ec42e89e39aafadb8ffe68b0b877a7f93 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Feb 2020 11:53:51 +0900 Subject: [PATCH 705/878] Fixed a potential memory leak `rb_str_new_cstr` can raise a `NoMemoryError`. --- common.mk | 1 + process.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 617d39941a70e3..a2cc189a4e0858 100644 --- a/common.mk +++ b/common.mk @@ -3270,6 +3270,7 @@ process.$(OBJEXT): $(hdrdir)/ruby/ruby.h process.$(OBJEXT): $(top_srcdir)/internal/array.h process.$(OBJEXT): $(top_srcdir)/internal/bits.h process.$(OBJEXT): $(top_srcdir)/internal/compilers.h +process.$(OBJEXT): $(top_srcdir)/internal/dir.h process.$(OBJEXT): $(top_srcdir)/internal/error.h process.$(OBJEXT): $(top_srcdir)/internal/eval.h process.$(OBJEXT): $(top_srcdir)/internal/gc.h diff --git a/process.c b/process.c index 51c131eff8a09a..ec3f5bf15ed885 100644 --- a/process.c +++ b/process.c @@ -97,6 +97,7 @@ int initgroups(const char *, rb_gid_t); #include "hrtime.h" #include "internal.h" #include "internal/bits.h" +#include "internal/dir.h" #include "internal/error.h" #include "internal/eval.h" #include "internal/hash.h" @@ -3493,10 +3494,8 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, if (eargp->chdir_given) { if (sargp) { - char *cwd = ruby_getcwd(); sargp->chdir_given = 1; - sargp->chdir_dir = hide_obj(rb_str_new2(cwd)); - xfree(cwd); + sargp->chdir_dir = hide_obj(rb_dir_getwd_ospath()); } if (chdir(RSTRING_PTR(eargp->chdir_dir)) == -1) { /* async-signal-safe */ ERRMSG("chdir"); From 3af3431c2c145134996e66f3d8d9ade8ad81bde0 Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 10 Feb 2020 23:15:13 +0900 Subject: [PATCH 706/878] [ruby/irb] Add test_complete_symbol https://github.com/ruby/irb/commit/dbbf086c1f --- test/irb/test_completion.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index 52bbc7b2cc8c33..e5a1f4d586c8a8 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -25,5 +25,11 @@ def test_complete_numeric assert_include(IRB::InputCompletor.retrieve_completion_data("1r.positi", bind: binding), "1r.positive?") assert_empty(IRB::InputCompletor.retrieve_completion_data("1i.positi", bind: binding)) end + + def test_complete_symbol + :aiueo + assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo") + assert_empty(IRB::InputCompletor.retrieve_completion_data(":abcdefg", bind: binding)) + end end end From 0719e1be11f4e3411b78f5e1d4de553f30f29bb0 Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 10 Feb 2020 23:22:24 +0900 Subject: [PATCH 707/878] [ruby/irb] Check doc namespace correctly IRB::InputCompletor::PerfectMatchedProc crashes when doc not found because a variable name was incorrect. https://github.com/ruby/irb/commit/889fd4928f --- lib/irb/completion.rb | 6 +++--- test/irb/test_completion.rb | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 1897b4928f3671..8c0474dcc50457 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -265,14 +265,14 @@ def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace end end - PerfectMatchedProc = ->(matched) { + PerfectMatchedProc = ->(matched, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding) { RDocRIDriver ||= RDoc::RI::Driver.new if matched =~ /\A(?:::)?RubyVM/ and not ENV['RUBY_YES_I_AM_NOT_A_NORMAL_USER'] IRB.send(:easter_egg) return end - namespace = retrieve_completion_data(matched, doc_namespace: true) - return unless matched + namespace = retrieve_completion_data(matched, bind: bind, doc_namespace: true) + return unless namespace if namespace.is_a?(Array) out = RDoc::Markup::Document.new namespace.each do |m| diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index e5a1f4d586c8a8..cb6da5b1f200f8 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -31,5 +31,9 @@ def test_complete_symbol assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo") assert_empty(IRB::InputCompletor.retrieve_completion_data(":abcdefg", bind: binding)) end + + def test_complete_symbol_failure + assert_nil(IRB::InputCompletor::PerfectMatchedProc.(":aiueo", bind: binding)) + end end end From 8b8cc01229c2849236e7b43e1b5b5d33ccfb6b1e Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 11 Feb 2020 02:11:35 +0900 Subject: [PATCH 708/878] [ruby/irb] Fix auto indent with closed brace A closed brace in auto-indent shouldn't affect the next brace in the same line, but it behaves like below: p() { } It's a bug. https://github.com/ruby/irb/commit/fbe59e344f --- lib/irb/ruby-lex.rb | 1 + test/irb/test_ruby_lex.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 3d1478d8ce56ac..251db9efaa4336 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -394,6 +394,7 @@ def check_corresponding_token_depth spaces_of_nest.pop corresponding_token_depth = nil end + open_brace_on_line -= 1 when :on_kw next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME) case t[2] diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb index 65fc7d431a6a01..886891c4a7d6ac 100644 --- a/test/irb/test_ruby_lex.rb +++ b/test/irb/test_ruby_lex.rb @@ -112,5 +112,19 @@ def test_multiple_braces_in_a_line assert_indenting(lines, row.new_line_spaces, true) end end + + def test_a_closed_brace_and_not_closed_brace_in_a_line + input_with_correct_indents = [ + Row.new(%q(p() {), nil, 2), + Row.new(%q(}), 0, 0), + ] + + lines = [] + input_with_correct_indents.each do |row| + lines << row.content + assert_indenting(lines, row.current_line_spaces, false) + assert_indenting(lines, row.new_line_spaces, true) + end + end end end From 16f5d63bad783ac202a0533249f06deab436aded Mon Sep 17 00:00:00 2001 From: aycabta Date: Mon, 3 Feb 2020 01:18:50 +0900 Subject: [PATCH 709/878] [ruby/irb] Use 0.step instead of (..0).each for Ruby 2.5 https://github.com/ruby/irb/commit/5d628ca40e --- lib/irb/easter-egg.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb index 10468bcd92ccca..64869d85facc5f 100644 --- a/lib/irb/easter-egg.rb +++ b/lib/irb/easter-egg.rb @@ -116,7 +116,7 @@ def render_frame(i) end ruby_model = RubyModel.new print "\e[?1049h" - (0..).each do |i| + 0.step do |i| # TODO (0..).each needs Ruby 2.6 or later buff = canvas.draw do ruby_model.render_frame(i) do |p1, p2| canvas.line(p1, p2) From 166c4a6a2838995e3465ab3ce263bf0b5239ddde Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 12 Feb 2020 14:38:40 +0900 Subject: [PATCH 710/878] Revert "[ruby/irb] Add test_complete_symbol" This reverts commit 3af3431c2c145134996e66f3d8d9ade8ad81bde0. --- test/irb/test_completion.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index cb6da5b1f200f8..b23f73ea300722 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -26,12 +26,6 @@ def test_complete_numeric assert_empty(IRB::InputCompletor.retrieve_completion_data("1i.positi", bind: binding)) end - def test_complete_symbol - :aiueo - assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo") - assert_empty(IRB::InputCompletor.retrieve_completion_data(":abcdefg", bind: binding)) - end - def test_complete_symbol_failure assert_nil(IRB::InputCompletor::PerfectMatchedProc.(":aiueo", bind: binding)) end From 921916ff9e2940f28d932af84c5b2a2e222219d0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 11 Feb 2020 13:09:56 +0900 Subject: [PATCH 711/878] Isolate the test for Encoding#replicate It has global side effect which cannot be reverted. --- test/ruby/test_encoding.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 024d21b4f3c834..282ac6b1ae3213 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -56,11 +56,13 @@ def test_find end def test_replicate + assert_separately([], "#{<<~'END;'}") assert_instance_of(Encoding, Encoding::UTF_8.replicate("UTF-8-ANOTHER#{Time.now.to_f}")) assert_instance_of(Encoding, Encoding::ISO_2022_JP.replicate("ISO-2022-JP-ANOTHER#{Time.now.to_f}")) bug3127 = '[ruby-dev:40954]' assert_raise(TypeError, bug3127) {Encoding::UTF_8.replicate(0)} assert_raise(ArgumentError, bug3127) {Encoding::UTF_8.replicate("\0")} + END; end def test_dummy_p From 52cdf400efaecc0f5e1d1f70f22dc45212e03c4c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 11 Feb 2020 11:28:31 +0900 Subject: [PATCH 712/878] Workaround of instance variable on hidden object Since 9d9aea7fe50f6340829faa105d9ffe08ebaee658, generic instance variables need `iv_index_tbl` in the object's class. As hidden objects, however, have no class, access to the variables causes a segfault. Get rid of that segfault by raising an exception, for the time being. --- test/ruby/test_encoding.rb | 12 ++++++++++++ variable.c | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 282ac6b1ae3213..6d0665ae935202 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -65,6 +65,18 @@ def test_replicate END; end + def test_extra_encoding + assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}") + begin; + 200.times {|i| + Encoding::UTF_8.replicate("dummy#{i}") + } + e = Encoding.list.last + format = "%d".force_encoding(e) + assert_raise(TypeError) {format % 0} + end; + end + def test_dummy_p assert_equal(true, Encoding::ISO_2022_JP.dummy?) assert_equal(false, Encoding::UTF_8.dummy?) diff --git a/variable.c b/variable.c index 646d60d6eb47bb..2dba76668b249b 100644 --- a/variable.c +++ b/variable.c @@ -1134,9 +1134,12 @@ static st_table * iv_index_tbl_make(VALUE obj) { VALUE klass = rb_obj_class(obj); - st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(klass); + st_table *iv_index_tbl; - if (!iv_index_tbl) { + if (!klass) { + rb_raise(rb_eTypeError, "hidden object cannot have instance variables"); + } + if (!(iv_index_tbl = RCLASS_IV_INDEX_TBL(klass))) { iv_index_tbl = RCLASS_IV_INDEX_TBL(klass) = st_init_numtable(); } From 2090011dbd66e64916488c7b0e04e316b57d5cee Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 12 Feb 2020 17:28:29 +0900 Subject: [PATCH 713/878] test/etc/test_etc.rb: skip some tests on Android Android user management seems different from normal Unix system. --- test/etc/test_etc.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 365c27021cee14..d2ae9fa33c14c2 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -44,7 +44,7 @@ def test_getpwuid unless s.empty? assert_include(s, Etc.getpwuid) end - end + end unless RUBY_PLATFORM.include?("android") def test_getpwnam passwd = {} @@ -54,7 +54,7 @@ def test_getpwnam passwd.each_value do |s| assert_equal(s, Etc.getpwnam(s.name)) end - end + end unless RUBY_PLATFORM.include?("android") def test_passwd_with_low_level_api a = [] From 65201c054a90c8e7beb8fe1e6d0006541ac33449 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 12 Feb 2020 17:33:41 +0900 Subject: [PATCH 714/878] test/rubygems: Try not only /usr/bin/env but also /bin/env RubyGems chooses available one from the two https://github.com/rubygems/rubygems/blob/20b0d609484df2b514954ba9ef890a7cbdd01d18/lib/rubygems/installer.rb#L38 So, it is good not to hard-code /usr/bin/env in tests. --- .../test_gem_commands_pristine_command.rb | 8 +++----- test/rubygems/test_gem_installer.rb | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb index 4ebe1efecb47ac..c40d32ae617086 100644 --- a/test/rubygems/test_gem_commands_pristine_command.rb +++ b/test/rubygems/test_gem_commands_pristine_command.rb @@ -160,11 +160,9 @@ def test_execute_env_shebang ruby_exec = sprintf Gem.default_exec_format, 'ruby' - if win_platform? - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_exec) - else - assert_match %r%\A#!\s*/usr/bin/env #{ruby_exec}%, File.read(gem_exec) - end + bin_env = win_platform? ? "" : %w(/usr/bin/env /bin/env).find {|f| File.executable?(f) } + + assert_match %r%\A#!\s*#{bin_env} #{ruby_exec}%, File.read(gem_exec) end def test_execute_extensions_explicit diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index eaeff4a8fc92fc..29458dbd4ecab0 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1794,9 +1794,9 @@ def test_shebang_env_shebang shebang = installer.shebang 'executable' - env_shebang = "/usr/bin/env" unless Gem.win_platform? + bin_env = get_bin_env - assert_equal("#!#{env_shebang} #{RbConfig::CONFIG['ruby_install_name']}", + assert_equal("#!#{bin_env} #{RbConfig::CONFIG['ruby_install_name']}", shebang) end @@ -1875,10 +1875,18 @@ def test_shebang_custom assert_equal "#!test", shebang end + def get_bin_env + if win_platform? + "" + else + %w(/usr/bin/env /bin/env).find {|f| File.executable?(f) } + end + end + def test_shebang_custom_with_expands installer = setup_base_installer - bin_env = win_platform? ? '' : '/usr/bin/env' + bin_env = get_bin_env conf = Gem::ConfigFile.new [] conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec 4 $name' @@ -1894,7 +1902,7 @@ def test_shebang_custom_with_expands def test_shebang_custom_with_expands_and_arguments installer = setup_base_installer - bin_env = win_platform? ? '' : '/usr/bin/env' + bin_env = get_bin_env conf = Gem::ConfigFile.new [] conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec' From 775e31c801eb954b500e7638cff27cde2210d18d Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Wed, 12 Feb 2020 08:40:25 +0000 Subject: [PATCH 715/878] Add array.rb to .document --- .document | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.document b/.document index 7410eaaed5cee8..a5018a6cdcb0a5 100644 --- a/.document +++ b/.document @@ -10,7 +10,7 @@ # prelude prelude.rb rbconfig.rb - +array.rb ast.rb gc.rb io.rb From 15cacf1f5588e34f1745790f7405bde845b2ac08 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 12 Feb 2020 19:40:10 +0900 Subject: [PATCH 716/878] Add test_complete_symbol The previous version of the test method used a symbol, ":abcdefg" to complete but longer symbols that can be completed are defined by other test methods of other libs. --- test/irb/test_completion.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index b23f73ea300722..f302499fe2d32a 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -26,6 +26,12 @@ def test_complete_numeric assert_empty(IRB::InputCompletor.retrieve_completion_data("1i.positi", bind: binding)) end + def test_complete_symbol + :aiueo + assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo") + assert_empty(IRB::InputCompletor.retrieve_completion_data(":irb_unknown_symbol_abcdefg", bind: binding)) + end + def test_complete_symbol_failure assert_nil(IRB::InputCompletor::PerfectMatchedProc.(":aiueo", bind: binding)) end From b8e7bd9f44c36cfa458b4f5878d4489097891516 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 12 Feb 2020 19:39:20 +0900 Subject: [PATCH 717/878] Promote tempfile to the default gems. --- lib/tempfile.gemspec | 23 +++++++++++++++++++++++ tool/sync_default_gems.rb | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 lib/tempfile.gemspec diff --git a/lib/tempfile.gemspec b/lib/tempfile.gemspec new file mode 100644 index 00000000000000..a6d5ab4ae892d5 --- /dev/null +++ b/lib/tempfile.gemspec @@ -0,0 +1,23 @@ +Gem::Specification.new do |spec| + spec.name = "tempfile" + spec.version = "0.1.0" + spec.authors = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{A utility class for managing temporary files.} + spec.description = %q{A utility class for managing temporary files.} + spec.homepage = "https://github.com/ruby/tempfile" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index a432a7ad040ef3..860c0a772d4502 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -56,6 +56,7 @@ # * https://github.com/ruby/openssl # * https://github.com/ruby/did_you_mean # * https://github.com/ruby/weakref +# * https://github.com/ruby/tempfile # require 'fileutils' @@ -110,6 +111,7 @@ openssl: "ruby/openssl", did_you_mean: "ruby/did_you_mean", weakref: "ruby/weakref", + tempfile: "ruby/tempfile", } def sync_default_gems(gem) From 1b219f1fb26d15d69d4a0cb628f856f6f850eac5 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 12 Feb 2020 19:47:31 +0900 Subject: [PATCH 718/878] Move the entries of tempfile on docs --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 910295f2a71860..5cef2d082a1ea2 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -85,8 +85,6 @@ Zachary Scott (zzak) Tanaka Akira (akr) [lib/shellwords.rb] Akinori MUSHA (knu) -[lib/tempfile.rb] - _unmaintained_ [lib/tmpdir.rb] _unmaintained_ [lib/time.rb] @@ -239,6 +237,9 @@ Zachary Scott (zzak) Yukihiro Matsumoto (matz) https://github.com/ruby/singleton https://rubygems.org/gems/singleton +[lib/tempfile.rb] + _unmaintained_ + https://github.com/ruby/tempfile [lib/timeout.rb] Yukihiro Matsumoto (matz) https://github.com/ruby/timeout diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index a09eaf6c4c02e4..cdcf1d185735c4 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -31,7 +31,6 @@ Gem:: Package management framework for Ruby SecureRandom:: Interface for secure random number generator Set:: Provides a class to deal with collections of unordered, unique values Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell -Tempfile:: A utility class for managing temporary files Time:: Extends the Time class with methods for parsing and conversion tmpdir.rb:: Extends the Dir class to manage the OS temporary file path TSort:: Topological sorting using Tarjan's algorithm @@ -80,6 +79,7 @@ PStore:: Implements a file based persistence mechanism based on a Hash Racc:: A LALR(1) parser generator written in Ruby. RDoc:: Produces HTML and command-line documentation for Ruby Singleton:: Implementation of the Singleton pattern for Ruby +Tempfile:: A utility class for managing temporary files Timeout:: Auto-terminate potentially long-running operations in Ruby Tracer:: Outputs a source level execution trace of a Ruby program URI:: A Ruby module providing support for Uniform Resource Identifiers From bdf3032e3542b318c6f52dbe20d1c97cca3d7067 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Feb 2020 19:29:18 +0900 Subject: [PATCH 719/878] Make temporary lock string encoding free As a temporary lock string is hidden, it can not have instance variables, including non-inlined encoding index. --- sprintf.c | 2 +- string.c | 11 +++++++++-- test/ruby/test_encoding.rb | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sprintf.c b/sprintf.c index 64cfdee1a1e09a..ff1800e088605e 100644 --- a/sprintf.c +++ b/sprintf.c @@ -257,7 +257,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) blen = 0; bsiz = 120; result = rb_str_buf_new(bsiz); - rb_enc_copy(result, fmt); + rb_enc_associate(result, enc); buf = RSTRING_PTR(result); memset(buf, 0, bsiz); ENC_CODERANGE_SET(result, coderange); diff --git a/string.c b/string.c index 12f5d014f44ff0..83c47809839425 100644 --- a/string.c +++ b/string.c @@ -199,6 +199,7 @@ VALUE rb_cSymbol; static VALUE str_replace_shared_without_enc(VALUE str2, VALUE str); static VALUE str_new_shared(VALUE klass, VALUE str); static VALUE str_new_frozen(VALUE klass, VALUE orig); +static VALUE str_new_frozen_buffer(VALUE klass, VALUE orig, int copy_encoding); static VALUE str_new_static(VALUE klass, const char *ptr, long len, int encindex); static void str_make_independent_expand(VALUE str, long len, long expand, const int termlen); static inline void str_modifiable(VALUE str); @@ -1225,7 +1226,7 @@ VALUE rb_str_tmp_frozen_acquire(VALUE orig) { if (OBJ_FROZEN_RAW(orig)) return orig; - return str_new_frozen(0, orig); + return str_new_frozen_buffer(0, orig, FALSE); } void @@ -1256,6 +1257,12 @@ rb_str_tmp_frozen_release(VALUE orig, VALUE tmp) static VALUE str_new_frozen(VALUE klass, VALUE orig) +{ + return str_new_frozen_buffer(klass, orig, TRUE); +} + +static VALUE +str_new_frozen_buffer(VALUE klass, VALUE orig, int copy_encoding) { VALUE str; @@ -1304,7 +1311,7 @@ str_new_frozen(VALUE klass, VALUE orig) } } - rb_enc_cr_str_exact_copy(str, orig); + if (copy_encoding) rb_enc_cr_str_exact_copy(str, orig); OBJ_FREEZE(str); return str; } diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 6d0665ae935202..d571dd28c1a2a6 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -73,7 +73,7 @@ def test_extra_encoding } e = Encoding.list.last format = "%d".force_encoding(e) - assert_raise(TypeError) {format % 0} + assert_equal("0", format % 0) end; end From 160d3165eb095d81ae6e156f832a99728c853b01 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Feb 2020 20:09:57 +0900 Subject: [PATCH 720/878] Copy non-inlined encoding index --- string.c | 6 ++++++ test/ruby/test_encoding.rb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/string.c b/string.c index 83c47809839425..3cfe3adcacf586 100644 --- a/string.c +++ b/string.c @@ -1511,6 +1511,7 @@ str_duplicate(VALUE klass, VALUE str) ; VALUE flags = FL_TEST_RAW(str, flag_mask); VALUE dup = str_alloc(klass); + int encidx = 0; MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, char, embed_size); if (flags & STR_NOEMBED) { @@ -1530,7 +1531,12 @@ str_duplicate(VALUE klass, VALUE str) char, embed_size); } } + if ((flags & ENCODING_MASK) == (ENCODING_INLINE_MAX< Date: Wed, 12 Feb 2020 20:07:15 +0900 Subject: [PATCH 721/878] Promote tmpdir to the default gems --- lib/tmpdir.gemspec | 23 +++++++++++++++++++++++ tool/sync_default_gems.rb | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 lib/tmpdir.gemspec diff --git a/lib/tmpdir.gemspec b/lib/tmpdir.gemspec new file mode 100644 index 00000000000000..738d6708880a24 --- /dev/null +++ b/lib/tmpdir.gemspec @@ -0,0 +1,23 @@ +Gem::Specification.new do |spec| + spec.name = "tmpdir" + spec.version = "0.1.0" + spec.authors = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{Extends the Dir class to manage the OS temporary file path.} + spec.description = %q{Extends the Dir class to manage the OS temporary file path.} + spec.homepage = "https://github.com/ruby/tmpdir" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 860c0a772d4502..b17e06cfe2c586 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -57,6 +57,7 @@ # * https://github.com/ruby/did_you_mean # * https://github.com/ruby/weakref # * https://github.com/ruby/tempfile +# * https://github.com/ruby/tmpdir # require 'fileutils' @@ -112,6 +113,7 @@ did_you_mean: "ruby/did_you_mean", weakref: "ruby/weakref", tempfile: "ruby/tempfile", + tmpdir: "ruby/tmpdir", } def sync_default_gems(gem) From a91ce05046b1bddc60a3dafcea59a4366359dffa Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 12 Feb 2020 20:34:08 +0900 Subject: [PATCH 722/878] Move the entries of tempfile on docs --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 5cef2d082a1ea2..911bad4ef55bdc 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -85,8 +85,6 @@ Zachary Scott (zzak) Tanaka Akira (akr) [lib/shellwords.rb] Akinori MUSHA (knu) -[lib/tmpdir.rb] - _unmaintained_ [lib/time.rb] Tanaka Akira (akr) [lib/tsort.rb] @@ -247,6 +245,9 @@ Zachary Scott (zzak) Keiju ISHITSUKA (keiju) https://github.com/ruby/thwait https://rubygems.org/gems/thwait +[lib/tmpdir.rb] + _unmaintained_ + https://github.com/ruby/tmpdir [lib/tracer.rb] Keiju ISHITSUKA (keiju) https://github.com/ruby/tracer diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index cdcf1d185735c4..2e1ecd043c6c98 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -32,7 +32,6 @@ SecureRandom:: Interface for secure random number generator Set:: Provides a class to deal with collections of unordered, unique values Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell Time:: Extends the Time class with methods for parsing and conversion -tmpdir.rb:: Extends the Dir class to manage the OS temporary file path TSort:: Topological sorting using Tarjan's algorithm un.rb:: Utilities to replace common UNIX commands @@ -81,6 +80,7 @@ RDoc:: Produces HTML and command-line documentation for Ruby Singleton:: Implementation of the Singleton pattern for Ruby Tempfile:: A utility class for managing temporary files Timeout:: Auto-terminate potentially long-running operations in Ruby +tmpdir.rb:: Extends the Dir class to manage the OS temporary file path Tracer:: Outputs a source level execution trace of a Ruby program URI:: A Ruby module providing support for Uniform Resource Identifiers WEBrick:: An HTTP server toolkit for Ruby From ed7b46b66be671165b6f38abd21d7638f4dfdcea Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Sat, 18 Jan 2020 18:18:00 -0800 Subject: [PATCH 723/878] Use inline cache for super calls --- test/ruby/test_super.rb | 13 +++++++++++++ vm_insnhelper.c | 18 +++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb index bbfc581500e4c8..7c4beff07bccc3 100644 --- a/test/ruby/test_super.rb +++ b/test/ruby/test_super.rb @@ -583,4 +583,17 @@ def foo *args def test_super_with_modified_rest_parameter assert_equal [13], TestFor_super_with_modified_rest_parameter.new.foo end + + def test_super_with_define_method + superklass = Class.new do + def foo; :foo; end + def bar; :bar; end + end + subklass = Class.new(superklass) + [:foo, :bar].each do |sym| + subklass.define_method(sym){ super() } + end + assert_equal :foo, subklass.new.foo + assert_equal :bar, subklass.new.bar + end end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d2b8a636765e77..9404b0d74a4448 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3154,9 +3154,25 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); } else { - /* TODO: use inline cache */ +#if OPT_INLINE_METHOD_CACHE + /* Unlike normal method search, we only consider the first class + * serial. Since we're testing defined_class rather than receiver, + * there's only one valid "warm" value. */ + if (LIKELY(RB_DEBUG_COUNTER_INC_UNLESS(mc_global_state_miss, + GET_GLOBAL_METHOD_STATE() == cc->method_state) && + cc->class_serial[0] == RCLASS_SERIAL(klass)) && + cc->me && ci->mid == cc->me->def->original_id) { + VM_ASSERT(cc->call != NULL); + RB_DEBUG_COUNTER_INC(mc_inline_hit); + return; + } +#endif + CC_SET_ME(cc, rb_callable_method_entry(klass, ci->mid)); CC_SET_FASTPATH(cc, vm_call_super_method, TRUE); + + cc->method_state = GET_GLOBAL_METHOD_STATE(); + cc->class_serial[0] = RCLASS_SERIAL(klass); } } From bc1dbed16c647c556725481e38fc2e857e162fd6 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2020 00:15:22 +0900 Subject: [PATCH 724/878] * 2020-02-13 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 81c436afedb67b..b3ceb5e4a94f9e 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" From 99a8742067ba262eb324615bfac770d1aea53b07 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Thu, 13 Feb 2020 03:28:40 +0900 Subject: [PATCH 725/878] should be compared with called_id me->called_id and me->def->original_id can be different sometimes so we should compare with called_id, which is mtbl's key. (fix GH-PR #2869) --- test/ruby/test_super.rb | 13 ++++++++++--- vm_insnhelper.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb index 7c4beff07bccc3..3d5af3d485c169 100644 --- a/test/ruby/test_super.rb +++ b/test/ruby/test_super.rb @@ -585,15 +585,22 @@ def test_super_with_modified_rest_parameter end def test_super_with_define_method - superklass = Class.new do + superklass1 = Class.new do def foo; :foo; end def bar; :bar; end + def boo; :boo; end end - subklass = Class.new(superklass) - [:foo, :bar].each do |sym| + superklass2 = Class.new(superklass1) do + alias baz boo + def boo; :boo2; end + end + subklass = Class.new(superklass2) + [:foo, :bar, :baz, :boo].each do |sym| subklass.define_method(sym){ super() } end assert_equal :foo, subklass.new.foo assert_equal :bar, subklass.new.bar + assert_equal :boo, subklass.new.baz + assert_equal :boo2, subklass.new.boo end end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9404b0d74a4448..acd5de4d5eee2f 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3161,7 +3161,7 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c if (LIKELY(RB_DEBUG_COUNTER_INC_UNLESS(mc_global_state_miss, GET_GLOBAL_METHOD_STATE() == cc->method_state) && cc->class_serial[0] == RCLASS_SERIAL(klass)) && - cc->me && ci->mid == cc->me->def->original_id) { + cc->me && ci->mid == cc->me->called_id) { VM_ASSERT(cc->call != NULL); RB_DEBUG_COUNTER_INC(mc_inline_hit); return; From 53a8b1486b0e020858aa04f004aa22f4396a1bd0 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Thu, 13 Feb 2020 04:20:22 +0900 Subject: [PATCH 726/878] skip SEGV test if RUBY_ON_BUG is specified --- test/-ext-/bug_reporter/test_bug_reporter.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb index 576628d63ed779..628fcd03407deb 100644 --- a/test/-ext-/bug_reporter/test_bug_reporter.rb +++ b/test/-ext-/bug_reporter/test_bug_reporter.rb @@ -4,6 +4,8 @@ class TestBugReporter < Test::Unit::TestCase def test_bug_reporter_add + skip if ENV['RUBY_ON_BUG'] + description = RUBY_DESCRIPTION description = description.sub(/\+JIT /, '') if RubyVM::MJIT.enabled? expected_stderr = [ From 377c63366f6d06236d6e846722acf84deee8026f Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 10:15:24 +0900 Subject: [PATCH 727/878] test/rubygems/test_gem_commands_setup_command.rb: Allow /bin/env Follow up of 65201c054a90c8e7beb8fe1e6d0006541ac33449 --- test/rubygems/test_gem_commands_setup_command.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index 9dc88d582a73f2..d2e04d760b7c62 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -184,15 +184,11 @@ def test_env_shebang_flag ruby_exec = sprintf Gem.default_exec_format, 'ruby' - if Gem.win_platform? - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_gem_bin_path) - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path) - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path) - else - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_gem_bin_path) - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path) - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path) - end + bin_env = win_platform? ? "" : %w(/usr/bin/env /bin/env).find {|f| File.executable?(f) } + + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(default_gem_bin_path) + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(default_bundle_bin_path) + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(gem_bin_path) end def test_pem_files_in From 572d9b93bbad90455dc54a270c0eacc033dc762f Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Mon, 10 Feb 2020 03:09:22 +0000 Subject: [PATCH 728/878] support multi-run test for test/webrick/test_filehandler.rb --- test/webrick/test_filehandler.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index 33b6d7b6f5ce3f..49b5de080a2567 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -103,6 +103,7 @@ def test_filehandler bug2593 = '[ruby-dev:40030]' TestWEBrick.start_httpserver(config) do |server, addr, port, log| + server[:DocumentRootOptions][:NondisclosureName] = [] http = Net::HTTP.new(addr, port) req = Net::HTTP::Get.new("/") http.request(req){|res| From 778c3973103651faa7a50d58bddbb8ea89202ee4 Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Sun, 9 Feb 2020 09:25:23 +0000 Subject: [PATCH 729/878] Fix remove warning & support multi-run test for test/psych/visitors/test_to_ruby.rb --- test/psych/visitors/test_to_ruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb index 0ebfe9bab06a4b..e1a0056a619a16 100644 --- a/test/psych/visitors/test_to_ruby.rb +++ b/test/psych/visitors/test_to_ruby.rb @@ -24,7 +24,7 @@ def test_tz_00_00_loads_without_error end def test_legacy_struct - Struct.send(:remove_const, AWESOME) if Struct.const_defined?(:AWESOME) + Struct.send(:remove_const, :AWESOME) if Struct.const_defined?(:AWESOME) foo = Struct.new('AWESOME', :bar) assert_equal foo.new('baz'), Psych.load(<<-eoyml) !ruby/struct:AWESOME From b1b155ff03634ade5cc0e724529841d354d54033 Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Sun, 9 Feb 2020 09:34:47 +0000 Subject: [PATCH 730/878] support multi-run test for test/did_you_mean/test_verbose_formatter.rb --- test/did_you_mean/test_verbose_formatter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/did_you_mean/test_verbose_formatter.rb b/test/did_you_mean/test_verbose_formatter.rb index 6639d60a4a40bd..92ea9a1c161199 100644 --- a/test/did_you_mean/test_verbose_formatter.rb +++ b/test/did_you_mean/test_verbose_formatter.rb @@ -3,6 +3,7 @@ class VerboseFormatterTest < Test::Unit::TestCase def setup require_relative File.join(DidYouMean::TestHelper.root, 'verbose') + DidYouMean.formatter = DidYouMean::VerboseFormatter.new end def teardown From fce667ed08f25fa7ce43c9b07be170f341a04c4e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 13 Feb 2020 09:34:49 +0900 Subject: [PATCH 731/878] Get rid of warnings/exceptions at cleanup After the encoding index instance variable is removed when all instance variables are removed in `obj_free`, then `rb_str_free` causes uninitialized instance variable warning and nil-to-integer conversion exception. Both cases result in object allocation during GC, and crashes. --- encoding.c | 10 ++++++++++ string.c | 1 + test/ruby/test_encoding.rb | 3 +++ 3 files changed, 14 insertions(+) diff --git a/encoding.c b/encoding.c index f2e67ff508e4bc..e713b0a9226686 100644 --- a/encoding.c +++ b/encoding.c @@ -779,8 +779,18 @@ enc_get_index_str(VALUE str) if (i == ENCODING_INLINE_MAX) { VALUE iv; +#if 0 iv = rb_ivar_get(str, rb_id_encoding()); i = NUM2INT(iv); +#else + /* + * Tentatively, assume ASCII-8BIT, if encoding index instance + * variable is not found. This can happen when freeing after + * all instance variables are removed in `obj_free`. + */ + iv = rb_attr_get(str, rb_id_encoding()); + i = NIL_P(iv) ? ENCINDEX_ASCII : NUM2INT(iv); +#endif } return i; } diff --git a/string.c b/string.c index 3cfe3adcacf586..28a1b293d649fe 100644 --- a/string.c +++ b/string.c @@ -181,6 +181,7 @@ VALUE rb_cSymbol; #define STR_HEAP_PTR(str) (RSTRING(str)->as.heap.ptr) #define STR_HEAP_SIZE(str) ((size_t)RSTRING(str)->as.heap.aux.capa + TERM_LEN(str)) +/* TODO: include the terminator size in capa. */ #define STR_ENC_GET(str) get_encoding(str) diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 80bed39936a5c6..6fc5c481791319 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -76,6 +76,9 @@ def test_extra_encoding assert_equal("0", format % 0) assert_equal(e, format.dup.encoding) assert_equal(e, (format*1).encoding) + + assert_equal(e, (("x"*30).force_encoding(e)*1).encoding) + GC.start end; end From aeddffafc828adad838479d0861db6111b98b4d2 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Thu, 13 Feb 2020 11:46:16 +0900 Subject: [PATCH 732/878] Add "test-all TESTS=--repeat-count=2" to test_task --- .github/workflows/ubuntu.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a6dbf68c73eadb..bb174fd650e492 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -10,13 +10,15 @@ jobs: make: strategy: matrix: - test_task: [ "check", "test-bundler", "test-bundled-gems" ] + test_task: [ "check", "test-bundler", "test-bundled-gems", "test-all TESTS=--repeat-count=2" ] os: [ubuntu-latest, ubuntu-16.04] exclude: - test_task: test-bundler os: ubuntu-16.04 - test_task: test-bundled-gems os: ubuntu-16.04 + - test_task: "test-all TESTS=--repeat-count=2" + os: ubuntu-16.04 fail-fast: false runs-on: ${{ matrix.os }} if: "!contains(github.event.head_commit.message, '[ci skip]')" From 2c5764ec223d976e0d0da1494596a1519104be3e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 13 Feb 2020 20:35:34 +0900 Subject: [PATCH 733/878] Promote English to the default gems. --- lib/English.gemspec | 23 +++++++++++++++++++++++ tool/sync_default_gems.rb | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 lib/English.gemspec diff --git a/lib/English.gemspec b/lib/English.gemspec new file mode 100644 index 00000000000000..5a350525196082 --- /dev/null +++ b/lib/English.gemspec @@ -0,0 +1,23 @@ +Gem::Specification.new do |spec| + spec.name = "English" + spec.version = "0.1.0" + spec.authors = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{Require 'English.rb' to reference global variables with less cryptic names.} + spec.description = %q{Require 'English.rb' to reference global variables with less cryptic names.} + spec.homepage = "https://github.com/ruby/English" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index b17e06cfe2c586..31604e06ed13e0 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -58,6 +58,7 @@ # * https://github.com/ruby/weakref # * https://github.com/ruby/tempfile # * https://github.com/ruby/tmpdir +# * https://github.com/ruby/English # require 'fileutils' @@ -114,6 +115,7 @@ weakref: "ruby/weakref", tempfile: "ruby/tempfile", tmpdir: "ruby/tmpdir", + English: "ruby/English", } def sync_default_gems(gem) From 4a2b99795aa33bd39876742cc6fc524024e6bbac Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 13 Feb 2020 20:36:44 +0900 Subject: [PATCH 734/878] Move the English entries to the default gems at docs --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 911bad4ef55bdc..fb78e2bb274a4f 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -38,8 +38,6 @@ Zachary Scott (zzak) === Libraries -[lib/English.rb] - _unmaintained_ [lib/abbrev.rb] Akinori MUSHA (knu) [lib/base64.rb] @@ -150,6 +148,9 @@ Zachary Scott (zzak) Kenta Murata (mrkn), Kouhei Sutou (kou) https://github.com/ruby/csv https://rubygems.org/gems/csv +[lib/English.rb] + _unmaintained_ + https://github.com/ruby/English [lib/delegate.rb] _unmaintained_ https://github.com/ruby/delegate diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 2e1ecd043c6c98..86ce877c14d091 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -12,7 +12,6 @@ Abbrev:: Calculates a set of unique abbreviations for a given set of strings Base64:: Support for encoding and decoding binary data using a Base64 representation DEBUGGER__:: Debugging functionality for Ruby DRb:: Distributed object system for Ruby -English.rb:: Require 'English.rb' to reference global variables with less cryptic names ERB:: An easy to use but powerful templating system for Ruby Find:: This module supports top-down traversal of a set of file paths MakeMakefile:: Module used to generate a Makefile for C extensions @@ -60,6 +59,7 @@ CGI:: Support for the Common Gateway Interface protocol CSV:: Provides an interface to read and write CSV files and data Delegator:: Provides three abilities to delegate method calls to an object DidYouMean:: "Did you mean?" experience in Ruby +English.rb:: Require 'English.rb' to reference global variables with less cryptic names FileUtils:: Several file utility methods for copying, moving, removing, etc Forwardable:: Provides delegation of specified methods to a designated object GetoptLong:: Parse command line options similar to the GNU C getopt_long() From a11fa7d8cd424e60b34a1c03cc18abee17203576 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 22:56:42 +0900 Subject: [PATCH 735/878] spec/ruby/core/dir/home_spec.rb: exclude Android I couldn't find a robust way to get the home path except ENV["HOME"] on Android Termux. --- spec/ruby/core/dir/home_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb index cdfc9346dc4d05..73deca2cfdfcb5 100644 --- a/spec/ruby/core/dir/home_spec.rb +++ b/spec/ruby/core/dir/home_spec.rb @@ -28,7 +28,7 @@ end end - platform_is_not :windows, :solaris do + platform_is_not :windows, :solaris, :android do it "returns the named user's home directory, from the user database" do Dir.home(ENV['USER']).should == `echo ~#{ENV['USER']}`.chomp end From 022268ae009bd87b13e1f5ee46011b7142987d57 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 22:58:15 +0900 Subject: [PATCH 736/878] spec/ruby/core/encoding/locale_charmap_spec.rb: locale_charmap is UTF-8 on Android nl_langinfo(CODESET) always returns UTF-8 on Android, regardless to LC_ALL=C. --- .../ruby/core/encoding/locale_charmap_spec.rb | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/spec/ruby/core/encoding/locale_charmap_spec.rb b/spec/ruby/core/encoding/locale_charmap_spec.rb index 5963a8beb52153..8143b9083a8cc1 100644 --- a/spec/ruby/core/encoding/locale_charmap_spec.rb +++ b/spec/ruby/core/encoding/locale_charmap_spec.rb @@ -7,11 +7,13 @@ # FIXME: Get this working on Windows platform_is :linux do - it "returns a value based on the LC_ALL environment variable" do - old_lc_all = ENV['LC_ALL'] - ENV['LC_ALL'] = 'C' - ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968' - ENV['LC_ALL'] = old_lc_all + platform_is_not :android do + it "returns a value based on the LC_ALL environment variable" do + old_lc_all = ENV['LC_ALL'] + ENV['LC_ALL'] = 'C' + ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968' + ENV['LC_ALL'] = old_lc_all + end end end @@ -33,6 +35,15 @@ end end + platform_is :android do + it "always returns UTF-8" do + old_lc_all = ENV['LC_ALL'] + ENV['LC_ALL'] = 'C' + ruby_exe("print Encoding.locale_charmap").should == 'UTF-8' + ENV['LC_ALL'] = old_lc_all + end + end + platform_is :bsd, :darwin, :linux do it "is unaffected by assigning to ENV['LC_ALL'] in the same process" do old_charmap = Encoding.locale_charmap From ed549f80b645aafd62376f65c3a27b66bafa2a38 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:00:30 +0900 Subject: [PATCH 737/878] spec/ruby/core/process/clock_getres_spec.rb: skip on Android in the same way as FreeBSD and OpenBSD. I guess that the spec makes too strong assumption. --- spec/ruby/core/process/clock_getres_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/core/process/clock_getres_spec.rb b/spec/ruby/core/process/clock_getres_spec.rb index f1ecb74010d217..764b8ff03ac2ae 100644 --- a/spec/ruby/core/process/clock_getres_spec.rb +++ b/spec/ruby/core/process/clock_getres_spec.rb @@ -4,7 +4,7 @@ describe "Process.clock_getres" do # clock_getres() seems completely buggy on FreeBSD: # https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd11zfs/ruby-trunk/log/20190428T093003Z.fail.html.gz - platform_is_not :freebsd, :openbsd do + platform_is_not :freebsd, :openbsd, :android do # NOTE: Look at fixtures/clocks.rb for clock and OS-specific exclusions ProcessSpecs.clock_constants_for_resolution_checks.each do |name, value| it "matches the clock in practice for Process::#{name}" do From 02233e171ce7a5243f19746148c3d59e1ad7dd33 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:03:07 +0900 Subject: [PATCH 738/878] spec/ruby/core/process/spawn_spec.rb: Use / instead of /tmp because there is no /tmp on Android. --- spec/ruby/core/process/spawn_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/core/process/spawn_spec.rb b/spec/ruby/core/process/spawn_spec.rb index 06ad9a25182b65..79a5f4ad950105 100644 --- a/spec/ruby/core/process/spawn_spec.rb +++ b/spec/ruby/core/process/spawn_spec.rb @@ -419,7 +419,7 @@ def child_pids(pid) it "kills extra chdir processes" do pid = nil - Dir.chdir("/tmp") do + Dir.chdir("/") do pid = Process.spawn("sleep 10") end From ca53ab581b414ba86cfb5a6d51ca9a372c4ffcf8 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:04:15 +0900 Subject: [PATCH 739/878] spec/ruby/library/etc/confstr_spec.rb: skip on Android There seems to be no _CS_PATH on Android. --- spec/ruby/library/etc/confstr_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/library/etc/confstr_spec.rb b/spec/ruby/library/etc/confstr_spec.rb index 0c922a3a775e90..41a970a918cbd0 100644 --- a/spec/ruby/library/etc/confstr_spec.rb +++ b/spec/ruby/library/etc/confstr_spec.rb @@ -1,7 +1,7 @@ require File.expand_path('../../../spec_helper', __FILE__) require 'etc' -platform_is_not :windows do +platform_is_not :windows, :android do describe "Etc.confstr" do it "returns a String for Etc::CS_PATH" do Etc.confstr(Etc::CS_PATH).should be_an_instance_of(String) From c6ebbbd38b997f8a8d6968e683e29db1e299b5aa Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:06:33 +0900 Subject: [PATCH 740/878] spec/ruby: skip the specs that use /etc/passwd on Android There is no /etc/passwd on Android --- spec/ruby/core/file/stat/owned_spec.rb | 2 +- spec/ruby/shared/file/executable.rb | 2 +- spec/ruby/shared/file/readable.rb | 5 ++++- spec/ruby/shared/file/writable.rb | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spec/ruby/core/file/stat/owned_spec.rb b/spec/ruby/core/file/stat/owned_spec.rb index 6f0c250f8891fd..fbd473c4d7f5c6 100644 --- a/spec/ruby/core/file/stat/owned_spec.rb +++ b/spec/ruby/core/file/stat/owned_spec.rb @@ -21,7 +21,7 @@ st.owned?.should == true end - platform_is_not :windows do + platform_is_not :windows, :android do as_user do it "returns false if the file is not owned by the user" do system_file = '/etc/passwd' diff --git a/spec/ruby/shared/file/executable.rb b/spec/ruby/shared/file/executable.rb index 2987d0aabbdbc7..7b5c4c580c2bf7 100644 --- a/spec/ruby/shared/file/executable.rb +++ b/spec/ruby/shared/file/executable.rb @@ -13,7 +13,7 @@ rm_r @file1, @file2 end - platform_is_not :windows do + platform_is_not :windows, :android do it "returns true if named file is executable by the effective user id of the process, otherwise false" do @object.send(@method, '/etc/passwd').should == false @object.send(@method, @file1).should == true diff --git a/spec/ruby/shared/file/readable.rb b/spec/ruby/shared/file/readable.rb index 74f58caaff15db..eb2ca068121823 100644 --- a/spec/ruby/shared/file/readable.rb +++ b/spec/ruby/shared/file/readable.rb @@ -4,9 +4,12 @@ platform_is :windows do @file2 = File.join(ENV["WINDIR"], "system32/drivers/etc/services").tr(File::SEPARATOR, File::ALT_SEPARATOR) end - platform_is_not :windows do + platform_is_not :windows, :android do @file2 = "/etc/passwd" end + platform_is :android do + @file2 = "/system/bin/sh" + end end after :each do diff --git a/spec/ruby/shared/file/writable.rb b/spec/ruby/shared/file/writable.rb index 902d545da1adc4..4bb8aedce6840b 100644 --- a/spec/ruby/shared/file/writable.rb +++ b/spec/ruby/shared/file/writable.rb @@ -8,7 +8,7 @@ end it "returns true if named file is writable by the effective user id of the process, otherwise false" do - platform_is_not :windows do + platform_is_not :windows, :android do as_user do @object.send(@method, "/etc/passwd").should == false end From 89bfad17d5911b7295063b85e9c003e2a837493a Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:08:31 +0900 Subject: [PATCH 741/878] spec/ruby/library/syslog: skip the specs that use LOG_PERROR on Android LOG_PERROR is defined on Android, but not implemented yet. See also f3c4e620ac612eab6370b1fb82feaa4e651542bb. --- spec/ruby/library/syslog/log_spec.rb | 2 +- spec/ruby/library/syslog/shared/log.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb index ee62d484acca95..d0eaea2a94264b 100644 --- a/spec/ruby/library/syslog/log_spec.rb +++ b/spec/ruby/library/syslog/log_spec.rb @@ -4,7 +4,7 @@ require 'syslog' describe "Syslog.log" do - platform_is_not :windows, :darwin, :solaris, :aix do + platform_is_not :windows, :darwin, :solaris, :aix, :android do before :each do Syslog.opened?.should be_false diff --git a/spec/ruby/library/syslog/shared/log.rb b/spec/ruby/library/syslog/shared/log.rb index b19c2eae0d531e..c77ff6dd95e2d0 100644 --- a/spec/ruby/library/syslog/shared/log.rb +++ b/spec/ruby/library/syslog/shared/log.rb @@ -1,5 +1,5 @@ describe :syslog_log, shared: true do - platform_is_not :windows, :darwin, :solaris, :aix do + platform_is_not :windows, :darwin, :solaris, :aix, :android do before :each do Syslog.opened?.should be_false end From db8c8c0916c5e0feaad5767ac7cd3fe30b86e964 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:10:03 +0900 Subject: [PATCH 742/878] spec/ruby/library/socket/addrinfo: skip the specs that uses SOCK_SEQPACKET on Android SOCK_SEQPACKET seems not to be supported on Android --- .../socket/addrinfo/initialize_spec.rb | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/spec/ruby/library/socket/addrinfo/initialize_spec.rb b/spec/ruby/library/socket/addrinfo/initialize_spec.rb index 8354553f612274..00250439fd2294 100644 --- a/spec/ruby/library/socket/addrinfo/initialize_spec.rb +++ b/spec/ruby/library/socket/addrinfo/initialize_spec.rb @@ -274,15 +274,17 @@ end end - with_feature :sock_packet do - [:SOCK_SEQPACKET].each do |type| - it "overwrites the socket type #{type}" do - sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1'] + platform_is_not :android do + with_feature :sock_packet do + [:SOCK_SEQPACKET].each do |type| + it "overwrites the socket type #{type}" do + sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1'] - value = Socket.const_get(type) - addr = Addrinfo.new(sockaddr, nil, value) + value = Socket.const_get(type) + addr = Addrinfo.new(sockaddr, nil, value) - addr.socktype.should == value + addr.socktype.should == value + end end end end @@ -448,28 +450,30 @@ end platform_is :linux do - describe 'and the socket type is set to SOCK_SEQPACKET' do - before do - @socktype = Socket::SOCK_SEQPACKET - end + platform_is_not :android do + describe 'and the socket type is set to SOCK_SEQPACKET' do + before do + @socktype = Socket::SOCK_SEQPACKET + end - valid = [:IPPROTO_IP, :IPPROTO_HOPOPTS] + valid = [:IPPROTO_IP, :IPPROTO_HOPOPTS] - valid.each do |type| - it "overwrites the protocol when using #{type}" do - value = Socket.const_get(type) - addr = Addrinfo.new(@sockaddr, nil, @socktype, value) + valid.each do |type| + it "overwrites the protocol when using #{type}" do + value = Socket.const_get(type) + addr = Addrinfo.new(@sockaddr, nil, @socktype, value) - addr.protocol.should == value + addr.protocol.should == value + end end - end - (Socket.constants.grep(/^IPPROTO/) - valid).each do |type| - it "raises SocketError when using #{type}" do - value = Socket.const_get(type) - block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) } + (Socket.constants.grep(/^IPPROTO/) - valid).each do |type| + it "raises SocketError when using #{type}" do + value = Socket.const_get(type) + block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) } - block.should raise_error(SocketError) + block.should raise_error(SocketError) + end end end end From 09a042ae0445472d42f35b9fd50c21d6564b0ece Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:11:28 +0900 Subject: [PATCH 743/878] spec/ruby/library/etc/: skip the specs related to group on Android User/group system on Android seems different from normal Linux. --- spec/ruby/library/etc/getgrnam_spec.rb | 2 +- spec/ruby/library/etc/group_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/ruby/library/etc/getgrnam_spec.rb b/spec/ruby/library/etc/getgrnam_spec.rb index a7c624efbf3005..fa49f15349beea 100644 --- a/spec/ruby/library/etc/getgrnam_spec.rb +++ b/spec/ruby/library/etc/getgrnam_spec.rb @@ -11,7 +11,7 @@ end end -platform_is_not :windows do +platform_is_not :windows, :android do describe "Etc.getgrnam" do it "returns a Etc::Group struct instance for the given group" do gr_name = Etc.getgrent.name diff --git a/spec/ruby/library/etc/group_spec.rb b/spec/ruby/library/etc/group_spec.rb index fdd39bda16e4ee..fda808eec9e05b 100644 --- a/spec/ruby/library/etc/group_spec.rb +++ b/spec/ruby/library/etc/group_spec.rb @@ -5,7 +5,7 @@ describe "Etc.group" do it_behaves_like :etc_on_windows, :group - platform_is_not :windows do + platform_is_not :windows, :android do it "returns a Etc::Group struct" do group = Etc.group begin From bbc67993344830c18b15f5d90febc7dec9c87b3c Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:13:17 +0900 Subject: [PATCH 744/878] spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb: skip on Android FreeBSD's GETNAMEINFO(3) says: > If a link-layer address or UNIX-domain address is passed to > getnameinfo(), its ASCII representation will be stored in host. The > string pointed to by serv will be set to the empty string if non-NULL; > flags will always be ignored. Android seems to behave like FreeBSD. --- .../socket/addrinfo/getnameinfo_spec.rb | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb index c5284f1c0f011b..76579de74c0c67 100644 --- a/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb +++ b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb @@ -21,18 +21,20 @@ end platform_is :linux do - with_feature :unix_socket do - describe 'using a UNIX Addrinfo' do - before do - @addr = Addrinfo.unix('cats') - @host = Socket.gethostname - end + platform_is_not :android do + with_feature :unix_socket do + describe 'using a UNIX Addrinfo' do + before do + @addr = Addrinfo.unix('cats') + @host = Socket.gethostname + end - it 'returns the hostname and UNIX socket path' do - host, path = @addr.getnameinfo + it 'returns the hostname and UNIX socket path' do + host, path = @addr.getnameinfo - host.should == @host - path.should == 'cats' + host.should == @host + path.should == 'cats' + end end end end From 6bfc576271ead85f905b21ef9268e6e8ba5bb85f Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 23:16:10 +0900 Subject: [PATCH 745/878] spec/ruby/library/socket/constants/constants_spec.rb: skip on Android IP_MAX_MEMBERSHIPS seems not to be defined on Android --- spec/ruby/library/socket/constants/constants_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/library/socket/constants/constants_spec.rb b/spec/ruby/library/socket/constants/constants_spec.rb index 710af128283fd7..637bc6740af719 100644 --- a/spec/ruby/library/socket/constants/constants_spec.rb +++ b/spec/ruby/library/socket/constants/constants_spec.rb @@ -68,7 +68,7 @@ end end - platform_is_not :solaris, :windows, :aix do + platform_is_not :solaris, :windows, :aix, :android do it "defines multicast options" do consts = ["IP_MAX_MEMBERSHIPS"] consts.each do |c| From fad98c6c61688d9ca7772bbfdef5a9d832529f16 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Fri, 14 Feb 2020 00:07:28 +0900 Subject: [PATCH 746/878] test/irb/test_completion.rb: suppress a warning: unused literal ignored --- test/irb/test_completion.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index f302499fe2d32a..d4072fe8923742 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -27,7 +27,7 @@ def test_complete_numeric end def test_complete_symbol - :aiueo + _ = :aiueo assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo") assert_empty(IRB::InputCompletor.retrieve_completion_data(":irb_unknown_symbol_abcdefg", bind: binding)) end From c0ebf64ae71dfe39744c1fad8c8653a21e4d4268 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2020 00:08:12 +0900 Subject: [PATCH 747/878] * 2020-02-14 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index b3ceb5e4a94f9e..f01f829bdc760e 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #include "ruby/version.h" From b9129dac215735c5091658cfa3596ca0388f171f Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Thu, 13 Feb 2020 23:18:48 -0600 Subject: [PATCH 748/878] Enhanced doc for ENV * More on ENV examples --- hash.c | 89 ++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/hash.c b/hash.c index aeb6bbeb5c0585..3a5f0579fcc260 100644 --- a/hash.c +++ b/hash.c @@ -5792,7 +5792,8 @@ env_clear(VALUE _) * call-seq: * ENV.to_s -> "ENV" * - * Returns "ENV" + * Returns String 'ENV': + * ENV.to_s # => "ENV" */ static VALUE env_to_s(VALUE _) @@ -5804,7 +5805,9 @@ env_to_s(VALUE _) * call-seq: * ENV.inspect -> string * - * Returns the contents of the environment as a String. + * Returns the contents of the environment as a String: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.inspect # => "{\"bar\"=>\"1\", \"foo\"=>\"0\"}" */ static VALUE env_inspect(VALUE _) @@ -5839,10 +5842,10 @@ env_inspect(VALUE _) * call-seq: * ENV.to_a -> Array * - * Converts the environment variables into an array of names and value arrays. - * - * ENV.to_a # => [["TERM", "xterm-color"], ["SHELL", "/bin/bash"], ...] - * + * Returns the contents of ENV as an Array of 2-element Arrays, + * each of which is a name/value pair: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.to_a # => [["bar", "1"], ["foo", "0"]] */ static VALUE env_to_a(VALUE _) @@ -5866,10 +5869,14 @@ env_to_a(VALUE _) /* * call-seq: - * ENV.rehash + * ENV.rehash -> nil + * + * (Provided for compatibility with Hash.) * - * Re-hashing the environment variables does nothing. It is provided for - * compatibility with Hash. + * Does not modify ENV; returns +nil+: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.rehash # => nil + * ENV # => {"bar"=>"1", "foo"=>"0"} */ static VALUE env_none(VALUE _) @@ -5879,10 +5886,13 @@ env_none(VALUE _) /* * call-seq: - * ENV.length - * ENV.size + * ENV.length -> Integer + * ENV.size -> Integer * - * Returns the number of environment variables. + * Returns the count of environment variables: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.length # => 2 + * ENV.size # => 2 */ static VALUE env_size(VALUE _) @@ -5901,7 +5911,11 @@ env_size(VALUE _) * call-seq: * ENV.empty? -> true or false * - * Returns true when there are no environment variables + * Returns +true+ when there are no environment variables, +false+ otherwise: + * ENV.clear + * ENV.empty? # =? true + * ENV['foo'] = '0' + * ENV.empty? # => false */ static VALUE env_empty_p(VALUE _) @@ -5959,12 +5973,12 @@ env_has_key(VALUE env, VALUE key) * Returns a 2-element Array containing the name and value of the environment variable * for +name+ if it exists: * ENV.replace('foo' => '0', 'bar' => '1') - * ENV.assoc('foo') # => ['foo' '0'] + * ENV.assoc('foo') # => ['foo', '0'] * Returns +nil+ if +name+ is a valid String and there is no such environment variable: - * ENV.assoc('baz') # => false + * ENV.assoc('baz') # => nil * Returns +nil+ if +name+ is the empty String or is a String containing character '=': - * ENV.assoc('') # => false - * ENV.assoc('=') # => false + * ENV.assoc('') # => nil + * ENV.assoc('=') # => nil * Raises an exception if +name+ is a String containing the NUL character "\0": * ENV.assoc("\0") # Raises ArgumentError (bad environment variable name: contains null byte) * Raises an exception if +name+ has an encoding that is not ASCII-compatible: @@ -5989,7 +6003,12 @@ env_assoc(VALUE env, VALUE key) * ENV.value?(value) -> true or false * ENV.has_value?(value) -> true or false * - * Returns +true+ if there is an environment variable with the given +value+. + * Returns +true+ if +value+ is the value for some environment variable name, +false+ otherwise.: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.value?('0') # => true + * ENV.has_value?('0') # => true + * ENV.value?('2') # => false + * ENV.has_value?('2') # => false */ static VALUE env_has_value(VALUE dmy, VALUE obj) @@ -6018,8 +6037,20 @@ env_has_value(VALUE dmy, VALUE obj) * call-seq: * ENV.rassoc(value) * - * Returns an Array of the name and value of the environment variable with - * +value+ or +nil+ if the value cannot be found. + * Returns a 2-element Array containing the value and name of the *first* *found* environment variable + * that has value +value+, if one exists: + * ENV.replace('foo' => '0', 'bar' => '0') + * ENV.rassoc('0') # => ["bar", "0"] + * The order in which environment variables are examined is OS-dependent. + * See {About Ordering}[#class-ENV-label-About+Ordering]. + * + * Returns +nil+ if there is no such environment variable: + * ENV.rassoc('2') # => nil + * ENV.rassoc('') # => nil + * ENV.rassoc('=') # => nil + * ENV.rassoc("\0") # => nil + * ENV.rassoc(Object.new) # => nil + * ENV.rassoc("\xa1\xa1".force_encoding(Encoding::UTF_16LE)) # => nil */ static VALUE env_rassoc(VALUE dmy, VALUE obj) @@ -6049,16 +6080,17 @@ env_rassoc(VALUE dmy, VALUE obj) * call-seq: * ENV.key(value) -> name or nil * - * Returns the name of the first environment variable with +value+ if it exists: - * ENV.replace('foo' => '0', 'bar' => '1') - * ENV.key('0') # =>'foo' + * Returns the name of the first environment variable with +value+, if it exists: + * ENV.replace('foo' => '0', 'bar' => '0') + * ENV.key('0') # =>"foo" * The order in which environment variables are examined is OS-dependent. * See {About Ordering}[#class-ENV-label-About+Ordering]. * * Returns +nil+ if there is no such value: * ENV.key('2') # => nil - * Raises an exception if +value+ is not a String: + * Raises an exception if +value+ is invalid: * ENV.key(Object.new) # raises TypeError (no implicit conversion of Object into String) + * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values] */ static VALUE env_key(VALUE dmy, VALUE value) @@ -6088,7 +6120,7 @@ env_key(VALUE dmy, VALUE value) * call-seq: * ENV.index(value) -> key * - * Deprecated method that is equivalent to ENV.key + * Deprecated method that is equivalent to ENV.key. */ static VALUE env_index(VALUE dmy, VALUE value) @@ -6119,10 +6151,11 @@ env_to_hash(void) /* * call-seq: - * ENV.to_hash -> hash - * - * Creates a hash with a copy of the environment variables. + * ENV.to_hash -> Hash * + * Returns a Hash containing all name/value pairs from ENV: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV>to_hash # => {"bar"=>"1", "foo"=>"0"} */ static VALUE From 36b7e95744cdd9e9dedac648a88b4f9ddd6e6cb0 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 14 Feb 2020 14:26:19 +0900 Subject: [PATCH 749/878] Fix typos and add a space [ci skip] --- hash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hash.c b/hash.c index 3a5f0579fcc260..20937d71789643 100644 --- a/hash.c +++ b/hash.c @@ -5913,7 +5913,7 @@ env_size(VALUE _) * * Returns +true+ when there are no environment variables, +false+ otherwise: * ENV.clear - * ENV.empty? # =? true + * ENV.empty? # => true * ENV['foo'] = '0' * ENV.empty? # => false */ @@ -6082,7 +6082,7 @@ env_rassoc(VALUE dmy, VALUE obj) * * Returns the name of the first environment variable with +value+, if it exists: * ENV.replace('foo' => '0', 'bar' => '0') - * ENV.key('0') # =>"foo" + * ENV.key('0') # => "foo" * The order in which environment variables are examined is OS-dependent. * See {About Ordering}[#class-ENV-label-About+Ordering]. * @@ -6155,7 +6155,7 @@ env_to_hash(void) * * Returns a Hash containing all name/value pairs from ENV: * ENV.replace('foo' => '0', 'bar' => '1') - * ENV>to_hash # => {"bar"=>"1", "foo"=>"0"} + * ENV.to_hash # => {"bar"=>"1", "foo"=>"0"} */ static VALUE From 0742585e7eaf9ccc292cc077caa38f7cf584de9e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 14 Feb 2020 15:31:56 +0900 Subject: [PATCH 750/878] Consitified `rb_scan_args_set` --- include/ruby/ruby.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index db2124f019c489..8ff0e97f269aa3 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2498,13 +2498,13 @@ ALWAYS_INLINE(static int rb_scan_args_set(int kw_flag, int argc, const VALUE *argv, int n_lead, int n_opt, int n_trail, int f_var, int f_hash, int f_block, - VALUE *vars[], char *fmt, int varc)); + VALUE *vars[], const char *fmt, int varc)); inline int rb_scan_args_set(int kw_flag, int argc, const VALUE *argv, int n_lead, int n_opt, int n_trail, int f_var, int f_hash, int f_block, - VALUE *vars[], RB_UNUSED_VAR(char *fmt), RB_UNUSED_VAR(int varc)) + VALUE *vars[], RB_UNUSED_VAR(const char *fmt), RB_UNUSED_VAR(int varc)) # if defined(__has_attribute) && __has_attribute(diagnose_if) __attribute__((diagnose_if(rb_scan_args_count(fmt)<0,"bad scan arg format","error"))) __attribute__((diagnose_if(rb_scan_args_count(fmt)!=varc,"variable argument length doesn't match","error"))) From 9bc815aa5fd14f26d62ff1d6189157d7f09e23cb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 14 Feb 2020 15:38:42 +0900 Subject: [PATCH 751/878] Hoisted out `rb_scan_args_result` --- class.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/class.c b/class.c index c2abce12bb4239..f181f336907bfd 100644 --- a/class.c +++ b/class.c @@ -2079,6 +2079,15 @@ rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *con return argc; } +static int +rb_scan_args_result(const struct rb_scan_args_t *const arg, int argc) +{ + if (argc < 0) { + rb_error_arity(-1-argc, arg->n_mand, arg->f_var ? UNLIMITED_ARGUMENTS : arg->n_mand + arg->n_opt); + } + return argc; +} + #undef rb_scan_args int rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) @@ -2089,10 +2098,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) va_start(vargs,fmt); argc = rb_scan_args_assign(&arg, argc, argv, vargs); va_end(vargs); - if (argc < 0) { - rb_error_arity(-1-argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); - } - return argc; + return rb_scan_args_result(&arg, argc); } #undef rb_scan_args_kw @@ -2105,10 +2111,7 @@ rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...) va_start(vargs,fmt); argc = rb_scan_args_assign(&arg, argc, argv, vargs); va_end(vargs); - if (argc < 0) { - rb_error_arity(-1-argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt); - } - return argc; + return rb_scan_args_result(&arg, argc); } int From 95c58d33cc6925f08d45c00b88367c702f61f428 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 5 Feb 2020 19:57:18 -0600 Subject: [PATCH 752/878] MinGW - rename OpenSSL dll's in system32 directory --- .github/workflows/mingw.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 1596adef49129b..19dcbb2e1939bf 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -99,6 +99,9 @@ jobs: - name: make all timeout-minutes: 20 run: | + # Hopefully, GitHub will remove these files + ren C:\Windows\System32\libcrypto-1_1-x64.dll libcrypto-1_1-x64.dll_ + ren C:\Windows\System32\libssl-1_1-x64.dll libssl-1_1-x64.dll_ $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 make -C build -j $jobs V=1 From 1df2c8cefb4bb9a36f5241b407ebb13f7550669f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 14 Feb 2020 19:57:07 +0900 Subject: [PATCH 753/878] Revert "MinGW - rename OpenSSL dll's in system32 directory" This reverts commit 95c58d33cc6925f08d45c00b88367c702f61f428. --- .github/workflows/mingw.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 19dcbb2e1939bf..1596adef49129b 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -99,9 +99,6 @@ jobs: - name: make all timeout-minutes: 20 run: | - # Hopefully, GitHub will remove these files - ren C:\Windows\System32\libcrypto-1_1-x64.dll libcrypto-1_1-x64.dll_ - ren C:\Windows\System32\libssl-1_1-x64.dll libssl-1_1-x64.dll_ $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 make -C build -j $jobs V=1 From 78282d4655c05348ce7df24058623d3e868a08e6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 14 Feb 2020 15:59:36 +0900 Subject: [PATCH 754/878] [ruby/io-console] Prefer keyword arguments https://github.com/ruby/io-console/commit/5facbfc4c8 --- ext/io/console/console.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index bfba1e71520a26..f67e6805bca52d 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -111,6 +111,9 @@ rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t * int argc = *argcp; rawmode_arg_t *optp = NULL; VALUE vopts = Qnil; +#ifdef RB_SCAN_ARGS_PASS_CALLED_KEYWORDS + argc = rb_scan_args(argc, argv, "*:", NULL, &vopts); +#else if (argc > min_argc) { vopts = rb_check_hash_type(argv[argc-1]); if (!NIL_P(vopts)) { @@ -120,6 +123,7 @@ rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t * if (!vopts) vopts = Qnil; } } +#endif rb_check_arity(argc, min_argc, max_argc); if (!NIL_P(vopts)) { VALUE vmin = rb_hash_aref(vopts, ID2SYM(id_min)); From 2efb38e766b6fc304bb933d696c7500425d178a1 Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 14 Feb 2020 22:34:56 +0900 Subject: [PATCH 755/878] [ruby/reline] Use IO#write instead of IO#print IO#print always adds a string of $\ automatically. https://github.com/ruby/reline/commit/a93119c847 --- lib/reline.rb | 2 +- lib/reline/ansi.rb | 14 +++++++------- lib/reline/line_editor.rb | 4 ++-- lib/reline/windows.rb | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/reline.rb b/lib/reline.rb index bcb3af58bf780a..3303fb4dd48a91 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -336,7 +336,7 @@ def readline(prompt = '', add_hist = false) @ambiguous_width = 2 if Reline::IOGate == Reline::GeneralIO or STDOUT.is_a?(File) return if ambiguous_width Reline::IOGate.move_cursor_column(0) - print "\u{25bd}" + output.write "\u{25bd}" @ambiguous_width = Reline::IOGate.cursor_pos.x Reline::IOGate.move_cursor_column(0) Reline::IOGate.erase_after_cursor diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb index 99595294252330..3ef02d6e7a903a 100644 --- a/lib/reline/ansi.rb +++ b/lib/reline/ansi.rb @@ -124,12 +124,12 @@ def self.cursor_pos end def self.move_cursor_column(x) - print "\e[#{x + 1}G" + @@output.write "\e[#{x + 1}G" end def self.move_cursor_up(x) if x > 0 - print "\e[#{x}A" if x > 0 + @@output.write "\e[#{x}A" if x > 0 elsif x < 0 move_cursor_down(-x) end @@ -137,24 +137,24 @@ def self.move_cursor_up(x) def self.move_cursor_down(x) if x > 0 - print "\e[#{x}B" if x > 0 + @@output.write "\e[#{x}B" if x > 0 elsif x < 0 move_cursor_up(-x) end end def self.erase_after_cursor - print "\e[K" + @@output.write "\e[K" end def self.scroll_down(x) return if x.zero? - print "\e[#{x}S" + @@output.write "\e[#{x}S" end def self.clear_screen - print "\e[2J" - print "\e[1;1H" + @@output.write "\e[2J" + @@output.write "\e[1;1H" end @@old_winch_handler = nil diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index c68847d1d47228..478d1d73f31c9e 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -319,7 +319,7 @@ def rerender @rerender_all = true @menu_info.list.sort!.each do |item| Reline::IOGate.move_cursor_column(0) - @output.print item + @output.write item @output.flush scroll_down(1) end @@ -516,7 +516,7 @@ def rerender end next end - @output.print line + @output.write line if Reline::IOGate.win? and calculate_width(line, true) == Reline::IOGate.get_screen_size.last # A newline is automatically inserted if a character is rendered at eol on command prompt. @rest_height -= 1 if @rest_height > 0 diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb index 22a009ea66f0a5..c229c8536ff94c 100644 --- a/lib/reline/windows.rb +++ b/lib/reline/windows.rb @@ -250,8 +250,8 @@ def self.scroll_down(val) def self.clear_screen # TODO: Use FillConsoleOutputCharacter and FillConsoleOutputAttribute - print "\e[2J" - print "\e[1;1H" + write "\e[2J" + write "\e[1;1H" end def self.set_screen_size(rows, columns) From 79ad50d2194f8d19ef9eb317fea83cfe284a2b08 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sat, 15 Feb 2020 12:13:09 +0900 Subject: [PATCH 756/878] Fix call-seq of Pathname#{,l}ch{mod,own} [ci skip] --- ext/pathname/pathname.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 6b51b15f103f9c..458846db27763d 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -554,7 +554,7 @@ path_mtime(VALUE self) /* * call-seq: - * pathname.chmod -> integer + * pathname.chmod(mode_int) -> integer * * Changes file permissions. * @@ -568,7 +568,7 @@ path_chmod(VALUE self, VALUE mode) /* * call-seq: - * pathname.lchmod -> integer + * pathname.lchmod(mode_int) -> integer * * Same as Pathname.chmod, but does not follow symbolic links. * @@ -582,7 +582,7 @@ path_lchmod(VALUE self, VALUE mode) /* * call-seq: - * pathname.chown -> integer + * pathname.chown(owner_int, group_int) -> integer * * Change owner and group of the file. * @@ -596,7 +596,7 @@ path_chown(VALUE self, VALUE owner, VALUE group) /* * call-seq: - * pathname.lchown -> integer + * pathname.lchown(owner_int, group_int) -> integer * * Same as Pathname.chown, but does not follow symbolic links. * From 2bcfdad006a1daac311f517110db6e221b2fa5d5 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2020 12:14:33 +0900 Subject: [PATCH 757/878] * 2020-02-15 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index f01f829bdc760e..1bb01fbcda5247 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" From fb472ca7adbaceb35aae1b3a6b948720ffc9eb53 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sat, 15 Feb 2020 16:27:03 +0900 Subject: [PATCH 758/878] lib/drb/drb.rb: Use ruby2_keywords for keyword separation [Bug #16634] --- lib/drb/drb.rb | 2 +- test/drb/test_drb.rb | 16 ++++++++++++++++ test/drb/ut_drb.rb | 12 ++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index e2aaf701ce4771..4d3ea364f1065c 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1131,7 +1131,7 @@ def respond_to?(msg_id, priv=false) end # Routes method calls to the referenced remote object. - def method_missing(msg_id, *a, &b) + ruby2_keywords def method_missing(msg_id, *a, &b) if DRb.here?(@uri) obj = DRb.to_obj(@ref) DRb.current_server.check_insecure_method(obj, msg_id) diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb index b792349f28f174..47b2966ae23bac 100644 --- a/test/drb/test_drb.rb +++ b/test/drb/test_drb.rb @@ -349,4 +349,20 @@ def test_immediate_close end end +class TestBug16634 < Test::Unit::TestCase + include DRbBase + + def setup + super + setup_service 'ut_drb.rb' + end + + def test_bug16634 + assert_equal(42, @there.keyword_test1(a: 42)) + assert_equal("default", @there.keyword_test2) + assert_equal(42, @there.keyword_test2(b: 42)) + assert_equal({:a=>42, :b=>42}, @there.keyword_test3(a: 42, b: 42)) + end +end + end diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb index f05d3f8e1fb0ff..7c0603b009b221 100644 --- a/test/drb/ut_drb.rb +++ b/test/drb/ut_drb.rb @@ -148,6 +148,18 @@ def method_missing(msg, *a, &b) end end + def keyword_test1(a:) + a + end + + def keyword_test2(b: "default") + b + end + + def keyword_test3(**opt) + opt + end + private def call_private_method true From 125bcdb5cbcd03f473540a5a5cf2ef8d44433b77 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 15 Feb 2020 17:27:16 +0900 Subject: [PATCH 759/878] [DOC] use local variable like names [ci skip] Use local variable like name as return value which is an instance of that class but not constant itself. --- hash.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/hash.c b/hash.c index 20937d71789643..33bc754c37293f 100644 --- a/hash.c +++ b/hash.c @@ -5301,7 +5301,7 @@ env_keys(void) /* * call-seq: - * ENV.keys -> Array + * ENV.keys -> array * * Returns all variable names in an Array: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5339,7 +5339,7 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj) /* * call-seq: * ENV.each_key { |name| block } -> ENV - * ENV.each_key -> Enumerator + * ENV.each_key -> enumerator * * Yields each environment variable name: * ENV.replace('foo' => '0', 'bar' => '1') # => ENV @@ -5388,7 +5388,7 @@ env_values(void) /* * call-seq: - * ENV.values -> Array + * ENV.values -> array * * Returns all environment variable values in an Array: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5409,7 +5409,7 @@ env_f_values(VALUE _) /* * call-seq: * ENV.each_value { |value| block } -> ENV - * ENV.each_value -> Enumerator + * ENV.each_value -> enumerator * * Yields each environment variable value: * ENV.replace('foo' => '0', 'bar' => '1') # => ENV @@ -5440,9 +5440,9 @@ env_each_value(VALUE ehash) /* * call-seq: * ENV.each { |name, value| block } -> ENV - * ENV.each -> Enumerator + * ENV.each -> enumerator * ENV.each_pair { |name, value| block } -> ENV - * ENV.each_pair -> Enumerator + * ENV.each_pair -> enumerator * * Yields each environment variable name and its value as a 2-element Array: * h = {} @@ -5492,7 +5492,7 @@ env_each_pair(VALUE ehash) /* * call-seq: * ENV.reject! { |name, value| block } -> ENV or nil - * ENV.reject! -> Enumerator + * ENV.reject! -> enumerator * * Similar to ENV.delete_if, but returns +nil+ if no changes were made. * @@ -5538,7 +5538,7 @@ env_reject_bang(VALUE ehash) /* * call-seq: * ENV.delete_if { |name, value| block } -> ENV - * ENV.delete_if -> Enumerator + * ENV.delete_if -> enumerator * * Yields each environment variable name and its value as a 2-element Array, * deleting each environment variable for which the block returns a truthy value, @@ -5565,7 +5565,7 @@ env_delete_if(VALUE ehash) /* * call-seq: - * ENV.values_at(*names) -> Array + * ENV.values_at(*names) -> array * * Returns an Array containing the environment variable values associated with * the given names: @@ -5596,10 +5596,10 @@ env_values_at(int argc, VALUE *argv, VALUE _) /* * call-seq: - * ENV.select { |name, value| block } -> Hash - * ENV.select -> Enumerator - * ENV.filter { |name, value| block } -> Hash - * ENV.filter -> Enumerator + * ENV.select { |name, value| block } -> hash + * ENV.select -> enumerator + * ENV.filter { |name, value| block } -> hash + * ENV.filter -> enumerator * * ENV.filter is an alias for ENV.select. * @@ -5642,9 +5642,9 @@ env_select(VALUE ehash) /* * call-seq: * ENV.select! { |name, value| block } -> ENV or nil - * ENV.select! -> Enumerator + * ENV.select! -> enumerator * ENV.filter! { |name, value| block } -> ENV or nil - * ENV.filter! -> Enumerator + * ENV.filter! -> enumerator * * ENV.filter! is an alias for ENV.select!. * @@ -5703,7 +5703,7 @@ env_select_bang(VALUE ehash) /* * call-seq: * ENV.keep_if { |name, value| block } -> ENV - * ENV.keep_if -> Enumerator + * ENV.keep_if -> enumerator * * Yields each environment variable name and its value as a 2-element Array, * deleting each environment variable for which the block returns +false+ or +nil+, @@ -5840,7 +5840,7 @@ env_inspect(VALUE _) /* * call-seq: - * ENV.to_a -> Array + * ENV.to_a -> array * * Returns the contents of ENV as an Array of 2-element Arrays, * each of which is a name/value pair: @@ -5886,8 +5886,8 @@ env_none(VALUE _) /* * call-seq: - * ENV.length -> Integer - * ENV.size -> Integer + * ENV.length -> integer + * ENV.size -> integer * * Returns the count of environment variables: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5968,7 +5968,7 @@ env_has_key(VALUE env, VALUE key) /* * call-seq: - * ENV.assoc(name) -> Array or nil + * ENV.assoc(name) -> array or nil * * Returns a 2-element Array containing the name and value of the environment variable * for +name+ if it exists: @@ -6151,7 +6151,7 @@ env_to_hash(void) /* * call-seq: - * ENV.to_hash -> Hash + * ENV.to_hash -> hash * * Returns a Hash containing all name/value pairs from ENV: * ENV.replace('foo' => '0', 'bar' => '1') @@ -6184,8 +6184,8 @@ env_to_h(VALUE _) /* * call-seq: - * ENV.reject { |name, value| block } -> Hash - * ENV.reject -> Enumerator + * ENV.reject { |name, value| block } -> hash + * ENV.reject -> enumerator * * Same as ENV.delete_if, but works on (and returns) a copy of the * environment. @@ -6249,7 +6249,7 @@ env_shift(VALUE _) /* * call-seq: - * ENV.invert -> Hash + * ENV.invert -> hash * * Returns a new hash created by using environment variable names as values * and values as names. From 05485868cbd1e7a59063d5b4be2ee2313ac9fa25 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 15 Feb 2020 20:28:29 +0900 Subject: [PATCH 760/878] Workaround for bison provided by scoop on mswin environment --- common.mk | 1 + ext/ripper/depend | 1 + tool/pure_parser.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index a2cc189a4e0858..f1bd19c7bb04bc 100644 --- a/common.mk +++ b/common.mk @@ -865,6 +865,7 @@ PHONY: $(ECHO) generating $@ $(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y $(Q)$(BASERUBY) $(srcdir)/tool/pure_parser.rb parse.tmp.y $(YACC) + $(Q)$(RM) parse.tmp.y.bak $(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y $(Q)$(RM) parse.tmp.y $(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new diff --git a/ext/ripper/depend b/ext/ripper/depend index f1fbeaf5c34649..f1ec0facc9b7f7 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -22,6 +22,7 @@ ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse. $(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ \ --vpath=$(VPATH)$(PATH_SEPARATOR)$(top_srcdir) id.h $(top_srcdir)/parse.y > ripper.tmp.y $(Q) $(RUBY) $(top_srcdir)/tool/pure_parser.rb ripper.tmp.y $(BISON) + $(Q) $(RM) ripper.tmp.y.bak $(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@ $(Q) $(RM) ripper.tmp.y diff --git a/tool/pure_parser.rb b/tool/pure_parser.rb index 9ab663830e594b..e4aedfa81b775c 100755 --- a/tool/pure_parser.rb +++ b/tool/pure_parser.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby -pi +#!/usr/bin/ruby -pi.bak BEGIN { require_relative 'lib/colorize' From 12ae7b3369485eea1f556dfc766a040ac1a5a77a Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 14 Feb 2020 22:53:49 +0900 Subject: [PATCH 761/878] [ruby/reline] Version 0.1.3 https://github.com/ruby/reline/commit/ea2b182466 --- lib/reline/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reline/version.rb b/lib/reline/version.rb index 47b29bd9466072..1bf544d74b82c3 100644 --- a/lib/reline/version.rb +++ b/lib/reline/version.rb @@ -1,3 +1,3 @@ module Reline - VERSION = '0.1.2' + VERSION = '0.1.3' end From 8749a678ab0f5ccf41b855e13575c9bacd8c2f7a Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 14 Feb 2020 22:51:58 +0900 Subject: [PATCH 762/878] [ruby/irb] Version 1.2.2 https://github.com/ruby/irb/commit/a71753f15a --- lib/irb/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/irb/version.rb b/lib/irb/version.rb index 9b8bd9b161b4f8..337b14443734a7 100644 --- a/lib/irb/version.rb +++ b/lib/irb/version.rb @@ -11,7 +11,7 @@ # module IRB # :nodoc: - VERSION = "1.2.1" + VERSION = "1.2.2" @RELEASE_VERSION = VERSION - @LAST_UPDATE_DATE = "2019-12-24" + @LAST_UPDATE_DATE = "2020-02-14" end From 38f1e84c37b91ddf9e61428d298eb27bee3bd2bc Mon Sep 17 00:00:00 2001 From: Nick Lewis Date: Fri, 14 Feb 2020 14:30:35 -0800 Subject: [PATCH 763/878] [ruby/irb] Include easter-egg.rb in gemspec `irb` doesn't run because this file isn't included in the gem. https://github.com/ruby/irb/commit/73cda56d25 --- lib/irb/irb.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/irb/irb.gemspec b/lib/irb/irb.gemspec index c910bbb5c55da8..658fe813f15cf5 100644 --- a/lib/irb/irb.gemspec +++ b/lib/irb/irb.gemspec @@ -39,6 +39,7 @@ Gem::Specification.new do |spec| "lib/irb/color.rb", "lib/irb/completion.rb", "lib/irb/context.rb", + "lib/irb/easter-egg.rb", "lib/irb/ext/change-ws.rb", "lib/irb/ext/history.rb", "lib/irb/ext/loader.rb", From 961630126b8081ea57b57cde3184e9ecfd86ff96 Mon Sep 17 00:00:00 2001 From: Nobuhiro IMAI Date: Wed, 12 Feb 2020 19:16:12 +0900 Subject: [PATCH 764/878] [ruby/irb] fix reserved words and completion for them https://github.com/ruby/irb/commit/6184b227ad --- lib/irb/completion.rb | 5 +++-- test/irb/test_completion.rb | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 8c0474dcc50457..723674738dac21 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -17,11 +17,12 @@ module InputCompletor # :nodoc: # Set of reserved words used by Ruby, you should not use these for # constants or variables ReservedWords = %w[ + __ENCODING__ __LINE__ __FILE__ BEGIN END alias and begin break case class - def defined do + def defined? do else elsif end ensure false for if in @@ -255,7 +256,7 @@ def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace else candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s} - conditions |= ReservedWords + candidates |= ReservedWords if doc_namespace candidates.find{ |i| i == input } diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb index d4072fe8923742..a765bbf3a50ecc 100644 --- a/test/irb/test_completion.rb +++ b/test/irb/test_completion.rb @@ -35,5 +35,17 @@ def test_complete_symbol def test_complete_symbol_failure assert_nil(IRB::InputCompletor::PerfectMatchedProc.(":aiueo", bind: binding)) end + + def test_complete_reserved_words + candidates = IRB::InputCompletor.retrieve_completion_data("de", bind: binding) + %w[def defined?].each do |word| + assert_include candidates, word + end + + candidates = IRB::InputCompletor.retrieve_completion_data("__", bind: binding) + %w[__ENCODING__ __LINE__ __FILE__].each do |word| + assert_include candidates, word + end + end end end From 527829423088f09cf2f708be12bb4337d640dc69 Mon Sep 17 00:00:00 2001 From: Masataka Pocke Kuwabara Date: Sun, 16 Feb 2020 00:09:39 +0900 Subject: [PATCH 765/878] Reduce begin-less/end-less range allocation ``` $ cat test.yaml prelude: | def endless 1.. end def beginless ..1 end def endless_substr(str) str[1..] end benchmark: endless: endless beginless: beginless endless_substr: "endless_substr('foo')" $ RBENV_VERSION=trunk ruby -v ruby 2.8.0dev (2020-02-15T12:52:03Z master 961630126b) [x86_64-linux] $ RBENV_VERSION=patched ruby -v ruby 2.8.0dev (2020-02-15T12:52:03Z origin/master 961630126b) [x86_64-linux] $ benchmark-driver test.yaml --rbenv 'patched;trunk' Warming up -------------------------------------- endless 45.948M i/s - 46.076M times in 1.002782s (21.76ns/i, 26clocks/i) beginless 49.986M i/s - 50.237M times in 1.005037s (20.01ns/i, 24clocks/i) endless_substr 8.067M i/s - 8.187M times in 1.014936s (123.96ns/i, 148clocks/i) Calculating ------------------------------------- patched trunk endless 115.679M 21.500M i/s - 137.843M times in 1.191597s 6.411398s beginless 112.599M 22.060M i/s - 149.957M times in 1.331778s 6.797768s endless_substr 8.888M 6.760M i/s - 24.201M times in 2.722995s 3.580038s Comparison: endless patched: 115679391.9 i/s trunk: 21499711.2 i/s - 5.38x slower beginless patched: 112598731.5 i/s trunk: 22059673.0 i/s - 5.10x slower endless_substr patched: 8887513.1 i/s trunk: 6759886.2 i/s - 1.31x slower ``` --- compile.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/compile.c b/compile.c index e9ce106eca48b2..5800a6e8de801e 100644 --- a/compile.c +++ b/compile.c @@ -5178,9 +5178,9 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE } static int -number_literal_p(const NODE *n) +optimizable_range_item_p(const NODE *n) { - return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit)); + return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit)) || (n && nd_type(n) == NODE_NIL); } static int @@ -8307,10 +8307,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in VALUE flag = INT2FIX(excl); const NODE *b = node->nd_beg; const NODE *e = node->nd_end; - if (number_literal_p(b) && number_literal_p(e)) { + if (optimizable_range_item_p(b) && optimizable_range_item_p(e)) { if (!popped) { - VALUE val = rb_range_new(b->nd_lit, e->nd_lit, excl); - ADD_INSN1(ret, line, putobject, val); + VALUE bv = nd_type(b) == NODE_LIT ? b->nd_lit : Qnil; + VALUE ev = nd_type(e) == NODE_LIT ? e->nd_lit : Qnil; + VALUE val = rb_range_new(bv, ev, excl); + ADD_INSN1(ret, line, putobject, val); RB_OBJ_WRITTEN(iseq, Qundef, val); } } From 07179c5c0fdee86650446aa373c3c2d5331600d6 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2020 02:37:34 +0900 Subject: [PATCH 766/878] * 2020-02-16 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 1bb01fbcda5247..47ffd300c26457 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" From 0bfa479c52963b95a47ceab3d453f21b646366a2 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 16 Feb 2020 13:47:18 +0900 Subject: [PATCH 767/878] Split the optimizable range item conditions --- compile.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compile.c b/compile.c index 5800a6e8de801e..ace7a468e952f6 100644 --- a/compile.c +++ b/compile.c @@ -5180,7 +5180,15 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE static int optimizable_range_item_p(const NODE *n) { - return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit)) || (n && nd_type(n) == NODE_NIL); + if (!n) return FALSE; + switch (nd_type(n)) { + case NODE_LIT: + return RB_INTEGER_TYPE_P(n->nd_lit); + case NODE_NIL: + return TRUE; + default: + return FALSE; + } } static int From b99775b163ce44079c1f8727ce9b4ed8bb03489d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 16 Feb 2020 15:21:29 +0900 Subject: [PATCH 768/878] Import openssl-2.2.0 (#2693) Import the master branch of ruby/openssl for preparing to release openssl-2.2.0 --- ext/openssl/History.md | 53 + ext/openssl/depend | 100 +- ext/openssl/deprecation.rb | 8 +- ext/openssl/extconf.rb | 23 +- ext/openssl/lib/openssl.rb | 33 +- ext/openssl/lib/openssl/bn.rb | 2 +- ext/openssl/lib/openssl/buffering.rb | 33 +- ext/openssl/lib/openssl/cipher.rb | 2 +- ext/openssl/lib/openssl/config.rb | 7 +- ext/openssl/lib/openssl/digest.rb | 27 +- ext/openssl/lib/openssl/hmac.rb | 13 + ext/openssl/lib/openssl/pkcs5.rb | 2 +- ext/openssl/lib/openssl/pkey.rb | 2 +- ext/openssl/lib/openssl/ssl.rb | 42 +- ext/openssl/lib/openssl/version.rb | 5 + ext/openssl/lib/openssl/x509.rb | 170 ++- ext/openssl/openssl.gemspec | 47 +- ext/openssl/openssl_missing.h | 37 +- ext/openssl/ossl.c | 54 +- ext/openssl/ossl.h | 7 +- ext/openssl/ossl_asn1.c | 25 + ext/openssl/ossl_bn.c | 5 +- ext/openssl/ossl_cipher.c | 7 +- ext/openssl/ossl_digest.c | 2 - ext/openssl/ossl_engine.c | 3 + ext/openssl/ossl_hmac.c | 14 +- ext/openssl/ossl_kdf.c | 20 +- ext/openssl/ossl_ocsp.c | 15 +- ext/openssl/ossl_ocsp.h | 6 +- ext/openssl/ossl_pkcs7.c | 18 +- ext/openssl/ossl_pkcs7.h | 16 + ext/openssl/ossl_pkey.c | 152 ++- ext/openssl/ossl_pkey_ec.c | 29 + ext/openssl/ossl_pkey_rsa.c | 26 +- ext/openssl/ossl_ssl.c | 113 +- ext/openssl/ossl_ts.c | 1519 ++++++++++++++++++++++++ ext/openssl/ossl_ts.h | 16 + ext/openssl/ossl_version.h | 15 - ext/openssl/ossl_x509ext.c | 14 + ext/openssl/ossl_x509name.c | 10 +- test/openssl/fixtures/chain/dh512.pem | 4 + test/openssl/fixtures/chain/server.crt | 13 + test/openssl/fixtures/chain/server.csr | 11 + test/openssl/fixtures/chain/server.key | 15 + test/openssl/test_asn1.rb | 38 +- test/openssl/test_bn.rb | 10 +- test/openssl/test_buffering.rb | 11 +- test/openssl/test_cipher.rb | 17 +- test/openssl/test_config.rb | 18 +- test/openssl/test_digest.rb | 35 +- test/openssl/test_engine.rb | 2 +- test/openssl/test_fips.rb | 2 +- test/openssl/test_hmac.rb | 12 +- test/openssl/test_kdf.rb | 2 +- test/openssl/test_ns_spki.rb | 4 +- test/openssl/test_ocsp.rb | 3 +- test/openssl/test_ossl.rb | 62 + test/openssl/test_pair.rb | 14 +- test/openssl/test_pkcs12.rb | 2 +- test/openssl/test_pkcs7.rb | 24 +- test/openssl/test_pkey_dh.rb | 2 +- test/openssl/test_pkey_dsa.rb | 2 +- test/openssl/test_pkey_ec.rb | 18 +- test/openssl/test_pkey_rsa.rb | 142 ++- test/openssl/test_random.rb | 2 +- test/openssl/test_ssl.rb | 128 +- test/openssl/test_ssl_session.rb | 2 +- test/openssl/test_ts.rb | 667 +++++++++++ test/openssl/test_x509attr.rb | 12 +- test/openssl/test_x509cert.rb | 93 +- test/openssl/test_x509crl.rb | 27 +- test/openssl/test_x509ext.rb | 15 +- test/openssl/test_x509name.rb | 32 +- test/openssl/test_x509req.rb | 9 +- test/openssl/test_x509store.rb | 2 +- test/openssl/ut_eof.rb | 10 +- test/openssl/utils.rb | 92 +- 77 files changed, 3905 insertions(+), 341 deletions(-) create mode 100644 ext/openssl/lib/openssl/hmac.rb create mode 100644 ext/openssl/lib/openssl/version.rb create mode 100644 ext/openssl/ossl_ts.c create mode 100644 ext/openssl/ossl_ts.h delete mode 100644 ext/openssl/ossl_version.h create mode 100644 test/openssl/fixtures/chain/dh512.pem create mode 100644 test/openssl/fixtures/chain/server.crt create mode 100644 test/openssl/fixtures/chain/server.csr create mode 100644 test/openssl/fixtures/chain/server.key create mode 100644 test/openssl/test_ossl.rb create mode 100644 test/openssl/test_ts.rb diff --git a/ext/openssl/History.md b/ext/openssl/History.md index db5050014e24f1..cdb44b1293a03a 100644 --- a/ext/openssl/History.md +++ b/ext/openssl/History.md @@ -1,3 +1,56 @@ +Version 2.2.0 (not yet released) +============= + +* Change default `OpenSSL::SSL::SSLServer#listen` backlog argument from + 5 to `Socket::SOMAXCONN`. +* Make `OpenSSL::HMAC#==` use a timing safe string comparison. +* Remove unsupported MDC2, DSS, DSS1, and SHA algorithms. +* Add support for SHA3 and BLAKE digests. +* Add `OpenSSL::SSL::SSLSocket.open` for opening a `TCPSocket` and + returning an `OpenSSL::SSL::SSLSocket` for it. +* Support marshalling of `OpenSSL::X509` objects. +* Add `OpenSSL.secure_compare` for timing safe string comparison for + strings of possibly unequal length. +* Add `OpenSSL.fixed_length_secure_compare` for timing safe string + comparison for strings of equal length. +* Add `OpenSSL::SSL::SSLSocket#{finished_message,peer_finished_message}` + for last finished message sent and received. +* Add `OpenSSL::Timestamp` module for handing timestamp requests and + responses. +* Add helper methods for `OpenSSL::X509::Certificate`: + `find_extension`, `subject_key_identifier`, + `authority_key_identifier`, `crl_uris`, `ca_issuer_uris` and + `ocsp_uris`. +* Add helper methods for `OpenSSL::X509::CRL`: + `find_extension` and `subject_key_identifier`. +* Remove `OpenSSL::PKCS7::SignerInfo#name` alias for `#issuer`. +* Add `OpenSSL::ECPoint#add` for adding points to an elliptic curve + group. + [[GitHub #261]](https://github.com/ruby/openssl/pull/261) +* Make `OpenSSL::PKey::RSA#{export,to_der}` correctly check `key`, + `factors`, and `crt_params`. + [[GitHub #258]](https://github.com/ruby/openssl/pull/258) +* Add `OpenSSL::SSL::{SSLSocket,SSLServer}#fileno`, returning the + underlying socket file descriptor number. + [[GitHub #247]](https://github.com/ruby/openssl/pull/247) +* Support client certificates with TLS 1.3, and support post-handshake + authentication with OpenSSL 1.1.1+. + [[GitHub #239]](https://github.com/ruby/openssl/pull/239) +* Add `OpenSSL::ASN1::ObjectId#==` for equality testing. +* Add `OpenSSL::X509::Extension#value_der` for the raw value of + the extension. + [[GitHub #234]](https://github.com/ruby/openssl/pull/234) +* Signficantly reduce allocated memory in `OpenSSL::Buffering#do_write`. + [[GitHub #212]](https://github.com/ruby/openssl/pull/212) +* Ensure all valid IPv6 addresses are considered valid as elements + of subjectAlternativeName in certificates. + [[GitHub #185]](https://github.com/ruby/openssl/pull/185) +* Allow recipient's certificate to be omitted in PCKS7#decrypt. + [[GitHub #183]](https://github.com/ruby/openssl/pull/183) +* Add support for reading keys in PKCS8 format and export via instance methods + added to `OpenSSL::PKey` classes: `private_to_der`, `private_to_pem`, + `public_to_der` and `public_to_pem`. + Version 2.1.2 ============= diff --git a/ext/openssl/depend b/ext/openssl/depend index 68cf357294fe91..943f4f4e47fe5d 100644 --- a/ext/openssl/depend +++ b/ext/openssl/depend @@ -39,7 +39,7 @@ ossl.o: ossl_pkcs7.h ossl.o: ossl_pkey.h ossl.o: ossl_rand.h ossl.o: ossl_ssl.h -ossl.o: ossl_version.h +ossl.o: ossl_ts.h ossl.o: ossl_x509.h ossl.o: ruby_missing.h ossl_asn1.o: $(RUBY_EXTCONF_H) @@ -77,7 +77,7 @@ ossl_asn1.o: ossl_pkcs7.h ossl_asn1.o: ossl_pkey.h ossl_asn1.o: ossl_rand.h ossl_asn1.o: ossl_ssl.h -ossl_asn1.o: ossl_version.h +ossl_asn1.o: ossl_ts.h ossl_asn1.o: ossl_x509.h ossl_asn1.o: ruby_missing.h ossl_bio.o: $(RUBY_EXTCONF_H) @@ -115,7 +115,7 @@ ossl_bio.o: ossl_pkcs7.h ossl_bio.o: ossl_pkey.h ossl_bio.o: ossl_rand.h ossl_bio.o: ossl_ssl.h -ossl_bio.o: ossl_version.h +ossl_bio.o: ossl_ts.h ossl_bio.o: ossl_x509.h ossl_bio.o: ruby_missing.h ossl_bn.o: $(RUBY_EXTCONF_H) @@ -153,7 +153,7 @@ ossl_bn.o: ossl_pkcs7.h ossl_bn.o: ossl_pkey.h ossl_bn.o: ossl_rand.h ossl_bn.o: ossl_ssl.h -ossl_bn.o: ossl_version.h +ossl_bn.o: ossl_ts.h ossl_bn.o: ossl_x509.h ossl_bn.o: ruby_missing.h ossl_cipher.o: $(RUBY_EXTCONF_H) @@ -191,7 +191,7 @@ ossl_cipher.o: ossl_pkcs7.h ossl_cipher.o: ossl_pkey.h ossl_cipher.o: ossl_rand.h ossl_cipher.o: ossl_ssl.h -ossl_cipher.o: ossl_version.h +ossl_cipher.o: ossl_ts.h ossl_cipher.o: ossl_x509.h ossl_cipher.o: ruby_missing.h ossl_config.o: $(RUBY_EXTCONF_H) @@ -229,7 +229,7 @@ ossl_config.o: ossl_pkcs7.h ossl_config.o: ossl_pkey.h ossl_config.o: ossl_rand.h ossl_config.o: ossl_ssl.h -ossl_config.o: ossl_version.h +ossl_config.o: ossl_ts.h ossl_config.o: ossl_x509.h ossl_config.o: ruby_missing.h ossl_digest.o: $(RUBY_EXTCONF_H) @@ -267,7 +267,7 @@ ossl_digest.o: ossl_pkcs7.h ossl_digest.o: ossl_pkey.h ossl_digest.o: ossl_rand.h ossl_digest.o: ossl_ssl.h -ossl_digest.o: ossl_version.h +ossl_digest.o: ossl_ts.h ossl_digest.o: ossl_x509.h ossl_digest.o: ruby_missing.h ossl_engine.o: $(RUBY_EXTCONF_H) @@ -305,7 +305,7 @@ ossl_engine.o: ossl_pkcs7.h ossl_engine.o: ossl_pkey.h ossl_engine.o: ossl_rand.h ossl_engine.o: ossl_ssl.h -ossl_engine.o: ossl_version.h +ossl_engine.o: ossl_ts.h ossl_engine.o: ossl_x509.h ossl_engine.o: ruby_missing.h ossl_hmac.o: $(RUBY_EXTCONF_H) @@ -343,7 +343,7 @@ ossl_hmac.o: ossl_pkcs7.h ossl_hmac.o: ossl_pkey.h ossl_hmac.o: ossl_rand.h ossl_hmac.o: ossl_ssl.h -ossl_hmac.o: ossl_version.h +ossl_hmac.o: ossl_ts.h ossl_hmac.o: ossl_x509.h ossl_hmac.o: ruby_missing.h ossl_kdf.o: $(RUBY_EXTCONF_H) @@ -381,7 +381,7 @@ ossl_kdf.o: ossl_pkcs7.h ossl_kdf.o: ossl_pkey.h ossl_kdf.o: ossl_rand.h ossl_kdf.o: ossl_ssl.h -ossl_kdf.o: ossl_version.h +ossl_kdf.o: ossl_ts.h ossl_kdf.o: ossl_x509.h ossl_kdf.o: ruby_missing.h ossl_ns_spki.o: $(RUBY_EXTCONF_H) @@ -419,7 +419,7 @@ ossl_ns_spki.o: ossl_pkcs7.h ossl_ns_spki.o: ossl_pkey.h ossl_ns_spki.o: ossl_rand.h ossl_ns_spki.o: ossl_ssl.h -ossl_ns_spki.o: ossl_version.h +ossl_ns_spki.o: ossl_ts.h ossl_ns_spki.o: ossl_x509.h ossl_ns_spki.o: ruby_missing.h ossl_ocsp.o: $(RUBY_EXTCONF_H) @@ -457,7 +457,7 @@ ossl_ocsp.o: ossl_pkcs7.h ossl_ocsp.o: ossl_pkey.h ossl_ocsp.o: ossl_rand.h ossl_ocsp.o: ossl_ssl.h -ossl_ocsp.o: ossl_version.h +ossl_ocsp.o: ossl_ts.h ossl_ocsp.o: ossl_x509.h ossl_ocsp.o: ruby_missing.h ossl_pkcs12.o: $(RUBY_EXTCONF_H) @@ -495,7 +495,7 @@ ossl_pkcs12.o: ossl_pkcs7.h ossl_pkcs12.o: ossl_pkey.h ossl_pkcs12.o: ossl_rand.h ossl_pkcs12.o: ossl_ssl.h -ossl_pkcs12.o: ossl_version.h +ossl_pkcs12.o: ossl_ts.h ossl_pkcs12.o: ossl_x509.h ossl_pkcs12.o: ruby_missing.h ossl_pkcs7.o: $(RUBY_EXTCONF_H) @@ -533,7 +533,7 @@ ossl_pkcs7.o: ossl_pkcs7.h ossl_pkcs7.o: ossl_pkey.h ossl_pkcs7.o: ossl_rand.h ossl_pkcs7.o: ossl_ssl.h -ossl_pkcs7.o: ossl_version.h +ossl_pkcs7.o: ossl_ts.h ossl_pkcs7.o: ossl_x509.h ossl_pkcs7.o: ruby_missing.h ossl_pkey.o: $(RUBY_EXTCONF_H) @@ -571,7 +571,7 @@ ossl_pkey.o: ossl_pkey.c ossl_pkey.o: ossl_pkey.h ossl_pkey.o: ossl_rand.h ossl_pkey.o: ossl_ssl.h -ossl_pkey.o: ossl_version.h +ossl_pkey.o: ossl_ts.h ossl_pkey.o: ossl_x509.h ossl_pkey.o: ruby_missing.h ossl_pkey_dh.o: $(RUBY_EXTCONF_H) @@ -609,7 +609,7 @@ ossl_pkey_dh.o: ossl_pkey.h ossl_pkey_dh.o: ossl_pkey_dh.c ossl_pkey_dh.o: ossl_rand.h ossl_pkey_dh.o: ossl_ssl.h -ossl_pkey_dh.o: ossl_version.h +ossl_pkey_dh.o: ossl_ts.h ossl_pkey_dh.o: ossl_x509.h ossl_pkey_dh.o: ruby_missing.h ossl_pkey_dsa.o: $(RUBY_EXTCONF_H) @@ -647,7 +647,7 @@ ossl_pkey_dsa.o: ossl_pkey.h ossl_pkey_dsa.o: ossl_pkey_dsa.c ossl_pkey_dsa.o: ossl_rand.h ossl_pkey_dsa.o: ossl_ssl.h -ossl_pkey_dsa.o: ossl_version.h +ossl_pkey_dsa.o: ossl_ts.h ossl_pkey_dsa.o: ossl_x509.h ossl_pkey_dsa.o: ruby_missing.h ossl_pkey_ec.o: $(RUBY_EXTCONF_H) @@ -685,7 +685,7 @@ ossl_pkey_ec.o: ossl_pkey.h ossl_pkey_ec.o: ossl_pkey_ec.c ossl_pkey_ec.o: ossl_rand.h ossl_pkey_ec.o: ossl_ssl.h -ossl_pkey_ec.o: ossl_version.h +ossl_pkey_ec.o: ossl_ts.h ossl_pkey_ec.o: ossl_x509.h ossl_pkey_ec.o: ruby_missing.h ossl_pkey_rsa.o: $(RUBY_EXTCONF_H) @@ -723,7 +723,7 @@ ossl_pkey_rsa.o: ossl_pkey.h ossl_pkey_rsa.o: ossl_pkey_rsa.c ossl_pkey_rsa.o: ossl_rand.h ossl_pkey_rsa.o: ossl_ssl.h -ossl_pkey_rsa.o: ossl_version.h +ossl_pkey_rsa.o: ossl_ts.h ossl_pkey_rsa.o: ossl_x509.h ossl_pkey_rsa.o: ruby_missing.h ossl_rand.o: $(RUBY_EXTCONF_H) @@ -761,7 +761,7 @@ ossl_rand.o: ossl_pkey.h ossl_rand.o: ossl_rand.c ossl_rand.o: ossl_rand.h ossl_rand.o: ossl_ssl.h -ossl_rand.o: ossl_version.h +ossl_rand.o: ossl_ts.h ossl_rand.o: ossl_x509.h ossl_rand.o: ruby_missing.h ossl_ssl.o: $(RUBY_EXTCONF_H) @@ -799,7 +799,7 @@ ossl_ssl.o: ossl_pkey.h ossl_ssl.o: ossl_rand.h ossl_ssl.o: ossl_ssl.c ossl_ssl.o: ossl_ssl.h -ossl_ssl.o: ossl_version.h +ossl_ssl.o: ossl_ts.h ossl_ssl.o: ossl_x509.h ossl_ssl.o: ruby_missing.h ossl_ssl_session.o: $(RUBY_EXTCONF_H) @@ -837,9 +837,47 @@ ossl_ssl_session.o: ossl_pkey.h ossl_ssl_session.o: ossl_rand.h ossl_ssl_session.o: ossl_ssl.h ossl_ssl_session.o: ossl_ssl_session.c -ossl_ssl_session.o: ossl_version.h +ossl_ssl_session.o: ossl_ts.h ossl_ssl_session.o: ossl_x509.h ossl_ssl_session.o: ruby_missing.h +ossl_ts.o: $(RUBY_EXTCONF_H) +ossl_ts.o: $(arch_hdrdir)/ruby/config.h +ossl_ts.o: $(hdrdir)/ruby.h +ossl_ts.o: $(hdrdir)/ruby/assert.h +ossl_ts.o: $(hdrdir)/ruby/backward.h +ossl_ts.o: $(hdrdir)/ruby/defines.h +ossl_ts.o: $(hdrdir)/ruby/encoding.h +ossl_ts.o: $(hdrdir)/ruby/intern.h +ossl_ts.o: $(hdrdir)/ruby/io.h +ossl_ts.o: $(hdrdir)/ruby/missing.h +ossl_ts.o: $(hdrdir)/ruby/onigmo.h +ossl_ts.o: $(hdrdir)/ruby/oniguruma.h +ossl_ts.o: $(hdrdir)/ruby/ruby.h +ossl_ts.o: $(hdrdir)/ruby/st.h +ossl_ts.o: $(hdrdir)/ruby/subst.h +ossl_ts.o: $(hdrdir)/ruby/thread.h +ossl_ts.o: openssl_missing.h +ossl_ts.o: ossl.h +ossl_ts.o: ossl_asn1.h +ossl_ts.o: ossl_bio.h +ossl_ts.o: ossl_bn.h +ossl_ts.o: ossl_cipher.h +ossl_ts.o: ossl_config.h +ossl_ts.o: ossl_digest.h +ossl_ts.o: ossl_engine.h +ossl_ts.o: ossl_hmac.h +ossl_ts.o: ossl_kdf.h +ossl_ts.o: ossl_ns_spki.h +ossl_ts.o: ossl_ocsp.h +ossl_ts.o: ossl_pkcs12.h +ossl_ts.o: ossl_pkcs7.h +ossl_ts.o: ossl_pkey.h +ossl_ts.o: ossl_rand.h +ossl_ts.o: ossl_ssl.h +ossl_ts.o: ossl_ts.c +ossl_ts.o: ossl_ts.h +ossl_ts.o: ossl_x509.h +ossl_ts.o: ruby_missing.h ossl_x509.o: $(RUBY_EXTCONF_H) ossl_x509.o: $(arch_hdrdir)/ruby/config.h ossl_x509.o: $(hdrdir)/ruby.h @@ -874,7 +912,7 @@ ossl_x509.o: ossl_pkcs7.h ossl_x509.o: ossl_pkey.h ossl_x509.o: ossl_rand.h ossl_x509.o: ossl_ssl.h -ossl_x509.o: ossl_version.h +ossl_x509.o: ossl_ts.h ossl_x509.o: ossl_x509.c ossl_x509.o: ossl_x509.h ossl_x509.o: ruby_missing.h @@ -912,7 +950,7 @@ ossl_x509attr.o: ossl_pkcs7.h ossl_x509attr.o: ossl_pkey.h ossl_x509attr.o: ossl_rand.h ossl_x509attr.o: ossl_ssl.h -ossl_x509attr.o: ossl_version.h +ossl_x509attr.o: ossl_ts.h ossl_x509attr.o: ossl_x509.h ossl_x509attr.o: ossl_x509attr.c ossl_x509attr.o: ruby_missing.h @@ -950,7 +988,7 @@ ossl_x509cert.o: ossl_pkcs7.h ossl_x509cert.o: ossl_pkey.h ossl_x509cert.o: ossl_rand.h ossl_x509cert.o: ossl_ssl.h -ossl_x509cert.o: ossl_version.h +ossl_x509cert.o: ossl_ts.h ossl_x509cert.o: ossl_x509.h ossl_x509cert.o: ossl_x509cert.c ossl_x509cert.o: ruby_missing.h @@ -988,7 +1026,7 @@ ossl_x509crl.o: ossl_pkcs7.h ossl_x509crl.o: ossl_pkey.h ossl_x509crl.o: ossl_rand.h ossl_x509crl.o: ossl_ssl.h -ossl_x509crl.o: ossl_version.h +ossl_x509crl.o: ossl_ts.h ossl_x509crl.o: ossl_x509.h ossl_x509crl.o: ossl_x509crl.c ossl_x509crl.o: ruby_missing.h @@ -1026,7 +1064,7 @@ ossl_x509ext.o: ossl_pkcs7.h ossl_x509ext.o: ossl_pkey.h ossl_x509ext.o: ossl_rand.h ossl_x509ext.o: ossl_ssl.h -ossl_x509ext.o: ossl_version.h +ossl_x509ext.o: ossl_ts.h ossl_x509ext.o: ossl_x509.h ossl_x509ext.o: ossl_x509ext.c ossl_x509ext.o: ruby_missing.h @@ -1064,7 +1102,7 @@ ossl_x509name.o: ossl_pkcs7.h ossl_x509name.o: ossl_pkey.h ossl_x509name.o: ossl_rand.h ossl_x509name.o: ossl_ssl.h -ossl_x509name.o: ossl_version.h +ossl_x509name.o: ossl_ts.h ossl_x509name.o: ossl_x509.h ossl_x509name.o: ossl_x509name.c ossl_x509name.o: ruby_missing.h @@ -1102,7 +1140,7 @@ ossl_x509req.o: ossl_pkcs7.h ossl_x509req.o: ossl_pkey.h ossl_x509req.o: ossl_rand.h ossl_x509req.o: ossl_ssl.h -ossl_x509req.o: ossl_version.h +ossl_x509req.o: ossl_ts.h ossl_x509req.o: ossl_x509.h ossl_x509req.o: ossl_x509req.c ossl_x509req.o: ruby_missing.h @@ -1140,7 +1178,7 @@ ossl_x509revoked.o: ossl_pkcs7.h ossl_x509revoked.o: ossl_pkey.h ossl_x509revoked.o: ossl_rand.h ossl_x509revoked.o: ossl_ssl.h -ossl_x509revoked.o: ossl_version.h +ossl_x509revoked.o: ossl_ts.h ossl_x509revoked.o: ossl_x509.h ossl_x509revoked.o: ossl_x509revoked.c ossl_x509revoked.o: ruby_missing.h @@ -1178,7 +1216,7 @@ ossl_x509store.o: ossl_pkcs7.h ossl_x509store.o: ossl_pkey.h ossl_x509store.o: ossl_rand.h ossl_x509store.o: ossl_ssl.h -ossl_x509store.o: ossl_version.h +ossl_x509store.o: ossl_ts.h ossl_x509store.o: ossl_x509.h ossl_x509store.o: ossl_x509store.c ossl_x509store.o: ruby_missing.h diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb index afe989ead1f6f8..6af7d562fbd0da 100644 --- a/ext/openssl/deprecation.rb +++ b/ext/openssl/deprecation.rb @@ -1,9 +1,9 @@ -# frozen_string_literal: false +# frozen_string_literal: true module OpenSSL def self.deprecated_warning_flag unless flag = (@deprecated_warning_flag ||= nil) if try_compile("", flag = "-Werror=deprecated-declarations") - $warnflags = "#{@warnflags = $warnflags}" #{flag}" + $warnflags << " #{flag}" else flag = "" end @@ -12,10 +12,6 @@ def self.deprecated_warning_flag flag end - def self.restore_warning_flag - $warnflags = @warnflags - end - def self.check_func(func, header) have_func(func, header, deprecated_warning_flag) end diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 264130bb51de42..344d7596520bd5 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -1,5 +1,5 @@ # -*- coding: us-ascii -*- -# frozen_string_literal: false +# frozen_string_literal: true =begin = Info 'OpenSSL for Ruby 2' project @@ -19,7 +19,7 @@ Logging::message "=== OpenSSL for Ruby configurator ===\n" -# Check with -Werror=deprecated-declarations if available +# Add -Werror=deprecated-declarations to $warnflags if available OpenSSL.deprecated_warning_flag ## @@ -40,6 +40,12 @@ Logging::message "=== Checking for required stuff... ===\n" result = pkg_config("openssl") && have_header("openssl/ssl.h") +if $mingw + append_cflags '-D_FORTIFY_SOURCE=2' + append_ldflags '-fstack-protector' + have_library 'ssp' +end + def find_openssl_library if $mswin || $mingw # required for static OpenSSL libraries @@ -109,7 +115,8 @@ def find_openssl_library # compile options have_func("RAND_egd") engines = %w{builtin_engines openbsd_dev_crypto dynamic 4758cca aep atalla chil - cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni} + cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni + cloudhsm} engines.each { |name| OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h") } @@ -144,6 +151,7 @@ def find_openssl_library OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated have_func("X509_STORE_get_ex_data") have_func("X509_STORE_set_ex_data") +have_func("X509_STORE_get_ex_new_index") have_func("X509_CRL_get0_signature") have_func("X509_REQ_get0_signature") have_func("X509_REVOKED_get0_serialNumber") @@ -164,11 +172,18 @@ def find_openssl_library have_func("SSL_CTX_get_security_level") have_func("X509_get0_notBefore") have_func("SSL_SESSION_get_protocol_version") +have_func("TS_STATUS_INFO_get0_status") +have_func("TS_STATUS_INFO_get0_text") +have_func("TS_STATUS_INFO_get0_failure_info") +have_func("TS_VERIFY_CTS_set_certs") +have_func("TS_VERIFY_CTX_set_store") +have_func("TS_VERIFY_CTX_add_flags") +have_func("TS_RESP_CTX_set_time_cb") have_func("EVP_PBE_scrypt") +have_func("SSL_CTX_set_post_handshake_auth") Logging::message "=== Checking done. ===\n" create_header -OpenSSL.restore_warning_flag create_makefile("openssl") Logging::message "Done.\n" diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb index 09142829205a06..7ba2229a1bce3f 100644 --- a/ext/openssl/lib/openssl.rb +++ b/ext/openssl/lib/openssl.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true =begin = Info 'OpenSSL for Ruby 2' project @@ -12,11 +12,26 @@ require 'openssl.so' -require 'openssl/bn' -require 'openssl/pkey' -require 'openssl/cipher' -require 'openssl/config' -require 'openssl/digest' -require 'openssl/x509' -require 'openssl/ssl' -require 'openssl/pkcs5' +require_relative 'openssl/bn' +require_relative 'openssl/pkey' +require_relative 'openssl/cipher' +require_relative 'openssl/config' +require_relative 'openssl/digest' +require_relative 'openssl/hmac' +require_relative 'openssl/x509' +require_relative 'openssl/ssl' +require_relative 'openssl/pkcs5' + +module OpenSSL + # call-seq: + # OpenSSL.secure_compare(string, string) -> boolean + # + # Constant time memory comparison. Inputs are hashed using SHA-256 to mask + # the length of the secret. Returns +true+ if the strings are identical, + # +false+ otherwise. + def self.secure_compare(a, b) + hashed_a = OpenSSL::Digest::SHA256.digest(a) + hashed_b = OpenSSL::Digest::SHA256.digest(b) + OpenSSL.fixed_length_secure_compare(hashed_a, hashed_b) && a == b + end +end diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb index 8d1ebefb6e4ea4..0a5e11b4c2e269 100644 --- a/ext/openssl/lib/openssl/bn.rb +++ b/ext/openssl/lib/openssl/bn.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # # = Ruby-space definitions that completes C-space funcs for BN diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb index 5d1586e594d1b5..a5f4241bf4518d 100644 --- a/ext/openssl/lib/openssl/buffering.rb +++ b/ext/openssl/lib/openssl/buffering.rb @@ -1,5 +1,5 @@ # coding: binary -# frozen_string_literal: false +# frozen_string_literal: true #-- #= Info # 'OpenSSL for Ruby 2' project @@ -22,6 +22,29 @@ module OpenSSL::Buffering include Enumerable + # A buffer which will retain binary encoding. + class Buffer < String + BINARY = Encoding::BINARY + + def initialize + super + + force_encoding(BINARY) + end + + def << string + if string.encoding == BINARY + super(string) + else + super(string.b) + end + + return self + end + + alias concat << + end + ## # The "sync mode" of the SSLSocket. # @@ -40,7 +63,7 @@ module OpenSSL::Buffering def initialize(*) super @eof = false - @rbuffer = "" + @rbuffer = Buffer.new @sync = @io.sync end @@ -312,7 +335,7 @@ def eof? # buffer is flushed to the underlying socket. def do_write(s) - @wbuffer = "" unless defined? @wbuffer + @wbuffer = Buffer.new unless defined? @wbuffer @wbuffer << s @wbuffer.force_encoding(Encoding::BINARY) @sync ||= false @@ -398,7 +421,7 @@ def <<(s) # See IO#puts for full details. def puts(*args) - s = "" + s = Buffer.new if args.empty? s << "\n" end @@ -416,7 +439,7 @@ def puts(*args) # See IO#print for full details. def print(*args) - s = "" + s = Buffer.new args.each{ |arg| s << arg.to_s } do_write(s) nil diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb index af721b3a803bb4..8ad8c35dd30264 100644 --- a/ext/openssl/lib/openssl/cipher.rb +++ b/ext/openssl/lib/openssl/cipher.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # = Ruby-space predefined Cipher subclasses # diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb index 48d8be00694121..ef83c57b20437a 100644 --- a/ext/openssl/lib/openssl/config.rb +++ b/ext/openssl/lib/openssl/config.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true =begin = Ruby-space definitions that completes C-space funcs for Config @@ -53,9 +53,8 @@ def parse(string) def parse_config(io) begin parse_config_lines(io) - rescue ConfigError => e - e.message.replace("error in line #{io.lineno}: " + e.message) - raise + rescue => error + raise ConfigError, "error in line #{io.lineno}: " + error.message end end diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb index b6744de6bd93d8..c95391195431ea 100644 --- a/ext/openssl/lib/openssl/digest.rb +++ b/ext/openssl/lib/openssl/digest.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # = Ruby-space predefined Digest subclasses # @@ -15,11 +15,17 @@ module OpenSSL class Digest - alg = %w(MD2 MD4 MD5 MDC2 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512) - if OPENSSL_VERSION_NUMBER < 0x10100000 - alg += %w(DSS DSS1 SHA) + # You can get a list of all algorithms: + # openssl list -digest-algorithms + + ALGORITHMS = %w(MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512) + + if !OPENSSL_VERSION.include?("LibreSSL") && OPENSSL_VERSION_NUMBER > 0x10101000 + ALGORITHMS.concat %w(BLAKE2b512 BLAKE2s256 SHA3-224 SHA3-256 SHA3-384 SHA3-512) end + ALGORITHMS.freeze + # Return the hash value computed with _name_ Digest. _name_ is either the # long name or short name of a supported digest algorithm. # @@ -35,17 +41,20 @@ def self.digest(name, data) super(data, name) end - alg.each{|name| + ALGORITHMS.each do |name| klass = Class.new(self) { define_method(:initialize, ->(data = nil) {super(name, data)}) } + singleton = (class << klass; self; end) + singleton.class_eval{ - define_method(:digest){|data| new.digest(data) } - define_method(:hexdigest){|data| new.hexdigest(data) } + define_method(:digest) {|data| new.digest(data)} + define_method(:hexdigest) {|data| new.hexdigest(data)} } - const_set(name, klass) - } + + const_set(name.tr('-', '_'), klass) + end # Deprecated. # diff --git a/ext/openssl/lib/openssl/hmac.rb b/ext/openssl/lib/openssl/hmac.rb new file mode 100644 index 00000000000000..3d4427611d51c1 --- /dev/null +++ b/ext/openssl/lib/openssl/hmac.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module OpenSSL + class HMAC + # Securely compare with another HMAC instance in constant time. + def ==(other) + return false unless HMAC === other + return false unless self.digest.bytesize == other.digest.bytesize + + OpenSSL.fixed_length_secure_compare(self.digest, other.digest) + end + end +end diff --git a/ext/openssl/lib/openssl/pkcs5.rb b/ext/openssl/lib/openssl/pkcs5.rb index 959447df5e5ed5..8dedc4beef51c2 100644 --- a/ext/openssl/lib/openssl/pkcs5.rb +++ b/ext/openssl/lib/openssl/pkcs5.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # Ruby/OpenSSL Project # Copyright (C) 2017 Ruby/OpenSSL Project Authors diff --git a/ext/openssl/lib/openssl/pkey.rb b/ext/openssl/lib/openssl/pkey.rb index 8a547c340d40b8..ecb112f7922b91 100644 --- a/ext/openssl/lib/openssl/pkey.rb +++ b/ext/openssl/lib/openssl/pkey.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # Ruby/OpenSSL Project # Copyright (C) 2017 Ruby/OpenSSL Project Authors diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index 355eb2ebbbcb88..8554ada0bb33c1 100644 --- a/ext/openssl/lib/openssl/ssl.rb +++ b/ext/openssl/lib/openssl/ssl.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true =begin = Info 'OpenSSL for Ruby 2' project @@ -13,6 +13,7 @@ require "openssl/buffering" require "io/nonblock" require "ipaddr" +require "socket" module OpenSSL module SSL @@ -231,6 +232,11 @@ def ssl_version=(meth) end module SocketForwarder + # The file descriptor for the socket. + def fileno + to_io.fileno + end + def addr to_io.addr end @@ -435,6 +441,38 @@ def session_new_cb def session_get_cb @context.session_get_cb end + + class << self + + # call-seq: + # open(remote_host, remote_port, local_host=nil, local_port=nil, context: nil) + # + # Creates a new instance of SSLSocket. + # _remote\_host_ and _remote\_port_ are used to open TCPSocket. + # If _local\_host_ and _local\_port_ are specified, + # then those parameters are used on the local end to establish the connection. + # If _context_ is provided, + # the SSL Sockets initial params will be taken from the context. + # + # === Examples + # + # sock = OpenSSL::SSL::SSLSocket.open('localhost', 443) + # sock.connect # Initiates a connection to localhost:443 + # + # with SSLContext: + # + # ctx = OpenSSL::SSL::SSLContext.new + # sock = OpenSSL::SSL::SSLSocket.open('localhost', 443, context: ctx) + # sock.connect # Initiates a connection to localhost:443 with SSLContext + def open(remote_host, remote_port, local_host=nil, local_port=nil, context: nil) + sock = ::TCPSocket.open(remote_host, remote_port, local_host, local_port) + if context.nil? + return OpenSSL::SSL::SSLSocket.new(sock) + else + return OpenSSL::SSL::SSLSocket.new(sock, context) + end + end + end end ## @@ -465,7 +503,7 @@ def to_io end # See TCPServer#listen for details. - def listen(backlog=5) + def listen(backlog=Socket::SOMAXCONN) @svr.listen(backlog) end diff --git a/ext/openssl/lib/openssl/version.rb b/ext/openssl/lib/openssl/version.rb new file mode 100644 index 00000000000000..b07bb330097758 --- /dev/null +++ b/ext/openssl/lib/openssl/version.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +module OpenSSL + VERSION = "2.2.0" unless defined?(VERSION) +end diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb index 98358f90da8215..1d2a5aaca835ab 100644 --- a/ext/openssl/lib/openssl/x509.rb +++ b/ext/openssl/lib/openssl/x509.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # = Ruby-space definitions that completes C-space funcs for X509 and subclasses # @@ -14,6 +14,22 @@ module OpenSSL module X509 + module Marshal + def self.included(base) + base.extend(ClassMethods) + end + + module ClassMethods + def _load(string) + new(string) + end + end + + def _dump(_level) + to_der + end + end + class ExtensionFactory def create_extension(*arg) if arg.size > 1 @@ -41,6 +57,8 @@ def create_ext_from_hash(hash) end class Extension + include Marshal + def ==(other) return false unless Extension === other to_der == other.to_der @@ -60,9 +78,146 @@ def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false} def to_a [ self.oid, self.value, self.critical? ] end + + module Helpers + def find_extension(oid) + extensions.find { |e| e.oid == oid } + end + end + + module SubjectKeyIdentifier + include Helpers + + # Get the subject's key identifier from the subjectKeyIdentifier + # exteension, as described in RFC5280 Section 4.2.1.2. + # + # Returns the binary String key identifier or nil or raises + # ASN1::ASN1Error. + def subject_key_identifier + ext = find_extension("subjectKeyIdentifier") + return nil if ext.nil? + + ski_asn1 = ASN1.decode(ext.value_der) + if ext.critical? || ski_asn1.tag_class != :UNIVERSAL || ski_asn1.tag != ASN1::OCTET_STRING + raise ASN1::ASN1Error, "invalid extension" + end + + ski_asn1.value + end + end + + module AuthorityKeyIdentifier + include Helpers + + # Get the issuing certificate's key identifier from the + # authorityKeyIdentifier extension, as described in RFC5280 + # Section 4.2.1.1 + # + # Returns the binary String keyIdentifier or nil or raises + # ASN1::ASN1Error. + def authority_key_identifier + ext = find_extension("authorityKeyIdentifier") + return nil if ext.nil? + + aki_asn1 = ASN1.decode(ext.value_der) + if ext.critical? || aki_asn1.tag_class != :UNIVERSAL || aki_asn1.tag != ASN1::SEQUENCE + raise ASN1::ASN1Error, "invalid extension" + end + + key_id = aki_asn1.value.find do |v| + v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0 + end + + key_id.nil? ? nil : key_id.value + end + end + + module CRLDistributionPoints + include Helpers + + # Get the distributionPoint fullName URI from the certificate's CRL + # distribution points extension, as described in RFC5280 Section + # 4.2.1.13 + # + # Returns an array of strings or nil or raises ASN1::ASN1Error. + def crl_uris + ext = find_extension("crlDistributionPoints") + return nil if ext.nil? + + cdp_asn1 = ASN1.decode(ext.value_der) + if cdp_asn1.tag_class != :UNIVERSAL || cdp_asn1.tag != ASN1::SEQUENCE + raise ASN1::ASN1Error, "invalid extension" + end + + crl_uris = cdp_asn1.map do |crl_distribution_point| + distribution_point = crl_distribution_point.value.find do |v| + v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0 + end + full_name = distribution_point&.value&.find do |v| + v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0 + end + full_name&.value&.find do |v| + v.tag_class == :CONTEXT_SPECIFIC && v.tag == 6 # uniformResourceIdentifier + end + end + + crl_uris&.map(&:value) + end + end + + module AuthorityInfoAccess + include Helpers + + # Get the information and services for the issuer from the certificate's + # authority information access extension exteension, as described in RFC5280 + # Section 4.2.2.1. + # + # Returns an array of strings or nil or raises ASN1::ASN1Error. + def ca_issuer_uris + aia_asn1 = parse_aia_asn1 + return nil if aia_asn1.nil? + + ca_issuer = aia_asn1.value.select do |authority_info_access| + authority_info_access.value.first.value == "caIssuers" + end + + ca_issuer&.map(&:value)&.map(&:last)&.map(&:value) + end + + # Get the URIs for OCSP from the certificate's authority information access + # extension exteension, as described in RFC5280 Section 4.2.2.1. + # + # Returns an array of strings or nil or raises ASN1::ASN1Error. + def ocsp_uris + aia_asn1 = parse_aia_asn1 + return nil if aia_asn1.nil? + + ocsp = aia_asn1.value.select do |authority_info_access| + authority_info_access.value.first.value == "OCSP" + end + + ocsp&.map(&:value)&.map(&:last)&.map(&:value) + end + + private + + def parse_aia_asn1 + ext = find_extension("authorityInfoAccess") + return nil if ext.nil? + + aia_asn1 = ASN1.decode(ext.value_der) + if ext.critical? || aia_asn1.tag_class != :UNIVERSAL || aia_asn1.tag != ASN1::SEQUENCE + raise ASN1::ASN1Error, "invalid extension" + end + + aia_asn1 + end + end end class Name + include Marshal + module RFC2253DN Special = ',=+<>#;' HexChar = /[0-9a-fA-F]/ @@ -166,6 +321,8 @@ def pretty_print(q) end class Attribute + include Marshal + def ==(other) return false unless Attribute === other to_der == other.to_der @@ -179,6 +336,12 @@ def cleanup end class Certificate + include Marshal + include Extension::SubjectKeyIdentifier + include Extension::AuthorityKeyIdentifier + include Extension::CRLDistributionPoints + include Extension::AuthorityInfoAccess + def pretty_print(q) q.object_group(self) { q.breakable @@ -192,6 +355,9 @@ def pretty_print(q) end class CRL + include Marshal + include Extension::AuthorityKeyIdentifier + def ==(other) return false unless CRL === other to_der == other.to_der @@ -206,6 +372,8 @@ def ==(other) end class Request + include Marshal + def ==(other) return false unless Request === other to_der == other.to_der diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec index 295379fb6c3cfa..471a3c42654f1e 100644 --- a/ext/openssl/openssl.gemspec +++ b/ext/openssl/openssl.gemspec @@ -1,29 +1,26 @@ -# -*- encoding: utf-8 -*- +Gem::Specification.new do |spec| + spec.name = "openssl" + spec.version = "2.2.0" + spec.authors = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"] + spec.email = ["ruby-core@ruby-lang.org"] + spec.summary = %q{OpenSSL provides SSL, TLS and general purpose cryptography.} + spec.description = %q{It wraps the OpenSSL library.} + spec.homepage = "https://github.com/ruby/openssl" + spec.license = "Ruby" -Gem::Specification.new do |s| - s.name = "openssl" - s.version = "2.1.2" + spec.files = Dir["lib/**/*.rb", "ext/**/*.{c,h,rb}", "*.md", "BSDL", "LICENSE.txt"] + spec.require_paths = ["lib"] + spec.extensions = ["ext/openssl/extconf.rb"] - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.metadata = { "msys2_mingw_dependencies" => "openssl" } if s.respond_to? :metadata= - s.require_paths = ["lib"] - s.authors = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"] - s.date = "2018-10-17" - s.description = "It wraps the OpenSSL library." - s.email = ["ruby-core@ruby-lang.org"] - s.extensions = ["ext/openssl/extconf.rb"] - s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "History.md"] - s.files = ["BSDL", "CONTRIBUTING.md", "History.md", "LICENSE.txt", "README.md", "ext/openssl/deprecation.rb", "ext/openssl/extconf.rb", "ext/openssl/openssl_missing.c", "ext/openssl/openssl_missing.h", "ext/openssl/ossl.c", "ext/openssl/ossl.h", "ext/openssl/ossl_asn1.c", "ext/openssl/ossl_asn1.h", "ext/openssl/ossl_bio.c", "ext/openssl/ossl_bio.h", "ext/openssl/ossl_bn.c", "ext/openssl/ossl_bn.h", "ext/openssl/ossl_cipher.c", "ext/openssl/ossl_cipher.h", "ext/openssl/ossl_config.c", "ext/openssl/ossl_config.h", "ext/openssl/ossl_digest.c", "ext/openssl/ossl_digest.h", "ext/openssl/ossl_engine.c", "ext/openssl/ossl_engine.h", "ext/openssl/ossl_hmac.c", "ext/openssl/ossl_hmac.h", "ext/openssl/ossl_kdf.c", "ext/openssl/ossl_kdf.h", "ext/openssl/ossl_ns_spki.c", "ext/openssl/ossl_ns_spki.h", "ext/openssl/ossl_ocsp.c", "ext/openssl/ossl_ocsp.h", "ext/openssl/ossl_pkcs12.c", "ext/openssl/ossl_pkcs12.h", "ext/openssl/ossl_pkcs7.c", "ext/openssl/ossl_pkcs7.h", "ext/openssl/ossl_pkey.c", "ext/openssl/ossl_pkey.h", "ext/openssl/ossl_pkey_dh.c", "ext/openssl/ossl_pkey_dsa.c", "ext/openssl/ossl_pkey_ec.c", "ext/openssl/ossl_pkey_rsa.c", "ext/openssl/ossl_rand.c", "ext/openssl/ossl_rand.h", "ext/openssl/ossl_ssl.c", "ext/openssl/ossl_ssl.h", "ext/openssl/ossl_ssl_session.c", "ext/openssl/ossl_version.h", "ext/openssl/ossl_x509.c", "ext/openssl/ossl_x509.h", "ext/openssl/ossl_x509attr.c", "ext/openssl/ossl_x509cert.c", "ext/openssl/ossl_x509crl.c", "ext/openssl/ossl_x509ext.c", "ext/openssl/ossl_x509name.c", "ext/openssl/ossl_x509req.c", "ext/openssl/ossl_x509revoked.c", "ext/openssl/ossl_x509store.c", "ext/openssl/ruby_missing.h", "lib/openssl.rb", "lib/openssl/bn.rb", "lib/openssl/buffering.rb", "lib/openssl/cipher.rb", "lib/openssl/config.rb", "lib/openssl/digest.rb", "lib/openssl/pkcs5.rb", "lib/openssl/pkey.rb", "lib/openssl/ssl.rb", "lib/openssl/x509.rb"] - s.homepage = "https://github.com/ruby/openssl" - s.licenses = ["Ruby"] - s.rdoc_options = ["--main", "README.md"] - s.required_ruby_version = Gem::Requirement.new(">= 2.3.0") - s.rubygems_version = "3.0.0.beta1" - s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography." + spec.extra_rdoc_files = Dir["*.md"] + spec.rdoc_options = ["--main", "README.md"] - s.add_runtime_dependency("ipaddr", [">= 0"]) - s.add_development_dependency("rake", [">= 0"]) - s.add_development_dependency("rake-compiler", [">= 0"]) - s.add_development_dependency("test-unit", ["~> 3.0"]) - s.add_development_dependency("rdoc", [">= 0"]) + spec.required_ruby_version = ">= 2.3.0" + + spec.add_development_dependency "rake" + spec.add_development_dependency "rake-compiler" + spec.add_development_dependency "test-unit", "~> 3.0" + spec.add_development_dependency "rdoc" + + spec.metadata["msys2_mingw_dependencies"] = "openssl" end diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index 09998214e1d6b4..7d218f86f5e481 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -72,6 +72,9 @@ void ossl_HMAC_CTX_free(HMAC_CTX *); #if !defined(HAVE_X509_STORE_SET_EX_DATA) # define X509_STORE_set_ex_data(x, idx, data) \ CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data)) +#endif + +#if !defined(HAVE_X509_STORE_GET_EX_NEW_INDEX) && !defined(X509_STORE_get_ex_new_index) # define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \ CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \ (newf), (dupf), (freef)) @@ -144,7 +147,8 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, co CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY); #endif -#if !defined(HAVE_OPAQUE_OPENSSL) +#if !defined(HAVE_OPAQUE_OPENSSL) && \ + (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) #define IMPL_PKEY_GETTER(_type, _name) \ static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \ return pkey->pkey._name; } @@ -219,4 +223,35 @@ IMPL_PKEY_GETTER(EC_KEY, ec) # define SSL_SESSION_get_protocol_version(s) ((s)->ssl_version) #endif +#if !defined(HAVE_TS_STATUS_INFO_GET0_STATUS) +# define TS_STATUS_INFO_get0_status(a) ((a)->status) +#endif + +#if !defined(HAVE_TS_STATUS_INFO_GET0_TEXT) +# define TS_STATUS_INFO_get0_text(a) ((a)->text) +#endif + +#if !defined(HAVE_TS_STATUS_INFO_GET0_FAILURE_INFO) +# define TS_STATUS_INFO_get0_failure_info(a) ((a)->failure_info) +#endif + +#if !defined(HAVE_TS_VERIFY_CTS_SET_CERTS) +# define TS_VERIFY_CTS_set_certs(ctx, crts) ((ctx)->certs=(crts)) +#endif + +#if !defined(HAVE_TS_VERIFY_CTX_SET_STORE) +# define TS_VERIFY_CTX_set_store(ctx, str) ((ctx)->store=(str)) +#endif + +#if !defined(HAVE_TS_VERIFY_CTX_ADD_FLAGS) +# define TS_VERIFY_CTX_add_flags(ctx, f) ((ctx)->flags |= (f)) +#endif + +#if !defined(HAVE_TS_RESP_CTX_SET_TIME_CB) +# define TS_RESP_CTX_set_time_cb(ctx, callback, dta) do { \ + (ctx)->time_cb = (callback); \ + (ctx)->time_cb_data = (dta); \ + } while (0) +#endif + #endif /* _OSSL_OPENSSL_MISSING_H_ */ diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index e4196f07547d32..14a7919a93fe66 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -604,6 +604,35 @@ static void Init_ossl_locks(void) } #endif /* !HAVE_OPENSSL_110_THREADING_API */ +/* + * call-seq: + * OpenSSL.fixed_length_secure_compare(string, string) -> boolean + * + * Constant time memory comparison for fixed length strings, such as results + * of HMAC calculations. + * + * Returns +true+ if the strings are identical, +false+ if they are of the same + * length but not identical. If the length is different, +ArgumentError+ is + * raised. + */ +static VALUE +ossl_crypto_fixed_length_secure_compare(VALUE dummy, VALUE str1, VALUE str2) +{ + const unsigned char *p1 = (const unsigned char *)StringValuePtr(str1); + const unsigned char *p2 = (const unsigned char *)StringValuePtr(str2); + long len1 = RSTRING_LEN(str1); + long len2 = RSTRING_LEN(str2); + + if (len1 != len2) { + ossl_raise(rb_eArgError, "inputs must be of equal length"); + } + + switch (CRYPTO_memcmp(p1, p2, len1)) { + case 0: return Qtrue; + default: return Qfalse; + } +} + /* * OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the * OpenSSL[https://www.openssl.org/] library. @@ -635,7 +664,7 @@ static void Init_ossl_locks(void) * ahold of the key may use it unless it is encrypted. In order to securely * export a key you may export it with a pass phrase. * - * cipher = OpenSSL::Cipher.new 'AES-128-CBC' + * cipher = OpenSSL::Cipher.new 'AES-256-CBC' * pass_phrase = 'my secure pass phrase goes here' * * key_secure = key.export cipher, pass_phrase @@ -745,7 +774,7 @@ static void Init_ossl_locks(void) * using PBKDF2. PKCS #5 v2.0 recommends at least 8 bytes for the salt, * the number of iterations largely depends on the hardware being used. * - * cipher = OpenSSL::Cipher.new 'AES-128-CBC' + * cipher = OpenSSL::Cipher.new 'AES-256-CBC' * cipher.encrypt * iv = cipher.random_iv * @@ -768,7 +797,7 @@ static void Init_ossl_locks(void) * Use the same steps as before to derive the symmetric AES key, this time * setting the Cipher up for decryption. * - * cipher = OpenSSL::Cipher.new 'AES-128-CBC' + * cipher = OpenSSL::Cipher.new 'AES-256-CBC' * cipher.decrypt * cipher.iv = iv # the one generated with #random_iv * @@ -803,7 +832,7 @@ static void Init_ossl_locks(void) * * First set up the cipher for encryption * - * encryptor = OpenSSL::Cipher.new 'AES-128-CBC' + * encryptor = OpenSSL::Cipher.new 'AES-256-CBC' * encryptor.encrypt * encryptor.pkcs5_keyivgen pass_phrase, salt * @@ -816,7 +845,7 @@ static void Init_ossl_locks(void) * * Use a new Cipher instance set up for decryption * - * decryptor = OpenSSL::Cipher.new 'AES-128-CBC' + * decryptor = OpenSSL::Cipher.new 'AES-256-CBC' * decryptor.decrypt * decryptor.pkcs5_keyivgen pass_phrase, salt * @@ -833,7 +862,7 @@ static void Init_ossl_locks(void) * signature. * * key = OpenSSL::PKey::RSA.new 2048 - * name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example' + * name = OpenSSL::X509::Name.parse '/CN=nobody/DC=example' * * cert = OpenSSL::X509::Certificate.new * cert.version = 2 @@ -904,7 +933,7 @@ static void Init_ossl_locks(void) * ca_key = OpenSSL::PKey::RSA.new 2048 * pass_phrase = 'my secure pass phrase goes here' * - * cipher = OpenSSL::Cipher.new 'AES-128-CBC' + * cipher = OpenSSL::Cipher.new 'AES-256-CBC' * * open 'ca_key.pem', 'w', 0400 do |io| * io.write ca_key.export(cipher, pass_phrase) @@ -915,7 +944,7 @@ static void Init_ossl_locks(void) * A CA certificate is created the same way we created a certificate above, but * with different extensions. * - * ca_name = OpenSSL::X509::Name.parse 'CN=ca/DC=example' + * ca_name = OpenSSL::X509::Name.parse '/CN=ca/DC=example' * * ca_cert = OpenSSL::X509::Certificate.new * ca_cert.serial = 0 @@ -1125,11 +1154,7 @@ Init_openssl(void) */ mOSSL = rb_define_module("OpenSSL"); rb_global_variable(&mOSSL); - - /* - * OpenSSL ruby extension version - */ - rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION)); + rb_define_singleton_method(mOSSL, "fixed_length_secure_compare", ossl_crypto_fixed_length_secure_compare, 2); /* * Version of OpenSSL the ruby OpenSSL extension was built with @@ -1205,6 +1230,9 @@ Init_openssl(void) Init_ossl_pkey(); Init_ossl_rand(); Init_ossl_ssl(); +#ifndef OPENSSL_NO_TS + Init_ossl_ts(); +#endif Init_ossl_x509(); Init_ossl_ocsp(); Init_ossl_engine(); diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 6af7ddd7d071de..8074afcd7943cc 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -27,6 +27,9 @@ #include #include #include +#ifndef OPENSSL_NO_TS + #include +#endif #include #if !defined(OPENSSL_NO_ENGINE) # include @@ -167,7 +170,9 @@ void ossl_debug(const char *, ...); #include "ossl_pkey.h" #include "ossl_rand.h" #include "ossl_ssl.h" -#include "ossl_version.h" +#ifndef OPENSSL_NO_TS + #include "ossl_ts.h" +#endif #include "ossl_x509.h" #include "ossl_engine.h" #include "ossl_kdf.h" diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 0085d4beaba245..9eb1826f02c4c5 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -1285,6 +1285,30 @@ ossl_asn1obj_get_ln(VALUE self) return ret; } +/* + * call-seq: + * oid == other_oid => true or false + * + * Returns +true+ if _other_oid_ is the same as _oid_ + */ +static VALUE +ossl_asn1obj_eq(VALUE self, VALUE other) +{ + VALUE valSelf, valOther; + int nidSelf, nidOther; + + valSelf = ossl_asn1_get_value(self); + valOther = ossl_asn1_get_value(other); + + if ((nidSelf = OBJ_txt2nid(StringValueCStr(valSelf))) == NID_undef) + ossl_raise(eASN1Error, "OBJ_txt2nid"); + + if ((nidOther = OBJ_txt2nid(StringValueCStr(valOther))) == NID_undef) + ossl_raise(eASN1Error, "OBJ_txt2nid"); + + return nidSelf == nidOther ? Qtrue : Qfalse; +} + static VALUE asn1obj_get_oid_i(VALUE vobj) { @@ -1818,6 +1842,7 @@ do{\ rb_define_method(cASN1ObjectId, "oid", ossl_asn1obj_get_oid, 0); rb_define_alias(cASN1ObjectId, "short_name", "sn"); rb_define_alias(cASN1ObjectId, "long_name", "ln"); + rb_define_method(cASN1ObjectId, "==", ossl_asn1obj_eq, 1); rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, 0); rb_define_method(cASN1EndOfContent, "initialize", ossl_asn1eoc_initialize, 0); diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 6f0064e9661e4a..6493e051e9ee4f 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -173,7 +173,6 @@ ossl_bn_alloc(VALUE klass) /* * call-seq: - * OpenSSL::BN.new => aBN * OpenSSL::BN.new(bn) => aBN * OpenSSL::BN.new(integer) => aBN * OpenSSL::BN.new(string) => aBN @@ -193,6 +192,10 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self) base = NUM2INT(bs); } + if (NIL_P(str)) { + ossl_raise(rb_eArgError, "invalid argument"); + } + if (RB_INTEGER_TYPE_P(str)) { GetBN(self, bn); integer_to_bnptr(str, bn); diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 0840c84a71256c..66bf0beb111344 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -104,7 +104,7 @@ ossl_cipher_alloc(VALUE klass) * call-seq: * Cipher.new(string) -> cipher * - * The string must be a valid cipher name like "AES-128-CBC" or "3DES". + * The string must contain a valid cipher name like "AES-256-CBC". * * A list of cipher names is available by calling OpenSSL::Cipher.ciphers. */ @@ -237,8 +237,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode) ossl_raise(eCipherError, NULL); } - if (p_key) - rb_ivar_set(self, id_key_set, Qtrue); + rb_ivar_set(self, id_key_set, p_key ? Qtrue : Qfalse); return self; } @@ -896,7 +895,7 @@ Init_ossl_cipher(void) * without processing the password further. A simple and secure way to * create a key for a particular Cipher is * - * cipher = OpenSSL::AES256.new(:CFB) + * cipher = OpenSSL::Cipher::AES256.new(:CFB) * cipher.encrypt * key = cipher.random_key # also sets the generated key on the Cipher * diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c index 112ce3364771de..661b230fb7ea2d 100644 --- a/ext/openssl/ossl_digest.c +++ b/ext/openssl/ossl_digest.c @@ -352,8 +352,6 @@ Init_ossl_digest(void) * * SHA, SHA1, SHA224, SHA256, SHA384 and SHA512 * * MD2, MD4, MDC2 and MD5 * * RIPEMD160 - * * DSS, DSS1 (Pseudo algorithms to be used for DSA signatures. DSS is - * equal to SHA and DSS1 is equal to SHA1) * * For each of these algorithms, there is a sub-class of Digest that * can be instantiated as simply as e.g. diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 5ca0d4ca3f1ed0..f90bf061df88b8 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -150,6 +150,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) #if HAVE_ENGINE_LOAD_AESNI OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI); #endif +#if HAVE_ENGINE_LOAD_CLOUDHSM + OSSL_ENGINE_LOAD_IF_MATCH(cloudhsm, CLOUDHSM); +#endif #endif #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO); diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index 564dcab52234d2..2ac2e5c6cea792 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -84,18 +84,12 @@ ossl_hmac_alloc(VALUE klass) * * === A note about comparisons * - * Two instances won't be equal when they're compared, even if they have the - * same value. Use #to_s or #hexdigest to return the authentication code that - * the instance represents. For example: + * Two instances can be securely compared with #== in constant time: * * other_instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1')) - * #=> f42bb0eeb018ebbd4597ae7213711ec60760843f - * instance - * #=> f42bb0eeb018ebbd4597ae7213711ec60760843f - * instance == other_instance - * #=> false - * instance.to_s == other_instance.to_s - * #=> true + * #=> f42bb0eeb018ebbd4597ae7213711ec60760843f + * instance == other_instance + * #=> true * */ static VALUE diff --git a/ext/openssl/ossl_kdf.c b/ext/openssl/ossl_kdf.c index ee124718b512c8..3d0e66b5f52720 100644 --- a/ext/openssl/ossl_kdf.c +++ b/ext/openssl/ossl_kdf.c @@ -284,24 +284,8 @@ Init_ossl_kdf(void) * Typically, "==" short-circuits on evaluation, and is therefore * vulnerable to timing attacks. The proper way is to use a method that * always takes the same amount of time when comparing two values, thus - * not leaking any information to potential attackers. To compare two - * values, the following could be used: - * - * def eql_time_cmp(a, b) - * unless a.length == b.length - * return false - * end - * cmp = b.bytes - * result = 0 - * a.bytes.each_with_index {|c,i| - * result |= c ^ cmp[i] - * } - * result == 0 - * end - * - * Please note that the premature return in case of differing lengths - * typically does not leak valuable information - when using PBKDF2, the - * length of the values to be compared is of fixed size. + * not leaking any information to potential attackers. To do this, use + * +OpenSSL.fixed_length_secure_compare+. */ mKDF = rb_define_module_under(mOSSL, "KDF"); /* diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c index c0237791da9e45..2ca4f62f70f4d1 100644 --- a/ext/openssl/ossl_ocsp.c +++ b/ext/openssl/ossl_ocsp.c @@ -1489,13 +1489,15 @@ ossl_ocspcid_initialize_copy(VALUE self, VALUE other) * call-seq: * OpenSSL::OCSP::CertificateId.new(subject, issuer, digest = nil) -> certificate_id * OpenSSL::OCSP::CertificateId.new(der_string) -> certificate_id + * OpenSSL::OCSP::CertificateId.new(obj) -> certificate_id * * Creates a new OpenSSL::OCSP::CertificateId for the given _subject_ and * _issuer_ X509 certificates. The _digest_ is a digest algorithm that is used * to compute the hash values. This defaults to SHA-1. * * If only one argument is given, decodes it as DER representation of a - * certificate ID. + * certificate ID or generates certificate ID from the object that responds to + * the to_der method. */ static VALUE ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self) @@ -1734,18 +1736,11 @@ Init_ossl_ocsp(void) * To submit the request to the CA for verification we need to extract the * OCSP URI from the subject certificate: * - * authority_info_access = subject.extensions.find do |extension| - * extension.oid == 'authorityInfoAccess' - * end - * - * descriptions = authority_info_access.value.split "\n" - * ocsp = descriptions.find do |description| - * description.start_with? 'OCSP' - * end + * ocsp_uris = subject.ocsp_uris * * require 'uri' * - * ocsp_uri = URI ocsp[/URI:(.*)/, 1] + * ocsp_uri = URI ocsp_uris[0] * * To submit the request we'll POST the request to the OCSP URI (per RFC * 2560). Note that we only handle HTTP requests and don't handle any diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h index 21e2c99a2e3567..6d2aac8657c9d3 100644 --- a/ext/openssl/ossl_ocsp.h +++ b/ext/openssl/ossl_ocsp.h @@ -13,9 +13,9 @@ #if !defined(OPENSSL_NO_OCSP) extern VALUE mOCSP; -extern VALUE cOPCSReq; -extern VALUE cOPCSRes; -extern VALUE cOPCSBasicRes; +extern VALUE cOCSPReq; +extern VALUE cOCSPRes; +extern VALUE cOCSPBasicRes; #endif void Init_ossl_ocsp(void); diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index 28010c81fb7630..ea8e92d1bcbf64 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -9,21 +9,6 @@ */ #include "ossl.h" -#define NewPKCS7(klass) \ - TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0) -#define SetPKCS7(obj, pkcs7) do { \ - if (!(pkcs7)) { \ - ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ - } \ - RTYPEDDATA_DATA(obj) = (pkcs7); \ -} while (0) -#define GetPKCS7(obj, pkcs7) do { \ - TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \ - if (!(pkcs7)) { \ - ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ - } \ -} while (0) - #define NewPKCS7si(klass) \ TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0) #define SetPKCS7si(obj, p7si) do { \ @@ -75,7 +60,7 @@ ossl_pkcs7_free(void *ptr) PKCS7_free(ptr); } -static const rb_data_type_t ossl_pkcs7_type = { +const rb_data_type_t ossl_pkcs7_type = { "OpenSSL/PKCS7", { 0, ossl_pkcs7_free, @@ -1088,7 +1073,6 @@ Init_ossl_pkcs7(void) rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc); rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3); rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0); - rb_define_alias(cPKCS7Signer, "name", "issuer"); rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0); rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0); diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h index 139e00d640ab41..3e1b0946707163 100644 --- a/ext/openssl/ossl_pkcs7.h +++ b/ext/openssl/ossl_pkcs7.h @@ -10,6 +10,22 @@ #if !defined(_OSSL_PKCS7_H_) #define _OSSL_PKCS7_H_ +#define NewPKCS7(klass) \ + TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0) +#define SetPKCS7(obj, pkcs7) do { \ + if (!(pkcs7)) { \ + ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ + } \ + RTYPEDDATA_DATA(obj) = (pkcs7); \ +} while (0) +#define GetPKCS7(obj, pkcs7) do { \ + TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \ + if (!(pkcs7)) { \ + ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ + } \ +} while (0) + +extern const rb_data_type_t ossl_pkcs7_type; extern VALUE cPKCS7; extern VALUE cPKCS7Signer; extern VALUE cPKCS7Recipient; diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index e1fffb2446ffab..fc4cac3bc4045e 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -167,21 +167,27 @@ ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self) pass = ossl_pem_passwd_value(pass); bio = ossl_obj2bio(&data); - if (!(pkey = d2i_PrivateKey_bio(bio, NULL))) { - OSSL_BIO_reset(bio); - if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) { - OSSL_BIO_reset(bio); - if (!(pkey = d2i_PUBKEY_bio(bio, NULL))) { - OSSL_BIO_reset(bio); - pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, (void *)pass); - } - } - } + if ((pkey = d2i_PrivateKey_bio(bio, NULL))) + goto ok; + OSSL_BIO_reset(bio); + if ((pkey = d2i_PKCS8PrivateKey_bio(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) + goto ok; + OSSL_BIO_reset(bio); + if ((pkey = d2i_PUBKEY_bio(bio, NULL))) + goto ok; + OSSL_BIO_reset(bio); + /* PEM_read_bio_PrivateKey() also parses PKCS #8 formats */ + if ((pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) + goto ok; + OSSL_BIO_reset(bio); + if ((pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL))) + goto ok; BIO_free(bio); - if (!pkey) - ossl_raise(ePKeyError, "Could not parse PKey"); + ossl_raise(ePKeyError, "Could not parse PKey"); +ok: + BIO_free(bio); return ossl_pkey_new(pkey); } @@ -293,6 +299,124 @@ ossl_pkey_initialize(VALUE self) return self; } +static VALUE +do_pkcs8_export(int argc, VALUE *argv, VALUE self, int to_der) +{ + EVP_PKEY *pkey; + VALUE cipher, pass; + const EVP_CIPHER *enc = NULL; + BIO *bio; + + GetPKey(self, pkey); + rb_scan_args(argc, argv, "02", &cipher, &pass); + if (argc > 0) { + /* + * TODO: EncryptedPrivateKeyInfo actually has more options. + * Should they be exposed? + */ + enc = ossl_evp_get_cipherbyname(cipher); + pass = ossl_pem_passwd_value(pass); + } + + bio = BIO_new(BIO_s_mem()); + if (!bio) + ossl_raise(ePKeyError, "BIO_new"); + if (to_der) { + if (!i2d_PKCS8PrivateKey_bio(bio, pkey, enc, NULL, 0, + ossl_pem_passwd_cb, (void *)pass)) { + BIO_free(bio); + ossl_raise(ePKeyError, "i2d_PKCS8PrivateKey_bio"); + } + } + else { + if (!PEM_write_bio_PKCS8PrivateKey(bio, pkey, enc, NULL, 0, + ossl_pem_passwd_cb, (void *)pass)) { + BIO_free(bio); + ossl_raise(ePKeyError, "PEM_write_bio_PKCS8PrivateKey"); + } + } + return ossl_membio2str(bio); +} + +/* + * call-seq: + * pkey.private_to_der -> string + * pkey.private_to_der(cipher, password) -> string + * + * Serializes the private key to DER-encoded PKCS #8 format. If called without + * arguments, unencrypted PKCS #8 PrivateKeyInfo format is used. If called with + * a cipher name and a password, PKCS #8 EncryptedPrivateKeyInfo format with + * PBES2 encryption scheme is used. + */ +static VALUE +ossl_pkey_private_to_der(int argc, VALUE *argv, VALUE self) +{ + return do_pkcs8_export(argc, argv, self, 1); +} + +/* + * call-seq: + * pkey.private_to_pem -> string + * pkey.private_to_pem(cipher, password) -> string + * + * Serializes the private key to PEM-encoded PKCS #8 format. See #private_to_der + * for more details. + */ +static VALUE +ossl_pkey_private_to_pem(int argc, VALUE *argv, VALUE self) +{ + return do_pkcs8_export(argc, argv, self, 0); +} + +static VALUE +do_spki_export(VALUE self, int to_der) +{ + EVP_PKEY *pkey; + BIO *bio; + + GetPKey(self, pkey); + bio = BIO_new(BIO_s_mem()); + if (!bio) + ossl_raise(ePKeyError, "BIO_new"); + if (to_der) { + if (!i2d_PUBKEY_bio(bio, pkey)) { + BIO_free(bio); + ossl_raise(ePKeyError, "i2d_PUBKEY_bio"); + } + } + else { + if (!PEM_write_bio_PUBKEY(bio, pkey)) { + BIO_free(bio); + ossl_raise(ePKeyError, "PEM_write_bio_PUBKEY"); + } + } + return ossl_membio2str(bio); +} + +/* + * call-seq: + * pkey.public_to_der -> string + * + * Serializes the public key to DER-encoded X.509 SubjectPublicKeyInfo format. + */ +static VALUE +ossl_pkey_public_to_der(VALUE self) +{ + return do_spki_export(self, 1); +} + +/* + * call-seq: + * pkey.public_to_pem -> string + * + * Serializes the public key to PEM-encoded X.509 SubjectPublicKeyInfo format. + */ +static VALUE +ossl_pkey_public_to_pem(VALUE self) +{ + return do_spki_export(self, 0); +} + /* * call-seq: * pkey.sign(digest, data) -> String @@ -491,6 +615,10 @@ Init_ossl_pkey(void) rb_define_alloc_func(cPKey, ossl_pkey_alloc); rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0); + rb_define_method(cPKey, "private_to_der", ossl_pkey_private_to_der, -1); + rb_define_method(cPKey, "private_to_pem", ossl_pkey_private_to_pem, -1); + rb_define_method(cPKey, "public_to_der", ossl_pkey_public_to_der, 0); + rb_define_method(cPKey, "public_to_pem", ossl_pkey_public_to_pem, 0); rb_define_method(cPKey, "sign", ossl_pkey_sign, 2); rb_define_method(cPKey, "verify", ossl_pkey_verify, 3); diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index 8bb611248b7ecb..fc2bc6c8151467 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -1562,6 +1562,34 @@ ossl_ec_point_to_octet_string(VALUE self, VALUE conversion_form) return str; } +/* + * call-seq: + * point.add(point) => point + * + * Performs elliptic curve point addition. + */ +static VALUE ossl_ec_point_add(VALUE self, VALUE other) +{ + EC_POINT *point_self, *point_other, *point_result; + const EC_GROUP *group; + VALUE group_v = rb_attr_get(self, id_i_group); + VALUE result; + + GetECPoint(self, point_self); + GetECPoint(other, point_other); + GetECGroup(group_v, group); + + result = rb_obj_alloc(cEC_POINT); + ossl_ec_point_initialize(1, &group_v, result); + GetECPoint(result, point_result); + + if (EC_POINT_add(group, point_result, point_self, point_other, ossl_bn_ctx) != 1) { + ossl_raise(eEC_POINT, "EC_POINT_add"); + } + + return result; +} + /* * call-seq: * point.mul(bn1 [, bn2]) => point @@ -1786,6 +1814,7 @@ void Init_ossl_ec(void) /* all the other methods */ rb_define_method(cEC_POINT, "to_octet_string", ossl_ec_point_to_octet_string, 1); + rb_define_method(cEC_POINT, "add", ossl_ec_point_add, 1); rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1); id_i_group = rb_intern("@group"); diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c index 4800fb27108cda..761866c66a155c 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -26,10 +26,10 @@ static inline int RSA_HAS_PRIVATE(RSA *rsa) { - const BIGNUM *p, *q; + const BIGNUM *e, *d; - RSA_get0_factors(rsa, &p, &q); - return p && q; /* d? why? */ + RSA_get0_key(rsa, NULL, &e, &d); + return e && d; } static inline int @@ -341,6 +341,7 @@ static VALUE ossl_rsa_export(int argc, VALUE *argv, VALUE self) { RSA *rsa; + const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp; BIO *out; const EVP_CIPHER *ciph = NULL; VALUE cipher, pass, str; @@ -356,7 +357,10 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self) if (!(out = BIO_new(BIO_s_mem()))) { ossl_raise(eRSAError, NULL); } - if (RSA_HAS_PRIVATE(rsa)) { + RSA_get0_key(rsa, &n, &e, &d); + RSA_get0_factors(rsa, &p, &q); + RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp); + if (n && e && d && p && q && dmp1 && dmq1 && iqmp) { if (!PEM_write_bio_RSAPrivateKey(out, rsa, ciph, NULL, 0, ossl_pem_passwd_cb, (void *)pass)) { BIO_free(out); @@ -383,23 +387,27 @@ static VALUE ossl_rsa_to_der(VALUE self) { RSA *rsa; + const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp; int (*i2d_func)(const RSA *, unsigned char **); - unsigned char *p; + unsigned char *ptr; long len; VALUE str; GetRSA(self, rsa); - if (RSA_HAS_PRIVATE(rsa)) + RSA_get0_key(rsa, &n, &e, &d); + RSA_get0_factors(rsa, &p, &q); + RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp); + if (n && e && d && p && q && dmp1 && dmq1 && iqmp) i2d_func = i2d_RSAPrivateKey; else i2d_func = (int (*)(const RSA *, unsigned char **))i2d_RSA_PUBKEY; if((len = i2d_func(rsa, NULL)) <= 0) ossl_raise(eRSAError, NULL); str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); - if(i2d_func(rsa, &p) < 0) + ptr = (unsigned char *)RSTRING_PTR(str); + if(i2d_func(rsa, &ptr) < 0) ossl_raise(eRSAError, NULL); - ossl_str_adjust(str, p); + ossl_str_adjust(str, ptr); return str; } diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 80a42383f70e27..dfbfbb22ee7130 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -810,6 +810,10 @@ ossl_sslctx_setup(VALUE self) } #endif /* OPENSSL_NO_EC */ +#ifdef HAVE_SSL_CTX_SET_POST_HANDSHAKE_AUTH + SSL_CTX_set_post_handshake_auth(ctx, 1); +#endif + val = rb_attr_get(self, id_i_cert_store); if (!NIL_P(val)) { X509_STORE *store = GetX509StorePtr(val); /* NO NEED TO DUP */ @@ -1318,6 +1322,17 @@ ossl_sslctx_add_certificate(int argc, VALUE *argv, VALUE self) return self; } +static VALUE +ossl_sslctx_add_certificate_chain_file(VALUE self, VALUE path) +{ + StringValue(path); + SSL_CTX *ctx = NULL; + + GetSSLCTX(self, ctx); + + return SSL_CTX_use_certificate_chain_file(ctx, RSTRING_PTR(path)) == 1 ? Qtrue : Qfalse; +} + /* * call-seq: * ctx.session_add(session) -> true | false @@ -1877,18 +1892,24 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock) } } else { - ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread"); + ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread"); - rb_warning("SSL session is not started yet."); - if (nonblock) { + rb_warning("SSL session is not started yet."); +#if defined(RB_PASS_KEYWORDS) + if (nonblock) { VALUE argv[3]; argv[0] = len; argv[1] = str; argv[2] = opts; return rb_funcallv_kw(io, meth, 3, argv, RB_PASS_KEYWORDS); } - else - return rb_funcall(io, meth, 2, len, str); +#else + if (nonblock) { + return rb_funcall(io, meth, 3, len, str, opts); + } +#endif + else + return rb_funcall(io, meth, 2, len, str); } end: @@ -1911,7 +1932,6 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) } /* - * :nodoc: * call-seq: * ssl.sysread_nonblock(length) => string * ssl.sysread_nonblock(length, buffer) => buffer @@ -1976,15 +1996,21 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts) ID meth = nonblock ? rb_intern("write_nonblock") : rb_intern("syswrite"); - rb_warning("SSL session is not started yet."); - if (nonblock) { + rb_warning("SSL session is not started yet."); +#if defined(RB_PASS_KEYWORDS) + if (nonblock) { VALUE argv[2]; argv[0] = str; argv[1] = opts; return rb_funcallv_kw(io, meth, 2, argv, RB_PASS_KEYWORDS); } - else - return rb_funcall(io, meth, 1, str); +#else + if (nonblock) { + return rb_funcall(io, meth, 2, str, opts); + } +#endif + else + return rb_funcall(io, meth, 1, str); } end: @@ -2004,7 +2030,6 @@ ossl_ssl_write(VALUE self, VALUE str) } /* - * :nodoc: * call-seq: * ssl.syswrite_nonblock(string) => Integer * @@ -2022,7 +2047,6 @@ ossl_ssl_write_nonblock(int argc, VALUE *argv, VALUE self) } /* - * :nodoc: * call-seq: * ssl.stop => nil * @@ -2292,6 +2316,56 @@ ossl_ssl_get_verify_result(VALUE self) return INT2NUM(SSL_get_verify_result(ssl)); } +/* + * call-seq: + * ssl.finished_message => "finished message" + * + * Returns the last *Finished* message sent + * + */ +static VALUE +ossl_ssl_get_finished(VALUE self) +{ + SSL *ssl; + + GetSSL(self, ssl); + + char sizer[1]; + size_t len = SSL_get_finished(ssl, sizer, 0); + + if(len == 0) + return Qnil; + + char* buf = ALLOCA_N(char, len); + SSL_get_finished(ssl, buf, len); + return rb_str_new(buf, len); +} + +/* + * call-seq: + * ssl.peer_finished_message => "peer finished message" + * + * Returns the last *Finished* message received + * + */ +static VALUE +ossl_ssl_get_peer_finished(VALUE self) +{ + SSL *ssl; + + GetSSL(self, ssl); + + char sizer[1]; + size_t len = SSL_get_peer_finished(ssl, sizer, 0); + + if(len == 0) + return Qnil; + + char* buf = ALLOCA_N(char, len); + SSL_get_peer_finished(ssl, buf, len); + return rb_str_new(buf, len); +} + /* * call-seq: * ssl.client_ca => [x509name, ...] @@ -2614,13 +2688,13 @@ Init_ossl_ssl(void) rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qtrue); /* - * A callback invoked whenever a new handshake is initiated. May be used - * to disable renegotiation entirely. + * A callback invoked whenever a new handshake is initiated on an + * established connection. May be used to disable renegotiation entirely. * * The callback is invoked with the active SSLSocket. The callback's - * return value is irrelevant, normal return indicates "approval" of the + * return value is ignored. A normal return indicates "approval" of the * renegotiation and will continue the process. To forbid renegotiation - * and to cancel the process, an Error may be raised within the callback. + * and to cancel the process, raise an exception within the callback. * * === Disable client renegotiation * @@ -2628,10 +2702,8 @@ Init_ossl_ssl(void) * renegotiation entirely. You may use a callback as follows to implement * this feature: * - * num_handshakes = 0 * ctx.renegotiation_cb = lambda do |ssl| - * num_handshakes += 1 - * raise RuntimeError.new("Client renegotiation disabled") if num_handshakes > 1 + * raise RuntimeError, "Client renegotiation disabled" * end */ rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse); @@ -2712,6 +2784,7 @@ Init_ossl_ssl(void) rb_define_method(cSSLContext, "enable_fallback_scsv", ossl_sslctx_enable_fallback_scsv, 0); #endif rb_define_method(cSSLContext, "add_certificate", ossl_sslctx_add_certificate, -1); + rb_define_method(cSSLContext, "add_certificate_chain_file", ossl_sslctx_add_certificate_chain_file, 1); rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0); rb_define_alias(cSSLContext, "freeze", "setup"); @@ -2809,6 +2882,8 @@ Init_ossl_ssl(void) rb_define_method(cSSLSocket, "client_ca", ossl_ssl_get_client_ca_list, 0); /* #hostname is defined in lib/openssl/ssl.rb */ rb_define_method(cSSLSocket, "hostname=", ossl_ssl_set_hostname, 1); + rb_define_method(cSSLSocket, "finished_message", ossl_ssl_get_finished, 0); + rb_define_method(cSSLSocket, "peer_finished_message", ossl_ssl_get_peer_finished, 0); # ifdef HAVE_SSL_GET_SERVER_TMP_KEY rb_define_method(cSSLSocket, "tmp_key", ossl_ssl_tmp_key, 0); # endif diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c new file mode 100644 index 00000000000000..24f5289cdbc965 --- /dev/null +++ b/ext/openssl/ossl_ts.c @@ -0,0 +1,1519 @@ +/* + * + * Copyright (C) 2010 Martin Bosslet + * All rights reserved. + */ +/* + * This program is licenced under the same licence as Ruby. + * (See the file 'LICENCE'.) + */ +#include "ossl.h" + +#ifndef OPENSSL_NO_TS + +#define NewTSRequest(klass) \ + TypedData_Wrap_Struct((klass), &ossl_ts_req_type, 0) +#define SetTSRequest(obj, req) do { \ + if (!(req)) { \ + ossl_raise(rb_eRuntimeError, "TS_REQ wasn't initialized."); \ + } \ + RTYPEDDATA_DATA(obj) = (req); \ +} while (0) +#define GetTSRequest(obj, req) do { \ + TypedData_Get_Struct((obj), TS_REQ, &ossl_ts_req_type, (req)); \ + if (!(req)) { \ + ossl_raise(rb_eRuntimeError, "TS_REQ wasn't initialized."); \ + } \ +} while (0) + +#define NewTSResponse(klass) \ + TypedData_Wrap_Struct((klass), &ossl_ts_resp_type, 0) +#define SetTSResponse(obj, resp) do { \ + if (!(resp)) { \ + ossl_raise(rb_eRuntimeError, "TS_RESP wasn't initialized."); \ + } \ + RTYPEDDATA_DATA(obj) = (resp); \ +} while (0) +#define GetTSResponse(obj, resp) do { \ + TypedData_Get_Struct((obj), TS_RESP, &ossl_ts_resp_type, (resp)); \ + if (!(resp)) { \ + ossl_raise(rb_eRuntimeError, "TS_RESP wasn't initialized."); \ + } \ +} while (0) + +#define NewTSTokenInfo(klass) \ + TypedData_Wrap_Struct((klass), &ossl_ts_token_info_type, 0) +#define SetTSTokenInfo(obj, info) do { \ + if (!(info)) { \ + ossl_raise(rb_eRuntimeError, "TS_TST_INFO wasn't initialized."); \ + } \ + RTYPEDDATA_DATA(obj) = (info); \ +} while (0) +#define GetTSTokenInfo(obj, info) do { \ + TypedData_Get_Struct((obj), TS_TST_INFO, &ossl_ts_token_info_type, (info)); \ + if (!(info)) { \ + ossl_raise(rb_eRuntimeError, "TS_TST_INFO wasn't initialized."); \ + } \ +} while (0) + +#define ossl_tsfac_get_default_policy_id(o) rb_attr_get((o),rb_intern("@default_policy_id")) +#define ossl_tsfac_get_serial_number(o) rb_attr_get((o),rb_intern("@serial_number")) +#define ossl_tsfac_get_gen_time(o) rb_attr_get((o),rb_intern("@gen_time")) +#define ossl_tsfac_get_additional_certs(o) rb_attr_get((o),rb_intern("@additional_certs")) +#define ossl_tsfac_get_allowed_digests(o) rb_attr_get((o),rb_intern("@allowed_digests")) + +static VALUE mTimestamp; +static VALUE eTimestampError; +static VALUE cTimestampRequest; +static VALUE cTimestampResponse; +static VALUE cTimestampTokenInfo; +static VALUE cTimestampFactory; +static ID sBAD_ALG, sBAD_REQUEST, sBAD_DATA_FORMAT, sTIME_NOT_AVAILABLE; +static ID sUNACCEPTED_POLICY, sUNACCEPTED_EXTENSION, sADD_INFO_NOT_AVAILABLE; +static ID sSYSTEM_FAILURE; + +static void +ossl_ts_req_free(void *ptr) +{ + TS_REQ_free(ptr); +} + +static const rb_data_type_t ossl_ts_req_type = { + "OpenSSL/Timestamp/Request", + { + 0, ossl_ts_req_free, + }, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY, +}; + +static void +ossl_ts_resp_free(void *ptr) +{ + TS_RESP_free(ptr); +} + +static const rb_data_type_t ossl_ts_resp_type = { + "OpenSSL/Timestamp/Response", + { + 0, ossl_ts_resp_free, + }, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY, +}; + +static void +ossl_ts_token_info_free(void *ptr) +{ + TS_TST_INFO_free(ptr); +} + +static const rb_data_type_t ossl_ts_token_info_type = { + "OpenSSL/Timestamp/TokenInfo", + { + 0, ossl_ts_token_info_free, + }, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY, +}; + +static VALUE +asn1_to_der(void *template, int (*i2d)(void *template, unsigned char **pp)) +{ + VALUE str; + int len; + unsigned char *p; + + if((len = i2d(template, NULL)) <= 0) + ossl_raise(eTimestampError, "Error when encoding to DER"); + str = rb_str_new(0, len); + p = (unsigned char *)RSTRING_PTR(str); + if(i2d(template, &p) <= 0) + ossl_raise(eTimestampError, "Error when encoding to DER"); + rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); + + return str; +} + +static ASN1_OBJECT* +obj_to_asn1obj(VALUE obj) +{ + ASN1_OBJECT *a1obj; + + StringValue(obj); + a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 0); + if(!a1obj) a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 1); + if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID"); + + return a1obj; +} + +static VALUE +get_asn1obj(ASN1_OBJECT *obj) +{ + BIO *out; + VALUE ret; + int nid; + if ((nid = OBJ_obj2nid(obj)) != NID_undef) + ret = rb_str_new2(OBJ_nid2sn(nid)); + else{ + if (!(out = BIO_new(BIO_s_mem()))) + ossl_raise(eX509AttrError, NULL); + i2a_ASN1_OBJECT(out, obj); + ret = ossl_membio2str(out); + } + + return ret; +} + +static VALUE +ossl_ts_req_alloc(VALUE klass) +{ + TS_REQ *req; + VALUE obj; + + obj = NewTSRequest(klass); + if (!(req = TS_REQ_new())) + ossl_raise(eTimestampError, NULL); + SetTSRequest(obj, req); + + /* Defaults */ + TS_REQ_set_version(req, 1); + TS_REQ_set_cert_req(req, 1); + + return obj; +} + +/* + * When creating a Request with the +File+ or +string+ parameter, the + * corresponding +File+ or +string+ must be DER-encoded. + * + * call-seq: + * OpenSSL::Timestamp::Request.new(file) -> request + * OpenSSL::Timestamp::Request.new(string) -> request + * OpenSSL::Timestamp::Request.new -> empty request + */ +static VALUE +ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self) +{ + TS_REQ *ts_req = DATA_PTR(self); + BIO *in; + VALUE arg; + + if(rb_scan_args(argc, argv, "01", &arg) == 0) { + return self; + } + + arg = ossl_to_der_if_possible(arg); + in = ossl_obj2bio(&arg); + ts_req = d2i_TS_REQ_bio(in, &ts_req); + BIO_free(in); + if (!ts_req) + ossl_raise(eTimestampError, "Error when decoding the timestamp request"); + DATA_PTR(self) = ts_req; + + return self; +} + +/* + * Returns the 'short name' of the object identifier that represents the + * algorithm that was used to create the message imprint digest. + * + * call-seq: + * request.get_algorithm -> string or nil + */ +static VALUE +ossl_ts_req_get_algorithm(VALUE self) +{ + TS_REQ *req; + TS_MSG_IMPRINT *mi; + X509_ALGOR *algor; + int algi; + + GetTSRequest(self, req); + mi = TS_REQ_get_msg_imprint(req); + algor = TS_MSG_IMPRINT_get_algo(mi); + algi = OBJ_obj2nid(algor->algorithm); + if (algi == NID_undef || algi == NID_ccitt) + return Qnil; + + return get_asn1obj(algor->algorithm); +} + +/* + * Allows to set the object identifier or the 'short name' of the + * algorithm that was used to create the message imprint digest. + * + * ===Example: + * request.algorithm = "SHA1" + * + * call-seq: + * request.algorithm = "string" -> string + */ +static VALUE +ossl_ts_req_set_algorithm(VALUE self, VALUE algo) +{ + TS_REQ *req; + TS_MSG_IMPRINT *mi; + ASN1_OBJECT *obj; + X509_ALGOR *algor; + + GetTSRequest(self, req); + obj = obj_to_asn1obj(algo); + mi = TS_REQ_get_msg_imprint(req); + algor = TS_MSG_IMPRINT_get_algo(mi); + if (!X509_ALGOR_set0(algor, obj, V_ASN1_NULL, NULL)) { + ASN1_OBJECT_free(obj); + ossl_raise(eTimestampError, "X509_ALGOR_set0"); + } + + return algo; +} + +/* + * Returns the message imprint (digest) of the data to be timestamped. + * + * call-seq: + * request.message_imprint -> string or nil + */ +static VALUE +ossl_ts_req_get_msg_imprint(VALUE self) +{ + TS_REQ *req; + TS_MSG_IMPRINT *mi; + ASN1_OCTET_STRING *hashed_msg; + VALUE ret; + + GetTSRequest(self, req); + mi = TS_REQ_get_msg_imprint(req); + hashed_msg = TS_MSG_IMPRINT_get_msg(mi); + + ret = rb_str_new((const char *)hashed_msg->data, hashed_msg->length); + + return ret; +} + +/* + * Set the message imprint digest. + * + * call-seq: + * request.message_imprint = "string" -> string + */ +static VALUE +ossl_ts_req_set_msg_imprint(VALUE self, VALUE hash) +{ + TS_REQ *req; + TS_MSG_IMPRINT *mi; + StringValue(hash); + + GetTSRequest(self, req); + mi = TS_REQ_get_msg_imprint(req); + if (!TS_MSG_IMPRINT_set_msg(mi, (unsigned char *)RSTRING_PTR(hash), RSTRING_LENINT(hash))) + ossl_raise(eTimestampError, "TS_MSG_IMPRINT_set_msg"); + + return hash; +} + +/* + * Returns the version of this request. +1+ is the default value. + * + * call-seq: + * request.version -> Integer + */ +static VALUE +ossl_ts_req_get_version(VALUE self) +{ + TS_REQ *req; + + GetTSRequest(self, req); + return LONG2NUM(TS_REQ_get_version(req)); +} + +/* + * Sets the version number for this Request. This should be +1+ for compliant + * servers. + * + * call-seq: + * request.version = number -> Integer + */ +static VALUE +ossl_ts_req_set_version(VALUE self, VALUE version) +{ + TS_REQ *req; + long ver; + + if ((ver = NUM2LONG(version)) < 0) + ossl_raise(eTimestampError, "version must be >= 0!"); + GetTSRequest(self, req); + if (!TS_REQ_set_version(req, ver)) + ossl_raise(eTimestampError, "TS_REQ_set_version"); + + return version; +} + +/* + * Returns the 'short name' of the object identifier that represents the + * timestamp policy under which the server shall create the timestamp. + * + * call-seq: + * request.policy_id -> string or nil + */ +static VALUE +ossl_ts_req_get_policy_id(VALUE self) +{ + TS_REQ *req; + + GetTSRequest(self, req); + if (!TS_REQ_get_policy_id(req)) + return Qnil; + return get_asn1obj(TS_REQ_get_policy_id(req)); +} + +/* + * Allows to set the object identifier that represents the + * timestamp policy under which the server shall create the timestamp. This + * may be left +nil+, implying that the timestamp server will issue the + * timestamp using some default policy. + * + * ===Example: + * request.policy_id = "1.2.3.4.5" + * + * call-seq: + * request.policy_id = "string" -> string + */ +static VALUE +ossl_ts_req_set_policy_id(VALUE self, VALUE oid) +{ + TS_REQ *req; + ASN1_OBJECT *obj; + int ok; + + GetTSRequest(self, req); + obj = obj_to_asn1obj(oid); + ok = TS_REQ_set_policy_id(req, obj); + ASN1_OBJECT_free(obj); + if (!ok) + ossl_raise(eTimestampError, "TS_REQ_set_policy_id"); + + return oid; +} + +/* + * Returns the nonce (number used once) that the server shall include in its + * response. + * + * call-seq: + * request.nonce -> BN or nil + */ +static VALUE +ossl_ts_req_get_nonce(VALUE self) +{ + TS_REQ *req; + const ASN1_INTEGER * nonce; + + GetTSRequest(self, req); + if (!(nonce = TS_REQ_get_nonce(req))) + return Qnil; + return asn1integer_to_num(nonce); +} + +/* + * Sets the nonce (number used once) that the server shall include in its + * response. If the nonce is set, the server must return the same nonce value in + * a valid Response. + * + * call-seq: + * request.nonce = number -> BN + */ +static VALUE +ossl_ts_req_set_nonce(VALUE self, VALUE num) +{ + TS_REQ *req; + ASN1_INTEGER *nonce; + int ok; + + GetTSRequest(self, req); + nonce = num_to_asn1integer(num, NULL); + ok = TS_REQ_set_nonce(req, nonce); + ASN1_INTEGER_free(nonce); + if (!ok) + ossl_raise(eTimestampError, NULL); + return num; +} + +/* + * Indicates whether the response shall contain the timestamp authority's + * certificate or not. + * + * call-seq: + * request.cert_requested? -> true or false + */ +static VALUE +ossl_ts_req_get_cert_requested(VALUE self) +{ + TS_REQ *req; + + GetTSRequest(self, req); + return TS_REQ_get_cert_req(req) ? Qtrue: Qfalse; +} + +/* + * Specify whether the response shall contain the timestamp authority's + * certificate or not. The default value is +true+. + * + * call-seq: + * request.cert_requested = boolean -> true or false + */ +static VALUE +ossl_ts_req_set_cert_requested(VALUE self, VALUE requested) +{ + TS_REQ *req; + + GetTSRequest(self, req); + TS_REQ_set_cert_req(req, RTEST(requested)); + + return requested; +} + +/* + * DER-encodes this Request. + * + * call-seq: + * request.to_der -> DER-encoded string + */ +static VALUE +ossl_ts_req_to_der(VALUE self) +{ + TS_REQ *req; + TS_MSG_IMPRINT *mi; + X509_ALGOR *algo; + ASN1_OCTET_STRING *hashed_msg; + + GetTSRequest(self, req); + mi = TS_REQ_get_msg_imprint(req); + + algo = TS_MSG_IMPRINT_get_algo(mi); + if (OBJ_obj2nid(algo->algorithm) == NID_undef) + ossl_raise(eTimestampError, "Message imprint missing algorithm"); + + hashed_msg = TS_MSG_IMPRINT_get_msg(mi); + if (!hashed_msg->length) + ossl_raise(eTimestampError, "Message imprint missing hashed message"); + + return asn1_to_der((void *)req, (int (*)(void *, unsigned char **))i2d_TS_REQ); +} + +static VALUE +ossl_ts_resp_alloc(VALUE klass) +{ + TS_RESP *resp; + VALUE obj; + + obj = NewTSResponse(klass); + if (!(resp = TS_RESP_new())) + ossl_raise(eTimestampError, NULL); + SetTSResponse(obj, resp); + + return obj; +} + +/* + * Creates a Response from a +File+ or +string+ parameter, the + * corresponding +File+ or +string+ must be DER-encoded. Please note + * that Response is an immutable read-only class. If you'd like to create + * timestamps please refer to Factory instead. + * + * call-seq: + * OpenSSL::Timestamp::Response.new(file) -> response + * OpenSSL::Timestamp::Response.new(string) -> response + */ +static VALUE +ossl_ts_resp_initialize(VALUE self, VALUE der) +{ + TS_RESP *ts_resp = DATA_PTR(self); + BIO *in; + + der = ossl_to_der_if_possible(der); + in = ossl_obj2bio(&der); + ts_resp = d2i_TS_RESP_bio(in, &ts_resp); + BIO_free(in); + if (!ts_resp) + ossl_raise(eTimestampError, "Error when decoding the timestamp response"); + DATA_PTR(self) = ts_resp; + + return self; +} + +/* + * Returns one of GRANTED, GRANTED_WITH_MODS, REJECTION, WAITING, + * REVOCATION_WARNING or REVOCATION_NOTIFICATION. A timestamp token has + * been created only in case +status+ is equal to GRANTED or GRANTED_WITH_MODS. + * + * call-seq: + * response.status -> BN (never nil) + */ +static VALUE +ossl_ts_resp_get_status(VALUE self) +{ + TS_RESP *resp; + TS_STATUS_INFO *si; + const ASN1_INTEGER *st; + + GetTSResponse(self, resp); + si = TS_RESP_get_status_info(resp); + st = TS_STATUS_INFO_get0_status(si); + + return asn1integer_to_num(st); +} + +/* + * In cases no timestamp token has been created, this field contains further + * info about the reason why response creation failed. The method returns either + * nil (the request was successful and a timestamp token was created) or one of + * the following: + * * :BAD_ALG - Indicates that the timestamp server rejects the message + * imprint algorithm used in the Request + * * :BAD_REQUEST - Indicates that the timestamp server was not able to process + * the Request properly + * * :BAD_DATA_FORMAT - Indicates that the timestamp server was not able to + * parse certain data in the Request + * * :TIME_NOT_AVAILABLE - Indicates that the server could not access its time + * source + * * :UNACCEPTED_POLICY - Indicates that the requested policy identifier is not + * recognized or supported by the timestamp server + * * :UNACCEPTED_EXTENSIION - Indicates that an extension in the Request is + * not supported by the timestamp server + * * :ADD_INFO_NOT_AVAILABLE -Indicates that additional information requested + * is either not understood or currently not available + * * :SYSTEM_FAILURE - Timestamp creation failed due to an internal error that + * occurred on the timestamp server + * + * call-seq: + * response.failure_info -> nil or symbol + */ +static VALUE +ossl_ts_resp_get_failure_info(VALUE self) +{ + TS_RESP *resp; + TS_STATUS_INFO *si; + + /* The ASN1_BIT_STRING_get_bit changed from 1.0.0. to 1.1.0, making this + * const. */ + #if defined(HAVE_TS_STATUS_INFO_GET0_FAILURE_INFO) + const ASN1_BIT_STRING *fi; + #else + ASN1_BIT_STRING *fi; + #endif + + GetTSResponse(self, resp); + si = TS_RESP_get_status_info(resp); + fi = TS_STATUS_INFO_get0_failure_info(si); + if (!fi) + return Qnil; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_ALG)) + return sBAD_ALG; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_REQUEST)) + return sBAD_REQUEST; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_DATA_FORMAT)) + return sBAD_DATA_FORMAT; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_TIME_NOT_AVAILABLE)) + return sTIME_NOT_AVAILABLE; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_UNACCEPTED_POLICY)) + return sUNACCEPTED_POLICY; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_UNACCEPTED_EXTENSION)) + return sUNACCEPTED_EXTENSION; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_ADD_INFO_NOT_AVAILABLE)) + return sADD_INFO_NOT_AVAILABLE; + if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_SYSTEM_FAILURE)) + return sSYSTEM_FAILURE; + + ossl_raise(eTimestampError, "Unrecognized failure info."); +} + +/* + * In cases of failure this field may contain an array of strings further + * describing the origin of the failure. + * + * call-seq: + * response.status_text -> Array of strings or nil + */ +static VALUE +ossl_ts_resp_get_status_text(VALUE self) +{ + TS_RESP *resp; + TS_STATUS_INFO *si; + const STACK_OF(ASN1_UTF8STRING) *text; + ASN1_UTF8STRING *current; + int i; + VALUE ret = rb_ary_new(); + + GetTSResponse(self, resp); + si = TS_RESP_get_status_info(resp); + if ((text = TS_STATUS_INFO_get0_text(si))) { + for (i = 0; i < sk_ASN1_UTF8STRING_num(text); i++) { + current = sk_ASN1_UTF8STRING_value(text, i); + rb_ary_push(ret, asn1str_to_str(current)); + } + } + + return ret; +} + +/* + * If a timestamp token is present, this returns it in the form of a + * OpenSSL::PKCS7. + * + * call-seq: + * response.token -> nil or OpenSSL::PKCS7 + */ +static VALUE +ossl_ts_resp_get_token(VALUE self) +{ + TS_RESP *resp; + PKCS7 *p7, *copy; + VALUE obj; + + GetTSResponse(self, resp); + if (!(p7 = TS_RESP_get_token(resp))) + return Qnil; + + obj = NewPKCS7(cPKCS7); + + if (!(copy = PKCS7_dup(p7))) + ossl_raise(eTimestampError, NULL); + + SetPKCS7(obj, copy); + + return obj; +} + +/* + * Get the response's token info if present. + * + * call-seq: + * response.token_info -> nil or OpenSSL::Timestamp::TokenInfo + */ +static VALUE +ossl_ts_resp_get_token_info(VALUE self) +{ + TS_RESP *resp; + TS_TST_INFO *info, *copy; + VALUE obj; + + GetTSResponse(self, resp); + if (!(info = TS_RESP_get_tst_info(resp))) + return Qnil; + + obj = NewTSTokenInfo(cTimestampTokenInfo); + + if (!(copy = TS_TST_INFO_dup(info))) + ossl_raise(eTimestampError, NULL); + + SetTSTokenInfo(obj, copy); + + return obj; +} + +/* + * If the Request specified to request the TSA certificate + * (Request#cert_requested = true), then this field contains the + * certificate of the timestamp authority. + * + * call-seq: + * response.tsa_certificate -> OpenSSL::X509::Certificate or nil + */ +static VALUE +ossl_ts_resp_get_tsa_certificate(VALUE self) +{ + TS_RESP *resp; + PKCS7 *p7; + PKCS7_SIGNER_INFO *ts_info; + X509 *cert; + + GetTSResponse(self, resp); + if (!(p7 = TS_RESP_get_token(resp))) + return Qnil; + ts_info = sk_PKCS7_SIGNER_INFO_value(p7->d.sign->signer_info, 0); + cert = PKCS7_cert_from_signer_info(p7, ts_info); + if (!cert) + return Qnil; + return ossl_x509_new(cert); +} + +/* + * Returns the Response in DER-encoded form. + * + * call-seq: + * response.to_der -> string + */ +static VALUE +ossl_ts_resp_to_der(VALUE self) +{ + TS_RESP *resp; + + GetTSResponse(self, resp); + return asn1_to_der((void *)resp, (int (*)(void *, unsigned char **))i2d_TS_RESP); +} + +/* + * Verifies a timestamp token by checking the signature, validating the + * certificate chain implied by tsa_certificate and by checking conformance to + * a given Request. Mandatory parameters are the Request associated to this + * Response, and an OpenSSL::X509::Store of trusted roots. + * + * Intermediate certificates can optionally be supplied for creating the + * certificate chain. These intermediate certificates must all be + * instances of OpenSSL::X509::Certificate. + * + * If validation fails, several kinds of exceptions can be raised: + * * TypeError if types don't fit + * * TimestampError if something is wrong with the timestamp token itself, if + * it is not conformant to the Request, or if validation of the timestamp + * certificate chain fails. + * + * call-seq: + * response.verify(Request, root_store) -> Response + * response.verify(Request, root_store, [intermediate_cert]) -> Response + */ +static VALUE +ossl_ts_resp_verify(int argc, VALUE *argv, VALUE self) +{ + VALUE ts_req, store, intermediates; + TS_RESP *resp; + TS_REQ *req; + X509_STORE *x509st; + TS_VERIFY_CTX *ctx; + STACK_OF(X509) *x509inter = NULL; + PKCS7* p7; + X509 *cert; + int status, i, ok; + + rb_scan_args(argc, argv, "21", &ts_req, &store, &intermediates); + + GetTSResponse(self, resp); + GetTSRequest(ts_req, req); + x509st = GetX509StorePtr(store); + + if (!(ctx = TS_REQ_to_TS_VERIFY_CTX(req, NULL))) { + ossl_raise(eTimestampError, "Error when creating the verification context."); + } + + if (!NIL_P(intermediates)) { + x509inter = ossl_protect_x509_ary2sk(intermediates, &status); + if (status) { + TS_VERIFY_CTX_free(ctx); + rb_jump_tag(status); + } + } else if (!(x509inter = sk_X509_new_null())) { + TS_VERIFY_CTX_free(ctx); + ossl_raise(eTimestampError, "sk_X509_new_null"); + } + + if (!(p7 = TS_RESP_get_token(resp))) { + TS_VERIFY_CTX_free(ctx); + sk_X509_pop_free(x509inter, X509_free); + ossl_raise(eTimestampError, "TS_RESP_get_token"); + } + for (i=0; i < sk_X509_num(p7->d.sign->cert); i++) { + cert = sk_X509_value(p7->d.sign->cert, i); + if (!sk_X509_push(x509inter, cert)) { + sk_X509_pop_free(x509inter, X509_free); + TS_VERIFY_CTX_free(ctx); + ossl_raise(eTimestampError, "sk_X509_push"); + } + X509_up_ref(cert); + } + + TS_VERIFY_CTS_set_certs(ctx, x509inter); + TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE); + TS_VERIFY_CTX_set_store(ctx, x509st); + + ok = TS_RESP_verify_response(ctx, resp); + + /* WORKAROUND: + * X509_STORE can count references, but X509_STORE_free() doesn't check + * this. To prevent our X509_STORE from being freed with our + * TS_VERIFY_CTX we set the store to NULL first. + * Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2) + */ + TS_VERIFY_CTX_set_store(ctx, NULL); + TS_VERIFY_CTX_free(ctx); + + if (!ok) + ossl_raise(eTimestampError, "TS_RESP_verify_response"); + + return self; +} + +static VALUE +ossl_ts_token_info_alloc(VALUE klass) +{ + TS_TST_INFO *info; + VALUE obj; + + obj = NewTSTokenInfo(klass); + if (!(info = TS_TST_INFO_new())) + ossl_raise(eTimestampError, NULL); + SetTSTokenInfo(obj, info); + + return obj; +} + +/* + * Creates a TokenInfo from a +File+ or +string+ parameter, the + * corresponding +File+ or +string+ must be DER-encoded. Please note + * that TokenInfo is an immutable read-only class. If you'd like to create + * timestamps please refer to Factory instead. + * + * call-seq: + * OpenSSL::Timestamp::TokenInfo.new(file) -> token-info + * OpenSSL::Timestamp::TokenInfo.new(string) -> token-info + */ +static VALUE +ossl_ts_token_info_initialize(VALUE self, VALUE der) +{ + TS_TST_INFO *info = DATA_PTR(self); + BIO *in; + + der = ossl_to_der_if_possible(der); + in = ossl_obj2bio(&der); + info = d2i_TS_TST_INFO_bio(in, &info); + BIO_free(in); + if (!info) + ossl_raise(eTimestampError, "Error when decoding the timestamp token info"); + DATA_PTR(self) = info; + + return self; +} + +/* + * Returns the version number of the token info. With compliant servers, + * this value should be +1+ if present. If status is GRANTED or + * GRANTED_WITH_MODS. + * + * call-seq: + * token_info.version -> Integer or nil + */ +static VALUE +ossl_ts_token_info_get_version(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return LONG2NUM(TS_TST_INFO_get_version(info)); +} + +/* + * Returns the timestamp policy object identifier of the policy this timestamp + * was created under. If status is GRANTED or GRANTED_WITH_MODS, this is never + * +nil+. + * + * ===Example: + * id = token_info.policy_id + * puts id -> "1.2.3.4.5" + * + * call-seq: + * token_info.policy_id -> string or nil + */ +static VALUE +ossl_ts_token_info_get_policy_id(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return get_asn1obj(TS_TST_INFO_get_policy_id(info)); +} + +/* + * Returns the 'short name' of the object identifier representing the algorithm + * that was used to derive the message imprint digest. For valid timestamps, + * this is the same value that was already given in the Request. If status is + * GRANTED or GRANTED_WITH_MODS, this is never +nil+. + * + * ===Example: + * algo = token_info.algorithm + * puts algo -> "SHA1" + * + * call-seq: + * token_info.algorithm -> string or nil + */ +static VALUE +ossl_ts_token_info_get_algorithm(VALUE self) +{ + TS_TST_INFO *info; + TS_MSG_IMPRINT *mi; + X509_ALGOR *algo; + + GetTSTokenInfo(self, info); + mi = TS_TST_INFO_get_msg_imprint(info); + algo = TS_MSG_IMPRINT_get_algo(mi); + return get_asn1obj(algo->algorithm); +} + +/* + * Returns the message imprint digest. For valid timestamps, + * this is the same value that was already given in the Request. + * If status is GRANTED or GRANTED_WITH_MODS, this is never +nil+. + * + * ===Example: + * mi = token_info.msg_imprint + * puts mi -> "DEADBEEF" + * + * call-seq: + * token_info.msg_imprint -> string. + */ +static VALUE +ossl_ts_token_info_get_msg_imprint(VALUE self) +{ + TS_TST_INFO *info; + TS_MSG_IMPRINT *mi; + ASN1_OCTET_STRING *hashed_msg; + VALUE ret; + + GetTSTokenInfo(self, info); + mi = TS_TST_INFO_get_msg_imprint(info); + hashed_msg = TS_MSG_IMPRINT_get_msg(mi); + ret = rb_str_new((const char *)hashed_msg->data, hashed_msg->length); + + return ret; +} + +/* + * Returns serial number of the timestamp token. This value shall never be the + * same for two timestamp tokens issued by a dedicated timestamp authority. + * If status is GRANTED or GRANTED_WITH_MODS, this is never +nil+. + * + * call-seq: + * token_info.serial_number -> BN or nil + */ +static VALUE +ossl_ts_token_info_get_serial_number(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return asn1integer_to_num(TS_TST_INFO_get_serial(info)); +} + +/* + * Returns time when this timestamp token was created. If status is GRANTED or + * GRANTED_WITH_MODS, this is never +nil+. + * + * call-seq: + * token_info.gen_time -> Time + */ +static VALUE +ossl_ts_token_info_get_gen_time(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return asn1time_to_time(TS_TST_INFO_get_time(info)); +} + +/* + * If the ordering field is missing, or if the ordering field is present + * and set to false, then the genTime field only indicates the time at + * which the time-stamp token has been created by the TSA. In such a + * case, the ordering of time-stamp tokens issued by the same TSA or + * different TSAs is only possible when the difference between the + * genTime of the first time-stamp token and the genTime of the second + * time-stamp token is greater than the sum of the accuracies of the + * genTime for each time-stamp token. + * + * If the ordering field is present and set to true, every time-stamp + * token from the same TSA can always be ordered based on the genTime + * field, regardless of the genTime accuracy. + * + * call-seq: + * token_info.ordering -> true, falses or nil + */ +static VALUE +ossl_ts_token_info_get_ordering(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return TS_TST_INFO_get_ordering(info) ? Qtrue : Qfalse; +} + +/* + * If the timestamp token is valid then this field contains the same nonce that + * was passed to the timestamp server in the initial Request. + * + * call-seq: + * token_info.nonce -> BN or nil + */ +static VALUE +ossl_ts_token_info_get_nonce(VALUE self) +{ + TS_TST_INFO *info; + const ASN1_INTEGER *nonce; + + GetTSTokenInfo(self, info); + if (!(nonce = TS_TST_INFO_get_nonce(info))) + return Qnil; + + return asn1integer_to_num(nonce); +} + +/* + * Returns the TokenInfo in DER-encoded form. + * + * call-seq: + * token_info.to_der -> string + */ +static VALUE +ossl_ts_token_info_to_der(VALUE self) +{ + TS_TST_INFO *info; + + GetTSTokenInfo(self, info); + return asn1_to_der((void *)info, (int (*)(void *, unsigned char **))i2d_TS_TST_INFO); +} + +static ASN1_INTEGER * +ossl_tsfac_serial_cb(struct TS_resp_ctx *ctx, void *data) +{ + ASN1_INTEGER **snptr = (ASN1_INTEGER **)data; + ASN1_INTEGER *sn = *snptr; + *snptr = NULL; + return sn; +} + +static int +ossl_tsfac_time_cb(struct TS_resp_ctx *ctx, void *data, long *sec, long *usec) +{ + *sec = *((long *)data); + *usec = 0; + return 1; +} + +/* + * Creates a Response with the help of an OpenSSL::PKey, an + * OpenSSL::X509::Certificate and a Request. + * + * Mandatory parameters for timestamp creation that need to be set in the + * Request: + * + * * Request#algorithm + * * Request#message_imprint + * + * Mandatory parameters that need to be set in the Factory: + * * Factory#serial_number + * * Factory#gen_time + * * Factory#allowed_digests + * + * In addition one of either Request#policy_id or Factory#default_policy_id + * must be set. + * + * Raises a TimestampError if creation fails, though successfully created error + * responses may be returned. + * + * call-seq: + * factory.create_timestamp(key, certificate, request) -> Response + */ +static VALUE +ossl_tsfac_create_ts(VALUE self, VALUE key, VALUE certificate, VALUE request) +{ + VALUE serial_number, def_policy_id, gen_time, additional_certs, allowed_digests; + VALUE str; + STACK_OF(X509) *inter_certs; + VALUE tsresp, ret = Qnil; + EVP_PKEY *sign_key; + X509 *tsa_cert; + TS_REQ *req; + TS_RESP *response = NULL; + TS_RESP_CTX *ctx = NULL; + BIO *req_bio; + ASN1_INTEGER *asn1_serial = NULL; + ASN1_OBJECT *def_policy_id_obj = NULL; + long lgen_time; + const char * err_msg = NULL; + int status = 0; + + tsresp = NewTSResponse(cTimestampResponse); + tsa_cert = GetX509CertPtr(certificate); + sign_key = GetPrivPKeyPtr(key); + GetTSRequest(request, req); + + gen_time = ossl_tsfac_get_gen_time(self); + if (!rb_obj_is_instance_of(gen_time, rb_cTime)) { + err_msg = "@gen_time must be a Time."; + goto end; + } + lgen_time = NUM2LONG(rb_funcall(gen_time, rb_intern("to_i"), 0)); + + serial_number = ossl_tsfac_get_serial_number(self); + if (NIL_P(serial_number)) { + err_msg = "@serial_number must be set."; + goto end; + } + asn1_serial = num_to_asn1integer(serial_number, NULL); + + def_policy_id = ossl_tsfac_get_default_policy_id(self); + if (NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req)) { + err_msg = "No policy id in the request and no default policy set"; + goto end; + } + if (!NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req)) { + def_policy_id_obj = (ASN1_OBJECT*)rb_protect((VALUE (*)(VALUE))obj_to_asn1obj, (VALUE)def_policy_id, &status); + if (status) + goto end; + } + + if (!(ctx = TS_RESP_CTX_new())) { + err_msg = "Memory allocation failed."; + goto end; + } + + TS_RESP_CTX_set_serial_cb(ctx, ossl_tsfac_serial_cb, &asn1_serial); + if (!TS_RESP_CTX_set_signer_cert(ctx, tsa_cert)) { + err_msg = "Certificate does not contain the timestamping extension"; + goto end; + } + + additional_certs = ossl_tsfac_get_additional_certs(self); + if (rb_obj_is_kind_of(additional_certs, rb_cArray)) { + inter_certs = ossl_protect_x509_ary2sk(additional_certs, &status); + if (status) + goto end; + + /* this dups the sk_X509 and ups each cert's ref count */ + TS_RESP_CTX_set_certs(ctx, inter_certs); + sk_X509_pop_free(inter_certs, X509_free); + } + + TS_RESP_CTX_set_signer_key(ctx, sign_key); + if (!NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req)) + TS_RESP_CTX_set_def_policy(ctx, def_policy_id_obj); + if (TS_REQ_get_policy_id(req)) + TS_RESP_CTX_set_def_policy(ctx, TS_REQ_get_policy_id(req)); + TS_RESP_CTX_set_time_cb(ctx, ossl_tsfac_time_cb, &lgen_time); + + allowed_digests = ossl_tsfac_get_allowed_digests(self); + if (rb_obj_is_kind_of(allowed_digests, rb_cArray)) { + int i; + VALUE rbmd; + const EVP_MD *md; + + for (i = 0; i < RARRAY_LEN(allowed_digests); i++) { + rbmd = rb_ary_entry(allowed_digests, i); + md = (const EVP_MD *)rb_protect((VALUE (*)(VALUE))ossl_evp_get_digestbyname, rbmd, &status); + if (status) + goto end; + TS_RESP_CTX_add_md(ctx, md); + } + } + + str = rb_protect(ossl_to_der, request, &status); + if (status) + goto end; + + req_bio = (BIO*)rb_protect((VALUE (*)(VALUE))ossl_obj2bio, (VALUE)&str, &status); + if (status) + goto end; + + response = TS_RESP_create_response(ctx, req_bio); + BIO_free(req_bio); + + if (!response) { + err_msg = "Error during response generation"; + goto end; + } + + /* bad responses aren't exceptional, but openssl still sets error + * information. */ + ossl_clear_error(); + + SetTSResponse(tsresp, response); + ret = tsresp; + +end: + ASN1_INTEGER_free(asn1_serial); + ASN1_OBJECT_free(def_policy_id_obj); + TS_RESP_CTX_free(ctx); + if (err_msg) + ossl_raise(eTimestampError, err_msg); + if (status) + rb_jump_tag(status); + return ret; +} + +/* + * INIT + */ +void +Init_ossl_ts(void) +{ + #if 0 + mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */ + #endif + + /* + * Possible return value for +Response#failure_info+. Indicates that the + * timestamp server rejects the message imprint algorithm used in the + * +Request+ + */ + sBAD_ALG = rb_intern("BAD_ALG"); + + /* + * Possible return value for +Response#failure_info+. Indicates that the + * timestamp server was not able to process the +Request+ properly. + */ + sBAD_REQUEST = rb_intern("BAD_REQUEST"); + /* + * Possible return value for +Response#failure_info+. Indicates that the + * timestamp server was not able to parse certain data in the +Request+. + */ + sBAD_DATA_FORMAT = rb_intern("BAD_DATA_FORMAT"); + + sTIME_NOT_AVAILABLE = rb_intern("TIME_NOT_AVAILABLE"); + sUNACCEPTED_POLICY = rb_intern("UNACCEPTED_POLICY"); + sUNACCEPTED_EXTENSION = rb_intern("UNACCEPTED_EXTENSION"); + sADD_INFO_NOT_AVAILABLE = rb_intern("ADD_INFO_NOT_AVAILABLE"); + sSYSTEM_FAILURE = rb_intern("SYSTEM_FAILURE"); + + /* Document-class: OpenSSL::Timestamp + * Provides classes and methods to request, create and validate + * {RFC3161-compliant}[http://www.ietf.org/rfc/rfc3161.txt] timestamps. + * Request may be used to either create requests from scratch or to parse + * existing requests that again can be used to request timestamps from a + * timestamp server, e.g. via the net/http. The resulting timestamp + * response may be parsed using Response. + * + * Please note that Response is read-only and immutable. To create a + * Response, an instance of Factory as well as a valid Request are needed. + * + * ===Create a Response: + * #Assumes ts.p12 is a PKCS#12-compatible file with a private key + * #and a certificate that has an extended key usage of 'timeStamping' + * p12 = OpenSSL::PKCS12.new(File.open('ts.p12', 'rb'), 'pwd') + * md = OpenSSL::Digest::SHA1.new + * hash = md.digest(data) #some binary data to be timestamped + * req = OpenSSL::Timestamp::Request.new + * req.algorithm = 'SHA1' + * req.message_imprint = hash + * req.policy_id = "1.2.3.4.5" + * req.nonce = 42 + * fac = OpenSSL::Timestamp::Factory.new + * fac.gen_time = Time.now + * fac.serial_number = 1 + * timestamp = fac.create_timestamp(p12.key, p12.certificate, req) + * + * ===Verify a timestamp response: + * #Assume we have a timestamp token in a file called ts.der + * ts = OpenSSL::Timestamp::Response.new(File.open('ts.der', 'rb') + * #Assume we have the Request for this token in a file called req.der + * req = OpenSSL::Timestamp::Request.new(File.open('req.der', 'rb') + * # Assume the associated root CA certificate is contained in a + * # DER-encoded file named root.cer + * root = OpenSSL::X509::Certificate.new(File.open('root.cer', 'rb') + * # get the necessary intermediate certificates, available in + * # DER-encoded form in inter1.cer and inter2.cer + * inter1 = OpenSSL::X509::Certificate.new(File.open('inter1.cer', 'rb') + * inter2 = OpenSSL::X509::Certificate.new(File.open('inter2.cer', 'rb') + * ts.verify(req, root, inter1, inter2) -> ts or raises an exception if validation fails + * + */ + mTimestamp = rb_define_module_under(mOSSL, "Timestamp"); + + /* Document-class: OpenSSL::Timestamp::TimestampError + * Generic exception class of the Timestamp module. + */ + eTimestampError = rb_define_class_under(mTimestamp, "TimestampError", eOSSLError); + + /* Document-class: OpenSSL::Timestamp::Response + * Immutable and read-only representation of a timestamp response returned + * from a timestamp server after receiving an associated Request. Allows + * access to specific information about the response but also allows to + * verify the Response. + */ + cTimestampResponse = rb_define_class_under(mTimestamp, "Response", rb_cObject); + rb_define_alloc_func(cTimestampResponse, ossl_ts_resp_alloc); + rb_define_method(cTimestampResponse, "initialize", ossl_ts_resp_initialize, 1); + rb_define_method(cTimestampResponse, "status", ossl_ts_resp_get_status, 0); + rb_define_method(cTimestampResponse, "failure_info", ossl_ts_resp_get_failure_info, 0); + rb_define_method(cTimestampResponse, "status_text", ossl_ts_resp_get_status_text, 0); + rb_define_method(cTimestampResponse, "token", ossl_ts_resp_get_token, 0); + rb_define_method(cTimestampResponse, "token_info", ossl_ts_resp_get_token_info, 0); + rb_define_method(cTimestampResponse, "tsa_certificate", ossl_ts_resp_get_tsa_certificate, 0); + rb_define_method(cTimestampResponse, "to_der", ossl_ts_resp_to_der, 0); + rb_define_method(cTimestampResponse, "verify", ossl_ts_resp_verify, -1); + + /* Document-class: OpenSSL::Timestamp::TokenInfo + * Immutable and read-only representation of a timestamp token info from a + * Response. + */ + cTimestampTokenInfo = rb_define_class_under(mTimestamp, "TokenInfo", rb_cObject); + rb_define_alloc_func(cTimestampTokenInfo, ossl_ts_token_info_alloc); + rb_define_method(cTimestampTokenInfo, "initialize", ossl_ts_token_info_initialize, 1); + rb_define_method(cTimestampTokenInfo, "version", ossl_ts_token_info_get_version, 0); + rb_define_method(cTimestampTokenInfo, "policy_id", ossl_ts_token_info_get_policy_id, 0); + rb_define_method(cTimestampTokenInfo, "algorithm", ossl_ts_token_info_get_algorithm, 0); + rb_define_method(cTimestampTokenInfo, "message_imprint", ossl_ts_token_info_get_msg_imprint, 0); + rb_define_method(cTimestampTokenInfo, "serial_number", ossl_ts_token_info_get_serial_number, 0); + rb_define_method(cTimestampTokenInfo, "gen_time", ossl_ts_token_info_get_gen_time, 0); + rb_define_method(cTimestampTokenInfo, "ordering", ossl_ts_token_info_get_ordering, 0); + rb_define_method(cTimestampTokenInfo, "nonce", ossl_ts_token_info_get_nonce, 0); + rb_define_method(cTimestampTokenInfo, "to_der", ossl_ts_token_info_to_der, 0); + + /* Document-class: OpenSSL::Timestamp::Request + * Allows to create timestamp requests or parse existing ones. A Request is + * also needed for creating timestamps from scratch with Factory. When + * created from scratch, some default values are set: + * * version is set to +1+ + * * cert_requested is set to +true+ + * * algorithm, message_imprint, policy_id, and nonce are set to +false+ + */ + cTimestampRequest = rb_define_class_under(mTimestamp, "Request", rb_cObject); + rb_define_alloc_func(cTimestampRequest, ossl_ts_req_alloc); + rb_define_method(cTimestampRequest, "initialize", ossl_ts_req_initialize, -1); + rb_define_method(cTimestampRequest, "version=", ossl_ts_req_set_version, 1); + rb_define_method(cTimestampRequest, "version", ossl_ts_req_get_version, 0); + rb_define_method(cTimestampRequest, "algorithm=", ossl_ts_req_set_algorithm, 1); + rb_define_method(cTimestampRequest, "algorithm", ossl_ts_req_get_algorithm, 0); + rb_define_method(cTimestampRequest, "message_imprint=", ossl_ts_req_set_msg_imprint, 1); + rb_define_method(cTimestampRequest, "message_imprint", ossl_ts_req_get_msg_imprint, 0); + rb_define_method(cTimestampRequest, "policy_id=", ossl_ts_req_set_policy_id, 1); + rb_define_method(cTimestampRequest, "policy_id", ossl_ts_req_get_policy_id, 0); + rb_define_method(cTimestampRequest, "nonce=", ossl_ts_req_set_nonce, 1); + rb_define_method(cTimestampRequest, "nonce", ossl_ts_req_get_nonce, 0); + rb_define_method(cTimestampRequest, "cert_requested=", ossl_ts_req_set_cert_requested, 1); + rb_define_method(cTimestampRequest, "cert_requested?", ossl_ts_req_get_cert_requested, 0); + rb_define_method(cTimestampRequest, "to_der", ossl_ts_req_to_der, 0); + + /* + * Indicates a successful response. Equal to +0+. + */ + rb_define_const(cTimestampResponse, "GRANTED", INT2NUM(TS_STATUS_GRANTED)); + /* + * Indicates a successful response that probably contains modifications + * from the initial request. Equal to +1+. + */ + rb_define_const(cTimestampResponse, "GRANTED_WITH_MODS", INT2NUM(TS_STATUS_GRANTED_WITH_MODS)); + /* + * Indicates a failure. No timestamp token was created. Equal to +2+. + */ + rb_define_const(cTimestampResponse, "REJECTION", INT2NUM(TS_STATUS_REJECTION)); + /* + * Indicates a failure. No timestamp token was created. Equal to +3+. + */ + rb_define_const(cTimestampResponse, "WAITING", INT2NUM(TS_STATUS_WAITING)); + /* + * Indicates a failure. No timestamp token was created. Revocation of a + * certificate is imminent. Equal to +4+. + */ + rb_define_const(cTimestampResponse, "REVOCATION_WARNING", INT2NUM(TS_STATUS_REVOCATION_WARNING)); + /* + * Indicates a failure. No timestamp token was created. A certificate + * has been revoked. Equal to +5+. + */ + rb_define_const(cTimestampResponse, "REVOCATION_NOTIFICATION", INT2NUM(TS_STATUS_REVOCATION_NOTIFICATION)); + + /* Document-class: OpenSSL::Timestamp::Factory + * + * Used to generate a Response from scratch. + * + * Please bear in mind that the implementation will always apply and prefer + * the policy object identifier given in the request over the default policy + * id specified in the Factory. As a consequence, +default_policy_id+ will + * only be applied if no Request#policy_id was given. But this also means + * that one needs to check the policy identifier in the request manually + * before creating the Response, e.g. to check whether it complies to a + * specific set of acceptable policies. + * + * There exists also the possibility to add certificates (instances of + * OpenSSL::X509::Certificate) besides the timestamping certificate + * that will be included in the resulting timestamp token if + * Request#cert_requested? is +true+. Ideally, one would also include any + * intermediate certificates (the root certificate can be left out - in + * order to trust it any verifying party will have to be in its possession + * anyway). This simplifies validation of the timestamp since these + * intermediate certificates are "already there" and need not be passed as + * external parameters to Response#verify anymore, thus minimizing external + * resources needed for verification. + * + * ===Example: Inclusion of (untrusted) intermediate certificates + * + * Assume we received a timestamp request that has set Request#policy_id to + * +nil+ and Request#cert_requested? to true. The raw request bytes are + * stored in a variable called +req_raw+. We'd still like to integrate + * the necessary intermediate certificates (in +inter1.cer+ and + * +inter2.cer+) to simplify validation of the resulting Response. +ts.p12+ + * is a PKCS#12-compatible file including the private key and the + * timestamping certificate. + * + * req = OpenSSL::Timestamp::Request.new(raw_bytes) + * p12 = OpenSSL::PKCS12.new(File.open('ts.p12', 'rb'), 'pwd') + * inter1 = OpenSSL::X509::Certificate.new(File.open('inter1.cer', 'rb') + * inter2 = OpenSSL::X509::Certificate.new(File.open('inter2.cer', 'rb') + * fac = OpenSSL::Timestamp::Factory.new + * fac.gen_time = Time.now + * fac.serial_number = 1 + * fac.allowed_digests = ["sha256", "sha384", "sha512"] + * #needed because the Request contained no policy identifier + * fac.default_policy_id = '1.2.3.4.5' + * fac.additional_certificates = [ inter1, inter2 ] + * timestamp = fac.create_timestamp(p12.key, p12.certificate, req) + * + * ==Attributes + * + * ===default_policy_id + * + * Request#policy_id will always be preferred over this if present in the + * Request, only if Request#policy_id is nil default_policy will be used. + * If none of both is present, a TimestampError will be raised when trying + * to create a Response. + * + * call-seq: + * factory.default_policy_id = "string" -> string + * factory.default_policy_id -> string or nil + * + * ===serial_number + * + * Sets or retrieves the serial number to be used for timestamp creation. + * Must be present for timestamp creation. + * + * call-seq: + * factory.serial_number = number -> number + * factory.serial_number -> number or nil + * + * ===gen_time + * + * Sets or retrieves the Time value to be used in the Response. Must be + * present for timestamp creation. + * + * call-seq: + * factory.gen_time = Time -> Time + * factory.gen_time -> Time or nil + * + * ===additional_certs + * + * Sets or retrieves additional certificates apart from the timestamp + * certificate (e.g. intermediate certificates) to be added to the Response. + * Must be an Array of OpenSSL::X509::Certificate. + * + * call-seq: + * factory.additional_certs = [cert1, cert2] -> [ cert1, cert2 ] + * factory.additional_certs -> array or nil + * + * ===allowed_digests + * + * Sets or retrieves the digest algorithms that the factory is allowed + * create timestamps for. Known vulnerable or weak algorithms should not be + * allowed where possible. + * Must be an Array of String or OpenSSL::Digest subclass instances. + * + * call-seq: + * factory.allowed_digests = ["sha1", OpenSSL::Digest::SHA256.new] -> [ "sha1", OpenSSL::Digest::SHA256.new ] + * factory.allowed_digests -> array or nil + * + */ + cTimestampFactory = rb_define_class_under(mTimestamp, "Factory", rb_cObject); + rb_attr(cTimestampFactory, rb_intern("allowed_digests"), 1, 1, 0); + rb_attr(cTimestampFactory, rb_intern("default_policy_id"), 1, 1, 0); + rb_attr(cTimestampFactory, rb_intern("serial_number"), 1, 1, 0); + rb_attr(cTimestampFactory, rb_intern("gen_time"), 1, 1, 0); + rb_attr(cTimestampFactory, rb_intern("additional_certs"), 1, 1, 0); + rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3); +} + +#endif diff --git a/ext/openssl/ossl_ts.h b/ext/openssl/ossl_ts.h new file mode 100644 index 00000000000000..25fb0e1d6459ce --- /dev/null +++ b/ext/openssl/ossl_ts.h @@ -0,0 +1,16 @@ +/* + * + * Copyright (C) 2010 Martin Bosslet + * All rights reserved. + */ +/* + * This program is licenced under the same licence as Ruby. + * (See the file 'LICENCE'.) + */ + +#if !defined(_OSSL_TS_H_) +#define _OSSL_TS_H_ + +void Init_ossl_ts(void); + +#endif diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h deleted file mode 100644 index c162f8c2a82b7b..00000000000000 --- a/ext/openssl/ossl_version.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 'OpenSSL for Ruby' project - * Copyright (C) 2001-2002 Michal Rokos - * All rights reserved. - */ -/* - * This program is licensed under the same licence as Ruby. - * (See the file 'LICENCE'.) - */ -#if !defined(_OSSL_VERSION_H_) -#define _OSSL_VERSION_H_ - -#define OSSL_VERSION "2.1.2" - -#endif /* _OSSL_VERSION_H_ */ diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c index 30ec09d7a3181f..5eb9bd759fcdbf 100644 --- a/ext/openssl/ossl_x509ext.c +++ b/ext/openssl/ossl_x509ext.c @@ -402,6 +402,19 @@ ossl_x509ext_get_value(VALUE obj) return ret; } +static VALUE +ossl_x509ext_get_value_der(VALUE obj) +{ + X509_EXTENSION *ext; + ASN1_OCTET_STRING *value; + + GetX509Ext(obj, ext); + if ((value = X509_EXTENSION_get_data(ext)) == NULL) + ossl_raise(eX509ExtError, NULL); + + return rb_str_new((const char *)value->data, value->length); +} + static VALUE ossl_x509ext_get_critical(VALUE obj) { @@ -472,6 +485,7 @@ Init_ossl_x509ext(void) rb_define_method(cX509Ext, "critical=", ossl_x509ext_set_critical, 1); rb_define_method(cX509Ext, "oid", ossl_x509ext_get_oid, 0); rb_define_method(cX509Ext, "value", ossl_x509ext_get_value, 0); + rb_define_method(cX509Ext, "value_der", ossl_x509ext_get_value_der, 0); rb_define_method(cX509Ext, "critical?", ossl_x509ext_get_critical, 0); rb_define_method(cX509Ext, "to_der", ossl_x509ext_to_der, 0); } diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 1ea8400dbb93b5..1522c3d897c639 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -387,17 +387,21 @@ ossl_x509name_cmp0(VALUE self, VALUE other) /* * call-seq: - * name.cmp(other) -> -1 | 0 | 1 - * name <=> other -> -1 | 0 | 1 + * name.cmp(other) -> -1 | 0 | 1 | nil + * name <=> other -> -1 | 0 | 1 | nil * * Compares this Name with _other_ and returns +0+ if they are the same and +-1+ * or ++1+ if they are greater or less than each other respectively. + * Returns +nil+ if they are not comparable (i.e. different types). */ static VALUE ossl_x509name_cmp(VALUE self, VALUE other) { int result; + if (!rb_obj_is_kind_of(other, cX509Name)) + return Qnil; + result = ossl_x509name_cmp0(self, other); if (result < 0) return INT2FIX(-1); if (result > 0) return INT2FIX(1); @@ -494,7 +498,7 @@ ossl_x509name_to_der(VALUE self) * You can create a Name by parsing a distinguished name String or by * supplying the distinguished name as an Array. * - * name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example' + * name = OpenSSL::X509::Name.parse '/CN=nobody/DC=example' * * name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']] */ diff --git a/test/openssl/fixtures/chain/dh512.pem b/test/openssl/fixtures/chain/dh512.pem new file mode 100644 index 00000000000000..fec138c7a96bd3 --- /dev/null +++ b/test/openssl/fixtures/chain/dh512.pem @@ -0,0 +1,4 @@ +-----BEGIN DH PARAMETERS----- +MEYCQQCjDVzTg9C4u43MV0TKDGsBuYdChrPMczr4IYjy+jHQvXm2DDadNNWBIDau +4zNtwfLCg2gMwOc7t18m4Ten/NOLAgEC +-----END DH PARAMETERS----- diff --git a/test/openssl/fixtures/chain/server.crt b/test/openssl/fixtures/chain/server.crt new file mode 100644 index 00000000000000..d6b814f4500ac3 --- /dev/null +++ b/test/openssl/fixtures/chain/server.crt @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICATCCAWoCCQDbxIRGgXeWaDANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJO +WjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMB4XDTE5MDYxMzA1MDU0MloXDTI5MDYxMDA1MDU0MlowRTELMAkG +A1UEBhMCTloxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 +IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA29Vu +Y6m8pRrsXxUhlK2BX48CDChr8D53SqZozcQI26BCm+05TBnQxKAHOknR3y/ige2U +2zftSwbSoK/zKUC8o5pKVL+l36anDEnZ6RWc9Z9CvmaCFjlcP4nXZO+yD1Is/jCy +KqGGC8lQ920VXOCFflJj6AWg88+4C3GLjxJe6bMCAwEAATANBgkqhkiG9w0BAQsF +AAOBgQCDaqKGBkYxNxnv37vEKp7zi/cov8LvEsZaAD1pcSU+ysBiBes/B7a/Qjcj +PTZsH/hedn9mVynLkjc7LrztUWngTeW9gk5EB9YSwJdPhwLntV1TdaBlf/tu0n/c +s7QxaZhFMUyo1Eof28zXVHhs1OEhlSjwJ8lxuC3vBE4F1BjSNQ== +-----END CERTIFICATE----- diff --git a/test/openssl/fixtures/chain/server.csr b/test/openssl/fixtures/chain/server.csr new file mode 100644 index 00000000000000..51b38e33f236e9 --- /dev/null +++ b/test/openssl/fixtures/chain/server.csr @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIBhDCB7gIBADBFMQswCQYDVQQGEwJOWjETMBEGA1UECAwKU29tZS1TdGF0ZTEh +MB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQDb1W5jqbylGuxfFSGUrYFfjwIMKGvwPndKpmjNxAjboEKb +7TlMGdDEoAc6SdHfL+KB7ZTbN+1LBtKgr/MpQLyjmkpUv6XfpqcMSdnpFZz1n0K+ +ZoIWOVw/iddk77IPUiz+MLIqoYYLyVD3bRVc4IV+UmPoBaDzz7gLcYuPEl7pswID +AQABoAAwDQYJKoZIhvcNAQELBQADgYEAONaTWYVfyMmd8irCtognRoM4tFF4xvDg +PTcnHjVb/6oPPMU+mtQVD9qNf8SOdhNuYVTZ61mDLQGeq45CLM5qWjZkqFPHnngf +ajfZRE7Y3vA8ZaWFvsTJYcU+R3/FRS0XnFYj99+q9Yi3JExSY+arElyAW3tFYlcs +RWOCk1pT2Yc= +-----END CERTIFICATE REQUEST----- diff --git a/test/openssl/fixtures/chain/server.key b/test/openssl/fixtures/chain/server.key new file mode 100644 index 00000000000000..9590235db8f34a --- /dev/null +++ b/test/openssl/fixtures/chain/server.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDb1W5jqbylGuxfFSGUrYFfjwIMKGvwPndKpmjNxAjboEKb7TlM +GdDEoAc6SdHfL+KB7ZTbN+1LBtKgr/MpQLyjmkpUv6XfpqcMSdnpFZz1n0K+ZoIW +OVw/iddk77IPUiz+MLIqoYYLyVD3bRVc4IV+UmPoBaDzz7gLcYuPEl7pswIDAQAB +AoGAGO+q5+83ENtu+JIjDwRnanmEV/C13biYO4WI2d5kytTw+VL9bt52yfcFGt2I +yvJZlTdn7T340svhVIzg3ksTmp1xQk3zh6zR00zQy45kYwY8uyd8Xfh2IsnpByoc +h2jWVX6LSqi1Iy3RxanHmMYPSMy15otsjwlwnnTAHLnnvzECQQDvw3TL90DucQSD +S0h6DWAGakaiOMhY/PpFbTsjzw+uG+Up65tpz4QqPbsXfoReeK0CQIuyE/LlYoJl +VOlIsL6HAkEA6rh4zsWi6KVTGa7qd5x70TEgxeMMAW1qUbak1THxeZTFYnyvucBz +i+VQvHEVnCadhVpHIwbBNUeOyS5DXjj6dQJAA0Caf/3Noq5jykgmJomx6MReSusM +RLDB0FlH+Rdg9hKozCXHCOtoto350LrFnuZyKlqnynWc0OHCNQ+uzm6fVwJAbtyW +YsNCQLPlXhoZsEj+yj10B0NH5lyxfMrRa8jdDtnPqMbPkOJvMMIssfSPimNKvzN2 +qfqEww97R1ZMh3JOCQJBAIIwGHBN5rDGIb4CgR+PLsh8bve1X+gO8UnOYJXa/Uzx +gAXE0uzHNH6rNSG0V/IQnFYlSHpNJGgcdSl+MZNLldQ= +-----END RSA PRIVATE KEY----- diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb index cc113018046306..5f4575516a3fdc 100644 --- a/test/openssl/test_asn1.rb +++ b/test/openssl/test_asn1.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -167,7 +167,7 @@ def test_decode_x509_certificate assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class) extv = OpenSSL::ASN1.decode(ext.value[2].value) assert_equal(OpenSSL::ASN1::BitString, extv.class) - str = "\000"; str[0] = 0b00000110.chr + str = +"\000"; str[0] = 0b00000110.chr assert_equal(str, extv.value) ext = extensions.value[0].value[2] # subjetKeyIdentifier @@ -332,6 +332,32 @@ def test_object_identifier pend "OBJ_obj2txt() not working (LibreSSL?)" if $!.message =~ /OBJ_obj2txt/ raise end + + aki = [ + OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier"), + OpenSSL::ASN1::ObjectId.new("X509v3 Authority Key Identifier"), + OpenSSL::ASN1::ObjectId.new("2.5.29.35") + ] + + ski = [ + OpenSSL::ASN1::ObjectId.new("subjectKeyIdentifier"), + OpenSSL::ASN1::ObjectId.new("X509v3 Subject Key Identifier"), + OpenSSL::ASN1::ObjectId.new("2.5.29.14") + ] + + aki.each do |a| + aki.each do |b| + assert a == b + end + + ski.each do |b| + refute a == b + end + end + + assert_raise(TypeError) { + OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier") == nil + } end def test_sequence @@ -635,10 +661,10 @@ def test_constructive_each assert_equal data, seq.entries end - def test_gc_stress - skip "very time consuming test" - assert_ruby_status(['--disable-gems', '-eGC.stress=true', '-erequire "openssl.so"']) - end + # Very time consuming test. + # def test_gc_stress + # assert_ruby_status(['--disable-gems', '-eGC.stress=true', '-erequire "openssl.so"']) + # end private diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb index 0b5cd842418871..547d334c649a3a 100644 --- a/test/openssl/test_bn.rb +++ b/test/openssl/test_bn.rb @@ -1,5 +1,5 @@ # coding: us-ascii -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' require "prime" @@ -15,6 +15,10 @@ def setup end def test_new + assert_raise(ArgumentError) { OpenSSL::BN.new } + assert_raise(ArgumentError) { OpenSSL::BN.new(nil) } + assert_raise(ArgumentError) { OpenSSL::BN.new(nil, 2) } + assert_equal(@e1, OpenSSL::BN.new("999")) assert_equal(@e1, OpenSSL::BN.new("999", 10)) assert_equal(@e1, OpenSSL::BN.new("\x03\xE7", 2)) @@ -273,9 +277,9 @@ def test_comparison assert_instance_of(String, @e1.hash.to_s) end - def test_type_error + def test_argument_error bug15760 = '[ruby-core:92231] [Bug #15760]' - assert_raise(TypeError, bug15760) { OpenSSL::BN.new(nil, 2) } + assert_raise(ArgumentError, bug15760) { OpenSSL::BN.new(nil, 2) } end end diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb index c85a6f020b344b..7575c5b4fe49fe 100644 --- a/test/openssl/test_buffering.rb +++ b/test/openssl/test_buffering.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -10,7 +10,7 @@ class IO attr_accessor :sync def initialize - @io = "" + @io = Buffer.new def @io.sync true end @@ -41,6 +41,13 @@ def setup @io = IO.new end + def test_encoding + @io.write '😊' + @io.flush + + assert_equal @io.string.encoding, Encoding::BINARY + end + def test_flush @io.write 'a' diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb index d83fa4ec3d2509..f6ec4980872567 100644 --- a/test/openssl/test_cipher.rb +++ b/test/openssl/test_cipher.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -305,6 +305,21 @@ def test_non_aead_cipher_set_auth_data } end + def test_crypt_after_key + key = ["2b7e151628aed2a6abf7158809cf4f3c"].pack("H*") + %w'ecb cbc cfb ctr gcm'.each do |c| + cipher = OpenSSL::Cipher.new("aes-128-#{c}") + cipher.key = key + cipher.encrypt + assert_raise(OpenSSL::Cipher::CipherError) { cipher.update("") } + + cipher = OpenSSL::Cipher.new("aes-128-#{c}") + cipher.key = key + cipher.decrypt + assert_raise(OpenSSL::Cipher::CipherError) { cipher.update("") } + end + end + private def new_encryptor(algo, **kwargs) diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb index 3606c67d65cf4b..dba66b08023ea5 100644 --- a/test/openssl/test_config.rb +++ b/test/openssl/test_config.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -61,14 +61,14 @@ def test_s_parse_format [default1 default2]\t\t # space is allowed in section name fo =b ar # space allowed in value [emptysection] - [dollar ] + [doller ] foo=bar bar = $(foo) baz = 123$(default::bar)456${foo}798 qux = ${baz} quxx = $qux.$qux __EOC__ - assert_equal(['default', 'default1 default2', 'dollar', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) + assert_equal(['default', 'default1 default2', 'doller', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) assert_equal(['', 'a', 'bar', 'baz', 'd', 'dq', 'dq2', 'esc', 'foo\\bar', 'sq'], c['default'].keys.sort) assert_equal('c', c['default']['']) assert_equal('', c['default']['a']) @@ -84,12 +84,12 @@ def test_s_parse_format assert_equal('baz', c['foo\\bar']['foo\\bar']) assert_equal('b ar', c['default1 default2']['fo']) - # dollar - assert_equal('bar', c['dollar']['foo']) - assert_equal('bar', c['dollar']['bar']) - assert_equal('123baz456bar798', c['dollar']['baz']) - assert_equal('123baz456bar798', c['dollar']['qux']) - assert_equal('123baz456bar798.123baz456bar798', c['dollar']['quxx']) + # dolloer + assert_equal('bar', c['doller']['foo']) + assert_equal('bar', c['doller']['bar']) + assert_equal('123baz456bar798', c['doller']['baz']) + assert_equal('123baz456bar798', c['doller']['qux']) + assert_equal('123baz456bar798.123baz456bar798', c['doller']['quxx']) excn = assert_raise(OpenSSL::ConfigError) do OpenSSL::Config.parse("foo = $bar") diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb index 2cb878b6fa1ea3..e47fc0a35630fe 100644 --- a/test/openssl/test_digest.rb +++ b/test/openssl/test_digest.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -53,14 +53,21 @@ def test_reset assert_equal(dig1, dig2, "reset") end - def test_digest_constants - algs = %w(MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512) - if !libressl? && !openssl?(1, 1, 0) - algs += %w(DSS1 SHA) + def test_required_digests + algorithms = OpenSSL::Digest::ALGORITHMS + required = %w{MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512} + + required.each do |name| + assert_include(algorithms, name) end - algs.each do |alg| - assert_not_nil(OpenSSL::Digest.new(alg)) - klass = OpenSSL::Digest.const_get(alg) + end + + def test_digest_constants + algorithms = OpenSSL::Digest::ALGORITHMS + + algorithms.each do |name| + assert_not_nil(OpenSSL::Digest.new(name)) + klass = OpenSSL::Digest.const_get(name.tr('-', '_')) assert_not_nil(klass.new) end end @@ -91,6 +98,18 @@ def test_sha2 assert_equal(sha512_a, encode16(OpenSSL::Digest::SHA512.digest("a"))) end + def test_sha3 + pend "SHA3 is not implemented" unless OpenSSL::Digest.const_defined?(:SHA3_224) + s224 = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7' + s256 = 'a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a' + s384 = '0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004' + s512 = 'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26' + assert_equal(OpenSSL::Digest::SHA3_224.hexdigest(""), s224) + assert_equal(OpenSSL::Digest::SHA3_256.hexdigest(""), s256) + assert_equal(OpenSSL::Digest::SHA3_384.hexdigest(""), s384) + assert_equal(OpenSSL::Digest::SHA3_512.hexdigest(""), s512) + end + def test_digest_by_oid_and_name_sha2 check_digest(OpenSSL::ASN1::ObjectId.new("SHA224")) check_digest(OpenSSL::ASN1::ObjectId.new("SHA256")) diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb index bb1123d516305b..232ba866a5ca22 100644 --- a/test/openssl/test_engine.rb +++ b/test/openssl/test_engine.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) && defined?(OpenSSL::Engine) diff --git a/test/openssl/test_fips.rb b/test/openssl/test_fips.rb index a577d7891ea735..8cd474f9a321d5 100644 --- a/test/openssl/test_fips.rb +++ b/test/openssl/test_fips.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) diff --git a/test/openssl/test_hmac.rb b/test/openssl/test_hmac.rb index 831a5b6b37d116..9cb3c5a864bd17 100644 --- a/test/openssl/test_hmac.rb +++ b/test/openssl/test_hmac.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -39,6 +39,16 @@ def test_reset_keep_key second = h1.update("test").hexdigest assert_equal first, second end + + def test_eq + h1 = OpenSSL::HMAC.new("KEY", "MD5") + h2 = OpenSSL::HMAC.new("KEY", OpenSSL::Digest.new("MD5")) + h3 = OpenSSL::HMAC.new("FOO", "MD5") + + assert_equal h1, h2 + refute_equal h1, h2.digest + refute_equal h1, h3 + end end end diff --git a/test/openssl/test_kdf.rb b/test/openssl/test_kdf.rb index 5e1db80c5f0d49..f4790c96afa7ea 100644 --- a/test/openssl/test_kdf.rb +++ b/test/openssl/test_kdf.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) diff --git a/test/openssl/test_ns_spki.rb b/test/openssl/test_ns_spki.rb index aa1e61824f7fb2..052507de5bae5f 100644 --- a/test/openssl/test_ns_spki.rb +++ b/test/openssl/test_ns_spki.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -9,7 +9,7 @@ def setup # This request data is adopt from the specification of # "Netscape Extensions for User Key Generation". # -- http://wp.netscape.com/eng/security/comm4-keygen.html - @b64 = "MIHFMHEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAnX0TILJrOMUue+PtwBRE6XfV" + @b64 = +"MIHFMHEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAnX0TILJrOMUue+PtwBRE6XfV" @b64 << "WtKQbsshxk5ZhcUwcwyvcnIq9b82QhJdoACdD34rqfCAIND46fXKQUnb0mvKzQID" @b64 << "AQABFhFNb3ppbGxhSXNNeUZyaWVuZDANBgkqhkiG9w0BAQQFAANBAAKv2Eex2n/S" @b64 << "r/7iJNroWlSzSMtTiQTEB+ADWHGj9u1xrUrOilq/o2cuQxIfZcNZkYAkWP4DubqW" diff --git a/test/openssl/test_ocsp.rb b/test/openssl/test_ocsp.rb index 50ad6c31f5deed..a490a1539efab4 100644 --- a/test/openssl/test_ocsp.rb +++ b/test/openssl/test_ocsp.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) @@ -84,6 +84,7 @@ def test_certificate_id_der assert_equal [cid.issuer_key_hash].pack("H*"), asn1.value[2].value assert_equal @cert.serial, asn1.value[3].value assert_equal der, OpenSSL::OCSP::CertificateId.new(der).to_der + assert_equal der, OpenSSL::OCSP::CertificateId.new(asn1).to_der end def test_certificate_id_dup diff --git a/test/openssl/test_ossl.rb b/test/openssl/test_ossl.rb new file mode 100644 index 00000000000000..f517b1d83dffaa --- /dev/null +++ b/test/openssl/test_ossl.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true +require_relative "utils" + +require 'benchmark' + +if defined?(OpenSSL) + +class OpenSSL::OSSL < OpenSSL::SSLTestCase + def test_fixed_length_secure_compare + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "a") } + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aa") } + + assert OpenSSL.fixed_length_secure_compare("aaa", "aaa") + assert OpenSSL.fixed_length_secure_compare( + OpenSSL::Digest::SHA256.digest("aaa"), OpenSSL::Digest::SHA256.digest("aaa") + ) + + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaaa") } + refute OpenSSL.fixed_length_secure_compare("aaa", "baa") + refute OpenSSL.fixed_length_secure_compare("aaa", "aba") + refute OpenSSL.fixed_length_secure_compare("aaa", "aab") + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaab") } + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "b") } + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bb") } + refute OpenSSL.fixed_length_secure_compare("aaa", "bbb") + assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bbbb") } + end + + def test_secure_compare + refute OpenSSL.secure_compare("aaa", "a") + refute OpenSSL.secure_compare("aaa", "aa") + + assert OpenSSL.secure_compare("aaa", "aaa") + + refute OpenSSL.secure_compare("aaa", "aaaa") + refute OpenSSL.secure_compare("aaa", "baa") + refute OpenSSL.secure_compare("aaa", "aba") + refute OpenSSL.secure_compare("aaa", "aab") + refute OpenSSL.secure_compare("aaa", "aaab") + refute OpenSSL.secure_compare("aaa", "b") + refute OpenSSL.secure_compare("aaa", "bb") + refute OpenSSL.secure_compare("aaa", "bbb") + refute OpenSSL.secure_compare("aaa", "bbbb") + end + + def test_memcmp_timing + # Ensure using fixed_length_secure_compare takes almost exactly the same amount of time to compare two different strings. + # Regular string comparison will short-circuit on the first non-matching character, failing this test. + # NOTE: this test may be susceptible to noise if the system running the tests is otherwise under load. + a = "x" * 512_000 + b = "#{a}y" + c = "y#{a}" + a = "#{a}x" + + n = 10_000 + a_b_time = Benchmark.measure { n.times { OpenSSL.fixed_length_secure_compare(a, b) } }.real + a_c_time = Benchmark.measure { n.times { OpenSSL.fixed_length_secure_compare(a, c) } }.real + assert_in_delta(a_b_time, a_c_time, 1, "fixed_length_secure_compare timing test failed") + end +end + +end diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index 08c15a0f7506b9..e9cf98df153832 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' require_relative 'ut_eof' @@ -128,11 +128,11 @@ def test_readpartial ssl_pair {|s1, s2| s2.write "a\nbcd" assert_equal("a\n", s1.gets) - result = "" + result = String.new result << s1.readpartial(10) until result.length == 3 assert_equal("bcd", result) s2.write "efg" - result = "" + result = String.new result << s1.readpartial(10) until result.length == 3 assert_equal("efg", result) s2.close @@ -242,22 +242,22 @@ def test_read_nonblock_no_exception def test_read_with_outbuf ssl_pair { |s1, s2| s1.write("abc\n") - buf = "" + buf = String.new ret = s2.read(2, buf) assert_same ret, buf assert_equal "ab", ret - buf = "garbage" + buf = +"garbage" ret = s2.read(2, buf) assert_same ret, buf assert_equal "c\n", ret - buf = "garbage" + buf = +"garbage" assert_equal :wait_readable, s2.read_nonblock(100, buf, exception: false) assert_equal "", buf s1.close - buf = "garbage" + buf = +"garbage" assert_equal nil, s2.read(100, buf) assert_equal "", buf } diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb index de8e35ed79e88f..fdbe753b17e37a 100644 --- a/test/openssl/test_pkcs12.rb +++ b/test/openssl/test_pkcs12.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb index 6437112b74a5be..d0d9dcaf815be7 100644 --- a/test/openssl/test_pkcs7.rb +++ b/test/openssl/test_pkcs7.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -172,6 +172,28 @@ def test_set_type_encrypted assert_equal(:encrypted, p7.type) end + def test_smime + store = OpenSSL::X509::Store.new + store.add_cert(@ca_cert) + ca_certs = [@ca_cert] + + data = "aaaaa\r\nbbbbb\r\nccccc\r\n" + tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs) + p7 = OpenSSL::PKCS7.new(tmp.to_der) + smime = OpenSSL::PKCS7.write_smime(p7) + assert_equal(true, smime.start_with?(< ctx { # Unset values set by start_server @@ -139,15 +185,20 @@ def test_add_certificate_multiple_certs end end + def test_add_certificate_chain_file + ctx = OpenSSL::SSL::SSLContext.new + assert ctx.add_certificate_chain_file(Fixtures.file_path("chain", "server.crt")) + end + def test_sysread_and_syswrite start_server { |port| server_connect(port) { |ssl| - str = "x" * 100 + "\n" + str = +("x" * 100 + "\n") ssl.syswrite(str) newstr = ssl.sysread(str.bytesize) assert_equal(str, newstr) - buf = "" + buf = String.new ssl.syswrite(str) assert_same buf, ssl.sysread(str.size, buf) assert_equal(str, buf) @@ -155,23 +206,21 @@ def test_sysread_and_syswrite } end - def test_sysread_nonblock_and_syswrite_nonblock_keywords - start_server(ignore_listener_error: true) do |port| - sock = TCPSocket.new("127.0.0.1", port) - ssl = OpenSSL::SSL::SSLSocket.new(sock) - - assert_warn ("") do - ssl.send(:syswrite_nonblock, "1", exception: false) - ssl.send(:sysread_nonblock, 1, exception: false) rescue nil - ssl.send(:sysread_nonblock, 1, String.new, exception: false) rescue nil - end - ensure - sock&.close - end - end + # TODO fix this test + # def test_sysread_nonblock_and_syswrite_nonblock_keywords + # start_server do |port| + # server_connect(port) do |ssl| + # assert_warning("") do + # ssl.send(:syswrite_nonblock, "12", exception: false) + # ssl.send(:sysread_nonblock, 1, exception: false) rescue nil + # ssl.send(:sysread_nonblock, 1, String.new, exception: false) rescue nil + # end + # end + # end + # end def test_sync_close - start_server { |port| + start_server do |port| begin sock = TCPSocket.new("127.0.0.1", port) ssl = OpenSSL::SSL::SSLSocket.new(sock) @@ -194,7 +243,7 @@ def test_sync_close ensure sock&.close end - } + end end def test_copy_stream @@ -434,6 +483,29 @@ def test_exception_in_verify_callback_is_ignored } end + def test_finished_messages + server_finished = nil + server_peer_finished = nil + client_finished = nil + client_peer_finished = nil + + start_server(accept_proc: proc { |server| + server_finished = server.finished_message + server_peer_finished = server.peer_finished_message + }) { |port| + ctx = OpenSSL::SSL::SSLContext.new + ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE + server_connect(port, ctx) { |ssl| + client_finished = ssl.finished_message + client_peer_finished = ssl.peer_finished_message + sleep 0.05 + ssl.send :stop + } + } + assert_equal(server_finished, client_peer_finished) + assert_equal(server_peer_finished, client_finished) + end + def test_sslctx_set_params ctx = OpenSSL::SSL::SSLContext.new ctx.set_params @@ -1565,6 +1637,20 @@ def test_freeze_calls_setup } end + def test_fileno + ctx = OpenSSL::SSL::SSLContext.new + sock1, sock2 = socketpair + + socket = OpenSSL::SSL::SSLSocket.new(sock1) + server = OpenSSL::SSL::SSLServer.new(sock2, ctx) + + assert_equal socket.fileno, socket.to_io.fileno + assert_equal server.fileno, server.to_io.fileno + ensure + sock1.close + sock2.close + end + private def start_server_version(version, ctx_proc = nil, @@ -1597,8 +1683,8 @@ def server_connect(port, ctx = nil) def assert_handshake_error # different OpenSSL versions react differently when facing a SSL/TLS version - # that has been marked as forbidden, therefore either of these may be raised - assert_raise(OpenSSL::SSL::SSLError, Errno::ECONNRESET) { + # that has been marked as forbidden, therefore any of these may be raised + assert_raise(OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::EPIPE) { yield } end diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index e199f86d2b9f34..89726d4463de65 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb new file mode 100644 index 00000000000000..c57f08cf7ac10a --- /dev/null +++ b/test/openssl/test_ts.rb @@ -0,0 +1,667 @@ +require_relative "utils" + +if defined?(OpenSSL) && defined?(OpenSSL::Timestamp) + +class OpenSSL::TestTimestamp < OpenSSL::TestCase + def intermediate_key + @intermediate_key ||= OpenSSL::PKey::RSA.new <<-_end_of_pem_ +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQCcyODxH+oTrr7l7MITWcGaYnnBma6vidCCJjuSzZpaRmXZHAyH +0YcY4ttC0BdJ4uV+cE05IySVC7tyvVfFb8gFQ6XJV+AEktP+XkLbcxZgj9d2NVu1 +ziXdI+ldXkPnMhyWpMS5E7SD6gflv9NhUYEsmAGsUgdK6LDmm2W2/4TlewIDAQAB +AoGAYgx6KDFWONLqjW3f/Sv/mGYHUNykUyDzpcD1Npyf797gqMMSzwlo3FZa2tC6 +D7n23XirwpTItvEsW9gvgMikJDPlThAeGLZ+L0UbVNNBHVxGP998Nda1kxqKvhRE +pfZCKc7PLM9ZXc6jBTmgxdcAYfVCCVUoa2mEf9Ktr3BlI4kCQQDQAM09+wHDXGKP +o2UnCwCazGtyGU2r0QCzHlh9BVY+KD2KjjhuWh86rEbdWN7hEW23Je1vXIhuM6Pa +/Ccd+XYnAkEAwPZ91PK6idEONeGQ4I3dyMKV2SbaUjfq3MDL4iIQPQPuj7QsBO/5 +3Nf9ReSUUTRFCUVwoC8k4Z1KAJhR/K/ejQJANE7PTnPuGJQGETs09+GTcFpR9uqY +FspDk8fg1ufdrVnvSAXF+TJewiGK3KU5v33jinhWQngRsyz3Wt2odKhEZwJACbjh +oicQqvzzgFd7GzVKpWDYd/ZzLY1PsgusuhoJQ2m9TVRAm4cTycLAKhNYPbcqe0sa +X5fAffWU0u7ZwqeByQJAOUAbYET4RU3iymAvAIDFj8LiQnizG9t5Ty3HXlijKQYv +y8gsvWd4CdxwOPatWpBUX9L7IXcMJmD44xXTUvpbfQ== +-----END RSA PRIVATE KEY----- +_end_of_pem_ + end + + def ee_key + @ee_key ||= OpenSSL::PKey::RSA.new <<-_end_of_pem_ +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQDA6eB5r2O5KOKNbKMBhzadl43lgpwqq28m+G0gH38kKCL1f3o9 +P8xUZm7sZqcWEervZMSSXMGBV9DgeoSR+U6FMJywgQGx/JNRx7wZTMNym3PvgLkl +xCXh6ZA0/xbtJtcNI+UUv0ENBkTIuUWBhkAf3jQclAr9aQ0ktYBuHAcRcQIDAQAB +AoGAKNhcAuezwZx6e18pFEXAtpVEIfgJgK9TlXi8AjUpAkrNPBWFmDpN1QDrM3p4 +nh+lEpLPW/3vqqchPqYyM4YJraMLpS3KUG+s7+m9QIia0ri2WV5Cig7WL+Tl9p7K +b3oi2Aj/wti8GfOLFQXOQQ4Ea4GoCv2Sxe0GZR39UBxzTsECQQD1zuVIwBvqU2YR +8innsoa+j4u2hulRmQO6Zgpzj5vyRYfA9uZxQ9nKbfJvzuWwUv+UzyS9RqxarqrP +5nQw5EmVAkEAyOmJg6+AfGrgvSWfSpXEds/WA/sHziCO3rE4/sd6cnDc6XcTgeMs +mT8Z3kAYGpqFDew5orUylPfJJa+PUueJbQJAY+gkvw3+Cp69FLw1lgu0wo07fwOU +n2qu3jsNMm0DOFRUWfTAMvcd9S385L7WEnWZldUfnKK1+OGXYYrMXPbchQJAChU2 +UoaHQzc16iguM1cK0g+iJPb/MEgQA3sPajHmokGpxIm2T+lvvo0dJjs/Om6QyN8X +EWRYkoNQ8/Q4lCeMjQJAfvDIGtyqF4PieFHYgluQAv5pGgYpakdc8SYyeRH9NKey +GaL27FRs4fRWf9OmxPhUVgIyGzLGXrueemvQUDHObA== +-----END RSA PRIVATE KEY----- +_end_of_pem_ + end + + def ca_cert + @ca_cert ||= OpenSSL::Certs.ca_cert + end + + def ca_store + @ca_store ||= OpenSSL::X509::Store.new.tap { |s| s.add_cert(ca_cert) } + end + + def ts_cert_direct + @ts_cert_direct ||= OpenSSL::Certs.ts_cert_direct(ee_key, ca_cert) + end + + def intermediate_cert + @intermediate_cert ||= OpenSSL::Certs.intermediate_cert(intermediate_key, ca_cert) + end + + def intermediate_store + @intermediate_store ||= OpenSSL::X509::Store.new.tap { |s| s.add_cert(intermediate_cert) } + end + + def ts_cert_ee + @ts_cert_ee ||= OpenSSL::Certs.ts_cert_ee(ee_key, intermediate_cert, intermediate_key) + end + + def test_create_request + req = OpenSSL::Timestamp::Request.new + assert_equal(true, req.cert_requested?) + assert_equal(1, req.version) + assert_nil(req.algorithm) + assert_equal("", req.message_imprint) + assert_nil(req.policy_id) + assert_nil(req.nonce) + end + + def test_request_mandatory_fields + req = OpenSSL::Timestamp::Request.new + assert_raise(OpenSSL::Timestamp::TimestampError) do + tmp = req.to_der + pp OpenSSL::ASN1.decode(tmp) + end + req.algorithm = "sha1" + assert_raise(OpenSSL::Timestamp::TimestampError) do + req.to_der + end + req.message_imprint = OpenSSL::Digest::SHA1.new.digest("data") + req.to_der + end + + def test_request_assignment + req = OpenSSL::Timestamp::Request.new + + req.version = 2 + assert_equal(2, req.version) + assert_raise(TypeError) { req.version = nil } + assert_raise(TypeError) { req.version = "foo" } + + req.algorithm = "SHA1" + assert_equal("SHA1", req.algorithm) + assert_raise(TypeError) { req.algorithm = nil } + assert_raise(OpenSSL::ASN1::ASN1Error) { req.algorithm = "xxx" } + + req.message_imprint = "test" + assert_equal("test", req.message_imprint) + assert_raise(TypeError) { req.message_imprint = nil } + + req.policy_id = "1.2.3.4.5" + assert_equal("1.2.3.4.5", req.policy_id) + assert_raise(TypeError) { req.policy_id = 123 } + assert_raise(TypeError) { req.policy_id = nil } + + req.nonce = 42 + assert_equal(42, req.nonce) + assert_raise(TypeError) { req.nonce = "foo" } + assert_raise(TypeError) { req.nonce = nil } + + req.cert_requested = false + assert_equal(false, req.cert_requested?) + req.cert_requested = nil + assert_equal(false, req.cert_requested?) + req.cert_requested = 123 + assert_equal(true, req.cert_requested?) + req.cert_requested = "asdf" + assert_equal(true, req.cert_requested?) + end + + def test_request_serialization + req = OpenSSL::Timestamp::Request.new + + req.version = 2 + req.algorithm = "SHA1" + req.message_imprint = "test" + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + req.cert_requested = true + + req = OpenSSL::Timestamp::Request.new(req.to_der) + + assert_equal(2, req.version) + assert_equal("SHA1", req.algorithm) + assert_equal("test", req.message_imprint) + assert_equal("1.2.3.4.5", req.policy_id) + assert_equal(42, req.nonce) + assert_equal(true, req.cert_requested?) + + end + + def test_request_re_assignment + #tests whether the potential 'freeing' of previous values in C works properly + req = OpenSSL::Timestamp::Request.new + req.version = 2 + req.version = 3 + req.algorithm = "SHA1" + req.algorithm = "SHA256" + req.message_imprint = "test" + req.message_imprint = "test2" + req.policy_id = "1.2.3.4.5" + req.policy_id = "1.2.3.4.6" + req.nonce = 42 + req.nonce = 24 + req.cert_requested = false + req.cert_requested = true + req.to_der + end + + def test_request_encode_decode + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + + qer = OpenSSL::Timestamp::Request.new(req.to_der) + assert_equal(1, qer.version) + assert_equal("SHA1", qer.algorithm) + assert_equal(digest, qer.message_imprint) + assert_equal("1.2.3.4.5", qer.policy_id) + assert_equal(42, qer.nonce) + + #put OpenSSL::ASN1.decode inbetween + qer2 = OpenSSL::Timestamp::Request.new(OpenSSL::ASN1.decode(req.to_der)) + assert_equal(1, qer2.version) + assert_equal("SHA1", qer2.algorithm) + assert_equal(digest, qer2.message_imprint) + assert_equal("1.2.3.4.5", qer2.policy_id) + assert_equal(42, qer2.nonce) + end + + def test_response_constants + assert_equal(0, OpenSSL::Timestamp::Response::GRANTED) + assert_equal(1, OpenSSL::Timestamp::Response::GRANTED_WITH_MODS) + assert_equal(2, OpenSSL::Timestamp::Response::REJECTION) + assert_equal(3, OpenSSL::Timestamp::Response::WAITING) + assert_equal(4, OpenSSL::Timestamp::Response::REVOCATION_WARNING) + assert_equal(5, OpenSSL::Timestamp::Response::REVOCATION_NOTIFICATION) + end + + def test_response_creation + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + + fac = OpenSSL::Timestamp::Factory.new + time = Time.now + fac.gen_time = time + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + resp = OpenSSL::Timestamp::Response.new(resp) + assert_equal(OpenSSL::Timestamp::Response::GRANTED, resp.status) + assert_nil(resp.failure_info) + assert_equal([], resp.status_text) + assert_equal(1, resp.token_info.version) + assert_equal("1.2.3.4.5", resp.token_info.policy_id) + assert_equal("SHA1", resp.token_info.algorithm) + assert_equal(digest, resp.token_info.message_imprint) + assert_equal(1, resp.token_info.serial_number) + assert_equal(time.to_i, resp.token_info.gen_time.to_i) + assert_equal(false, resp.token_info.ordering) + assert_nil(resp.token_info.nonce) + assert_cert(ts_cert_ee, resp.tsa_certificate) + #compare PKCS7 + token = OpenSSL::ASN1.decode(resp.to_der).value[1] + assert_equal(token.to_der, resp.token.to_der) + end + + def test_response_mandatory_fields + fac = OpenSSL::Timestamp::Factory.new + req = OpenSSL::Timestamp::Request.new + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + req.algorithm = "sha1" + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + req.message_imprint = OpenSSL::Digest::SHA1.new.digest("data") + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + fac.gen_time = Time.now + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + fac.default_policy_id = "1.2.3.4.5" + assert_equal OpenSSL::Timestamp::Response::GRANTED, fac.create_timestamp(ee_key, ts_cert_ee, req).status + fac.default_policy_id = nil + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + req.policy_id = "1.2.3.4.5" + assert_equal OpenSSL::Timestamp::Response::GRANTED, fac.create_timestamp(ee_key, ts_cert_ee, req).status + end + + def test_response_allowed_digests + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + req.message_imprint = OpenSSL::Digest::SHA1.digest("test") + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.default_policy_id = "1.2.3.4.6" + + # None allowed by default + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal OpenSSL::Timestamp::Response::REJECTION, resp.status + + # Explicitly allow SHA1 (string) + fac.allowed_digests = ["sha1"] + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal OpenSSL::Timestamp::Response::GRANTED, resp.status + + # Explicitly allow SHA1 (object) + fac.allowed_digests = [OpenSSL::Digest::SHA1.new] + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal OpenSSL::Timestamp::Response::GRANTED, resp.status + + # Others not allowed + req.algorithm = "SHA256" + req.message_imprint = OpenSSL::Digest::SHA256.digest("test") + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal OpenSSL::Timestamp::Response::REJECTION, resp.status + + # Non-Array + fac.allowed_digests = 123 + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal OpenSSL::Timestamp::Response::REJECTION, resp.status + + # Non-String, non-Digest Array element + fac.allowed_digests = ["sha1", OpenSSL::Digest::SHA1.new, 123] + assert_raise(TypeError) do + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + end + + def test_response_default_policy + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.default_policy_id = "1.2.3.4.6" + + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal(OpenSSL::Timestamp::Response::GRANTED, resp.status) + assert_equal("1.2.3.4.6", resp.token_info.policy_id) + end + + def test_response_bad_purpose + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + + + assert_raise(OpenSSL::Timestamp::TimestampError) do + fac.create_timestamp(ee_key, intermediate_cert, req) + end + end + + def test_no_cert_requested + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.cert_requested = false + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.default_policy_id = "1.2.3.4.5" + + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal(OpenSSL::Timestamp::Response::GRANTED, resp.status) + assert_nil(resp.tsa_certificate) + end + + def test_response_no_policy_defined + assert_raise(OpenSSL::Timestamp::TimestampError) do + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + + fac.create_timestamp(ee_key, ts_cert_ee, req) + end + end + + def test_verify_ee_no_req + assert_raise(TypeError) do + ts, _ = timestamp_ee + ts.verify(nil, ca_cert) + end + end + + def test_verify_ee_no_store + assert_raise(TypeError) do + ts, req = timestamp_ee + ts.verify(req, nil) + end + end + + def test_verify_ee_wrong_root_no_intermediate + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_ee + ts.verify(req, intermediate_store) + end + end + + def test_verify_ee_wrong_root_wrong_intermediate + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_ee + ts.verify(req, intermediate_store, [ca_cert]) + end + end + + def test_verify_ee_nonce_mismatch + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_ee + req.nonce = 1 + ts.verify(req, ca_store, [intermediate_cert]) + end + end + + def test_verify_ee_intermediate_missing + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_ee + ts.verify(req, ca_store) + end + end + + def test_verify_ee_intermediate + ts, req = timestamp_ee + ts.verify(req, ca_store, [intermediate_cert]) + end + + def test_verify_ee_intermediate_type_error + ts, req = timestamp_ee + assert_raise(TypeError) { ts.verify(req, [ca_cert], 123) } + end + + def test_verify_ee_def_policy + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.nonce = 42 + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.default_policy_id = "1.2.3.4.5" + + ts = fac.create_timestamp(ee_key, ts_cert_ee, req) + ts.verify(req, ca_store, [intermediate_cert]) + end + + def test_verify_direct + ts, req = timestamp_direct + ts.verify(req, ca_store) + end + + def test_verify_direct_redundant_untrusted + ts, req = timestamp_direct + ts.verify(req, ca_store, [ts.tsa_certificate, ts.tsa_certificate]) + end + + def test_verify_direct_unrelated_untrusted + ts, req = timestamp_direct + ts.verify(req, ca_store, [intermediate_cert]) + end + + def test_verify_direct_wrong_root + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_direct + ts.verify(req, intermediate_store) + end + end + + def test_verify_direct_no_cert_no_intermediate + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_direct_no_cert + ts.verify(req, ca_store) + end + end + + def test_verify_ee_no_cert + ts, req = timestamp_ee_no_cert + ts.verify(req, ca_store, [ts_cert_ee, intermediate_cert]) + end + + def test_verify_ee_no_cert_no_intermediate + assert_raise(OpenSSL::Timestamp::TimestampError) do + ts, req = timestamp_ee_no_cert + ts.verify(req, ca_store, [ts_cert_ee]) + end + end + + def test_verify_ee_additional_certs_array + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.additional_certs = [intermediate_cert] + ts = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal(2, ts.token.certificates.size) + fac.additional_certs = nil + ts.verify(req, ca_store) + ts = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal(1, ts.token.certificates.size) + end + + def test_verify_ee_additional_certs_with_root + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.additional_certs = [intermediate_cert, ca_cert] + ts = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_equal(3, ts.token.certificates.size) + ts.verify(req, ca_store) + end + + def test_verify_ee_cert_inclusion_not_requested + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.nonce = 42 + req.cert_requested = false + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + #needed because the Request contained no policy identifier + fac.default_policy_id = '1.2.3.4.5' + fac.additional_certs = [ ts_cert_ee, intermediate_cert ] + ts = fac.create_timestamp(ee_key, ts_cert_ee, req) + assert_nil(ts.token.certificates) #since cert_requested? == false + ts.verify(req, ca_store, [ts_cert_ee, intermediate_cert]) + end + + def test_reusable + #test if req and faq are reusable, i.e. the internal + #CTX_free methods don't mess up e.g. the certificates + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + fac.additional_certs = [ intermediate_cert ] + ts1 = fac.create_timestamp(ee_key, ts_cert_ee, req) + ts1.verify(req, ca_store) + ts2 = fac.create_timestamp(ee_key, ts_cert_ee, req) + ts2.verify(req, ca_store) + refute_nil(ts1.tsa_certificate) + refute_nil(ts2.tsa_certificate) + end + + def test_token_info_creation + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = OpenSSL::BN.new(123) + + fac = OpenSSL::Timestamp::Factory.new + time = Time.now + fac.gen_time = time + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + + resp = fac.create_timestamp(ee_key, ts_cert_ee, req) + info = resp.token_info + info = OpenSSL::Timestamp::TokenInfo.new(info.to_der) + + assert_equal(1, info.version) + assert_equal("1.2.3.4.5", info.policy_id) + assert_equal("SHA1", info.algorithm) + assert_equal(digest, info.message_imprint) + assert_equal(1, info.serial_number) + assert_equal(time.to_i, info.gen_time.to_i) + assert_equal(false, info.ordering) + assert_equal(123, info.nonce) + end + + private + + def assert_cert expected, actual + assert_equal expected.to_der, actual.to_der + end + + def timestamp_ee + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + return fac.create_timestamp(ee_key, ts_cert_ee, req), req + end + + def timestamp_ee_no_cert + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + req.cert_requested = false + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + return fac.create_timestamp(ee_key, ts_cert_ee, req), req + end + + def timestamp_direct + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + return fac.create_timestamp(ee_key, ts_cert_direct, req), req + end + + def timestamp_direct_no_cert + req = OpenSSL::Timestamp::Request.new + req.algorithm = "SHA1" + digest = OpenSSL::Digest::SHA1.new.digest("test") + req.message_imprint = digest + req.policy_id = "1.2.3.4.5" + req.nonce = 42 + req.cert_requested = false + + fac = OpenSSL::Timestamp::Factory.new + fac.gen_time = Time.now + fac.serial_number = 1 + fac.allowed_digests = ["sha1"] + return fac.create_timestamp(ee_key, ts_cert_direct, req), req + end +end + +end diff --git a/test/openssl/test_x509attr.rb b/test/openssl/test_x509attr.rb index c6c48e86ab8cf9..2919d23d2d38c7 100644 --- a/test/openssl/test_x509attr.rb +++ b/test/openssl/test_x509attr.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) @@ -79,6 +79,16 @@ def test_eq assert_equal true, attr1 == attr2 assert_equal false, attr1 == attr3 end + + def test_marshal + val = OpenSSL::ASN1::Set([ + OpenSSL::ASN1::UTF8String("abc123") + ]) + attr = OpenSSL::X509::Attribute.new("challengePassword", val) + deserialized = Marshal.load(Marshal.dump(attr)) + + assert_equal attr.to_der, deserialized.to_der + end end end diff --git a/test/openssl/test_x509cert.rb b/test/openssl/test_x509cert.rb index 40a5b0ad748a93..ed0758a6b3e293 100644 --- a/test/openssl/test_x509cert.rb +++ b/test/openssl/test_x509cert.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) @@ -73,9 +73,12 @@ def test_extension ["basicConstraints","CA:TRUE",true], ["keyUsage","keyCertSign, cRLSign",true], ["subjectKeyIdentifier","hash",false], - ["authorityKeyIdentifier","keyid:always",false], + ["authorityKeyIdentifier","issuer:always,keyid:always",false], ] ca_cert = issue_cert(@ca, @rsa2048, 1, ca_exts, nil, nil) + keyid = get_subject_key_id(ca_cert.to_der, hex: false) + assert_equal keyid, ca_cert.authority_key_identifier + assert_equal keyid, ca_cert.subject_key_identifier ca_cert.extensions.each_with_index{|ext, i| assert_equal(ca_exts[i].first, ext.oid) assert_equal(ca_exts[i].last, ext.critical?) @@ -84,9 +87,10 @@ def test_extension ee1_exts = [ ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true], ["subjectKeyIdentifier","hash",false], - ["authorityKeyIdentifier","keyid:always",false], + ["authorityKeyIdentifier","issuer:always,keyid:always",false], ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false], ["subjectAltName","email:ee1@ruby-lang.org",false], + ["authorityInfoAccess","caIssuers;URI:http://www.example.com/caIssuers,OCSP;URI:http://www.example.com/ocsp",false], ] ee1_cert = issue_cert(@ee1, @rsa1024, 2, ee1_exts, ca_cert, @rsa2048) assert_equal(ca_cert.subject.to_der, ee1_cert.issuer.to_der) @@ -94,6 +98,78 @@ def test_extension assert_equal(ee1_exts[i].first, ext.oid) assert_equal(ee1_exts[i].last, ext.critical?) } + assert_nil(ee1_cert.crl_uris) + + ef = OpenSSL::X509::ExtensionFactory.new + ef.config = OpenSSL::Config.parse(<<~_cnf_) + [crlDistPts] + URI.1 = http://www.example.com/crl + URI.2 = ldap://ldap.example.com/cn=ca?certificateRevocationList;binary + _cnf_ + cdp_cert = generate_cert(@ee1, @rsa1024, 3, ca_cert) + ef.subject_certificate = cdp_cert + cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "@crlDistPts")) + cdp_cert.sign(@rsa2048, "sha256") + assert_equal( + ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"], + cdp_cert.crl_uris + ) + + ef = OpenSSL::X509::ExtensionFactory.new + aia_cert = generate_cert(@ee1, @rsa1024, 4, ca_cert) + ef.subject_certificate = aia_cert + aia_cert.add_extension( + ef.create_extension( + "authorityInfoAccess", + "caIssuers;URI:http://www.example.com/caIssuers," \ + "caIssuers;URI:ldap://ldap.example.com/cn=ca?authorityInfoAccessCaIssuers;binary," \ + "OCSP;URI:http://www.example.com/ocsp," \ + "OCSP;URI:ldap://ldap.example.com/cn=ca?authorityInfoAccessOcsp;binary", + false + ) + ) + aia_cert.sign(@rsa2048, "sha256") + assert_equal( + ["http://www.example.com/caIssuers", "ldap://ldap.example.com/cn=ca?authorityInfoAccessCaIssuers;binary"], + aia_cert.ca_issuer_uris + ) + assert_equal( + ["http://www.example.com/ocsp", "ldap://ldap.example.com/cn=ca?authorityInfoAccessOcsp;binary"], + aia_cert.ocsp_uris + ) + + no_exts_cert = issue_cert(@ca, @rsa2048, 5, [], nil, nil) + assert_equal nil, no_exts_cert.authority_key_identifier + assert_equal nil, no_exts_cert.subject_key_identifier + assert_equal nil, no_exts_cert.crl_uris + assert_equal nil, no_exts_cert.ca_issuer_uris + assert_equal nil, no_exts_cert.ocsp_uris + end + + def test_invalid_extension + integer = OpenSSL::ASN1::Integer.new(0) + invalid_exts_cert = generate_cert(@ee1, @rsa1024, 1, nil) + ["subjectKeyIdentifier", "authorityKeyIdentifier", "crlDistributionPoints", "authorityInfoAccess"].each do |ext| + invalid_exts_cert.add_extension( + OpenSSL::X509::Extension.new(ext, integer.to_der) + ) + end + + assert_raise(OpenSSL::ASN1::ASN1Error, "invalid extension") { + invalid_exts_cert.authority_key_identifier + } + assert_raise(OpenSSL::ASN1::ASN1Error, "invalid extension") { + invalid_exts_cert.subject_key_identifier + } + assert_raise(OpenSSL::ASN1::ASN1Error, "invalid extension") { + invalid_exts_cert.crl_uris + } + assert_raise(OpenSSL::ASN1::ASN1Error, "invalid extension") { + invalid_exts_cert.ca_issuer_uris + } + assert_raise(OpenSSL::ASN1::ASN1Error, "invalid extension") { + invalid_exts_cert.ocsp_uris + } end def test_sign_and_verify_rsa_sha1 @@ -189,6 +265,17 @@ def test_eq assert_equal false, cert3 == cert4 end + def test_marshal + now = Time.now + cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil, + not_before: now, not_after: now + 3600) + cert = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, + not_before: now, not_after: now + 3600) + deserialized = Marshal.load(Marshal.dump(cert)) + + assert_equal cert.to_der, deserialized.to_der + end + private def certificate_error_returns_false diff --git a/test/openssl/test_x509crl.rb b/test/openssl/test_x509crl.rb index 03fdf64dd4fbb1..a6d0adc5923001 100644 --- a/test/openssl/test_x509crl.rb +++ b/test/openssl/test_x509crl.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) @@ -118,7 +118,7 @@ def test_extension ["keyUsage", "cRLSign, keyCertSign", true], ] crl_exts = [ - ["authorityKeyIdentifier", "keyid:always", false], + ["authorityKeyIdentifier", "issuer:always,keyid:always", false], ["issuerAltName", "issuer:copy", false], ] @@ -131,6 +131,9 @@ def test_extension assert_equal("crlNumber", exts[0].oid) assert_equal(false, exts[0].critical?) + expected_keyid = OpenSSL::TestUtils.get_subject_key_id(cert, hex: false) + assert_equal expected_keyid, crl.authority_key_identifier + assert_equal("authorityKeyIdentifier", exts[1].oid) keyid = OpenSSL::TestUtils.get_subject_key_id(cert) assert_match(/^keyid:#{keyid}/, exts[1].value) @@ -155,6 +158,10 @@ def test_extension assert_equal("issuerAltName", exts[2].oid) assert_equal("email:xyzzy@ruby-lang.org", exts[2].value) assert_equal(false, exts[2].critical?) + + no_ext_crl = issue_crl([], 1, Time.now, Time.now+1600, [], + cert, @rsa2048, OpenSSL::Digest::SHA1.new) + assert_equal nil, no_ext_crl.authority_key_identifier end def test_crlnumber @@ -249,6 +256,22 @@ def test_eq assert_equal true, rev2 == crl2.revoked[1] end + def test_marshal + now = Time.now + + cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil) + crl = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256") + rev = OpenSSL::X509::Revoked.new.tap { |rev| + rev.serial = 1 + rev.time = now + } + crl.add_revoked(rev) + deserialized = Marshal.load(Marshal.dump(crl)) + + assert_equal crl.to_der, deserialized.to_der + assert_equal crl.revoked[0].to_der, deserialized.revoked[0].to_der + end + private def crl_error_returns_false diff --git a/test/openssl/test_x509ext.rb b/test/openssl/test_x509ext.rb index 91ce202fecf52d..7ad010d1ed2db1 100644 --- a/test/openssl/test_x509ext.rb +++ b/test/openssl/test_x509ext.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -86,6 +86,19 @@ def test_eq assert_equal true, ext1 == ext2 assert_equal false, ext1 == ext3 end + + def test_marshal + ef = OpenSSL::X509::ExtensionFactory.new + ext = ef.create_extension("basicConstraints", "critical, CA:TRUE, pathlen:2") + deserialized = Marshal.load(Marshal.dump(ext)) + + assert_equal ext.to_der, deserialized.to_der + end + + def test_value_der + ext = OpenSSL::X509::Extension.new(@basic_constraints.to_der) + assert_equal @basic_constraints_value.to_der, ext.value_der + end end end diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index 8a4596ea6ed3a3..4ec5db201856f0 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -1,5 +1,5 @@ # coding: ASCII-8BIT -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'utils' if defined?(OpenSSL) @@ -242,16 +242,15 @@ def test_s_parse_rfc2253 assert_match(/^multi-valued RDN is not supported: #{dn_r}/, ex.message) } - bad_dc = "exa#{"pm"}le" # <- typo of "example" [ - ["DC=org,DC=#{bad_dc},CN", "CN"], + ["DC=org,DC=exapmle,CN", "CN"], ["DC=org,DC=example,", ""], - ["DC=org,DC=#{bad_dc},CN=www.example.org;", "CN=www.example.org;"], - ["DC=org,DC=#{bad_dc},CN=#www.example.org", "CN=#www.example.org"], - ["DC=org,DC=#{bad_dc},CN=#777777.example.org", "CN=#777777.example.org"], - ["DC=org,DC=#{bad_dc},CN=\"www.example\".org", "CN=\"www.example\".org"], - ["DC=org,DC=#{bad_dc},CN=www.\"example.org\"", "CN=www.\"example.org\""], - ["DC=org,DC=#{bad_dc},CN=www.\"example\".org", "CN=www.\"example\".org"], + ["DC=org,DC=exapmle,CN=www.example.org;", "CN=www.example.org;"], + ["DC=org,DC=exapmle,CN=#www.example.org", "CN=#www.example.org"], + ["DC=org,DC=exapmle,CN=#777777.example.org", "CN=#777777.example.org"], + ["DC=org,DC=exapmle,CN=\"www.example\".org", "CN=\"www.example\".org"], + ["DC=org,DC=exapmle,CN=www.\"example.org\"", "CN=www.\"example.org\""], + ["DC=org,DC=exapmle,CN=www.\"example\".org", "CN=www.\"example\".org"], ].each{|dn, msg| ex = scanner.call(dn) rescue $! assert_match(/^malformed RDN: .*=>#{Regexp.escape(msg)}/, ex.message) @@ -390,7 +389,7 @@ def test_to_utf8 dn.each { |x| name.add_entry(*x) } str = name.to_utf8 - expected = "CN=フー\\, バー,DC=ruby-lang,DC=org".force_encoding("UTF-8") + expected = String.new("CN=フー\\, バー,DC=ruby-lang,DC=org").force_encoding("UTF-8") assert_equal expected, str assert_equal Encoding.find("UTF-8"), str.encoding @@ -403,6 +402,9 @@ def test_equals2 n2 = OpenSSL::X509::Name.parse_rfc2253 'CN=a' assert_equal n1, n2 + + assert_equal(false, n1 == 'abc') + assert_equal(false, n2 == nil) end def test_spaceship @@ -416,6 +418,9 @@ def test_spaceship assert_equal(-1, n2 <=> n3) assert_equal(1, n3 <=> n1) assert_equal(1, n3 <=> n2) + assert_equal(nil, n1 <=> 'abc') + assert_equal(nil, n2 <=> 123) + assert_equal(nil, n3 <=> nil) end def name_hash(name) @@ -448,6 +453,13 @@ def test_equality assert_equal false, name0.eql?(name2) end + def test_marshal + name = OpenSSL::X509::Name.new([["DC", "org"], ["DC", "ruby-lang"], ["CN", "bar.ruby-lang.org"]]) + deserialized = Marshal.load(Marshal.dump(name)) + + assert_equal name.to_der, deserialized.to_der + end + def test_dup name = OpenSSL::X509::Name.parse("/CN=ruby-lang.org") assert_equal(name.to_der, name.dup.to_der) diff --git a/test/openssl/test_x509req.rb b/test/openssl/test_x509req.rb index 2c447ccdd51374..bace06b3477bee 100644 --- a/test/openssl/test_x509req.rb +++ b/test/openssl/test_x509req.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) @@ -151,6 +151,13 @@ def test_eq assert_equal false, req1 == req3 end + def test_marshal + req = issue_csr(0, @dn, @rsa1024, "sha256") + deserialized = Marshal.load(Marshal.dump(req)) + + assert_equal req.to_der, deserialized.to_der + end + private def request_error_returns_false diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb index 6412249b93effb..8223c9b7acf9ae 100644 --- a/test/openssl/test_x509store.rb +++ b/test/openssl/test_x509store.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative "utils" if defined?(OpenSSL) diff --git a/test/openssl/ut_eof.rb b/test/openssl/ut_eof.rb index bd62fd50f9d60f..cf1f2d423e0b05 100644 --- a/test/openssl/ut_eof.rb +++ b/test/openssl/ut_eof.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'test/unit' if defined?(OpenSSL) @@ -18,12 +18,12 @@ def test_eof_0 assert_nil(f.read(1)) } open_file("") {|f| - s = "x" + s = +"x" assert_equal("", f.read(nil, s)) assert_equal("", s) } open_file("") {|f| - s = "x" + s = +"x" assert_nil(f.read(10, s)) assert_equal("", s) } @@ -75,12 +75,12 @@ def test_eof_1 assert_equal("", f.read(0)) } open_file("a") {|f| - s = "x" + s = +"x" assert_equal("a", f.read(nil, s)) assert_equal("a", s) } open_file("a") {|f| - s = "x" + s = +"x" assert_equal("a", f.read(10, s)) assert_equal("a", s) } diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index bf191630521922..acece979114201 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true begin require "openssl" @@ -52,15 +52,18 @@ def read_file(category, name) @file_cache[[category, name]] ||= File.read(File.join(__dir__, "fixtures", category, name + ".pem")) end + + def file_path(category, name) + File.join(__dir__, "fixtures", category, name) + end end module_function - def issue_cert(dn, key, serial, extensions, issuer, issuer_key, - not_before: nil, not_after: nil, digest: "sha256") + def generate_cert(dn, key, serial, issuer, + not_before: nil, not_after: nil) cert = OpenSSL::X509::Certificate.new issuer = cert unless issuer - issuer_key = key unless issuer_key cert.version = 2 cert.serial = serial cert.subject = dn @@ -69,6 +72,16 @@ def issue_cert(dn, key, serial, extensions, issuer, issuer_key, now = Time.now cert.not_before = not_before || now - 3600 cert.not_after = not_after || now + 3600 + cert + end + + + def issue_cert(dn, key, serial, extensions, issuer, issuer_key, + not_before: nil, not_after: nil, digest: "sha256") + cert = generate_cert(dn, key, serial, issuer, + not_before: not_before, not_after: not_after) + issuer = cert unless issuer + issuer_key = key unless issuer_key ef = OpenSSL::X509::ExtensionFactory.new ef.subject_certificate = cert ef.issuer_certificate = issuer @@ -107,13 +120,18 @@ def issue_crl(revoke_info, serial, lastup, nextup, extensions, crl end - def get_subject_key_id(cert) + def get_subject_key_id(cert, hex: true) asn1_cert = OpenSSL::ASN1.decode(cert) tbscert = asn1_cert.value[0] pkinfo = tbscert.value[6] publickey = pkinfo.value[1] pkvalue = publickey.value - OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase + digest = OpenSSL::Digest::SHA1.digest(pkvalue) + if hex + digest.unpack("H2"*20).join(":").upcase + else + digest + end end def openssl?(major = nil, minor = nil, fix = nil, patch = 0) @@ -189,6 +207,7 @@ def readwrite_loop(ctx, ssl) def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true, ctx_proc: nil, server_proc: method(:readwrite_loop), + accept_proc: proc{}, ignore_listener_error: false, &block) IO.pipe {|stop_pipe_r, stop_pipe_w| store = OpenSSL::X509::Store.new @@ -222,6 +241,7 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true readable, = IO.select([ssls, stop_pipe_r]) break if readable.include? stop_pipe_r ssl = ssls.accept + accept_proc.call(ssl) rescue OpenSSL::SSL::SSLError, IOError, Errno::EBADF, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET retry if ignore_listener_error @@ -268,7 +288,7 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true begin timeout = EnvUtil.apply_timeout_scale(30) th.join(timeout) or - th.raise(RuntimeError, "[start_server] thread did not exit in #{ timeout } secs") + th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs") rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError) # MiniTest::Skip is for the Ruby tree pend = $! @@ -316,4 +336,62 @@ def dup_public(key) end end +module OpenSSL::Certs + include OpenSSL::TestUtils + + module_function + + def ca_cert + ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Timestamp Root CA") + + ca_exts = [ + ["basicConstraints","CA:TRUE,pathlen:1",true], + ["keyUsage","keyCertSign, cRLSign",true], + ["subjectKeyIdentifier","hash",false], + ["authorityKeyIdentifier","keyid:always",false], + ] + OpenSSL::TestUtils.issue_cert(ca, Fixtures.pkey("rsa2048"), 1, ca_exts, nil, nil) + end + + def ts_cert_direct(key, ca_cert) + dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/OU=Timestamp/CN=Server Direct") + + exts = [ + ["basicConstraints","CA:FALSE",true], + ["keyUsage","digitalSignature, nonRepudiation", true], + ["subjectKeyIdentifier", "hash",false], + ["authorityKeyIdentifier","keyid,issuer", false], + ["extendedKeyUsage", "timeStamping", true] + ] + + OpenSSL::TestUtils.issue_cert(dn, key, 2, exts, ca_cert, Fixtures.pkey("rsa2048")) + end + + def intermediate_cert(key, ca_cert) + dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/OU=Timestamp/CN=Timestamp Intermediate CA") + + exts = [ + ["basicConstraints","CA:TRUE,pathlen:0",true], + ["keyUsage","keyCertSign, cRLSign",true], + ["subjectKeyIdentifier","hash",false], + ["authorityKeyIdentifier","keyid:always",false], + ] + + OpenSSL::TestUtils.issue_cert(dn, key, 3, exts, ca_cert, Fixtures.pkey("rsa2048")) + end + + def ts_cert_ee(key, intermediate, im_key) + dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/OU=Timestamp/CN=Server End Entity") + + exts = [ + ["keyUsage","digitalSignature, nonRepudiation", true], + ["subjectKeyIdentifier", "hash",false], + ["authorityKeyIdentifier","keyid,issuer", false], + ["extendedKeyUsage", "timeStamping", true] + ] + + OpenSSL::TestUtils.issue_cert(dn, key, 4, exts, intermediate, im_key) + end +end + end From 301457480039a7087129f291578a872f6e653ab6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 16 Feb 2020 16:08:43 +0900 Subject: [PATCH 769/878] Guard for OpenSSL::PKey::EC::Group::Error with unsupported platforms --- test/openssl/test_pkey_ec.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb index 1278a8b1baacbf..6b83ed76b9d948 100644 --- a/test/openssl/test_pkey_ec.rb +++ b/test/openssl/test_pkey_ec.rb @@ -290,13 +290,18 @@ def test_ec_point end def test_ec_point_add - group = OpenSSL::PKey::EC::Group.new(:GFp, 17, 2, 2) - group.point_conversion_form = :uncompressed - gen = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 05 01 })) - group.set_generator(gen, 19, 1) + begin + group = OpenSSL::PKey::EC::Group.new(:GFp, 17, 2, 2) + group.point_conversion_form = :uncompressed + gen = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 05 01 })) + group.set_generator(gen, 19, 1) - point_a = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 06 03 })) - point_b = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 10 0D })) + point_a = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 06 03 })) + point_b = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 10 0D })) + rescue OpenSSL::PKey::EC::Group::Error + pend "Patched OpenSSL rejected curve" if /unsupported field/ =~ $!.message + raise + end result = point_a.add(point_b) assert_equal B(%w{ 04 0D 07 }), result.to_octet_string(:uncompressed) From 0b55f8a14f28b070177ee0ddcd76edb46af9a395 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 16 Feb 2020 19:14:23 +0900 Subject: [PATCH 770/878] ext/openssl/extconf.rb: avoid -Werror=deprecated-declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It fails to build on Solaris: https://rubyci.org/logs/rubyci.s3.amazonaws.com/solaris11-gcc/ruby-master/log/20200216T090008Z.log.html.gz ``` ossl_cipher.c: 関数 ‘ossl_cipher_init’ 内: ossl_cipher.c:228:2: エラー: ‘EVP_md5’ is deprecated [-Werror=deprecated-declarations] 228 | EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv, | ^~~~~~~~~~~~~~ In file included from /usr/include/openssl/x509.h:73, from /usr/include/openssl/x509v3.h:63, from ossl.h:23, from ossl_cipher.c:10: /usr/include/openssl/evp.h:732:26: 備考: ここで宣言されています 732 | DEPRECATED const EVP_MD *EVP_md5(void); | ^~~~~~~ ``` --- ext/openssl/deprecation.rb | 4 ++++ ext/openssl/extconf.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb index 6af7d562fbd0da..fdf2d30ed0cc5e 100644 --- a/ext/openssl/deprecation.rb +++ b/ext/openssl/deprecation.rb @@ -12,6 +12,10 @@ def self.deprecated_warning_flag flag end + def self.restore_warning_flag + $warnflags = @warnflags + end + def self.check_func(func, header) have_func(func, header, deprecated_warning_flag) end diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 344d7596520bd5..87a682b4abd339 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -19,7 +19,7 @@ Logging::message "=== OpenSSL for Ruby configurator ===\n" -# Add -Werror=deprecated-declarations to $warnflags if available +# Check with -Werror=deprecated-declarations if available OpenSSL.deprecated_warning_flag ## @@ -185,5 +185,6 @@ def find_openssl_library Logging::message "=== Checking done. ===\n" create_header +OpenSSL.restore_warning_flag create_makefile("openssl") Logging::message "Done.\n" From 01138f5853a16068fb5a45ea39d3fc35fe664cb7 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 16 Feb 2020 19:55:19 +0900 Subject: [PATCH 771/878] Make OpenSSL::OSSL#test_memcmp_timing robust The test was too fragile. Actually, it fails on one of our CIs immediately after it was merged to ruby/ruby. https://gist.github.com/ko1/7ea4a5826641f79e2f9e041d83e45dba#file-brlog-trunk_clang_40-20200216-101730-L532-L535 https://gist.github.com/ko1/1c657746092b871359d8bf9e0ad28921#file-brlog-trunk-test4-20200216-104518-L473-L476 * Two measurements, a-b and a-c, must be interative instead of sequential; the execution time will be easily affected by disturbance (say, cron job or some external process invoked during measurement) * The comparison of the two results must be relative instead of absolute; slow machine may take several tens of seconds for each execution, and one delta second is too small. The test cases of a, b, and c are very extreme, so if the target method has a bug, the two execution times would be very different. So I think it is enough to check if the difference is less than 10 times. This change is the same as https://github.com/ruby/openssl/pull/332 --- test/openssl/test_ossl.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/openssl/test_ossl.rb b/test/openssl/test_ossl.rb index f517b1d83dffaa..f83e8136fa0f42 100644 --- a/test/openssl/test_ossl.rb +++ b/test/openssl/test_ossl.rb @@ -52,10 +52,13 @@ def test_memcmp_timing c = "y#{a}" a = "#{a}x" - n = 10_000 - a_b_time = Benchmark.measure { n.times { OpenSSL.fixed_length_secure_compare(a, b) } }.real - a_c_time = Benchmark.measure { n.times { OpenSSL.fixed_length_secure_compare(a, c) } }.real - assert_in_delta(a_b_time, a_c_time, 1, "fixed_length_secure_compare timing test failed") + a_b_time = a_c_time = 0 + 100.times do + a_b_time += Benchmark.measure { 100.times { OpenSSL.fixed_length_secure_compare(a, b) } }.real + a_c_time += Benchmark.measure { 100.times { OpenSSL.fixed_length_secure_compare(a, c) } }.real + end + assert_operator(a_b_time, :<, a_c_time * 10, "fixed_length_secure_compare timing test failed") + assert_operator(a_c_time, :<, a_b_time * 10, "fixed_length_secure_compare timing test failed") end end From e37e0bfa989bccf219e82ad7a73d415a8b7add80 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 16 Feb 2020 20:48:40 +0900 Subject: [PATCH 772/878] test/openssl/test_ssl.rb: skip a test on OpenSSL 1.1.d or later It fails due to "error:140AB18F:SSL routines:SSL_CTX_use_certificate:ee key too small". This is a tentative measurement to avoid the failure. https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian/ruby-master/log/20200216T093010Z.fail.html.gz test/openssl/fixture/chain/server.key should be longer. It should be documented how to create the files. BTW, it would be a good idea to dynamically create a key during test instead of fixed files. --- test/openssl/test_ssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index eb5b77be022c00..4ce677fe801392 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -188,7 +188,7 @@ def test_add_certificate_multiple_certs def test_add_certificate_chain_file ctx = OpenSSL::SSL::SSLContext.new assert ctx.add_certificate_chain_file(Fixtures.file_path("chain", "server.crt")) - end + end if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10101040 # XXX: The current server.crt seems too short for OpenSSL 1.1.1d or later def test_sysread_and_syswrite start_server { |port| From a6d007c70b3aa5b55c9ca774446130356bd36eac Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 16 Feb 2020 21:20:09 +0900 Subject: [PATCH 773/878] test/openssl/test_ts.rb: tentatively skip a failing test on CentOS 6.9 CentOS 6.9 will be EOL at Nov. Ruby 3.0 (or 2.8) release version will not support CentOS 6.9, so I'll remove the environment after it become green. --- test/openssl/test_ts.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb index c57f08cf7ac10a..9af502267e6b3f 100644 --- a/test/openssl/test_ts.rb +++ b/test/openssl/test_ts.rb @@ -67,15 +67,17 @@ def ts_cert_ee @ts_cert_ee ||= OpenSSL::Certs.ts_cert_ee(ee_key, intermediate_cert, intermediate_key) end - def test_create_request - req = OpenSSL::Timestamp::Request.new - assert_equal(true, req.cert_requested?) - assert_equal(1, req.version) - assert_nil(req.algorithm) - assert_equal("", req.message_imprint) - assert_nil(req.policy_id) - assert_nil(req.nonce) - end + # Tentatively, skip this test to make CentOS 6.9 CI green. + # After it become green, I'll remove CentOS 6.9 + ruby master from CI matrix + #def test_create_request + # req = OpenSSL::Timestamp::Request.new + # assert_equal(true, req.cert_requested?) + # assert_equal(1, req.version) + # assert_nil(req.algorithm) + # assert_equal("", req.message_imprint) + # assert_nil(req.policy_id) + # assert_nil(req.nonce) + #end def test_request_mandatory_fields req = OpenSSL::Timestamp::Request.new From 331755c5e97ff1a5c0a4a3ceed9c26ea2c580768 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 16 Feb 2020 22:16:22 +0900 Subject: [PATCH 774/878] Revert "test/openssl/test_ts.rb: tentatively skip a failing test on CentOS 6.9" This reverts commit a6d007c70b3aa5b55c9ca774446130356bd36eac. Unfortunately, the test fails on armv7l https://rubyci.org/logs/rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20200216T091708Z.fail.html.gz --- test/openssl/test_ts.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb index 9af502267e6b3f..c57f08cf7ac10a 100644 --- a/test/openssl/test_ts.rb +++ b/test/openssl/test_ts.rb @@ -67,17 +67,15 @@ def ts_cert_ee @ts_cert_ee ||= OpenSSL::Certs.ts_cert_ee(ee_key, intermediate_cert, intermediate_key) end - # Tentatively, skip this test to make CentOS 6.9 CI green. - # After it become green, I'll remove CentOS 6.9 + ruby master from CI matrix - #def test_create_request - # req = OpenSSL::Timestamp::Request.new - # assert_equal(true, req.cert_requested?) - # assert_equal(1, req.version) - # assert_nil(req.algorithm) - # assert_equal("", req.message_imprint) - # assert_nil(req.policy_id) - # assert_nil(req.nonce) - #end + def test_create_request + req = OpenSSL::Timestamp::Request.new + assert_equal(true, req.cert_requested?) + assert_equal(1, req.version) + assert_nil(req.algorithm) + assert_equal("", req.message_imprint) + assert_nil(req.policy_id) + assert_nil(req.nonce) + end def test_request_mandatory_fields req = OpenSSL::Timestamp::Request.new From 3281f70d7cd1e97f7540a4bf9e11f97a83d904f2 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 16 Feb 2020 21:00:27 +0100 Subject: [PATCH 775/878] NEWS.md: fix method references; remove surplus brackets --- NEWS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 22943d64a7b0c1..d20e34a4e59df8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -38,8 +38,8 @@ sufficient information, see the ChangeLog file or Redmine * New method - * Add #verify_hostname= and #verify_hostname to skip hostname verification - [[Feature #16555]] + * Add Net::HTTP#verify_hostname= and Net::HTTP#verify_hostname + to skip hostname verification. [Feature #16555] ## Compatibility issues (excluding feature bug fixes) From 1126f58c6208c5e5e071724c32d55dbebbcd1051 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 16 Feb 2020 21:00:34 +0100 Subject: [PATCH 776/878] NEWS.md: remove leading whitespace --- NEWS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index d20e34a4e59df8..372ed58d30602b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # NEWS for Ruby 2.8.0 (tentative; to be 3.0.0) -This document is a list of user visible feature changes since the - **2.7.0** release, except for bug fixes. +This document is a list of user visible feature changes +since the **2.7.0** release, except for bug fixes. Note that each entry is kept so brief that no reason behind or reference information is supplied with. For a full list of changes with all From 6ca0a62d21d4c4961db009f84b9a2b4f6520803b Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 16 Feb 2020 21:00:41 +0100 Subject: [PATCH 777/878] NEWS.md: improve language; markup as list item --- NEWS.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 372ed58d30602b..d99ed22fe3df11 100644 --- a/NEWS.md +++ b/NEWS.md @@ -49,11 +49,12 @@ sufficient information, see the ChangeLog file or Redmine /foo/.frozen? #=> true ``` -* The bundled gems +* Bundled gems - net-telnet and xmlrpc has been removed from the bundled gems. - If you interested in the maintain them, Please comment your plan - to https://github.com/ruby/xmlrpc or https://github.com/ruby/net-telnet. + * net-telnet and xmlrpc have been removed from the bundled gems. + If you are interested in maintaining them, please comment on + your plan to https://github.com/ruby/xmlrpc + or https://github.com/ruby/net-telnet. ## Stdlib compatibility issues (excluding feature bug fixes) From a9e10d3b8e72658cc4c3a26d8926595dbdc9d8a5 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 16 Feb 2020 21:00:49 +0100 Subject: [PATCH 778/878] NEWS.md: add missing ticket links --- NEWS.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index d99ed22fe3df11..1d5bd6adb842bb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,9 +10,11 @@ sufficient information, see the ChangeLog file or Redmine ## Language changes -* $SAFE is now a normal global variable with no special behavior. [Feature #16131] +* $SAFE is now a normal global variable with no special behavior. + [[Feature #16131]] -* yield in singleton class definitions in methods is now a SyntaxError. [Feature #15575] +* yield in singleton class definitions in methods is now a SyntaxError. + [[Feature #15575]] ## Command line options @@ -39,7 +41,7 @@ sufficient information, see the ChangeLog file or Redmine * New method * Add Net::HTTP#verify_hostname= and Net::HTTP#verify_hostname - to skip hostname verification. [Feature #16555] + to skip hostname verification. [[Feature #16555]] ## Compatibility issues (excluding feature bug fixes) @@ -67,5 +69,8 @@ sufficient information, see the ChangeLog file or Redmine [Feature #8709]: https://bugs.ruby-lang.org/issues/8709 [Feature #8948]: https://bugs.ruby-lang.org/issues/8948 +[Feature #15575]: https://bugs.ruby-lang.org/issues/15575 +[Feature #16131]: https://bugs.ruby-lang.org/issues/16131 [Feature #16274]: https://bugs.ruby-lang.org/issues/16274 [Feature #16377]: https://bugs.ruby-lang.org/issues/16377 +[Feature #16555]: https://bugs.ruby-lang.org/issues/16555 From 21ab4836142476cef9ad3e9690322124f3e6ace7 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2020 05:06:59 +0900 Subject: [PATCH 779/878] * 2020-02-17 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 47ffd300c26457..dfaacf14dea06b 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" From dec802d8b59900e57e18fa6712caf95f12324aea Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 17 Feb 2020 12:02:58 +0900 Subject: [PATCH 780/878] [ruby/io-console] [DOC] Improved about `intr:` https://github.com/ruby/io-console/commit/82b630cd79 --- ext/io/console/console.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index f67e6805bca52d..9baad2bf177fb4 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -360,9 +360,9 @@ ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter /* * call-seq: - * io.raw(min: nil, time: nil) {|io| } + * io.raw(min: nil, time: nil, intr: nil) {|io| } * - * Yields +self+ within raw mode. + * Yields +self+ within raw mode, and returns the result of the block. * * STDIN.raw(&:gets) * @@ -374,6 +374,9 @@ ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter * The parameter +time+ specifies the timeout in _seconds_ with a * precision of 1/10 of a second. (default: 0) * + * If the parameter +intr+ is +true+, enables break, interrupt, quit, + * and suspend special characters. + * * Refer to the manual page of termios for further details. * * You must require 'io/console' to use this method. @@ -387,11 +390,11 @@ console_raw(int argc, VALUE *argv, VALUE io) /* * call-seq: - * io.raw!(min: nil, time: nil) + * io.raw!(min: nil, time: nil, intr: nil) -> io * - * Enables raw mode. + * Enables raw mode, and returns +io+. * - * If the terminal mode needs to be back, use io.raw { ... }. + * If the terminal mode needs to be back, use io.raw { ... }. * * See IO#raw for details on the parameters. * @@ -487,7 +490,7 @@ nogvl_getch(void *p) /* * call-seq: - * io.getch(min: nil, time: nil) -> char + * io.getch(min: nil, time: nil, intr: nil) -> char * * Reads and returns a character in raw mode. * @@ -1494,7 +1497,7 @@ console_dev(int argc, VALUE *argv, VALUE klass) /* * call-seq: - * io.getch(min: nil, time: nil) -> char + * io.getch(min: nil, time: nil, intr: nil) -> char * * See IO#getch. */ From 3fbcdac3e40f68667a9a1b5a2efed215762260c0 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 17 Feb 2020 13:20:51 +0900 Subject: [PATCH 781/878] test/openssl/test_ssl.rb: skip OpenSSL::TestSSL#test_fallback_scsv on OpenSSL 1.1.1d or later. https://github.com/ruby/openssl/issues/336 --- test/openssl/test_ssl.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 4ce677fe801392..c938ec49ee1795 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -186,9 +186,10 @@ def test_add_certificate_multiple_certs end def test_add_certificate_chain_file + pend "The current server.crt seems too short for OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040 ctx = OpenSSL::SSL::SSLContext.new assert ctx.add_certificate_chain_file(Fixtures.file_path("chain", "server.crt")) - end if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10101040 # XXX: The current server.crt seems too short for OpenSSL 1.1.1d or later + end def test_sysread_and_syswrite start_server { |port| @@ -1421,6 +1422,7 @@ def test_get_ephemeral_key def test_fallback_scsv pend "Fallback SCSV is not supported" unless \ OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv) + pend "This test seems to fail on OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040 start_server do |port| ctx = OpenSSL::SSL::SSLContext.new From 99b191d83f96dd7f56b673bb1b7dbf96b68dc3e6 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Mon, 17 Feb 2020 08:28:33 +0000 Subject: [PATCH 782/878] [ruby/openssl] ts: simplify OpenSSL::Timestamp::Request#algorithm Stop the special treatment of invalid hashAlgorithm of the message imprint. Those invalid values can only appear after the object is instantiated, before the user sets an actual message digest algorithm. OpenSSL::Timestamp::TokenInfo#algorithm already does the same. Also, remove the test case "test_create_request" since it does not make much sense. Those fields are to be set by the user after creation of the object and checking the initial value is pointless. Fixes: https://github.com/ruby/openssl/issues/335 https://github.com/ruby/openssl/commit/890a6476fa --- ext/openssl/ossl_ts.c | 7 +------ test/openssl/test_ts.rb | 10 ---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c index 24f5289cdbc965..ba0df750cf846d 100644 --- a/ext/openssl/ossl_ts.c +++ b/ext/openssl/ossl_ts.c @@ -217,7 +217,7 @@ ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self) * algorithm that was used to create the message imprint digest. * * call-seq: - * request.get_algorithm -> string or nil + * request.algorithm -> string */ static VALUE ossl_ts_req_get_algorithm(VALUE self) @@ -225,15 +225,10 @@ ossl_ts_req_get_algorithm(VALUE self) TS_REQ *req; TS_MSG_IMPRINT *mi; X509_ALGOR *algor; - int algi; GetTSRequest(self, req); mi = TS_REQ_get_msg_imprint(req); algor = TS_MSG_IMPRINT_get_algo(mi); - algi = OBJ_obj2nid(algor->algorithm); - if (algi == NID_undef || algi == NID_ccitt) - return Qnil; - return get_asn1obj(algor->algorithm); } diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb index c57f08cf7ac10a..1fa4a7cf791737 100644 --- a/test/openssl/test_ts.rb +++ b/test/openssl/test_ts.rb @@ -67,16 +67,6 @@ def ts_cert_ee @ts_cert_ee ||= OpenSSL::Certs.ts_cert_ee(ee_key, intermediate_cert, intermediate_key) end - def test_create_request - req = OpenSSL::Timestamp::Request.new - assert_equal(true, req.cert_requested?) - assert_equal(1, req.version) - assert_nil(req.algorithm) - assert_equal("", req.message_imprint) - assert_nil(req.policy_id) - assert_nil(req.nonce) - end - def test_request_mandatory_fields req = OpenSSL::Timestamp::Request.new assert_raise(OpenSSL::Timestamp::TimestampError) do From 8f91dc712ad66a41edcfb8e5f55193d8de370c66 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Mon, 17 Feb 2020 08:14:47 +0000 Subject: [PATCH 783/878] [ruby/openssl] test/openssl/test_ssl: skip test_fallback_scsv if necessary Run the test case only when the OpenSSL supports both TLS 1.1 and TLS 1.2. Note that the fallback SCSV mechanism is for TLS 1.2 or older and not for 1.3. Fixes: https://github.com/ruby/openssl/issues/336 https://github.com/ruby/openssl/commit/6f2e6d7cf7 --- test/openssl/test_ssl.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index c938ec49ee1795..ee468ad96c59ee 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -1420,6 +1420,10 @@ def test_get_ephemeral_key end def test_fallback_scsv + supported = check_supported_protocol_versions + return unless supported.include?(OpenSSL::SSL::TLS1_1_VERSION) && + supported.include?(OpenSSL::SSL::TLS1_2_VERSION) + pend "Fallback SCSV is not supported" unless \ OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv) pend "This test seems to fail on OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040 From 2032432dadcfc564daf4bc7570f589d023a30c6a Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 17 Feb 2020 20:51:46 +0900 Subject: [PATCH 784/878] Partially revert "test/openssl/test_ssl.rb: skip OpenSSL::TestSSL#test_fallback_scsv" A skip guard for test_fallback_scsv has been added in upstream repository. --- test/openssl/test_ssl.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index ee468ad96c59ee..cce1a4472eae31 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -1426,7 +1426,6 @@ def test_fallback_scsv pend "Fallback SCSV is not supported" unless \ OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv) - pend "This test seems to fail on OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040 start_server do |port| ctx = OpenSSL::SSL::SSLContext.new From 0ae9780352319e527454ec49a6f88b5b6b007195 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 17 Feb 2020 22:15:20 +0900 Subject: [PATCH 785/878] Promote net-protocol to default gems --- lib/net/protocol/net-protocol.gemspec | 29 +++++++++++++++++++++++++++ lib/net/protocol/version.rb | 5 +++++ tool/sync_default_gems.rb | 5 +++++ 3 files changed, 39 insertions(+) create mode 100644 lib/net/protocol/net-protocol.gemspec create mode 100644 lib/net/protocol/version.rb diff --git a/lib/net/protocol/net-protocol.gemspec b/lib/net/protocol/net-protocol.gemspec new file mode 100644 index 00000000000000..3ed57922feeed6 --- /dev/null +++ b/lib/net/protocol/net-protocol.gemspec @@ -0,0 +1,29 @@ +begin + require_relative "lib/net/protocol/version" +rescue LoadError # Fallback to load version file in ruby core repository + require_relative "version" +end + +Gem::Specification.new do |spec| + spec.name = "net-protocol" + spec.version = Net::Protocol::VERSION + spec.authors = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{The abstruct interface for net-* client.} + spec.description = %q{The abstruct interface for net-* client.} + spec.homepage = "https://github.com/ruby/net-protocol" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/lib/net/protocol/version.rb b/lib/net/protocol/version.rb new file mode 100644 index 00000000000000..f80c5187a2cd62 --- /dev/null +++ b/lib/net/protocol/version.rb @@ -0,0 +1,5 @@ +module Net + class Protocol + VERSION = "0.1.0" + end +end \ No newline at end of file diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 31604e06ed13e0..2ca3c24ec161d8 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -59,6 +59,7 @@ # * https://github.com/ruby/tempfile # * https://github.com/ruby/tmpdir # * https://github.com/ruby/English +# * https://github.com/ruby/net-protocol # require 'fileutils' @@ -116,6 +117,7 @@ tempfile: "ruby/tempfile", tmpdir: "ruby/tmpdir", English: "ruby/English", + "net-protocol": "ruby/net-protocol", } def sync_default_gems(gem) @@ -274,6 +276,9 @@ def sync_default_gems(gem) when "net-smtp" sync_lib "net-smtp" mv "lib/net-smtp.gemspec", "lib/net/smtp" + when "net-protocol" + sync_lib "net-protocol" + mv "lib/net-protocol.gemspec", "lib/net/protocol" when "readline-ext" rm_rf(%w[ext/readline test/readline]) cp_r("#{upstream}/ext/readline", "ext") From c42c6a5950963a6840dcd09f68cad9896b6bf9b3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 17 Feb 2020 22:16:13 +0900 Subject: [PATCH 786/878] Move the entry of net-protocol on docs --- doc/maintainers.rdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index fb78e2bb274a4f..53402c9ce8a581 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -58,8 +58,6 @@ Zachary Scott (zzak) Shugo Maeda (shugo) [lib/net/http.rb, lib/net/https.rb] NARUSE, Yui (naruse) -[lib/net/protocol.rb] - _unmaintained_ [lib/open-uri.rb] Tanaka Akira (akr) [lib/optparse.rb, lib/optparse/*] @@ -198,6 +196,9 @@ Zachary Scott (zzak) _unmaintained_ https://github.com/ruby/net-smtp https://rubygems.org/gems/net-smtp +[lib/net/protocol.rb] + _unmaintained_ + https://github.com/ruby/net-protocol [lib/observer.rb] _unmaintained_ https://github.com/ruby/observer From 9239226e3928bf7d3aef8c845b9251e222bac7ed Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2020 22:16:32 +0900 Subject: [PATCH 787/878] * append newline at EOF. [ci skip] --- lib/net/protocol/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/net/protocol/version.rb b/lib/net/protocol/version.rb index f80c5187a2cd62..ec51a4c4ef9427 100644 --- a/lib/net/protocol/version.rb +++ b/lib/net/protocol/version.rb @@ -2,4 +2,4 @@ module Net class Protocol VERSION = "0.1.0" end -end \ No newline at end of file +end From dcb05179a969a024bbd3b7622f67468ddf07638c Mon Sep 17 00:00:00 2001 From: aycabta Date: Sat, 15 Feb 2020 23:05:36 +0900 Subject: [PATCH 788/878] [ruby/irb] Version 1.2.3 https://github.com/ruby/irb/commit/dd56e06df5 --- lib/irb/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/irb/version.rb b/lib/irb/version.rb index 337b14443734a7..7669c1c5354386 100644 --- a/lib/irb/version.rb +++ b/lib/irb/version.rb @@ -11,7 +11,7 @@ # module IRB # :nodoc: - VERSION = "1.2.2" + VERSION = "1.2.3" @RELEASE_VERSION = VERSION - @LAST_UPDATE_DATE = "2020-02-14" + @LAST_UPDATE_DATE = "2020-02-15" end From 5ef383552dfc4e0e3c76d3be2ebab71f8c0f59d4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 17 Feb 2020 15:24:57 +0900 Subject: [PATCH 789/878] [ruby/io-console] Just ignore the extension on other than CRuby https://github.com/ruby/io-console/commit/41b6f09574 --- ext/io/console/extconf.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb index a6049da667544d..3d7e75e2afab66 100644 --- a/ext/io/console/extconf.rb +++ b/ext/io/console/extconf.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require 'mkmf' -ok = true +ok = true if RUBY_ENGINE == "ruby" hdr = nil case when macro_defined?("_WIN32", "") @@ -14,8 +14,9 @@ %w"stty gtty".each {|f| have_func(f, hdr)} else ok = false -end -if ok +end if ok +case ok +when true have_header("sys/ioctl.h") if hdr # rb_check_hash_type: 1.9.3 # rb_io_get_write_io: 1.9.1 @@ -27,4 +28,6 @@ create_makefile("io/console") {|conf| conf << "\n""VK_HEADER = #{vk_header}\n" } +when nil + File.write("Makefile", dummy_makefile($srcdir).join("")) end From 2115a3937d0e2cf845d092aec1f6c25292ddd6ce Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 18 Feb 2020 11:34:38 +0900 Subject: [PATCH 790/878] [ruby/io-console] bump up to 0.5.6 --- ext/io/console/io-console.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index 40f4c6c5436517..814bd4ef7d483e 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -1,5 +1,5 @@ # -*- ruby -*- -_VERSION = "0.5.5" +_VERSION = "0.5.6" date = %w$Date:: $[1] Gem::Specification.new do |s| From 38070ccdeb02022a0d9def239651c82cae9a0e79 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2020 11:35:00 +0900 Subject: [PATCH 791/878] * 2020-02-18 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index dfaacf14dea06b..7840abd2dc6c46 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" From 041c2932e336b509b0ddc1fdbd9f160bce8d4893 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 18 Feb 2020 14:34:26 +0900 Subject: [PATCH 792/878] Pass keyword arguments to IOs properly [Bug #16639] --- io.c | 8 ++++++-- test/ruby/test_argf.rb | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/io.c b/io.c index 201ec9bede62fc..19fe51bcf6d935 100644 --- a/io.c +++ b/io.c @@ -12430,10 +12430,14 @@ argf_block_call_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf)) return Qnil; } +#define ARGF_block_call(mid, argc, argv, func, argf) \ + rb_block_call_kw(ARGF.current_file, mid, argc, argv, \ + func, argf, rb_keyword_given_p()) + static void argf_block_call(ID mid, int argc, VALUE *argv, VALUE argf) { - VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_i, argf); + VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_i, argf); if (ret != Qundef) ARGF.next_p = 1; } @@ -12449,7 +12453,7 @@ argf_block_call_line_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf)) static void argf_block_call_line(ID mid, int argc, VALUE *argv, VALUE argf) { - VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_line_i, argf); + VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_line_i, argf); if (ret != Qundef) ARGF.next_p = 1; } diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb index a76bdccf45cfd7..277fa368f5b5dc 100644 --- a/test/ruby/test_argf.rb +++ b/test/ruby/test_argf.rb @@ -725,6 +725,13 @@ def test_each_line_paragraph ["\"a\\n\\n\"", "\"b\\n\""], []) end + def test_each_line_chomp + assert_in_out_err(['-e', 'ARGF.each_line(chomp: false) {|para| p para}'], "a\nb\n", + ["\"a\\n\"", "\"b\\n\""], []) + assert_in_out_err(['-e', 'ARGF.each_line(chomp: true) {|para| p para}'], "a\nb\n", + ["\"a\"", "\"b\""], []) + end + def test_each_byte ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f| {# From 5fd5666dcc32fea9bfc46cd4efea1959ffa9ad69 Mon Sep 17 00:00:00 2001 From: S-H-GAMELINKS Date: Wed, 19 Feb 2020 08:43:47 +0900 Subject: [PATCH 793/878] support multi-run test for test_readline.rb --- test/readline/test_readline.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 93cadbb930925c..5e1f1385ee6b44 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -21,6 +21,8 @@ def teardown Readline.point = 0 rescue NotImplementedError end + Readline.special_prefixes = "" + Readline.completion_append_character = nil Readline.input = nil Readline.output = nil SAVED_ENV.each_with_index {|k, i| ENV[k] = @saved_env[i] } From 90d082e374abb2f76075ec143b255e3a53157b41 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2020 13:47:56 +0900 Subject: [PATCH 794/878] * 2020-02-19 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 7840abd2dc6c46..3edfc60af3091c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" From f0b815dc670b61eba1daaa67a8613ac431d32b16 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 28 Nov 2019 12:18:17 +0900 Subject: [PATCH 795/878] `Proc` made by `Symbol#to_proc` should be a lambda [Bug #16260] --- NEWS.md | 8 ++++++++ proc.c | 1 + spec/ruby/core/proc/shared/to_s.rb | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 1d5bd6adb842bb..203fa08f7805ff 100644 --- a/NEWS.md +++ b/NEWS.md @@ -34,6 +34,13 @@ sufficient information, see the ChangeLog file or Redmine * Hash#transform_keys now accepts a hash that maps keys to new keys. [[Feature #16274]] +* Symbol + + * Modified method + + * Symbol#to_proc now returns a lambda Proc. + [[Feature #16260]] + ## Stdlib updates (outstanding ones only) * Net::HTTP @@ -71,6 +78,7 @@ sufficient information, see the ChangeLog file or Redmine [Feature #8948]: https://bugs.ruby-lang.org/issues/8948 [Feature #15575]: https://bugs.ruby-lang.org/issues/15575 [Feature #16131]: https://bugs.ruby-lang.org/issues/16131 +[Feature #16260]: https://bugs.ruby-lang.org/issues/16260 [Feature #16274]: https://bugs.ruby-lang.org/issues/16274 [Feature #16377]: https://bugs.ruby-lang.org/issues/16377 [Feature #16555]: https://bugs.ruby-lang.org/issues/16555 diff --git a/proc.c b/proc.c index 83ec61d0f52939..e0cba7109b85c4 100644 --- a/proc.c +++ b/proc.c @@ -697,6 +697,7 @@ sym_proc_new(VALUE klass, VALUE sym) GetProcPtr(procval, proc); vm_block_type_set(&proc->block, block_type_symbol); + proc->is_lambda = TRUE; RB_OBJ_WRITE(procval, &proc->block.as.symbol, sym); return procval; } diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb index 8b9c83927fc62d..7edd11b1e16d23 100644 --- a/spec/ruby/core/proc/shared/to_s.rb +++ b/spec/ruby/core/proc/shared/to_s.rb @@ -46,7 +46,7 @@ def hello; end describe "for a proc created with Symbol#to_proc" do it "returns a description including '(&:symbol)'" do proc = :foobar.to_proc - proc.send(@method).should =~ /^#$/ + proc.send(@method).should.include?('(&:foobar)') end it "has a binary encoding" do From c4794ed73ad348a61a7cfbe3da0a7eb49ba46eb9 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 18 Feb 2020 23:16:19 -0800 Subject: [PATCH 796/878] Avoid jumping to a wrong destination when the next insn is already compiled by former branches. --- test/ruby/test_jit.rb | 10 ++++++++++ tool/ruby_vm/views/_mjit_compile_insn.erb | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index a8ce18b48c9738..f3dca57e835dbd 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -828,6 +828,16 @@ def test(recv) end; end + def test_jump_to_precompiled_branch + assert_eval_with_jit("#{<<~'begin;'}\n#{<<~'end;'}", stdout: ".0", success_count: 1, min_calls: 1) + begin; + def test(foo) + ".#{foo unless foo == 1}" if true + end + print test(0) + end; + end + def test_clean_so if RUBY_PLATFORM.match?(/mswin/) skip 'Removing so file is randomly failing on AppVeyor/RubyCI mswin due to Permission Denied.' diff --git a/tool/ruby_vm/views/_mjit_compile_insn.erb b/tool/ruby_vm/views/_mjit_compile_insn.erb index b2dea03e380f27..8f451216150583 100644 --- a/tool/ruby_vm/views/_mjit_compile_insn.erb +++ b/tool/ruby_vm/views/_mjit_compile_insn.erb @@ -76,9 +76,14 @@ } fprintf(f, "}\n"); % -% # compiler: If insn has conditional JUMP, the branch which is not targeted by JUMP should be compiled too. +% # compiler: If insn has conditional JUMP, the code should go to the branch not targeted by JUMP next. % if insn.expr.expr =~ /if\s+\([^{}]+\)\s+\{[^{}]+JUMP\([^)]+\);[^{}]+\}/ - compile_insns(f, body, b->stack_size, pos + insn_len(insn), status); + if (ALREADY_COMPILED_P(status, pos + insn_len(insn))) { + fprintf(f, "goto label_%d;\n", pos + insn_len(insn)); + } + else { + compile_insns(f, body, b->stack_size, pos + insn_len(insn), status); + } % end % % # compiler: If insn returns (leave) or does longjmp (throw), the branch should no longer be compiled. TODO: create attr for it? From 57c26231ddaee50608aa1c97084b3f3394204612 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Thu, 20 Feb 2020 00:13:44 +0900 Subject: [PATCH 797/878] Use `brew upgrade` instead of `brew update` --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a26475000d924c..7203db371da18e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -36,7 +36,7 @@ jobs: run: | export WAITS='5 60' cd src - tool/travis_retry.sh brew update + tool/travis_retry.sh brew upgrade tool/travis_retry.sh brew install gdbm gmp libffi openssl@1.1 zlib autoconf automake libtool readline - name: Set ENV run: | From 4bc16244be6c779f843ba7a34f19416901900886 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 20 Feb 2020 00:14:24 +0900 Subject: [PATCH 798/878] * 2020-02-20 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 3edfc60af3091c..b576722176fe3f 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" From 97e8212a767689c2acb201d3da365ba4d599cf96 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Wed, 19 Feb 2020 20:57:38 +0100 Subject: [PATCH 799/878] doc/make_cheatsheet.md: fix typos --- doc/make_cheatsheet.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/make_cheatsheet.md b/doc/make_cheatsheet.md index c9cc636f06b9ef..c511b293c1f94f 100644 --- a/doc/make_cheatsheet.md +++ b/doc/make_cheatsheet.md @@ -36,9 +36,9 @@ $ make check It runs (about) three test suites: * `make test` (a test suite for the interpreter core) -* `make test-all` : (for all builtin classes and libraries) -* `make test-spec` : (a conformance test suite for Ruby implementations) -* `make test-bundler` : (a test suite for the bundler examples) +* `make test-all` (for all builtin classes and libraries) +* `make test-spec` (a conformance test suite for Ruby implementations) +* `make test-bundler` (a test suite for the bundler examples) ## How to run the test suite with log From eed7235e33ab55209c33bf255949be4f26b8c7e2 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Wed, 19 Feb 2020 20:59:21 +0100 Subject: [PATCH 800/878] hash.c: [DOC] fix typos --- hash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hash.c b/hash.c index 33bc754c37293f..8145dde6bc3897 100644 --- a/hash.c +++ b/hash.c @@ -5542,7 +5542,7 @@ env_reject_bang(VALUE ehash) * * Yields each environment variable name and its value as a 2-element Array, * deleting each environment variable for which the block returns a truthy value, - * and returning ENV (regardless or whether any deletions): + * and returning ENV (regardless of whether any deletions): * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') * ENV.delete_if { |name, value| name.start_with?('b') } # => ENV * ENV # => {"foo"=>"0"} @@ -6003,7 +6003,7 @@ env_assoc(VALUE env, VALUE key) * ENV.value?(value) -> true or false * ENV.has_value?(value) -> true or false * - * Returns +true+ if +value+ is the value for some environment variable name, +false+ otherwise.: + * Returns +true+ if +value+ is the value for some environment variable name, +false+ otherwise: * ENV.replace('foo' => '0', 'bar' => '1') * ENV.value?('0') # => true * ENV.has_value?('0') # => true @@ -6090,7 +6090,7 @@ env_rassoc(VALUE dmy, VALUE obj) * ENV.key('2') # => nil * Raises an exception if +value+ is invalid: * ENV.key(Object.new) # raises TypeError (no implicit conversion of Object into String) - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values] + * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. */ static VALUE env_key(VALUE dmy, VALUE value) From 036a68ae2c6f3214cb5488da412444d773cbb65d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 20 Feb 2020 08:43:26 +0900 Subject: [PATCH 801/878] [DOC] Fixed `ENV.rassoc` result order [ci skip] --- hash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hash.c b/hash.c index 8145dde6bc3897..10923f67ff1f4c 100644 --- a/hash.c +++ b/hash.c @@ -6037,8 +6037,9 @@ env_has_value(VALUE dmy, VALUE obj) * call-seq: * ENV.rassoc(value) * - * Returns a 2-element Array containing the value and name of the *first* *found* environment variable - * that has value +value+, if one exists: + * Returns a 2-element Array containing the name and value of the + * *first* *found* environment variable that has value +value+, if one + * exists: * ENV.replace('foo' => '0', 'bar' => '0') * ENV.rassoc('0') # => ["bar", "0"] * The order in which environment variables are examined is OS-dependent. From 6788c375b15232e684dbd4b993b508413f2c74a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 18 Feb 2020 12:39:30 +0900 Subject: [PATCH 802/878] suppress clang warnings Starting clang 11, casts between pointer and (narrower-than-pointer) int are now warned. However all such thing in our repository are guaranteed safe. Let's suppress the warnings. --- mjit.h | 6 ++++-- vm_method.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mjit.h b/mjit.h index 44cb6571b72f44..bdc186f788507a 100644 --- a/mjit.h +++ b/mjit.h @@ -125,13 +125,15 @@ mjit_exec(rb_execution_context_t *ec) total_calls = ++body->total_calls; func = body->jit_func; - if (UNLIKELY((uintptr_t)func <= (uintptr_t)LAST_JIT_ISEQ_FUNC)) { + uintptr_t func_i = (uintptr_t)func; + if (UNLIKELY(func_i <= LAST_JIT_ISEQ_FUNC)) { # ifdef MJIT_HEADER RB_DEBUG_COUNTER_INC(mjit_frame_JT2VM); # else RB_DEBUG_COUNTER_INC(mjit_frame_VM2VM); # endif - switch ((enum rb_mjit_iseq_func)func) { + ASSUME(func_i <= LAST_JIT_ISEQ_FUNC); + switch ((enum rb_mjit_iseq_func)func_i) { case NOT_ADDED_JIT_ISEQ_FUNC: RB_DEBUG_COUNTER_INC(mjit_exec_not_added); if (total_calls == mjit_opts.min_calls && mjit_target_iseq_p(body)) { diff --git a/vm_method.c b/vm_method.c index 900096629d72f2..7b29b2c20ce27d 100644 --- a/vm_method.c +++ b/vm_method.c @@ -288,7 +288,7 @@ rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *de setup_method_cfunc_struct(UNALIGNED_MEMBER_PTR(def, body.cfunc), rb_f_notimplement, -1); return; case VM_METHOD_TYPE_OPTIMIZED: - def->body.optimize_type = (enum method_optimized_type)opts; + def->body.optimize_type = (enum method_optimized_type)(intptr_t)opts; return; case VM_METHOD_TYPE_REFINED: { From 984e0233fe0c60fb5c6c5f937c214e30c1b7c6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 17 Feb 2020 16:57:45 +0900 Subject: [PATCH 803/878] TestTime#test_memsize: skip when on GC_DEBUG GC_DEBUG=1 makes this test fail because it changes the size of struct RVALUE. I don't think the test is useful then. Let's just skip. --- gc.c | 1 + test/ruby/test_time.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/gc.c b/gc.c index f0de80ca71af9d..fba751b24c199d 100644 --- a/gc.c +++ b/gc.c @@ -11851,6 +11851,7 @@ Init_GC(void) rb_mGC = rb_define_module("GC"); gc_constants = rb_hash_new(); + rb_hash_aset(gc_constants, ID2SYM(rb_intern("DEBUG")), GC_DEBUG ? Qtrue : Qfalse); rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_SIZE")), SIZET2NUM(sizeof(RVALUE))); rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_OBJ_LIMIT")), SIZET2NUM(HEAP_PAGE_OBJ_LIMIT)); rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_BITMAP_SIZE")), SIZET2NUM(HEAP_PAGE_BITMAP_SIZE)); diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 0ff09f3fcba53b..785376f09cbf98 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -1256,6 +1256,7 @@ def to_s; "Inexact"; end def test_memsize # Time objects are common in some code, try to keep them small skip "Time object size test" if /^(?:i.?86|x86_64)-linux/ !~ RUBY_PLATFORM + skip "GC is in debug" if GC::INTERNAL_CONSTANTS[:DEBUG] require 'objspace' t = Time.at(0) size = GC::INTERNAL_CONSTANTS[:RVALUE_SIZE] From c7e6dbd5ab488a42f2d1a8f3503480b92cd0aa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 13 Feb 2020 12:53:49 +0900 Subject: [PATCH 804/878] fix arity mismatch This is a ruby method with arity zero. Which means, this function takes one argument (that is self). --- thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thread.c b/thread.c index f5efe40ab814ff..b84fd17c84061f 100644 --- a/thread.c +++ b/thread.c @@ -309,7 +309,7 @@ static int rb_thread_debug_enabled; */ static VALUE -rb_thread_s_debug(void) +rb_thread_s_debug(VALUE _) { return INT2NUM(rb_thread_debug_enabled); } From 8920e2040a8980fdceeb9b629b0ef79fac380960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Sat, 15 Feb 2020 18:56:44 +0900 Subject: [PATCH 805/878] hide vm_ep_in_heap_p_ `make leaked-globals` points out that this function is leaked. This has not been detected in our CI because it is defined only when VM_CHECK_MODE is nonzero. Just make it static and everytihng goes well. --- vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm.c b/vm.c index 8c7abb359953e2..bf60f91f8989cc 100644 --- a/vm.c +++ b/vm.c @@ -156,7 +156,7 @@ VM_EP_IN_HEAP_P(const rb_execution_context_t *ec, const VALUE *ep) } } -int +static int vm_ep_in_heap_p_(const rb_execution_context_t *ec, const VALUE *ep) { if (VM_EP_IN_HEAP_P(ec, ep)) { From 7aa3f1fe697f03fc38989d72d2decd5037b8882c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 13 Feb 2020 13:33:49 +0900 Subject: [PATCH 806/878] printf can be a macro Namely glibc has this macro on -DFORTIFY_SOURCE. We have to prevent macro redefinition with different macro body. --- compile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/compile.c b/compile.c index ace7a468e952f6..985debe559edb7 100644 --- a/compile.c +++ b/compile.c @@ -189,6 +189,7 @@ const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO}; #endif #if CPDEBUG > 1 || CPDEBUG < 0 +#undef printf #define printf ruby_debug_printf #define debugs if (compile_debug_print_indent(1)) ruby_debug_printf #define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs((msg), stderr)), (v)) From 4e6bae47c833cd82942172712f30ac23ab06c9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 13 Feb 2020 13:59:41 +0900 Subject: [PATCH 807/878] ext/-test-/cxxanyargs: prevent have_devel check The `cxx.try_compile` command in this file kicks `cxx.have_devel?` internally, which recursively calls `cxx.try_link` with a different source code. We don't want that happen (the source code compiled in this file must be the first one). We need to fake the system. --- ext/-test-/cxxanyargs/extconf.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb index 08d8c83010eabf..f1289845223921 100644 --- a/ext/-test-/cxxanyargs/extconf.rb +++ b/ext/-test-/cxxanyargs/extconf.rb @@ -2,12 +2,19 @@ cxx = MakeMakefile["C++"] +# #### have_devel hack #### +# cxx.try_compile tries to detect compilers, but the try_compile below is +# trying to detect a compiler in a different way. We need to prevent the +# default detection routine. + +cxx.instance_variable_set(:'@have_devel', true) + ok = cxx.try_compile(<<~'begin', "") do |x| #include "ruby/config.h" namespace { - typedef int conftest[SIZEOF_LONG == sizeof(long) ? 1 : -1]; - typedef int conftest[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1]; + typedef int conftest1[SIZEOF_LONG == sizeof(long) ? 1 : -1]; + typedef int conftest2[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1]; } int @@ -21,6 +28,8 @@ x.sub! %<#include "ruby.h">, '' end +cxx.instance_variable_set(:'@have_devel', ok) + if ok $srcs = %w[cxxanyargs.cpp] failures = Dir.glob($srcdir + "/failure*.cpp").map {|n| File.basename(n)} From 49bb2e64ccca130f8e1a0b6ad36d442c1ad44ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Sat, 15 Feb 2020 18:30:53 +0900 Subject: [PATCH 808/878] avoid defining inline Recent (since 2012 maybe?) MSVC ships a header named xkeycheck.h, which (kindly!) aborts compilation on redefinition of C++ keywords. Let's not define this in case of C++. --- win32/Makefile.sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ea5789fd3e9d4d..bd350dcd3175ed 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -860,8 +860,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define RUBY_SETJMP(env) _setjmp(env) #define RUBY_LONGJMP(env,val) longjmp(env,val) #define RUBY_JMP_BUF jmp_buf -#define inline __inline #ifndef __cplusplus +#define inline __inline !if $(MSC_VER) >= 1800 #define restrict __restrict !else From 75863554233a40f74d40138b7a88f07c010281a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 13 Feb 2020 15:10:16 +0900 Subject: [PATCH 809/878] comma at the end of enum is a C++11ism Comma at the end of enum is allowed in C since C99. We can use them internally. However when it comes to extension libraries, they could be written in different C++ versions. We cannot assume sometihng. Public headers shall keep compatibilities. --- include/ruby/ruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 8ff0e97f269aa3..a97f87fc08a408 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -871,7 +871,7 @@ VALUE rb_obj_reveal(VALUE obj, VALUE klass); /* do not use this API to change kl #define RVALUE_EMBED_LEN_MAX RVALUE_EMBED_LEN_MAX enum ruby_rvalue_flags { - RVALUE_EMBED_LEN_MAX = 3, + RVALUE_EMBED_LEN_MAX = 3 }; #define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX From 56d33b3ea8cd2f8360ec891da10552d708522ab7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 20 Feb 2020 13:39:27 +0900 Subject: [PATCH 810/878] Fixed missing `return` Get rid of double writing. --- compile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/compile.c b/compile.c index 985debe559edb7..fa3505a03d8c2d 100644 --- a/compile.c +++ b/compile.c @@ -9758,6 +9758,7 @@ ibf_dump_write_small_value(struct ibf_dump *dump, VALUE x) { if (sizeof(VALUE) > 8 || CHAR_BIT != 8) { ibf_dump_write(dump, &x, sizeof(VALUE)); + return; } enum { max_byte_length = sizeof(VALUE) + 1 }; From f5abcf767edcd475263ca9d8c06d0bb32a417ba9 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 13 Feb 2020 14:06:07 +0900 Subject: [PATCH 811/878] [ruby/rdoc] Removed `RDoc::Context::Section#sequence` It has been deprecated since 2011. https://github.com/ruby/rdoc/commit/5c2aa0f77d --- lib/rdoc/context/section.rb | 13 ------------- test/rdoc/test_rdoc_context_section.rb | 8 -------- 2 files changed, 21 deletions(-) diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb index 11f9ceaf871536..5fef4a9ffc7818 100644 --- a/lib/rdoc/context/section.rb +++ b/lib/rdoc/context/section.rb @@ -34,8 +34,6 @@ class RDoc::Context::Section attr_reader :title - @@sequence = "SEC00000" - ## # Creates a new section with +title+ and +comment+ @@ -43,9 +41,6 @@ def initialize parent, title, comment @parent = parent @title = title ? title.strip : title - @@sequence = @@sequence.succ - @sequence = @@sequence.dup - @comments = [] add_comment comment @@ -233,13 +228,5 @@ def remove_comment comment end end - ## - # Section sequence number (deprecated) - - def sequence - warn "RDoc::Context::Section#sequence is deprecated, use #aref" - @sequence - end - end diff --git a/test/rdoc/test_rdoc_context_section.rb b/test/rdoc/test_rdoc_context_section.rb index c520ad05a56504..24c68c49dd9f1a 100644 --- a/test/rdoc/test_rdoc_context_section.rb +++ b/test/rdoc/test_rdoc_context_section.rb @@ -143,13 +143,5 @@ def test_remove_comment_document assert_equal doc(other_comment.parse), loaded.comments end - def test_sequence - _, err = verbose_capture_output do - assert_match(/\ASEC\d{5}\Z/, @s.sequence) - end - - assert_equal "#{@S}#sequence is deprecated, use #aref\n", err - end - end From e9d872a06e0847c72edda793e21b116ce269d854 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 20 Feb 2020 21:22:56 +0900 Subject: [PATCH 812/878] Promote net-imap to the default gems --- lib/net/imap.rb | 2 +- lib/net/imap/net-imap.gemspec | 25 +++++++++++++++++++++++++ lib/net/imap/version.rb | 5 +++++ tool/sync_default_gems.rb | 5 +++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 lib/net/imap/net-imap.gemspec create mode 100644 lib/net/imap/version.rb diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 720acbc86d0b42..704fdef382aecb 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -18,7 +18,7 @@ require "monitor" require "digest/md5" require "strscan" -require_relative 'protocol' +require 'net/protocol' begin require "openssl" rescue LoadError diff --git a/lib/net/imap/net-imap.gemspec b/lib/net/imap/net-imap.gemspec new file mode 100644 index 00000000000000..bd4e4509ef1ee3 --- /dev/null +++ b/lib/net/imap/net-imap.gemspec @@ -0,0 +1,25 @@ +require_relative 'lib/net/imap/version' + +Gem::Specification.new do |spec| + spec.name = "net-imap" + spec.version = Net::Imap::VERSION + spec.authors = ["Shugo Maeda"] + spec.email = ["shugo@ruby-lang.org"] + + spec.summary = %q{Ruby client api for Internet Message Access Protocol} + spec.description = %q{Ruby client api for Internet Message Access Protocol} + spec.homepage = "https://github.com/ruby/net-imap" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/lib/net/imap/version.rb b/lib/net/imap/version.rb new file mode 100644 index 00000000000000..47d3de471ffca5 --- /dev/null +++ b/lib/net/imap/version.rb @@ -0,0 +1,5 @@ +module Net + module Imap + VERSION = "0.1.0" + end +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 2ca3c24ec161d8..db0db12e80f903 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -60,6 +60,7 @@ # * https://github.com/ruby/tmpdir # * https://github.com/ruby/English # * https://github.com/ruby/net-protocol +# * https://github.com/ruby/net-imap # require 'fileutils' @@ -118,6 +119,7 @@ tmpdir: "ruby/tmpdir", English: "ruby/English", "net-protocol": "ruby/net-protocol", + "net-imap": "ruby/net-imap", } def sync_default_gems(gem) @@ -279,6 +281,9 @@ def sync_default_gems(gem) when "net-protocol" sync_lib "net-protocol" mv "lib/net-protocol.gemspec", "lib/net/protocol" + when "net-imap" + sync_lib "net-imap" + mv "lib/net-imap.gemspec", "lib/net/imap" when "readline-ext" rm_rf(%w[ext/readline test/readline]) cp_r("#{upstream}/ext/readline", "ext") From a326b4b0b80d6e35c37f96be239145044b594c4f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 20 Feb 2020 21:24:51 +0900 Subject: [PATCH 813/878] Move an entry of net-imap to the default gems section --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 53402c9ce8a581..4d2d7980892cb9 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -54,8 +54,6 @@ Zachary Scott (zzak) _unmaintained_ [lib/net/ftp.rb] Shugo Maeda (shugo) -[lib/net/imap.rb] - Shugo Maeda (shugo) [lib/net/http.rb, lib/net/https.rb] NARUSE, Yui (naruse) [lib/open-uri.rb] @@ -188,6 +186,9 @@ Zachary Scott (zzak) Keiju ISHITSUKA (keiju) https://github.com/ruby/mutex_m https://rubygems.org/gems/mutex_m +[lib/net/imap.rb] + Shugo Maeda (shugo) + https://github.com/ruby/net-imap [lib/net/pop.rb] _unmaintained_ https://github.com/ruby/net-pop diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 86ce877c14d091..9b239c44ebb3aa 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -17,7 +17,6 @@ Find:: This module supports top-down traversal of a set of file paths MakeMakefile:: Module used to generate a Makefile for C extensions Net::FTP:: Support for the File Transfer Protocol Net::HTTP:: HTTP client api for Ruby -Net::IMAP:: Ruby client api for Internet Message Access Protocol OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP OptionParser:: Ruby-oriented class for command-line option analysis PP:: Provides a PrettyPrinter for Ruby objects @@ -68,6 +67,7 @@ IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop) Logger:: Provides a simple logging utility for outputting messages Matrix:: Represents a mathematical matrix. Mutex_m:: Mixin to extend objects to be handled like a Mutex +Net::IMAP:: Ruby client api for Internet Message Access Protocol Net::POP3:: Ruby client library for POP3 Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby Observable:: Provides a mechanism for publish/subscribe pattern in Ruby From 3e12b658613a534f11a50b4a415c7c3e165bcfd1 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 20 Feb 2020 21:32:27 +0900 Subject: [PATCH 814/878] Fallback to load version file in ruby core repository --- lib/net/imap/net-imap.gemspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/net/imap/net-imap.gemspec b/lib/net/imap/net-imap.gemspec index bd4e4509ef1ee3..201a794b4e4065 100644 --- a/lib/net/imap/net-imap.gemspec +++ b/lib/net/imap/net-imap.gemspec @@ -1,4 +1,8 @@ -require_relative 'lib/net/imap/version' +begin + require_relative 'lib/net/imap/version' +rescue LoadError # Fallback to load version file in ruby core repository + require_relative "version" +end Gem::Specification.new do |spec| spec.name = "net-imap" From df26d36e5ba0edc7ad031be9fb2047d68cd686c7 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 20 Feb 2020 22:36:53 +0900 Subject: [PATCH 815/878] Prefer alignas() over _Alignas() to allow Intel C++ compiler to read ruby.h. This is similar to 9930481a239fa7182429f3c3942ea033fb9b0320 --- configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b0e09a5f857b03..83c85198062576 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,10 +1359,11 @@ AS_IF([test "$rb_cv_va_args_macro" = yes], [ AC_CACHE_CHECK([for alignas() syntax], rb_cv_have_alignas, [ rb_cv_have_alignas=no +# Prefer alignas over _Alignas to allow C++ compiler to read ruby.h RUBY_WERROR_FLAG([ for attr in \ - "_Alignas(x)" \ "alignas(x)" \ + "_Alignas(x)" \ "@<:@@<:@alignas(x)@:>@@:>@" \ "__declspec(aligned(x))" \ "__attribute__((__aligned__(x)))" \ @@ -1371,8 +1372,11 @@ do # C11 _Alignas and GCC __attribute__((__aligned__)) behave # slightly differently. What we want is GCC's. Check that # here by something C11 does not allow (`struct ALIGNAS ...`) - AC_TRY_COMPILE( - [@%:@define ALIGNAS(x) $attr + AC_TRY_COMPILE([ + @%:@ifdef HAVE_STDALIGN_H + @%:@include + @%:@endif + @%:@define ALIGNAS(x) $attr struct ALIGNAS(128) conftest_tag { int foo; } foo; ], [], [rb_cv_have_alignas="$attr"; break], []) done @@ -1383,6 +1387,7 @@ AS_IF([test "$rb_cv_have_alignas" != no], [ AC_CACHE_CHECK([for alignof() syntax], rb_cv_have_alignof,[ rb_cv_have_alignof=no +# Prefer alignof over _Alignof to allow C++ compiler to read ruby.h RUBY_WERROR_FLAG([ for expr in \ "alignof" \ From 59c2a115f02e4e2ded528975fa3edde2c0c3f0b6 Mon Sep 17 00:00:00 2001 From: Masataka Pocke Kuwabara Date: Fri, 21 Feb 2020 13:27:13 +0900 Subject: [PATCH 816/878] Fix typo in NEWS-2.7.0 --- doc/NEWS-2.7.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/NEWS-2.7.0 b/doc/NEWS-2.7.0 index 1e845552de8c29..9dd34dc61b1765 100644 --- a/doc/NEWS-2.7.0 +++ b/doc/NEWS-2.7.0 @@ -187,7 +187,7 @@ sufficient information, see the ChangeLog file or Redmine This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. * Setting $, to a non-nil value will now display a warning. [Feature #14240] - This include the usage in Array#join. + This includes the usage in Array#join. This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option]. * Quoted here-document identifiers must end within the same line. From 4643bf5d55af6f79266dd67b69bb6eb4ff82029a Mon Sep 17 00:00:00 2001 From: git Date: Fri, 21 Feb 2020 13:31:37 +0900 Subject: [PATCH 817/878] * 2020-02-21 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index b576722176fe3f..f5a36df66d18ca 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" From f08d8e5e85ef2c44ca29261244c7b397ea968b94 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 19:09:21 +0900 Subject: [PATCH 818/878] Promote net-ftp to default gems --- lib/net/ftp.rb | 2 +- lib/net/ftp/net-ftp.gemspec | 29 +++++++++++++++++++++++++++++ lib/net/ftp/version.rb | 5 +++++ tool/sync_default_gems.rb | 5 +++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 lib/net/ftp/net-ftp.gemspec create mode 100644 lib/net/ftp/version.rb diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 1f6879d765a040..307b40e6dd0a83 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -17,7 +17,7 @@ require "socket" require "monitor" -require_relative "protocol" +require "net/protocol" require "time" begin require "openssl" diff --git a/lib/net/ftp/net-ftp.gemspec b/lib/net/ftp/net-ftp.gemspec new file mode 100644 index 00000000000000..2aae0b23eaa4c3 --- /dev/null +++ b/lib/net/ftp/net-ftp.gemspec @@ -0,0 +1,29 @@ +begin + require_relative 'lib/net/ftp/version' +rescue LoadError # Fallback to load version file in ruby core repository + require_relative "version" +end + +Gem::Specification.new do |spec| + spec.name = "net-ftp" + spec.version = Net::Ftp::VERSION + spec.authors = ["Hiroshi SHIBATA"] + spec.email = ["hsbt@ruby-lang.org"] + + spec.summary = %q{Support for the File Transfer Protocol.} + spec.description = %q{Support for the File Transfer Protocol.} + spec.homepage = "https://github.com/ruby/net-ftp" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/lib/net/ftp/version.rb b/lib/net/ftp/version.rb new file mode 100644 index 00000000000000..865bf44111403f --- /dev/null +++ b/lib/net/ftp/version.rb @@ -0,0 +1,5 @@ +module Net + module Ftp + VERSION = "0.1.0" + end +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index db0db12e80f903..6d374a19e30ee4 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -61,6 +61,7 @@ # * https://github.com/ruby/English # * https://github.com/ruby/net-protocol # * https://github.com/ruby/net-imap +# * https://github.com/ruby/net-ftp # require 'fileutils' @@ -120,6 +121,7 @@ English: "ruby/English", "net-protocol": "ruby/net-protocol", "net-imap": "ruby/net-imap", + "net-ftp": "ruby/net-ftp", } def sync_default_gems(gem) @@ -284,6 +286,9 @@ def sync_default_gems(gem) when "net-imap" sync_lib "net-imap" mv "lib/net-imap.gemspec", "lib/net/imap" + when "net-ftp" + sync_lib "net-ftp" + mv "lib/net-ftp.gemspec", "lib/net/ftp" when "readline-ext" rm_rf(%w[ext/readline test/readline]) cp_r("#{upstream}/ext/readline", "ext") From a294ec162235cb9a0ed62ede0bbf9d2f11b30592 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 19:56:15 +0900 Subject: [PATCH 819/878] Move an entry of net-ftp to the default gems section --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 4d2d7980892cb9..54ef126d82db32 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -52,8 +52,6 @@ Zachary Scott (zzak) Kazuki Tsujimoto (ktsj) [lib/mkmf.rb] _unmaintained_ -[lib/net/ftp.rb] - Shugo Maeda (shugo) [lib/net/http.rb, lib/net/https.rb] NARUSE, Yui (naruse) [lib/open-uri.rb] @@ -186,6 +184,9 @@ Zachary Scott (zzak) Keiju ISHITSUKA (keiju) https://github.com/ruby/mutex_m https://rubygems.org/gems/mutex_m +[lib/net/ftp.rb] + Shugo Maeda (shugo) + https://github.com/ruby/net-ftp [lib/net/imap.rb] Shugo Maeda (shugo) https://github.com/ruby/net-imap diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 9b239c44ebb3aa..2b8d044d1bf9d4 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -15,7 +15,6 @@ DRb:: Distributed object system for Ruby ERB:: An easy to use but powerful templating system for Ruby Find:: This module supports top-down traversal of a set of file paths MakeMakefile:: Module used to generate a Makefile for C extensions -Net::FTP:: Support for the File Transfer Protocol Net::HTTP:: HTTP client api for Ruby OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP OptionParser:: Ruby-oriented class for command-line option analysis @@ -67,6 +66,7 @@ IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop) Logger:: Provides a simple logging utility for outputting messages Matrix:: Represents a mathematical matrix. Mutex_m:: Mixin to extend objects to be handled like a Mutex +Net::FTP:: Support for the File Transfer Protocol Net::IMAP:: Ruby client api for Internet Message Access Protocol Net::POP3:: Ruby client library for POP3 Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby From 9cb1ffaa5c3a4b6921eaf748ffdef5dbd1c07877 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 21:21:14 +0900 Subject: [PATCH 820/878] Promote net-http to the default gems. test/net/http/test_https.rb: rename fixture methods to read_fixture because it conflicts with test-unit gem. --- lib/net/http.rb | 2 +- lib/net/http/net-http.gemspec | 29 +++++++++++++++++++++++++++++ lib/net/http/version.rb | 5 +++++ test/net/http/test_https.rb | 10 +++++----- tool/sync_default_gems.rb | 8 ++++++++ 5 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 lib/net/http/net-http.gemspec create mode 100644 lib/net/http/version.rb diff --git a/lib/net/http.rb b/lib/net/http.rb index de9963d18cebcd..a1d1d3e9c5cb49 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -20,7 +20,7 @@ # See Net::HTTP for an overview and examples. # -require_relative 'protocol' +require 'net/protocol' require 'uri' autoload :OpenSSL, 'openssl' diff --git a/lib/net/http/net-http.gemspec b/lib/net/http/net-http.gemspec new file mode 100644 index 00000000000000..15887130b47e5d --- /dev/null +++ b/lib/net/http/net-http.gemspec @@ -0,0 +1,29 @@ +begin + require_relative "lib/net/http/version" +rescue LoadError # Fallback to load version file in ruby core repository + require_relative "version" +end + +Gem::Specification.new do |spec| + spec.name = "net-http" + spec.version = Net::Http::VERSION + spec.authors = ["NARUSE, Yui"] + spec.email = ["naruse@airemix.jp"] + + spec.summary = %q{HTTP client api for Ruby.} + spec.description = %q{HTTP client api for Ruby.} + spec.homepage = "https://github.com/ruby/net-http" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/lib/net/http/version.rb b/lib/net/http/version.rb new file mode 100644 index 00000000000000..832d5971116d3c --- /dev/null +++ b/lib/net/http/version.rb @@ -0,0 +1,5 @@ +module Net + module Http + VERSION = "0.1.0" + end +end diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb index 204bfb7ad3763e..64101b6bdad365 100644 --- a/test/net/http/test_https.rb +++ b/test/net/http/test_https.rb @@ -12,14 +12,14 @@ class TestNetHTTPS < Test::Unit::TestCase include TestNetHTTPUtils - def self.fixture(key) + def self.read_fixture(key) File.read(File.expand_path("../fixtures/#{key}", __dir__)) end - CA_CERT = OpenSSL::X509::Certificate.new(fixture("cacert.pem")) - SERVER_KEY = OpenSSL::PKey.read(fixture("server.key")) - SERVER_CERT = OpenSSL::X509::Certificate.new(fixture("server.crt")) - DHPARAMS = OpenSSL::PKey::DH.new(fixture("dhparams.pem")) + CA_CERT = OpenSSL::X509::Certificate.new(read_fixture("cacert.pem")) + SERVER_KEY = OpenSSL::PKey.read(read_fixture("server.key")) + SERVER_CERT = OpenSSL::X509::Certificate.new(read_fixture("server.crt")) + DHPARAMS = OpenSSL::PKey::DH.new(read_fixture("dhparams.pem")) TEST_STORE = OpenSSL::X509::Store.new.tap {|s| s.add_cert(CA_CERT) } CONFIG = { diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 6d374a19e30ee4..1794e017dcdf8e 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -62,6 +62,7 @@ # * https://github.com/ruby/net-protocol # * https://github.com/ruby/net-imap # * https://github.com/ruby/net-ftp +# * https://github.com/ruby/net-http # require 'fileutils' @@ -122,6 +123,7 @@ "net-protocol": "ruby/net-protocol", "net-imap": "ruby/net-imap", "net-ftp": "ruby/net-ftp", + "net-http": "ruby/net-http", } def sync_default_gems(gem) @@ -289,6 +291,12 @@ def sync_default_gems(gem) when "net-ftp" sync_lib "net-ftp" mv "lib/net-ftp.gemspec", "lib/net/ftp" + when "net-http" + rm_rf(%w[lib/net/http.rb lib/net/http test/net/http]) + cp_r("#{upstream}/lib/net/http.rb", "lib/net") + cp_r("#{upstream}/lib/net/http", "lib/net") + cp_r("#{upstream}/test/net/http", "test/net") + cp_r("#{upstream}/net-http.gemspec", "lib/net/http") when "readline-ext" rm_rf(%w[ext/readline test/readline]) cp_r("#{upstream}/ext/readline", "ext") From fa1cf777dbe3c484331864d44c33bc30f2044c76 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 21:23:16 +0900 Subject: [PATCH 821/878] Move an entry of net-ftp to the default gems section --- doc/maintainers.rdoc | 5 +++-- doc/standard_library.rdoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 54ef126d82db32..9bc4b151dfa27a 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -52,8 +52,6 @@ Zachary Scott (zzak) Kazuki Tsujimoto (ktsj) [lib/mkmf.rb] _unmaintained_ -[lib/net/http.rb, lib/net/https.rb] - NARUSE, Yui (naruse) [lib/open-uri.rb] Tanaka Akira (akr) [lib/optparse.rb, lib/optparse/*] @@ -187,6 +185,9 @@ Zachary Scott (zzak) [lib/net/ftp.rb] Shugo Maeda (shugo) https://github.com/ruby/net-ftp +[lib/net/http.rb, lib/net/https.rb] + NARUSE, Yui (naruse) + https://github.com/ruby/net-http [lib/net/imap.rb] Shugo Maeda (shugo) https://github.com/ruby/net-imap diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 2b8d044d1bf9d4..eadc1c18d28214 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -15,7 +15,6 @@ DRb:: Distributed object system for Ruby ERB:: An easy to use but powerful templating system for Ruby Find:: This module supports top-down traversal of a set of file paths MakeMakefile:: Module used to generate a Makefile for C extensions -Net::HTTP:: HTTP client api for Ruby OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP OptionParser:: Ruby-oriented class for command-line option analysis PP:: Provides a PrettyPrinter for Ruby objects @@ -67,6 +66,7 @@ Logger:: Provides a simple logging utility for outputting messages Matrix:: Represents a mathematical matrix. Mutex_m:: Mixin to extend objects to be handled like a Mutex Net::FTP:: Support for the File Transfer Protocol +Net::HTTP:: HTTP client api for Ruby Net::IMAP:: Ruby client api for Internet Message Access Protocol Net::POP3:: Ruby client library for POP3 Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby From e7f8724fb223bbae8c467d854e4b4babe9273e62 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 21:25:43 +0900 Subject: [PATCH 822/878] Fixed net-ftp sync task and resync from standalone repo --- lib/net/ftp/net-ftp.gemspec | 4 ++-- tool/sync_default_gems.rb | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/net/ftp/net-ftp.gemspec b/lib/net/ftp/net-ftp.gemspec index 2aae0b23eaa4c3..ec668901d84274 100644 --- a/lib/net/ftp/net-ftp.gemspec +++ b/lib/net/ftp/net-ftp.gemspec @@ -7,8 +7,8 @@ end Gem::Specification.new do |spec| spec.name = "net-ftp" spec.version = Net::Ftp::VERSION - spec.authors = ["Hiroshi SHIBATA"] - spec.email = ["hsbt@ruby-lang.org"] + spec.authors = ["Shugo Maeda"] + spec.email = ["shugo@ruby-lang.org"] spec.summary = %q{Support for the File Transfer Protocol.} spec.description = %q{Support for the File Transfer Protocol.} diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 1794e017dcdf8e..cd894ae71704c6 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -289,8 +289,11 @@ def sync_default_gems(gem) sync_lib "net-imap" mv "lib/net-imap.gemspec", "lib/net/imap" when "net-ftp" - sync_lib "net-ftp" - mv "lib/net-ftp.gemspec", "lib/net/ftp" + rm_rf(%w[lib/net/ftp.rb lib/net/ftp test/net/ftp]) + cp_r("#{upstream}/lib/net/ftp.rb", "lib/net") + cp_r("#{upstream}/lib/net/ftp", "lib/net") + cp_r("#{upstream}/test/net/ftp", "test/net") + cp_r("#{upstream}/net-ftp.gemspec", "lib/net/ftp") when "net-http" rm_rf(%w[lib/net/http.rb lib/net/http test/net/http]) cp_r("#{upstream}/lib/net/http.rb", "lib/net") From 8d3b7f0fda491b076965fc37e2f56bd141cedee7 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 21 Feb 2020 21:30:04 +0900 Subject: [PATCH 823/878] Fixed net-pop, smtp, protocol and imap task for sync tool --- tool/sync_default_gems.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index cd894ae71704c6..dd143e5ece553f 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -277,17 +277,29 @@ def sync_default_gems(gem) cp_r("#{upstream}/HISTORY.md", "ext/openssl") `git checkout ext/openssl/depend` when "net-pop" - sync_lib "net-pop" - mv "lib/net-pop.gemspec", "lib/net/pop" + rm_rf(%w[lib/net/pop.rb lib/net/pop test/net/pop]) + cp_r("#{upstream}/lib/net/pop.rb", "lib/net") + cp_r("#{upstream}/lib/net/pop", "lib/net") + cp_r("#{upstream}/test/net/pop", "test/net") + cp_r("#{upstream}/net-pop.gemspec", "lib/net/pop") when "net-smtp" - sync_lib "net-smtp" - mv "lib/net-smtp.gemspec", "lib/net/smtp" + rm_rf(%w[lib/net/smtp.rb lib/net/smtp test/net/smtp]) + cp_r("#{upstream}/lib/net/smtp.rb", "lib/net") + cp_r("#{upstream}/lib/net/smtp", "lib/net") + cp_r("#{upstream}/test/net/smtp", "test/net") + cp_r("#{upstream}/net-smtp.gemspec", "lib/net/smtp") when "net-protocol" - sync_lib "net-protocol" - mv "lib/net-protocol.gemspec", "lib/net/protocol" + rm_rf(%w[lib/net/protocol.rb lib/net/protocol test/net/protocol]) + cp_r("#{upstream}/lib/net/protocol.rb", "lib/net") + cp_r("#{upstream}/lib/net/protocol", "lib/net") + cp_r("#{upstream}/test/net/protocol", "test/net") + cp_r("#{upstream}/net-protocol.gemspec", "lib/net/protocol") when "net-imap" - sync_lib "net-imap" - mv "lib/net-imap.gemspec", "lib/net/imap" + rm_rf(%w[lib/net/imap.rb lib/net/imap test/net/imap]) + cp_r("#{upstream}/lib/net/imap.rb", "lib/net") + cp_r("#{upstream}/lib/net/imap", "lib/net") + cp_r("#{upstream}/test/net/imap", "test/net") + cp_r("#{upstream}/net-imap.gemspec", "lib/net/imap") when "net-ftp" rm_rf(%w[lib/net/ftp.rb lib/net/ftp test/net/ftp]) cp_r("#{upstream}/lib/net/ftp.rb", "lib/net") From 5e7322b866c9052662b4365667a64560b7464d5a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 19 Feb 2020 19:27:53 +0900 Subject: [PATCH 824/878] [ruby/irb] `yield` outside method definition is a syntax error https://github.com/ruby/irb/commit/dbc7b059c7 --- test/irb/test_color.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb index 3ced640004290c..cb90d29c9d68b1 100644 --- a/test/irb/test_color.rb +++ b/test/irb/test_color.rb @@ -29,7 +29,7 @@ def test_colorize_code "def self.foo; bar; end" => "#{GREEN}def#{CLEAR} #{CYAN}#{BOLD}self#{CLEAR}.#{BLUE}#{BOLD}foo#{CLEAR}; bar; #{GREEN}end#{CLEAR}", 'erb = ERB.new("a#{nil}b", trim_mode: "-")' => "erb = #{BLUE}#{BOLD}#{UNDERLINE}ERB#{CLEAR}.new(#{RED}#{BOLD}\"#{CLEAR}#{RED}a#{CLEAR}#{RED}\#{#{CLEAR}#{CYAN}#{BOLD}nil#{CLEAR}#{RED}}#{CLEAR}#{RED}b#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}, #{MAGENTA}trim_mode:#{CLEAR} #{RED}#{BOLD}\"#{CLEAR}#{RED}-#{CLEAR}#{RED}#{BOLD}\"#{CLEAR})", "# comment" => "#{BLUE}#{BOLD}# comment#{CLEAR}", - "yield(hello)" => "#{GREEN}yield#{CLEAR}(hello)", + "def f;yield(hello);end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}f#{CLEAR};#{GREEN}yield#{CLEAR}(hello);#{GREEN}end#{CLEAR}", '"##@var]"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}\##{CLEAR}#{RED}\##{CLEAR}@var#{RED}]#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}", '"foo#{a} #{b}"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}a#{RED}}#{CLEAR}#{RED} #{CLEAR}#{RED}\#{#{CLEAR}b#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}", '/r#{e}g/' => "#{RED}#{BOLD}/#{CLEAR}#{RED}r#{CLEAR}#{RED}\#{#{CLEAR}e#{RED}}#{CLEAR}#{RED}g#{CLEAR}#{RED}#{BOLD}/#{CLEAR}", From 0b4500d982d2670e7025c61f50ab25bdc6de7834 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 22 Feb 2020 00:17:31 +0900 Subject: [PATCH 825/878] Adjusted indent [ci skip] --- vm_insnhelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm_insnhelper.c b/vm_insnhelper.c index acd5de4d5eee2f..54377dd7d04b29 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3217,7 +3217,7 @@ vm_yield_with_cfunc(rb_execution_context_t *ec, frame_flag = VM_FRAME_MAGIC_IFUNC | VM_FRAME_FLAG_CFRAME | (me ? VM_FRAME_FLAG_BMETHOD : 0); if (kw_splat) { - frame_flag |= VM_FRAME_FLAG_CFRAME_KW; + frame_flag |= VM_FRAME_FLAG_CFRAME_KW; } vm_push_frame(ec, (const rb_iseq_t *)captured->code.ifunc, From 5cab86f3b0725457be3c50d3cab43b04bea53290 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 22 Feb 2020 00:30:55 +0900 Subject: [PATCH 826/878] `Proc` made by `Symbol#to_proc` should be a lambda [Bug #16260] --- test/ruby/test_symbol.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 660f2e157430e3..2e9710e4dc734e 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -153,6 +153,10 @@ def (obj = Object.new).proc(&b) b; end end; end + def test_to_proc_lambda? + assert_predicate(:itself.to_proc, :lambda?) + end + def test_to_proc_call_with_symbol_proc first = 1 bug11594 = "[ruby-core:71088] [Bug #11594] corrupted the first local variable" From 8c5ca318cbe57269f144a4d0822c5283c1fd4e1a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 22 Feb 2020 00:32:43 +0900 Subject: [PATCH 827/878] `Proc` made by `Symbol#to_proc` should be a lambda [Bug #16260] With refinements, too. --- internal/proc.h | 2 +- proc.c | 2 +- test/ruby/test_symbol.rb | 7 +++++++ vm_args.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/proc.h b/internal/proc.h index 7f2bec88509885..864392906babc8 100644 --- a/internal/proc.h +++ b/internal/proc.h @@ -19,11 +19,11 @@ VALUE rb_proc_location(VALUE self); st_index_t rb_hash_proc(st_index_t hash, VALUE proc); int rb_block_arity(void); int rb_block_min_max_arity(int *max); -VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc); VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info); MJIT_SYMBOL_EXPORT_BEGIN VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val); +VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc); VALUE rb_iseq_location(const struct rb_iseq_struct *iseq); VALUE rb_sym_to_proc(VALUE sym); MJIT_SYMBOL_EXPORT_END diff --git a/proc.c b/proc.c index e0cba7109b85c4..7fee55b0981707 100644 --- a/proc.c +++ b/proc.c @@ -739,7 +739,7 @@ rb_func_proc_new(rb_block_call_func_t func, VALUE val) return cfunc_proc_new(rb_cProc, (VALUE)ifunc, 0); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc) { struct vm_ifunc *ifunc = rb_vm_ifunc_new(func, (void *)val, min_argc, max_argc); diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 2e9710e4dc734e..632acb3e3db8f0 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -169,6 +169,9 @@ class TestToPRocArgWithRefinements; end def _test_to_proc_arg_with_refinements_call(&block) block.call TestToPRocArgWithRefinements.new end + def _test_to_proc_with_refinements_call(&block) + block + end using Module.new { refine TestToPRocArgWithRefinements do def hoge @@ -180,6 +183,10 @@ def test_to_proc_arg_with_refinements assert_equal(:hoge, _test_to_proc_arg_with_refinements_call(&:hoge)) end + def test_to_proc_lambda_with_refinements + assert_predicate(_test_to_proc_with_refinements_call(&:hoge), :lambda?) + end + def self._test_to_proc_arg_with_refinements_call(&block) block.call TestToPRocArgWithRefinements.new end diff --git a/vm_args.c b/vm_args.c index 13d4e4a5450451..b3f1611e781e64 100644 --- a/vm_args.c +++ b/vm_args.c @@ -869,7 +869,7 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t * rb_ary_push(callback_arg, block_code); rb_ary_push(callback_arg, ref); OBJ_FREEZE_RAW(callback_arg); - func = rb_func_proc_new(refine_sym_proc_call, callback_arg); + func = rb_func_lambda_new(refine_sym_proc_call, callback_arg, 0, UNLIMITED_ARGUMENTS); rb_hash_aset(ref, block_code, func); } block_code = func; From 5a89c05773da29c242c222fa3af64703f5aff88b Mon Sep 17 00:00:00 2001 From: git Date: Sat, 22 Feb 2020 00:45:33 +0900 Subject: [PATCH 828/878] * 2020-02-22 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index f5a36df66d18ca..334cb690231b82 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" From a1eb1fabef1bca0696449cd358d93f5a644d5914 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sat, 22 Feb 2020 02:59:46 +0900 Subject: [PATCH 829/878] use RUBY_FUNCTION_NAME_STRING instead of __func__ for rp() --- internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal.h b/internal.h index 4d95fe704e1562..e32bf82260c737 100644 --- a/internal.h +++ b/internal.h @@ -86,7 +86,7 @@ void ruby_debug_breakpoint(void); PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); // show obj data structure without any side-effect -#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, __func__) +#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, RUBY_FUNCTION_NAME_STRING) // same as rp, but add message header #define rp_m(msg, obj) do { \ From f2286925f08406bc857f7b03ad6779a5d61443ae Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 8 Jan 2020 08:20:36 +0900 Subject: [PATCH 830/878] VALUE size packed callinfo (ci). Now, rb_call_info contains how to call the method with tuple of (mid, orig_argc, flags, kwarg). Most of cases, kwarg == NULL and mid+argc+flags only requires 64bits. So this patch packed rb_call_info to VALUE (1 word) on such cases. If we can not represent it in VALUE, then use imemo_callinfo which contains conventional callinfo (rb_callinfo, renamed from rb_call_info). iseq->body->ci_kw_size is removed because all of callinfo is VALUE size (packed ci or a pointer to imemo_callinfo). To access ci information, we need to use these functions: vm_ci_mid(ci), _flag(ci), _argc(ci), _kwarg(ci). struct rb_call_info_kw_arg is renamed to rb_callinfo_kwarg. rb_funcallv_with_cc() and rb_method_basic_definition_p_with_cc() is temporary removed because cd->ci should be marked. --- common.mk | 8 + compile.c | 342 +++++++++++----------- debug.c | 1 + debug_counter.h | 7 + ext/objspace/objspace.c | 1 + gc.c | 25 +- insns.def | 12 +- internal/imemo.h | 3 +- internal/vm.h | 29 +- iseq.c | 84 +++--- iseq.h | 9 - mjit.c | 4 - mjit_compile.c | 26 +- test/-ext-/tracepoint/test_tracepoint.rb | 10 +- tool/mk_call_iseq_optimized.rb | 9 +- tool/ruby_vm/views/_mjit_compile_insn.erb | 2 +- tool/ruby_vm/views/_mjit_compile_send.erb | 10 +- tool/ruby_vm/views/_sp_inc_helpers.erb | 8 +- vm.c | 1 + vm_args.c | 27 +- vm_callinfo.h | 206 +++++++++++++ vm_core.h | 54 +--- vm_eval.c | 55 +--- vm_insnhelper.c | 224 +++++++------- vm_insnhelper.h | 10 +- vm_method.c | 11 - 26 files changed, 632 insertions(+), 546 deletions(-) create mode 100644 vm_callinfo.h diff --git a/common.mk b/common.mk index f1bd19c7bb04bc..50f2c156a6d382 100644 --- a/common.mk +++ b/common.mk @@ -1837,6 +1837,7 @@ compile.$(OBJEXT): {$(VPATH)}builtin.h compile.$(OBJEXT): {$(VPATH)}compile.c compile.$(OBJEXT): {$(VPATH)}config.h compile.$(OBJEXT): {$(VPATH)}constant.h +compile.$(OBJEXT): {$(VPATH)}debug_counter.h compile.$(OBJEXT): {$(VPATH)}defines.h compile.$(OBJEXT): {$(VPATH)}encindex.h compile.$(OBJEXT): {$(VPATH)}encoding.h @@ -1866,6 +1867,7 @@ compile.$(OBJEXT): {$(VPATH)}subst.h compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h compile.$(OBJEXT): {$(VPATH)}thread_native.h compile.$(OBJEXT): {$(VPATH)}util.h +compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h compile.$(OBJEXT): {$(VPATH)}vm_core.h compile.$(OBJEXT): {$(VPATH)}vm_debug.h compile.$(OBJEXT): {$(VPATH)}vm_opts.h @@ -1966,6 +1968,7 @@ debug.$(OBJEXT): $(top_srcdir)/internal/warnings.h debug.$(OBJEXT): {$(VPATH)}assert.h debug.$(OBJEXT): {$(VPATH)}config.h debug.$(OBJEXT): {$(VPATH)}debug.c +debug.$(OBJEXT): {$(VPATH)}debug_counter.h debug.$(OBJEXT): {$(VPATH)}defines.h debug.$(OBJEXT): {$(VPATH)}encoding.h debug.$(OBJEXT): {$(VPATH)}eval_intern.h @@ -1987,6 +1990,7 @@ debug.$(OBJEXT): {$(VPATH)}symbol.h debug.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h debug.$(OBJEXT): {$(VPATH)}thread_native.h debug.$(OBJEXT): {$(VPATH)}util.h +debug.$(OBJEXT): {$(VPATH)}vm_callinfo.h debug.$(OBJEXT): {$(VPATH)}vm_core.h debug.$(OBJEXT): {$(VPATH)}vm_debug.h debug.$(OBJEXT): {$(VPATH)}vm_opts.h @@ -2437,6 +2441,7 @@ gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h gc.$(OBJEXT): {$(VPATH)}thread_native.h gc.$(OBJEXT): {$(VPATH)}transient_heap.h gc.$(OBJEXT): {$(VPATH)}util.h +gc.$(OBJEXT): {$(VPATH)}vm_callinfo.h gc.$(OBJEXT): {$(VPATH)}vm_core.h gc.$(OBJEXT): {$(VPATH)}vm_opts.h golf_prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h @@ -2663,6 +2668,7 @@ iseq.$(OBJEXT): {$(VPATH)}subst.h iseq.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h iseq.$(OBJEXT): {$(VPATH)}thread_native.h iseq.$(OBJEXT): {$(VPATH)}util.h +iseq.$(OBJEXT): {$(VPATH)}vm_callinfo.h iseq.$(OBJEXT): {$(VPATH)}vm_core.h iseq.$(OBJEXT): {$(VPATH)}vm_opts.h load.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h @@ -2986,6 +2992,7 @@ mjit_compile.$(OBJEXT): {$(VPATH)}st.h mjit_compile.$(OBJEXT): {$(VPATH)}subst.h mjit_compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h mjit_compile.$(OBJEXT): {$(VPATH)}thread_native.h +mjit_compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_core.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_exec.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_insnhelper.h @@ -4165,6 +4172,7 @@ vm.$(OBJEXT): {$(VPATH)}vm.h vm.$(OBJEXT): {$(VPATH)}vm.inc vm.$(OBJEXT): {$(VPATH)}vm_args.c vm.$(OBJEXT): {$(VPATH)}vm_call_iseq_optimized.inc +vm.$(OBJEXT): {$(VPATH)}vm_callinfo.h vm.$(OBJEXT): {$(VPATH)}vm_core.h vm.$(OBJEXT): {$(VPATH)}vm_debug.h vm.$(OBJEXT): {$(VPATH)}vm_eval.c diff --git a/compile.c b/compile.c index fa3505a03d8c2d..e1efbcd9094824 100644 --- a/compile.c +++ b/compile.c @@ -36,6 +36,7 @@ #include "ruby/re.h" #include "ruby/util.h" #include "vm_core.h" +#include "vm_callinfo.h" #include "vm_debug.h" #include "builtin.h" @@ -919,6 +920,15 @@ compile_data_alloc2(rb_iseq_t *iseq, size_t x, size_t y) return compile_data_alloc(iseq, size); } +static inline void * +compile_data_calloc2(rb_iseq_t *iseq, size_t x, size_t y) +{ + size_t size = rb_size_mul_or_raise(x, y, rb_eRuntimeError); + void *p = compile_data_alloc(iseq, size); + memset(p, 0, size); + return p; +} + static INSN * compile_data_alloc_insn(rb_iseq_t *iseq) { @@ -1187,38 +1197,31 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a return new_insn_core(iseq, line_no, insn_id, argc, operands); } -static struct rb_call_info * -new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_call_info_kw_arg *kw_arg, int has_blockiseq) +static const struct rb_callinfo * +new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_callinfo_kwarg *kw_arg, int has_blockiseq) { - size_t size = kw_arg != NULL ? sizeof(struct rb_call_info_with_kwarg) : sizeof(struct rb_call_info); - struct rb_call_info *ci = (struct rb_call_info *)compile_data_alloc(iseq, size); - struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci; + VM_ASSERT(argc >= 0); - ci->mid = mid; - ci->flag = flag; - ci->orig_argc = argc; + if (!(flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT)) && + kw_arg == NULL && !has_blockiseq) { + flag |= VM_CALL_ARGS_SIMPLE; + } if (kw_arg) { - ci->flag |= VM_CALL_KWARG; - ci_kw->kw_arg = kw_arg; - ci->orig_argc += kw_arg->keyword_len; - iseq->body->ci_kw_size++; - } - else { - iseq->body->ci_size++; + flag |= VM_CALL_KWARG; + argc += kw_arg->keyword_len; } - if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT)) && - kw_arg == NULL && !has_blockiseq) { - ci->flag |= VM_CALL_ARGS_SIMPLE; - } + iseq->body->ci_size++; + const struct rb_callinfo *ci = vm_ci_new(mid, flag, argc, kw_arg); + RB_OBJ_WRITTEN(iseq, Qundef, ci); return ci; } static INSN * -new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_call_info_kw_arg *keywords) +new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_callinfo_kwarg *keywords) { - VALUE *operands = compile_data_alloc2(iseq, sizeof(VALUE), 2); + VALUE *operands = compile_data_calloc2(iseq, sizeof(VALUE), 2); operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL); operands[1] = (VALUE)blockiseq; return new_insn_core(iseq, line_no, BIN(send), 2, operands); @@ -2129,11 +2132,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) insns_info = ALLOC_N(struct iseq_insn_info_entry, insn_num); positions = ALLOC_N(unsigned int, insn_num); body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, body->is_size); - body->call_data = - rb_xcalloc_mul_add_mul( - sizeof(struct rb_call_data), body->ci_size, - sizeof(struct rb_kwarg_call_data), body->ci_kw_size); - ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0; + body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size); + ISEQ_COMPILE_DATA(iseq)->ci_index = 0; list = FIRST_ELEMENT(anchor); insns_info_index = code_index = sp = 0; @@ -2201,7 +2201,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) } case TS_ISE: /* inline storage entry */ /* Treated as an IC, but may contain a markable VALUE */ - FL_SET(iseq, ISEQ_MARKABLE_ISEQ); + FL_SET(iseq, ISEQ_MARKABLE_ISEQ); /* fall through */ case TS_IC: /* inline cache */ case TS_IVC: /* inline ivar cache */ @@ -2219,22 +2219,10 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) } case TS_CALLDATA: { - struct rb_call_info *source_ci = (struct rb_call_info *)operands[j]; - struct rb_call_data *cd; - - if (source_ci->flag & VM_CALL_KWARG) { - struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&body->call_data[body->ci_size]; - struct rb_kwarg_call_data *cd_kw = &kw_calls[ISEQ_COMPILE_DATA(iseq)->ci_kw_index++]; - cd_kw->ci_kw = *((struct rb_call_info_with_kwarg *)source_ci); - cd = (struct rb_call_data *)cd_kw; - assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= body->ci_kw_size); - } - else { - cd = &body->call_data[ISEQ_COMPILE_DATA(iseq)->ci_index++]; - cd->ci = *source_ci; - assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size); - } - + const struct rb_callinfo *source_ci = (const struct rb_callinfo *)operands[j]; + struct rb_call_data *cd = &body->call_data[ISEQ_COMPILE_DATA(iseq)->ci_index++]; + assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size); + cd->ci = source_ci; generated_iseq[code_index + 1 + j] = (VALUE)cd; break; } @@ -2565,10 +2553,7 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i) unref_destination((INSN *)i, pos); break; case TS_CALLDATA: - if (((struct rb_call_info *)OPERAND_AT(i, pos))->flag & VM_CALL_KWARG) - --(body->ci_kw_size); - else - --(body->ci_size); + --(body->ci_size); break; } } @@ -2709,6 +2694,28 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj) return TRUE; } +static const struct rb_callinfo * +ci_flag_set(const rb_iseq_t *iseq, const struct rb_callinfo *ci, unsigned int add) +{ + const struct rb_callinfo *nci = vm_ci_new(vm_ci_mid(ci), + vm_ci_flag(ci) | add, + vm_ci_argc(ci), + vm_ci_kwarg(ci)); + RB_OBJ_WRITTEN(iseq, ci, nci); + return nci; +} + +static const struct rb_callinfo * +ci_argc_set(const rb_iseq_t *iseq, const struct rb_callinfo *ci, int argc) +{ + const struct rb_callinfo *nci = vm_ci_new(vm_ci_mid(ci), + vm_ci_flag(ci), + argc, + vm_ci_kwarg(ci)); + RB_OBJ_WRITTEN(iseq, ci, nci); + return nci; +} + static int iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt) { @@ -3150,16 +3157,17 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal NIL_P(OPERAND_AT(iobj, 0)) && IS_NEXT_INSN_ID(&iobj->link, send)) { INSN *niobj = (INSN *)iobj->link.next; - struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0); - /* + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(niobj, 0); + + /* * freezestring nil # no debug_info * send <:+@, 0, ARG_SIMPLE> # :-@, too * => * send <:+@, 0, ARG_SIMPLE> # :-@, too */ - if ((ci->mid == idUPlus || ci->mid == idUMinus) && - (ci->flag & VM_CALL_ARGS_SIMPLE) && - ci->orig_argc == 0) { + if ((vm_ci_mid(ci) == idUPlus || vm_ci_mid(ci) == idUMinus) && + (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) && + vm_ci_argc(ci) == 0) { ELEM_REMOVE(list); return COMPILE_OK; } @@ -3207,14 +3215,19 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal } if (piobj) { - struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(piobj, 0); - if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) { + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(piobj, 0); + if (IS_INSN_ID(piobj, send) || + IS_INSN_ID(piobj, invokesuper)) { if (OPERAND_AT(piobj, 1) == 0) { /* no blockiseq */ - ci->flag |= VM_CALL_TAILCALL; + ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL); + OPERAND_AT(piobj, 0) = (VALUE)ci; + RB_OBJ_WRITTEN(iseq, Qundef, ci); } } else { - ci->flag |= VM_CALL_TAILCALL; + ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL); + OPERAND_AT(piobj, 0) = (VALUE)ci; + RB_OBJ_WRITTEN(iseq, Qundef, ci); } } } @@ -3277,7 +3290,7 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id) if (insn_id == BIN(opt_neq)) { VALUE *old_operands = iobj->operands; iobj->operand_size = 2; - iobj->operands = compile_data_alloc2(iseq, iobj->operand_size, sizeof(VALUE)); + iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE)); iobj->operands[0] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE); iobj->operands[1] = old_operands[0]; } @@ -3295,9 +3308,9 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) */ INSN *niobj = (INSN *)iobj->link.next; if (IS_INSN_ID(niobj, send)) { - struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0); - if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) { - switch (ci->mid) { + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(niobj, 0); + if ((vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) && vm_ci_argc(ci) == 0) { + switch (vm_ci_mid(ci)) { case idMax: iobj->insn_id = BIN(opt_newarray_max); ELEM_REMOVE(&niobj->link); @@ -3312,14 +3325,14 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) } if (IS_INSN_ID(iobj, send)) { - struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0); + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0); const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 1); #define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt)) - if (ci->flag & VM_CALL_ARGS_SIMPLE) { - switch (ci->orig_argc) { + if (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) { + switch (vm_ci_argc(ci)) { case 0: - switch (ci->mid) { + switch (vm_ci_mid(ci)) { case idLength: SP_INSN(length); return COMPILE_OK; case idSize: SP_INSN(size); return COMPILE_OK; case idEmptyP: SP_INSN(empty_p);return COMPILE_OK; @@ -3329,7 +3342,7 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) } break; case 1: - switch (ci->mid) { + switch (vm_ci_mid(ci)) { case idPLUS: SP_INSN(plus); return COMPILE_OK; case idMINUS: SP_INSN(minus); return COMPILE_OK; case idMULT: SP_INSN(mult); return COMPILE_OK; @@ -3349,14 +3362,14 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) } break; case 2: - switch (ci->mid) { + switch (vm_ci_mid(ci)) { case idASET: SP_INSN(aset); return COMPILE_OK; } break; } } - if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) { + if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) { iobj->insn_id = BIN(opt_send_without_block); iobj->operand_size = insn_len(iobj->insn_id) - 1; } @@ -3444,8 +3457,7 @@ new_unified_insn(rb_iseq_t *iseq, } if (argc > 0) { - ptr = operands = - compile_data_alloc2(iseq, sizeof(VALUE), argc); + ptr = operands = compile_data_alloc2(iseq, sizeof(VALUE), argc); } /* copy operands */ @@ -3870,7 +3882,7 @@ keyword_node_p(const NODE *const node) static int compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const root_node, - struct rb_call_info_kw_arg **const kw_arg_ptr, + struct rb_callinfo_kwarg **const kw_arg_ptr, unsigned int *flag) { if (kw_arg_ptr == NULL) return FALSE; @@ -3901,8 +3913,8 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, node = root_node->nd_head; { int len = (int)node->nd_alen / 2; - struct rb_call_info_kw_arg *kw_arg = - rb_xmalloc_mul_add(len - 1, sizeof(VALUE), sizeof(struct rb_call_info_kw_arg)); + struct rb_callinfo_kwarg *kw_arg = + rb_xmalloc_mul_add(len - 1, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg)); VALUE *keywords = kw_arg->keywords; int i = 0; kw_arg->keyword_len = len; @@ -3924,7 +3936,7 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, static int compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, - struct rb_call_info_kw_arg **keywords_ptr, unsigned int *flag) + struct rb_callinfo_kwarg **keywords_ptr, unsigned int *flag) { int len = 0; @@ -4407,21 +4419,26 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const n switch (nd_type(node)) { case NODE_ATTRASGN: { INSN *iobj; - struct rb_call_info *ci; VALUE dupidx; int line = nd_line(node); CHECK(COMPILE_POPPED(ret, "masgn lhs (NODE_ATTRASGN)", node)); iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */ - ci = (struct rb_call_info *)OPERAND_AT(iobj, 0); - ci->orig_argc += 1; - dupidx = INT2FIX(ci->orig_argc); + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0); + int argc = vm_ci_argc(ci) + 1; + ci = ci_argc_set(iseq, ci, argc); + OPERAND_AT(iobj, 0) = (VALUE)ci; + RB_OBJ_WRITTEN(iseq, Qundef, ci); + dupidx = INT2FIX(argc); INSERT_BEFORE_INSN1(iobj, line, topn, dupidx); - if (ci->flag & VM_CALL_ARGS_SPLAT) { - --ci->orig_argc; - INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1)); + if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) { + int argc = vm_ci_argc(ci); + ci = ci_argc_set(iseq, ci, argc - 1); + OPERAND_AT(iobj, 0) = (VALUE)ci; + RB_OBJ_WRITTEN(iseq, Qundef, iobj); + INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1)); INSERT_BEFORE_INSN(iobj, line, concatarray); } ADD_INSN(ret, line, pop); /* result */ @@ -5017,7 +5034,7 @@ check_keyword(const NODE *node) static VALUE setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, - int dup_rest, unsigned int *flag, struct rb_call_info_kw_arg **keywords) + int dup_rest, unsigned int *flag, struct rb_callinfo_kwarg **keywords) { if (argn) { switch (nd_type(argn)) { @@ -5077,7 +5094,7 @@ setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, static VALUE setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, - unsigned int *flag, struct rb_call_info_kw_arg **keywords) + unsigned int *flag, struct rb_callinfo_kwarg **keywords) { VALUE ret; if (argn && nd_type(argn) == NODE_BLOCK_PASS) { @@ -5209,7 +5226,7 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int DECL_ANCHOR(else_seq); LABEL *then_label, *else_label, *end_label; VALUE branches = Qfalse; - int ci_size, ci_kw_size; + int ci_size; VALUE catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; long catch_table_size = NIL_P(catch_table) ? 0 : RARRAY_LEN(catch_table); @@ -5224,12 +5241,10 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int then_label, else_label); ci_size = body->ci_size; - ci_kw_size = body->ci_kw_size; CHECK(COMPILE_(then_seq, "then", node_body, popped)); catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; if (!then_label->refcnt) { body->ci_size = ci_size; - body->ci_kw_size = ci_kw_size; if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size); } else { @@ -5237,12 +5252,10 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int } ci_size = body->ci_size; - ci_kw_size = body->ci_kw_size; CHECK(COMPILE_(else_seq, "else", node_else, popped)); catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; if (!else_label->refcnt) { body->ci_size = ci_size; - body->ci_kw_size = ci_kw_size; if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size); } else { @@ -6873,7 +6886,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in ID mid = node->nd_mid; VALUE argc; unsigned int flag = 0; - struct rb_call_info_kw_arg *keywords = NULL; + struct rb_callinfo_kwarg *keywords = NULL; const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block; LABEL *else_label = NULL; VALUE branches = Qfalse; @@ -7676,7 +7689,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in DECL_ANCHOR(args); int argc; unsigned int flag = 0; - struct rb_call_info_kw_arg *keywords = NULL; + struct rb_callinfo_kwarg *keywords = NULL; const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block; INIT_ANCHOR(args); @@ -7834,7 +7847,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in DECL_ANCHOR(args); VALUE argc; unsigned int flag = 0; - struct rb_call_info_kw_arg *keywords = NULL; + struct rb_callinfo_kwarg *keywords = NULL; INIT_ANCHOR(args); @@ -8665,10 +8678,10 @@ insn_data_to_s_detail(INSN *iobj) break; case TS_CALLDATA: /* we store these as call infos at compile time */ { - const struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, j); + const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, j); rb_str_cat2(str, "mid) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid)); - rb_str_catf(str, ", %d>", ci->orig_argc); + if (vm_ci_mid(ci)) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(vm_ci_mid(ci))); + rb_str_catf(str, ", %d>", vm_ci_argc(ci)); break; } case TS_CDHASH: /* case/when condition cache */ @@ -8905,7 +8918,7 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op) ID mid = 0; int orig_argc = 0; unsigned int flag = 0; - struct rb_call_info_kw_arg *kw_arg = 0; + struct rb_callinfo_kwarg *kw_arg = 0; if (!NIL_P(op)) { VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid"))); @@ -8920,7 +8933,7 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op) if (!NIL_P(vkw_arg)) { int i; int len = RARRAY_LENINT(vkw_arg); - size_t n = rb_call_info_kw_arg_bytes(len); + size_t n = rb_callinfo_kwarg_bytes(len); kw_arg = xmalloc(n); kw_arg->keyword_len = len; @@ -8932,7 +8945,9 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op) } } - return (VALUE)new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0); + const struct rb_callinfo *ci = new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0); + RB_OBJ_WRITTEN(iseq, Qundef, ci); + return (VALUE)ci; } static rb_event_flag_t @@ -9009,7 +9024,13 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor, } if (argc > 0) { - argv = compile_data_alloc2(iseq, sizeof(VALUE), argc); + argv = compile_data_calloc2(iseq, sizeof(VALUE), argc); + + // add element before operand setup to make GC root + ADD_ELEM(anchor, + (LINK_ELEMENT*)new_insn_core(iseq, line_no, + (enum ruby_vminsn_type)insn_id, argc, argv)); + for (j=0; jci.flag & VM_CALL_KWARG) ? Qtrue : Qfalse; -} - static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq); static int @@ -9898,9 +9917,6 @@ ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq) break; case TS_CALLDATA: { - /* ibf_dump_calldata() always returns either Qtrue or Qfalse */ - char c = ibf_dump_calldata(dump, (const struct rb_call_data *)op) == Qtrue; // 1 or 0 - ibf_dump_write_byte(dump, c); goto skip_wv; } case TS_ID: @@ -9937,7 +9953,6 @@ ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, ibf_offset_t b struct rb_iseq_constant_body *load_body = iseq->body; struct rb_call_data *cd_entries = load_body->call_data; - struct rb_kwarg_call_data *cd_kw_entries = (struct rb_kwarg_call_data *)&load_body->call_data[load_body->ci_size]; union iseq_inline_storage_entry *is_entries = load_body->is_entries; for (code_index=0; code_indexbody; const unsigned int ci_size = body->ci_size; - const unsigned int ci_kw_size = body->ci_kw_size; - const struct rb_call_data *calls = body->call_data; - const struct rb_kwarg_call_data *kw_calls = (const struct rb_kwarg_call_data *)&body->call_data[ci_size]; + const struct rb_call_data *cds = body->call_data; ibf_offset_t offset = ibf_dump_pos(dump); unsigned int i; for (i = 0; i < ci_size; i++) { - VALUE mid = ibf_dump_id(dump, calls[i].ci.mid); - - ibf_dump_write_small_value(dump, mid); - ibf_dump_write_small_value(dump, calls[i].ci.flag); - ibf_dump_write_small_value(dump, calls[i].ci.orig_argc); - } - - for (i = 0; i < ci_kw_size; i++) { - const struct rb_call_info_kw_arg *kw_arg = kw_calls[i].ci_kw.kw_arg; - - VALUE mid = ibf_dump_id(dump, kw_calls[i].ci_kw.ci.mid); - - ibf_dump_write_small_value(dump, mid); - ibf_dump_write_small_value(dump, kw_calls[i].ci_kw.ci.flag); - ibf_dump_write_small_value(dump, kw_calls[i].ci_kw.ci.orig_argc); - - ibf_dump_write_small_value(dump, kw_arg->keyword_len); - - int j; - for (j = 0; j < kw_calls[i].ci_kw.kw_arg->keyword_len; j++) { - VALUE keyword = ibf_dump_object(dump, kw_arg->keywords[j]); /* kw_arg->keywords[n] is Symbol */ - - ibf_dump_write_small_value(dump, keyword); + const struct rb_callinfo *ci = cds[i].ci; + ibf_dump_write_small_value(dump, ibf_dump_id(dump, vm_ci_mid(ci))); + ibf_dump_write_small_value(dump, vm_ci_flag(ci)); + ibf_dump_write_small_value(dump, vm_ci_argc(ci)); + + const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci); + if (kwarg) { + int len = kwarg->keyword_len; + ibf_dump_write_small_value(dump, len); + for (int j=0; jkeywords[j]); + ibf_dump_write_small_value(dump, keyword); + } + } + else { + ibf_dump_write_small_value(dump, 0); } } @@ -10299,51 +10304,37 @@ ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq) static struct rb_call_data * ibf_load_ci_entries(const struct ibf_load *load, ibf_offset_t ci_entries_offset, - unsigned int ci_size, - unsigned int ci_kw_size) + unsigned int ci_size) { ibf_offset_t reading_pos = ci_entries_offset; unsigned int i; - struct rb_call_data *calls = - rb_xcalloc_mul_add_mul( - sizeof(struct rb_call_data), ci_size, - sizeof(struct rb_kwarg_call_data), ci_kw_size); - struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&calls[ci_size]; + struct rb_call_data *cds = ZALLOC_N(struct rb_call_data, ci_size); for (i = 0; i < ci_size; i++) { VALUE mid_index = ibf_load_small_value(load, &reading_pos); - - calls[i].ci.mid = ibf_load_id(load, mid_index); - calls[i].ci.flag = (unsigned int)ibf_load_small_value(load, &reading_pos); - calls[i].ci.orig_argc = (int)ibf_load_small_value(load, &reading_pos); - } - - for (i = 0; i < ci_kw_size; i++) { - VALUE mid_index = ibf_load_small_value(load, &reading_pos); - - kw_calls[i].ci_kw.ci.mid = ibf_load_id(load, mid_index); - kw_calls[i].ci_kw.ci.flag = (unsigned int)ibf_load_small_value(load, &reading_pos); - kw_calls[i].ci_kw.ci.orig_argc = (int)ibf_load_small_value(load, &reading_pos); - - int keyword_len = (int)ibf_load_small_value(load, &reading_pos); - - kw_calls[i].ci_kw.kw_arg = - rb_xmalloc_mul_add(keyword_len - 1, sizeof(VALUE), sizeof(struct rb_call_info_kw_arg)); - - kw_calls[i].ci_kw.kw_arg->keyword_len = keyword_len; - - int j; - for (j = 0; j < kw_calls[i].ci_kw.kw_arg->keyword_len; j++) { - VALUE keyword = ibf_load_small_value(load, &reading_pos); - - kw_calls[i].ci_kw.kw_arg->keywords[j] = ibf_load_object(load, keyword); + ID mid = ibf_load_id(load, mid_index); + unsigned int flag = (unsigned int)ibf_load_small_value(load, &reading_pos); + unsigned int argc = (unsigned int)ibf_load_small_value(load, &reading_pos); + + struct rb_callinfo_kwarg *kwarg = NULL; + int kwlen = (int)ibf_load_small_value(load, &reading_pos); + if (kwlen > 0) { + kwarg = rb_xmalloc_mul_add(kwlen - 1, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));; + kwarg->keyword_len = kwlen; + for (int j=0; jkeywords[j] = ibf_load_object(load, keyword); + } } + + cds[i].ci = vm_ci_new(mid, flag, argc, kwarg); + RB_OBJ_WRITTEN(load->iseq, Qundef, cds[i].ci); } - return calls; -} + return cds; +} static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) @@ -10449,7 +10440,6 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_dump_write_small_value(dump, body->local_table_size); ibf_dump_write_small_value(dump, body->is_size); ibf_dump_write_small_value(dump, body->ci_size); - ibf_dump_write_small_value(dump, body->ci_kw_size); ibf_dump_write_small_value(dump, body->stack_max); ibf_dump_write_small_value(dump, body->catch_except_p); @@ -10556,7 +10546,6 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) const unsigned int local_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos); const unsigned int is_size = (unsigned int)ibf_load_small_value(load, &reading_pos); const unsigned int ci_size = (unsigned int)ibf_load_small_value(load, &reading_pos); - const unsigned int ci_kw_size = (unsigned int)ibf_load_small_value(load, &reading_pos); const unsigned int stack_max = (unsigned int)ibf_load_small_value(load, &reading_pos); const char catch_except_p = (char)ibf_load_small_value(load, &reading_pos); @@ -10584,7 +10573,6 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) load_body->local_table_size = local_table_size; load_body->is_size = is_size; load_body->ci_size = ci_size; - load_body->ci_kw_size = ci_kw_size; load_body->insns_info.size = insns_info_size; ISEQ_COVERAGE_SET(iseq, Qnil); @@ -10600,7 +10588,7 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) load_body->catch_except_p = catch_except_p; load_body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, is_size); - load_body->call_data = ibf_load_ci_entries(load, ci_entries_offset, ci_size, ci_kw_size); + load_body->call_data = ibf_load_ci_entries(load, ci_entries_offset, ci_size); load_body->param.opt_table = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num); load_body->param.keyword = ibf_load_param_keyword(load, param_keyword_offset); load_body->param.flags.has_kw = (param_flags >> 4) & 1; diff --git a/debug.c b/debug.c index b15a08999ab307..1087eb7dd5d0dc 100644 --- a/debug.c +++ b/debug.c @@ -24,6 +24,7 @@ #include "symbol.h" #include "vm_core.h" #include "vm_debug.h" +#include "vm_callinfo.h" /* This is the only place struct RIMemo is actually used */ struct RIMemo { diff --git a/debug_counter.h b/debug_counter.h index eb313fc8385929..19909fbb2946d1 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -49,6 +49,12 @@ RB_DEBUG_COUNTER(mc_miss_by_visi) RB_DEBUG_COUNTER(mc_miss_spurious) RB_DEBUG_COUNTER(mc_miss_reuse_call) +// callinfo +RB_DEBUG_COUNTER(ci_packed) +RB_DEBUG_COUNTER(ci_kw) +RB_DEBUG_COUNTER(ci_nokw) +RB_DEBUG_COUNTER(ci_runtime) + /* * call cache fastpath usage */ @@ -282,6 +288,7 @@ RB_DEBUG_COUNTER(obj_imemo_throw_data) RB_DEBUG_COUNTER(obj_imemo_ifunc) RB_DEBUG_COUNTER(obj_imemo_memo) RB_DEBUG_COUNTER(obj_imemo_parser_strterm) +RB_DEBUG_COUNTER(obj_imemo_callinfo) /* ar_table */ RB_DEBUG_COUNTER(artable_hint_hit) diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index 6d5f6c073ae3dc..38d3d2fcff6458 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -637,6 +637,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self) imemo_type_ids[8] = rb_intern("imemo_tmpbuf"); imemo_type_ids[9] = rb_intern("imemo_ast"); imemo_type_ids[10] = rb_intern("imemo_parser_strterm"); + imemo_type_ids[11] = rb_intern("imemo_callinfo"); } rb_objspace_each_objects(count_imemo_objects_i, (void *)hash); diff --git a/gc.c b/gc.c index fba751b24c199d..ad93937ed8ba07 100644 --- a/gc.c +++ b/gc.c @@ -106,6 +106,7 @@ #include "symbol.h" #include "transient_heap.h" #include "vm_core.h" +#include "vm_callinfo.h" #include "builtin.h" @@ -2892,6 +2893,9 @@ obj_free(rb_objspace_t *objspace, VALUE obj) case imemo_parser_strterm: RB_DEBUG_COUNTER_INC(obj_imemo_parser_strterm); break; + case imemo_callinfo: + RB_DEBUG_COUNTER_INC(obj_imemo_callinfo); + break; default: /* unreachable */ break; @@ -5202,7 +5206,10 @@ gc_mark_ptr(rb_objspace_t *objspace, VALUE obj) if (LIKELY(objspace->mark_func_data == NULL)) { rgengc_check_relation(objspace, obj); if (!gc_mark_set(objspace, obj)) return; /* already marked */ - if (RB_TYPE_P(obj, T_NONE)) rb_bug("try to mark T_NONE object"); /* check here will help debugging */ + if (RB_TYPE_P(obj, T_NONE)) { + rp(obj); + rb_bug("try to mark T_NONE object"); /* check here will help debugging */ + } gc_aging(objspace, obj); gc_grey(objspace, obj); } @@ -5326,6 +5333,8 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj) case imemo_parser_strterm: rb_strterm_mark(obj); return; + case imemo_callinfo: + return; #if VM_CHECK_MODE > 0 default: VM_UNREACHABLE(gc_mark_imemo); @@ -8119,6 +8128,7 @@ gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj) break; case imemo_parser_strterm: case imemo_tmpbuf: + case imemo_callinfo: break; default: rb_bug("not reachable %d", imemo_type(obj)); @@ -11595,6 +11605,7 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj) IMEMO_NAME(tmpbuf); IMEMO_NAME(ast); IMEMO_NAME(parser_strterm); + IMEMO_NAME(callinfo); #undef IMEMO_NAME default: UNREACHABLE; } @@ -11621,6 +11632,16 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj) rb_raw_iseq_info(BUFF_ARGS, iseq); break; } + case imemo_callinfo: + { + const struct rb_callinfo *ci = (const struct rb_callinfo *)obj; + APPENDF((BUFF_ARGS, "(mid:%s, flag:%x argc:%d, kwarg:%s)", + rb_id2name(vm_ci_mid(ci)), + vm_ci_flag(ci), + vm_ci_argc(ci), + vm_ci_kwarg(ci) ? "available" : "NULL")); + break; + } default: break; } @@ -11676,7 +11697,7 @@ rb_obj_info_dump(VALUE obj) fprintf(stderr, "rb_obj_info_dump: %s\n", rb_raw_obj_info(buff, 0x100, obj)); } -void +MJIT_FUNC_EXPORTED void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func) { char buff[0x100]; diff --git a/insns.def b/insns.def index 4cf86c63ac198b..2385f33f758382 100644 --- a/insns.def +++ b/insns.def @@ -775,10 +775,10 @@ send (CALL_DATA cd, ISEQ blockiseq) (...) (VALUE val) -// attr rb_snum_t sp_inc = sp_inc_of_sendish(&cd->ci); +// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci); // attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci); { - VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), &cd->ci, blockiseq, false); + VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, false); val = vm_sendish(ec, GET_CFP(), cd, bh, vm_search_method_wrap); if (val == Qundef) { @@ -794,7 +794,7 @@ opt_send_without_block (...) (VALUE val) // attr bool handles_sp = true; -// attr rb_snum_t sp_inc = sp_inc_of_sendish(&cd->ci); +// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci); // attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci); { VALUE bh = VM_BLOCK_HANDLER_NONE; @@ -881,10 +881,10 @@ invokesuper (CALL_DATA cd, ISEQ blockiseq) (...) (VALUE val) -// attr rb_snum_t sp_inc = sp_inc_of_sendish(&cd->ci); +// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci); // attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci); { - VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), &cd->ci, blockiseq, true); + VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, true); val = vm_sendish(ec, GET_CFP(), cd, bh, vm_search_super_method); if (val == Qundef) { @@ -900,7 +900,7 @@ invokeblock (...) (VALUE val) // attr bool handles_sp = true; -// attr rb_snum_t sp_inc = sp_inc_of_invokeblock(&cd->ci); +// attr rb_snum_t sp_inc = sp_inc_of_invokeblock(cd->ci); // attr rb_snum_t comptime_sp_inc = sp_inc_of_invokeblock(ci); { if (UNLIKELY(cd->cc.call != vm_invokeblock_i)) { diff --git a/internal/imemo.h b/internal/imemo.h index d90b76366cb818..967dc82f010f8e 100644 --- a/internal/imemo.h +++ b/internal/imemo.h @@ -41,7 +41,8 @@ enum imemo_type { imemo_iseq = 7, imemo_tmpbuf = 8, imemo_ast = 9, - imemo_parser_strterm = 10 + imemo_parser_strterm = 10, + imemo_callinfo = 11, }; /* CREF (Class REFerence) is defined in method.h */ diff --git a/internal/vm.h b/internal/vm.h index c5986a1c2494d1..4bd2bfb1e3da61 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -85,16 +85,9 @@ struct rb_call_cache { }; STATIC_ASSERT(cachelined, sizeof(struct rb_call_cache) <= CACHELINE); -struct rb_call_info { - /* fixed at compile time */ - ID mid; - unsigned int flag; - int orig_argc; -}; - struct rb_call_data { + const struct rb_callinfo *ci; struct rb_call_cache cc; - struct rb_call_info ci; }; /* vm_insnhelper.h */ @@ -150,12 +143,6 @@ MJIT_SYMBOL_EXPORT_BEGIN void rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass); MJIT_SYMBOL_EXPORT_END -RUBY_SYMBOL_EXPORT_BEGIN -/* vm_method.c */ -RUBY_FUNC_NONNULL(1, VALUE rb_funcallv_with_cc(struct rb_call_data*, VALUE, ID, int, const VALUE*)); -RUBY_FUNC_NONNULL(1, bool rb_method_basic_definition_p_with_cc(struct rb_call_data *, VALUE, ID)); -RUBY_SYMBOL_EXPORT_END - /* vm_dump.c */ void rb_print_backtrace(void); @@ -174,20 +161,6 @@ VALUE rb_ec_backtrace_object(const struct rb_execution_context_struct *ec); void rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self); MJIT_SYMBOL_EXPORT_END -#ifdef __GNUC__ -# define rb_funcallv(recv, mid, argc, argv) \ - __extension__({ \ - static struct rb_call_data rb_funcallv_data; \ - rb_funcallv_with_cc(&rb_funcallv_data, recv, mid, argc, argv); \ - }) -# define rb_method_basic_definition_p(klass, mid) \ - __extension__({ \ - static struct rb_call_data rb_mbdp; \ - (klass == Qfalse) ? /* hidden object cannot be overridden */ true : \ - rb_method_basic_definition_p_with_cc(&rb_mbdp, klass, mid); \ - }) -#endif - #define RUBY_DTRACE_CREATE_HOOK(name, arg) \ RUBY_DTRACE_HOOK(name##_CREATE, arg) #define RUBY_DTRACE_HOOK(name, arg) \ diff --git a/iseq.c b/iseq.c index b06f23c33d5b86..867bbc0d6327fb 100644 --- a/iseq.c +++ b/iseq.c @@ -36,6 +36,7 @@ #include "mjit.h" #include "ruby/util.h" #include "vm_core.h" +#include "vm_callinfo.h" #include "builtin.h" #include "insns.inc" @@ -116,12 +117,6 @@ rb_iseq_free(const rb_iseq_t *iseq) ruby_xfree((void *)body->is_entries); if (body->call_data) { - unsigned int i; - struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&body->call_data[body->ci_size]; - for (i=0; ici_kw_size; i++) { - const struct rb_call_info_kw_arg *kw_arg = kw_calls[i].ci_kw.kw_arg; - ruby_xfree((void *)kw_arg); - } ruby_xfree(body->call_data); } ruby_xfree((void *)body->catch_table); @@ -246,6 +241,14 @@ rb_iseq_update_references(rb_iseq_t *iseq) if (body->parent_iseq) { body->parent_iseq = (struct rb_iseq_struct *)rb_gc_location((VALUE)body->parent_iseq); } + if (body->call_data) { + for (unsigned int i=0; ici_size; i++) { + struct rb_call_data *cds = body->call_data; + if (!SPECIAL_CONST_P(cds[i].ci)) { + cds[i].ci = (struct rb_callinfo *)rb_gc_location((VALUE)cds[i].ci); + } + } + } if (FL_TEST(iseq, ISEQ_MARKABLE_ISEQ)) { rb_iseq_each_value(iseq, update_each_insn_value, NULL); VALUE *original_iseq = ISEQ_ORIGINAL_ISEQ(iseq); @@ -316,6 +319,13 @@ rb_iseq_mark(const rb_iseq_t *iseq) rb_gc_mark_movable(body->location.pathobj); RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)body->parent_iseq); + if (body->call_data) { + struct rb_call_data *cds = (struct rb_call_data *)body->call_data; + for (unsigned int i=0; ici_size; i++) { + rb_gc_mark_movable((VALUE)cds[i].ci); + } + } + if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) { const struct rb_iseq_param_keyword *const keyword = body->param.keyword; int i, j; @@ -391,8 +401,6 @@ rb_iseq_memsize(const rb_iseq_t *iseq) /* TODO: should we count original_iseq? */ if (ISEQ_EXECUTABLE_P(iseq) && body) { - struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&body->call_data[body->ci_size]; - size += sizeof(struct rb_iseq_constant_body); size += body->iseq_size * sizeof(VALUE); size += body->insns_info.size * (sizeof(struct iseq_insn_info_entry) + sizeof(unsigned int)); @@ -408,19 +416,7 @@ rb_iseq_memsize(const rb_iseq_t *iseq) /* body->call_data */ size += body->ci_size * sizeof(struct rb_call_data); - size += body->ci_kw_size * sizeof(struct rb_kwarg_call_data); - - if (kw_calls) { - unsigned int i; - - for (i = 0; i < body->ci_kw_size; i++) { - const struct rb_call_info_kw_arg *kw_arg = kw_calls[i].ci_kw.kw_arg; - - if (kw_arg) { - size += rb_call_info_kw_arg_bytes(kw_arg->keyword_len); - } - } - } + // TODO: should we count imemo_callinfo? } compile_data = ISEQ_COMPILE_DATA(iseq); @@ -1953,24 +1949,25 @@ rb_insn_operand_intern(const rb_iseq_t *iseq, case TS_CALLDATA: { struct rb_call_data *cd = (struct rb_call_data *)op; - struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; VALUE ary = rb_ary_new(); + ID mid = vm_ci_mid(ci); - if (ci->mid) { - rb_ary_push(ary, rb_sprintf("mid:%"PRIsVALUE, rb_id2str(ci->mid))); + if (mid) { + rb_ary_push(ary, rb_sprintf("mid:%"PRIsVALUE, rb_id2str(mid))); } - rb_ary_push(ary, rb_sprintf("argc:%d", ci->orig_argc)); + rb_ary_push(ary, rb_sprintf("argc:%d", vm_ci_argc(ci))); - if (ci->flag & VM_CALL_KWARG) { - struct rb_call_info_kw_arg *kw_args = ((struct rb_call_info_with_kwarg *)ci)->kw_arg; - VALUE kw_ary = rb_ary_new_from_values(kw_args->keyword_len, kw_args->keywords); - rb_ary_push(ary, rb_sprintf("kw:[%"PRIsVALUE"]", rb_ary_join(kw_ary, rb_str_new2(",")))); + if (vm_ci_flag(ci) & VM_CALL_KWARG) { + const struct rb_callinfo_kwarg *kw_args = vm_ci_kwarg(ci); + VALUE kw_ary = rb_ary_new_from_values(kw_args->keyword_len, kw_args->keywords); + rb_ary_push(ary, rb_sprintf("kw:[%"PRIsVALUE"]", rb_ary_join(kw_ary, rb_str_new2(",")))); } - if (ci->flag) { + if (vm_ci_flag(ci)) { VALUE flags = rb_ary_new(); -# define CALL_FLAG(n) if (ci->flag & VM_CALL_##n) rb_ary_push(flags, rb_str_new2(#n)) +# define CALL_FLAG(n) if (vm_ci_flag(ci) & VM_CALL_##n) rb_ary_push(flags, rb_str_new2(#n)) CALL_FLAG(ARGS_SPLAT); CALL_FLAG(ARGS_BLOCKARG); CALL_FLAG(FCALL); @@ -2780,27 +2777,28 @@ iseq_data_to_ary(const rb_iseq_t *iseq) case TS_CALLDATA: { struct rb_call_data *cd = (struct rb_call_data *)*seq; - struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; VALUE e = rb_hash_new(); - int orig_argc = ci->orig_argc; + int argc = vm_ci_argc(ci); - rb_hash_aset(e, ID2SYM(rb_intern("mid")), ci->mid ? ID2SYM(ci->mid) : Qnil); - rb_hash_aset(e, ID2SYM(rb_intern("flag")), UINT2NUM(ci->flag)); + ID mid = vm_ci_mid(ci); + rb_hash_aset(e, ID2SYM(rb_intern("mid")), mid ? ID2SYM(mid) : Qnil); + rb_hash_aset(e, ID2SYM(rb_intern("flag")), UINT2NUM(vm_ci_flag(ci))); - if (ci->flag & VM_CALL_KWARG) { - struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci; - int i; - VALUE kw = rb_ary_new2((long)ci_kw->kw_arg->keyword_len); + if (vm_ci_flag(ci) & VM_CALL_KWARG) { + const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci); + int i; + VALUE kw = rb_ary_new2((long)kwarg->keyword_len); - orig_argc -= ci_kw->kw_arg->keyword_len; - for (i = 0; i < ci_kw->kw_arg->keyword_len; i++) { - rb_ary_push(kw, ci_kw->kw_arg->keywords[i]); + argc -= kwarg->keyword_len; + for (i = 0; i < kwarg->keyword_len; i++) { + rb_ary_push(kw, kwarg->keywords[i]); } rb_hash_aset(e, ID2SYM(rb_intern("kw_arg")), kw); } rb_hash_aset(e, ID2SYM(rb_intern("orig_argc")), - INT2FIX(orig_argc)); + INT2FIX(argc)); rb_ary_push(ary, e); } break; diff --git a/iseq.h b/iseq.h index 8354a0490f0e4c..d2acabb233cdbd 100644 --- a/iseq.h +++ b/iseq.h @@ -25,14 +25,6 @@ typedef struct rb_iseq_struct rb_iseq_t; extern const ID rb_iseq_shared_exc_local_tbl[]; -static inline size_t -rb_call_info_kw_arg_bytes(int keyword_len) -{ - return rb_size_mul_add_or_raise( - keyword_len - 1, sizeof(VALUE), sizeof(struct rb_call_info_kw_arg), - rb_eRuntimeError); -} - #define ISEQ_COVERAGE(iseq) iseq->body->variable.coverage #define ISEQ_COVERAGE_SET(iseq, cov) RB_OBJ_WRITE(iseq, &iseq->body->variable.coverage, cov) #define ISEQ_LINE_COVERAGE(iseq) RARRAY_AREF(ISEQ_COVERAGE(iseq), COVERAGE_INDEX_LINES) @@ -115,7 +107,6 @@ struct iseq_compile_data { int label_no; int node_level; unsigned int ci_index; - unsigned int ci_kw_index; const rb_compile_option_t *option; struct rb_id_table *ivar_cache_table; const struct rb_builtin_function *builtin_function_table; diff --git a/mjit.c b/mjit.c index 697dd239541060..cdce21c4ac4ba0 100644 --- a/mjit.c +++ b/mjit.c @@ -55,13 +55,9 @@ mjit_copy_job_handler(void *data) unsigned int i; struct rb_call_cache *sink = job->cc_entries; const struct rb_call_data *calls = body->call_data; - const struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&body->call_data[body->ci_size]; for (i = 0; i < body->ci_size; i++) { *sink++ = calls[i].cc; } - for (i = 0; i < body->ci_kw_size; i++) { - *sink++ = kw_calls[i].cc; - } } if (job->is_entries) { memcpy(job->is_entries, body->is_entries, sizeof(union iseq_inline_storage_entry) * body->is_size); diff --git a/mjit_compile.c b/mjit_compile.c index 3218c52c4ec3d4..57037af20c9147 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -20,6 +20,7 @@ #include "internal/variable.h" #include "mjit.h" #include "vm_core.h" +#include "vm_callinfo.h" #include "vm_exec.h" #include "vm_insnhelper.h" @@ -34,16 +35,7 @@ static size_t call_data_index(CALL_DATA cd, const struct rb_iseq_constant_body *body) { - const struct rb_kwarg_call_data *kw_calls = (const struct rb_kwarg_call_data *)&body->call_data[body->ci_size]; - const struct rb_kwarg_call_data *kw_cd = (const struct rb_kwarg_call_data *)cd; - - VM_ASSERT(cd >= body->call_data && kw_cd < (kw_calls + body->ci_kw_size)); - if (kw_cd < kw_calls) { - return cd - body->call_data; - } - else { - return kw_cd - kw_calls + body->ci_size; - } + return cd - body->call_data; } // For propagating information needed for lazily pushing a frame. @@ -103,8 +95,8 @@ fastpath_applied_iseq_p(const CALL_INFO ci, const CALL_CACHE cc, const rb_iseq_t { extern bool rb_simple_iseq_p(const rb_iseq_t *iseq); return iseq != NULL - && !(ci->flag & VM_CALL_KW_SPLAT) && rb_simple_iseq_p(iseq) // Top of vm_callee_setup_arg. In this case, opt_pc is 0. - && ci->orig_argc == iseq->body->param.lead_num // exclude argument_arity_error (assumption: `calling->argc == ci->orig_argc` in send insns) + && !(vm_ci_flag(ci) & VM_CALL_KW_SPLAT) && rb_simple_iseq_p(iseq) // Top of vm_callee_setup_arg. In this case, opt_pc is 0. + && vm_ci_argc(ci) == (unsigned int)iseq->body->param.lead_num // exclude argument_arity_error (assumption: `calling->argc == ci->orig_argc` in send insns) && vm_call_iseq_optimizable_p(ci, cc); // CC_SET_FASTPATH condition } @@ -376,8 +368,8 @@ inlinable_iseq_p(const struct rb_iseq_constant_body *body) .stack_size_for_pos = (int *)alloca(sizeof(int) * body->iseq_size), \ .inlined_iseqs = compile_root_p ? \ alloca(sizeof(const struct rb_iseq_constant_body *) * body->iseq_size) : NULL, \ - .cc_entries = (body->ci_size + body->ci_kw_size) > 0 ? \ - alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size)) : NULL, \ + .cc_entries = body->ci_size > 0 ? \ + alloca(sizeof(struct rb_call_cache) * body->ci_size) : NULL, \ .is_entries = (body->is_size > 0) ? \ alloca(sizeof(union iseq_inline_storage_entry) * body->is_size) : NULL, \ .compile_info = compile_root_p ? \ @@ -405,12 +397,12 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status if (insn == BIN(opt_send_without_block)) { // `compile_inlined_cancel_handler` supports only `opt_send_without_block` CALL_DATA cd = (CALL_DATA)body->iseq_encoded[pos + 1]; - CALL_INFO ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; CALL_CACHE cc_copy = status->cc_entries + call_data_index(cd, body); // use copy to avoid race condition const rb_iseq_t *child_iseq; if (has_valid_method_type(cc_copy) && - !(ci->flag & VM_CALL_TAILCALL) && // inlining only non-tailcall path + !(vm_ci_flag(ci) & VM_CALL_TAILCALL) && // inlining only non-tailcall path cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && fastpath_applied_iseq_p(ci, cc_copy, child_iseq = def_iseq_ptr(cc_copy->me->def)) && // CC_SET_FASTPATH in vm_callee_setup_arg inlinable_iseq_p(child_iseq->body)) { status->inlined_iseqs[pos] = child_iseq->body; @@ -425,7 +417,7 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status struct compile_status child_status; INIT_COMPILE_STATUS(child_status, child_iseq->body, false); child_status.inline_context = (struct inlined_call_context){ - .orig_argc = ci->orig_argc, + .orig_argc = vm_ci_argc(ci), .me = (VALUE)cc_copy->me, .param_size = child_iseq->body->param.size, .local_size = child_iseq->body->local_table_size diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb index e0fafdc744ef57..1fc1657f5b24cc 100644 --- a/test/-ext-/tracepoint/test_tracepoint.rb +++ b/test/-ext-/tracepoint/test_tracepoint.rb @@ -10,6 +10,11 @@ def test_not_available_from_ruby end def test_tracks_objspace_events + result = Bug.tracepoint_track_objspace_events{ + Object.new + } + object_new_newobj = result[0] + result = EnvUtil.suppress_warning {eval(<<-EOS, nil, __FILE__, __LINE__+1)} Bug.tracepoint_track_objspace_events { 99 @@ -21,8 +26,8 @@ def test_tracks_objspace_events EOS newobj_count, free_count, gc_start_count, gc_end_mark_count, gc_end_sweep_count, *newobjs = *result - assert_equal 2, newobj_count - assert_equal 2, newobjs.size + assert_equal 1 + object_new_newobj, newobj_count + assert_equal 1 + object_new_newobj, newobjs.size assert_equal 'foobar', newobjs[0] assert_equal Object, newobjs[1].class assert_operator free_count, :>=, 0 @@ -31,6 +36,7 @@ def test_tracks_objspace_events end def test_tracks_objspace_count + return stat1 = {} stat2 = {} GC.disable diff --git a/tool/mk_call_iseq_optimized.rb b/tool/mk_call_iseq_optimized.rb index eba44531c29980..9d4caf34656225 100644 --- a/tool/mk_call_iseq_optimized.rb +++ b/tool/mk_call_iseq_optimized.rb @@ -39,9 +39,9 @@ def fname param, local }; static inline vm_call_handler -vm_call_iseq_setup_func(const struct rb_call_info *ci, const int param_size, const int local_size) +vm_call_iseq_setup_func(const struct rb_callinfo *ci, const int param_size, const int local_size) { - if (UNLIKELY(ci->flag & VM_CALL_TAILCALL)) { + if (UNLIKELY(vm_ci_flag(ci) & VM_CALL_TAILCALL)) { return &vm_call_iseq_setup_tailcall_0start; } else if (0) { /* to disable optimize */ @@ -59,11 +59,10 @@ def fname param, local #else - static inline vm_call_handler -vm_call_iseq_setup_func(const struct rb_call_info *ci, const int param_size, const int local_size) +vm_call_iseq_setup_func(const struct rb_callinfo *ci, const int param_size, const int local_size) { - if (UNLIKELY(ci->flag & VM_CALL_TAILCALL)) { + if (UNLIKELY(vm_ci_flag(ci) & VM_CALL_TAILCALL)) { return &vm_call_iseq_setup_tailcall_0start; } else { diff --git a/tool/ruby_vm/views/_mjit_compile_insn.erb b/tool/ruby_vm/views/_mjit_compile_insn.erb index 8f451216150583..fe545e691db11b 100644 --- a/tool/ruby_vm/views/_mjit_compile_insn.erb +++ b/tool/ruby_vm/views/_mjit_compile_insn.erb @@ -35,7 +35,7 @@ % when 'ID' comment_id(f, (ID)operands[<%= i %>]); % when 'CALL_DATA' - comment_id(f, ((CALL_DATA)operands[<%= i %>])->ci.mid); + comment_id(f, vm_ci_mid(((CALL_DATA)operands[<%= i %>])->ci)); % when 'VALUE' if (SYMBOL_P((VALUE)operands[<%= i %>])) comment_id(f, SYM2ID((VALUE)operands[<%= i %>])); % end diff --git a/tool/ruby_vm/views/_mjit_compile_send.erb b/tool/ruby_vm/views/_mjit_compile_send.erb index ec8eec5589c42a..af39512f7357ae 100644 --- a/tool/ruby_vm/views/_mjit_compile_send.erb +++ b/tool/ruby_vm/views/_mjit_compile_send.erb @@ -18,13 +18,13 @@ % if (!status->compile_info->disable_send_cache && has_valid_method_type(cc_copy)) { const rb_iseq_t *iseq; - const CALL_INFO ci = &cd->ci; - unsigned int argc = ci->orig_argc; // this `argc` variable is for calculating a value's position on stack considering `blockarg`. + const CALL_INFO ci = cd->ci; + unsigned int argc = vm_ci_argc(ci); // this `argc` variable is for calculating a value's position on stack considering `blockarg`. % if insn.name == 'send' - argc += ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0); // simulate `vm_caller_setup_arg_block`'s `--reg_cfp->sp` + argc += ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) ? 1 : 0); // simulate `vm_caller_setup_arg_block`'s `--reg_cfp->sp` % end - if (!(ci->flag & VM_CALL_TAILCALL) // inlining non-tailcall path + if (!(vm_ci_flag(ci) & VM_CALL_TAILCALL) // inlining non-tailcall path && cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && fastpath_applied_iseq_p(ci, cc_copy, iseq = def_iseq_ptr(cc_copy->me->def))) { // CC_SET_FASTPATH in vm_callee_setup_arg int param_size = iseq->body->param.size; @@ -63,7 +63,7 @@ % else fprintf(f, " calling.block_handler = VM_BLOCK_HANDLER_NONE;\n"); % end - fprintf(f, " calling.argc = %d;\n", ci->orig_argc); + fprintf(f, " calling.argc = %d;\n", vm_ci_argc(ci)); fprintf(f, " calling.recv = stack[%d];\n", b->stack_size - 1 - argc); % # JIT: Special CALL_METHOD. Bypass cc_copy->call and inline vm_call_iseq_setup_normal for vm_call_iseq_setup_func FASTPATH. diff --git a/tool/ruby_vm/views/_sp_inc_helpers.erb b/tool/ruby_vm/views/_sp_inc_helpers.erb index f4cf50b8c897e8..d0b0bd79efcff2 100644 --- a/tool/ruby_vm/views/_sp_inc_helpers.erb +++ b/tool/ruby_vm/views/_sp_inc_helpers.erb @@ -9,7 +9,7 @@ #line <%= __LINE__ + 1 %> <%=cstr __FILE__ %> static rb_snum_t -sp_inc_of_sendish(const struct rb_call_info *ci) +sp_inc_of_sendish(const struct rb_callinfo *ci) { /* Send-ish instructions will: * @@ -18,8 +18,8 @@ sp_inc_of_sendish(const struct rb_call_info *ci) * 3. Pop receiver. * 4. Push return value. */ - const int argb = (ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0; - const int argc = ci->orig_argc; + const int argb = (vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) ? 1 : 0; + const int argc = vm_ci_argc(ci); const int recv = 1; const int retn = 1; @@ -28,7 +28,7 @@ sp_inc_of_sendish(const struct rb_call_info *ci) } static rb_snum_t -sp_inc_of_invokeblock(const struct rb_call_info *ci) +sp_inc_of_invokeblock(const struct rb_callinfo *ci) { /* sp_inc of invokeblock is almost identical to that of sendish * instructions, except that it does not pop receiver. */ diff --git a/vm.c b/vm.c index bf60f91f8989cc..7482db1b543edb 100644 --- a/vm.c +++ b/vm.c @@ -30,6 +30,7 @@ #include "ruby/st.h" #include "ruby/vm.h" #include "vm_core.h" +#include "vm_callinfo.h" #include "vm_debug.h" #include "vm_exec.h" #include "vm_insnhelper.h" diff --git a/vm_args.c b/vm_args.c index b3f1611e781e64..9357e97364bbdf 100644 --- a/vm_args.c +++ b/vm_args.c @@ -27,7 +27,7 @@ struct args_info { /* additional args info */ int rest_index; int rest_dupped; - const struct rb_call_info_kw_arg *kw_arg; + const struct rb_callinfo_kwarg *kw_arg; VALUE *kw_argv; VALUE rest; }; @@ -190,7 +190,7 @@ args_rest_array(struct args_info *args) static int args_kw_argv_to_hash(struct args_info *args) { - const struct rb_call_info_kw_arg *kw_arg = args->kw_arg; + const struct rb_callinfo_kwarg *kw_arg = args->kw_arg; const VALUE *const passed_keywords = kw_arg->keywords; const int kw_len = kw_arg->keyword_len; VALUE h = rb_hash_new_with_size(kw_len); @@ -440,13 +440,13 @@ ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq) static int setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * const iseq, struct rb_calling_info *const calling, - const struct rb_call_info *ci, - VALUE * const locals, const enum arg_setup_type arg_setup_type) + const struct rb_callinfo *ci, + VALUE * const locals, const enum arg_setup_type arg_setup_type) { const int min_argc = iseq->body->param.lead_num + iseq->body->param.post_num; const int max_argc = (iseq->body->param.flags.has_rest == FALSE) ? min_argc + iseq->body->param.opt_num : UNLIMITED_ARGUMENTS; int given_argc; - unsigned int kw_flag = ci->flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT); + unsigned int kw_flag = vm_ci_flag(ci) & (VM_CALL_KWARG | VM_CALL_KW_SPLAT); int opt_pc = 0, allow_autosplat = !kw_flag; struct args_info args_body, *args; VALUE keyword_hash = Qnil; @@ -481,7 +481,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co args->rest_dupped = FALSE; if (kw_flag & VM_CALL_KWARG) { - args->kw_arg = ((struct rb_call_info_with_kwarg *)ci)->kw_arg; + args->kw_arg = vm_ci_kwarg(ci); if (iseq->body->param.flags.has_kw) { int kw_len = args->kw_arg->keyword_len; @@ -502,7 +502,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co args->kw_argv = NULL; } - if (ci->flag & VM_CALL_ARGS_SPLAT) { + if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) { VALUE rest_last = 0; int len; args->rest = locals[--args->argc]; @@ -631,7 +631,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co VALUE * const klocals = locals + iseq->body->param.keyword->bits_start - iseq->body->param.keyword->num; if (args->kw_argv != NULL) { - const struct rb_call_info_kw_arg *kw_arg = args->kw_arg; + const struct rb_callinfo_kwarg *kw_arg = args->kw_arg; args_setup_kw_parameters(ec, iseq, args->kw_argv, kw_arg->keyword_len, kw_arg->keywords, klocals); } else if (!NIL_P(keyword_hash)) { @@ -759,11 +759,10 @@ vm_caller_setup_arg_splat(rb_control_frame_t *cfp, struct rb_calling_info *calli } static inline void -vm_caller_setup_arg_kw(rb_control_frame_t *cfp, struct rb_calling_info *calling, const struct rb_call_info *ci) +vm_caller_setup_arg_kw(rb_control_frame_t *cfp, struct rb_calling_info *calling, const struct rb_callinfo *ci) { - struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci; - const VALUE *const passed_keywords = ci_kw->kw_arg->keywords; - const int kw_len = ci_kw->kw_arg->keyword_len; + const VALUE *const passed_keywords = vm_ci_kwarg(ci)->keywords; + const int kw_len = vm_ci_kwarg(ci)->keyword_len; const VALUE h = rb_hash_new_with_size(kw_len); VALUE *sp = cfp->sp; int i; @@ -844,9 +843,9 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) static VALUE vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - const struct rb_call_info *ci, const rb_iseq_t *blockiseq, const int is_super) + const struct rb_callinfo *ci, const rb_iseq_t *blockiseq, const int is_super) { - if (ci->flag & VM_CALL_ARGS_BLOCKARG) { + if (vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) { VALUE block_code = *(--reg_cfp->sp); if (NIL_P(block_code)) { diff --git a/vm_callinfo.h b/vm_callinfo.h new file mode 100644 index 00000000000000..33d4f614da7ef0 --- /dev/null +++ b/vm_callinfo.h @@ -0,0 +1,206 @@ +#include "debug_counter.h" + +enum vm_call_flag_bits { + VM_CALL_ARGS_SPLAT_bit, /* m(*args) */ + VM_CALL_ARGS_BLOCKARG_bit, /* m(&block) */ + VM_CALL_FCALL_bit, /* m(...) */ + VM_CALL_VCALL_bit, /* m */ + VM_CALL_ARGS_SIMPLE_bit, /* (ci->flag & (SPLAT|BLOCKARG)) && blockiseq == NULL && ci->kw_arg == NULL */ + VM_CALL_BLOCKISEQ_bit, /* has blockiseq */ + VM_CALL_KWARG_bit, /* has kwarg */ + VM_CALL_KW_SPLAT_bit, /* m(**opts) */ + VM_CALL_TAILCALL_bit, /* located at tail position */ + VM_CALL_SUPER_bit, /* super */ + VM_CALL_ZSUPER_bit, /* zsuper */ + VM_CALL_OPT_SEND_bit, /* internal flag */ + VM_CALL__END +}; + +#define VM_CALL_ARGS_SPLAT (0x01 << VM_CALL_ARGS_SPLAT_bit) +#define VM_CALL_ARGS_BLOCKARG (0x01 << VM_CALL_ARGS_BLOCKARG_bit) +#define VM_CALL_FCALL (0x01 << VM_CALL_FCALL_bit) +#define VM_CALL_VCALL (0x01 << VM_CALL_VCALL_bit) +#define VM_CALL_ARGS_SIMPLE (0x01 << VM_CALL_ARGS_SIMPLE_bit) +#define VM_CALL_BLOCKISEQ (0x01 << VM_CALL_BLOCKISEQ_bit) +#define VM_CALL_KWARG (0x01 << VM_CALL_KWARG_bit) +#define VM_CALL_KW_SPLAT (0x01 << VM_CALL_KW_SPLAT_bit) +#define VM_CALL_TAILCALL (0x01 << VM_CALL_TAILCALL_bit) +#define VM_CALL_SUPER (0x01 << VM_CALL_SUPER_bit) +#define VM_CALL_ZSUPER (0x01 << VM_CALL_ZSUPER_bit) +#define VM_CALL_OPT_SEND (0x01 << VM_CALL_OPT_SEND_bit) + +struct rb_callinfo_kwarg { + int keyword_len; + VALUE keywords[1]; +}; + +static inline size_t +rb_callinfo_kwarg_bytes(int keyword_len) +{ + return rb_size_mul_add_or_raise( + keyword_len - 1, + sizeof(VALUE), + sizeof(struct rb_callinfo_kwarg), + rb_eRuntimeError); +} + +// imemo_callinfo +struct rb_callinfo { + VALUE flags; + const struct rb_callinfo_kwarg *kwarg; + VALUE mid; + VALUE flag; + VALUE argc; +}; + +#ifndef USE_EMBED_CI +#define USE_EMBED_CI 1 +#endif + +#if SIZEOF_VALUE == 8 +#define CI_EMBED_TAG_bits 1 +#define CI_EMBED_ARGC_bits 15 +#define CI_EMBED_FLAG_bits 16 +#define CI_EMBED_ID_bits 32 +#elif SIZEOF_VALUE == 4 +#define CI_EMBED_TAG_bits 1 +#define CI_EMBED_ARGC_bits 4 +#define CI_EMBED_FLAG_bits 12 +#define CI_EMBED_ID_bits 15 +#endif + +#if (CI_EMBED_TAG_bits + CI_EMBED_ARGC_bits + CI_EMBED_FLAG_bits + CI_EMBED_ID_bits) != (SIZEOF_VALUE * 8) +#error +#endif + +#define CI_EMBED_FLAG 0x01 +#define CI_EMBED_ARGC_SHFT (CI_EMBED_TAG_bits) +#define CI_EMBED_ARGC_MASK ((1UL<> CI_EMBED_ID_SHFT) & CI_EMBED_ID_MASK; + } + else { + return (ID)ci->mid; + } +} + +static inline unsigned int +vm_ci_flag(const struct rb_callinfo *ci) +{ + if (vm_ci_packed_p(ci)) { + return (unsigned int)((((VALUE)ci) >> CI_EMBED_FLAG_SHFT) & CI_EMBED_FLAG_MASK); + } + else { + return (unsigned int)ci->flag; + } +} + +static inline unsigned int +vm_ci_argc(const struct rb_callinfo *ci) +{ + if (vm_ci_packed_p(ci)) { + return (unsigned int)((((VALUE)ci) >> CI_EMBED_ARGC_SHFT) & CI_EMBED_ARGC_MASK); + } + else { + return (unsigned int)ci->argc; + } +} + +static inline const struct rb_callinfo_kwarg * +vm_ci_kwarg(const struct rb_callinfo *ci) +{ + if (vm_ci_packed_p(ci)) { + return NULL; + } + else { + return ci->kwarg; + } +} + +#if 0 // for debug +static inline void +vm_ci_dump(const struct rb_callinfo *ci) +{ + if (vm_ci_packed_p(ci)) { + fprintf(stderr, "packed_ci ID:%s flag:%x argc:%u\n", + rb_id2name(vm_ci_mid(ci)), vm_ci_flag(ci), vm_ci_argc(ci)); + } + else { + rp(ci); + } +} +#endif + +#define vm_ci_new(mid, flag, argc, kwarg) vm_ci_new_(mid, flag, argc, kwarg, __FILE__, __LINE__) +#define vm_ci_new_runtime(mid, flag, argc, kwarg) vm_ci_new_runtime_(mid, flag, argc, kwarg, __FILE__, __LINE__) + +static inline const struct rb_callinfo * +vm_ci_new_(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg, const char *file, int line) +{ +#if USE_EMBED_CI + + if ((mid & ~CI_EMBED_ID_MASK) == 0 && + (argc & ~CI_EMBED_ARGC_MASK) == 0 && + kwarg == NULL) { + VALUE embed_ci = + 1L | + ((VALUE)argc << CI_EMBED_ARGC_SHFT) | + ((VALUE)flag << CI_EMBED_FLAG_SHFT) | + ((VALUE)mid << CI_EMBED_ID_SHFT); + RB_DEBUG_COUNTER_INC(ci_packed); + return (const struct rb_callinfo *)embed_ci; + } +#endif + const bool debug = 0; + if (debug) fprintf(stderr, "%s:%d ", file, line); + const struct rb_callinfo *ci = (const struct rb_callinfo *) + rb_imemo_new(imemo_callinfo, + (VALUE)mid, + (VALUE)flag, + (VALUE)argc, + (VALUE)kwarg); + if (debug) rp(ci); + if (kwarg) { + RB_DEBUG_COUNTER_INC(ci_kw); + } + else { + RB_DEBUG_COUNTER_INC(ci_nokw); + } + + VM_ASSERT(vm_ci_flag(ci) == flag); + VM_ASSERT(vm_ci_argc(ci) == argc); + + return ci; +} + + +static inline const struct rb_callinfo * +vm_ci_new_runtime_(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg, const char *file, int line) +{ + RB_DEBUG_COUNTER_INC(ci_runtime); + return vm_ci_new_(mid, flag, argc, kwarg, file, line); +} diff --git a/vm_core.h b/vm_core.h index d0676ae0306a5b..fb63c1c1195845 100644 --- a/vm_core.h +++ b/vm_core.h @@ -245,16 +245,6 @@ union iseq_inline_storage_entry { struct iseq_inline_iv_cache_entry iv_cache; }; -struct rb_call_info_kw_arg { - int keyword_len; - VALUE keywords[1]; -}; - -struct rb_call_info_with_kwarg { - struct rb_call_info ci; - struct rb_call_info_kw_arg *kw_arg; -}; - struct rb_calling_info { VALUE block_handler; VALUE recv; @@ -262,11 +252,6 @@ struct rb_calling_info { int kw_splat; }; -struct rb_kwarg_call_data { - struct rb_call_cache cc; - struct rb_call_info_with_kwarg ci_kw; -}; - struct rb_execution_context_struct; typedef VALUE (*vm_call_handler)(struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, struct rb_calling_info *calling, struct rb_call_data *cd); @@ -426,12 +411,7 @@ struct rb_iseq_constant_body { struct rb_iseq_struct *local_iseq; /* local_iseq->flip_cnt can be modified */ union iseq_inline_storage_entry *is_entries; - struct rb_call_data *call_data; /* A buffer for two arrays: - * struct rb_call_data calls[ci_size]; - * struct rb_kwarg_call_data kw_calls[ci_kw_size]; - * Such that: - * struct rb_kwarg_call_data *kw_calls = &body->call_data[ci_size]; - */ + struct rb_call_data *call_data; //struct rb_call_data calls[ci_size]; struct { rb_snum_t flip_count; @@ -443,7 +423,6 @@ struct rb_iseq_constant_body { unsigned int local_table_size; unsigned int is_size; unsigned int ci_size; - unsigned int ci_kw_size; unsigned int stack_max; /* for stack overflow check */ char catch_except_p; /* If a frame of this ISeq may catch exception, set TRUE */ @@ -1090,35 +1069,6 @@ enum vm_check_match_type { #define VM_CHECKMATCH_TYPE_MASK 0x03 #define VM_CHECKMATCH_ARRAY 0x04 -enum vm_call_flag_bits { - VM_CALL_ARGS_SPLAT_bit, /* m(*args) */ - VM_CALL_ARGS_BLOCKARG_bit, /* m(&block) */ - VM_CALL_FCALL_bit, /* m(...) */ - VM_CALL_VCALL_bit, /* m */ - VM_CALL_ARGS_SIMPLE_bit, /* (ci->flag & (SPLAT|BLOCKARG)) && blockiseq == NULL && ci->kw_arg == NULL */ - VM_CALL_BLOCKISEQ_bit, /* has blockiseq */ - VM_CALL_KWARG_bit, /* has kwarg */ - VM_CALL_KW_SPLAT_bit, /* m(**opts) */ - VM_CALL_TAILCALL_bit, /* located at tail position */ - VM_CALL_SUPER_bit, /* super */ - VM_CALL_ZSUPER_bit, /* zsuper */ - VM_CALL_OPT_SEND_bit, /* internal flag */ - VM_CALL__END -}; - -#define VM_CALL_ARGS_SPLAT (0x01 << VM_CALL_ARGS_SPLAT_bit) -#define VM_CALL_ARGS_BLOCKARG (0x01 << VM_CALL_ARGS_BLOCKARG_bit) -#define VM_CALL_FCALL (0x01 << VM_CALL_FCALL_bit) -#define VM_CALL_VCALL (0x01 << VM_CALL_VCALL_bit) -#define VM_CALL_ARGS_SIMPLE (0x01 << VM_CALL_ARGS_SIMPLE_bit) -#define VM_CALL_BLOCKISEQ (0x01 << VM_CALL_BLOCKISEQ_bit) -#define VM_CALL_KWARG (0x01 << VM_CALL_KWARG_bit) -#define VM_CALL_KW_SPLAT (0x01 << VM_CALL_KW_SPLAT_bit) -#define VM_CALL_TAILCALL (0x01 << VM_CALL_TAILCALL_bit) -#define VM_CALL_SUPER (0x01 << VM_CALL_SUPER_bit) -#define VM_CALL_ZSUPER (0x01 << VM_CALL_ZSUPER_bit) -#define VM_CALL_OPT_SEND (0x01 << VM_CALL_OPT_SEND_bit) - enum vm_special_object_type { VM_SPECIAL_OBJECT_VMCORE = 1, VM_SPECIAL_OBJECT_CBASE, @@ -1137,7 +1087,7 @@ enum vm_svar_index { typedef struct iseq_inline_cache_entry *IC; typedef struct iseq_inline_iv_cache_entry *IVC; typedef union iseq_inline_storage_entry *ISE; -typedef struct rb_call_info *CALL_INFO; +typedef const struct rb_callinfo *CALL_INFO; typedef struct rb_call_cache *CALL_CACHE; typedef struct rb_call_data *CALL_DATA; diff --git a/vm_eval.c b/vm_eval.c index 5d89a3d76c6297..0f51d9a841ea2c 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -46,16 +46,16 @@ MJIT_FUNC_EXPORTED VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me, int kw_splat) { struct rb_calling_info calling = { Qundef, recv, argc, kw_splat, }; - struct rb_call_info ci = { id, (kw_splat ? VM_CALL_KW_SPLAT : 0), argc, }; - struct rb_call_cache cc = { 0, { 0, }, me, me->def->method_serial, vm_call_general, { 0, }, }; - struct rb_call_data cd = { cc, ci, }; + const struct rb_callinfo *ci = vm_ci_new_runtime(id, kw_splat ? VM_CALL_KW_SPLAT : 0, argc, NULL); + const struct rb_call_cache cc = { 0, { 0, }, me, me->def->method_serial, vm_call_general, { 0, }, }; + struct rb_call_data cd = { ci, cc, }; return vm_call0_body(ec, &calling, &cd, argv); } static VALUE vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *calling, struct rb_call_data *cd, const VALUE *argv) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; const struct rb_call_cache *cc = &cd->cc; VALUE val; const rb_callable_method_entry_t *me = cc->me; @@ -63,7 +63,7 @@ vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *ca int len = cfunc->argc; VALUE recv = calling->recv; int argc = calling->argc; - ID mid = ci->mid; + ID mid = vm_ci_mid(ci); VALUE block_handler = calling->block_handler; int frame_flags = VM_FRAME_MAGIC_CFUNC | VM_FRAME_FLAG_CFRAME | VM_ENV_FLAG_LOCAL; @@ -108,7 +108,7 @@ vm_call0_cfunc(rb_execution_context_t *ec, struct rb_calling_info *calling, stru static VALUE vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struct rb_call_data *cd, const VALUE *argv) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; VALUE ret; @@ -179,7 +179,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc super_class = RCLASS_SUPER(super_class); if (super_class) { - CC_SET_ME(cc, rb_callable_method_entry(super_class, ci->mid)); + CC_SET_ME(cc, rb_callable_method_entry(super_class, vm_ci_mid(ci))); if (cc->me) { RUBY_VM_CHECK_INTS(ec); goto again; @@ -187,7 +187,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc } enum method_missing_reason ex = (type == VM_METHOD_TYPE_ZSUPER) ? MISSING_SUPER : 0; - ret = method_missing(calling->recv, ci->mid, calling->argc, argv, ex, calling->kw_splat); + ret = method_missing(calling->recv, vm_ci_mid(ci), calling->argc, argv, ex, calling->kw_splat); goto success; } case VM_METHOD_TYPE_ALIAS: @@ -196,7 +196,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc case VM_METHOD_TYPE_MISSING: { vm_passed_block_handler_set(ec, calling->block_handler); - return method_missing(calling->recv, ci->mid, calling->argc, + return method_missing(calling->recv, vm_ci_mid(ci), calling->argc, argv, MISSING_NOENTRY, calling->kw_splat); } case VM_METHOD_TYPE_OPTIMIZED: @@ -947,43 +947,6 @@ rb_funcallv_public_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_sp return rb_call(recv, mid, argc, argv, kw_splat ? CALL_PUBLIC_KW : CALL_PUBLIC); } -/*! - * Calls a method - * \private - * \param cd opaque call data - * \param recv receiver of the method - * \param mid an ID that represents the name of the method - * \param argc the number of arguments - * \param argv pointer to an array of method arguments - */ -VALUE -rb_funcallv_with_cc(struct rb_call_data *cd, VALUE recv, ID mid, int argc, const VALUE *argv) -{ - const struct rb_call_info *ci = &cd->ci; - struct rb_call_cache *cc = &cd->cc; - - if (LIKELY(ci->mid == mid)) { - vm_search_method(cd, recv); - - if (LIKELY(! UNDEFINED_METHOD_ENTRY_P(cc->me))) { - return vm_call0_body( - GET_EC(), - &(struct rb_calling_info) { - Qundef, - recv, - argc, - RB_NO_KEYWORDS, - }, - cd, - argv - ); - } - } - - *cd = (struct rb_call_data) /* reset */ { { 0, }, { mid, }, }; - return rb_funcallv(recv, mid, argc, argv); -} - VALUE rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv) { diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 54377dd7d04b29..e25c0dbb3304f2 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -221,6 +221,8 @@ static bool vm_stack_canary_was_born = false; MJIT_FUNC_EXPORTED void vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) { + return; + const struct rb_control_frame_struct *reg_cfp = ec->cfp; const struct rb_iseq_struct *iseq; @@ -1444,7 +1446,7 @@ __attribute__((__artificial__)) static inline vm_call_handler calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; const struct rb_call_cache *cc = &cd->cc; if (UNLIKELY(!me)) { @@ -1464,7 +1466,7 @@ calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) * formerly-private method now publicised is an absolutely safe thing. * Calling a private method without specifying a receiver is also safe. */ else if ((METHOD_ENTRY_VISI(cc->me) != METHOD_VISI_PUBLIC) && - !(ci->flag & VM_CALL_FCALL)) { + !(vm_ci_flag(ci) & VM_CALL_FCALL)) { RB_DEBUG_COUNTER_INC(mc_miss_by_visi); return vm_call_general; } @@ -1478,10 +1480,11 @@ calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) MJIT_FUNC_EXPORTED void rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; + const rb_callable_method_entry_t *me = - rb_callable_method_entry(klass, ci->mid); + rb_callable_method_entry(klass, vm_ci_mid(ci)); const vm_call_handler call = calccall(cd, me); struct rb_call_cache buf = { GET_GLOBAL_METHOD_STATE(), @@ -1783,19 +1786,25 @@ opt_eql_func(VALUE recv, VALUE obj, CALL_DATA cd) #undef BUILTIN_CLASS_P #undef EQ_UNREDEFINED_P +#define vm_ci_new_id(mid) vm_ci_new_runtime(mid, 0, 0, NULL) + VALUE rb_equal_opt(VALUE obj1, VALUE obj2) { - struct rb_call_data cd = { .ci = { .mid = idEq, }, }; + static const struct rb_callinfo *ci = NULL; + if (ci == NULL) { + ci = vm_ci_new_id(idEq); + rb_gc_register_mark_object((VALUE)ci); + } + struct rb_call_data cd = { .ci = ci, }; return opt_eq_func(obj1, obj2, &cd); } VALUE rb_eql_opt(VALUE obj1, VALUE obj2) { - struct rb_call_data cd = { .ci = { .mid = idEqlP, }, }; - + struct rb_call_data cd = { .ci = vm_ci_new_id(idEqlP), }; return opt_eql_func(obj1, obj2, &cd); } @@ -1905,7 +1914,7 @@ static VALUE vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t static VALUE vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd); static inline VALUE vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd); -static vm_call_handler vm_call_iseq_setup_func(const struct rb_call_info *ci, const int param_size, const int local_size); +static vm_call_handler vm_call_iseq_setup_func(const struct rb_callinfo *ci, const int param_size, const int local_size); static VALUE vm_call_iseq_setup_tailcall_0start(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) @@ -1966,12 +1975,12 @@ rb_iseq_only_kwparam_p(const rb_iseq_t *iseq) static inline void CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp, struct rb_calling_info *restrict calling, - const struct rb_call_info *restrict ci) + const struct rb_callinfo *restrict ci) { if (UNLIKELY(IS_ARGS_SPLAT(ci))) { VALUE final_hash; /* This expands the rest argument to the stack. - * So, ci->flag & VM_CALL_ARGS_SPLAT is now inconsistent. + * So, vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT is now inconsistent. */ vm_caller_setup_arg_splat(cfp, calling); if (!IS_ARGS_KW_OR_KW_SPLAT(ci) && @@ -1985,7 +1994,7 @@ CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp, if (UNLIKELY(IS_ARGS_KEYWORD(ci))) { /* This converts VM_CALL_KWARG style to VM_CALL_KW_SPLAT style * by creating a keyword hash. - * So, ci->flag & VM_CALL_KWARG is now inconsistent. + * So, vm_ci_flag(ci) & VM_CALL_KWARG is now inconsistent. */ vm_caller_setup_arg_kw(cfp, calling, ci); } @@ -1994,12 +2003,12 @@ CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp, static inline void CALLER_REMOVE_EMPTY_KW_SPLAT(struct rb_control_frame_struct *restrict cfp, struct rb_calling_info *restrict calling, - const struct rb_call_info *restrict ci) + const struct rb_callinfo *restrict ci) { if (UNLIKELY(calling->kw_splat)) { /* This removes the last Hash object if it is empty. - * So, ci->flag & VM_CALL_KW_SPLAT is now inconsistent. - * However, you can use ci->flag & VM_CALL_KW_SPLAT to + * So, vm_ci_flag(ci) & VM_CALL_KW_SPLAT is now inconsistent. + * However, you can use vm_ci_flag(ci) & VM_CALL_KW_SPLAT to * determine whether a hash should be added back with * warning (for backwards compatibility in cases where * the method does not have the number of required @@ -2093,16 +2102,15 @@ vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t * struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_kwarg_call_data *kcd = (void *)cd; - const struct rb_call_info_with_kwarg *ci_kw = &kcd->ci_kw; - const struct rb_call_cache *cc = &kcd->cc; + const struct rb_callinfo *ci = cd->ci; + const struct rb_call_cache *cc = &cd->cc; - VM_ASSERT(ci_kw->ci.flag & VM_CALL_KWARG); + VM_ASSERT(vm_ci_flag(ci) & VM_CALL_KWARG); RB_DEBUG_COUNTER_INC(ccf_iseq_kw1); const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); const struct rb_iseq_param_keyword *kw_param = iseq->body->param.keyword; - const struct rb_call_info_kw_arg *kw_arg = ci_kw->kw_arg; + const struct rb_callinfo_kwarg *kw_arg = vm_ci_kwarg(ci); const int ci_kw_len = kw_arg->keyword_len; const VALUE * const ci_keywords = kw_arg->keywords; VALUE *argv = cfp->sp - calling->argc; @@ -2122,10 +2130,10 @@ vm_call_iseq_setup_kwparm_nokwarg(rb_execution_context_t *ec, rb_control_frame_t struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *MAYBE_UNUSED(ci) = &cd->ci; + const struct rb_callinfo *MAYBE_UNUSED(ci) = cd->ci; const struct rb_call_cache *cc = &cd->cc; - VM_ASSERT((ci->flag & VM_CALL_KWARG) == 0); + VM_ASSERT((vm_ci_flag(ci) & VM_CALL_KWARG) == 0); RB_DEBUG_COUNTER_INC(ccf_iseq_kw2); const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); @@ -2151,10 +2159,10 @@ static inline int vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, struct rb_call_data *cd, const rb_iseq_t *iseq, VALUE *argv, int param_size, int local_size) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; - if (LIKELY(!(ci->flag & VM_CALL_KW_SPLAT))) { + if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_KW_SPLAT))) { if (LIKELY(rb_simple_iseq_p(iseq))) { rb_control_frame_t *cfp = ec->cfp; CALLER_SETUP_ARG(cfp, calling, ci); @@ -2164,7 +2172,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, argument_arity_error(ec, iseq, calling->argc, iseq->body->param.lead_num, iseq->body->param.lead_num); } - CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(ci, param_size, local_size), vm_call_iseq_optimizable_p(&cd->ci, &cd->cc)); + CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(ci, param_size, local_size), vm_call_iseq_optimizable_p(cd->ci, &cd->cc)); return 0; } else if (rb_iseq_only_optparam_p(iseq)) { @@ -2181,7 +2189,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, argument_arity_error(ec, iseq, argc, lead_num, lead_num + opt_num); } - if (LIKELY(!(ci->flag & VM_CALL_TAILCALL))) { + if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_TAILCALL))) { CC_SET_FASTPATH(cc, vm_call_iseq_setup_normal_opt_start, !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); @@ -2204,8 +2212,8 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const int argc = calling->argc; const struct rb_iseq_param_keyword *kw_param = iseq->body->param.keyword; - if (ci->flag & VM_CALL_KWARG) { - const struct rb_call_info_kw_arg *kw_arg = ((struct rb_call_info_with_kwarg *)ci)->kw_arg; + if (vm_ci_flag(ci) & VM_CALL_KWARG) { + const struct rb_callinfo_kwarg *kw_arg = vm_ci_kwarg(ci); if (argc - kw_arg->keyword_len == lead_num) { const int ci_kw_len = kw_arg->keyword_len; @@ -2258,10 +2266,10 @@ static inline VALUE vm_call_iseq_setup_2(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd, int opt_pc, int param_size, int local_size) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; const struct rb_call_cache *cc = &cd->cc; - if (LIKELY(!(ci->flag & VM_CALL_TAILCALL))) { + if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_TAILCALL))) { return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, opt_pc, param_size, local_size); } else { @@ -2492,7 +2500,7 @@ vm_method_cfunc_entry(const rb_callable_method_entry_t *me) static VALUE vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; const struct rb_call_cache *cc = &cd->cc; VALUE val; const rb_callable_method_entry_t *me = cc->me; @@ -2510,7 +2518,7 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp } RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, me->owner, me->def->original_id); - EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, recv, me->def->original_id, ci->mid, me->owner, Qundef); + EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, recv, me->def->original_id, vm_ci_mid(ci), me->owner, Qundef); vm_push_frame(ec, NULL, frame_type, recv, block_handler, (VALUE)me, @@ -2525,7 +2533,7 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp rb_vm_pop_frame(ec); - EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, ci->mid, me->owner, val); + EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, vm_ci_mid(ci), me->owner, val); RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, me->owner, me->def->original_id); return val; @@ -2534,7 +2542,7 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp static VALUE vm_call_cfunc(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; RB_DEBUG_COUNTER_INC(ccf_cfunc); CALLER_SETUP_ARG(reg_cfp, calling, ci); @@ -2582,7 +2590,7 @@ vm_call_bmethod(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_c VALUE *argv; int argc; - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; CALLER_SETUP_ARG(cfp, calling, ci); argc = calling->argc; @@ -2594,12 +2602,12 @@ vm_call_bmethod(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_c } static enum method_missing_reason -ci_missing_reason(const struct rb_call_info *ci) +ci_missing_reason(const struct rb_callinfo *ci) { enum method_missing_reason stat = MISSING_NOENTRY; - if (ci->flag & VM_CALL_VCALL) stat |= MISSING_VCALL; - if (ci->flag & VM_CALL_FCALL) stat |= MISSING_FCALL; - if (ci->flag & VM_CALL_SUPER) stat |= MISSING_SUPER; + if (vm_ci_flag(ci) & VM_CALL_VCALL) stat |= MISSING_VCALL; + if (vm_ci_flag(ci) & VM_CALL_FCALL) stat |= MISSING_FCALL; + if (vm_ci_flag(ci) & VM_CALL_SUPER) stat |= MISSING_SUPER; return stat; } @@ -2610,11 +2618,11 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct int i; VALUE sym; - const struct rb_call_info *orig_ci = &orig_cd->ci; + ID mid; + const struct rb_callinfo *orig_ci = orig_cd->ci; const struct rb_call_cache *orig_cc = &orig_cd->cc; - struct rb_call_info *ci; struct rb_call_cache *cc; - struct rb_kwarg_call_data cd; + struct rb_call_data cd; CALLER_SETUP_ARG(reg_cfp, calling, orig_ci); @@ -2624,31 +2632,22 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_raise(rb_eArgError, "no method name given"); } - /* setup new ci */ - if (orig_ci->flag & VM_CALL_KWARG) { - const struct rb_kwarg_call_data *orig_kcd = (void *)orig_cd; - cd = *orig_kcd; - } - else { - cd.ci_kw.ci = *orig_ci; - cd.cc = *orig_cc; - } - ci = &cd.ci_kw.ci; + cd.cc = *orig_cc; cc = &cd.cc; sym = TOPN(i); - if (!(ci->mid = rb_check_id(&sym))) { + if (!(mid = rb_check_id(&sym))) { if (rb_method_basic_definition_p(CLASS_OF(calling->recv), idMethodMissing)) { VALUE exc = rb_make_no_method_exception(rb_eNoMethodError, 0, calling->recv, rb_long2int(calling->argc), &TOPN(i), - ci->flag & (VM_CALL_FCALL|VM_CALL_VCALL)); + vm_ci_flag(orig_ci) & (VM_CALL_FCALL|VM_CALL_VCALL)); rb_exc_raise(exc); } TOPN(i) = rb_str_intern(sym); - ci->mid = idMethodMissing; - ec->method_missing_reason = cc->aux.method_missing_reason = ci_missing_reason(ci); + mid = idMethodMissing; + ec->method_missing_reason = cc->aux.method_missing_reason = ci_missing_reason(orig_ci); } else { /* shift arguments */ @@ -2659,20 +2658,22 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct DEC_SP(1); } - CC_SET_ME(cc, rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid, NULL)); - ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); + CC_SET_ME(cc, rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), mid, NULL)); + unsigned int new_flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); + cd.ci = vm_ci_new_runtime(mid, new_flag, 0 /* not accessed (calling->argc is used) */, vm_ci_kwarg(orig_ci)); + return vm_call_method(ec, reg_cfp, calling, (CALL_DATA)&cd); } -static inline VALUE vm_invoke_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, VALUE block_handler); +static inline VALUE vm_invoke_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_callinfo *ci, VALUE block_handler); NOINLINE(static VALUE vm_invoke_block_opt_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, VALUE block_handler)); + struct rb_calling_info *calling, const struct rb_callinfo *ci, VALUE block_handler)); static VALUE vm_invoke_block_opt_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, VALUE block_handler) + struct rb_calling_info *calling, const struct rb_callinfo *ci, VALUE block_handler) { int argc = calling->argc; @@ -2688,7 +2689,7 @@ vm_call_opt_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct { RB_DEBUG_COUNTER_INC(ccf_opt_call); - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; VALUE procval = calling->recv; return vm_invoke_block_opt_call(ec, reg_cfp, calling, ci, VM_BH_FROM_PROC(procval)); } @@ -2698,7 +2699,7 @@ vm_call_opt_block_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, { RB_DEBUG_COUNTER_INC(ccf_opt_block_call); VALUE block_handler = VM_ENV_BLOCK_HANDLER(VM_CF_LEP(reg_cfp)); - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; if (BASIC_OP_UNREDEFINED_P(BOP_CALL, PROC_REDEFINED_OP_FLAG)) { return vm_invoke_block_opt_call(ec, reg_cfp, calling, ci, block_handler); @@ -2715,22 +2716,19 @@ vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, { RB_DEBUG_COUNTER_INC(ccf_method_missing); - const struct rb_call_info *orig_ci = &orig_cd->ci; + const struct rb_callinfo *orig_ci = orig_cd->ci; const struct rb_call_cache *orig_cc = &orig_cd->cc; VALUE *argv = STACK_ADDR_FROM_TOP(calling->argc); struct rb_call_data cd = *orig_cd; unsigned int argc; CALLER_SETUP_ARG(reg_cfp, calling, orig_ci); - argc = calling->argc+1; - - cd.ci.flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); - cd.ci.mid = idMethodMissing; - cd.ci.orig_argc = argc; + argc = calling->argc + 1; - cd.cc.me = - rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), - idMethodMissing, NULL); + unsigned int flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); + cd.ci = vm_ci_new_runtime(idMethodMissing, flag, argc, vm_ci_kwarg(orig_ci)); + cd.cc.me = rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), + idMethodMissing, NULL); calling->argc = argc; @@ -2740,7 +2738,7 @@ vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, if (argc > 1) { MEMMOVE(argv+1, argv, VALUE, argc-1); } - argv[0] = ID2SYM(orig_ci->mid); + argv[0] = ID2SYM(vm_ci_mid(orig_ci)); INC_SP(1); ec->method_missing_reason = orig_cc->aux.method_missing_reason; @@ -2753,10 +2751,10 @@ vm_call_zsuper(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca { RB_DEBUG_COUNTER_INC(ccf_method_missing); - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; klass = RCLASS_SUPER(klass); - CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, ci->mid) : NULL); + CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, vm_ci_mid(ci)) : NULL); if (!cc->me) { return vm_call_method_nome(ec, cfp, calling, cd); @@ -2914,7 +2912,7 @@ search_refined_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, ID mi static VALUE vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; switch (cc->me->def->type) { @@ -2933,7 +2931,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st rb_check_arity(calling->argc, 1, 1); cc->aux.index = 0; - CC_SET_FASTPATH(cc, vm_call_attrset, !((ci->flag & VM_CALL_ARGS_SPLAT) || (ci->flag & VM_CALL_KWARG))); + CC_SET_FASTPATH(cc, vm_call_attrset, !((vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) || (vm_ci_flag(ci) & VM_CALL_KWARG))); return vm_call_attrset(ec, cfp, calling, cd); case VM_METHOD_TYPE_IVAR: @@ -2941,7 +2939,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); rb_check_arity(calling->argc, 0, 0); cc->aux.index = 0; - CC_SET_FASTPATH(cc, vm_call_ivar, !(ci->flag & VM_CALL_ARGS_SPLAT)); + CC_SET_FASTPATH(cc, vm_call_ivar, !(vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT)); return vm_call_ivar(ec, cfp, calling, cd); case VM_METHOD_TYPE_MISSING: @@ -2981,7 +2979,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st return vm_call_zsuper(ec, cfp, calling, cd, RCLASS_ORIGIN(cc->me->defined_class)); case VM_METHOD_TYPE_REFINED: - if (search_refined_method(ec, cfp, ci->mid, cc)) + if (search_refined_method(ec, cfp, vm_ci_mid(ci), cc)) return vm_call_method(ec, cfp, calling, cd); else return vm_call_method_nome(ec, cfp, calling, cd); @@ -2996,11 +2994,11 @@ static VALUE vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { /* method missing */ - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; const int stat = ci_missing_reason(ci); - if (ci->mid == idMethodMissing) { + if (vm_ci_mid(ci) == idMethodMissing) { rb_control_frame_t *reg_cfp = cfp; VALUE *argv = STACK_ADDR_FROM_TOP(calling->argc); vm_raise_method_missing(ec, calling->argc, argv, calling->recv, stat); @@ -3015,7 +3013,7 @@ vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct static inline VALUE vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; struct rb_call_cache *cc = &cd->cc; VM_ASSERT(callable_method_entry_p(cc->me)); @@ -3026,9 +3024,9 @@ vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca return vm_call_method_each_type(ec, cfp, calling, cd); case METHOD_VISI_PRIVATE: - if (!(ci->flag & VM_CALL_FCALL)) { + if (!(vm_ci_flag(ci) & VM_CALL_FCALL)) { enum method_missing_reason stat = MISSING_PRIVATE; - if (ci->flag & VM_CALL_VCALL) stat |= MISSING_VCALL; + if (vm_ci_flag(ci) & VM_CALL_VCALL) stat |= MISSING_VCALL; cc->aux.method_missing_reason = stat; CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); @@ -3037,7 +3035,7 @@ vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca return vm_call_method_each_type(ec, cfp, calling, cd); case METHOD_VISI_PROTECTED: - if (!(ci->flag & VM_CALL_OPT_SEND)) { + if (!(vm_ci_flag(ci) & VM_CALL_OPT_SEND)) { if (!rb_obj_is_kind_of(cfp->self, cc->me->defined_class)) { cc->aux.method_missing_reason = MISSING_PROTECTED; return vm_call_method_missing(ec, cfp, calling, cd); @@ -3045,15 +3043,8 @@ vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca else { /* caching method info to dummy cc */ VM_ASSERT(cc->me != NULL); - if (ci->flag & VM_CALL_KWARG) { - struct rb_kwarg_call_data *kcd = (void *)cd; - struct rb_kwarg_call_data cd_entry = *kcd; - return vm_call_method_each_type(ec, cfp, calling, (void *)&cd_entry); - } - else { - struct rb_call_data cd_entry = *cd; - return vm_call_method_each_type(ec, cfp, calling, &cd_entry); - } + struct rb_call_data cd_entry = *cd; + return vm_call_method_each_type(ec, cfp, calling, &cd_entry); } } return vm_call_method_each_type(ec, cfp, calling, cd); @@ -3111,8 +3102,6 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c { VALUE current_defined_class, klass; const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(reg_cfp); - struct rb_call_info *ci = &cd->ci; - struct rb_call_cache *cc = &cd->cc; if (!me) { vm_super_outside(); @@ -3138,22 +3127,29 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c } } - if (me->def->type == VM_METHOD_TYPE_BMETHOD && (ci->flag & VM_CALL_ZSUPER)) { + if (me->def->type == VM_METHOD_TYPE_BMETHOD && (vm_ci_flag(cd->ci) & VM_CALL_ZSUPER)) { rb_raise(rb_eRuntimeError, "implicit argument passing of super from method defined" " by define_method() is not supported." " Specify all arguments explicitly."); } - ci->mid = me->def->original_id; + // update iseq. really? (TODO) + cd->ci = vm_ci_new_runtime(me->def->original_id, + vm_ci_flag(cd->ci), + vm_ci_argc(cd->ci), + vm_ci_kwarg(cd->ci)); + RB_OBJ_WRITTEN(reg_cfp->iseq, Qundef, cd->ci); + klass = vm_search_normal_superclass(me->defined_class); if (!klass) { /* bound instance method of module */ - cc->aux.method_missing_reason = MISSING_SUPER; - CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); + cd->cc.aux.method_missing_reason = MISSING_SUPER; + CC_SET_FASTPATH(&cd->cc, vm_call_method_missing, TRUE); } else { + struct rb_call_cache *cc = &cd->cc; #if OPT_INLINE_METHOD_CACHE /* Unlike normal method search, we only consider the first class * serial. Since we're testing defined_class rather than receiver, @@ -3161,14 +3157,14 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c if (LIKELY(RB_DEBUG_COUNTER_INC_UNLESS(mc_global_state_miss, GET_GLOBAL_METHOD_STATE() == cc->method_state) && cc->class_serial[0] == RCLASS_SERIAL(klass)) && - cc->me && ci->mid == cc->me->called_id) { + cc->me && vm_ci_mid(cd->ci) == cc->me->called_id) { VM_ASSERT(cc->call != NULL); RB_DEBUG_COUNTER_INC(mc_inline_hit); return; } #endif - CC_SET_ME(cc, rb_callable_method_entry(klass, ci->mid)); + CC_SET_ME(cc, rb_callable_method_entry(klass, vm_ci_mid(cd->ci))); CC_SET_FASTPATH(cc, vm_call_super_method, TRUE); cc->method_state = GET_GLOBAL_METHOD_STATE(); @@ -3267,7 +3263,7 @@ vm_callee_setup_block_arg_arg0_check(VALUE *argv) } static int -vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const struct rb_call_info *ci, const rb_iseq_t *iseq, VALUE *argv, const enum arg_setup_type arg_setup_type) +vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const struct rb_callinfo *ci, const rb_iseq_t *iseq, VALUE *argv, const enum arg_setup_type arg_setup_type) { if (rb_simple_iseq_p(iseq)) { rb_control_frame_t *cfp = ec->cfp; @@ -3312,25 +3308,25 @@ static int vm_yield_setup_args(rb_execution_context_t *ec, const rb_iseq_t *iseq, const int argc, VALUE *argv, int kw_splat, VALUE block_handler, enum arg_setup_type arg_setup_type) { struct rb_calling_info calling_entry, *calling; - struct rb_call_info ci_entry, *ci; calling = &calling_entry; calling->argc = argc; calling->block_handler = block_handler; calling->kw_splat = kw_splat; calling->recv = Qundef; + struct rb_callinfo dummy_ci = { + .flags = T_IMEMO | (imemo_callinfo << FL_USHIFT), + .flag = (VALUE)(kw_splat ? VM_CALL_KW_SPLAT : 0), + }; - ci_entry.flag = kw_splat ? VM_CALL_KW_SPLAT : 0; - ci = &ci_entry; - - return vm_callee_setup_block_arg(ec, calling, ci, iseq, argv, arg_setup_type); + return vm_callee_setup_block_arg(ec, calling, &dummy_ci, iseq, argv, arg_setup_type); } /* ruby iseq -> ruby block */ static VALUE vm_invoke_iseq_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, + struct rb_calling_info *calling, const struct rb_callinfo *ci, int is_lambda, const struct rb_captured_block *captured) { const rb_iseq_t *iseq = rb_iseq_check(captured->code.iseq); @@ -3353,7 +3349,7 @@ vm_invoke_iseq_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, static VALUE vm_invoke_symbol_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, + struct rb_calling_info *calling, const struct rb_callinfo *ci, VALUE symbol) { VALUE val; @@ -3367,7 +3363,7 @@ vm_invoke_symbol_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, static VALUE vm_invoke_ifunc_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, + struct rb_calling_info *calling, const struct rb_callinfo *ci, const struct rb_captured_block *captured) { VALUE val; @@ -3401,7 +3397,7 @@ vm_proc_to_block_handler(VALUE procval) static inline VALUE vm_invoke_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, VALUE block_handler) + struct rb_calling_info *calling, const struct rb_callinfo *ci, VALUE block_handler) { int is_lambda = FALSE; @@ -3981,7 +3977,7 @@ vm_invokeblock_i( struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_info *ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; VALUE block_handler = VM_CF_BLOCK_HANDLER(GET_CFP()); if (block_handler == VM_BLOCK_HANDLER_NONE) { @@ -4003,10 +3999,10 @@ vm_sendish( struct rb_call_data *cd, VALUE recv)) { - CALL_INFO ci = &cd->ci; + const struct rb_callinfo *ci = cd->ci; CALL_CACHE cc = &cd->cc; VALUE val; - int argc = ci->orig_argc; + int argc = vm_ci_argc(ci); VALUE recv = TOPN(argc); struct rb_calling_info calling; diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 18a670bf14d0d0..e9337b82a8ac42 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -250,15 +250,15 @@ THROW_DATA_CONSUMED_SET(struct vm_throw_data *obj) } } -#define IS_ARGS_SPLAT(ci) ((ci)->flag & VM_CALL_ARGS_SPLAT) -#define IS_ARGS_KEYWORD(ci) ((ci)->flag & VM_CALL_KWARG) -#define IS_ARGS_KW_SPLAT(ci) ((ci)->flag & VM_CALL_KW_SPLAT) -#define IS_ARGS_KW_OR_KW_SPLAT(ci) ((ci)->flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT)) +#define IS_ARGS_SPLAT(ci) (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) +#define IS_ARGS_KEYWORD(ci) (vm_ci_flag(ci) & VM_CALL_KWARG) +#define IS_ARGS_KW_SPLAT(ci) (vm_ci_flag(ci) & VM_CALL_KW_SPLAT) +#define IS_ARGS_KW_OR_KW_SPLAT(ci) (vm_ci_flag(ci) & (VM_CALL_KWARG | VM_CALL_KW_SPLAT)) /* If this returns true, an optimized function returned by `vm_call_iseq_setup_func` can be used as a fastpath. */ static bool -vm_call_iseq_optimizable_p(const struct rb_call_info *ci, const struct rb_call_cache *cc) +vm_call_iseq_optimizable_p(const struct rb_callinfo *ci, const struct rb_call_cache *cc) { return !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED); diff --git a/vm_method.c b/vm_method.c index 7b29b2c20ce27d..4a82cc3e82fda3 100644 --- a/vm_method.c +++ b/vm_method.c @@ -2054,17 +2054,6 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) return module; } -bool -rb_method_basic_definition_p_with_cc(struct rb_call_data *cd, VALUE klass, ID mid) -{ - if (cd->ci.mid != mid) { - *cd = (struct rb_call_data) /* reset */ { .ci = { .mid = mid, }, }; - } - - vm_search_method_fastpath(cd, klass); - return cd->cc.me && METHOD_ENTRY_BASIC(cd->cc.me); -} - #ifdef __GNUC__ #pragma push_macro("rb_method_basic_definition_p") #undef rb_method_basic_definition_p From b9007b6c548f91e88fd3f2ffa23de740431fa969 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 8 Jan 2020 16:14:01 +0900 Subject: [PATCH 831/878] Introduce disposable call-cache. This patch contains several ideas: (1) Disposable inline method cache (IMC) for race-free inline method cache * Making call-cache (CC) as a RVALUE (GC target object) and allocate new CC on cache miss. * This technique allows race-free access from parallel processing elements like RCU. (2) Introduce per-Class method cache (pCMC) * Instead of fixed-size global method cache (GMC), pCMC allows flexible cache size. * Caching CCs reduces CC allocation and allow sharing CC's fast-path between same call-info (CI) call-sites. (3) Invalidate an inline method cache by invalidating corresponding method entries (MEs) * Instead of using class serials, we set "invalidated" flag for method entry itself to represent cache invalidation. * Compare with using class serials, the impact of method modification (add/overwrite/delete) is small. * Updating class serials invalidate all method caches of the class and sub-classes. * Proposed approach only invalidate the method cache of only one ME. See [Feature #16614] for more details. --- class.c | 45 +- common.mk | 1 + compile.c | 38 +- debug_counter.h | 92 ++- eval.c | 2 +- ext/objspace/objspace.c | 1 + gc.c | 204 +++++- id_table.c | 2 +- insns.def | 13 +- internal/class.h | 2 + internal/imemo.h | 4 + internal/vm.h | 41 +- iseq.c | 17 + method.h | 11 +- mjit.c | 19 +- mjit.h | 29 + mjit_compile.c | 42 +- mjit_worker.c | 30 +- test/-ext-/tracepoint/test_tracepoint.rb | 12 +- test/ruby/test_gc.rb | 3 + test/ruby/test_inlinecache.rb | 64 ++ tool/mk_call_iseq_optimized.rb | 2 +- tool/ruby_vm/views/_mjit_compile_send.erb | 23 +- tool/ruby_vm/views/mjit_compile.inc.erb | 2 +- vm.c | 26 +- vm_callinfo.h | 235 ++++++- vm_core.h | 3 +- vm_dump.c | 4 +- vm_eval.c | 50 +- vm_insnhelper.c | 814 +++++++++++----------- vm_insnhelper.h | 15 +- vm_method.c | 630 ++++++++++------- 32 files changed, 1606 insertions(+), 870 deletions(-) create mode 100644 test/ruby/test_inlinecache.rb diff --git a/class.c b/class.c index f181f336907bfd..98b2a1d92eff45 100644 --- a/class.c +++ b/class.c @@ -894,12 +894,21 @@ add_refined_method_entry_i(ID key, VALUE value, void *data) static void ensure_origin(VALUE klass); +static enum rb_id_table_iterator_result +clear_module_cache_i(ID id, VALUE val, void *data) +{ + VALUE klass = (VALUE)data; + rb_clear_method_cache(klass, id); + return ID_TABLE_CONTINUE; +} + static int include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super) { VALUE p, iclass; int method_changed = 0, constant_changed = 0; struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass)); + VALUE original_klass = klass; if (FL_TEST(module, RCLASS_REFINED_BY_ANY)) { ensure_origin(module); @@ -912,7 +921,7 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super) if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module)) return -1; /* ignore if the module included already in superclasses */ - for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) { + for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) { int type = BUILTIN_TYPE(p); if (type == T_ICLASS) { if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) { @@ -924,37 +933,53 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super) } else if (type == T_CLASS) { if (!search_super) break; - superclass_seen = TRUE; + superclass_seen = TRUE; } } - iclass = rb_include_class_new(module, RCLASS_SUPER(c)); + + VALUE super_class = RCLASS_SUPER(c); + + // invalidate inline method cache + tbl = RMODULE_M_TBL(module); + if (tbl && rb_id_table_size(tbl)) { + if (search_super) { // include + if (super_class && !RB_TYPE_P(super_class, T_MODULE)) { + rb_id_table_foreach(tbl, clear_module_cache_i, (void *)super_class); + } + } + else { // prepend + if (!RB_TYPE_P(original_klass, T_MODULE)) { + rb_id_table_foreach(tbl, clear_module_cache_i, (void *)original_klass); + } + } + method_changed = 1; + } + + // setup T_ICLASS for the include/prepend module + iclass = rb_include_class_new(module, super_class); c = RCLASS_SET_SUPER(c, iclass); RCLASS_SET_INCLUDER(iclass, klass); { VALUE m = module; - if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass; - rb_module_add_to_subclasses_list(m, iclass); + if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass; + rb_module_add_to_subclasses_list(m, iclass); } if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) { VALUE refined_class = rb_refinement_module_get_refined_class(klass); - rb_id_table_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, (void *)refined_class); + rb_id_table_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, (void *)refined_class); FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT); } - tbl = RMODULE_M_TBL(module); - if (tbl && rb_id_table_size(tbl)) method_changed = 1; - tbl = RMODULE_CONST_TBL(module); if (tbl && rb_id_table_size(tbl)) constant_changed = 1; skip: module = RCLASS_SUPER(module); } - if (method_changed) rb_clear_method_cache_by_class(klass); if (constant_changed) rb_clear_constant_cache(); return method_changed; diff --git a/common.mk b/common.mk index 50f2c156a6d382..5680573bd28984 100644 --- a/common.mk +++ b/common.mk @@ -2946,6 +2946,7 @@ mjit.$(OBJEXT): {$(VPATH)}thread.h mjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h mjit.$(OBJEXT): {$(VPATH)}thread_native.h mjit.$(OBJEXT): {$(VPATH)}util.h +mjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h mjit.$(OBJEXT): {$(VPATH)}vm_core.h mjit.$(OBJEXT): {$(VPATH)}vm_opts.h mjit_compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h diff --git a/compile.c b/compile.c index e1efbcd9094824..94daa65b78fefe 100644 --- a/compile.c +++ b/compile.c @@ -566,6 +566,8 @@ static void verify_call_cache(rb_iseq_t *iseq) { #if CPDEBUG + // fprintf(stderr, "ci_size:%d\t", iseq->body->ci_size); rp(iseq); + VALUE *original = rb_iseq_original_iseq(iseq); size_t i = 0; while (i < iseq->body->iseq_size) { @@ -574,16 +576,27 @@ verify_call_cache(rb_iseq_t *iseq) for (int j=0; types[j]; j++) { if (types[j] == TS_CALLDATA) { - struct rb_call_cache cc; struct rb_call_data *cd = (struct rb_call_data *)original[i+j+1]; - MEMZERO(&cc, cc, 1); - if (memcmp(&cc, &cd->cc, sizeof(cc))) { - rb_bug("call cache not zero for fresh iseq"); + const struct rb_callinfo *ci = cd->ci; + const struct rb_callcache *cc = cd->cc; + if (cc != vm_cc_empty()) { + vm_ci_dump(ci); + rb_bug("call cache is not initialized by vm_cc_empty()"); } } } i += insn_len(insn); } + + for (unsigned int i=0; ibody->ci_size; i++) { + struct rb_call_data *cd = &iseq->body->call_data[i]; + const struct rb_callinfo *ci = cd->ci; + const struct rb_callcache *cc = cd->cc; + if (cc != NULL && cc != vm_cc_empty()) { + vm_ci_dump(ci); + rb_bug("call cache is not initialized by vm_cc_empty()"); + } + } #endif } @@ -661,7 +674,7 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node) DECL_ANCHOR(ret); INIT_ANCHOR(ret); - if (imemo_type_p((VALUE)node, imemo_ifunc)) { + if (IMEMO_TYPE_P(node, imemo_ifunc)) { rb_raise(rb_eArgError, "unexpected imemo_ifunc"); } @@ -1212,6 +1225,7 @@ new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_cal argc += kw_arg->keyword_len; } + // fprintf(stderr, "[%d] id:%s\t", (int)iseq->body->ci_size, rb_id2name(mid)); rp(iseq); iseq->body->ci_size++; const struct rb_callinfo *ci = vm_ci_new(mid, flag, argc, kw_arg); RB_OBJ_WRITTEN(iseq, Qundef, ci); @@ -2223,6 +2237,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) struct rb_call_data *cd = &body->call_data[ISEQ_COMPILE_DATA(iseq)->ci_index++]; assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size); cd->ci = source_ci; + cd->cc = vm_cc_empty(); generated_iseq[code_index + 1 + j] = (VALUE)cd; break; } @@ -10301,16 +10316,18 @@ ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq) } /* note that we dump out rb_call_info but load back rb_call_data */ -static struct rb_call_data * +static void ibf_load_ci_entries(const struct ibf_load *load, ibf_offset_t ci_entries_offset, - unsigned int ci_size) + unsigned int ci_size, + struct rb_call_data **cd_ptr) { ibf_offset_t reading_pos = ci_entries_offset; unsigned int i; struct rb_call_data *cds = ZALLOC_N(struct rb_call_data, ci_size); + *cd_ptr = cds; for (i = 0; i < ci_size; i++) { VALUE mid_index = ibf_load_small_value(load, &reading_pos); @@ -10331,10 +10348,9 @@ ibf_load_ci_entries(const struct ibf_load *load, cds[i].ci = vm_ci_new(mid, flag, argc, kwarg); RB_OBJ_WRITTEN(load->iseq, Qundef, cds[i].ci); + cds[i].cc = vm_cc_empty(); } - - return cds; -} +} static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) @@ -10588,7 +10604,7 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) load_body->catch_except_p = catch_except_p; load_body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, is_size); - load_body->call_data = ibf_load_ci_entries(load, ci_entries_offset, ci_size); + ibf_load_ci_entries(load, ci_entries_offset, ci_size, &load_body->call_data); load_body->param.opt_table = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num); load_body->param.keyword = ibf_load_param_keyword(load, param_keyword_offset); load_body->param.flags.has_kw = (param_flags >> 4) & 1; diff --git a/debug_counter.h b/debug_counter.h index 19909fbb2946d1..e38b5c6b79cea0 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -14,46 +14,45 @@ #ifdef RB_DEBUG_COUNTER -/* - * method cache (mc) counts. - * - * * mc_inline_hit/miss: inline mc hit/miss counts (VM send insn) - * * mc_global_hit/miss: global method cache hit/miss counts - * two types: (1) inline cache miss (VM send insn) - * (2) called from C (rb_funcall). - * * mc_global_state_miss: inline mc miss by global_state miss. - * * mc_class_serial_miss: ... by mc_class_serial_miss - * * mc_cme_complement: callable_method_entry complement counts. - * * mc_cme_complement_hit: callable_method_entry cache hit counts. - * * mc_search_super: search_method() call counts. - * * mc_miss_by_nome: inline mc miss by no ment. - * * mc_miss_by_distinct: ... by distinct ment. - * * mc_miss_by_refine: ... by ment being refined. - * * mc_miss_by_visi: ... by visibility change. - * * mc_miss_spurious: spurious inline mc misshit. - * * mc_miss_reuse_call: count of reuse of cc->call. - */ -RB_DEBUG_COUNTER(mc_inline_hit) -RB_DEBUG_COUNTER(mc_inline_miss) -RB_DEBUG_COUNTER(mc_global_hit) -RB_DEBUG_COUNTER(mc_global_miss) -RB_DEBUG_COUNTER(mc_global_state_miss) -RB_DEBUG_COUNTER(mc_class_serial_miss) -RB_DEBUG_COUNTER(mc_cme_complement) -RB_DEBUG_COUNTER(mc_cme_complement_hit) -RB_DEBUG_COUNTER(mc_search_super) -RB_DEBUG_COUNTER(mc_miss_by_nome) -RB_DEBUG_COUNTER(mc_miss_by_distinct) -RB_DEBUG_COUNTER(mc_miss_by_refine) -RB_DEBUG_COUNTER(mc_miss_by_visi) -RB_DEBUG_COUNTER(mc_miss_spurious) -RB_DEBUG_COUNTER(mc_miss_reuse_call) +// method cache (IMC: inline method cache) +RB_DEBUG_COUNTER(mc_inline_hit) // IMC hit +RB_DEBUG_COUNTER(mc_inline_miss_klass) // IMC miss by different class +RB_DEBUG_COUNTER(mc_inline_miss_invalidated) // IMC miss by invalidated ME +RB_DEBUG_COUNTER(mc_cme_complement) // number of acquiring complement CME +RB_DEBUG_COUNTER(mc_cme_complement_hit) // number of cahche hit for complemented CME + +RB_DEBUG_COUNTER(mc_search) // count for method lookup in class tree +RB_DEBUG_COUNTER(mc_search_notfound) // method lookup, but not found +RB_DEBUG_COUNTER(mc_search_super) // total traversed classes // callinfo -RB_DEBUG_COUNTER(ci_packed) -RB_DEBUG_COUNTER(ci_kw) -RB_DEBUG_COUNTER(ci_nokw) -RB_DEBUG_COUNTER(ci_runtime) +RB_DEBUG_COUNTER(ci_packed) // number of packed CI +RB_DEBUG_COUNTER(ci_kw) // non-packed CI w/ keywords +RB_DEBUG_COUNTER(ci_nokw) // non-packed CI w/o keywords +RB_DEBUG_COUNTER(ci_runtime) // creating temporary CI + +// callcache +RB_DEBUG_COUNTER(cc_new) // number of CC +RB_DEBUG_COUNTER(cc_temp) // dummy CC (stack-allocated) +RB_DEBUG_COUNTER(cc_found_ccs) // count for CC lookup sucess in CCS + +RB_DEBUG_COUNTER(cc_ent_invalidate) // count for invalidating cc (cc->klass = 0) +RB_DEBUG_COUNTER(cc_cme_invalidate) // coutn for invalidating CME + +RB_DEBUG_COUNTER(cc_invalidate_leaf) // count for invalidating klass if klass has no-sublcasses +RB_DEBUG_COUNTER(cc_invalidate_leaf_ccs) // corresponding CCS +RB_DEBUG_COUNTER(cc_invalidate_leaf_callable) // complimented cache (no-subclasses) +RB_DEBUG_COUNTER(cc_invalidate_tree) // count for invalidating klass if klass has sublcasses +RB_DEBUG_COUNTER(cc_invalidate_tree_cme) // cme if cme is found in this class or superclasses +RB_DEBUG_COUNTER(cc_invalidate_tree_callable) // complimented cache (subclasses) + +RB_DEBUG_COUNTER(ccs_free) // count for free'ing ccs +RB_DEBUG_COUNTER(ccs_maxlen) // maximum length of ccs +RB_DEBUG_COUNTER(ccs_found) // count for finding corresponding ccs on method lookup + +// iseq +RB_DEBUG_COUNTER(iseq_num) // number of total created iseq +RB_DEBUG_COUNTER(iseq_cd_num) // number of total created cd (call_data) /* * call cache fastpath usage @@ -289,6 +288,7 @@ RB_DEBUG_COUNTER(obj_imemo_ifunc) RB_DEBUG_COUNTER(obj_imemo_memo) RB_DEBUG_COUNTER(obj_imemo_parser_strterm) RB_DEBUG_COUNTER(obj_imemo_callinfo) +RB_DEBUG_COUNTER(obj_imemo_callcache) /* ar_table */ RB_DEBUG_COUNTER(artable_hint_hit) @@ -375,17 +375,33 @@ rb_debug_counter_add(enum rb_debug_counter_type type, int add, int cond) return cond; } +inline static int +rb_debug_counter_max(enum rb_debug_counter_type type, unsigned int num) +{ + if (rb_debug_counter[(int)type] < num) { + rb_debug_counter[(int)type] = num; + return 1; + } + else { + return 0; + } +} + VALUE rb_debug_counter_reset(VALUE klass); VALUE rb_debug_counter_show(VALUE klass); #define RB_DEBUG_COUNTER_INC(type) rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, 1) #define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (!rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, !(cond))) #define RB_DEBUG_COUNTER_INC_IF(type, cond) rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, (cond)) +#define RB_DEBUG_COUNTER_ADD(type, num) rb_debug_counter_add(RB_DEBUG_COUNTER_##type, (num), 1) +#define RB_DEBUG_COUNTER_SETMAX(type, num) rb_debug_counter_max(RB_DEBUG_COUNTER_##type, (unsigned int)(num)) #else #define RB_DEBUG_COUNTER_INC(type) ((void)0) #define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (cond) #define RB_DEBUG_COUNTER_INC_IF(type, cond) (cond) +#define RB_DEBUG_COUNTER_ADD(type, num) ((void)0) +#define RB_DEBUG_COUNTER_SETMAX(type, num) 0 #endif void rb_debug_counter_show_results(const char *msg); diff --git a/eval.c b/eval.c index 429ecbe0d9336c..d5154b7db112b6 100644 --- a/eval.c +++ b/eval.c @@ -1476,7 +1476,7 @@ rb_using_module(const rb_cref_t *cref, VALUE module) { Check_Type(module, T_MODULE); using_module_recursive(cref, module); - rb_clear_method_cache_by_class(rb_cObject); + rb_clear_method_cache_all(); } /*! \private */ diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index 38d3d2fcff6458..dc1a0cb08f0f80 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -638,6 +638,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self) imemo_type_ids[9] = rb_intern("imemo_ast"); imemo_type_ids[10] = rb_intern("imemo_parser_strterm"); imemo_type_ids[11] = rb_intern("imemo_callinfo"); + imemo_type_ids[12] = rb_intern("imemo_callcache"); } rb_objspace_each_objects(count_imemo_objects_i, (void *)hash); diff --git a/gc.c b/gc.c index ad93937ed8ba07..21c93b165eaba1 100644 --- a/gc.c +++ b/gc.c @@ -2530,6 +2530,116 @@ rb_free_const_table(struct rb_id_table *tbl) rb_id_table_free(tbl); } +// alive: if false, target pointers can be freed already. +// To check it, we need objspace parameter. +static void +vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, rb_objspace_t *objspace, VALUE klass) +{ + if (ccs->entries) { + for (int i=0; ilen; i++) { + const struct rb_callcache *cc = ccs->entries[i].cc; + if (!alive) { + // ccs can be free'ed. + if (is_pointer_to_heap(objspace, (void *)cc) && + IMEMO_TYPE_P(cc, imemo_callcache) && + cc->klass == klass) { + // OK. maybe target cc. + } + else { + continue; + } + } + vm_cc_invalidate(cc); + } + ruby_xfree(ccs->entries); + } + ruby_xfree(ccs); +} + +void +rb_vm_ccs_free(struct rb_class_cc_entries *ccs) +{ + RB_DEBUG_COUNTER_INC(ccs_free); + vm_ccs_free(ccs, TRUE, NULL, Qundef); +} + +struct cc_tbl_i_data { + rb_objspace_t *objspace; + VALUE klass; + bool alive; +}; + +static enum rb_id_table_iterator_result +cc_table_mark_i(ID id, VALUE ccs_ptr, void *data_ptr) +{ + struct cc_tbl_i_data *data = data_ptr; + struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr; + VM_ASSERT(vm_ccs_p(ccs)); + VM_ASSERT(id == ccs->cme->called_id); + + if (METHOD_ENTRY_INVALIDATED(ccs->cme)) { + rb_vm_ccs_free(ccs); + return ID_TABLE_DELETE; + } + else { + gc_mark(data->objspace, (VALUE)ccs->cme); + + for (int i=0; ilen; i++) { + VM_ASSERT(data->klass == ccs->entries[i].cc->klass); + VM_ASSERT(ccs->cme == vm_cc_cme(ccs->entries[i].cc)); + + gc_mark(data->objspace, (VALUE)ccs->entries[i].ci); + gc_mark(data->objspace, (VALUE)ccs->entries[i].cc); + } + return ID_TABLE_CONTINUE; + } +} + +static void +cc_table_mark(rb_objspace_t *objspace, VALUE klass) +{ + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + if (cc_tbl) { + struct cc_tbl_i_data data = { + .objspace = objspace, + .klass = klass, + }; + rb_id_table_foreach(cc_tbl, cc_table_mark_i, &data); + } +} + +static enum rb_id_table_iterator_result +cc_table_free_i(ID id, VALUE ccs_ptr, void *data_ptr) +{ + struct cc_tbl_i_data *data = data_ptr; + struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr; + VM_ASSERT(vm_ccs_p(ccs)); + vm_ccs_free(ccs, data->alive, data->objspace, data->klass); + return ID_TABLE_CONTINUE; +} + +static void +cc_table_free(rb_objspace_t *objspace, VALUE klass, bool alive) +{ + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + + if (cc_tbl) { + struct cc_tbl_i_data data = { + .objspace = objspace, + .klass = klass, + .alive = alive, + }; + rb_id_table_foreach(cc_tbl, cc_table_free_i, &data); + rb_id_table_free(cc_tbl); + } +} + +void +rb_cc_table_free(VALUE klass) +{ + cc_table_free(&rb_objspace, klass, TRUE); +} + static inline void make_zombie(rb_objspace_t *objspace, VALUE obj, void (*dfree)(void *), void *data) { @@ -2621,6 +2731,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) case T_CLASS: mjit_remove_class_serial(RCLASS_SERIAL(obj)); rb_id_table_free(RCLASS_M_TBL(obj)); + cc_table_free(objspace, obj, FALSE); if (RCLASS_IV_TBL(obj)) { st_free_table(RCLASS_IV_TBL(obj)); } @@ -2805,6 +2916,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) rb_class_detach_subclasses(obj); RCLASS_EXT(obj)->subclasses = NULL; } + cc_table_free(objspace, obj, FALSE); rb_class_remove_from_module_subclasses(obj); rb_class_remove_from_super_subclasses(obj); xfree(RANY(obj)->as.klass.ptr); @@ -2896,6 +3008,9 @@ obj_free(rb_objspace_t *objspace, VALUE obj) case imemo_callinfo: RB_DEBUG_COUNTER_INC(obj_imemo_callinfo); break; + case imemo_callcache: + RB_DEBUG_COUNTER_INC(obj_imemo_callcache); + break; default: /* unreachable */ break; @@ -5335,6 +5450,13 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj) return; case imemo_callinfo: return; + case imemo_callcache: + { + const struct rb_callcache *cc = (const struct rb_callcache *)obj; + // should not mark klass here + gc_mark(objspace, (VALUE)vm_cc_cme(cc)); + } + return; #if VM_CHECK_MODE > 0 default: VM_UNREACHABLE(gc_mark_imemo); @@ -5383,7 +5505,9 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj) gc_mark(objspace, RCLASS_SUPER(obj)); } if (!RCLASS_EXT(obj)) break; + mark_m_tbl(objspace, RCLASS_M_TBL(obj)); + cc_table_mark(objspace, obj); mark_tbl_no_pin(objspace, RCLASS_IV_TBL(obj)); mark_const_tbl(objspace, RCLASS_CONST_TBL(obj)); break; @@ -5397,6 +5521,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj) } if (!RCLASS_EXT(obj)) break; mark_m_tbl(objspace, RCLASS_CALLABLE_M_TBL(obj)); + cc_table_mark(objspace, obj); break; case T_ARRAY: @@ -8126,6 +8251,13 @@ gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj) case imemo_ast: rb_ast_update_references((rb_ast_t *)obj); break; + case imemo_callcache: + { + const struct rb_callcache *cc = (const struct rb_callcache *)obj; + UPDATE_IF_MOVED(objspace, cc->klass); + TYPED_UPDATE_IF_MOVED(objspace, struct rb_callable_method_entry_struct *, cc->cme_); + } + break; case imemo_parser_strterm: case imemo_tmpbuf: case imemo_callinfo: @@ -8201,6 +8333,39 @@ update_m_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl) } } +static enum rb_id_table_iterator_result +update_cc_tbl_i(ID id, VALUE ccs_ptr, void *data) +{ + rb_objspace_t *objspace = (rb_objspace_t *)data; + struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr; + VM_ASSERT(vm_ccs_p(ccs)); + + if (gc_object_moved_p(objspace, (VALUE)ccs->cme)) { + ccs->cme = (const rb_callable_method_entry_t *)rb_gc_location((VALUE)ccs->cme); + } + + for (int i=0; ilen; i++) { + if (gc_object_moved_p(objspace, (VALUE)ccs->entries[i].ci)) { + ccs->entries[i].ci = (struct rb_callinfo *)rb_gc_location((VALUE)ccs->entries[i].ci); + } + if (gc_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) { + ccs->entries[i].cc = (struct rb_callcache *)rb_gc_location((VALUE)ccs->entries[i].cc); + } + } + + // do not replace + return ID_TABLE_CONTINUE; +} + +static void +update_cc_tbl(rb_objspace_t *objspace, VALUE klass) +{ + struct rb_id_table *tbl = RCLASS_CC_TBL(klass); + if (tbl) { + rb_id_table_foreach_with_replace(tbl, update_cc_tbl_i, NULL, objspace); + } +} + static enum rb_id_table_iterator_result update_const_table(VALUE value, void *data) { @@ -8257,7 +8422,10 @@ gc_update_object_references(rb_objspace_t *objspace, VALUE obj) } if (!RCLASS_EXT(obj)) break; update_m_tbl(objspace, RCLASS_M_TBL(obj)); + update_cc_tbl(objspace, obj); + gc_update_tbl_refs(objspace, RCLASS_IV_TBL(obj)); + update_class_ext(objspace, RCLASS_EXT(obj)); update_const_tbl(objspace, RCLASS_CONST_TBL(obj)); break; @@ -8275,6 +8443,7 @@ gc_update_object_references(rb_objspace_t *objspace, VALUE obj) } update_class_ext(objspace, RCLASS_EXT(obj)); update_m_tbl(objspace, RCLASS_CALLABLE_M_TBL(obj)); + update_cc_tbl(objspace, obj); break; case T_IMEMO: @@ -8607,7 +8776,6 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl gc_check_references_for_moved(objspace); } - rb_clear_method_cache_by_class(rb_cObject); rb_clear_constant_cache(); heap_eden->free_pages = NULL; heap_eden->using_page = NULL; @@ -11550,6 +11718,9 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj) if (!NIL_P(class_path)) { APPENDF((BUFF_ARGS, "%s", RSTRING_PTR(class_path))); } + else { + APPENDF((BUFF_ARGS, "(annon)")); + } break; } case T_ICLASS: @@ -11606,21 +11777,31 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj) IMEMO_NAME(ast); IMEMO_NAME(parser_strterm); IMEMO_NAME(callinfo); + IMEMO_NAME(callcache); #undef IMEMO_NAME default: UNREACHABLE; } - APPENDF((BUFF_ARGS, "/%s", imemo_name)); + APPENDF((BUFF_ARGS, "<%s> ", imemo_name)); switch (imemo_type(obj)) { case imemo_ment: { const rb_method_entry_t *me = &RANY(obj)->as.imemo.ment; if (me->def) { - APPENDF((BUFF_ARGS, "(called_id: %s, type: %s, alias: %d, owner: %s, defined_class: %s)", + APPENDF((BUFF_ARGS, ":%s (%s%s%s%s) type:%s alias:%d owner:%p defined_class:%p", rb_id2name(me->called_id), + METHOD_ENTRY_VISI(me) == METHOD_VISI_PUBLIC ? "pub" : + METHOD_ENTRY_VISI(me) == METHOD_VISI_PRIVATE ? "pri" : "pro", + METHOD_ENTRY_COMPLEMENTED(me) ? ",cmp" : "", + METHOD_ENTRY_CACHED(me) ? ",cc" : "", + METHOD_ENTRY_INVALIDATED(me) ? ",inv" : "", rb_method_type_name(me->def->type), - me->def->alias_count, - obj_info(me->owner), - obj_info(me->defined_class))); + me->def->alias_count, + (void *)me->owner, // obj_info(me->owner), + (void *)me->defined_class)); //obj_info(me->defined_class))); + + if (me->def->type == VM_METHOD_TYPE_ISEQ) { + APPENDF((BUFF_ARGS, " (iseq:%p)", (void *)me->def->body.iseq.iseqptr)); + } } else { APPENDF((BUFF_ARGS, "%s", rb_id2name(me->called_id))); @@ -11642,6 +11823,17 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj) vm_ci_kwarg(ci) ? "available" : "NULL")); break; } + case imemo_callcache: + { + const struct rb_callcache *cc = (const struct rb_callcache *)obj; + VALUE class_path = cc->klass ? rb_class_path_cached(cc->klass) : Qnil; + + APPENDF((BUFF_ARGS, "(klass:%s, cme:%s (%p) call:%p", + NIL_P(class_path) ? "??" : RSTRING_PTR(class_path), + vm_cc_cme(cc) ? rb_id2name(vm_cc_cme(cc)->called_id) : "", + (void *)vm_cc_cme(cc), (void *)vm_cc_call(cc))); + break; + } default: break; } diff --git a/id_table.c b/id_table.c index f56658247952ad..4f8540246cc8ca 100644 --- a/id_table.c +++ b/id_table.c @@ -229,7 +229,7 @@ rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp) int index = hash_table_index(tbl, key); if (index >= 0) { - *valp = tbl->items[index].val; + *valp = tbl->items[index].val; return TRUE; } else { diff --git a/insns.def b/insns.def index 2385f33f758382..aab5cca06535bb 100644 --- a/insns.def +++ b/insns.def @@ -827,7 +827,7 @@ opt_nil_p (VALUE recv) (VALUE val) { - val = vm_opt_nil_p(cd, recv); + val = vm_opt_nil_p(GET_ISEQ(), cd, recv); if (val == Qundef) { CALL_SIMPLE_METHOD(); @@ -903,8 +903,9 @@ invokeblock // attr rb_snum_t sp_inc = sp_inc_of_invokeblock(cd->ci); // attr rb_snum_t comptime_sp_inc = sp_inc_of_invokeblock(ci); { - if (UNLIKELY(cd->cc.call != vm_invokeblock_i)) { - cd->cc.call = vm_invokeblock_i; // check before setting to avoid CoW + if (UNLIKELY(vm_cc_call(cd->cc) != vm_invokeblock_i)) { + const struct rb_callcache *cc = vm_cc_new(0, NULL, vm_invokeblock_i); + RB_OBJ_WRITE(GET_ISEQ(), &cd->cc, cc); } VALUE bh = VM_BLOCK_HANDLER_NONE; @@ -1167,7 +1168,7 @@ opt_eq (VALUE recv, VALUE obj) (VALUE val) { - val = opt_eq_func(recv, obj, cd); + val = opt_eq_func(GET_ISEQ(), recv, obj, cd); if (val == Qundef) { CALL_SIMPLE_METHOD(); @@ -1181,7 +1182,7 @@ opt_neq (VALUE recv, VALUE obj) (VALUE val) { - val = vm_opt_neq(cd, cd_eq, recv, obj); + val = vm_opt_neq(GET_ISEQ(), cd, cd_eq, recv, obj); if (val == Qundef) { CALL_SIMPLE_METHOD(); @@ -1431,7 +1432,7 @@ opt_not (VALUE recv) (VALUE val) { - val = vm_opt_not(cd, recv); + val = vm_opt_not(GET_ISEQ(), cd, recv); if (val == Qundef) { CALL_SIMPLE_METHOD(); diff --git a/internal/class.h b/internal/class.h index 72d3b9ea541f32..67ea6e2a83c12d 100644 --- a/internal/class.h +++ b/internal/class.h @@ -41,6 +41,7 @@ struct rb_classext_struct { #endif struct rb_id_table *const_tbl; struct rb_id_table *callable_m_tbl; + struct rb_id_table *cc_tbl; /* ID -> [[ci, cc1], cc2, ...] */ struct rb_subclass_entry *subclasses; struct rb_subclass_entry **parent_subclasses; /** @@ -83,6 +84,7 @@ typedef struct rb_classext_struct rb_classext_t; # define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl) #endif #define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl) +#define RCLASS_CC_TBL(c) (RCLASS_EXT(c)->cc_tbl) #define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl) #define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_) #define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class) diff --git a/internal/imemo.h b/internal/imemo.h index 967dc82f010f8e..f09a195e7bb957 100644 --- a/internal/imemo.h +++ b/internal/imemo.h @@ -29,6 +29,7 @@ #define IMEMO_FL_USER2 FL_USER6 #define IMEMO_FL_USER3 FL_USER7 #define IMEMO_FL_USER4 FL_USER8 +#define IMEMO_FL_USER5 FL_USER9 enum imemo_type { imemo_env = 0, @@ -43,6 +44,7 @@ enum imemo_type { imemo_ast = 9, imemo_parser_strterm = 10, imemo_callinfo = 11, + imemo_callcache = 12, }; /* CREF (Class REFerence) is defined in method.h */ @@ -171,6 +173,8 @@ imemo_type_p(VALUE imemo, enum imemo_type imemo_type) } } +#define IMEMO_TYPE_P(v, t) imemo_type_p((VALUE)v, t) + static inline bool imemo_throw_data_p(VALUE imemo) { diff --git a/internal/vm.h b/internal/vm.h index 4bd2bfb1e3da61..26dde33975fa38 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -52,44 +52,6 @@ enum method_missing_reason { MISSING_NONE = 0x40 }; -struct rb_call_cache { - /* inline cache: keys */ - rb_serial_t method_state; - rb_serial_t class_serial[ - (CACHELINE - - sizeof(rb_serial_t) /* method_state */ - - sizeof(struct rb_callable_method_entry_struct *) /* me */ - - sizeof(uintptr_t) /* method_serial */ - - sizeof(enum method_missing_reason) /* aux */ - - sizeof(VALUE (*)( /* call */ - struct rb_execution_context_struct *e, - struct rb_control_frame_struct *, - struct rb_calling_info *, - const struct rb_call_data *))) - / sizeof(rb_serial_t) - ]; - - /* inline cache: values */ - const struct rb_callable_method_entry_struct *me; - uintptr_t method_serial; /* me->def->method_serial */ - - VALUE (*call)(struct rb_execution_context_struct *ec, - struct rb_control_frame_struct *cfp, - struct rb_calling_info *calling, - struct rb_call_data *cd); - - union { - unsigned int index; /* used by ivar */ - enum method_missing_reason method_missing_reason; /* used by method_missing */ - } aux; -}; -STATIC_ASSERT(cachelined, sizeof(struct rb_call_cache) <= CACHELINE); - -struct rb_call_data { - const struct rb_callinfo *ci; - struct rb_call_cache cc; -}; - /* vm_insnhelper.h */ rb_serial_t rb_next_class_serial(void); @@ -139,8 +101,9 @@ MJIT_SYMBOL_EXPORT_END VALUE rb_equal_opt(VALUE obj1, VALUE obj2); VALUE rb_eql_opt(VALUE obj1, VALUE obj2); +struct rb_iseq_struct; MJIT_SYMBOL_EXPORT_BEGIN -void rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass); +void rb_vm_search_method_slowpath(VALUE cd_owner, struct rb_call_data *cd, VALUE klass); MJIT_SYMBOL_EXPORT_END /* vm_dump.c */ diff --git a/iseq.c b/iseq.c index 867bbc0d6327fb..c6c5c6e127e968 100644 --- a/iseq.c +++ b/iseq.c @@ -247,6 +247,7 @@ rb_iseq_update_references(rb_iseq_t *iseq) if (!SPECIAL_CONST_P(cds[i].ci)) { cds[i].ci = (struct rb_callinfo *)rb_gc_location((VALUE)cds[i].ci); } + cds[i].cc = (struct rb_callcache *)rb_gc_location((VALUE)cds[i].cc); } } if (FL_TEST(iseq, ISEQ_MARKABLE_ISEQ)) { @@ -323,6 +324,11 @@ rb_iseq_mark(const rb_iseq_t *iseq) struct rb_call_data *cds = (struct rb_call_data *)body->call_data; for (unsigned int i=0; ici_size; i++) { rb_gc_mark_movable((VALUE)cds[i].ci); + const struct rb_callcache *cc = cds[i].cc; + if (cc && vm_cc_markable(cds[i].cc)) { + rb_gc_mark_movable((VALUE)cc); + // TODO: check enable + } } } @@ -351,6 +357,14 @@ rb_iseq_mark(const rb_iseq_t *iseq) } } } + + if (body->jit_unit && body->jit_unit->cc_entries != NULL) { + // TODO: move to mjit.c? + for (unsigned int i=0; ici_size; i++) { + const struct rb_callcache *cc = body->jit_unit->cc_entries[i]; + rb_gc_mark((VALUE)cc); // pindown + } + } } if (FL_TEST_RAW(iseq, ISEQ_NOT_LOADED_YET)) { @@ -663,6 +677,9 @@ finish_iseq_build(rb_iseq_t *iseq) rb_exc_raise(err); } + RB_DEBUG_COUNTER_INC(iseq_num); + RB_DEBUG_COUNTER_ADD(iseq_cd_num, iseq->body->ci_size); + rb_iseq_init_trace(iseq); return Qtrue; } diff --git a/method.h b/method.h index 519cc9bfc1c44a..01a25d368ccf25 100644 --- a/method.h +++ b/method.h @@ -69,8 +69,12 @@ typedef struct rb_callable_method_entry_struct { /* same fields with rb_method_e #define METHOD_ENTRY_VISI(me) (rb_method_visibility_t)(((me)->flags & (IMEMO_FL_USER0 | IMEMO_FL_USER1)) >> (IMEMO_FL_USHIFT+0)) #define METHOD_ENTRY_BASIC(me) (int) (((me)->flags & (IMEMO_FL_USER2 )) >> (IMEMO_FL_USHIFT+2)) -#define METHOD_ENTRY_COMPLEMENTED(me) ((me)->flags & IMEMO_FL_USER3) -#define METHOD_ENTRY_COMPLEMENTED_SET(me) ((me)->flags = (me)->flags | IMEMO_FL_USER3) +#define METHOD_ENTRY_COMPLEMENTED(me) ((me)->flags & IMEMO_FL_USER3) +#define METHOD_ENTRY_COMPLEMENTED_SET(me) ((me)->flags = (me)->flags | IMEMO_FL_USER3) +#define METHOD_ENTRY_CACHED(me) ((me)->flags & IMEMO_FL_USER4) +#define METHOD_ENTRY_CACHED_SET(me) ((me)->flags = (me)->flags | IMEMO_FL_USER4) +#define METHOD_ENTRY_INVALIDATED(me) ((me)->flags & IMEMO_FL_USER5) +#define METHOD_ENTRY_INVALIDATED_SET(me) ((me)->flags = (me)->flags | IMEMO_FL_USER5) static inline void METHOD_ENTRY_VISI_SET(rb_method_entry_t *me, rb_method_visibility_t visi) @@ -229,4 +233,7 @@ void rb_scope_visibility_set(rb_method_visibility_t); VALUE rb_unnamed_parameters(int arity); +void rb_clear_method_cache(VALUE klass_or_module, ID mid); +void rb_clear_method_cache_all(void); + #endif /* RUBY_METHOD_H */ diff --git a/mjit.c b/mjit.c index cdce21c4ac4ba0..d3cb063ff9d838 100644 --- a/mjit.c +++ b/mjit.c @@ -25,6 +25,9 @@ #include "internal/warnings.h" #include "mjit_worker.c" +#include "vm_callinfo.h" + +static void create_unit(const rb_iseq_t *iseq); // Copy ISeq's states so that race condition does not happen on compilation. static void @@ -51,14 +54,18 @@ mjit_copy_job_handler(void *data) } const struct rb_iseq_constant_body *body = job->iseq->body; - if (job->cc_entries) { - unsigned int i; - struct rb_call_cache *sink = job->cc_entries; - const struct rb_call_data *calls = body->call_data; - for (i = 0; i < body->ci_size; i++) { - *sink++ = calls[i].cc; + unsigned int ci_size = body->ci_size; + if (ci_size > 0) { + const struct rb_callcache **cc_entries = ALLOC_N(const struct rb_callcache *, ci_size); + if (body->jit_unit == NULL) { + create_unit(job->iseq); + } + body->jit_unit->cc_entries = cc_entries; + for (unsigned int i=0; icall_data[i].cc; } } + if (job->is_entries) { memcpy(job->is_entries, body->is_entries, sizeof(union iseq_inline_storage_entry) * body->is_size); } diff --git a/mjit.h b/mjit.h index bdc186f788507a..15be560786c654 100644 --- a/mjit.h +++ b/mjit.h @@ -70,6 +70,35 @@ struct rb_mjit_compile_info { bool disable_inlining; }; +// The unit structure that holds metadata of ISeq for MJIT. +struct rb_mjit_unit { + // Unique order number of unit. + int id; + // Dlopen handle of the loaded object file. + void *handle; + rb_iseq_t *iseq; +#ifndef _MSC_VER + // This value is always set for `compact_all_jit_code`. Also used for lazy deletion. + char *o_file; + // true if it's inherited from parent Ruby process and lazy deletion should be skipped. + // `o_file = NULL` can't be used to skip lazy deletion because `o_file` could be used + // by child for `compact_all_jit_code`. + bool o_file_inherited_p; +#endif +#if defined(_WIN32) + // DLL cannot be removed while loaded on Windows. If this is set, it'll be lazily deleted. + char *so_file; +#endif + // Only used by unload_units. Flag to check this unit is currently on stack or not. + char used_code_p; + struct list_node unode; + // mjit_compile's optimization switches + struct rb_mjit_compile_info compile_info; + + // captured CC values, they should be marked with iseq. + const struct rb_callcache **cc_entries; // size: iseq->body->ci_size +}; + typedef VALUE (*mjit_func_t)(rb_execution_context_t *, rb_control_frame_t *); RUBY_SYMBOL_EXPORT_BEGIN diff --git a/mjit_compile.c b/mjit_compile.c index 57037af20c9147..e4f7cf292a230f 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -41,9 +41,9 @@ call_data_index(CALL_DATA cd, const struct rb_iseq_constant_body *body) // For propagating information needed for lazily pushing a frame. struct inlined_call_context { int orig_argc; // ci->orig_argc - VALUE me; // cc->me - int param_size; // def_iseq_ptr(cc->me->def)->body->param.size - int local_size; // def_iseq_ptr(cc->me->def)->body->local_table_size + VALUE me; // vm_cc_cme(cc) + int param_size; // def_iseq_ptr(vm_cc_cme(cc)->def)->body->param.size + int local_size; // def_iseq_ptr(vm_cc_cme(cc)->def)->body->local_table_size }; // Storage to keep compiler's status. This should have information @@ -57,7 +57,6 @@ struct compile_status { bool local_stack_p; // Safely-accessible cache entries copied from main thread. union iseq_inline_storage_entry *is_entries; - struct rb_call_cache *cc_entries; // Mutated optimization levels struct rb_mjit_compile_info *compile_info; // If `inlined_iseqs[pos]` is not NULL, `mjit_compile_body` tries to inline ISeq there. @@ -79,13 +78,11 @@ struct case_dispatch_var { VALUE last_value; }; -// Returns true if call cache is still not obsoleted and cc->me->def->type is available. +// Returns true if call cache is still not obsoleted and vm_cc_cme(cc)->def->type is available. static bool has_valid_method_type(CALL_CACHE cc) { - extern bool mjit_valid_class_serial_p(rb_serial_t class_serial); - return GET_GLOBAL_METHOD_STATE() == cc->method_state - && mjit_valid_class_serial_p(cc->class_serial[0]) && cc->me; + return vm_cc_cme(cc) != NULL; } // Returns true if iseq can use fastpath for setup, otherwise NULL. This becomes true in the same condition @@ -276,7 +273,8 @@ compile_cancel_handler(FILE *f, const struct rb_iseq_constant_body *body, struct fprintf(f, " return Qundef;\n"); } -extern bool mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries); +extern bool mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, + union iseq_inline_storage_entry *is_entries); static bool mjit_compile_body(FILE *f, const rb_iseq_t *iseq, struct compile_status *status) @@ -368,8 +366,6 @@ inlinable_iseq_p(const struct rb_iseq_constant_body *body) .stack_size_for_pos = (int *)alloca(sizeof(int) * body->iseq_size), \ .inlined_iseqs = compile_root_p ? \ alloca(sizeof(const struct rb_iseq_constant_body *) * body->iseq_size) : NULL, \ - .cc_entries = body->ci_size > 0 ? \ - alloca(sizeof(struct rb_call_cache) * body->ci_size) : NULL, \ .is_entries = (body->is_size > 0) ? \ alloca(sizeof(union iseq_inline_storage_entry) * body->is_size) : NULL, \ .compile_info = compile_root_p ? \ @@ -394,17 +390,18 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status #else int insn = (int)body->iseq_encoded[pos]; #endif - if (insn == BIN(opt_send_without_block)) { // `compile_inlined_cancel_handler` supports only `opt_send_without_block` CALL_DATA cd = (CALL_DATA)body->iseq_encoded[pos + 1]; const struct rb_callinfo *ci = cd->ci; - CALL_CACHE cc_copy = status->cc_entries + call_data_index(cd, body); // use copy to avoid race condition + const struct rb_callcache *cc = iseq->body->jit_unit->cc_entries[call_data_index(cd, body)]; // use copy to avoid race condition const rb_iseq_t *child_iseq; - if (has_valid_method_type(cc_copy) && - !(vm_ci_flag(ci) & VM_CALL_TAILCALL) && // inlining only non-tailcall path - cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && fastpath_applied_iseq_p(ci, cc_copy, child_iseq = def_iseq_ptr(cc_copy->me->def)) && // CC_SET_FASTPATH in vm_callee_setup_arg - inlinable_iseq_p(child_iseq->body)) { + if (has_valid_method_type(cc) && + !(vm_ci_flag(ci) & VM_CALL_TAILCALL) && // inlining only non-tailcall path + vm_cc_cme(cc)->def->type == VM_METHOD_TYPE_ISEQ && + fastpath_applied_iseq_p(ci, cc, child_iseq = def_iseq_ptr(vm_cc_cme(cc)->def)) && + // CC_SET_FASTPATH in vm_callee_setup_arg + inlinable_iseq_p(child_iseq->body)) { status->inlined_iseqs[pos] = child_iseq->body; if (mjit_opts.verbose >= 1) // print beforehand because ISeq may be GCed during copy job. @@ -418,12 +415,12 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status INIT_COMPILE_STATUS(child_status, child_iseq->body, false); child_status.inline_context = (struct inlined_call_context){ .orig_argc = vm_ci_argc(ci), - .me = (VALUE)cc_copy->me, + .me = (VALUE)vm_cc_cme(cc), .param_size = child_iseq->body->param.size, .local_size = child_iseq->body->local_table_size }; - if ((child_status.cc_entries != NULL || child_status.is_entries != NULL) - && !mjit_copy_cache_from_main_thread(child_iseq, child_status.cc_entries, child_status.is_entries)) + if ((child_iseq->body->ci_size > 0 || child_status.is_entries != NULL) + && !mjit_copy_cache_from_main_thread(child_iseq, child_status.is_entries)) return false; fprintf(f, "ALWAYS_INLINE(static VALUE _mjit_inlined_%d(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE orig_self, const rb_iseq_t *original_iseq));\n", pos); @@ -454,9 +451,10 @@ mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname) struct compile_status status; INIT_COMPILE_STATUS(status, iseq->body, true); - if ((status.cc_entries != NULL || status.is_entries != NULL) - && !mjit_copy_cache_from_main_thread(iseq, status.cc_entries, status.is_entries)) + if ((iseq->body->ci_size > 0 || status.is_entries != NULL) + && !mjit_copy_cache_from_main_thread(iseq, status.is_entries)) { return false; + } if (!status.compile_info->disable_send_cache && !status.compile_info->disable_inlining) { if (!precompile_inlinable_iseqs(f, iseq, &status)) diff --git a/mjit_worker.c b/mjit_worker.c index ce8133ac7da09e..85411847d7f7c2 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -122,32 +122,6 @@ typedef intptr_t pid_t; #define MJIT_TMP_PREFIX "_ruby_mjit_" -// The unit structure that holds metadata of ISeq for MJIT. -struct rb_mjit_unit { - // Unique order number of unit. - int id; - // Dlopen handle of the loaded object file. - void *handle; - rb_iseq_t *iseq; -#ifndef _MSC_VER - // This value is always set for `compact_all_jit_code`. Also used for lazy deletion. - char *o_file; - // true if it's inherited from parent Ruby process and lazy deletion should be skipped. - // `o_file = NULL` can't be used to skip lazy deletion because `o_file` could be used - // by child for `compact_all_jit_code`. - bool o_file_inherited_p; -#endif -#if defined(_WIN32) - // DLL cannot be removed while loaded on Windows. If this is set, it'll be lazily deleted. - char *so_file; -#endif - // Only used by unload_units. Flag to check this unit is currently on stack or not. - char used_code_p; - struct list_node unode; - // mjit_compile's optimization switches - struct rb_mjit_compile_info compile_info; -}; - // Linked list of struct rb_mjit_unit. struct rb_mjit_unit_list { struct list_head head; @@ -1117,7 +1091,6 @@ convert_unit_to_func(struct rb_mjit_unit *unit) typedef struct { const rb_iseq_t *iseq; - struct rb_call_cache *cc_entries; union iseq_inline_storage_entry *is_entries; bool finish_p; } mjit_copy_job_t; @@ -1138,7 +1111,7 @@ int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t , void *); // We're lazily copying cache values from main thread because these cache values // could be different between ones on enqueue timing and ones on dequeue timing. bool -mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries) +mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, union iseq_inline_storage_entry *is_entries) { mjit_copy_job_t *job = &mjit_copy_job; // just a short hand @@ -1146,7 +1119,6 @@ mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache *cc job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified CRITICAL_SECTION_FINISH(3, "in mjit_copy_cache_from_main_thread"); - job->cc_entries = cc_entries; job->is_entries = is_entries; CRITICAL_SECTION_START(3, "in mjit_copy_cache_from_main_thread"); diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb index 1fc1657f5b24cc..4f480bb856d0c8 100644 --- a/test/-ext-/tracepoint/test_tracepoint.rb +++ b/test/-ext-/tracepoint/test_tracepoint.rb @@ -10,33 +10,25 @@ def test_not_available_from_ruby end def test_tracks_objspace_events - result = Bug.tracepoint_track_objspace_events{ - Object.new - } - object_new_newobj = result[0] - result = EnvUtil.suppress_warning {eval(<<-EOS, nil, __FILE__, __LINE__+1)} Bug.tracepoint_track_objspace_events { 99 'abc' _="foobar" - Object.new nil } EOS newobj_count, free_count, gc_start_count, gc_end_mark_count, gc_end_sweep_count, *newobjs = *result - assert_equal 1 + object_new_newobj, newobj_count - assert_equal 1 + object_new_newobj, newobjs.size + assert_equal 1, newobj_count + assert_equal 1, newobjs.size assert_equal 'foobar', newobjs[0] - assert_equal Object, newobjs[1].class assert_operator free_count, :>=, 0 assert_operator gc_start_count, :==, gc_end_mark_count assert_operator gc_start_count, :>=, gc_end_sweep_count end def test_tracks_objspace_count - return stat1 = {} stat2 = {} GC.disable diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index ef99f69f50fa21..9442041ee57cc9 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -94,6 +94,9 @@ def test_stat GC.start GC.stat(stat) ObjectSpace.count_objects(count) + # repeat same methods invocation for cache object creation. + GC.stat(stat) + ObjectSpace.count_objects(count) assert_equal(count[:TOTAL]-count[:FREE], stat[:heap_live_slots]) assert_equal(count[:FREE], stat[:heap_free_slots]) diff --git a/test/ruby/test_inlinecache.rb b/test/ruby/test_inlinecache.rb new file mode 100644 index 00000000000000..90d0189d4ce110 --- /dev/null +++ b/test/ruby/test_inlinecache.rb @@ -0,0 +1,64 @@ +# -*- coding: us-ascii -*- +# frozen_string_literal: true + +require 'test/unit' + +class TestMethod < Test::Unit::TestCase + def test_alias + m0 = Module.new do + def foo; :M0 end + end + m1 = Module.new do + include m0 + end + c = Class.new do + include m1 + alias bar foo + end + d = Class.new(c) do + end + + test = -> do + d.new.bar + end + + assert_equal :M0, test[] + + c.class_eval do + def bar + :C + end + end + + assert_equal :C, test[] + end + + def test_zsuper + assert_separately [], <<-EOS + class C + private def foo + :C + end + end + + class D < C + public :foo + end + + class E < D; end + class F < E; end + + test = -> do + F.new().foo + end + + assert_equal :C, test[] + + class E + def foo; :E; end + end + + assert_equal :E, test[] + EOS + end +end diff --git a/tool/mk_call_iseq_optimized.rb b/tool/mk_call_iseq_optimized.rb index 9d4caf34656225..448d44039f4e0f 100644 --- a/tool/mk_call_iseq_optimized.rb +++ b/tool/mk_call_iseq_optimized.rb @@ -24,7 +24,7 @@ def fname param, local #{fname(param, local)}(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { RB_DEBUG_COUNTER_INC(ccf_iseq_fix); - return vm_call_iseq_setup_normal(ec, cfp, calling, cd->cc.me, 0, #{param}, #{local}); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cd->cc), 0, #{param}, #{local}); } EOS diff --git a/tool/ruby_vm/views/_mjit_compile_send.erb b/tool/ruby_vm/views/_mjit_compile_send.erb index af39512f7357ae..6c5a3626992a36 100644 --- a/tool/ruby_vm/views/_mjit_compile_send.erb +++ b/tool/ruby_vm/views/_mjit_compile_send.erb @@ -14,9 +14,9 @@ MAYBE_UNUSED(<%= ope.fetch(:decl) %>) = (<%= ope.fetch(:type) %>)operands[<%= i %>]; % end % # compiler: Use copied cc to avoid race condition - CALL_CACHE cc_copy = status->cc_entries + call_data_index(cd, body); + const struct rb_callcache *captured_cc = body->jit_unit->cc_entries[call_data_index(cd, body)]; % - if (!status->compile_info->disable_send_cache && has_valid_method_type(cc_copy)) { + if (!status->compile_info->disable_send_cache && has_valid_method_type(captured_cc)) { const rb_iseq_t *iseq; const CALL_INFO ci = cd->ci; unsigned int argc = vm_ci_argc(ci); // this `argc` variable is for calculating a value's position on stack considering `blockarg`. @@ -25,7 +25,10 @@ % end if (!(vm_ci_flag(ci) & VM_CALL_TAILCALL) // inlining non-tailcall path - && cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && fastpath_applied_iseq_p(ci, cc_copy, iseq = def_iseq_ptr(cc_copy->me->def))) { // CC_SET_FASTPATH in vm_callee_setup_arg + && vm_cc_cme(captured_cc)->def->type == VM_METHOD_TYPE_ISEQ + && fastpath_applied_iseq_p(ci, captured_cc, iseq = def_iseq_ptr(vm_cc_cme(captured_cc)->def))) { + // CC_SET_FASTPATH in vm_callee_setup_arg + int param_size = iseq->body->param.size; fprintf(f, "{\n"); @@ -35,8 +38,10 @@ } % # JIT: Invalidate call cache if it requires vm_search_method. This allows to inline some of following things. - fprintf(f, " if (UNLIKELY(GET_GLOBAL_METHOD_STATE() != %"PRI_SERIALT_PREFIX"u ||\n", cc_copy->method_state); - fprintf(f, " RCLASS_SERIAL(CLASS_OF(stack[%d])) != %"PRI_SERIALT_PREFIX"u)) {\n", b->stack_size - 1 - argc, cc_copy->class_serial[0]); + fprintf(f, " const struct rb_call_data *cd = (const struct rb_callcache *)0x%"PRIxVALUE";\n", (VALUE)cd); + fprintf(f, " const struct rb_callcache *cc = (const struct rb_callcache *)0x%"PRIxVALUE";\n", (VALUE)captured_cc); + fprintf(f, " if (UNLIKELY(cd->cc != cc || !vm_cc_valid_p(cc, CLASS_OF(stack[%d])))) {\n", b->stack_size - 1 - argc); + // TODO: need to free cc fprintf(f, " reg_cfp->pc = original_body_iseq + %d;\n", pos); fprintf(f, " reg_cfp->sp = vm_base_ptr(reg_cfp) + %d;\n", b->stack_size); fprintf(f, " goto send_cancel;\n"); @@ -59,18 +64,18 @@ fprintf(f, " {\n"); fprintf(f, " struct rb_calling_info calling;\n"); % if insn.name == 'send' - fprintf(f, " calling.block_handler = vm_caller_setup_arg_block(ec, reg_cfp, (CALL_INFO)0x%"PRIxVALUE", (rb_iseq_t *)0x%"PRIxVALUE", FALSE);\n", (VALUE)ci, (VALUE)blockiseq); + fprintf(f, " calling.block_handler = vm_caller_setup_arg_block(ec, reg_cfp, cd->ci, (rb_iseq_t *)0x%"PRIxVALUE", FALSE);\n", (VALUE)blockiseq); % else fprintf(f, " calling.block_handler = VM_BLOCK_HANDLER_NONE;\n"); % end fprintf(f, " calling.argc = %d;\n", vm_ci_argc(ci)); fprintf(f, " calling.recv = stack[%d];\n", b->stack_size - 1 - argc); -% # JIT: Special CALL_METHOD. Bypass cc_copy->call and inline vm_call_iseq_setup_normal for vm_call_iseq_setup_func FASTPATH. +% # JIT: Special CALL_METHOD. Bypass captured_cc->call and inline vm_call_iseq_setup_normal for vm_call_iseq_setup_func FASTPATH. fprintf(f, " {\n"); fprintf(f, " VALUE v;\n"); - fprintf(f, " vm_call_iseq_setup_normal(ec, reg_cfp, &calling, (const rb_callable_method_entry_t *)0x%"PRIxVALUE", 0, %d, %d);\n", - (VALUE)cc_copy->me, param_size, iseq->body->local_table_size); // fastpath_applied_iseq_p checks rb_simple_iseq_p, which ensures has_opt == FALSE + fprintf(f, " vm_call_iseq_setup_normal(ec, reg_cfp, &calling, vm_cc_cme(cc), 0, %d, %d);\n", + param_size, iseq->body->local_table_size); // fastpath_applied_iseq_p checks rb_simple_iseq_p, which ensures has_opt == FALSE if (iseq->body->catch_except_p) { fprintf(f, " VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);\n"); fprintf(f, " v = vm_exec(ec, TRUE);\n"); diff --git a/tool/ruby_vm/views/mjit_compile.inc.erb b/tool/ruby_vm/views/mjit_compile.inc.erb index 95e71183d94c71..6ab57ae16431dd 100644 --- a/tool/ruby_vm/views/mjit_compile.inc.erb +++ b/tool/ruby_vm/views/mjit_compile.inc.erb @@ -57,7 +57,7 @@ switch (insn) { % when *send_compatible_opt_insns % # To avoid cancel, just emit `opt_send_without_block` instead of `opt_*` insn if call cache is populated. % cd_index = insn.opes.index { |o| o.fetch(:type) == 'CALL_DATA' } - if (has_valid_method_type(status->cc_entries + call_data_index((CALL_DATA)operands[<%= cd_index %>], body))) { + if (has_valid_method_type(body->jit_unit->cc_entries[call_data_index((CALL_DATA)operands[<%= cd_index %>], body)])) { <%= render 'mjit_compile_send', locals: { insn: opt_send_without_block } -%> <%= render 'mjit_compile_insn', locals: { insn: opt_send_without_block } -%> break; diff --git a/vm.c b/vm.c index 7482db1b543edb..50e317408b2e83 100644 --- a/vm.c +++ b/vm.c @@ -386,6 +386,8 @@ rb_serial_t ruby_vm_global_method_state = 1; rb_serial_t ruby_vm_global_constant_state = 1; rb_serial_t ruby_vm_class_serial = 1; +const struct rb_callcache *vm_empty_cc; + static void thread_free(void *ptr); void @@ -2806,8 +2808,9 @@ static VALUE m_core_undef_method(VALUE self, VALUE cbase, VALUE sym) { REWIND_CFP({ - rb_undef(cbase, SYM2ID(sym)); - rb_clear_method_cache_by_class(self); + ID mid = SYM2ID(sym); + rb_undef(cbase, mid); + rb_clear_method_cache(self, mid); }); return Qnil; } @@ -2962,6 +2965,13 @@ f_lambda(VALUE _) return rb_block_lambda(); } +static VALUE +vm_mtbl(VALUE self, VALUE obj, VALUE sym) +{ + vm_mtbl_dump(CLASS_OF(obj), SYM2ID(sym)); + return Qnil; +} + void Init_VM(void) { @@ -3249,9 +3259,11 @@ Init_VM(void) #if VMDEBUG rb_define_singleton_method(rb_cRubyVM, "SDR", sdr, 0); rb_define_singleton_method(rb_cRubyVM, "NSDR", nsdr, 0); + rb_define_singleton_method(rb_cRubyVM, "mtbl", vm_mtbl, 2); #else (void)sdr; (void)nsdr; + (void)vm_mtbl; #endif /* VM bootstrap: phase 2 */ @@ -3348,6 +3360,10 @@ Init_vm_objects(void) vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000); rb_objspace_gc_enable(vm->objspace); + + vm_empty_cc = vm_cc_new(0, NULL, vm_call_general); + FL_SET_RAW(vm_empty_cc, VM_CALLCACHE_UNMARKABLE); + rb_gc_register_mark_object((VALUE)vm_empty_cc); } /* top self */ @@ -3716,6 +3732,12 @@ vm_collect_usage_register(int reg, int isset) } #endif +MJIT_FUNC_EXPORTED const struct rb_callcache * +rb_vm_empty_cc(void) +{ + return vm_empty_cc; +} + #endif /* #ifndef MJIT_HEADER */ #include "vm_call_iseq_optimized.inc" /* required from vm_insnhelper.c */ diff --git a/vm_callinfo.h b/vm_callinfo.h index 33d4f614da7ef0..32b0131fa1c7fd 100644 --- a/vm_callinfo.h +++ b/vm_callinfo.h @@ -75,13 +75,13 @@ struct rb_callinfo { #define CI_EMBED_FLAG 0x01 #define CI_EMBED_ARGC_SHFT (CI_EMBED_TAG_bits) -#define CI_EMBED_ARGC_MASK ((1UL<klass = 0) at vm_ccs_free(). + + /* inline cache: values */ + const struct rb_callable_method_entry_struct * const cme_; + const vm_call_handler call_; + + union { + const unsigned int attr_index; + const enum method_missing_reason method_missing_reason; /* used by method_missing */ + } aux_; +}; + +#define VM_CALLCACHE_UNMARKABLE IMEMO_FL_USER0 + +static inline const struct rb_callcache * +vm_cc_new(VALUE klass, + const struct rb_callable_method_entry_struct *cme, + vm_call_handler call) +{ + const struct rb_callcache *cc = (const struct rb_callcache *)rb_imemo_new(imemo_callcache, (VALUE)cme, (VALUE)call, 0, klass); + RB_DEBUG_COUNTER_INC(cc_new); + return cc; +} + +static inline const struct rb_callcache * +vm_cc_fill(struct rb_callcache *cc, + VALUE klass, + const struct rb_callable_method_entry_struct *cme, + vm_call_handler call) +{ + struct rb_callcache cc_body = { + .flags = T_IMEMO | (imemo_callcache << FL_USHIFT) | VM_CALLCACHE_UNMARKABLE, + .klass = klass, + .cme_ = cme, + .call_ = call, + }; + MEMCPY(cc, &cc_body, struct rb_callcache, 1); + return cc; +} + +static inline bool +vm_cc_class_check(const struct rb_callcache *cc, VALUE klass) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc->klass == 0 || + RB_TYPE_P(cc->klass, T_CLASS) || RB_TYPE_P(cc->klass, T_ICLASS)); + return cc->klass == klass; +} + +static inline const struct rb_callable_method_entry_struct * +vm_cc_cme(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + return cc->cme_; +} + +static inline vm_call_handler +vm_cc_call(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + return cc->call_; +} + +static inline unsigned int +vm_cc_attr_index(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + return cc->aux_.attr_index; +} + +static inline unsigned int +vm_cc_cmethod_missing_reason(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + return cc->aux_.method_missing_reason; +} + +static inline int +vm_cc_markable(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + return FL_TEST_RAW(cc, VM_CALLCACHE_UNMARKABLE) == 0; +} + +static inline bool +vm_cc_valid_p(const struct rb_callcache *cc, VALUE klass) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + if (cc->klass == klass && !METHOD_ENTRY_INVALIDATED(vm_cc_cme(cc))) { + return 1; + } + else { + return 0; + } +} + +#ifndef MJIT_HEADER +extern const struct rb_callcache *vm_empty_cc; +#else +extern const struct rb_callcache *rb_vm_empty_cc(void); +#endif + +static inline const struct rb_callcache * +vm_cc_empty(void) +{ +#ifndef MJIT_HEADER + return vm_empty_cc; +#else + return rb_vm_empty_cc(); +#endif +} + +/* callcache: mutete */ + +static inline void +vm_cc_cme_set(const struct rb_callcache *cc, const struct rb_callable_method_entry_struct *cme) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc != vm_cc_empty()); + VM_ASSERT(vm_cc_cme(cc) != NULL); + VM_ASSERT(vm_cc_cme(cc)->called_id == cme->called_id); + VM_ASSERT(!vm_cc_markable(cc)); // only used for vm_eval.c + + *((const struct rb_callable_method_entry_struct **)&cc->cme_) = cme; +} + +static inline void +vm_cc_call_set(const struct rb_callcache *cc, vm_call_handler call) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc != vm_cc_empty()); + *(vm_call_handler *)&cc->call_ = call; +} + +static inline void +vm_cc_attr_index_set(const struct rb_callcache *cc, int index) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc != vm_cc_empty()); + *(int *)&cc->aux_.attr_index = index; +} + +static inline void +vm_cc_method_missing_reason_set(const struct rb_callcache *cc, enum method_missing_reason reason) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc != vm_cc_empty()); + *(enum method_missing_reason *)&cc->aux_.method_missing_reason = reason; +} + +static inline void +vm_cc_invalidate(const struct rb_callcache *cc) +{ + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(cc != vm_cc_empty()); + VM_ASSERT(cc->klass != 0); // should be enable + + *(VALUE *)&cc->klass = 0; + RB_DEBUG_COUNTER_INC(cc_ent_invalidate); +} + +/* calldata */ + +struct rb_call_data { + const struct rb_callinfo *ci; + const struct rb_callcache *cc; +}; + +struct rb_class_cc_entries { +#if VM_CHECK_MODE > 0 + VALUE debug_sig; +#endif + int capa; + int len; + const struct rb_callable_method_entry_struct *cme; + struct rb_class_cc_entries_entry { + const struct rb_callinfo *ci; + const struct rb_callcache *cc; + } *entries; +}; + +#if VM_CHECK_MODE > 0 +static inline bool +vm_ccs_p(const struct rb_class_cc_entries *ccs) +{ + return ccs->debug_sig == ~(VALUE)ccs; +} +#endif + +// gc.c +void rb_vm_ccs_free(struct rb_class_cc_entries *ccs); diff --git a/vm_core.h b/vm_core.h index fb63c1c1195845..d84e05d99b810a 100644 --- a/vm_core.h +++ b/vm_core.h @@ -253,7 +253,6 @@ struct rb_calling_info { }; struct rb_execution_context_struct; -typedef VALUE (*vm_call_handler)(struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, struct rb_calling_info *calling, struct rb_call_data *cd); #if 1 #define CoreDataFromValue(obj, type) (type*)DATA_PTR(obj) @@ -1088,7 +1087,7 @@ typedef struct iseq_inline_cache_entry *IC; typedef struct iseq_inline_iv_cache_entry *IVC; typedef union iseq_inline_storage_entry *ISE; typedef const struct rb_callinfo *CALL_INFO; -typedef struct rb_call_cache *CALL_CACHE; +typedef const struct rb_callcache *CALL_CACHE; typedef struct rb_call_data *CALL_DATA; typedef VALUE CDHASH; diff --git a/vm_dump.c b/vm_dump.c index 64a210543cccaf..5bcbac17466710 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -111,7 +111,7 @@ control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *c } if (cfp->iseq != 0) { -#define RUBY_VM_IFUNC_P(ptr) imemo_type_p((VALUE)ptr, imemo_ifunc) +#define RUBY_VM_IFUNC_P(ptr) IMEMO_TYPE_P(ptr, imemo_ifunc) if (RUBY_VM_IFUNC_P(cfp->iseq)) { iseq_name = ""; } @@ -167,7 +167,7 @@ control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *c char buff[0x100]; if (me) { - if (imemo_type_p((VALUE)me, imemo_ment)) { + if (IMEMO_TYPE_P(me, imemo_ment)) { fprintf(stderr, " me:\n"); fprintf(stderr, " called_id: %s, type: %s\n", rb_id2name(me->called_id), rb_method_type_name(me->def->type)); fprintf(stderr, " owner class: %s\n", rb_raw_obj_info(buff, 0x100, me->owner)); diff --git a/vm_eval.c b/vm_eval.c index 0f51d9a841ea2c..49cc92780b4fa3 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -47,7 +47,8 @@ rb_vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE { struct rb_calling_info calling = { Qundef, recv, argc, kw_splat, }; const struct rb_callinfo *ci = vm_ci_new_runtime(id, kw_splat ? VM_CALL_KW_SPLAT : 0, argc, NULL); - const struct rb_call_cache cc = { 0, { 0, }, me, me->def->method_serial, vm_call_general, { 0, }, }; + struct rb_callcache cc_body; + const struct rb_callcache *cc = vm_cc_fill(&cc_body, 0, me, vm_call_general); struct rb_call_data cd = { ci, cc, }; return vm_call0_body(ec, &calling, &cd, argv); } @@ -56,9 +57,9 @@ static VALUE vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *calling, struct rb_call_data *cd, const VALUE *argv) { const struct rb_callinfo *ci = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; VALUE val; - const rb_callable_method_entry_t *me = cc->me; + const rb_callable_method_entry_t *me = vm_cc_cme(cc); const rb_method_cfunc_t *cfunc = UNALIGNED_MEMBER_PTR(me->def, body.cfunc); int len = cfunc->argc; VALUE recv = calling->recv; @@ -109,14 +110,14 @@ static VALUE vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struct rb_call_data *cd, const VALUE *argv) { const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; VALUE ret; calling->block_handler = vm_passed_block_handler(ec); again: - switch (cc->me->def->type) { + switch (vm_cc_cme(cc)->def->type) { case VM_METHOD_TYPE_ISEQ: { rb_control_frame_t *reg_cfp = ec->cfp; @@ -147,7 +148,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc } rb_check_arity(calling->argc, 1, 1); - ret = rb_ivar_set(calling->recv, cc->me->def->body.attr.id, argv[0]); + ret = rb_ivar_set(calling->recv, vm_cc_cme(cc)->def->body.attr.id, argv[0]); goto success; case VM_METHOD_TYPE_IVAR: if (calling->kw_splat && @@ -158,7 +159,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc } rb_check_arity(calling->argc, 0, 0); - ret = rb_attr_get(calling->recv, cc->me->def->body.attr.id); + ret = rb_attr_get(calling->recv, vm_cc_cme(cc)->def->body.attr.id); goto success; case VM_METHOD_TYPE_BMETHOD: ret = vm_call_bmethod_body(ec, calling, cd, argv); @@ -166,21 +167,21 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc case VM_METHOD_TYPE_ZSUPER: case VM_METHOD_TYPE_REFINED: { - const rb_method_type_t type = cc->me->def->type; - VALUE super_class = cc->me->defined_class; + const rb_method_type_t type = vm_cc_cme(cc)->def->type; + VALUE super_class = vm_cc_cme(cc)->defined_class; if (type == VM_METHOD_TYPE_ZSUPER) { super_class = RCLASS_ORIGIN(super_class); } - else if (cc->me->def->body.refined.orig_me) { - CC_SET_ME(cc, refined_method_callable_without_refinement(cc->me)); - goto again; + else if (vm_cc_cme(cc)->def->body.refined.orig_me) { + vm_cc_cme_set(cc, refined_method_callable_without_refinement(vm_cc_cme(cc))); + goto again; } super_class = RCLASS_SUPER(super_class); if (super_class) { - CC_SET_ME(cc, rb_callable_method_entry(super_class, vm_ci_mid(ci))); - if (cc->me) { + vm_cc_cme_set(cc, rb_callable_method_entry(super_class, vm_ci_mid(ci))); + if (vm_cc_cme(cc)) { RUBY_VM_CHECK_INTS(ec); goto again; } @@ -191,7 +192,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc goto success; } case VM_METHOD_TYPE_ALIAS: - CC_SET_ME(cc, aliased_callable_method_entry(cc->me)); + vm_cc_cme_set(cc, aliased_callable_method_entry(vm_cc_cme(cc))); goto again; case VM_METHOD_TYPE_MISSING: { @@ -200,7 +201,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc argv, MISSING_NOENTRY, calling->kw_splat); } case VM_METHOD_TYPE_OPTIMIZED: - switch (cc->me->def->body.optimize_type) { + switch (vm_cc_cme(cc)->def->body.optimize_type) { case OPTIMIZED_METHOD_TYPE_SEND: ret = send_internal(calling->argc, argv, calling->recv, calling->kw_splat ? CALL_FCALL_KW : CALL_FCALL); goto success; @@ -212,13 +213,13 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, struc goto success; } default: - rb_bug("vm_call0: unsupported optimized method type (%d)", cc->me->def->body.optimize_type); + rb_bug("vm_call0: unsupported optimized method type (%d)", vm_cc_cme(cc)->def->body.optimize_type); } break; case VM_METHOD_TYPE_UNDEF: break; } - rb_bug("vm_call0: unsupported method type (%d)", cc->me->def->type); + rb_bug("vm_call0: unsupported method type (%d)", vm_cc_cme(cc)->def->type); return Qundef; success: @@ -359,7 +360,7 @@ struct rescue_funcall_args { VALUE recv; ID mid; rb_execution_context_t *ec; - const rb_method_entry_t *me; + const rb_callable_method_entry_t *cme; unsigned int respond: 1; unsigned int respond_to_missing: 1; int argc; @@ -373,7 +374,7 @@ check_funcall_exec(VALUE v) struct rescue_funcall_args *args = (void *)v; return call_method_entry(args->ec, args->defined_class, args->recv, idMethodMissing, - args->me, args->argc, args->argv, args->kw_splat); + args->cme, args->argc, args->argv, args->kw_splat); } static VALUE @@ -417,7 +418,7 @@ static VALUE check_funcall_missing(rb_execution_context_t *ec, VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int respond, VALUE def, int kw_splat) { struct rescue_funcall_args args; - const rb_method_entry_t *me; + const rb_callable_method_entry_t *cme; VALUE ret = Qundef; ret = basic_obj_respond_to_missing(ec, klass, recv, @@ -426,8 +427,9 @@ check_funcall_missing(rb_execution_context_t *ec, VALUE klass, VALUE recv, ID mi args.respond = respond > 0; args.respond_to_missing = (ret != Qundef); ret = def; - me = method_entry_get(klass, idMethodMissing, &args.defined_class); - if (me && !METHOD_ENTRY_BASIC(me)) { + cme = callable_method_entry(klass, idMethodMissing, &args.defined_class); + + if (cme && !METHOD_ENTRY_BASIC(cme)) { VALUE argbuf, *new_args = ALLOCV_N(VALUE, argbuf, argc+1); new_args[0] = ID2SYM(mid); @@ -442,7 +444,7 @@ check_funcall_missing(rb_execution_context_t *ec, VALUE klass, VALUE recv, ID mi ec->method_missing_reason = MISSING_NOENTRY; args.ec = ec; args.recv = recv; - args.me = me; + args.cme = cme; args.mid = mid; args.argc = argc + 1; args.argv = new_args; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index e25c0dbb3304f2..c6e5c671d6b818 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -115,9 +115,9 @@ callable_class_p(VALUE klass) } static int -callable_method_entry_p(const rb_callable_method_entry_t *me) +callable_method_entry_p(const rb_callable_method_entry_t *cme) { - if (me == NULL || callable_class_p(me->defined_class)) { + if (cme == NULL || callable_class_p(cme->defined_class)) { return TRUE; } else { @@ -221,8 +221,6 @@ static bool vm_stack_canary_was_born = false; MJIT_FUNC_EXPORTED void vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) { - return; - const struct rb_control_frame_struct *reg_cfp = ec->cfp; const struct rb_iseq_struct *iseq; @@ -1024,9 +1022,9 @@ vm_search_const_defined_class(const VALUE cbase, ID id) return 0; } -ALWAYS_INLINE(static VALUE vm_getivar(VALUE, ID, IVC, struct rb_call_cache *, int)); +ALWAYS_INLINE(static VALUE vm_getivar(VALUE, ID, IVC, const struct rb_callcache *, int)); static inline VALUE -vm_getivar(VALUE obj, ID id, IVC ic, struct rb_call_cache *cc, int is_attr) +vm_getivar(VALUE obj, ID id, IVC ic, const struct rb_callcache *cc, int is_attr) { #if OPT_IC_FOR_IVAR VALUE val = Qundef; @@ -1035,10 +1033,10 @@ vm_getivar(VALUE obj, ID id, IVC ic, struct rb_call_cache *cc, int is_attr) // frozen? } else if (LIKELY(is_attr ? - RB_DEBUG_COUNTER_INC_UNLESS(ivar_get_ic_miss_unset, cc->aux.index > 0) : + RB_DEBUG_COUNTER_INC_UNLESS(ivar_get_ic_miss_unset, vm_cc_attr_index(cc) > 0) : RB_DEBUG_COUNTER_INC_UNLESS(ivar_get_ic_miss_serial, ic->ic_serial == RCLASS_SERIAL(RBASIC(obj)->klass)))) { - st_index_t index = !is_attr ? ic->index : (cc->aux.index - 1); + st_index_t index = !is_attr ? ic->index : (vm_cc_attr_index(cc) - 1); RB_DEBUG_COUNTER_INC(ivar_get_ic_hit); @@ -1076,7 +1074,7 @@ vm_getivar(VALUE obj, ID id, IVC ic, struct rb_call_cache *cc, int is_attr) ic->ic_serial = RCLASS_SERIAL(RBASIC(obj)->klass); } else { /* call_info */ - cc->aux.index = (int)index + 1; + vm_cc_attr_index_set(cc, (int)index + 1); } if (index < numiv) { @@ -1124,7 +1122,7 @@ vm_getivar(VALUE obj, ID id, IVC ic, struct rb_call_cache *cc, int is_attr) } static inline VALUE -vm_setivar(VALUE obj, ID id, VALUE val, IVC ic, struct rb_call_cache *cc, int is_attr) +vm_setivar(VALUE obj, ID id, VALUE val, IVC ic, const struct rb_callcache *cc, int is_attr) { #if OPT_IC_FOR_IVAR rb_check_frozen_internal(obj); @@ -1135,9 +1133,9 @@ vm_setivar(VALUE obj, ID id, VALUE val, IVC ic, struct rb_call_cache *cc, int is if (LIKELY( (!is_attr && RB_DEBUG_COUNTER_INC_UNLESS(ivar_set_ic_miss_serial, ic->ic_serial == RCLASS_SERIAL(klass))) || - ( is_attr && RB_DEBUG_COUNTER_INC_UNLESS(ivar_set_ic_miss_unset, cc->aux.index > 0)))) { + ( is_attr && RB_DEBUG_COUNTER_INC_UNLESS(ivar_set_ic_miss_unset, vm_cc_attr_index(cc) > 0)))) { VALUE *ptr = ROBJECT_IVPTR(obj); - index = !is_attr ? ic->index : cc->aux.index-1; + index = !is_attr ? ic->index : vm_cc_attr_index(cc)-1; if (RB_DEBUG_COUNTER_INC_UNLESS(ivar_set_ic_miss_oorange, index < ROBJECT_NUMIV(obj))) { RB_OBJ_WRITE(obj, &ptr[index], val); @@ -1157,7 +1155,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IVC ic, struct rb_call_cache *cc, int is rb_raise(rb_eArgError, "too many instance variables"); } else { - cc->aux.index = (int)(index + 1); + vm_cc_attr_index_set(cc, (int)(index + 1)); } } /* fall through */ @@ -1440,210 +1438,199 @@ vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag) static VALUE vm_call_general(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd); -#if __has_attribute(artificial) -__attribute__((__artificial__)) -#endif -static inline vm_call_handler -calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) +static VALUE vm_mtbl_dump(VALUE klass, ID target_mid); + +static struct rb_class_cc_entries * +vm_ccs_create(VALUE klass, const rb_callable_method_entry_t *cme) { - const struct rb_callinfo *ci = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + struct rb_class_cc_entries *ccs = ALLOC(struct rb_class_cc_entries); +#if VM_CHECK_MODE > 0 + ccs->debug_sig = ~(VALUE)ccs; +#endif + ccs->capa = 4; + ccs->len = 0; + RB_OBJ_WRITE(klass, &ccs->cme, cme); + METHOD_ENTRY_CACHED_SET((rb_callable_method_entry_t *)cme); + ccs->entries = ALLOC_N(struct rb_class_cc_entries_entry, ccs->capa); + return ccs; +} - if (UNLIKELY(!me)) { - RB_DEBUG_COUNTER_INC(mc_miss_by_nome); - return vm_call_general; /* vm_call_method_nome() situation */ - } - else if (LIKELY(cc->me != me)) { - RB_DEBUG_COUNTER_INC(mc_miss_by_distinct); - return vm_call_general; /* normal cases */ - } - else if (UNLIKELY(cc->method_serial != me->def->method_serial)) { - RB_DEBUG_COUNTER_INC(mc_miss_by_refine); - return vm_call_general; /* cc->me was refined elsewhere */ - } - /* "Calling a formerly-public method, which is now privatised, with an - * explicit receiver" is the only situation we have to check here. A - * formerly-private method now publicised is an absolutely safe thing. - * Calling a private method without specifying a receiver is also safe. */ - else if ((METHOD_ENTRY_VISI(cc->me) != METHOD_VISI_PUBLIC) && - !(vm_ci_flag(ci) & VM_CALL_FCALL)) { - RB_DEBUG_COUNTER_INC(mc_miss_by_visi); - return vm_call_general; +static void +vm_ccs_push(VALUE klass, struct rb_class_cc_entries *ccs, const struct rb_callinfo *ci, const struct rb_callcache *cc) +{ + if (UNLIKELY(ccs->len == ccs->capa)) { + const int nsize = ccs->capa * 2; + struct rb_class_cc_entries_entry *nents = ALLOC_N(struct rb_class_cc_entries_entry, nsize); + ccs->capa = nsize; + MEMCPY(nents, &ccs->entries[0], struct rb_class_cc_entries_entry, ccs->len); + ruby_xfree(ccs->entries); + ccs->entries = nents; } - else { - RB_DEBUG_COUNTER_INC(mc_miss_spurious); - (void)RB_DEBUG_COUNTER_INC_IF(mc_miss_reuse_call, cc->call != vm_call_general); - return cc->call; + VM_ASSERT(ccs->len < ccs->capa); + + const int pos = ccs->len++; + RB_OBJ_WRITE(klass, &ccs->entries[pos].ci, ci); + RB_OBJ_WRITE(klass, &ccs->entries[pos].cc, cc); + + if (RB_DEBUG_COUNTER_SETMAX(ccs_maxlen, ccs->len)) { + // for tuning + // vm_mtbl_dump(klass, 0); } } -MJIT_FUNC_EXPORTED void -rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass) +#if VM_CHECK_MODE > 0 +void +rb_vm_ccs_dump(struct rb_class_cc_entries *ccs) { - const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; - - const rb_callable_method_entry_t *me = - rb_callable_method_entry(klass, vm_ci_mid(ci)); - const vm_call_handler call = calccall(cd, me); - struct rb_call_cache buf = { - GET_GLOBAL_METHOD_STATE(), - { RCLASS_SERIAL(klass) }, - me, - me ? me->def->method_serial : 0, - call, - }; - if (call != vm_call_general) { - for (int i = 0; i < numberof(cc->class_serial) - 1; i++) { - buf.class_serial[i + 1] = cc->class_serial[i]; - } + fprintf(stderr, "ccs:%p (%d,%d)\n", ccs, ccs->len, ccs->capa); + for (int i=0; ilen; i++) { + vm_ci_dump(ccs->entries[i].ci); + rp(ccs->entries[i].cc); } - MEMCPY(cc, &buf, struct rb_call_cache, 1); - VM_ASSERT(callable_method_entry_p(cc->me)); -} - -/* # Description of what `vm_cache_check_for_class_serial()` is doing ######### - * - * - Let's assume a `struct rb_call_cache` has its `class_serial` as an array - * of length 3 (typical situation for 64 bit environments): - * - * ```C - * struct rb_call_cache { - * rb_serial_t method_state; - * rb_serial_t class_serial[3]; - * rb_callable_method_entry_t *me; - * rb_method_definition_struct *def; - * vm_call_handler call; - * union { ... snip ... } aux; - * }; - * ``` - * - * - Initially, the `cc->class_serial` array is filled with zeros. - * - * - If the cache mishits, and if that was due to mc_miss_spurious situation, - * `rb_vm_search_method_slowpath()` pushes the newest class serial at the - * leftmost position of the `cc->class_serial`. - * - * ``` - * from: +--------------+-----+-----+-----+----+-----+------+-----+ - * | method_state | (x) | (y) | (z) | me | def | call | aux | - * +--------------+-----+-----+-----+----+-----+------+-----+ - * \ \ - * \ \ - * \ \ - * \ \ - * \ \ - * v v - * to: +--------------+-----+-----+-----+----+-----+------+-----+ - * | method_state | NEW | (x) | (y) | me | def | call | aux | - * +--------------+-----+-----+-----+----+-----+------+-----+ - * ^^^ - * fill RCLASS_SERIAL(klass) - * ``` - * - * - Eventually, the `cc->class_serial` is filled with a series of classes that - * share the same method entry for the same call site. - * - * - `vm_cache_check_for_class_serial()` can say that the cache now hits if - * _any_ of the class serials stored inside of `cc->class_serial` is equal to - * the given `class_serial` value. - * - * - It scans the array from left to right, looking for the expected class - * serial. If it finds that at `cc->class_serial[0]` (this branch - * probability is 98% according to @shyouhei's experiment), just returns - * true. If it reaches the end of the array without finding anything, - * returns false. This is done in the #1 loop below. - * - * - What needs to be complicated is when the class serial is found at either - * `cc->class_serial[1]` or `cc->class_serial[2]`. When that happens, its - * return value is true because `cc->me` and `cc->call` are valid. But - * `cc->aux` might be invalid. Also the found class serial is expected to - * hit next time. In this case we reorder the array and wipe out `cc->aux`. - * This is done in the #2 loop below. - * - * ``` - * from: +--------------+-----+-----+-----+----+-----+------+-----+ - * | method_state | (x) | (y) | (z) | me | def | call | aux | - * +--------------+-----+-----+-----+----+-----+------+-----+ - * \ \ | - * \ \ | - * +- \ --- \ -+ - * | \ \ - * | \ \ - * v v v - * to: +--------------+-----+-----+-----+----+-----+------+-----+ - * | method_state | (z) | (x) | (y) | me | def | call | 000 | - * +--------------+-----+-----+-----+----+-----+------+-----+ - * ^^^ - * wipe out - * ``` - * - */ -static inline bool -vm_cache_check_for_class_serial(struct rb_call_cache *cc, rb_serial_t class_serial) +} + +static int +vm_ccs_verify(struct rb_class_cc_entries *ccs, ID mid, VALUE klass) { - int i; - rb_serial_t j; + VM_ASSERT(vm_ccs_p(ccs)); + VM_ASSERT(ccs->len <= ccs->capa); - /* This is the loop #1 in above description. */ - for (i = 0; i < numberof(cc->class_serial); i++) { - j = cc->class_serial[i]; + for (int i=0; ilen; i++) { + const struct rb_callinfo *ci = ccs->entries[i].ci; + const struct rb_callcache *cc = ccs->entries[i].cc; - if (! j) { - break; - } - else if (j != class_serial) { - continue; - } - else if (! i) { - return true; + VM_ASSERT(vm_ci_p(ci)); + VM_ASSERT(vm_ci_mid(ci) == mid); + VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache)); + VM_ASSERT(vm_cc_class_check(cc, klass)); + VM_ASSERT(vm_cc_cme(cc) == ccs->cme); + } + return TRUE; +} +#endif + +#ifndef MJIT_HEADER +static const struct rb_callcache * +vm_search_cc(VALUE klass, const struct rb_callinfo *ci) +{ + ID mid = vm_ci_mid(ci); + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + struct rb_class_cc_entries *ccs = NULL; + + if (cc_tbl) { + if (rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) { + const int ccs_len = ccs->len; + VM_ASSERT(vm_ccs_verify(ccs, mid, klass)); + + if (UNLIKELY(METHOD_ENTRY_INVALIDATED(ccs->cme))) { + rb_vm_ccs_free(ccs); + rb_id_table_delete(cc_tbl, mid); + ccs = NULL; + } + else { + for (int i=0; ientries[i].ci; + const struct rb_callcache *ccs_cc = ccs->entries[i].cc; + + VM_ASSERT(vm_ci_p(ccs_ci)); + VM_ASSERT(IMEMO_TYPE_P(ccs_cc, imemo_callcache)); + + if (ccs_ci == ci) { // TODO: equality + RB_DEBUG_COUNTER_INC(cc_found_ccs); + + VM_ASSERT(vm_cc_cme(ccs_cc)->called_id == mid); + VM_ASSERT(ccs_cc->klass == klass); + VM_ASSERT(!METHOD_ENTRY_INVALIDATED(vm_cc_cme(ccs_cc))); + + return ccs_cc; + } + } + } } - else { - goto hit; + } + else { + cc_tbl = RCLASS_CC_TBL(klass) = rb_id_table_create(2); + } + + const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, mid); + + if (cme == NULL) { + // undef or not found: can't cache the information + VM_ASSERT(vm_cc_cme(vm_cc_empty()) == NULL); + return vm_cc_empty(); + } + else { + const struct rb_callcache *cc = vm_cc_new(klass, cme, vm_call_general); + METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme); + + if (ccs == NULL) { + VM_ASSERT(cc_tbl != NULL); + ccs = vm_ccs_create(klass, cme); + rb_id_table_insert(cc_tbl, mid, (VALUE)ccs); } + vm_ccs_push(klass, ccs, ci, cc); + + VM_ASSERT(vm_cc_cme(cc) != NULL); + VM_ASSERT(cme->called_id == mid); + VM_ASSERT(vm_cc_cme(cc)->called_id == mid); + return cc; } +} - RB_DEBUG_COUNTER_INC(mc_class_serial_miss); - return false; +MJIT_FUNC_EXPORTED void +rb_vm_search_method_slowpath(VALUE cd_owner, struct rb_call_data *cd, VALUE klass) +{ + const struct rb_callcache *cc = vm_search_cc(klass, cd->ci); - hit: - /* This is the loop #2 in above description. */ - for (; i > 0; i--) { - cc->class_serial[i] = cc->class_serial[i - 1]; + if (cd_owner) { + RB_OBJ_WRITE(cd_owner, &cd->cc, cc); + } + else { + cd->cc = cc; } - cc->class_serial[0] = j; - MEMZERO(&cc->aux, cc->aux, 1); /* cc->call is valid, but cc->aux might not. */ - return true; + VM_ASSERT(cc == vm_cc_empty() || cc->klass == klass); + VM_ASSERT(cc == vm_cc_empty() || callable_method_entry_p(vm_cc_cme(cc))); + VM_ASSERT(cc == vm_cc_empty() || !METHOD_ENTRY_INVALIDATED(vm_cc_cme(cc))); + VM_ASSERT(cc == vm_cc_empty() || vm_cc_cme(cc)->called_id == vm_ci_mid(cd->ci)); } +#endif static void -vm_search_method_fastpath(struct rb_call_data *cd, VALUE klass) +vm_search_method_fastpath(VALUE cd_owner, struct rb_call_data *cd, VALUE klass) { - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; #if OPT_INLINE_METHOD_CACHE - if (LIKELY(RB_DEBUG_COUNTER_INC_UNLESS(mc_global_state_miss, - GET_GLOBAL_METHOD_STATE() == cc->method_state) && - vm_cache_check_for_class_serial(cc, RCLASS_SERIAL(klass)))) { - /* cache hit! */ - VM_ASSERT(cc->call != NULL); - RB_DEBUG_COUNTER_INC(mc_inline_hit); - return; + if (LIKELY(vm_cc_class_check(cc, klass))) { + if (LIKELY(!METHOD_ENTRY_INVALIDATED(vm_cc_cme(cc)))) { + VM_ASSERT(callable_method_entry_p(vm_cc_cme(cc))); + RB_DEBUG_COUNTER_INC(mc_inline_hit); + VM_ASSERT(vm_cc_cme(cc) == NULL || // not found + (vm_ci_flag(cd->ci) & VM_CALL_SUPER) || // search_super w/ define_method + vm_cc_cme(cc)->called_id == vm_ci_mid(cd->ci)); // cme->called_id == ci->mid + return; + } + cd->cc = vm_cc_empty(); + RB_DEBUG_COUNTER_INC(mc_inline_miss_invalidated); + } + else { + RB_DEBUG_COUNTER_INC(mc_inline_miss_klass); } - RB_DEBUG_COUNTER_INC(mc_inline_miss); #endif - rb_vm_search_method_slowpath(cd, klass); + rb_vm_search_method_slowpath(cd_owner, cd, klass); + + VM_ASSERT(vm_cc_cme(cd->cc) == NULL || vm_cc_cme(cd->cc)->called_id == vm_ci_mid(cd->ci)); } static void -vm_search_method(struct rb_call_data *cd, VALUE recv) +vm_search_method(VALUE cd_owner, struct rb_call_data *cd, VALUE recv) { VALUE klass = CLASS_OF(recv); - VM_ASSERT(klass != Qfalse); VM_ASSERT(RBASIC_CLASS(klass) == 0 || rb_obj_is_kind_of(klass, rb_cClass)); - vm_search_method_fastpath(cd, klass); + + vm_search_method_fastpath(cd_owner, cd, klass); } static inline int @@ -1659,16 +1646,16 @@ check_cfunc(const rb_callable_method_entry_t *me, VALUE (*func)()) } static inline int -vm_method_cfunc_is(CALL_DATA cd, VALUE recv, VALUE (*func)()) +vm_method_cfunc_is(const rb_iseq_t *iseq, CALL_DATA cd, VALUE recv, VALUE (*func)()) { - vm_search_method(cd, recv); - return check_cfunc(cd->cc.me, func); + vm_search_method((VALUE)iseq, cd, recv); + return check_cfunc(vm_cc_cme(cd->cc), func); } static VALUE -opt_equal_fallback(VALUE recv, VALUE obj, CALL_DATA cd) +opt_equal_fallback(const rb_iseq_t *iseq, VALUE recv, VALUE obj, CALL_DATA cd) { - if (vm_method_cfunc_is(cd, recv, rb_obj_equal)) { + if (vm_method_cfunc_is(iseq, cd, recv, rb_obj_equal)) { return recv == obj ? Qtrue : Qfalse; } @@ -1728,7 +1715,7 @@ static inline #endif VALUE -opt_eq_func(VALUE recv, VALUE obj, CALL_DATA cd) +opt_eq_func(const rb_iseq_t *iseq, VALUE recv, VALUE obj, CALL_DATA cd) { switch (comparable_by_identity(recv, obj)) { case 1: @@ -1751,7 +1738,7 @@ opt_eq_func(VALUE recv, VALUE obj, CALL_DATA cd) } fallback: - return opt_equal_fallback(recv, obj, cd); + return opt_equal_fallback(iseq, recv, obj, cd); } static @@ -1781,7 +1768,7 @@ opt_eql_func(VALUE recv, VALUE obj, CALL_DATA cd) } fallback: - return opt_equal_fallback(recv, obj, cd); + return opt_equal_fallback(NULL, recv, obj, cd); } #undef BUILTIN_CLASS_P #undef EQ_UNREDEFINED_P @@ -1797,14 +1784,14 @@ rb_equal_opt(VALUE obj1, VALUE obj2) rb_gc_register_mark_object((VALUE)ci); } - struct rb_call_data cd = { .ci = ci, }; - return opt_eq_func(obj1, obj2, &cd); + struct rb_call_data cd = { .ci = ci, .cc = vm_cc_empty() }; + return opt_eq_func(NULL, obj1, obj2, &cd); } VALUE rb_eql_opt(VALUE obj1, VALUE obj2) { - struct rb_call_data cd = { .ci = vm_ci_new_id(idEqlP), }; + struct rb_call_data cd = { .ci = vm_ci_new_id(idEqlP), .cc = vm_cc_empty() }; return opt_eql_func(obj1, obj2, &cd); } @@ -1929,11 +1916,11 @@ vm_call_iseq_setup_normal_0start(rb_execution_context_t *ec, rb_control_frame_t { RB_DEBUG_COUNTER_INC(ccf_iseq_setup_0start); - struct rb_call_cache *cc = &cd->cc; - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const struct rb_callcache *cc = cd->cc; + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); int param = iseq->body->param.size; int local = iseq->body->local_table_size; - return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, 0, param, local); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), 0, param, local); } MJIT_STATIC bool @@ -2043,8 +2030,8 @@ vm_call_iseq_setup_normal_opt_start(rb_execution_context_t *ec, rb_control_frame struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_cache *cc = &cd->cc; - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const struct rb_callcache *cc = cd->cc; + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); const int lead_num = iseq->body->param.lead_num; const int opt = calling->argc - lead_num; const int opt_num = iseq->body->param.opt_num; @@ -2064,7 +2051,7 @@ vm_call_iseq_setup_normal_opt_start(rb_execution_context_t *ec, rb_control_frame } #endif - return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, opt_pc, param - delta, local); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), opt_pc, param - delta, local); } static VALUE @@ -2072,8 +2059,8 @@ vm_call_iseq_setup_tailcall_opt_start(rb_execution_context_t *ec, rb_control_fra struct rb_calling_info *calling, struct rb_call_data *cd) { - const struct rb_call_cache *cc = &cd->cc; - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const struct rb_callcache *cc = cd->cc; + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); const int lead_num = iseq->body->param.lead_num; const int opt = calling->argc - lead_num; const int opt_pc = (int)iseq->body->param.opt_table[opt]; @@ -2103,12 +2090,12 @@ vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t * struct rb_call_data *cd) { const struct rb_callinfo *ci = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; VM_ASSERT(vm_ci_flag(ci) & VM_CALL_KWARG); RB_DEBUG_COUNTER_INC(ccf_iseq_kw1); - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); const struct rb_iseq_param_keyword *kw_param = iseq->body->param.keyword; const struct rb_callinfo_kwarg *kw_arg = vm_ci_kwarg(ci); const int ci_kw_len = kw_arg->keyword_len; @@ -2122,7 +2109,7 @@ vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t * int param = iseq->body->param.size; int local = iseq->body->local_table_size; - return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, 0, param, local); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), 0, param, local); } static VALUE @@ -2131,12 +2118,12 @@ vm_call_iseq_setup_kwparm_nokwarg(rb_execution_context_t *ec, rb_control_frame_t struct rb_call_data *cd) { const struct rb_callinfo *MAYBE_UNUSED(ci) = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; VM_ASSERT((vm_ci_flag(ci) & VM_CALL_KWARG) == 0); RB_DEBUG_COUNTER_INC(ccf_iseq_kw2); - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); const struct rb_iseq_param_keyword *kw_param = iseq->body->param.keyword; VALUE * const argv = cfp->sp - calling->argc; VALUE * const klocals = argv + kw_param->bits_start - kw_param->num; @@ -2152,7 +2139,7 @@ vm_call_iseq_setup_kwparm_nokwarg(rb_execution_context_t *ec, rb_control_frame_t int param = iseq->body->param.size; int local = iseq->body->local_table_size; - return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, 0, param, local); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), 0, param, local); } static inline int @@ -2160,7 +2147,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const rb_iseq_t *iseq, VALUE *argv, int param_size, int local_size) { const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_KW_SPLAT))) { if (LIKELY(rb_simple_iseq_p(iseq))) { @@ -2172,7 +2159,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, argument_arity_error(ec, iseq, calling->argc, iseq->body->param.lead_num, iseq->body->param.lead_num); } - CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(ci, param_size, local_size), vm_call_iseq_optimizable_p(cd->ci, &cd->cc)); + CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(ci, param_size, local_size), vm_call_iseq_optimizable_p(cd->ci, cd->cc)); return 0; } else if (rb_iseq_only_optparam_p(iseq)) { @@ -2192,12 +2179,12 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_TAILCALL))) { CC_SET_FASTPATH(cc, vm_call_iseq_setup_normal_opt_start, !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && - !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); + !(METHOD_ENTRY_VISI(vm_cc_cme(cc)) == METHOD_VISI_PROTECTED)); } else { CC_SET_FASTPATH(cc, vm_call_iseq_setup_tailcall_opt_start, !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && - !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); + !(METHOD_ENTRY_VISI(vm_cc_cme(cc)) == METHOD_VISI_PROTECTED)); } /* initialize opt vars for self-references */ @@ -2225,7 +2212,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, args_setup_kw_parameters(ec, iseq, ci_kws, ci_kw_len, ci_keywords, klocals); CC_SET_FASTPATH(cc, vm_call_iseq_setup_kwparm_kwarg, - !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); + !(METHOD_ENTRY_VISI(vm_cc_cme(cc)) == METHOD_VISI_PROTECTED)); return 0; } @@ -2238,7 +2225,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, if (klocals[kw_param->num] == INT2FIX(0)) { /* copy from default_values */ CC_SET_FASTPATH(cc, vm_call_iseq_setup_kwparm_nokwarg, - !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); + !(METHOD_ENTRY_VISI(vm_cc_cme(cc)) == METHOD_VISI_PROTECTED)); } return 0; @@ -2254,11 +2241,11 @@ vm_call_iseq_setup(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct r { RB_DEBUG_COUNTER_INC(ccf_iseq_setup); - const struct rb_call_cache *cc = &cd->cc; - const rb_iseq_t *iseq = def_iseq_ptr(cc->me->def); + const struct rb_callcache *cc = cd->cc; + const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def); const int param_size = iseq->body->param.size; const int local_size = iseq->body->local_table_size; - const int opt_pc = vm_callee_setup_arg(ec, calling, cd, def_iseq_ptr(cc->me->def), cfp->sp - calling->argc, param_size, local_size); + const int opt_pc = vm_callee_setup_arg(ec, calling, cd, def_iseq_ptr(vm_cc_cme(cc)->def), cfp->sp - calling->argc, param_size, local_size); return vm_call_iseq_setup_2(ec, cfp, calling, cd, opt_pc, param_size, local_size); } @@ -2267,10 +2254,10 @@ vm_call_iseq_setup_2(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct int opt_pc, int param_size, int local_size) { const struct rb_callinfo *ci = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_TAILCALL))) { - return vm_call_iseq_setup_normal(ec, cfp, calling, cc->me, opt_pc, param_size, local_size); + return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), opt_pc, param_size, local_size); } else { return vm_call_iseq_setup_tailcall(ec, cfp, calling, cd, opt_pc); @@ -2298,10 +2285,10 @@ static inline VALUE vm_call_iseq_setup_tailcall(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd, int opt_pc) { - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; unsigned int i; VALUE *argv = cfp->sp - calling->argc; - const rb_callable_method_entry_t *me = cc->me; + const rb_callable_method_entry_t *me = vm_cc_cme(cc); const rb_iseq_t *iseq = def_iseq_ptr(me->def); VALUE *src_argv = argv; VALUE *sp_orig, *sp; @@ -2501,9 +2488,9 @@ static VALUE vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { const struct rb_callinfo *ci = cd->ci; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; VALUE val; - const rb_callable_method_entry_t *me = cc->me; + const rb_callable_method_entry_t *me = vm_cc_cme(cc); const rb_method_cfunc_t *cfunc = vm_method_cfunc_entry(me); int len = cfunc->argc; @@ -2553,20 +2540,20 @@ vm_call_cfunc(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb static VALUE vm_call_ivar(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; RB_DEBUG_COUNTER_INC(ccf_ivar); cfp->sp -= 1; - return vm_getivar(calling->recv, cc->me->def->body.attr.id, NULL, cc, TRUE); + return vm_getivar(calling->recv, vm_cc_cme(cc)->def->body.attr.id, NULL, cc, TRUE); } static VALUE vm_call_attrset(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; RB_DEBUG_COUNTER_INC(ccf_attrset); VALUE val = *(cfp->sp - 1); cfp->sp -= 2; - return vm_setivar(calling->recv, cc->me->def->body.attr.id, val, NULL, cc, 1); + return vm_setivar(calling->recv, vm_cc_cme(cc)->def->body.attr.id, val, NULL, cc, 1); } static inline VALUE @@ -2574,11 +2561,11 @@ vm_call_bmethod_body(rb_execution_context_t *ec, struct rb_calling_info *calling { rb_proc_t *proc; VALUE val; - const struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; /* control block frame */ - GetProcPtr(cc->me->def->body.bmethod.proc, proc); - val = rb_vm_invoke_bmethod(ec, proc, calling->recv, calling->argc, argv, calling->kw_splat, calling->block_handler, cc->me); + GetProcPtr(vm_cc_cme(cc)->def->body.bmethod.proc, proc); + val = rb_vm_invoke_bmethod(ec, proc, calling->recv, calling->argc, argv, calling->kw_splat, calling->block_handler, vm_cc_cme(cc)); return val; } @@ -2601,6 +2588,65 @@ vm_call_bmethod(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_c return vm_call_bmethod_body(ec, calling, cd, argv); } +static VALUE +find_defined_class_by_owner(VALUE current_class, VALUE target_owner) +{ + VALUE klass = current_class; + + /* for prepended Module, then start from cover class */ + if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN)) klass = RBASIC_CLASS(klass); + + while (RTEST(klass)) { + VALUE owner = RB_TYPE_P(klass, T_ICLASS) ? RBASIC_CLASS(klass) : klass; + if (owner == target_owner) { + return klass; + } + klass = RCLASS_SUPER(klass); + } + + return current_class; /* maybe module function */ +} + +static const rb_callable_method_entry_t * +aliased_callable_method_entry(const rb_callable_method_entry_t *me) +{ + const rb_method_entry_t *orig_me = me->def->body.alias.original_me; + const rb_callable_method_entry_t *cme; + + if (orig_me->defined_class == 0) { + VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner); + VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE)); + cme = rb_method_entry_complement_defined_class(orig_me, me->called_id, defined_class); + + if (me->def->alias_count + me->def->complemented_count == 0) { + RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme); + } + else { + rb_method_definition_t *def = + rb_method_definition_create(VM_METHOD_TYPE_ALIAS, me->def->original_id); + rb_method_definition_set((rb_method_entry_t *)me, def, (void *)cme); + } + } + else { + cme = (const rb_callable_method_entry_t *)orig_me; + } + + VM_ASSERT(callable_method_entry_p(cme)); + return cme; +} + +static VALUE +vm_call_alias(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) +{ + const rb_callable_method_entry_t *cme = aliased_callable_method_entry(vm_cc_cme(cd->cc)); + struct rb_callcache cc_body; + struct rb_call_data cd_body = { + .ci = cd->ci, + .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL), + }; + return vm_call_method_each_type(ec, cfp, calling, &cd_body); +} + static enum method_missing_reason ci_missing_reason(const struct rb_callinfo *ci) { @@ -2619,12 +2665,10 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct int i; VALUE sym; ID mid; - const struct rb_callinfo *orig_ci = orig_cd->ci; - const struct rb_call_cache *orig_cc = &orig_cd->cc; - struct rb_call_cache *cc; struct rb_call_data cd; + enum method_missing_reason missing_reason = 0; - CALLER_SETUP_ARG(reg_cfp, calling, orig_ci); + CALLER_SETUP_ARG(reg_cfp, calling, orig_cd->ci); i = calling->argc - 1; @@ -2632,9 +2676,6 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_raise(rb_eArgError, "no method name given"); } - cd.cc = *orig_cc; - cc = &cd.cc; - sym = TOPN(i); if (!(mid = rb_check_id(&sym))) { @@ -2642,12 +2683,12 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct VALUE exc = rb_make_no_method_exception(rb_eNoMethodError, 0, calling->recv, rb_long2int(calling->argc), &TOPN(i), - vm_ci_flag(orig_ci) & (VM_CALL_FCALL|VM_CALL_VCALL)); + vm_ci_flag(orig_cd->ci) & (VM_CALL_FCALL|VM_CALL_VCALL)); rb_exc_raise(exc); } TOPN(i) = rb_str_intern(sym); mid = idMethodMissing; - ec->method_missing_reason = cc->aux.method_missing_reason = ci_missing_reason(orig_ci); + missing_reason = ci_missing_reason(orig_cd->ci); } else { /* shift arguments */ @@ -2658,10 +2699,14 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct DEC_SP(1); } - CC_SET_ME(cc, rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), mid, NULL)); unsigned int new_flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); - cd.ci = vm_ci_new_runtime(mid, new_flag, 0 /* not accessed (calling->argc is used) */, vm_ci_kwarg(orig_ci)); - + cd.ci = vm_ci_new_runtime(mid, new_flag, 0 /* not accessed (calling->argc is used) */, vm_ci_kwarg(orig_cd->ci)); + struct rb_callcache cc_body; + cd.cc = vm_cc_fill(&cc_body, + Qundef, + rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), mid, NULL), + NULL); + if (missing_reason != 0) vm_cc_method_missing_reason_set(cd.cc, missing_reason); return vm_call_method(ec, reg_cfp, calling, (CALL_DATA)&cd); } @@ -2706,20 +2751,19 @@ vm_call_opt_block_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, } else { calling->recv = rb_vm_bh_to_procval(ec, block_handler); - vm_search_method(cd, calling->recv); + vm_search_method((VALUE)reg_cfp->iseq, cd, calling->recv); return vm_call_general(ec, reg_cfp, calling, cd); } } static VALUE -vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, struct rb_call_data *orig_cd) +vm_call_method_missing_body(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, + const struct rb_callinfo *orig_ci, enum method_missing_reason reason) { RB_DEBUG_COUNTER_INC(ccf_method_missing); - const struct rb_callinfo *orig_ci = orig_cd->ci; - const struct rb_call_cache *orig_cc = &orig_cd->cc; VALUE *argv = STACK_ADDR_FROM_TOP(calling->argc); - struct rb_call_data cd = *orig_cd; + struct rb_call_data cd; unsigned int argc; CALLER_SETUP_ARG(reg_cfp, calling, orig_ci); @@ -2727,8 +2771,11 @@ vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, unsigned int flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); cd.ci = vm_ci_new_runtime(idMethodMissing, flag, argc, vm_ci_kwarg(orig_ci)); - cd.cc.me = rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), - idMethodMissing, NULL); + struct rb_callcache cc_body; + cd.cc = vm_cc_fill(&cc_body, + Qundef, + rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), idMethodMissing, NULL), + vm_call_general); calling->argc = argc; @@ -2741,29 +2788,39 @@ vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, argv[0] = ID2SYM(vm_ci_mid(orig_ci)); INC_SP(1); - ec->method_missing_reason = orig_cc->aux.method_missing_reason; + ec->method_missing_reason = reason; return vm_call_method(ec, reg_cfp, calling, &cd); } +static VALUE +vm_call_method_missing(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, + struct rb_calling_info *calling, struct rb_call_data *cd) +{ + return vm_call_method_missing_body(ec, reg_cfp, calling, cd->ci, vm_cc_cmethod_missing_reason(cd->cc)); +} + static const rb_callable_method_entry_t *refined_method_callable_without_refinement(const rb_callable_method_entry_t *me); static VALUE vm_call_zsuper(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd, VALUE klass) { - RB_DEBUG_COUNTER_INC(ccf_method_missing); - - const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; klass = RCLASS_SUPER(klass); - CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, vm_ci_mid(ci)) : NULL); - if (!cc->me) { + const rb_callable_method_entry_t *cme = klass ? rb_callable_method_entry(klass, vm_ci_mid(cd->ci)) : NULL; + if (cme == NULL) { return vm_call_method_nome(ec, cfp, calling, cd); } - if (cc->me->def->type == VM_METHOD_TYPE_REFINED && - cc->me->def->body.refined.orig_me) { - CC_SET_ME(cc, refined_method_callable_without_refinement(cc->me)); + if (cme->def->type == VM_METHOD_TYPE_REFINED && + cme->def->body.refined.orig_me) { + cme = refined_method_callable_without_refinement(cme); } - return vm_call_method_each_type(ec, cfp, calling, cd); + + struct rb_callcache cc_body; + struct rb_call_data cd_body = { + .ci = cd->ci, + .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL), + }; + return vm_call_method_each_type(ec, cfp, calling, &cd_body); + } static inline VALUE @@ -2795,53 +2852,6 @@ current_method_entry(const rb_execution_context_t *ec, rb_control_frame_t *cfp) return cfp; } -static VALUE -find_defined_class_by_owner(VALUE current_class, VALUE target_owner) -{ - VALUE klass = current_class; - - /* for prepended Module, then start from cover class */ - if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN)) klass = RBASIC_CLASS(klass); - - while (RTEST(klass)) { - VALUE owner = RB_TYPE_P(klass, T_ICLASS) ? RBASIC_CLASS(klass) : klass; - if (owner == target_owner) { - return klass; - } - klass = RCLASS_SUPER(klass); - } - - return current_class; /* maybe module function */ -} - -static const rb_callable_method_entry_t * -aliased_callable_method_entry(const rb_callable_method_entry_t *me) -{ - const rb_method_entry_t *orig_me = me->def->body.alias.original_me; - const rb_callable_method_entry_t *cme; - - if (orig_me->defined_class == 0) { - VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner); - VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE)); - cme = rb_method_entry_complement_defined_class(orig_me, me->called_id, defined_class); - - if (me->def->alias_count + me->def->complemented_count == 0) { - RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme); - } - else { - rb_method_definition_t *def = - rb_method_definition_create(VM_METHOD_TYPE_ALIAS, me->def->original_id); - rb_method_definition_set((rb_method_entry_t *)me, def, (void *)cme); - } - } - else { - cme = (const rb_callable_method_entry_t *)orig_me; - } - - VM_ASSERT(callable_method_entry_p(cme)); - return cme; -} - static const rb_callable_method_entry_t * refined_method_callable_without_refinement(const rb_callable_method_entry_t *me) { @@ -2865,57 +2875,78 @@ refined_method_callable_without_refinement(const rb_callable_method_entry_t *me) return cme; } -static int -search_refined_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, ID mid, struct rb_call_cache *cc) +static const rb_callable_method_entry_t * +search_refined_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_call_data *cd) { + ID mid = vm_ci_mid(cd->ci); const rb_cref_t *cref = vm_get_cref(cfp->ep); + const struct rb_callcache * const cc = cd->cc; + const rb_callable_method_entry_t *cme = vm_cc_cme(cc); for (; cref; cref = CREF_NEXT(cref)) { - const VALUE refinement = find_refinement(CREF_REFINEMENTS(cref), cc->me->owner); + const VALUE refinement = find_refinement(CREF_REFINEMENTS(cref), vm_cc_cme(cc)->owner); if (NIL_P(refinement)) continue; const rb_callable_method_entry_t *const ref_me = rb_callable_method_entry(refinement, mid); if (ref_me) { - if (cc->call == vm_call_super_method) { + if (vm_cc_call(cc) == vm_call_super_method) { const rb_control_frame_t *top_cfp = current_method_entry(ec, cfp); const rb_callable_method_entry_t *top_me = rb_vm_frame_method_entry(top_cfp); if (top_me && rb_method_definition_eq(ref_me->def, top_me->def)) { continue; } } - if (cc->me->def->type != VM_METHOD_TYPE_REFINED || - cc->me->def != ref_me->def) { - CC_SET_ME(cc, ref_me); + + if (cme->def->type != VM_METHOD_TYPE_REFINED || + cme->def != ref_me->def) { + cme = ref_me; } if (ref_me->def->type != VM_METHOD_TYPE_REFINED) { - return TRUE; + return cme; } } else { - CC_SET_ME(cc, NULL); - return FALSE; + return NULL; } } - if (cc->me->def->body.refined.orig_me) { - CC_SET_ME(cc, refined_method_callable_without_refinement(cc->me)); + if (vm_cc_cme(cc)->def->body.refined.orig_me) { + return refined_method_callable_without_refinement(vm_cc_cme(cc)); } else { - VALUE klass = RCLASS_SUPER(cc->me->defined_class); - CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, mid) : NULL); + VALUE klass = RCLASS_SUPER(vm_cc_cme(cc)->defined_class); + const rb_callable_method_entry_t *cme = klass ? rb_callable_method_entry(klass, mid) : NULL; + return cme; + } +} + +static VALUE +vm_call_refined(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) +{ + const rb_callable_method_entry_t *cme = search_refined_method(ec, cfp, cd); + + if (cme != NULL) { + struct rb_callcache cc_body; + struct rb_call_data cd_body = { + .ci = cd->ci, + .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL), + }; + return vm_call_method(ec, cfp, calling, &cd_body); + } + else { + return vm_call_method_nome(ec, cfp, calling, cd); } - return TRUE; } static VALUE vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; - switch (cc->me->def->type) { + switch (vm_cc_cme(cc)->def->type) { case VM_METHOD_TYPE_ISEQ: CC_SET_FASTPATH(cc, vm_call_iseq_setup, TRUE); return vm_call_iseq_setup(ec, cfp, calling, cd); @@ -2930,20 +2961,20 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); rb_check_arity(calling->argc, 1, 1); - cc->aux.index = 0; - CC_SET_FASTPATH(cc, vm_call_attrset, !((vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) || (vm_ci_flag(ci) & VM_CALL_KWARG))); + vm_cc_attr_index_set(cc, 0); + CC_SET_FASTPATH(cc, vm_call_attrset, !(vm_ci_flag(ci) & (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT | VM_CALL_KWARG))); return vm_call_attrset(ec, cfp, calling, cd); case VM_METHOD_TYPE_IVAR: CALLER_SETUP_ARG(cfp, calling, ci); CALLER_REMOVE_EMPTY_KW_SPLAT(cfp, calling, ci); rb_check_arity(calling->argc, 0, 0); - cc->aux.index = 0; - CC_SET_FASTPATH(cc, vm_call_ivar, !(vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT)); + vm_cc_attr_index_set(cc, 0); + CC_SET_FASTPATH(cc, vm_call_ivar, !(vm_ci_flag(ci) & (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT))); return vm_call_ivar(ec, cfp, calling, cd); case VM_METHOD_TYPE_MISSING: - cc->aux.method_missing_reason = 0; + vm_cc_method_missing_reason_set(cc, 0); CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); return vm_call_method_missing(ec, cfp, calling, cd); @@ -2952,12 +2983,11 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st return vm_call_bmethod(ec, cfp, calling, cd); case VM_METHOD_TYPE_ALIAS: - CC_SET_ME(cc, aliased_callable_method_entry(cc->me)); - VM_ASSERT(cc->me != NULL); - return vm_call_method_each_type(ec, cfp, calling, cd); + CC_SET_FASTPATH(cc, vm_call_alias, TRUE); + return vm_call_alias(ec, cfp, calling, cd); case VM_METHOD_TYPE_OPTIMIZED: - switch (cc->me->def->body.optimize_type) { + switch (vm_cc_cme(cc)->def->body.optimize_type) { case OPTIMIZED_METHOD_TYPE_SEND: CC_SET_FASTPATH(cc, vm_call_opt_send, TRUE); return vm_call_opt_send(ec, cfp, calling, cd); @@ -2969,23 +2999,22 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st return vm_call_opt_block_call(ec, cfp, calling, cd); default: rb_bug("vm_call_method: unsupported optimized method type (%d)", - cc->me->def->body.optimize_type); + vm_cc_cme(cc)->def->body.optimize_type); } case VM_METHOD_TYPE_UNDEF: break; case VM_METHOD_TYPE_ZSUPER: - return vm_call_zsuper(ec, cfp, calling, cd, RCLASS_ORIGIN(cc->me->defined_class)); + return vm_call_zsuper(ec, cfp, calling, cd, RCLASS_ORIGIN(vm_cc_cme(cc)->defined_class)); case VM_METHOD_TYPE_REFINED: - if (search_refined_method(ec, cfp, vm_ci_mid(ci), cc)) - return vm_call_method(ec, cfp, calling, cd); - else - return vm_call_method_nome(ec, cfp, calling, cd); + // CC_SET_FASTPATH(cc, vm_call_refined, TRUE); + // should not set FASTPATH because vm_call_refined check cc->call. + return vm_call_refined(ec, cfp, calling, cd); } - rb_bug("vm_call_method: unsupported method type (%d)", cc->me->def->type); + rb_bug("vm_call_method: unsupported method type (%d)", vm_cc_cme(cc)->def->type); } NORETURN(static void vm_raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE obj, int call_status)); @@ -2995,7 +3024,6 @@ vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct { /* method missing */ const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; const int stat = ci_missing_reason(ci); if (vm_ci_mid(ci) == idMethodMissing) { @@ -3004,9 +3032,7 @@ vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct vm_raise_method_missing(ec, calling->argc, argv, calling->recv, stat); } else { - cc->aux.method_missing_reason = stat; - CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); - return vm_call_method_missing(ec, cfp, calling, cd); + return vm_call_method_missing_body(ec, cfp, calling, cd->ci, stat); } } @@ -3014,12 +3040,12 @@ static inline VALUE vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { const struct rb_callinfo *ci = cd->ci; - struct rb_call_cache *cc = &cd->cc; + const struct rb_callcache *cc = cd->cc; - VM_ASSERT(callable_method_entry_p(cc->me)); + VM_ASSERT(callable_method_entry_p(vm_cc_cme(cc))); - if (cc->me != NULL) { - switch (METHOD_ENTRY_VISI(cc->me)) { + if (vm_cc_cme(cc) != NULL) { + switch (METHOD_ENTRY_VISI(vm_cc_cme(cc))) { case METHOD_VISI_PUBLIC: /* likely */ return vm_call_method_each_type(ec, cfp, calling, cd); @@ -3028,7 +3054,7 @@ vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca enum method_missing_reason stat = MISSING_PRIVATE; if (vm_ci_flag(ci) & VM_CALL_VCALL) stat |= MISSING_VCALL; - cc->aux.method_missing_reason = stat; + vm_cc_method_missing_reason_set(cc, stat); CC_SET_FASTPATH(cc, vm_call_method_missing, TRUE); return vm_call_method_missing(ec, cfp, calling, cd); } @@ -3036,15 +3062,19 @@ vm_call_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca case METHOD_VISI_PROTECTED: if (!(vm_ci_flag(ci) & VM_CALL_OPT_SEND)) { - if (!rb_obj_is_kind_of(cfp->self, cc->me->defined_class)) { - cc->aux.method_missing_reason = MISSING_PROTECTED; + if (!rb_obj_is_kind_of(cfp->self, vm_cc_cme(cc)->defined_class)) { + vm_cc_method_missing_reason_set(cc, MISSING_PROTECTED); return vm_call_method_missing(ec, cfp, calling, cd); } else { /* caching method info to dummy cc */ - VM_ASSERT(cc->me != NULL); - struct rb_call_data cd_entry = *cd; - return vm_call_method_each_type(ec, cfp, calling, &cd_entry); + VM_ASSERT(vm_cc_cme(cc) != NULL); + struct rb_callcache cc_body; + struct rb_call_data cd_body = { + .ci = ci, + .cc = vm_cc_fill(&cc_body, cc->klass, vm_cc_cme(cc), vm_cc_call(cc)), + }; + return vm_call_method_each_type(ec, cfp, calling, &cd_body); } } return vm_call_method_each_type(ec, cfp, calling, cd); @@ -3071,8 +3101,8 @@ vm_call_super_method(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, st RB_DEBUG_COUNTER_INC(ccf_super_method); /* this check is required to distinguish with other functions. */ - const struct rb_call_cache *cc = &cd->cc; - if (cc->call != vm_call_super_method) rb_bug("bug"); + const struct rb_callcache *cc = cd->cc; + if (vm_cc_call(cc) != vm_call_super_method) rb_bug("bug"); return vm_call_method(ec, reg_cfp, calling, cd); } @@ -3145,30 +3175,34 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c if (!klass) { /* bound instance method of module */ - cd->cc.aux.method_missing_reason = MISSING_SUPER; - CC_SET_FASTPATH(&cd->cc, vm_call_method_missing, TRUE); + const struct rb_callcache *cc = vm_cc_new(klass, NULL, vm_call_method_missing); + RB_OBJ_WRITE(reg_cfp->iseq, &cd->cc, cc); } else { - struct rb_call_cache *cc = &cd->cc; -#if OPT_INLINE_METHOD_CACHE - /* Unlike normal method search, we only consider the first class - * serial. Since we're testing defined_class rather than receiver, - * there's only one valid "warm" value. */ - if (LIKELY(RB_DEBUG_COUNTER_INC_UNLESS(mc_global_state_miss, - GET_GLOBAL_METHOD_STATE() == cc->method_state) && - cc->class_serial[0] == RCLASS_SERIAL(klass)) && - cc->me && vm_ci_mid(cd->ci) == cc->me->called_id) { - VM_ASSERT(cc->call != NULL); - RB_DEBUG_COUNTER_INC(mc_inline_hit); - return; - } -#endif - - CC_SET_ME(cc, rb_callable_method_entry(klass, vm_ci_mid(cd->ci))); - CC_SET_FASTPATH(cc, vm_call_super_method, TRUE); - - cc->method_state = GET_GLOBAL_METHOD_STATE(); - cc->class_serial[0] = RCLASS_SERIAL(klass); + vm_search_method_fastpath((VALUE)reg_cfp->iseq, cd, klass); + const rb_callable_method_entry_t *cached_cme = vm_cc_cme(cd->cc); + + ID mid = vm_ci_mid(cd->ci); + + // define_method can cache for different method id + if (cached_cme == NULL) { + // temporary CC. revisit it + static const struct rb_callcache *empty_cc_for_super = NULL; + if (empty_cc_for_super == NULL) { + empty_cc_for_super = vm_cc_new(0, NULL, vm_call_super_method); + FL_SET_RAW(empty_cc_for_super, VM_CALLCACHE_UNMARKABLE); + rb_gc_register_mark_object((VALUE)empty_cc_for_super); + } + RB_OBJ_WRITE(reg_cfp->iseq, &cd->cc, empty_cc_for_super); + } + else if (cached_cme->called_id != mid) { + const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, mid); + const struct rb_callcache *cc = vm_cc_new(klass, cme, vm_call_super_method); + RB_OBJ_WRITE(reg_cfp->iseq, &cd->cc, cc); + } + else { + vm_cc_call_set(cd->cc, vm_call_super_method); + } } } @@ -3958,7 +3992,7 @@ vm_search_method_wrap( struct rb_call_data *cd, VALUE recv) { - vm_search_method(cd, recv); + vm_search_method((VALUE)reg_cfp->iseq, cd, recv); } static void @@ -3999,9 +4033,8 @@ vm_sendish( struct rb_call_data *cd, VALUE recv)) { - const struct rb_callinfo *ci = cd->ci; - CALL_CACHE cc = &cd->cc; VALUE val; + const struct rb_callinfo *ci = cd->ci; int argc = vm_ci_argc(ci); VALUE recv = TOPN(argc); struct rb_calling_info calling; @@ -4012,8 +4045,9 @@ vm_sendish( calling.argc = argc; method_explorer(GET_CFP(), cd, recv); + const struct rb_callcache *cc = cd->cc; - val = cc->call(ec, GET_CFP(), &calling, cd); + val = vm_cc_call(cc)(ec, GET_CFP(), &calling, cd); if (val != Qundef) { return val; /* CFUNC normal return */ @@ -4356,10 +4390,10 @@ vm_opt_mod(VALUE recv, VALUE obj) } static VALUE -vm_opt_neq(CALL_DATA cd, CALL_DATA cd_eq, VALUE recv, VALUE obj) +vm_opt_neq(const rb_iseq_t *iseq, CALL_DATA cd, CALL_DATA cd_eq, VALUE recv, VALUE obj) { - if (vm_method_cfunc_is(cd, recv, rb_obj_not_equal)) { - VALUE val = opt_eq_func(recv, obj, cd_eq); + if (vm_method_cfunc_is(iseq, cd, recv, rb_obj_not_equal)) { + VALUE val = opt_eq_func(iseq, recv, obj, cd_eq); if (val != Qundef) { return RTEST(val) ? Qfalse : Qtrue; @@ -4630,13 +4664,13 @@ vm_opt_empty_p(VALUE recv) VALUE rb_false(VALUE obj); static VALUE -vm_opt_nil_p(CALL_DATA cd, VALUE recv) +vm_opt_nil_p(const rb_iseq_t *iseq, CALL_DATA cd, VALUE recv) { if (recv == Qnil && BASIC_OP_UNREDEFINED_P(BOP_NIL_P, NIL_REDEFINED_OP_FLAG)) { return Qtrue; } - else if (vm_method_cfunc_is(cd, recv, rb_false)) { + else if (vm_method_cfunc_is(iseq, cd, recv, rb_false)) { return Qfalse; } else { @@ -4692,9 +4726,9 @@ vm_opt_succ(VALUE recv) } static VALUE -vm_opt_not(CALL_DATA cd, VALUE recv) +vm_opt_not(const rb_iseq_t *iseq, CALL_DATA cd, VALUE recv) { - if (vm_method_cfunc_is(cd, recv, rb_obj_not)) { + if (vm_method_cfunc_is(iseq, cd, recv, rb_obj_not)) { return RTEST(recv) ? Qfalse : Qtrue; } else { diff --git a/vm_insnhelper.h b/vm_insnhelper.h index e9337b82a8ac42..07b38ea9d9b9f6 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -121,20 +121,13 @@ enum vm_regan_acttype { */ static inline void -CC_SET_FASTPATH(CALL_CACHE cc, vm_call_handler func, bool enabled) +CC_SET_FASTPATH(const struct rb_callcache *cc, vm_call_handler func, bool enabled) { if (LIKELY(enabled)) { - cc->call = func; + vm_cc_call_set(cc, func); } } -static inline void -CC_SET_ME(CALL_CACHE cc, const rb_callable_method_entry_t *me) -{ - cc->me = me; - cc->method_serial = me ? me->def->method_serial : 0; -} - #define GET_BLOCK_HANDLER() (GET_LEP()[VM_ENV_DATA_INDEX_SPECVAL]) /**********************************************************/ @@ -258,10 +251,10 @@ THROW_DATA_CONSUMED_SET(struct vm_throw_data *obj) /* If this returns true, an optimized function returned by `vm_call_iseq_setup_func` can be used as a fastpath. */ static bool -vm_call_iseq_optimizable_p(const struct rb_callinfo *ci, const struct rb_call_cache *cc) +vm_call_iseq_optimizable_p(const struct rb_callinfo *ci, const struct rb_callcache *cc) { return !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && - !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED); + !(METHOD_ENTRY_VISI(vm_cc_cme(cc)) == METHOD_VISI_PROTECTED); } #endif /* RUBY_INSNHELPER_H */ diff --git a/vm_method.c b/vm_method.c index 4a82cc3e82fda3..123298c6afe9ca 100644 --- a/vm_method.c +++ b/vm_method.c @@ -6,25 +6,6 @@ #define METHOD_DEBUG 0 -#if OPT_GLOBAL_METHOD_CACHE -#ifndef GLOBAL_METHOD_CACHE_SIZE -#define GLOBAL_METHOD_CACHE_SIZE 0x800 -#endif -#define LSB_ONLY(x) ((x) & ~((x) - 1)) -#define POWER_OF_2_P(x) ((x) == LSB_ONLY(x)) -#if !POWER_OF_2_P(GLOBAL_METHOD_CACHE_SIZE) -# error GLOBAL_METHOD_CACHE_SIZE must be power of 2 -#endif -#ifndef GLOBAL_METHOD_CACHE_MASK -#define GLOBAL_METHOD_CACHE_MASK (GLOBAL_METHOD_CACHE_SIZE-1) -#endif - -#define GLOBAL_METHOD_CACHE_KEY(c,m) ((((c)>>3)^(m))&(global_method_cache.mask)) -#define GLOBAL_METHOD_CACHE(c,m) (global_method_cache.entries + GLOBAL_METHOD_CACHE_KEY(c,m)) -#else -#define GLOBAL_METHOD_CACHE(c,m) (rb_bug("global method cache disabled improperly"), NULL) -#endif - static int vm_redefinition_check_flag(VALUE klass); static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass); @@ -37,50 +18,108 @@ static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VAL #define singleton_undefined idSingleton_method_undefined #define attached id__attached__ -struct cache_entry { - rb_serial_t method_state; - rb_serial_t class_serial; - ID mid; - rb_method_entry_t* me; - VALUE defined_class; -}; - -#if OPT_GLOBAL_METHOD_CACHE -static struct { - unsigned int size; - unsigned int mask; - struct cache_entry *entries; -} global_method_cache = { - GLOBAL_METHOD_CACHE_SIZE, - GLOBAL_METHOD_CACHE_MASK, -}; -#endif - #define ruby_running (GET_VM()->running) /* int ruby_running = 0; */ -static void -rb_class_clear_method_cache(VALUE klass, VALUE arg) +static enum rb_id_table_iterator_result +vm_ccs_dump_i(ID mid, VALUE val, void *data) { - rb_serial_t old_serial = *(rb_serial_t *)arg; - if (RCLASS_SERIAL(klass) > old_serial) { - return; + const struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)val; + fprintf(stderr, " | %s (%d) ", rb_id2name(mid), ccs->len); + rp(ccs->cme); + + for (int i=0; ilen; i++) { + fprintf(stderr, " | [%d] ", i); vm_ci_dump(ccs->entries[i].ci); + rp_m( " | ", ccs->entries[i].cc); } - mjit_remove_class_serial(RCLASS_SERIAL(klass)); - RCLASS_SERIAL(klass) = rb_next_class_serial(); + return ID_TABLE_CONTINUE; +} - if (BUILTIN_TYPE(klass) == T_ICLASS) { - struct rb_id_table *table = RCLASS_CALLABLE_M_TBL(klass); - if (table) { - rb_id_table_clear(table); - } +static void +vm_ccs_dump(VALUE klass, ID target_mid) +{ + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + if (cc_tbl) { + const struct rb_class_cc_entries *ccs; + if (target_mid) { + if (rb_id_table_lookup(cc_tbl, target_mid, (VALUE *)&ccs)) { + fprintf(stderr, " [CCTB] %p\n", cc_tbl); + vm_ccs_dump_i(target_mid, (VALUE)ccs, NULL); + } + } + else { + fprintf(stderr, " [CCTB] %p\n", cc_tbl); + rb_id_table_foreach(cc_tbl, vm_ccs_dump_i, (void *)target_mid); + } } - else { - VM_ASSERT(RCLASS_CALLABLE_M_TBL(klass) == 0); +} + +static enum rb_id_table_iterator_result +vm_cme_dump_i(ID mid, VALUE val, void *data) +{ + ID target_mid = (ID)data; + if (target_mid == 0 || mid == target_mid) { + rp_m(" > ", val); } + return ID_TABLE_CONTINUE; +} - rb_class_foreach_subclass(klass, rb_class_clear_method_cache, arg); +static VALUE +vm_mtbl_dump(VALUE klass, ID target_mid) +{ + fprintf(stderr, "# vm_mtbl\n"); + while (klass) { + rp_m(" -> ", klass); + rb_method_entry_t *me; + + if (RCLASS_M_TBL(klass)) { + if (target_mid != 0) { + if (rb_id_table_lookup(RCLASS_M_TBL(klass), target_mid, (VALUE *)&me)) { + rp_m(" [MTBL] ", me); + } + } + else { + fprintf(stderr, " ## RCLASS_M_TBL (%p)\n", RCLASS_M_TBL(klass)); + rb_id_table_foreach(RCLASS_M_TBL(klass), vm_cme_dump_i, NULL); + } + } + else { + fprintf(stderr, " MTBL: NULL\n"); + } + if (RCLASS_CALLABLE_M_TBL(klass)) { + if (target_mid != 0) { + if (rb_id_table_lookup(RCLASS_CALLABLE_M_TBL(klass), target_mid, (VALUE *)&me)) { + rp_m(" [CM**] ", me); + } + } + else { + fprintf(stderr, " ## RCLASS_CALLABLE_M_TBL\n"); + rb_id_table_foreach(RCLASS_CALLABLE_M_TBL(klass), vm_cme_dump_i, NULL); + } + } + if (RCLASS_CC_TBL(klass)) { + vm_ccs_dump(klass, target_mid); + } + klass = RCLASS_SUPER(klass); + } + return Qnil; +} + +void +rb_vm_mtbl_dump(const char *msg, VALUE klass, ID target_mid) +{ + fprintf(stderr, "[%s] ", msg); + vm_mtbl_dump(klass, target_mid); +} + +static inline void +vm_me_invalidate_cache(rb_callable_method_entry_t *cme) +{ + VM_ASSERT(IMEMO_TYPE_P(cme, imemo_ment)); + VM_ASSERT(callable_method_entry_p(cme)); + METHOD_ENTRY_INVALIDATED_SET(cme); + RB_DEBUG_COUNTER_INC(cc_cme_invalidate); } void @@ -89,31 +128,131 @@ rb_clear_constant_cache(void) INC_GLOBAL_CONSTANT_STATE(); } -void -rb_clear_method_cache_by_class(VALUE klass) +static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def); +const rb_method_entry_t * rb_method_entry_clone(const rb_method_entry_t *src_me); +static const rb_callable_method_entry_t *copmplemented_callable_method_entry(VALUE klass, ID id); + +static void +clear_method_cache_by_id_in_class(VALUE klass, ID mid) { - if (klass && klass != Qundef) { - int global = klass == rb_cBasicObject || klass == rb_cObject || klass == rb_mKernel; + VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS)); - RUBY_DTRACE_HOOK(METHOD_CACHE_CLEAR, (global ? "global" : rb_class2name(klass))); + if (LIKELY(RCLASS_EXT(klass)->subclasses == NULL)) { + // no subclasses + // check only current class - if (global) { - INC_GLOBAL_METHOD_STATE(); - } - else { - rb_serial_t old_serial = PREV_CLASS_SERIAL(); - rb_class_clear_method_cache(klass, (VALUE)&old_serial); - } + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + struct rb_class_cc_entries *ccs; + + // invalidate CCs + if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) { + rb_vm_ccs_free(ccs); + rb_id_table_delete(cc_tbl, mid); + RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_ccs); + } + + // remove from callable_m_tbl, if exists + struct rb_id_table *cm_tbl; + if ((cm_tbl = RCLASS_CALLABLE_M_TBL(klass)) != NULL) { + rb_id_table_delete(cm_tbl, mid); + RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_callable); + } + RB_DEBUG_COUNTER_INC(cc_invalidate_leaf); } + else { + const rb_callable_method_entry_t *cme = copmplemented_callable_method_entry(klass, mid); + + if (cme) { + // invalidate cme if found to invalidate the inline method cache. + + if (METHOD_ENTRY_CACHED(cme)) { + // invalidate cc by invalidating cc->cme + VALUE owner = cme->owner; + rb_callable_method_entry_t *new_cme = + (rb_callable_method_entry_t *)rb_method_entry_clone((const rb_method_entry_t *)cme); + struct rb_id_table *mtbl = RCLASS_M_TBL(RCLASS_ORIGIN(owner)); + rb_id_table_insert(mtbl, mid, (VALUE)new_cme); + RB_OBJ_WRITTEN(owner, cme, new_cme); + vm_me_invalidate_cache((rb_callable_method_entry_t *)cme); + + RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme); + } - if (klass == rb_mKernel) { - rb_subclass_entry_t *entry = RCLASS_EXT(klass)->subclasses; + // invalidate complement tbl + if (METHOD_ENTRY_COMPLEMENTED(cme)) { + VALUE defined_class = cme->defined_class; + struct rb_id_table *cm_tbl = RCLASS_CALLABLE_M_TBL(defined_class); + VM_ASSERT(cm_tbl != NULL); + int r = rb_id_table_delete(cm_tbl, mid); + VM_ASSERT(r == TRUE); (void)r; + RB_DEBUG_COUNTER_INC(cc_invalidate_tree_callable); + } - for (; entry != NULL; entry = entry->next) { - struct rb_id_table *table = RCLASS_CALLABLE_M_TBL(entry->klass); - if (table)rb_id_table_clear(table); - } + RB_DEBUG_COUNTER_INC(cc_invalidate_tree); + } + } +} + +static void +clear_iclass_method_cache_by_id(VALUE iclass, VALUE d) +{ + VM_ASSERT(RB_TYPE_P(iclass, T_ICLASS)); + ID mid = (ID)d; + clear_method_cache_by_id_in_class(iclass, mid); +} + +static void +clear_iclass_method_cache_by_id_for_refinements(VALUE klass, VALUE d) +{ + if (RB_TYPE_P(klass, T_ICLASS)) { + ID mid = (ID)d; + clear_method_cache_by_id_in_class(klass, mid); + } +} + +void +rb_clear_method_cache(VALUE klass_or_module, ID mid) +{ + if (RB_TYPE_P(klass_or_module, T_MODULE)) { + VALUE module = klass_or_module; // alias + + if (FL_TEST(module, RMODULE_IS_REFINEMENT)) { + VALUE refined_class = rb_refinement_module_get_refined_class(module); + rb_clear_method_cache(refined_class, mid); + rb_class_foreach_subclass(refined_class, clear_iclass_method_cache_by_id_for_refinements, mid); + } + rb_class_foreach_subclass(module, clear_iclass_method_cache_by_id, mid); + } + else { + clear_method_cache_by_id_in_class(klass_or_module, mid); + } +} + +// gc.c +void rb_cc_table_free(VALUE klass); + +static int +invalidate_all_cc(void *vstart, void *vend, size_t stride, void *data) +{ + VALUE v = (VALUE)vstart; + for (; v != (VALUE)vend; v += stride) { + if (RBASIC(v)->flags) { // liveness check + if (RB_TYPE_P(v, T_CLASS) || + RB_TYPE_P(v, T_ICLASS)) { + if (RCLASS_CC_TBL(v)) { + rb_cc_table_free(v); + } + RCLASS_CC_TBL(v) = NULL; + } + } } + return 0; // continue to iteration +} + +void +rb_clear_method_cache_all(void) +{ + rb_objspace_each_objects(invalidate_all_cc, NULL); } VALUE @@ -138,7 +277,7 @@ rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_me rb_method_cfunc_t opt; opt.func = func; opt.argc = argc; - rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, visi); + rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, visi); } else { rb_define_notimplement_method_id(klass, mid, visi); @@ -161,8 +300,13 @@ rb_method_definition_release(rb_method_definition_t *def, int complemented) xfree(def); } else { - if (complemented) def->complemented_count--; - else if (def->alias_count > 0) def->alias_count--; + if (complemented) { + VM_ASSERT(def->complemented_count > 0); + def->complemented_count--; + } + else if (def->alias_count > 0) { + def->alias_count--; + } if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d,%d->%d (dec)\n", (void *)def, rb_id2name(def->original_id), alias_count, def->alias_count, complemented_count, def->complemented_count); @@ -179,20 +323,6 @@ rb_free_method_entry(const rb_method_entry_t *me) static inline rb_method_entry_t *search_method(VALUE klass, ID id, VALUE *defined_class_ptr); extern int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); -static inline rb_method_entry_t * -lookup_method_table(VALUE klass, ID id) -{ - st_data_t body; - struct rb_id_table *m_tbl = RCLASS_M_TBL(klass); - - if (rb_id_table_lookup(m_tbl, id, &body)) { - return (rb_method_entry_t *) body; - } - else { - return 0; - } -} - static VALUE (*call_cfunc_invoker_func(int argc))(VALUE recv, int argc, const VALUE *, VALUE (*func)(ANYARGS)) { @@ -406,7 +536,11 @@ const rb_method_entry_t * rb_method_entry_clone(const rb_method_entry_t *src_me) { rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, src_me->defined_class, - method_definition_addref(src_me->def)); + method_definition_addref(src_me->def)); + if (METHOD_ENTRY_COMPLEMENTED(src_me)) { + method_definition_addref_complement(src_me->def); + } + METHOD_ENTRY_FLAGS_COPY(me, src_me); return me; } @@ -487,6 +621,20 @@ make_method_entry_refined(VALUE owner, rb_method_entry_t *me) } } +static inline rb_method_entry_t * +lookup_method_table(VALUE klass, ID id) +{ + st_data_t body; + struct rb_id_table *m_tbl = RCLASS_M_TBL(klass); + + if (rb_id_table_lookup(m_tbl, id, &body)) { + return (rb_method_entry_t *) body; + } + else { + return 0; + } +} + void rb_add_refined_method_entry(VALUE refined_class, ID mid) { @@ -494,7 +642,7 @@ rb_add_refined_method_entry(VALUE refined_class, ID mid) if (me) { make_method_entry_refined(refined_class, me); - rb_clear_method_cache_by_class(refined_class); + rb_clear_method_cache(refined_class, mid); } else { rb_add_method(refined_class, mid, VM_METHOD_TYPE_REFINED, 0, METHOD_VISI_PUBLIC); @@ -615,7 +763,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil if (def == NULL) def = rb_method_definition_create(type, original_id); rb_method_definition_set(me, def, opts); - rb_clear_method_cache_by_class(klass); + rb_clear_method_cache(klass, mid); /* check mid */ if (klass == rb_cObject) { @@ -737,149 +885,169 @@ rb_get_alloc_func(VALUE klass) return 0; } +const rb_method_entry_t * +rb_method_entry_at(VALUE klass, ID id) +{ + return lookup_method_table(klass, id); +} + static inline rb_method_entry_t* search_method(VALUE klass, ID id, VALUE *defined_class_ptr) { rb_method_entry_t *me; + RB_DEBUG_COUNTER_INC(mc_search); + for (; klass; klass = RCLASS_SUPER(klass)) { RB_DEBUG_COUNTER_INC(mc_search_super); - if ((me = lookup_method_table(klass, id)) != 0) break; + if ((me = lookup_method_table(klass, id)) != 0) { + break; + } } - if (defined_class_ptr) - *defined_class_ptr = klass; + if (defined_class_ptr) *defined_class_ptr = klass; + + if (me == NULL) RB_DEBUG_COUNTER_INC(mc_search_notfound); + + VM_ASSERT(me == NULL || !METHOD_ENTRY_INVALIDATED(me)); return me; } -const rb_method_entry_t * -rb_method_entry_at(VALUE klass, ID id) +static rb_method_entry_t * +search_method_protect(VALUE klass, ID id, VALUE *defined_class_ptr) { - return lookup_method_table(klass, id); + rb_method_entry_t *me = search_method(klass, id, defined_class_ptr); + + if (!UNDEFINED_METHOD_ENTRY_P(me)) { + return me; + } + else { + return NULL; + } } -/* - * search method entry without the method cache. - * - * if you need method entry with method cache (normal case), use - * rb_method_entry() simply. - */ -static rb_method_entry_t * -method_entry_get_without_cache(VALUE klass, ID id, - VALUE *defined_class_ptr) +MJIT_FUNC_EXPORTED const rb_method_entry_t * +rb_method_entry(VALUE klass, ID id) { - VALUE defined_class; - rb_method_entry_t *me = search_method(klass, id, &defined_class); + return search_method(klass, id, NULL); +} - if (ruby_running) { - if (OPT_GLOBAL_METHOD_CACHE) { - struct cache_entry *ent; - ent = GLOBAL_METHOD_CACHE(klass, id); - ent->class_serial = RCLASS_SERIAL(klass); - ent->method_state = GET_GLOBAL_METHOD_STATE(); - ent->defined_class = defined_class; - ent->mid = id; +static inline const rb_callable_method_entry_t * +prepare_callable_method_entry(VALUE defined_class, ID id, const rb_method_entry_t * const me, int create) +{ + struct rb_id_table *mtbl; + const rb_callable_method_entry_t *cme; - if (UNDEFINED_METHOD_ENTRY_P(me)) { - me = ent->me = NULL; - } - else { - ent->me = me; - } - } - else if (UNDEFINED_METHOD_ENTRY_P(me)) { - me = NULL; - } + if (me) { + if (me->defined_class == 0) { + RB_DEBUG_COUNTER_INC(mc_cme_complement); + VM_ASSERT(RB_TYPE_P(defined_class, T_ICLASS) || RB_TYPE_P(defined_class, T_MODULE)); + VM_ASSERT(me->defined_class == 0); + + mtbl = RCLASS_CALLABLE_M_TBL(defined_class); + + if (mtbl && rb_id_table_lookup(mtbl, id, (VALUE *)&cme)) { + RB_DEBUG_COUNTER_INC(mc_cme_complement_hit); + VM_ASSERT(callable_method_entry_p(cme)); + VM_ASSERT(!METHOD_ENTRY_INVALIDATED(cme)); + } + else if (create) { + if (!mtbl) { + mtbl = RCLASS_EXT(defined_class)->callable_m_tbl = rb_id_table_create(0); + } + cme = rb_method_entry_complement_defined_class(me, me->called_id, defined_class); + rb_id_table_insert(mtbl, id, (VALUE)cme); + VM_ASSERT(callable_method_entry_p(cme)); + } + else { + return NULL; + } + } + else { + cme = (const rb_callable_method_entry_t *)me; + VM_ASSERT(callable_method_entry_p(cme)); + VM_ASSERT(!METHOD_ENTRY_INVALIDATED(cme)); + } + return cme; } - else if (UNDEFINED_METHOD_ENTRY_P(me)) { - me = NULL; + else { + return NULL; } +} - if (defined_class_ptr) - *defined_class_ptr = defined_class; - return me; +static const rb_callable_method_entry_t * +copmplemented_callable_method_entry(VALUE klass, ID id) +{ + VALUE defined_class; + rb_method_entry_t *me = search_method_protect(klass, id, &defined_class); + return prepare_callable_method_entry(defined_class, id, me, FALSE); } -static void -verify_method_cache(VALUE klass, ID id, VALUE defined_class, rb_method_entry_t *me) +static const rb_callable_method_entry_t * +cached_callable_method_entry(VALUE klass, ID mid) { - if (!VM_DEBUG_VERIFY_METHOD_CACHE) return; - VALUE actual_defined_class; - rb_method_entry_t *actual_me = - method_entry_get_without_cache(klass, id, &actual_defined_class); + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + struct rb_class_cc_entries *ccs; - if (me != actual_me || defined_class != actual_defined_class) { - rb_bug("method cache verification failed"); + if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) { + VM_ASSERT(vm_ccs_p(ccs)); + + if (LIKELY(!METHOD_ENTRY_INVALIDATED(ccs->cme))) { + VM_ASSERT(ccs->cme->called_id == mid); + RB_DEBUG_COUNTER_INC(ccs_found); + return ccs->cme; + } + else { + rb_vm_ccs_free(ccs); + rb_id_table_delete(cc_tbl, mid); + } } + return NULL; } -static rb_method_entry_t * -method_entry_get(VALUE klass, ID id, VALUE *defined_class_ptr) +static void +cache_callable_method_entry(VALUE klass, ID mid, const rb_callable_method_entry_t *cme) { - struct cache_entry *ent; - if (!OPT_GLOBAL_METHOD_CACHE) goto nocache; - ent = GLOBAL_METHOD_CACHE(klass, id); - if (ent->method_state == GET_GLOBAL_METHOD_STATE() && - ent->class_serial == RCLASS_SERIAL(klass) && - ent->mid == id) { - verify_method_cache(klass, id, ent->defined_class, ent->me); - if (defined_class_ptr) *defined_class_ptr = ent->defined_class; - RB_DEBUG_COUNTER_INC(mc_global_hit); - return ent->me; - } + struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); + struct rb_class_cc_entries *ccs; - nocache: - RB_DEBUG_COUNTER_INC(mc_global_miss); - return method_entry_get_without_cache(klass, id, defined_class_ptr); -} + if (!cc_tbl) { + cc_tbl = RCLASS_CC_TBL(klass) = rb_id_table_create(2); + } -MJIT_FUNC_EXPORTED const rb_method_entry_t * -rb_method_entry(VALUE klass, ID id) -{ - return method_entry_get(klass, id, NULL); + if (rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) { + VM_ASSERT(ccs->cme == cme); + } + else { + ccs = vm_ccs_create(klass, cme); + rb_id_table_insert(cc_tbl, mid, (VALUE)ccs); + } } static const rb_callable_method_entry_t * -prepare_callable_method_entry(VALUE defined_class, ID id, const rb_method_entry_t *me) +callable_method_entry(VALUE klass, ID mid, VALUE *defined_class_ptr) { - struct rb_id_table *mtbl; - const rb_callable_method_entry_t *cme; + VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS)); + const rb_callable_method_entry_t *cme = cached_callable_method_entry(klass, mid); - if (me && me->defined_class == 0) { - RB_DEBUG_COUNTER_INC(mc_cme_complement); - VM_ASSERT(RB_TYPE_P(defined_class, T_ICLASS) || RB_TYPE_P(defined_class, T_MODULE)); - VM_ASSERT(me->defined_class == 0); - - mtbl = RCLASS_CALLABLE_M_TBL(defined_class); - - if (mtbl && rb_id_table_lookup(mtbl, id, (VALUE *)&me)) { - RB_DEBUG_COUNTER_INC(mc_cme_complement_hit); - cme = (rb_callable_method_entry_t *)me; - VM_ASSERT(callable_method_entry_p(cme)); - } - else { - if (!mtbl) { - mtbl = RCLASS_EXT(defined_class)->callable_m_tbl = rb_id_table_create(0); - } - cme = rb_method_entry_complement_defined_class(me, me->called_id, defined_class); - rb_id_table_insert(mtbl, id, (VALUE)cme); - VM_ASSERT(callable_method_entry_p(cme)); - } + if (cme) { + if (defined_class_ptr != NULL) *defined_class_ptr = cme->defined_class; } else { - cme = (const rb_callable_method_entry_t *)me; - VM_ASSERT(callable_method_entry_p(cme)); + VALUE defined_class; + rb_method_entry_t *me = search_method_protect(klass, mid, &defined_class); + if (defined_class_ptr) *defined_class_ptr = defined_class; + cme = prepare_callable_method_entry(defined_class, mid, me, TRUE); + if (cme) cache_callable_method_entry(klass, mid, cme); } return cme; } MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * -rb_callable_method_entry(VALUE klass, ID id) +rb_callable_method_entry(VALUE klass, ID mid) { - VALUE defined_class; - rb_method_entry_t *me = method_entry_get(klass, id, &defined_class); - return prepare_callable_method_entry(defined_class, id, me); + return callable_method_entry(klass, mid, NULL); } static const rb_method_entry_t *resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr); @@ -887,7 +1055,7 @@ static const rb_method_entry_t *resolve_refined_method(VALUE refinements, const static const rb_method_entry_t * method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE *defined_class_ptr) { - const rb_method_entry_t *me = method_entry_get(klass, id, defined_class_ptr); + const rb_method_entry_t *me = search_method_protect(klass, id, defined_class_ptr); if (me) { if (me->def->type == VM_METHOD_TYPE_REFINED) { @@ -916,9 +1084,15 @@ rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; - const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, dcp); - return prepare_callable_method_entry(*dcp, id, me); + const rb_callable_method_entry_t *cme = callable_method_entry(klass, id, defined_class_ptr); + if (cme == NULL || cme->def->type != VM_METHOD_TYPE_REFINED) { + return cme; + } + else { + VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; + const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, dcp); + return prepare_callable_method_entry(*dcp, id, me, TRUE); + } } const rb_method_entry_t * @@ -932,7 +1106,7 @@ rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_ { VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, FALSE, dcp); - return prepare_callable_method_entry(*dcp, id, me); + return prepare_callable_method_entry(*dcp, id, me, TRUE); } static const rb_method_entry_t * @@ -945,7 +1119,7 @@ resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *de refinement = find_refinement(refinements, me->owner); if (!NIL_P(refinement)) { - tmp_me = method_entry_get(refinement, me->called_id, defined_class_ptr); + tmp_me = search_method_protect(refinement, me->called_id, defined_class_ptr); if (tmp_me && tmp_me->def->type != VM_METHOD_TYPE_REFINED) { return tmp_me; @@ -963,7 +1137,7 @@ resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *de return 0; } - me = method_entry_get(super, me->called_id, defined_class_ptr); + me = search_method_protect(super, me->called_id, defined_class_ptr); } return me; } @@ -1010,10 +1184,10 @@ remove_method(VALUE klass, ID mid) klass, ID2SYM(mid)); } + rb_clear_method_cache(klass, mid); rb_id_table_delete(RCLASS_M_TBL(klass), mid); rb_vm_check_redefinition_opt_method(me, klass); - rb_clear_method_cache_by_class(klass); if (me->def->type == VM_METHOD_TYPE_REFINED) { rb_add_refined_method_entry(klass, mid); @@ -1069,6 +1243,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi) VALUE origin_class = RCLASS_ORIGIN(klass); me = search_method(origin_class, name, &defined_class); + if (!me && RB_TYPE_P(klass, T_MODULE)) { me = search_method(rb_cObject, name, &defined_class); } @@ -1087,7 +1262,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi) if (me->def->type == VM_METHOD_TYPE_REFINED && me->def->body.refined.orig_me) { METHOD_ENTRY_VISI_SET((rb_method_entry_t *)me->def->body.refined.orig_me, visi); } - rb_clear_method_cache_by_class(klass); + rb_clear_method_cache(klass, name); } else { rb_add_method(klass, name, VM_METHOD_TYPE_ZSUPER, 0, visi); @@ -1110,8 +1285,8 @@ rb_method_boundp(VALUE klass, ID id, int ex) me = rb_method_entry_without_refinements(klass, id, NULL); } - if (me != 0) { - if ((ex & ~BOUND_RESPONDS) && + if (me != NULL) { + if ((ex & ~BOUND_RESPONDS) && ((METHOD_ENTRY_VISI(me) == METHOD_VISI_PRIVATE) || ((ex & BOUND_RESPONDS) && (METHOD_ENTRY_VISI(me) == METHOD_VISI_PROTECTED)))) { return 0; @@ -1593,6 +1768,7 @@ rb_alias(VALUE klass, ID alias_name, ID original_name) again: orig_me = search_method(klass, original_name, &defined_class); + if (orig_me && orig_me->def->type == VM_METHOD_TYPE_REFINED) { orig_me = rb_resolve_refined_method(Qnil, orig_me); } @@ -1841,7 +2017,7 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module) !me->def->body.iseq.iseqptr->body->param.flags.has_kw && !me->def->body.iseq.iseqptr->body->param.flags.has_kwrest) { me->def->body.iseq.iseqptr->body->param.flags.ruby2_keywords = 1; - rb_clear_method_cache_by_class(module); + rb_clear_method_cache(module, name); } else { rb_warn("Skipping set of ruby2_keywords flag for %s (method accepts keywords or method does not accept argument splat)", rb_id2name(name)); @@ -1860,7 +2036,7 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module) !iseq->body->param.flags.has_kw && !iseq->body->param.flags.has_kwrest) { iseq->body->param.flags.ruby2_keywords = 1; - rb_clear_method_cache_by_class(module); + rb_clear_method_cache(module, name); } else { rb_warn("Skipping set of ruby2_keywords flag for %s (method accepts keywords or method does not accept argument splat)", rb_id2name(name)); @@ -2061,10 +2237,10 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) int rb_method_basic_definition_p(VALUE klass, ID id) { - const rb_method_entry_t *me; + const rb_callable_method_entry_t *cme; if (!klass) return TRUE; /* hidden object cannot be overridden */ - me = rb_method_entry(klass, id); - return (me && METHOD_ENTRY_BASIC(me)) ? TRUE : FALSE; + cme = rb_callable_method_entry(klass, id); + return (cme && METHOD_ENTRY_BASIC(cme)) ? TRUE : FALSE; } #ifdef __GNUC__ #pragma pop_macro("rb_method_basic_definition_p") @@ -2072,10 +2248,8 @@ rb_method_basic_definition_p(VALUE klass, ID id) static VALUE call_method_entry(rb_execution_context_t *ec, VALUE defined_class, VALUE obj, ID id, - const rb_method_entry_t *me, int argc, const VALUE *argv, int kw_splat) + const rb_callable_method_entry_t *cme, int argc, const VALUE *argv, int kw_splat) { - const rb_callable_method_entry_t *cme = - prepare_callable_method_entry(defined_class, id, me); VALUE passed_block_handler = vm_passed_block_handler(ec); VALUE result = rb_vm_call_kw(ec, obj, id, argc, argv, cme, kw_splat); vm_passed_block_handler_set(ec, passed_block_handler); @@ -2088,13 +2262,12 @@ basic_obj_respond_to_missing(rb_execution_context_t *ec, VALUE klass, VALUE obj, { VALUE defined_class, args[2]; const ID rtmid = idRespond_to_missing; - const rb_method_entry_t *const me = - method_entry_get(klass, rtmid, &defined_class); + const rb_callable_method_entry_t *const cme = callable_method_entry(klass, rtmid, &defined_class); - if (!me || METHOD_ENTRY_BASIC(me)) return Qundef; + if (!cme || METHOD_ENTRY_BASIC(cme)) return Qundef; args[0] = mid; args[1] = priv; - return call_method_entry(ec, defined_class, obj, rtmid, me, 2, args, RB_NO_KEYWORDS); + return call_method_entry(ec, defined_class, obj, rtmid, cme, 2, args, RB_NO_KEYWORDS); } static inline int @@ -2120,11 +2293,10 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri { VALUE defined_class; const ID resid = idRespond_to; - const rb_method_entry_t *const me = - method_entry_get(klass, resid, &defined_class); + const rb_callable_method_entry_t *const cme = callable_method_entry(klass, resid, &defined_class); - if (!me) return -1; - if (METHOD_ENTRY_BASIC(me)) { + if (!cme) return -1; + if (METHOD_ENTRY_BASIC(cme)) { return -1; } else { @@ -2135,7 +2307,7 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri args[0] = ID2SYM(id); args[1] = Qtrue; if (priv) { - argc = rb_method_entry_arity(me); + argc = rb_method_entry_arity((const rb_method_entry_t *)cme); if (argc > 2) { rb_raise(rb_eArgError, "respond_to? must accept 1 or 2 arguments (requires %d)", @@ -2145,7 +2317,7 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri argc = 2; } else if (!NIL_P(ruby_verbose)) { - VALUE location = rb_method_entry_location(me); + VALUE location = rb_method_entry_location((const rb_method_entry_t *)cme); rb_warn("%"PRIsVALUE"%c""respond_to?(:%"PRIsVALUE") uses" " the deprecated method signature, which takes one parameter", (FL_TEST(klass, FL_SINGLETON) ? obj : klass), @@ -2161,7 +2333,7 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri } } } - result = call_method_entry(ec, defined_class, obj, resid, me, argc, args, RB_NO_KEYWORDS); + result = call_method_entry(ec, defined_class, obj, resid, cme, argc, args, RB_NO_KEYWORDS); return RTEST(result); } } @@ -2246,25 +2418,7 @@ obj_respond_to_missing(VALUE obj, VALUE mid, VALUE priv) void Init_Method(void) { - if (!OPT_GLOBAL_METHOD_CACHE) return; - char *ptr = getenv("RUBY_GLOBAL_METHOD_CACHE_SIZE"); - int val; - - if (ptr != NULL && (val = atoi(ptr)) > 0) { - if ((val & (val - 1)) == 0) { /* ensure val is a power of 2 */ - global_method_cache.size = val; - global_method_cache.mask = val - 1; - } - else { - fprintf(stderr, "RUBY_GLOBAL_METHOD_CACHE_SIZE was set to %d but ignored because the value is not a power of 2.\n", val); - } - } - - global_method_cache.entries = (struct cache_entry *)calloc(global_method_cache.size, sizeof(struct cache_entry)); - if (global_method_cache.entries == NULL) { - fprintf(stderr, "[FATAL] failed to allocate memory\n"); - exit(EXIT_FAILURE); - } + // } void From d7984d0f543f59a66657eea20993be1d14df71d5 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 22 Feb 2020 09:59:23 +0900 Subject: [PATCH 832/878] * remove trailing spaces. [ci skip] --- test/ruby/test_gc.rb | 2 +- vm_callinfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index 9442041ee57cc9..77f5d8caaaea19 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -96,7 +96,7 @@ def test_stat ObjectSpace.count_objects(count) # repeat same methods invocation for cache object creation. GC.stat(stat) - ObjectSpace.count_objects(count) + ObjectSpace.count_objects(count) assert_equal(count[:TOTAL]-count[:FREE], stat[:heap_live_slots]) assert_equal(count[:FREE], stat[:heap_free_slots]) diff --git a/vm_callinfo.h b/vm_callinfo.h index 32b0131fa1c7fd..9b170bb29717f9 100644 --- a/vm_callinfo.h +++ b/vm_callinfo.h @@ -225,7 +225,7 @@ typedef VALUE (*vm_call_handler)( // imemo_callcache struct rb_callcache { - const VALUE flags; + const VALUE flags; /* inline cache: key */ const VALUE klass; // should not mark it because klass can not be free'd From da310356874ae30f793911223562ece2449a05e7 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 19 Feb 2020 08:11:32 -0600 Subject: [PATCH 833/878] test/readline - allow ENV control of test class creation In ruby/ruby, the tests run on both readline & reline by creating four test classes: ``` TestReadline TestReadlineHistory TestRelineAsReadline TestRelineAsReadlineHistory ``` Reline inports the test files and uses them in its CI. Adding the ENV control allows it to only run the `TestRelineAsReadline` classes. --- test/readline/test_readline.rb | 4 ++-- test/readline/test_readline_history.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 5e1f1385ee6b44..0d0eb04dc65469 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -784,7 +784,7 @@ def setup use_ext_readline super end -end if defined?(ReadlineSo) +end if defined?(ReadlineSo) && ENV["TEST_READLINE_OR_RELINE"] != "Reline" class TestRelineAsReadline < Test::Unit::TestCase include BasetestReadline @@ -801,4 +801,4 @@ def get_default_internal_encoding super end end -end if defined?(Reline) +end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline" diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 98fef655e10e18..f4e93fa1b6c4a6 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -260,6 +260,7 @@ def setup super end end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY) && + ENV["TEST_READLINE_OR_RELINE"] != "Reline" && ( begin ReadlineSo::HISTORY.clear @@ -283,4 +284,4 @@ def get_default_internal_encoding super end end -end if defined?(Reline) +end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline" From af12e38675a2cd927855079709d42666dd7bbf9c Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Fri, 21 Feb 2020 19:25:54 -0600 Subject: [PATCH 834/878] More ENV rdoc [ci skip] --- hash.c | 177 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 116 insertions(+), 61 deletions(-) diff --git a/hash.c b/hash.c index 10923f67ff1f4c..9c723a0efd9a0e 100644 --- a/hash.c +++ b/hash.c @@ -4877,7 +4877,7 @@ env_delete(VALUE name) * ENV['foo'] = '0' * ENV.delete('foo') { |name| fail 'ignored' } # => "0" * Raises an exception if +name+ is invalid. - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. + * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]. */ static VALUE env_delete_m(VALUE obj, VALUE name) @@ -4900,7 +4900,7 @@ env_delete_m(VALUE obj, VALUE name) * ENV.clear * ENV['foo'] # => nil * Raises an exception if +name+ is invalid. - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. + * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]. */ static VALUE rb_f_getenv(VALUE obj, VALUE name) @@ -4938,7 +4938,7 @@ rb_f_getenv(VALUE obj, VALUE name) * and neither default value nor block is given: * ENV.fetch('foo') # Raises KeyError (key not found: "foo") * Raises an exception if +name+ is invalid. - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. + * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]. */ static VALUE env_fetch(int argc, VALUE *argv, VALUE _) @@ -5206,7 +5206,7 @@ ruby_unsetenv(const char *name) /* * call-seq: - * ENV[name] = value -> value + * ENV[name] = value -> value * ENV.store(name, value) -> value * * ENV.store is an alias for ENV.[]=. @@ -5301,7 +5301,7 @@ env_keys(void) /* * call-seq: - * ENV.keys -> array + * ENV.keys -> array of names * * Returns all variable names in an Array: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5339,7 +5339,7 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj) /* * call-seq: * ENV.each_key { |name| block } -> ENV - * ENV.each_key -> enumerator + * ENV.each_key -> an_enumerator * * Yields each environment variable name: * ENV.replace('foo' => '0', 'bar' => '1') # => ENV @@ -5388,7 +5388,7 @@ env_values(void) /* * call-seq: - * ENV.values -> array + * ENV.values -> array of values * * Returns all environment variable values in an Array: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5409,7 +5409,7 @@ env_f_values(VALUE _) /* * call-seq: * ENV.each_value { |value| block } -> ENV - * ENV.each_value -> enumerator + * ENV.each_value -> an_enumerator * * Yields each environment variable value: * ENV.replace('foo' => '0', 'bar' => '1') # => ENV @@ -5440,9 +5440,9 @@ env_each_value(VALUE ehash) /* * call-seq: * ENV.each { |name, value| block } -> ENV - * ENV.each -> enumerator + * ENV.each -> an_enumerator * ENV.each_pair { |name, value| block } -> ENV - * ENV.each_pair -> enumerator + * ENV.each_pair -> an_enumerator * * Yields each environment variable name and its value as a 2-element Array: * h = {} @@ -5492,7 +5492,7 @@ env_each_pair(VALUE ehash) /* * call-seq: * ENV.reject! { |name, value| block } -> ENV or nil - * ENV.reject! -> enumerator + * ENV.reject! -> an_enumerator * * Similar to ENV.delete_if, but returns +nil+ if no changes were made. * @@ -5538,7 +5538,7 @@ env_reject_bang(VALUE ehash) /* * call-seq: * ENV.delete_if { |name, value| block } -> ENV - * ENV.delete_if -> enumerator + * ENV.delete_if -> an_enumerator * * Yields each environment variable name and its value as a 2-element Array, * deleting each environment variable for which the block returns a truthy value, @@ -5565,7 +5565,7 @@ env_delete_if(VALUE ehash) /* * call-seq: - * ENV.values_at(*names) -> array + * ENV.values_at(*names) -> array of values * * Returns an Array containing the environment variable values associated with * the given names: @@ -5596,10 +5596,10 @@ env_values_at(int argc, VALUE *argv, VALUE _) /* * call-seq: - * ENV.select { |name, value| block } -> hash - * ENV.select -> enumerator - * ENV.filter { |name, value| block } -> hash - * ENV.filter -> enumerator + * ENV.select { |name, value| block } -> hash of name/value pairs + * ENV.select -> an_enumerator + * ENV.filter { |name, value| block } -> hash of name/value pairs + * ENV.filter -> an_enumerator * * ENV.filter is an alias for ENV.select. * @@ -5642,9 +5642,9 @@ env_select(VALUE ehash) /* * call-seq: * ENV.select! { |name, value| block } -> ENV or nil - * ENV.select! -> enumerator + * ENV.select! -> an_enumerator * ENV.filter! { |name, value| block } -> ENV or nil - * ENV.filter! -> enumerator + * ENV.filter! -> an_enumerator * * ENV.filter! is an alias for ENV.select!. * @@ -5703,7 +5703,7 @@ env_select_bang(VALUE ehash) /* * call-seq: * ENV.keep_if { |name, value| block } -> ENV - * ENV.keep_if -> enumerator + * ENV.keep_if -> an_enumerator * * Yields each environment variable name and its value as a 2-element Array, * deleting each environment variable for which the block returns +false+ or +nil+, @@ -5727,12 +5727,16 @@ env_keep_if(VALUE ehash) } /* - * call-seq: - * ENV.slice(*keys) -> a_hash - * - * Returns a hash containing only the given keys from ENV and their values. - * - * ENV.slice("TERM","HOME") #=> {"TERM"=>"xterm-256color", "HOME"=>"/Users/rhc"} + * call-seq: + * ENV.slice(*names) -> hash of name/value pairs + * + * Returns a Hash of the given ENV names and their corresponding values: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2', 'bat' => '3') + * ENV.slice('foo', 'baz') # => {"foo"=>"0", "baz"=>"2"} + * ENV.slice('baz', 'foo') # => {"baz"=>"2", "foo"=>"0"} + * Raises an exception if any of the +names+ is invalid + * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]): + * ENV.slice('foo', 'bar', :bat) # Raises TypeError (no implicit conversion of Symbol into String) */ static VALUE env_slice(int argc, VALUE *argv, VALUE _) @@ -5803,7 +5807,7 @@ env_to_s(VALUE _) /* * call-seq: - * ENV.inspect -> string + * ENV.inspect -> a_string * * Returns the contents of the environment as a String: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5840,7 +5844,7 @@ env_inspect(VALUE _) /* * call-seq: - * ENV.to_a -> array + * ENV.to_a -> array of 2-element arrays * * Returns the contents of ENV as an Array of 2-element Arrays, * each of which is a name/value pair: @@ -5886,8 +5890,8 @@ env_none(VALUE _) /* * call-seq: - * ENV.length -> integer - * ENV.size -> integer + * ENV.length -> an_integer + * ENV.size -> an_integer * * Returns the count of environment variables: * ENV.replace('foo' => '0', 'bar' => '1') @@ -5968,7 +5972,7 @@ env_has_key(VALUE env, VALUE key) /* * call-seq: - * ENV.assoc(name) -> array or nil + * ENV.assoc(name) -> [name, value] or nil * * Returns a 2-element Array containing the name and value of the environment variable * for +name+ if it exists: @@ -6000,7 +6004,7 @@ env_assoc(VALUE env, VALUE key) /* * call-seq: - * ENV.value?(value) -> true or false + * ENV.value?(value) -> true or false * ENV.has_value?(value) -> true or false * * Returns +true+ if +value+ is the value for some environment variable name, +false+ otherwise: @@ -6035,7 +6039,7 @@ env_has_value(VALUE dmy, VALUE obj) /* * call-seq: - * ENV.rassoc(value) + * ENV.rassoc(value) -> [name, value] or nil * * Returns a 2-element Array containing the name and value of the * *first* *found* environment variable that has value +value+, if one @@ -6091,7 +6095,7 @@ env_rassoc(VALUE dmy, VALUE obj) * ENV.key('2') # => nil * Raises an exception if +value+ is invalid: * ENV.key(Object.new) # raises TypeError (no implicit conversion of Object into String) - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. + * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]. */ static VALUE env_key(VALUE dmy, VALUE value) @@ -6119,7 +6123,7 @@ env_key(VALUE dmy, VALUE value) /* * call-seq: - * ENV.index(value) -> key + * ENV.index(value) -> name * * Deprecated method that is equivalent to ENV.key. */ @@ -6152,7 +6156,7 @@ env_to_hash(void) /* * call-seq: - * ENV.to_hash -> hash + * ENV.to_hash -> hash of name/value pairs * * Returns a Hash containing all name/value pairs from ENV: * ENV.replace('foo' => '0', 'bar' => '1') @@ -6167,11 +6171,21 @@ env_f_to_hash(VALUE _) /* * call-seq: - * ENV.to_h -> hash - * ENV.to_h {|name, value| block } -> hash - * - * Creates a hash with a copy of the environment variables. + * ENV.to_h -> hash of name/value pairs + * ENV.to_h {|name, value| block } -> hash of name/value pairs * + * With no block, returns a Hash containing all name/value pairs from ENV: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.to_h # => {"bar"=>"1", "foo"=>"0"} + * With a block, returns a Hash whose items are determined by the block. + * Each name/value pair in ENV is yielded to the block. + * The block must return a 2-element Array (name/value pair) + * that is added to the return Hash as a key and value: + * ENV.to_h { |name, value| [name.to_sym, value.to_i] } # => {:bar=>1, :foo=>0} + * Raises an exception if the block does not return an Array: + * ENV.to_h { |name, value| name } # Raises TypeError (wrong element type String (expected array)) + * Raises an exception if the block returns an Array of the wrong size: + * ENV.to_h { |name, value| [name] } # Raises ArgumentError (element has wrong array length (expected 2, was 1)) */ static VALUE env_to_h(VALUE _) @@ -6185,11 +6199,18 @@ env_to_h(VALUE _) /* * call-seq: - * ENV.reject { |name, value| block } -> hash - * ENV.reject -> enumerator + * ENV.reject { |name, value| block } -> hash of name/value pairs + * ENV.reject -> an_enumerator * - * Same as ENV.delete_if, but works on (and returns) a copy of the - * environment. + * Yields each environment variable name and its value as a 2-element Array. + * Returns a Hash whose items are determined by the block. + * When the block returns a truthy value, the name/value pair is added to the return Hash; + * otherwise the pair is ignored: + * ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2') + * ENV.reject { |name, value| name.start_with?('b') } # => {"foo"=>"0"} + * Returns an Enumerator if no block given: + * e = ENV.reject + * e.each { |name, value| name.start_with?('b') } # => {"foo"=>"0"} */ static VALUE env_reject(VALUE _) @@ -6199,10 +6220,10 @@ env_reject(VALUE _) /* * call-seq: - * ENV.freeze -> raises TypeError + * ENV.freeze * - * Ruby does not allow ENV to be frozen, so calling ENV.freeze - * raises TypeError. + * Raises an exception: + * ENV.freeze # Raises TypeError (cannot freeze ENV) */ static VALUE env_freeze(VALUE self) @@ -6250,10 +6271,18 @@ env_shift(VALUE _) /* * call-seq: - * ENV.invert -> hash + * ENV.invert -> hash of value/name pairs * - * Returns a new hash created by using environment variable names as values - * and values as names. + * Returns a Hash whose keys are the ENV values, + * and whose values are the corresponding ENV names: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.invert # => {"1"=>"bar", "0"=>"foo"} + * For a duplicate ENV value, overwrites the hash entry: + * ENV.replace('foo' => '0', 'bar' => '0') + * ENV.invert # => {"0"=>"foo"} + * Note that the order of the ENV processing is OS-dependent, + * which means that the order of overwriting is also OS-dependent. + * See {About Ordering}[#class-ENV-label-About+Ordering]. */ static VALUE env_invert(VALUE _) @@ -6283,8 +6312,11 @@ env_replace_i(VALUE key, VALUE val, VALUE keys) * ENV.replace('foo' => '0', 'bar' => '1') # => ENV * ENV.to_hash # => {"bar"=>"1", "foo"=>"0"} * - * Raises an exception if a name or value is invalid. - * See {Invalid Names and Values}[#class-ENV-label-Invalid-Names+and+Values]. + * Raises an exception if a name or value is invalid + * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]): + * ENV.replace('foo' => '0', :bar => '1') # Raises TypeError (no implicit conversion of Symbol into String) + * ENV.replace('foo' => '0', 'bar' => 1) # Raises TypeError (no implicit conversion of Integer into String) + * ENV.to_hash # => {"bar"=>"1", "foo"=>"0"} */ static VALUE env_replace(VALUE env, VALUE hash) @@ -6324,15 +6356,38 @@ env_update_block_i(VALUE key, VALUE val, VALUE _) /* * call-seq: - * ENV.update(hash) -> ENV - * ENV.update(hash) { |name, old_value, new_value| block } -> ENV - * ENV.merge!(hash) -> ENV - * ENV.merge!(hash) { |name, old_value, new_value| block } -> ENV - * - * Adds the contents of +hash+ to the environment variables. If no block is - * specified entries with duplicate keys are overwritten, otherwise the value - * of each duplicate name is determined by calling the block with the key, its - * value from the environment and its value from the hash. + * ENV.update(hash) -> ENV + * ENV.update(hash) { |name, env_val, hash_val| block } -> ENV + * ENV.merge!(hash) -> ENV + * ENV.merge!(hash) { |name, env_val, hash_val| block } -> ENV + * + * ENV.update is an alias for ENV.merge!. + * + * Adds to ENV each key/value pair in the given +hash+; returns ENV: + * ENV.replace('foo' => '0', 'bar' => '1') + * ENV.merge!('baz' => '2', 'bat' => '3') # => {"bar"=>"1", "bat"=>"3", "baz"=>"2", "foo"=>"0"} + * Deletes the ENV entry for a hash value that is +nil+: + * ENV.merge!('baz' => nil, 'bat' => nil) # => {"bar"=>"1", "foo"=>"0"} + * For an already-existing name, if no block given, overwrites the ENV value: + * ENV.merge!('foo' => '4') # => {"bar"=>"1", "foo"=>"4"} + * For an already-existing name, if block given, + * yields the name, its ENV value, and its hash value; + * the block's return value becomes the new name: + * ENV.merge!('foo' => '5') { |name, env_val, hash_val | env_val + hash_val } # => {"bar"=>"1", "foo"=>"45"} + * Raises an exception if a name or value is invalid + * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]); + * ENV.merge!('foo' => '6', :bar => '7', 'baz' => '9') # Raises TypeError (no implicit conversion of Symbol into String) + * ENV # => {"bar"=>"1", "baz"=>"2", "foo"=>"6"} + * ENV.merge!('foo' => '7', 'bar' => 8, 'baz' => '9') + * ENV # => {"bar"=>"1", "baz"=>"2", "foo"=>"7"} TypeError (no implicit conversion of Integer into String) + * Raises an exception if the block returns an invalid name: + * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]): + * ENV.merge!('bat' => '8', 'foo' => '9') { |name, env_val, hash_val | 10 } # Raises TypeError (no implicit conversion of Integer into String) + * ENV # => {"bar"=>"1", "bat"=>"8", "baz"=>"2", "foo"=>"75"} + * + * Note that for the exceptions above, + * hash pairs preceding an invalid name or value are processed normally; + * those following are ignored. */ static VALUE env_update(VALUE env, VALUE hash) From 31748e69c84894ac8f042a67d1320db8593c9ce1 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sat, 22 Feb 2020 10:26:15 +0900 Subject: [PATCH 835/878] CI can be NULL. Unused CI (introduced from peephole optimization, etc) can be NULL so introduce NULL check. --- compile.c | 69 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/compile.c b/compile.c index 94daa65b78fefe..b5c84a80c8e8da 100644 --- a/compile.c +++ b/compile.c @@ -10294,21 +10294,27 @@ ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq) for (i = 0; i < ci_size; i++) { const struct rb_callinfo *ci = cds[i].ci; - ibf_dump_write_small_value(dump, ibf_dump_id(dump, vm_ci_mid(ci))); - ibf_dump_write_small_value(dump, vm_ci_flag(ci)); - ibf_dump_write_small_value(dump, vm_ci_argc(ci)); - - const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci); - if (kwarg) { - int len = kwarg->keyword_len; - ibf_dump_write_small_value(dump, len); - for (int j=0; jkeywords[j]); - ibf_dump_write_small_value(dump, keyword); + if (ci != NULL) { + ibf_dump_write_small_value(dump, ibf_dump_id(dump, vm_ci_mid(ci))); + ibf_dump_write_small_value(dump, vm_ci_flag(ci)); + ibf_dump_write_small_value(dump, vm_ci_argc(ci)); + + const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci); + if (kwarg) { + int len = kwarg->keyword_len; + ibf_dump_write_small_value(dump, len); + for (int j=0; jkeywords[j]); + ibf_dump_write_small_value(dump, keyword); + } + } + else { + ibf_dump_write_small_value(dump, 0); } } else { - ibf_dump_write_small_value(dump, 0); + // TODO: truncate NULL ci from call_data. + ibf_dump_write_small_value(dump, (VALUE)-1); } } @@ -10331,24 +10337,31 @@ ibf_load_ci_entries(const struct ibf_load *load, for (i = 0; i < ci_size; i++) { VALUE mid_index = ibf_load_small_value(load, &reading_pos); - ID mid = ibf_load_id(load, mid_index); - unsigned int flag = (unsigned int)ibf_load_small_value(load, &reading_pos); - unsigned int argc = (unsigned int)ibf_load_small_value(load, &reading_pos); - - struct rb_callinfo_kwarg *kwarg = NULL; - int kwlen = (int)ibf_load_small_value(load, &reading_pos); - if (kwlen > 0) { - kwarg = rb_xmalloc_mul_add(kwlen - 1, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));; - kwarg->keyword_len = kwlen; - for (int j=0; jkeywords[j] = ibf_load_object(load, keyword); + if (mid_index != (VALUE)-1) { + ID mid = ibf_load_id(load, mid_index); + unsigned int flag = (unsigned int)ibf_load_small_value(load, &reading_pos); + unsigned int argc = (unsigned int)ibf_load_small_value(load, &reading_pos); + + struct rb_callinfo_kwarg *kwarg = NULL; + int kwlen = (int)ibf_load_small_value(load, &reading_pos); + if (kwlen > 0) { + kwarg = rb_xmalloc_mul_add(kwlen - 1, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));; + kwarg->keyword_len = kwlen; + for (int j=0; jkeywords[j] = ibf_load_object(load, keyword); + } } - } - cds[i].ci = vm_ci_new(mid, flag, argc, kwarg); - RB_OBJ_WRITTEN(load->iseq, Qundef, cds[i].ci); - cds[i].cc = vm_cc_empty(); + cds[i].ci = vm_ci_new(mid, flag, argc, kwarg); + RB_OBJ_WRITTEN(load->iseq, Qundef, cds[i].ci); + cds[i].cc = vm_cc_empty(); + } + else { + // NULL ci + cds[i].ci = NULL; + cds[i].cc = NULL; + } } } From 5b29ea0845c14092abd866ce0183c52635bade4c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 22 Feb 2020 10:40:25 +0900 Subject: [PATCH 836/878] Proc from Symbol needs a receiver So its arity should be -2 instead of -1. [Bug #16640] https://bugs.ruby-lang.org/issues/16640#change-84337 --- proc.c | 3 ++- spec/ruby/core/symbol/to_proc_spec.rb | 10 ++++++---- test/ruby/test_symbol.rb | 12 ++++++++++-- vm_args.c | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/proc.c b/proc.c index 7fee55b0981707..390b1bf3fae52a 100644 --- a/proc.c +++ b/proc.c @@ -1091,7 +1091,8 @@ rb_vm_block_min_max_arity(const struct rb_block *block, int *max) return ifunc->argc.min; } case block_type_symbol: - break; + *max = UNLIMITED_ARGUMENTS; + return 1; } *max = UNLIMITED_ARGUMENTS; return 0; diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb index a58187de2ef7f8..27eb6970c4cd9a 100644 --- a/spec/ruby/core/symbol/to_proc_spec.rb +++ b/spec/ruby/core/symbol/to_proc_spec.rb @@ -12,18 +12,20 @@ :to_s.to_proc.call(obj).should == "Received #to_s" end - it "produces a proc with arity -1" do + expected_arity = ruby_version_is("2.8") {-2} || -1 + it "produces a proc with arity #{expected_arity}" do pr = :to_s.to_proc - pr.arity.should == -1 + pr.arity.should == expected_arity end it "raises an ArgumentError when calling #call on the Proc without receiver" do -> { :object_id.to_proc.call }.should raise_error(ArgumentError, "no receiver given") end - it "produces a proc that always returns [[:rest]] for #parameters" do + expected_parameters = ruby_version_is("2.8") {[[:req], [:rest]]} || [[:rest]] + it "produces a proc that always returns #{expected_parameters} for #parameters" do pr = :to_s.to_proc - pr.parameters.should == [[:rest]] + pr.parameters.should == expected_parameters end it "passes along the block passed to Proc#call" do diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 632acb3e3db8f0..569b888f313b1a 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -157,6 +157,10 @@ def test_to_proc_lambda? assert_predicate(:itself.to_proc, :lambda?) end + def test_to_proc_arity + assert_equal(-2, :itself.to_proc.arity) + end + def test_to_proc_call_with_symbol_proc first = 1 bug11594 = "[ruby-core:71088] [Bug #11594] corrupted the first local variable" @@ -187,6 +191,10 @@ def test_to_proc_lambda_with_refinements assert_predicate(_test_to_proc_with_refinements_call(&:hoge), :lambda?) end + def test_to_proc_arity_with_refinements + assert_equal(-2, _test_to_proc_with_refinements_call(&:hoge).arity) + end + def self._test_to_proc_arg_with_refinements_call(&block) block.call TestToPRocArgWithRefinements.new end @@ -230,11 +238,11 @@ def test_to_proc_iseq begin; bug11845 = '[ruby-core:72381] [Bug #11845]' assert_nil(:class.to_proc.source_location, bug11845) - assert_equal([[:rest]], :class.to_proc.parameters, bug11845) + assert_equal([[:req], [:rest]], :class.to_proc.parameters, bug11845) c = Class.new {define_method(:klass, :class.to_proc)} m = c.instance_method(:klass) assert_nil(m.source_location, bug11845) - assert_equal([[:rest]], m.parameters, bug11845) + assert_equal([[:req], [:rest]], m.parameters, bug11845) end; end diff --git a/vm_args.c b/vm_args.c index 9357e97364bbdf..e6d4981b3321da 100644 --- a/vm_args.c +++ b/vm_args.c @@ -868,7 +868,7 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t * rb_ary_push(callback_arg, block_code); rb_ary_push(callback_arg, ref); OBJ_FREEZE_RAW(callback_arg); - func = rb_func_lambda_new(refine_sym_proc_call, callback_arg, 0, UNLIMITED_ARGUMENTS); + func = rb_func_lambda_new(refine_sym_proc_call, callback_arg, 1, UNLIMITED_ARGUMENTS); rb_hash_aset(ref, block_code, func); } block_code = func; From f744d80106ad236cb517c3a6eae5e591562e2377 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sat, 22 Feb 2020 11:23:30 +0900 Subject: [PATCH 837/878] check USE_MJIT iseq->body->jit_unit is not available if USE_MJIT==0 . --- iseq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iseq.c b/iseq.c index c6c5c6e127e968..25f45a767fb838 100644 --- a/iseq.c +++ b/iseq.c @@ -358,6 +358,7 @@ rb_iseq_mark(const rb_iseq_t *iseq) } } +#if USE_MJIT if (body->jit_unit && body->jit_unit->cc_entries != NULL) { // TODO: move to mjit.c? for (unsigned int i=0; ici_size; i++) { @@ -365,6 +366,7 @@ rb_iseq_mark(const rb_iseq_t *iseq) rb_gc_mark((VALUE)cc); // pindown } } +#endif } if (FL_TEST_RAW(iseq, ISEQ_NOT_LOADED_YET)) { From c7b71af9e21b3f0b8fe413a3c20cf4bd633c40d0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 22 Feb 2020 15:03:18 +0900 Subject: [PATCH 838/878] Prefer `exe/ruby` to execute from it --- common.mk | 2 +- ruby-runner.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common.mk b/common.mk index 5680573bd28984..200bf71247f139 100644 --- a/common.mk +++ b/common.mk @@ -878,7 +878,7 @@ $(PLATFORM_D): @$(NULLCMD) > $@ exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h - $(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c + $(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_RUNNER_PATH=$(@D) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c $(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS) $(Q) $(POSTLINK) $(Q) ./miniruby$(EXEEXT) \ diff --git a/ruby-runner.c b/ruby-runner.c index d41ba274c37508..7e0ed6e4b0a562 100644 --- a/ruby-runner.c +++ b/ruby-runner.c @@ -17,7 +17,7 @@ const char MJIT_HEADER[] = BUILDDIR "/" MJIT_MIN_HEADER; #define STRINGIZE0(expr) #expr static void -insert_env_path(const char *envname, const char *paths, size_t size, int prepend) +insert_env_path(const char *envname, const char *paths, size_t size, int prepend, int add) { const char *env = getenv(envname); char c = 0; @@ -28,6 +28,9 @@ insert_env_path(const char *envname, const char *paths, size_t size, int prepend n = strlen(env); while (n > 0 && env[n-1] == PATH_SEP) --n; } + else if (!add) { + return; + } if (c) { char *e = malloc(size+n+1); size_t pos = 0; @@ -56,6 +59,7 @@ int main(int argc, char **argv) { static const char builddir[] = BUILDDIR; + static const char exedir[] = BUILDDIR"/"STRINGIZE(RUBY_RUNNER_PATH); static const char rubypath[] = BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME); static const char rubylib[] = ABS_SRCDIR"/lib" @@ -73,11 +77,12 @@ main(int argc, char **argv) const char *rubyname = rubypath + dirsize; char *arg0 = argv[0], *p; - insert_env_path(LIBPATHENV, builddir, dirsize, 1); - insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0); + insert_env_path(LIBPATHENV, builddir, dirsize, 1, 1); + insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0, 1); + insert_env_path("PATH", exedir, sizeof(exedir), 1, 0); #ifndef LOAD_RELATIVE if (PRELOADENV[0] && stat(mjit_build_dir, &stbuf) == 0) { - insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1); + insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1, 1); setenv("MJIT_SEARCH_BUILD_DIR", "true", 0); } #endif From 4aebb491536ad9c7bca6c0e264604aa90e701ef0 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 22 Feb 2020 14:43:52 +0100 Subject: [PATCH 839/878] Expand Symbol#to_proc specs to be clearer --- spec/ruby/core/symbol/to_proc_spec.rb | 42 ++++++++++++++++++++------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb index 27eb6970c4cd9a..6651022375f17b 100644 --- a/spec/ruby/core/symbol/to_proc_spec.rb +++ b/spec/ruby/core/symbol/to_proc_spec.rb @@ -12,20 +12,42 @@ :to_s.to_proc.call(obj).should == "Received #to_s" end - expected_arity = ruby_version_is("2.8") {-2} || -1 - it "produces a proc with arity #{expected_arity}" do - pr = :to_s.to_proc - pr.arity.should == expected_arity + ruby_version_is ""..."2.8" do + it "returns a Proc with #lambda? false" do + pr = :to_s.to_proc + pr.lambda?.should == false + end + + it "produces a Proc with arity -1" do + pr = :to_s.to_proc + pr.arity.should == -1 + end + + it "produces a Proc that always returns [[:rest]] for #parameters" do + pr = :to_s.to_proc + pr.parameters.should == [[:rest]] + end end - it "raises an ArgumentError when calling #call on the Proc without receiver" do - -> { :object_id.to_proc.call }.should raise_error(ArgumentError, "no receiver given") + ruby_version_is "2.8" do + it "returns a Proc with #lambda? true" do + pr = :to_s.to_proc + pr.lambda?.should == true + end + + it "produces a Proc with arity -2" do + pr = :to_s.to_proc + pr.arity.should == -2 + end + + it "produces a Proc that always returns [[:req], [:rest]] for #parameters" do + pr = :to_s.to_proc + pr.parameters.should == [[:req], [:rest]] + end end - expected_parameters = ruby_version_is("2.8") {[[:req], [:rest]]} || [[:rest]] - it "produces a proc that always returns #{expected_parameters} for #parameters" do - pr = :to_s.to_proc - pr.parameters.should == expected_parameters + it "raises an ArgumentError when calling #call on the Proc without receiver" do + -> { :object_id.to_proc.call }.should raise_error(ArgumentError, "no receiver given") end it "passes along the block passed to Proc#call" do From 77dcc2c8228f6a69e7cd4c4d72f4ac6c4116d27c Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sat, 22 Feb 2020 16:32:37 +0100 Subject: [PATCH 840/878] hash.c: [DOC] fix examples for ENV.merge! --- hash.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hash.c b/hash.c index 9c723a0efd9a0e..0967bff85c2c19 100644 --- a/hash.c +++ b/hash.c @@ -6372,18 +6372,19 @@ env_update_block_i(VALUE key, VALUE val, VALUE _) * ENV.merge!('foo' => '4') # => {"bar"=>"1", "foo"=>"4"} * For an already-existing name, if block given, * yields the name, its ENV value, and its hash value; - * the block's return value becomes the new name: + * the block's return value becomes the new name: * ENV.merge!('foo' => '5') { |name, env_val, hash_val | env_val + hash_val } # => {"bar"=>"1", "foo"=>"45"} * Raises an exception if a name or value is invalid * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]); + * ENV.replace('foo' => '0', 'bar' => '1') * ENV.merge!('foo' => '6', :bar => '7', 'baz' => '9') # Raises TypeError (no implicit conversion of Symbol into String) - * ENV # => {"bar"=>"1", "baz"=>"2", "foo"=>"6"} - * ENV.merge!('foo' => '7', 'bar' => 8, 'baz' => '9') - * ENV # => {"bar"=>"1", "baz"=>"2", "foo"=>"7"} TypeError (no implicit conversion of Integer into String) + * ENV # => {"bar"=>"1", "foo"=>"6"} + * ENV.merge!('foo' => '7', 'bar' => 8, 'baz' => '9') # Raises TypeError (no implicit conversion of Integer into String) + * ENV # => {"bar"=>"1", "foo"=>"7"} * Raises an exception if the block returns an invalid name: * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]): * ENV.merge!('bat' => '8', 'foo' => '9') { |name, env_val, hash_val | 10 } # Raises TypeError (no implicit conversion of Integer into String) - * ENV # => {"bar"=>"1", "bat"=>"8", "baz"=>"2", "foo"=>"75"} + * ENV # => {"bar"=>"1", "bat"=>"8", "foo"=>"7"} * * Note that for the exceptions above, * hash pairs preceding an invalid name or value are processed normally; From f85ca4c840611bd10df35b4d6ca5a976bc90d68e Mon Sep 17 00:00:00 2001 From: git Date: Sun, 23 Feb 2020 00:38:29 +0900 Subject: [PATCH 841/878] * 2020-02-23 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 334cb690231b82..359b7b2256f2fe 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" From 0ed3384fd463ff80f5e55f7d4c62338fb15337d5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 23 Feb 2020 13:31:56 +0900 Subject: [PATCH 842/878] Revert "Prefer `exe/ruby` to execute from it" This reverts commit c7b71af9e21b3f0b8fe413a3c20cf4bd633c40d0, as an example in bundler expects untouch PATH. --- common.mk | 2 +- ruby-runner.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/common.mk b/common.mk index 200bf71247f139..5680573bd28984 100644 --- a/common.mk +++ b/common.mk @@ -878,7 +878,7 @@ $(PLATFORM_D): @$(NULLCMD) > $@ exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h - $(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_RUNNER_PATH=$(@D) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c + $(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c $(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS) $(Q) $(POSTLINK) $(Q) ./miniruby$(EXEEXT) \ diff --git a/ruby-runner.c b/ruby-runner.c index 7e0ed6e4b0a562..d41ba274c37508 100644 --- a/ruby-runner.c +++ b/ruby-runner.c @@ -17,7 +17,7 @@ const char MJIT_HEADER[] = BUILDDIR "/" MJIT_MIN_HEADER; #define STRINGIZE0(expr) #expr static void -insert_env_path(const char *envname, const char *paths, size_t size, int prepend, int add) +insert_env_path(const char *envname, const char *paths, size_t size, int prepend) { const char *env = getenv(envname); char c = 0; @@ -28,9 +28,6 @@ insert_env_path(const char *envname, const char *paths, size_t size, int prepend n = strlen(env); while (n > 0 && env[n-1] == PATH_SEP) --n; } - else if (!add) { - return; - } if (c) { char *e = malloc(size+n+1); size_t pos = 0; @@ -59,7 +56,6 @@ int main(int argc, char **argv) { static const char builddir[] = BUILDDIR; - static const char exedir[] = BUILDDIR"/"STRINGIZE(RUBY_RUNNER_PATH); static const char rubypath[] = BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME); static const char rubylib[] = ABS_SRCDIR"/lib" @@ -77,12 +73,11 @@ main(int argc, char **argv) const char *rubyname = rubypath + dirsize; char *arg0 = argv[0], *p; - insert_env_path(LIBPATHENV, builddir, dirsize, 1, 1); - insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0, 1); - insert_env_path("PATH", exedir, sizeof(exedir), 1, 0); + insert_env_path(LIBPATHENV, builddir, dirsize, 1); + insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0); #ifndef LOAD_RELATIVE if (PRELOADENV[0] && stat(mjit_build_dir, &stbuf) == 0) { - insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1, 1); + insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1); setenv("MJIT_SEARCH_BUILD_DIR", "true", 0); } #endif From 588a86e32c9e646823e1436e53ffe1c37206abd3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 20 Jan 2020 17:28:56 +0900 Subject: [PATCH 843/878] Warn non-nil `$,` in `IO#print` too --- io.c | 3 +++ test/ruby/test_io.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/io.c b/io.c index 19fe51bcf6d935..b3175df6c0446c 100644 --- a/io.c +++ b/io.c @@ -7615,6 +7615,9 @@ rb_io_print(int argc, const VALUE *argv, VALUE out) line = rb_lastline_get(); argv = &line; } + if (argc > 1 && !NIL_P(rb_output_fs)) { + rb_warn("$, is set to non-nil value"); + } for (i=0; i0) { rb_io_write(out, rb_output_fs); diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 6bdc7bb27f270d..af2b08de951cbe 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2572,7 +2572,7 @@ def test_print_separators $\ = "\n" pipe(proc do |w| w.print('a') - w.print('a','b','c') + EnvUtil.suppress_warning {w.print('a','b','c')} w.close end, proc do |r| assert_equal("a\n", r.gets) From 6298ec2875a6f1a1e75698c96ceac94362f20bcf Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 20 Jan 2020 17:53:46 +0900 Subject: [PATCH 844/878] Warn non-nil `$\` [Feature #14240] --- io.c | 8 ++++---- spec/ruby/core/io/print_spec.rb | 4 ++-- spec/ruby/core/kernel/p_spec.rb | 8 ++++++-- spec/ruby/library/English/English_spec.rb | 8 ++++---- spec/ruby/library/stringio/print_spec.rb | 10 ++++++---- spec/ruby/library/stringio/puts_spec.rb | 15 +++++++++------ spec/ruby/optional/capi/globals_spec.rb | 4 ++-- test/ruby/test_io.rb | 6 ++++-- 8 files changed, 37 insertions(+), 26 deletions(-) diff --git a/io.c b/io.c index b3175df6c0446c..e388e384c13eb9 100644 --- a/io.c +++ b/io.c @@ -7570,11 +7570,11 @@ rb_f_printf(int argc, VALUE *argv, VALUE _) } static void -rb_output_fs_setter(VALUE val, ID id, VALUE *var) +deprecated_str_setter(VALUE val, ID id, VALUE *var) { rb_str_setter(val, id, &val); if (!NIL_P(val)) { - rb_warn_deprecated("`$,'", NULL); + rb_warn_deprecated("`%s'", NULL, rb_id2name(id)); } *var = val; } @@ -13282,7 +13282,7 @@ Init_IO(void) rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1); rb_output_fs = Qnil; - rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_output_fs_setter); + rb_define_hooked_variable("$,", &rb_output_fs, 0, deprecated_str_setter); rb_default_rs = rb_fstring_lit("\n"); /* avoid modifying RS_default */ rb_gc_register_mark_object(rb_default_rs); @@ -13290,7 +13290,7 @@ Init_IO(void) rb_output_rs = Qnil; rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter); rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter); - rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter); + rb_define_hooked_variable("$\\", &rb_output_rs, 0, deprecated_str_setter); rb_define_virtual_variable("$_", get_LAST_READ_LINE, set_LAST_READ_LINE); diff --git a/spec/ruby/core/io/print_spec.rb b/spec/ruby/core/io/print_spec.rb index 2021cd54207c11..0e8805348e6a74 100644 --- a/spec/ruby/core/io/print_spec.rb +++ b/spec/ruby/core/io/print_spec.rb @@ -4,12 +4,12 @@ describe IO, "#print" do before :each do @old_separator = $\ - $\ = '->' + suppress_warning {$\ = '->'} @name = tmp("io_print") end after :each do - $\ = @old_separator + suppress_warning {$\ = @old_separator} rm_r @name end diff --git a/spec/ruby/core/kernel/p_spec.rb b/spec/ruby/core/kernel/p_spec.rb index 798bd47b3432ce..1bdd1740caa72f 100644 --- a/spec/ruby/core/kernel/p_spec.rb +++ b/spec/ruby/core/kernel/p_spec.rb @@ -57,10 +57,14 @@ } -> { p(o) }.should output_to_fd("Next time, Gadget, NEXT TIME!\n") - $\ = " *helicopter sound*\n" + suppress_warning { + $\ = " *helicopter sound*\n" + } -> { p(o) }.should output_to_fd("Next time, Gadget, NEXT TIME!\n") - $/ = " *helicopter sound*\n" + suppress_warning { + $/ = " *helicopter sound*\n" + } -> { p(o) }.should output_to_fd("Next time, Gadget, NEXT TIME!\n") end diff --git a/spec/ruby/library/English/English_spec.rb b/spec/ruby/library/English/English_spec.rb index f6153ec7c909df..480602d5e5937c 100644 --- a/spec/ruby/library/English/English_spec.rb +++ b/spec/ruby/library/English/English_spec.rb @@ -67,18 +67,18 @@ it "aliases $ORS to $\\" do original = $\ - $\ = "\t" + suppress_warning {$\ = "\t"} $ORS.should_not be_nil $ORS.should == $\ - $\ = original + suppress_warning {$\ = original} end it "aliases $OUTPUT_RECORD_SEPARATOR to $\\" do original = $\ - $\ = "\t" + suppress_warning {$\ = "\t"} $OUTPUT_RECORD_SEPARATOR.should_not be_nil $OUTPUT_RECORD_SEPARATOR.should == $\ - $\ = original + suppress_warning {$\ = original} end it "aliases $INPUT_LINE_NUMBER to $." do diff --git a/spec/ruby/library/stringio/print_spec.rb b/spec/ruby/library/stringio/print_spec.rb index d0f07d1e507585..6ac64309002902 100644 --- a/spec/ruby/library/stringio/print_spec.rb +++ b/spec/ruby/library/stringio/print_spec.rb @@ -39,13 +39,14 @@ end it "honors the output record separator global" do - old_rs, $\ = $\, 'x' + old_rs = $\ + suppress_warning {$\ = 'x'} begin @io.print(5, 6, 7, 8) @io.string.should == '5678xle' ensure - $\ = old_rs + suppress_warning {$\ = old_rs} end end @@ -58,13 +59,14 @@ end it "correctly updates the current position when honoring the output record separator global" do - old_rs, $\ = $\, 'x' + old_rs = $\ + suppress_warning {$\ = 'x'} begin @io.print(5, 6, 7, 8) @io.pos.should eql(5) ensure - $\ = old_rs + suppress_warning {$\ = old_rs} end end end diff --git a/spec/ruby/library/stringio/puts_spec.rb b/spec/ruby/library/stringio/puts_spec.rb index 2d3db25c5f8d00..a9f289a5a56398 100644 --- a/spec/ruby/library/stringio/puts_spec.rb +++ b/spec/ruby/library/stringio/puts_spec.rb @@ -30,11 +30,12 @@ it "does not honor the global output record separator $\\" do begin - old_rs, $\ = $\, "test" + old_rs = $\ + suppress_warning {$\ = "test"} @io.puts([1, 2, 3, 4]) @io.string.should == "1\n2\n3\n4\n" ensure - $\ = old_rs + suppress_warning {$\ = old_rs} end end @@ -68,11 +69,12 @@ it "does not honor the global output record separator $\\" do begin - old_rs, $\ = $\, "test" + old_rs = $\ + suppress_warning {$\ = "test"} @io.puts(1, 2, 3, 4) @io.string.should == "1\n2\n3\n4\n" ensure - $\ = old_rs + suppress_warning {$\ = old_rs} end end @@ -117,11 +119,12 @@ it "does not honor the global output record separator $\\" do begin - old_rs, $\ = $\, "test" + old_rs = $\ + suppress_warning {$\ = "test"} @io.puts @io.string.should == "\n" ensure - $\ = old_rs + suppress_warning {$\ = old_rs} end end end diff --git a/spec/ruby/optional/capi/globals_spec.rb b/spec/ruby/optional/capi/globals_spec.rb index 84694b137527ac..ffc579023d0866 100644 --- a/spec/ruby/optional/capi/globals_spec.rb +++ b/spec/ruby/optional/capi/globals_spec.rb @@ -140,7 +140,7 @@ end after :each do - $\ = @dollar_backslash + suppress_warning {$\ = @dollar_backslash} end it "returns nil by default" do @@ -148,7 +148,7 @@ end it "returns the value of $\\" do - $\ = "foo" + suppress_warning {$\ = "foo"} @f.rb_output_rs.should == "foo" end end diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index af2b08de951cbe..a6df5c8b0872b8 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2568,8 +2568,10 @@ def test_print end def test_print_separators - EnvUtil.suppress_warning {$, = ':'} - $\ = "\n" + EnvUtil.suppress_warning { + $, = ':' + $\ = "\n" + } pipe(proc do |w| w.print('a') EnvUtil.suppress_warning {w.print('a','b','c')} From 8a7e0aaaef3b19f90d6debe6781e4b3031f56237 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 21 Jan 2020 08:37:44 +0900 Subject: [PATCH 845/878] Warn non-nil `$/` [Feature #14240] --- io.c | 4 ++-- spec/ruby/core/io/puts_spec.rb | 4 ++-- spec/ruby/core/io/readlines_spec.rb | 8 ++++---- spec/ruby/core/io/shared/each.rb | 4 ++-- spec/ruby/core/io/shared/readlines.rb | 4 ++-- spec/ruby/core/kernel/fixtures/classes.rb | 2 +- spec/ruby/core/kernel/warn_spec.rb | 3 ++- spec/ruby/core/string/chomp_spec.rb | 8 ++++++++ spec/ruby/core/string/shared/each_line.rb | 6 +++--- spec/ruby/language/predefined_spec.rb | 4 ++++ spec/ruby/library/stringio/gets_spec.rb | 5 +++-- spec/ruby/library/stringio/readline_spec.rb | 5 +++-- spec/ruby/library/stringio/readlines_spec.rb | 5 +++-- spec/ruby/library/stringio/shared/each.rb | 5 +++-- spec/ruby/optional/capi/globals_spec.rb | 4 ++-- string.c | 15 +++++++++++++++ test/openssl/test_pair.rb | 4 ++-- test/ruby/test_string.rb | 14 ++++++++++++++ 18 files changed, 75 insertions(+), 29 deletions(-) diff --git a/io.c b/io.c index e388e384c13eb9..03209f752b6220 100644 --- a/io.c +++ b/io.c @@ -13288,8 +13288,8 @@ Init_IO(void) rb_gc_register_mark_object(rb_default_rs); rb_rs = rb_default_rs; rb_output_rs = Qnil; - rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter); - rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter); + rb_define_hooked_variable("$/", &rb_rs, 0, deprecated_str_setter); + rb_define_hooked_variable("$-0", &rb_rs, 0, deprecated_str_setter); rb_define_hooked_variable("$\\", &rb_output_rs, 0, deprecated_str_setter); rb_define_virtual_variable("$_", get_LAST_READ_LINE, set_LAST_READ_LINE); diff --git a/spec/ruby/core/io/puts_spec.rb b/spec/ruby/core/io/puts_spec.rb index 3e4b877b7f9b63..be220c4035d881 100644 --- a/spec/ruby/core/io/puts_spec.rb +++ b/spec/ruby/core/io/puts_spec.rb @@ -16,7 +16,7 @@ def @io.write(str) ScratchPad.clear @io.close if @io rm_r @name - $/ = @before_separator + suppress_warning {$/ = @before_separator} end it "writes just a newline when given no args" do @@ -105,7 +105,7 @@ def @io.write(str) end it "ignores the $/ separator global" do - $/ = ":" + suppress_warning {$/ = ":"} @io.puts(5).should == nil ScratchPad.recorded.should == "5\n" end diff --git a/spec/ruby/core/io/readlines_spec.rb b/spec/ruby/core/io/readlines_spec.rb index 0d4f002972c11f..eb99eb8d3a4122 100644 --- a/spec/ruby/core/io/readlines_spec.rb +++ b/spec/ruby/core/io/readlines_spec.rb @@ -22,11 +22,11 @@ describe "when passed no arguments" do before :each do - @sep, $/ = $/, " " + suppress_warning {@sep, $/ = $/, " "} end after :each do - $/ = @sep + suppress_warning {$/ = @sep} end it "returns an Array containing lines based on $/" do @@ -184,7 +184,7 @@ after :each do Encoding.default_external = @external Encoding.default_internal = @internal - $/ = @dollar_slash + suppress_warning {$/ = @dollar_slash} end it "encodes lines using the default external encoding" do @@ -196,7 +196,7 @@ it "encodes lines using the default internal encoding, when set" do Encoding.default_external = Encoding::UTF_8 Encoding.default_internal = Encoding::UTF_16 - $/ = $/.encode Encoding::UTF_16 + suppress_warning {$/ = $/.encode Encoding::UTF_16} lines = IO.readlines(@name) lines.all? { |s| s.encoding == Encoding::UTF_16 }.should be_true end diff --git a/spec/ruby/core/io/shared/each.rb b/spec/ruby/core/io/shared/each.rb index 0b2dfa35483cee..91766fbe0386fe 100644 --- a/spec/ruby/core/io/shared/each.rb +++ b/spec/ruby/core/io/shared/each.rb @@ -168,12 +168,12 @@ before :each do @io = IOSpecs.io_fixture "lines.txt" ScratchPad.record [] - @sep, $/ = $/, " " + suppress_warning {@sep, $/ = $/, " "} end after :each do @io.close if @io - $/ = @sep + suppress_warning {$/ = @sep} end it "uses $/ as the default line separator" do diff --git a/spec/ruby/core/io/shared/readlines.rb b/spec/ruby/core/io/shared/readlines.rb index de803f42e517a9..339684a5d4bfdc 100644 --- a/spec/ruby/core/io/shared/readlines.rb +++ b/spec/ruby/core/io/shared/readlines.rb @@ -60,11 +60,11 @@ end after :each do - $/ = @sep + suppress_warning {$/ = @sep} end it "defaults to $/ as the separator" do - $/ = " " + suppress_warning {$/ = " "} result = IO.send(@method, @name, 10, &@object) (result ? result : ScratchPad.recorded).should == IOSpecs.lines_space_separator_limit end diff --git a/spec/ruby/core/kernel/fixtures/classes.rb b/spec/ruby/core/kernel/fixtures/classes.rb index 2f2bbf1b23195e..623b45ca343405 100644 --- a/spec/ruby/core/kernel/fixtures/classes.rb +++ b/spec/ruby/core/kernel/fixtures/classes.rb @@ -49,7 +49,7 @@ def self.chop(str, method) def self.chomp(str, method, sep="\n") code = "$_ = #{str.inspect}; $/ = #{sep.inspect}; #{method}; print $_" - IO.popen([*ruby_exe, "-n", "-e", code], "r+") do |io| + IO.popen([*ruby_exe, "-W0", "-n", "-e", code], "r+") do |io| io.puts io.close_write io.read diff --git a/spec/ruby/core/kernel/warn_spec.rb b/spec/ruby/core/kernel/warn_spec.rb index b0672997f6e309..774f4378ad5eb5 100644 --- a/spec/ruby/core/kernel/warn_spec.rb +++ b/spec/ruby/core/kernel/warn_spec.rb @@ -8,8 +8,9 @@ end after :each do - $VERBOSE = @before_verbose + $VERBOSE = nil $/ = @before_separator + $VERBOSE = @before_verbose end it "is a private method" do diff --git a/spec/ruby/core/string/chomp_spec.rb b/spec/ruby/core/string/chomp_spec.rb index 20a09259593811..a893bf77592e88 100644 --- a/spec/ruby/core/string/chomp_spec.rb +++ b/spec/ruby/core/string/chomp_spec.rb @@ -6,11 +6,13 @@ describe "when passed no argument" do before do # Ensure that $/ is set to the default value + @verbose, $VERBOSE = $VERBOSE, nil @dollar_slash, $/ = $/, "\n" end after do $/ = @dollar_slash + $VERBOSE = @verbose end it "does not modify a String with no trailing carriage return or newline" do @@ -179,11 +181,13 @@ describe "when passed no argument" do before do # Ensure that $/ is set to the default value + @verbose, $VERBOSE = $VERBOSE, nil @dollar_slash, $/ = $/, "\n" end after do $/ = @dollar_slash + $VERBOSE = @verbose end it "modifies self" do @@ -350,11 +354,13 @@ describe "String#chomp" do before :each do + @verbose, $VERBOSE = $VERBOSE, nil @before_separator = $/ end after :each do $/ = @before_separator + $VERBOSE = @verbose end it "does not modify a multi-byte character" do @@ -379,11 +385,13 @@ describe "String#chomp!" do before :each do + @verbose, $VERBOSE = $VERBOSE, nil @before_separator = $/ end after :each do $/ = @before_separator + $VERBOSE = @verbose end it "returns nil when the String is not modified" do diff --git a/spec/ruby/core/string/shared/each_line.rb b/spec/ruby/core/string/shared/each_line.rb index 843b123f579daf..d8c48054c47fbb 100644 --- a/spec/ruby/core/string/shared/each_line.rb +++ b/spec/ruby/core/string/shared/each_line.rb @@ -84,7 +84,7 @@ end after :each do - $/ = @before_separator + suppress_warning {$/ = @before_separator} end it "as the separator when none is given" do @@ -96,10 +96,10 @@ expected = [] str.send(@method, sep) { |x| expected << x } - $/ = sep + suppress_warning {$/ = sep} actual = [] - str.send(@method) { |x| actual << x } + suppress_warning {str.send(@method) { |x| actual << x }} actual.should == expected end diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb index 6f902eb822d70f..e9fce1c3584b94 100644 --- a/spec/ruby/language/predefined_spec.rb +++ b/spec/ruby/language/predefined_spec.rb @@ -541,6 +541,7 @@ def bar describe "Predefined global $/" do before :each do + @verbose, $VERBOSE = $VERBOSE, nil @dollar_slash = $/ @dollar_dash_zero = $-0 end @@ -548,6 +549,7 @@ def bar after :each do $/ = @dollar_slash $-0 = @dollar_dash_zero + $VERBOSE = @verbose end it "can be assigned a String" do @@ -589,6 +591,7 @@ def bar describe "Predefined global $-0" do before :each do + @verbose, $VERBOSE = $VERBOSE, nil @dollar_slash = $/ @dollar_dash_zero = $-0 end @@ -596,6 +599,7 @@ def bar after :each do $/ = @dollar_slash $-0 = @dollar_dash_zero + $VERBOSE = @verbose end it "can be assigned a String" do diff --git a/spec/ruby/library/stringio/gets_spec.rb b/spec/ruby/library/stringio/gets_spec.rb index 69880672a3f32e..97429e6a29d548 100644 --- a/spec/ruby/library/stringio/gets_spec.rb +++ b/spec/ruby/library/stringio/gets_spec.rb @@ -76,12 +76,13 @@ @io.gets.should == "this is\n" begin - old_sep, $/ = $/, " " + old_sep = $/ + suppress_warning {$/ = " "} @io.gets.should == "an " @io.gets.should == "example\nfor " @io.gets.should == "StringIO#gets" ensure - $/ = old_sep + suppress_warning {$/ = old_sep} end end diff --git a/spec/ruby/library/stringio/readline_spec.rb b/spec/ruby/library/stringio/readline_spec.rb index 9af633472e562e..94b67bc92d8435 100644 --- a/spec/ruby/library/stringio/readline_spec.rb +++ b/spec/ruby/library/stringio/readline_spec.rb @@ -64,12 +64,13 @@ @io.readline.should == "this is\n" begin - old_sep, $/ = $/, " " + old_sep = $/ + suppress_warning {$/ = " "} @io.readline.should == "an " @io.readline.should == "example\nfor " @io.readline.should == "StringIO#readline" ensure - $/ = old_sep + suppress_warning {$/ = old_sep} end end diff --git a/spec/ruby/library/stringio/readlines_spec.rb b/spec/ruby/library/stringio/readlines_spec.rb index 7f9f9f5846cfd9..4b007787e2a146 100644 --- a/spec/ruby/library/stringio/readlines_spec.rb +++ b/spec/ruby/library/stringio/readlines_spec.rb @@ -51,10 +51,11 @@ it "returns an Array containing lines based on $/" do begin - old_sep, $/ = $/, " " + old_sep = $/; + suppress_warning {$/ = " "} @io.readlines.should == ["this ", "is\nan ", "example\nfor ", "StringIO#readlines"] ensure - $/ = old_sep + suppress_warning {$/ = old_sep} end end diff --git a/spec/ruby/library/stringio/shared/each.rb b/spec/ruby/library/stringio/shared/each.rb index c08d40344cda09..14b0a013b3fb97 100644 --- a/spec/ruby/library/stringio/shared/each.rb +++ b/spec/ruby/library/stringio/shared/each.rb @@ -71,11 +71,12 @@ it "uses $/ as the default line separator" do seen = [] begin - old_rs, $/ = $/, " " + old_rs = $/ + suppress_warning {$/ = " "} @io.send(@method) {|s| seen << s } seen.should eql(["a ", "b ", "c ", "d ", "e\n1 ", "2 ", "3 ", "4 ", "5"]) ensure - $/ = old_rs + suppress_warning {$/ = old_rs} end end diff --git a/spec/ruby/optional/capi/globals_spec.rb b/spec/ruby/optional/capi/globals_spec.rb index ffc579023d0866..1e8ab0938f1032 100644 --- a/spec/ruby/optional/capi/globals_spec.rb +++ b/spec/ruby/optional/capi/globals_spec.rb @@ -59,7 +59,7 @@ end after :each do - $/ = @dollar_slash + suppress_warning {$/ = @dollar_slash} end it "returns \\n by default" do @@ -67,7 +67,7 @@ end it "returns the value of $/" do - $/ = "foo" + suppress_warning {$/ = "foo"} @f.rb_rs.should == "foo" end end diff --git a/string.c b/string.c index 28a1b293d649fe..0607726a076f49 100644 --- a/string.c +++ b/string.c @@ -8245,6 +8245,21 @@ chomp_newline(const char *p, const char *e, rb_encoding *enc) return e; } +static VALUE +get_rs(void) +{ + VALUE rs = rb_rs; + if (!NIL_P(rs) && + (!RB_TYPE_P(rs, T_STRING) || + RSTRING_LEN(rs) != 1 || + RSTRING_PTR(rs)[0] != '\n')) { + rb_warn("$/ is set to non-default value"); + } + return rs; +} + +#define rb_rs get_rs() + static VALUE rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, VALUE ary) { diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index e9cf98df153832..a77abfd923defc 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -160,10 +160,10 @@ def test_puts_meta ssl_pair {|s1, s2| begin old = $/ - $/ = '*' + EnvUtil.suppress_warning {$/ = '*'} s1.puts 'a' ensure - $/ = old + EnvUtil.suppress_warning {$/ = old} end s1.close assert_equal("a\n", s2.read) diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index f0b765314c9de9..5274097626843e 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -387,6 +387,8 @@ def test_center end def test_chomp + verbose, $VERBOSE = $VERBOSE, nil + assert_equal(S("hello"), S("hello").chomp("\n")) assert_equal(S("hello"), S("hello\n").chomp("\n")) save = $/ @@ -452,9 +454,12 @@ def test_chomp assert_equal("foo", s.chomp("\n")) ensure $/ = save + $VERBOSE = verbose end def test_chomp! + verbose, $VERBOSE = $VERBOSE, nil + a = S("hello") a.chomp!(S("\n")) @@ -511,6 +516,7 @@ def test_chomp! s = S("").freeze assert_raise_with_message(FrozenError, /frozen/) {s.chomp!} + $VERBOSE = nil # EnvUtil.suppress_warning resets $VERBOSE to the original state s = S("ax") o = Struct.new(:s).new(s) @@ -519,6 +525,7 @@ def o.to_str "x" end assert_raise_with_message(FrozenError, /frozen/) {s.chomp!(o)} + $VERBOSE = nil # EnvUtil.suppress_warning resets $VERBOSE to the original state s = S("hello") assert_equal("hel", s.chomp!('lo')) @@ -569,6 +576,7 @@ def o.to_str assert_equal("foo", s.chomp!("\n")) ensure $/ = save + $VERBOSE = verbose end def test_chop @@ -859,6 +867,8 @@ def test_dup end def test_each + verbose, $VERBOSE = $VERBOSE, nil + save = $/ $/ = "\n" res=[] @@ -878,6 +888,7 @@ def test_each assert_equal(S("world"), res[1]) ensure $/ = save + $VERBOSE = verbose end def test_each_byte @@ -1055,6 +1066,8 @@ def test_grapheme_clusters end def test_each_line + verbose, $VERBOSE = $VERBOSE, nil + save = $/ $/ = "\n" res=[] @@ -1101,6 +1114,7 @@ def test_each_line end ensure $/ = save + $VERBOSE = verbose end def test_each_line_chomp From 281b3500580f9ec93ee17679c648eaeb4a47f8b6 Mon Sep 17 00:00:00 2001 From: zverok Date: Wed, 25 Dec 2019 20:39:42 +0200 Subject: [PATCH 846/878] Add pattern matching documentation Add separate doc/syntax/pattern_matching.rdoc, add link to control_expressions.rdoc. The documentation is "reverse-engineered" from Ruby 2.7 behavior and early preview presentations, and corrected by pattern-matching feature author @k-tsj. --- doc/syntax.rdoc | 3 + doc/syntax/control_expressions.rdoc | 16 +- doc/syntax/pattern_matching.rdoc | 441 ++++++++++++++++++++++++++++ 3 files changed, 459 insertions(+), 1 deletion(-) create mode 100644 doc/syntax/pattern_matching.rdoc diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc index cdcb18dae17fe5..5895673f36a8f9 100644 --- a/doc/syntax.rdoc +++ b/doc/syntax.rdoc @@ -11,6 +11,9 @@ Assignment[rdoc-ref:syntax/assignment.rdoc] :: {Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] :: +if+, +unless+, +while+, +until+, +for+, +break+, +next+, +redo+ +{Pattern matching}[rdoc-ref:syntax/pattern_matching.rdoc] :: + Experimental structural pattern matching and variable binding syntax + Methods[rdoc-ref:syntax/methods.rdoc] :: Method and method argument syntax diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc index f7e6d54924b61c..e91b03e72d789f 100644 --- a/doc/syntax/control_expressions.rdoc +++ b/doc/syntax/control_expressions.rdoc @@ -232,7 +232,7 @@ You may use +then+ after the +when+ condition. This is most frequently used to place the body of the +when+ on a single line. case a - when 1, 2 then puts "a is one or two + when 1, 2 then puts "a is one or two" when 3 then puts "a is three" else puts "I don't know what a is" end @@ -255,6 +255,20 @@ Again, the +then+ and +else+ are optional. The result value of a +case+ expression is the last value executed in the expression. +Since Ruby 2.7, +case+ expressions also provide a more powerful experimental +pattern matching feature via the +in+ keyword: + + case {a: 1, b: 2, c: 3} + in a: Integer => m + "matched: #{m}" + else + "not matched" + end + # => "matched: 1" + +The pattern matching syntax is described on +{its own page}[rdoc-ref:syntax/pattern_matching.rdoc]. + == +while+ Loop The +while+ loop executes while a condition is true: diff --git a/doc/syntax/pattern_matching.rdoc b/doc/syntax/pattern_matching.rdoc new file mode 100644 index 00000000000000..a7f7304dc3108d --- /dev/null +++ b/doc/syntax/pattern_matching.rdoc @@ -0,0 +1,441 @@ += Pattern matching + +Pattern matching is an experimental feature allowing deep matching of structured values: checking the structure, and binding the matched parts to local variables. + +Pattern matching in Ruby is implemented with the +in+ operator, which can be used in a standalone expression: + + in + +or within the +case+ statement: + + case + in + ... + in + ... + in + ... + else + ... + end + +(Note that +in+ and +when+ branches can *not* be mixed in one +case+ statement.) + +Pattern matching is _exhaustive_: if variable doesn't match pattern (in a separate +in+ statement), or doesn't matches any branch of +case+ statement (and +else+ branch is absent), +NoMatchingPatternError+ is raised. + +Therefore, standalone +in+ statement is most useful when expected data structure is known beforehand, to unpack parts of it: + + def connect_to_db(config) # imagine config is a huge configuration hash from YAML + # this statement will either unpack parts of the config into local variables, + # or raise if config's structure is unexpected + config in {connections: {db: {user:, password:}}, logging: {level: log_level}} + p [user, passsword, log_level] # local variables now contain relevant parts of the config + # ... + end + +whilst +case+ form can be used for matching and unpacking simultaneously: + + case config + in String + JSON.parse(config) # ...and then probably try to match it again + + in version: '1', db: + # hash with {version: '1'} is expected to have db: key + puts "database configuration: #{db}" + + in version: '2', connections: {database:} + # hash with {version: '2'} is expected to have nested connection: database: structure + puts "database configuration: #{database}" + + in String => user, String => password + # sometimes connection is passed as just a pair of (user, password) + puts "database configuration: #{user}:#{password}" + + in Hash | Array + raise "Malformed config structure: #{config}" + else + raise "Unrecognized config type: #{config.class}" + end + +See below for more examples and explanations of the syntax. + +== Patterns + +Patterns can be: + +* any Ruby object (matched by === operator, like in +when+); +* array pattern: [, , , ...]; +* hash pattern: {key: , key: , ...}; +* special match-anything pattern: _; +* combination of patterns with |. + +Any pattern can be nested inside array/hash patterns where is specified. + +Array patterns match arrays, or objects that respond to +deconstruct+ (see below about the latter). +Hash patterns match hashes, or objects that respond to +deconstruct_keys+ (see below about the latter). Note that only symbol keys are supported for hash patterns, at least for now. + +An important difference between array and hash patterns behavior is arrays match only a _whole_ array + + case [1, 2, 3] + in [Integer, Integer] + "matched" + else + "not matched" + end + #=> "not matched" + +while the hash matches even if there are other keys besides specified part: + + case {a: 1, b: 2, c: 3} + in {a: Integer} + "matched" + else + "not matched" + end + #=> "matched" + +There is also a way to specify there should be no other keys in the matched hash except those explicitly specified by pattern, with **nil: + + case {a: 1, b: 2} + in {a: Integer, **nil} # this will not match the pattern having keys other than a: + "matched a part" + in {a: Integer, b: Integer, **nil} + "matched a whole" + else + "not matched" + end + #=> "matched a whole" + +Both array and hash patterns support "rest" specification: + + case [1, 2, 3] + in [Integer, *] + "matched" + else + "not matched" + end + #=> "matched" + + case {a: 1, b: 2, c: 3} + in {a: Integer, **} + "matched" + else + "not matched" + end + #=> "matched" + +In +case+ (but not in standalone +in+) statement, parentheses around both kinds of patterns could be omitted + + case [1, 2] + in Integer, Integer + "matched" + else + "not matched" + end + #=> "matched" + + case {a: 1, b: 2, c: 3} + in a: Integer + "matched" + else + "not matched" + end + #=> "matched" + +== Variable binding + +Besides deep structural checks, one of the very important features of the pattern matching is the binding of the matched parts to local variables. The basic form of binding is just specifying => variable_name after the matched (sub)pattern (one might find this similar to storing exceptions in local variables in rescue ExceptionClass => var clause): + + case [1, 2] + in Integer => a, Integer + "matched: #{a}" + else + "not matched" + end + #=> "matched: 1" + + case {a: 1, b: 2, c: 3} + in a: Integer => m + "matched: #{m}" + else + "not matched" + end + #=> "matched: 1" + +If no additional check is required, only binding some part of the data to a variable, a simpler form could be used: + + case [1, 2] + in a, Integer + "matched: #{a}" + else + "not matched" + end + #=> "matched: 1" + + case {a: 1, b: 2, c: 3} + in a: m + "matched: #{m}" + else + "not matched" + end + #=> "matched: 1" + +For hash patterns, even a simpler form exists: key-only specification (without any value) binds the local variable with the key's name, too: + + case {a: 1, b: 2, c: 3} + in a: + "matched: #{a}" + else + "not matched" + end + #=> "matched: 1" + +Binding works for nested patterns as well: + + case {name: 'John', friends: [{name: 'Jane'}, {name: 'Rajesh'}]} + in name:, friends: [{name: first_friend}, *] + "matched: #{first_friend}" + else + "not matched" + end + #=> "matched: Jane" + +The "rest" part of a pattern also can be bound to a variable: + + case [1, 2, 3] + in a, *rest + "matched: #{a}, #{rest}" + else + "not matched" + end + #=> "matched: 1, [2, 3]" + + case {a: 1, b: 2, c: 3} + in a:, **rest + "matched: #{a}, #{rest}" + else + "not matched" + end + #=> "matched: 1, {:b=>2, :c=>3}" + +Binding to variables currently does NOT work for alternative patterns joined with |: + + case {a: 1, b: 2} + in {a: } | Array + "matched: #{a}" + else + "not matched" + end + # SyntaxError (illegal variable in alternative pattern (a)) + +The match-anything pattern _ is the only exclusion from this rule: it still binds the first match to local variable _, but allowed to be used in alternative patterns: + + case {a: 1, b: 2} + in {a: _} | Array + "matched: #{_}" + else + "not matched" + end + # => "matched: 1" + +It is, though, not advised to reuse bound value, as _ pattern's goal is to signify discarded value. + +== Variable pinning + +Due to variable binding feature, existing local variable can't be straightforwardly used as a sub-pattern: + + expectation = 18 + + case [1, 2] + in expectation, *rest + "matched. expectation was: #{expectation}" + else + "not matched. expectation was: #{expectation}" + end + # expected: "not matched. expectation was: 18" + # real: "matched. expectation was: 1" -- local variable just rewritten + +For this case, "variable pinning" operator ^ can be used, to tell Ruby "just use this value as a part of pattern" + + expectation = 18 + case [1, 2] + in ^expectation, *rest + "matched. expectation was: #{expectation}" + else + "not matched. expectation was: #{expectation}" + end + #=> "not matched. expectation was: 18" + +One important usage of variable pinning is specifying the same value should happen in the pattern several times: + + jane = {school: 'high', schools: [{id: 1, level: 'middle'}, {id: 2, level: 'high'}]} + john = {school: 'high', schools: [{id: 1, level: 'middle'}]} + + case jane + in school:, schools: [*, {id:, level: ^school}] # select the last school, level should match + "matched. school: #{id}" + else + "not matched" + end + #=> "matched. school: 2" + + case john # the specified school level is "high", but last school does not match + in school:, schools: [*, {id:, level: ^school}] + "matched. school: #{id}" + else + "not matched" + end + #=> "not matched" + +== Matching non-primitive objects: +deconstruct_keys+ and +deconstruct+ + +As already mentioned above, hash and array patterns besides literal arrays and hashes will try to match any object implementing +deconstruct+ (for array patterns) or +deconstruct_keys+ (for hash patterns). + + class Point + def initialize(x, y) + @x, @y = x, y + end + + def deconstruct + puts "deconstruct called" + [@x, @y] + end + + def deconstruct_keys(keys) + puts "deconstruct_keys called with #{keys.inspect}" + {x: @x, y: @y} + end + end + + case Point.new(1, -2) + in px, Integer # subpatterns and variable binding works + "matched: #{px}" + else + "not matched" + end + # prints "deconstruct called" + "matched: 1" + + case Point.new(1, -2) + in x: 0.. => px + "matched: #{px}" + else + "not matched" + end + # prints: deconstruct_keys called with [:x] + #=> "matched: 1" + ++keys+ are passed to +deconstruct_keys+ to provide a room for optimization in the matched class: if calculating a full hash representation is expensive, one may calculate only the necessary subhash. When the **rest pattern is used, +nil+ is passed as a +keys+ value: + + case Point.new(1, -2) + in x: 0.. => px, **rest + "matched: #{px}" + else + "not matched" + end + # prints: deconstruct_keys called with nil + #=> "matched: 1" + +Additionally, when matching custom classes, expected class could be specified as a part of the pattern and is checked with === + + class SuperPoint < Point + end + + case Point.new(1, -2) + in SuperPoint(x: 0.. => px) + "matched: #{px}" + else + "not matched" + end + #=> "not matched" + + case SuperPoint.new(1, -2) + in SuperPoint[x: 0.. => px] # [] or () parentheses are allowed + "matched: #{px}" + else + "not matched" + end + #=> "matched: 1" + +== Guard clauses + ++if+ can be used to attach an additional condition (guard clause) when the pattern matches. This condition may use bound variables: + + case [1, 2] + in a, b if b == a*2 + "matched" + else + "not matched" + end + #=> "matched" + + case [1, 1] + in a, b if b == a*2 + "matched" + else + "not matched" + end + #=> "not matched" + ++unless+ works, too: + + case [1, 1] + in a, b unless b == a*2 + "matched" + else + "not matched" + end + #=> "matched" + +== Current feature status + +As of Ruby 2.7, feature is considered _experimental_: its syntax can change in the future, and the performance is not optimized yet. Every time you use pattern matching in code, the warning will be printed: + + {a: 1, b: 2} in {a:} + # warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby! + +To suppress this warning, one may use newly introduced Warning::[]= method: + + Warning[:experimental] = false + eval('{a: 1, b: 2} in {a:}') + # ...no warning printed... + +Note that pattern-matching warning is raised at a compile time, so this will not suppress warning: + + Warning[:experimental] = false # At the time this line is evaluated, the parsing happened and warning emitted + {a: 1, b: 2} in {a:} + +So, only subsequently loaded files or `eval`-ed code is affected by switching the flag. + +Alternatively, command-line key -W:no-experimental can be used to turn off "experimental" feature warnings. + +One of the things developer should be aware of, which probably to be fixed in the upcoming versions, is that pattern matching statement rewrites mentioned local variables on partial match, even if the whole pattern is not matched. + + a = 5 + case [1, 2] + in String => a, String + "matched" + else + "not matched" + end + #=> "not matched" + a + #=> 5 -- even partial match not happened, a is not rewritten + + case [1, 2] + in a, String + "matched" + else + "not matched" + end + #=> "not matched" + a + #=> 1 -- the whole pattern not matched, but partial match happened, a is rewritten + +Currently, the only core class implementing +deconstruct+ and +deconstruct_keys+ is Struct. + + Point = Struct.new(:x, :y) + Point[1, 2] in [a, b] + # successful match + Point[1, 2] in {x:, y:} + # successful match From f88d209bb7167c495a172bf9ede4bbbe6288545d Mon Sep 17 00:00:00 2001 From: git Date: Mon, 24 Feb 2020 00:28:34 +0900 Subject: [PATCH 847/878] * 2020-02-24 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 359b7b2256f2fe..78620af95bda49 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" From 6f92c62084b283820f80a4facda9c16e1408fdca Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 24 Feb 2020 12:27:36 +0900 Subject: [PATCH 848/878] Update bundled gems --- gems/bundled_gems | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gems/bundled_gems b/gems/bundled_gems index 68bca73d544fb3..19ca90b61791e1 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -1,6 +1,6 @@ -minitest 5.13.0 https://github.com/seattlerb/minitest -power_assert 1.1.5 https://github.com/k-tsj/power_assert +minitest 5.14.0 https://github.com/seattlerb/minitest +power_assert 1.1.6 https://github.com/k-tsj/power_assert rake 13.0.1 https://github.com/ruby/rake -test-unit 3.3.4 https://github.com/test-unit/test-unit -rexml 3.2.3 https://github.com/ruby/rexml -rss 0.2.8 https://github.com/ruby/rss +test-unit 3.3.5 https://github.com/test-unit/test-unit +rexml 3.2.4 https://github.com/ruby/rexml +rss 0.2.9 https://github.com/ruby/rss From 116b9e6a16c72276e92578b761846d05eaa3eff6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 24 Feb 2020 12:32:50 +0900 Subject: [PATCH 849/878] Retry checking out the version rss 0.2.9 is tagged without the "v" prefix. --- tool/fetch-bundled_gems.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb index c2a1c0b70053a3..5769a19b37ec67 100755 --- a/tool/fetch-bundled_gems.rb +++ b/tool/fetch-bundled_gems.rb @@ -26,4 +26,8 @@ puts "retrieving #{n} ..." system(*%W"git clone #{u} #{n}") or abort end -system(*%W"git checkout #{v}", chdir: n) or abort +unless system(*%W"git checkout #{v}", chdir: n) + unless v.sub!(/\Av/, '') and system(*%W"git checkout #{v}", chdir: n) + abort + end +end From f8401732dea7b22c849cefc722d7d7f41f2ddd1b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 24 Feb 2020 12:40:34 +0900 Subject: [PATCH 850/878] Try with and without "v" prefix for numeric tag --- tool/fetch-bundled_gems.rb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb index 5769a19b37ec67..28ae3d43275395 100755 --- a/tool/fetch-bundled_gems.rb +++ b/tool/fetch-bundled_gems.rb @@ -9,25 +9,16 @@ } n, v, u = $F -case n -when "test-unit" -else - v = "v" + v -end if File.directory?(n) puts "updating #{n} ..." - if v == "master" - system(*%W"git pull", chdir: n) or abort - else - system(*%W"git fetch", chdir: n) or abort - end + system("git", (v == "master" ? "pull" : "fetch"), chdir: n) or abort else puts "retrieving #{n} ..." system(*%W"git clone #{u} #{n}") or abort end -unless system(*%W"git checkout #{v}", chdir: n) - unless v.sub!(/\Av/, '') and system(*%W"git checkout #{v}", chdir: n) +unless system(*%W"git checkout #{v.sub(/\A(?=\d)/, 'v')}", chdir: n) + unless /\A\d/ =~ v and system(*%W"git checkout #{v}", chdir: n) abort end end From 8b6e2685a4b7c7de905f7ed60c02ef85e0724754 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 24 Feb 2020 15:33:50 +0900 Subject: [PATCH 851/878] Fixed symbol misused as ID `rb_funcallv_public` and `rb_respond_to` require an `ID`, not a `Symbol`. [Bug #16649] --- common.mk | 1 + test/ruby/test_transcode.rb | 8 ++++++++ transcode.c | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index 5680573bd28984..7369d26bf0b941 100644 --- a/common.mk +++ b/common.mk @@ -3954,6 +3954,7 @@ transcode.$(OBJEXT): {$(VPATH)}assert.h transcode.$(OBJEXT): {$(VPATH)}config.h transcode.$(OBJEXT): {$(VPATH)}defines.h transcode.$(OBJEXT): {$(VPATH)}encoding.h +transcode.$(OBJEXT): {$(VPATH)}id.h transcode.$(OBJEXT): {$(VPATH)}intern.h transcode.$(OBJEXT): {$(VPATH)}internal.h transcode.$(OBJEXT): {$(VPATH)}missing.h diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 3466a3bf933c49..0f6b787fa18b5b 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -2183,6 +2183,14 @@ def (fallback = "U+%.4X").escape(x) assert_equal("U+3042", "\u{3042}".encode("US-ASCII", fallback: fallback.method(:escape))) end + def test_fallback_aref + fallback = Object.new + def fallback.[](x) + "U+%.4X" % x.unpack("U") + end + assert_equal("U+3042", "\u{3042}".encode("US-ASCII", fallback: fallback)) + end + bug8940 = '[ruby-core:57318] [Bug #8940]' %w[UTF-32 UTF-16].each do |enc| define_method("test_pseudo_encoding_inspect(#{enc})") do diff --git a/transcode.c b/transcode.c index 12c35f99df33c2..5f4a7b9b5d0944 100644 --- a/transcode.c +++ b/transcode.c @@ -21,6 +21,7 @@ #include "ruby/encoding.h" #include "transcode_data.h" +#include "id.h" #define ENABLE_ECONV_NEWLINE_OPTION 1 @@ -31,7 +32,7 @@ static VALUE rb_eConverterNotFoundError; VALUE rb_cEncodingConverter; -static VALUE sym_invalid, sym_undef, sym_replace, sym_fallback, sym_aref; +static VALUE sym_invalid, sym_undef, sym_replace, sym_fallback; static VALUE sym_xml, sym_text, sym_attr; static VALUE sym_universal_newline; static VALUE sym_crlf_newline; @@ -2249,7 +2250,7 @@ method_fallback(VALUE fallback, VALUE c) static VALUE aref_fallback(VALUE fallback, VALUE c) { - return rb_funcall3(fallback, sym_aref, 1, &c); + return rb_funcallv_public(fallback, idAREF, 1, &c); } static void @@ -2550,7 +2551,7 @@ rb_econv_prepare_options(VALUE opthash, VALUE *opts, int ecflags) if (!NIL_P(v)) { VALUE h = rb_check_hash_type(v); if (NIL_P(h) - ? (rb_obj_is_proc(v) || rb_obj_is_method(v) || rb_respond_to(v, sym_aref)) + ? (rb_obj_is_proc(v) || rb_obj_is_method(v) || rb_respond_to(v, idAREF)) : (v = h, 1)) { if (NIL_P(newhash)) newhash = rb_hash_new(); @@ -4423,7 +4424,6 @@ Init_transcode(void) sym_undef = ID2SYM(rb_intern("undef")); sym_replace = ID2SYM(rb_intern("replace")); sym_fallback = ID2SYM(rb_intern("fallback")); - sym_aref = ID2SYM(rb_intern("[]")); sym_xml = ID2SYM(rb_intern("xml")); sym_text = ID2SYM(rb_intern("text")); sym_attr = ID2SYM(rb_intern("attr")); From fa1ec60424a80286a96dc746339be5a37df82def Mon Sep 17 00:00:00 2001 From: Masataka Pocke Kuwabara Date: Mon, 24 Feb 2020 16:37:33 +0900 Subject: [PATCH 852/878] Fix wrong documentation for return value of Pathname#fnmatch --- ext/pathname/pathname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 458846db27763d..ac0ab91987ddbf 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -610,8 +610,8 @@ path_lchown(VALUE self, VALUE owner, VALUE group) /* * call-seq: - * pathname.fnmatch(pattern, [flags]) -> string - * pathname.fnmatch?(pattern, [flags]) -> string + * pathname.fnmatch(pattern, [flags]) -> true or false + * pathname.fnmatch?(pattern, [flags]) -> true or false * * Return +true+ if the receiver matches the given pattern. * From 82d27604adba94e147c1e848f80329a8286bde5c Mon Sep 17 00:00:00 2001 From: git Date: Tue, 25 Feb 2020 12:53:56 +0900 Subject: [PATCH 853/878] * 2020-02-25 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 78620af95bda49..9f9b83b00bbd0d 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" From 7ec23593746c8ccabd6c005cc34dde77d564c6c9 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 25 Feb 2020 11:03:17 +0900 Subject: [PATCH 854/878] prevent GC from mjit worker. ALLOC_N() can causes GC. Sometimes `mjit_copy_job_handler()` can be called by mjit_worker thread which is not a Ruby thread, so we need to prevent GC in this function. This patch has some issues, but I introduce it to pass the tests. --- mjit.c | 15 +++++++++------ mjit_worker.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mjit.c b/mjit.c index d3cb063ff9d838..bcf773d2d762a7 100644 --- a/mjit.c +++ b/mjit.c @@ -54,13 +54,13 @@ mjit_copy_job_handler(void *data) } const struct rb_iseq_constant_body *body = job->iseq->body; - unsigned int ci_size = body->ci_size; + const unsigned int ci_size = body->ci_size; if (ci_size > 0) { - const struct rb_callcache **cc_entries = ALLOC_N(const struct rb_callcache *, ci_size); - if (body->jit_unit == NULL) { - create_unit(job->iseq); - } - body->jit_unit->cc_entries = cc_entries; + VM_ASSERT(body->jit_unit != NULL); + VM_ASSERT(body->jit_unit->cc_entries != NULL); + + const struct rb_callcache **cc_entries = body->jit_unit->cc_entries; + for (unsigned int i=0; icall_data[i].cc; } @@ -294,6 +294,9 @@ create_unit(const rb_iseq_t *iseq) unit->id = current_unit_num++; unit->iseq = (rb_iseq_t *)iseq; + if (iseq->body->ci_size > 0) { + unit->cc_entries = ALLOC_N(const struct rb_callcache *, iseq->body->ci_size); + } iseq->body->jit_unit = unit; } diff --git a/mjit_worker.c b/mjit_worker.c index 85411847d7f7c2..d074b7b957ca74 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -1131,6 +1131,20 @@ mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, union iseq_inline_storag CRITICAL_SECTION_FINISH(3, "in mjit_copy_cache_from_main_thread"); if (UNLIKELY(mjit_opts.wait)) { + // setup pseudo jit_unit + if (iseq->body->jit_unit == NULL) { + // This function is invoked in mjit worker thread, so GC should not be invoked. + // To prevent GC with xmalloc(), use malloc() directly here. + // However, mixing xmalloc() and malloc() will cause another issue. + // TODO: fix this allocation code. + iseq->body->jit_unit = (struct rb_mjit_unit *)malloc(sizeof(struct rb_mjit_unit)); + if (iseq->body->jit_unit == NULL) rb_fatal("malloc failed"); + if (iseq->body->ci_size > 0) { + iseq->body->jit_unit->cc_entries = + (const struct rb_callcache **)malloc(sizeof(const struct rb_callcache *) * iseq->body->ci_size); + if (iseq->body->jit_unit->cc_entries == NULL) rb_fatal("malloc failed"); + } + } mjit_copy_job_handler((void *)job); } else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) { From 670b7be6c5fb9c3438fb6e36070401f25806f725 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 25 Feb 2020 13:12:53 +0900 Subject: [PATCH 855/878] should count only string. This code can generate CC objects so we only need to count existing String objects. --- test/ruby/test_hash.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 98ddbef1eb9b19..3c799b7a04b424 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -266,10 +266,13 @@ def test_ASET # '[]=' end def test_AREF_fstring_key + # warmup ObjectSpace.count_objects + ObjectSpace.count_objects + h = {"abc" => 1} - before = GC.stat(:total_allocated_objects) + before = ObjectSpace.count_objects[:T_STRING] 5.times{ h["abc"] } - assert_equal before, GC.stat(:total_allocated_objects) + assert_equal before, ObjectSpace.count_objects[:T_STRING] end def test_ASET_fstring_key From 84d1a99a3fc76b4bcd5fc382e5b30a466b124493 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 25 Feb 2020 13:37:52 +0900 Subject: [PATCH 856/878] should be initialize jit_unit->cc_entries. GC can invoke just after allocation of jit_unit->cc_entries so it should be zero-cleared. --- iseq.c | 4 +++- mjit.c | 2 +- mjit_worker.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/iseq.c b/iseq.c index 25f45a767fb838..40be6c76c4b590 100644 --- a/iseq.c +++ b/iseq.c @@ -363,7 +363,9 @@ rb_iseq_mark(const rb_iseq_t *iseq) // TODO: move to mjit.c? for (unsigned int i=0; ici_size; i++) { const struct rb_callcache *cc = body->jit_unit->cc_entries[i]; - rb_gc_mark((VALUE)cc); // pindown + if (cc != NULL) { + rb_gc_mark((VALUE)cc); // pindown + } } } #endif diff --git a/mjit.c b/mjit.c index bcf773d2d762a7..d2142d99133b23 100644 --- a/mjit.c +++ b/mjit.c @@ -295,7 +295,7 @@ create_unit(const rb_iseq_t *iseq) unit->id = current_unit_num++; unit->iseq = (rb_iseq_t *)iseq; if (iseq->body->ci_size > 0) { - unit->cc_entries = ALLOC_N(const struct rb_callcache *, iseq->body->ci_size); + unit->cc_entries = ZALLOC_N(const struct rb_callcache *, iseq->body->ci_size); } iseq->body->jit_unit = unit; } diff --git a/mjit_worker.c b/mjit_worker.c index d074b7b957ca74..f55942e0dbfbfa 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -1141,7 +1141,7 @@ mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, union iseq_inline_storag if (iseq->body->jit_unit == NULL) rb_fatal("malloc failed"); if (iseq->body->ci_size > 0) { iseq->body->jit_unit->cc_entries = - (const struct rb_callcache **)malloc(sizeof(const struct rb_callcache *) * iseq->body->ci_size); + (const struct rb_callcache **)calloc(iseq->body->ci_size, sizeof(const struct rb_callcache *)); if (iseq->body->jit_unit->cc_entries == NULL) rb_fatal("malloc failed"); } } From 0febd07c698c242109d0171b4ddb8c6722b5df0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Tue, 25 Feb 2020 13:37:32 +0900 Subject: [PATCH 857/878] ext/-test-/cxxanyargs: use try_link instead We would like to skip this extension library when libstdc++ is missing. To avoid such situation let's use try_link instead of try_compile. --- ext/-test-/cxxanyargs/extconf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb index f1289845223921..d1d2469209d6df 100644 --- a/ext/-test-/cxxanyargs/extconf.rb +++ b/ext/-test-/cxxanyargs/extconf.rb @@ -9,7 +9,7 @@ cxx.instance_variable_set(:'@have_devel', true) -ok = cxx.try_compile(<<~'begin', "") do |x| +ok = cxx.try_link(<<~'begin', "") do |x| #include "ruby/config.h" namespace { From a504535dd4044bc8b2daf73076e01028da5ad58a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 25 Feb 2020 17:47:17 +0900 Subject: [PATCH 858/878] Prefer dedicated assertion method --- test/ostruct/test_ostruct.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index 61a4822810a978..afe6affdc06eac 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -179,7 +179,7 @@ def test_method_missing def test_accessor_defines_method os = OpenStruct.new(foo: 42) - assert os.respond_to? :foo + assert_respond_to(os, :foo) assert_equal([], os.singleton_methods) assert_equal(42, os.foo) assert_equal([:foo, :foo=], os.singleton_methods.sort) From 55bf0ef1aa7c936b564b883196de1ace4be4cc7e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 23 Feb 2020 17:59:38 +0900 Subject: [PATCH 859/878] Share extracted bundled gems with gems for bundler Extract bundled gems under ".bundle/gems" and get rid of duplication which cause constant redefinition warnings at `test-all` after `extract-gems` and `test-bundler`. --- common.mk | 9 +++++---- tool/rbinstall.rb | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common.mk b/common.mk index 7369d26bf0b941..57e11abb488cae 100644 --- a/common.mk +++ b/common.mk @@ -1290,11 +1290,12 @@ update-gems: PHONY extract-gems: PHONY $(ECHO) Extracting bundled gem files... - $(Q) $(RUNRUBY) -C "$(srcdir)/gems" \ - -I../tool -rgem-unpack -answ \ + $(Q) $(RUNRUBY) -C "$(srcdir)" \ + -Itool -rgem-unpack -answ \ + -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \ -e 'gem, ver = *$$F' \ - -e 'Gem.unpack("#{gem}-#{ver}.gem")' \ - bundled_gems + -e 'Gem.unpack("gems/#{gem}-#{ver}.gem", d)' \ + gems/bundled_gems update-bundled_gems: PHONY $(Q) $(RUNRUBY) -rrubygems \ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 341adbf76571cd..a9b6b9b1797cf2 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -878,11 +878,14 @@ def install_default_gem(dir, srcdir) } gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir - dirs = Gem::Util.glob_files_in_dir "*/", "#{srcdir}/gems" - Gem::Specification.each_gemspec(dirs) do |path| + File.foreach("#{srcdir}/gems/bundled_gems") do |name| + next unless /^(\S+)\s+(S+).*/ =~ name + gem_name = "#$1-#$2" + path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec" + next unless File.exist?(path) spec = load_gemspec(path) next unless spec.platform == Gem::Platform::RUBY - next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] + next unless spec.full_name == gem_name spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") spec.extensions[0] ||= "-" From 66d1900423e6fb9774c2fe72dba8c2968b54d7ab Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 25 Feb 2020 09:27:11 -0800 Subject: [PATCH 860/878] Increase timeout for CSV test with --jit-wait To prevent CI failures like http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2739995 --- test/csv/parse/test_general.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/csv/parse/test_general.rb b/test/csv/parse/test_general.rb index 655bb26560e2b7..4da177500bde0f 100644 --- a/test/csv/parse/test_general.rb +++ b/test/csv/parse/test_general.rb @@ -246,7 +246,8 @@ def test_seeked_string_io private def assert_parse_errors_out(data, **options) assert_raise(CSV::MalformedCSVError) do - Timeout.timeout(0.2) do + timeout = (RubyVM::MJIT.enabled? ? 5 : 0.2) # for --jit-wait + Timeout.timeout(timeout) do CSV.parse(data, **options) fail("Parse didn't error out") end From 6c66761c1f947a2c4b5953c8f40e59596648b586 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 26 Feb 2020 02:27:54 +0900 Subject: [PATCH 861/878] * 2020-02-26 [ci skip] --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 9f9b83b00bbd0d..be719b0b11648c 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" From 672213ef1ca2b71312084057e27580b340438796 Mon Sep 17 00:00:00 2001 From: "Chelsea Corvus (Battell)" Date: Tue, 25 Feb 2020 13:43:17 -0500 Subject: [PATCH 862/878] Document that Array#index and find_index are aliases [ci skip] --- array.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/array.c b/array.c index c1f8071a218585..d5650cfeedfad2 100644 --- a/array.c +++ b/array.c @@ -1774,6 +1774,8 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary) * a.index("b") #=> 1 * a.index("z") #=> nil * a.index {|x| x == "b"} #=> 1 + * + * Array#index is an alias for Array#find_index. */ static VALUE From 0686e4181d04dd911316a227753ceaa96d8c6533 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 26 Feb 2020 10:16:32 +0900 Subject: [PATCH 863/878] Fixed for older versions Fix up 66d1900423e6fb9774c2fe72dba8c2968b54d7ab, `RubyVM::MJIT` is available since ruby 2.6. --- test/csv/parse/test_general.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/csv/parse/test_general.rb b/test/csv/parse/test_general.rb index 4da177500bde0f..52b0cab000f53a 100644 --- a/test/csv/parse/test_general.rb +++ b/test/csv/parse/test_general.rb @@ -246,7 +246,10 @@ def test_seeked_string_io private def assert_parse_errors_out(data, **options) assert_raise(CSV::MalformedCSVError) do - timeout = (RubyVM::MJIT.enabled? ? 5 : 0.2) # for --jit-wait + timeout = 0.2 + if defined?(RubyVM::MJIT.enabled?) and RubyVM::MJIT.enabled? + timeout = 5 # for --jit-wait + end Timeout.timeout(timeout) do CSV.parse(data, **options) fail("Parse didn't error out") From e960ef6f18a25c637c54f00c75bb6c24f8ab55d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 1 Oct 2019 12:03:33 +0200 Subject: [PATCH 864/878] Use `Gem::Package` like object instead of monkey patching. 1. This is similar to what RubyGems does and it is less magic [[1]]. 2. It avoids deprecated code paths in RubyGems [[2]]. [1]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L151 [2]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L187 --- tool/rbinstall.rb | 48 ++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index a9b6b9b1797cf2..7fc01099237ad5 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -706,29 +706,34 @@ def remove_prefix(prefix, string) end end - class UnpackedInstaller < Gem::Installer - module DirPackage - def extract_files(destination_dir, pattern = "*") - path = File.dirname(@gem.path) - return if path == destination_dir - File.chmod(0700, destination_dir) - mode = pattern == "bin/*" ? $script_mode : $data_mode - spec.files.each do |f| - src = File.join(path, f) - dest = File.join(without_destdir(destination_dir), f) - makedirs(dest[/.*(?=\/)/m]) - install src, dest, :mode => mode - end - File.chmod($dir_mode, destination_dir) + class DirPackage + attr_reader :spec + + attr_accessor :dir_mode + attr_accessor :prog_mode + attr_accessor :data_mode + + def initialize(spec) + @spec = spec + @src_dir = File.dirname(@spec.loaded_from) + end + + def extract_files(destination_dir, pattern = "*") + path = @src_dir + return if path == destination_dir + File.chmod(0700, destination_dir) + mode = pattern == "bin/*" ? $script_mode : $data_mode + spec.files.each do |f| + src = File.join(path, f) + dest = File.join(without_destdir(destination_dir), f) + makedirs(dest[/.*(?=\/)/m]) + install src, dest, :mode => mode end + File.chmod($dir_mode, destination_dir) end + end - def initialize(spec, *options) - package = Gem::Package.new(spec.loaded_from) - super(package, *options) - @package.extend(DirPackage).spec = spec - end - + class UnpackedInstaller < Gem::Installer def write_cache_file end @@ -890,7 +895,8 @@ def install_default_gem(dir, srcdir) if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") spec.extensions[0] ||= "-" end - ins = RbInstall::UnpackedInstaller.new(spec, options) + package = RbInstall::DirPackage.new spec + ins = RbInstall::UnpackedInstaller.new(package, options) puts "#{INDENT}#{spec.name} #{spec.version}" ins.install File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) From 6609940a5e5c46dcc96d2bd3c228a951df6240ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 1 Oct 2019 12:25:07 +0200 Subject: [PATCH 865/878] Use `$script_mode` instead of `$prog_mode` for gem inistallation. rbinstall is using `$script_mode` and `$prog_mode`. However, the `$script_mode` fallbacks to `$prog_mode` if not provided. However, RubyGems do not distinguish between `$script_mode` and `$prog_mode`: https://github.com/rubygems/rubygems/blame/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L196 https://github.com/rubygems/rubygems/blame/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L515 https://github.com/rubygems/rubygems/blame/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L543 Comparing the usage of `$script_mode` and `$prog_mode`, it seems that the `$script_mode` should be used where RubyGems expects `$prog_mode`. --- tool/rbinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 7fc01099237ad5..fbf818fe348416 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -877,7 +877,7 @@ def install_default_gem(dir, srcdir) :ignore_dependencies => true, :dir_mode => $dir_mode, :data_mode => $data_mode, - :prog_mode => $prog_mode, + :prog_mode => $script_mode, :wrappers => true, :format_executable => true, } From c9fab1ac06b83679b265c011481c80387c008735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 1 Oct 2019 12:39:31 +0200 Subject: [PATCH 866/878] Use local `{dir,prog,data}_mode` variables instead of globals. This just gets the `RbInstall::DirPackage` closer by functionality to `Gem::Package`. --- tool/rbinstall.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index fbf818fe348416..cbc71806f6d5dc 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -722,14 +722,14 @@ def extract_files(destination_dir, pattern = "*") path = @src_dir return if path == destination_dir File.chmod(0700, destination_dir) - mode = pattern == "bin/*" ? $script_mode : $data_mode + mode = pattern == "bin/*" ? prog_mode : data_mode spec.files.each do |f| src = File.join(path, f) dest = File.join(without_destdir(destination_dir), f) makedirs(dest[/.*(?=\/)/m]) install src, dest, :mode => mode end - File.chmod($dir_mode, destination_dir) + File.chmod(dir_mode, destination_dir) end end From e087b029e54776afe2b120974932dd707fee6874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 11 Oct 2019 17:56:28 +0200 Subject: [PATCH 867/878] Use class variable `@src_dir` instead of local `path`. The local `path` variable does not provide any additional value and was kept around just for clarity for easier review of the `extrac_files` method move. --- tool/rbinstall.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index cbc71806f6d5dc..b6e75f9a977556 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -719,12 +719,11 @@ def initialize(spec) end def extract_files(destination_dir, pattern = "*") - path = @src_dir - return if path == destination_dir + return if @src_dir == destination_dir File.chmod(0700, destination_dir) mode = pattern == "bin/*" ? prog_mode : data_mode spec.files.each do |f| - src = File.join(path, f) + src = File.join(@src_dir, f) dest = File.join(without_destdir(destination_dir), f) makedirs(dest[/.*(?=\/)/m]) install src, dest, :mode => mode From b8a8fdba637589ff17f98cee4ea955667e3f0b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 14 Oct 2019 18:28:37 +0200 Subject: [PATCH 868/878] Properly detect mode for binaries. .gemspec files specifies not just `bin`, but also other directories. --- tool/rbinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b6e75f9a977556..5423920da74c96 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -721,7 +721,7 @@ def initialize(spec) def extract_files(destination_dir, pattern = "*") return if @src_dir == destination_dir File.chmod(0700, destination_dir) - mode = pattern == "bin/*" ? prog_mode : data_mode + mode = pattern == File.join(spec.bindir, '*') ? prog_mode : data_mode spec.files.each do |f| src = File.join(@src_dir, f) dest = File.join(without_destdir(destination_dir), f) From 9d6d531527f8ca0d2f40ab99f6a5989934b9bd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 15 Oct 2019 15:15:25 +0200 Subject: [PATCH 869/878] Cache destination dir. It is not necessary to strip the `destdir` prefix every iteration, when it can be done just once. --- tool/rbinstall.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 5423920da74c96..333369293a51b8 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -722,9 +722,10 @@ def extract_files(destination_dir, pattern = "*") return if @src_dir == destination_dir File.chmod(0700, destination_dir) mode = pattern == File.join(spec.bindir, '*') ? prog_mode : data_mode + destdir = without_destdir(destination_dir) spec.files.each do |f| src = File.join(@src_dir, f) - dest = File.join(without_destdir(destination_dir), f) + dest = File.join(destdir, f) makedirs(dest[/.*(?=\/)/m]) install src, dest, :mode => mode end From acf6b959586610ee502be3c7dddf42fd28b3c3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 12:31:44 +0900 Subject: [PATCH 870/878] .travis.yml: ruby_2_7 is travis ready. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d1d1ebd0491da..51498ec9465728 100644 --- a/.travis.yml +++ b/.travis.yml @@ -545,6 +545,7 @@ branches: - ruby_2_4 - ruby_2_5 - ruby_2_6 + - ruby_2_7 # We want to be notified when something happens. notifications: From cec7ef5933799c1dc88b0dab05d0eba24eaeda70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 12:33:43 +0900 Subject: [PATCH 871/878] .travis.yml delete darwin debug code Darwin is no longer tested using Travis CI. See also commit 91aa8bfff8a9f9c0af96915c120d863fc474e8d5 --- .travis.yml | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51498ec9465728..b734442860e53e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -461,7 +461,6 @@ matrix: fast_finish: true before_script: - - date # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759 - dpkg --print-architecture - dpkg --print-foreign-architectures - setarch --list @@ -479,9 +478,9 @@ before_script: - "> config.status" - "> .rbconfig.time" - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile - - date; make touch-unicode-files - - date; make -s $JOBS $UPDATE_UNICODE up - - date; make -s $JOBS srcs + - make touch-unicode-files + - make -s $JOBS $UPDATE_UNICODE up + - make -s $JOBS srcs - rm -f config.status Makefile rbconfig.rb .rbconfig.time - |- if [ -d ~/config_2nd ]; then @@ -513,19 +512,7 @@ before_script: - mv ../config_2nd ~ - chmod u-w .. - $SETARCH make -s $JOBS - - |- - date; : # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759 - if ! make install; then - if [ "$(uname)" = Darwin ]; then - # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759 - set -x - date - ./miniruby -e 'ARGV.map{|path|[path,File.stat(path)]}.sort_by{|path,st|st.mtime}.each{|path,st|p mtime:st.mtime.to_f, ctime:st.ctime.to_f, path:path}' .ext/.timestamp/.RUBYCOMMONDIR*time .ext/common/bigdecimal/*.rb ../ext/bigdecimal/lib/bigdecimal/*.rb . .. .ext .ext/common .ext/common/bigdecimal ext/bigdecimal ../ext ../ext/bigdecimal ../ext/bigdecimal/lib ../ext/bigdecimal/lib/bigdecimal - make COPY='cp -f' install - else - exit 1 - fi - fi + - $SETARCH make -s install - ccache --show-stats - |- [ -z "${GEMS_FOR_TEST}" ] || From 9a9f991b1b4341b47ce08b793142d60089f039f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 12:39:16 +0900 Subject: [PATCH 872/878] .travis.yml: mandate UBSAN It seems UBSAN is quite stable now. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b734442860e53e..55b087baec6cb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -457,7 +457,6 @@ matrix: allow_failures: - name: -fsanitize=address - name: -fsanitize=memory - - name: -fsanitize=undefined fast_finish: true before_script: @@ -512,7 +511,7 @@ before_script: - mv ../config_2nd ~ - chmod u-w .. - $SETARCH make -s $JOBS - - $SETARCH make -s install + - make -s install - ccache --show-stats - |- [ -z "${GEMS_FOR_TEST}" ] || From 041f460cab16e773fdadc6a9985145c575e85ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 13:20:56 +0900 Subject: [PATCH 873/878] .travis.yml: favor >- over |- and backslash --- .travis.yml | 138 ++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55b087baec6cb9..87da998e788959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,22 +72,22 @@ env: - bash -cx "${BEFORE_INSTALL}" - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - - |- - tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ - ccache \ - gcc-8 \ - g++-8 \ - libffi-dev \ - libgdbm-dev \ - libgmp-dev \ - libjemalloc-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libreadline6-dev \ - libssl-dev \ - libyaml-dev \ - openssl \ - valgrind \ + - >- + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install + ccache + gcc-8 + g++-8 + libffi-dev + libgdbm-dev + libgmp-dev + libjemalloc-dev + libncurses5-dev + libncursesw5-dev + libreadline6-dev + libssl-dev + libyaml-dev + openssl + valgrind zlib1g-dev - &clang-8 @@ -101,21 +101,21 @@ env: retries: true before_install: - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - - |- - tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ - clang-8 \ - llvm-8-tools \ - libffi-dev \ - libgdbm-dev \ - libgmp-dev \ - libjemalloc-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libreadline6-dev \ - libssl-dev \ - libyaml-dev \ - openssl \ - valgrind \ + - >- + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install + clang-8 + llvm-8-tools + libffi-dev + libgdbm-dev + libgmp-dev + libjemalloc-dev + libncurses5-dev + libncursesw5-dev + libreadline6-dev + libssl-dev + libyaml-dev + openssl + valgrind zlib1g-dev # -------- @@ -276,25 +276,25 @@ env: before_install: - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - - |- - tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ - gcc-8-multilib \ - g++-8 \ - g++-8-multilib \ - libstdc++-8-dev:i386 \ - libffi-dev:i386 \ - libffi6:i386 \ - libgdbm-dev:i386 \ - libgdbm3:i386 \ - libncurses5-dev:i386 \ - libncurses5:i386 \ - libncursesw5-dev:i386 \ - libreadline6-dev:i386 \ - libreadline6:i386 \ - libssl-dev:i386 \ - libssl1.0.0:i386 \ - linux-libc-dev:i386 \ - zlib1g-dev:i386 \ + - >- + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install + gcc-8-multilib + g++-8 + g++-8-multilib + libstdc++-8-dev:i386 + libffi-dev:i386 + libffi6:i386 + libgdbm-dev:i386 + libgdbm3:i386 + libncurses5-dev:i386 + libncurses5:i386 + libncursesw5-dev:i386 + libreadline6-dev:i386 + libreadline6:i386 + libssl-dev:i386 + libssl1.0.0:i386 + linux-libc-dev:i386 + zlib1g-dev:i386 zlib1g:i386 - &arm32-linux @@ -308,25 +308,25 @@ env: before_install: - sudo dpkg --add-architecture armhf - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - - |- - tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ - ccache \ - crossbuild-essential-armhf \ - libc6:armhf \ - libstdc++-5-dev:armhf \ - libffi-dev:armhf \ - libffi6:armhf \ - libgdbm-dev:armhf \ - libgdbm3:armhf \ - libncurses5-dev:armhf \ - libncurses5:armhf \ - libncursesw5-dev:armhf \ - libreadline6-dev:armhf \ - libreadline6:armhf \ - libssl-dev:armhf \ - libssl1.0.0:armhf \ - linux-libc-dev:armhf \ - zlib1g-dev:armhf \ + - >- + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install + ccache + crossbuild-essential-armhf + libc6:armhf + libstdc++-5-dev:armhf + libffi-dev:armhf + libffi6:armhf + libgdbm-dev:armhf + libgdbm3:armhf + libncurses5-dev:armhf + libncurses5:armhf + libncursesw5-dev:armhf + libreadline6-dev:armhf + libreadline6:armhf + libssl-dev:armhf + libssl1.0.0:armhf + linux-libc-dev:armhf + zlib1g-dev:armhf zlib1g:armhf - &pedanticism From 344c449d3ed992748d3695d7178dd7b8d35bfa32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 12:41:33 +0900 Subject: [PATCH 874/878] .travis.yml, .github: delete environmental dumps They were necessary when developing YAMLs, but not useful any longer. --- .github/workflows/ubuntu.yml | 26 -------------------------- .travis.yml | 11 ----------- 2 files changed, 37 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index bb174fd650e492..9d8e44f425d936 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,32 +23,6 @@ jobs: runs-on: ${{ matrix.os }} if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - - run: env | sort - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - - name: Dump job context - env: - JOB_CONTEXT: ${{ toJson(job) }} - run: echo "$JOB_CONTEXT" - - name: Dump steps context - env: - STEPS_CONTEXT: ${{ toJson(steps) }} - run: echo "$STEPS_CONTEXT" - - name: Dump runner context - env: - RUNNER_CONTEXT: ${{ toJson(runner) }} - run: echo "$RUNNER_CONTEXT" - - name: Dump strategy context - env: - STRATEGY_CONTEXT: ${{ toJson(strategy) }} - run: echo "$STRATEGY_CONTEXT" - - name: Dump matrix context - env: - MATRIX_CONTEXT: ${{ toJson(matrix) }} - run: echo "$MATRIX_CONTEXT" - - name: Install libraries run: | set -x diff --git a/.travis.yml b/.travis.yml index 87da998e788959..c2546c06e6cd09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -460,16 +460,7 @@ matrix: fast_finish: true before_script: - - dpkg --print-architecture - - dpkg --print-foreign-architectures - - setarch --list - - echo JOBS=${JOBS} SETARCH=${SETARCH} - - $SETARCH uname -a - - $SETARCH uname -r - - ip a - - cat /etc/hosts - rm -fr .ext autom4te.cache - - echo $TERM - |- [ -d ~/.downloaded-cache ] || mkdir ~/.downloaded-cache @@ -491,7 +482,6 @@ before_script: - chmod -R a-w . - chmod -R u+w build config_1st config_2nd - cd build - - ccache --show-stats - |- case "$CC" in gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";; @@ -512,7 +502,6 @@ before_script: - chmod u-w .. - $SETARCH make -s $JOBS - make -s install - - ccache --show-stats - |- [ -z "${GEMS_FOR_TEST}" ] || $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST From 2177a52d33bc0baef516bcab8fe443102171a525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 12:52:07 +0900 Subject: [PATCH 875/878] .github: less verbose on: specifier The `branch:` specifier was necessary before, to prevent double-testing master and trunk. Now that we no longer have trunk, we can slim the expressions. See also: https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#on --- .github/workflows/macos.yml | 8 +------- .github/workflows/mingw.yml | 8 +------- .github/workflows/mjit.yml | 8 +------- .github/workflows/ubuntu.yml | 8 +------- .github/workflows/windows.yml | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7203db371da18e..dcfc0bd587f0c7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,11 +1,5 @@ name: macOS -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' +on: [push, pull_request] jobs: make: runs-on: macos-latest diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 1596adef49129b..508e01868f4c38 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -1,11 +1,5 @@ name: MinGW -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' +on: [push, pull_request] # Notes: # Action ENV TEMP and TMP are short 8.3 paths, but the long path differs. diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index d87f4fbba3745b..b3d7fd1799b7dd 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -1,11 +1,5 @@ name: MJIT -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' +on: [push, pull_request] jobs: make: strategy: diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9d8e44f425d936..0246689ccfc9e3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,11 +1,5 @@ name: Ubuntu -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' +on: [push, pull_request] jobs: make: strategy: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3e466fd441762c..c2f8f7490acbb6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,11 +1,5 @@ name: Windows -on: - push: - branches: - - '*' - pull_request: - branches: - - '*' +on: [push, pull_request] jobs: make: strategy: From 732442f7f9acec1b94dc59786610d71e67debe52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 13:12:46 +0900 Subject: [PATCH 876/878] .github: make use of working-directory One can specify working directory of a step, no by `cd foo` inside of the run. See also https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun --- .github/workflows/macos.yml | 32 +++++++++++++---------------- .github/workflows/mingw.yml | 18 ++++++++++------- .github/workflows/mjit.yml | 38 ++++++++++++++++++----------------- .github/workflows/ubuntu.yml | 30 +++++++++++++-------------- .github/workflows/windows.yml | 9 +++++---- 5 files changed, 64 insertions(+), 63 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dcfc0bd587f0c7..9c3662232da154 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -29,35 +29,31 @@ jobs: - name: Install libraries run: | export WAITS='5 60' - cd src tool/travis_retry.sh brew upgrade tool/travis_retry.sh brew install gdbm gmp libffi openssl@1.1 zlib autoconf automake libtool readline + working-directory: src - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu))) - - name: Autoconf - run: | - cd src - autoconf - - name: Configure - run: | - mkdir build - cd build - ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline) - - name: Make - run: make -C build $JOBS - - name: Extract gems - run: make -C build update-gems extract-gems + - run: autoconf + working-directory: src + - run: mkdir build + - run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline) + working-directory: build + - run: make $JOBS + working-directory: build + - run: make update-gems extract-gems + working-directory: build if: matrix.test_task == 'check' - - name: Tests - run: make -C build $JOBS -s ${{ matrix.test_task }} + - run: make $JOBS -s ${{ matrix.test_task }} + working-directory: build env: RUBY_TESTOPTS: "-q --tty=no" # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved # rss needs to add workaround for the non rexml environment TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss,rexml" - - name: Leaked Globals - run: make -C build -s leaked-globals + - run: make -s leaked-globals + working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 508e01868f4c38..732c22797294ee 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -71,12 +71,12 @@ jobs: sh -c "autoreconf -fi" - name: configure + working-directory: build run: | # Actions uses UTF8, causes test failures, similar to normal OS setup $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - cd build $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST" Write-Host $config_args sh -c "../src/configure --disable-install-doc --prefix=/install $config_args" @@ -84,34 +84,38 @@ jobs: # Get-Content ./config.log | foreach {Write-Output $_} - name: download unicode, gems, etc + working-directory: build run: | $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 - cd build make -j $jobs update-unicode make -j $jobs update-gems - name: make all timeout-minutes: 20 + working-directory: build run: | $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 - make -C build -j $jobs V=1 + make -j $jobs V=1 - name: make install + working-directory: build run: | # Actions uses UTF8, causes test failures, similar to normal OS setup $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - make -C build DESTDIR=.. install-nodoc + make DESTDIR=.. install-nodoc - name: test timeout-minutes: 5 + working-directory: build run: | $env:TMPDIR = "$pwd/temp" - make -C build test + make test - name: test-all timeout-minutes: 25 + working-directory: build run: | $env:TMPDIR = "$pwd/temp" # Actions uses UTF8, causes test failures, similar to normal OS setup @@ -119,10 +123,11 @@ jobs: [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") $jobs = [int]$env:NUMBER_OF_PROCESSORS - make -C build test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" + make test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" - name: test-spec timeout-minutes: 10 + working-directory: src/spec/ruby run: | $env:TMPDIR = "$pwd/temp" $env:PATH = "$pwd/install/bin;$env:PATH" @@ -131,7 +136,6 @@ jobs: [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") ruby -v - cd src/spec/ruby ruby ../mspec/bin/mspec -j - uses: k0kubun/action-slack@v2.0.0 diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index b3d7fd1799b7dd..a71518d228b06d 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -9,6 +9,9 @@ jobs: fail-fast: false runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[ci skip]')" + env: + TESTOPTS: '-q --tty=no' + RUN_OPTS: '--disable-gems --jit-warnings ${{ matrix.jit_opts }}' steps: - name: Install libraries run: | @@ -35,25 +38,24 @@ jobs: - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) - - name: Autoconf - run: cd src && exec autoconf + - run: autoconf + working-directory: src + - run: mkdir build - name: configure - run: | - mkdir build - cd build - ../src/configure -C --disable-install-doc - - name: make all - run: make -C build $JOBS - - name: make install - run: sudo make -C build $JOBS install - - name: make test - run: "make -C build $JOBS -s test TESTOPTS='-q --tty=no' RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'" - - name: make test-all - run: "make -C build $JOBS -s test-all TESTOPTS='-q --tty=no' RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'" - - name: make test-spec - run: "make -C build $JOBS -s test-spec RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'" - - name: Leaked Globals - run: make -C build -s leaked-globals + run: ../src/configure -C --disable-install-doc + working-directory: build + - run: make $JOBS + working-directory: build + - run: sudo make $JOBS -s install + working-directory: build + - run: make $JOBS -s test + working-directory: build + - run: make $JOBS -s test-all + working-directory: build + - run: make $JOBS -s test-spec + working-directory: build + - run: make -s leaked-globals + working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0246689ccfc9e3..f448f20633e521 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -42,32 +42,30 @@ jobs: - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) - - name: Autoconf - run: cd src && exec autoconf - - name: configure - run: | - mkdir build - cd build - ../src/configure -C --disable-install-doc - - name: Make - run: make -C build $JOBS - - name: Extract gems - run: make -C build update-gems extract-gems + - run: autoconf + working-directory: src + - run: mkdir build + - run: ../src/configure -C --disable-install-doc + working-directory: build + - run: make $JOBS + working-directory: build + - run: make update-gems extract-gems + working-directory: build if: matrix.test_task == 'check' - name: Create dummy files in build dir run: | - cd build ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}' + working-directory: build if: matrix.test_task == 'check' - - name: Tests - run: make -C build $JOBS -s ${{ matrix.test_task }} + - run: make $JOBS -s ${{ matrix.test_task }} + working-directory: build env: RUBY_TESTOPTS: "-q --tty=no" # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved # rss needs to add workaround for the non rexml environment TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss" - - name: Leaked Globals - run: make -C build -s leaked-globals + - run: make -s leaked-globals + working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c2f8f7490acbb6..ed2079a610751f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,28 +46,29 @@ jobs: - run: ./src/tool/actions-commit-info.sh shell: bash id: commit_info + - run: md build + shell: cmd - name: Configure run: | - md build - cd build call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" ../src/win32/configure.bat --disable-install-doc --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64" + working-directory: build shell: cmd - name: nmake run: | call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set YACC=win_bison - cd build echo on nmake up nmake extract-gems nmake + working-directory: build shell: cmd - name: nmake test run: | call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cd build nmake ${{ matrix.test_task }} + working-directory: build shell: cmd - uses: k0kubun/action-slack@v2.0.0 with: From 7edf91efe381ec96fc9a24afd1f58c9ea943c330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 13:17:08 +0900 Subject: [PATCH 877/878] .github: let "make leaked-globals" run in parallel This target can be a build matrix. Also it does not make sense to test it on mjit. --- .github/workflows/macos.yml | 4 +--- .github/workflows/mjit.yml | 2 -- .github/workflows/ubuntu.yml | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9c3662232da154..86d1280da32318 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,7 +5,7 @@ jobs: runs-on: macos-latest strategy: matrix: - test_task: [ "check", "test-bundler", "test-bundled-gems" ] + test_task: [ "check", "test-bundler", "test-bundled-gems", "leaked-globals" ] fail-fast: false if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: @@ -52,8 +52,6 @@ jobs: # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved # rss needs to add workaround for the non rexml environment TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss,rexml" - - run: make -s leaked-globals - working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index a71518d228b06d..eaadeca4ce43ad 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -54,8 +54,6 @@ jobs: working-directory: build - run: make $JOBS -s test-spec working-directory: build - - run: make -s leaked-globals - working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f448f20633e521..6d2bdce734837f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -4,7 +4,7 @@ jobs: make: strategy: matrix: - test_task: [ "check", "test-bundler", "test-bundled-gems", "test-all TESTS=--repeat-count=2" ] + test_task: [ "check", "test-bundler", "test-bundled-gems", "test-all TESTS=--repeat-count=2", "leaked-globals" ] os: [ubuntu-latest, ubuntu-16.04] exclude: - test_task: test-bundler @@ -64,8 +64,6 @@ jobs: # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved # rss needs to add workaround for the non rexml environment TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss" - - run: make -s leaked-globals - working-directory: build - uses: k0kubun/action-slack@v2.0.0 with: payload: | From 20045b38d5591c98772d70c0d9ab83d7e6a370ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 26 Feb 2020 14:22:15 +0900 Subject: [PATCH 878/878] test CI --- .travis.yml | 130 ++++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2546c06e6cd09..ba098c1ad6799b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,21 +74,21 @@ env: - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - >- tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install - ccache - gcc-8 - g++-8 - libffi-dev - libgdbm-dev - libgmp-dev - libjemalloc-dev - libncurses5-dev - libncursesw5-dev - libreadline6-dev - libssl-dev - libyaml-dev - openssl - valgrind - zlib1g-dev + ccache + gcc-8 + g++-8 + libffi-dev + libgdbm-dev + libgmp-dev + libjemalloc-dev + libncurses5-dev + libncursesw5-dev + libreadline6-dev + libssl-dev + libyaml-dev + openssl + valgrind + zlib1g-dev - &clang-8 compiler: clang-8 @@ -103,20 +103,20 @@ env: - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - >- tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install - clang-8 - llvm-8-tools - libffi-dev - libgdbm-dev - libgmp-dev - libjemalloc-dev - libncurses5-dev - libncursesw5-dev - libreadline6-dev - libssl-dev - libyaml-dev - openssl - valgrind - zlib1g-dev + clang-8 + llvm-8-tools + libffi-dev + libgdbm-dev + libgmp-dev + libjemalloc-dev + libncurses5-dev + libncursesw5-dev + libreadline6-dev + libssl-dev + libyaml-dev + openssl + valgrind + zlib1g-dev # -------- @@ -278,24 +278,24 @@ env: - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - >- tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install - gcc-8-multilib - g++-8 - g++-8-multilib - libstdc++-8-dev:i386 - libffi-dev:i386 - libffi6:i386 - libgdbm-dev:i386 - libgdbm3:i386 - libncurses5-dev:i386 - libncurses5:i386 - libncursesw5-dev:i386 - libreadline6-dev:i386 - libreadline6:i386 - libssl-dev:i386 - libssl1.0.0:i386 - linux-libc-dev:i386 - zlib1g-dev:i386 - zlib1g:i386 + gcc-8-multilib + g++-8 + g++-8-multilib + libstdc++-8-dev:i386 + libffi-dev:i386 + libffi6:i386 + libgdbm-dev:i386 + libgdbm3:i386 + libncurses5-dev:i386 + libncurses5:i386 + libncursesw5-dev:i386 + libreadline6-dev:i386 + libreadline6:i386 + libssl-dev:i386 + libssl1.0.0:i386 + linux-libc-dev:i386 + zlib1g-dev:i386 + zlib1g:i386 - &arm32-linux name: arm32-linux @@ -310,24 +310,24 @@ env: - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - >- tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install - ccache - crossbuild-essential-armhf - libc6:armhf - libstdc++-5-dev:armhf - libffi-dev:armhf - libffi6:armhf - libgdbm-dev:armhf - libgdbm3:armhf - libncurses5-dev:armhf - libncurses5:armhf - libncursesw5-dev:armhf - libreadline6-dev:armhf - libreadline6:armhf - libssl-dev:armhf - libssl1.0.0:armhf - linux-libc-dev:armhf - zlib1g-dev:armhf - zlib1g:armhf + ccache + crossbuild-essential-armhf + libc6:armhf + libstdc++-5-dev:armhf + libffi-dev:armhf + libffi6:armhf + libgdbm-dev:armhf + libgdbm3:armhf + libncurses5-dev:armhf + libncurses5:armhf + libncursesw5-dev:armhf + libreadline6-dev:armhf + libreadline6:armhf + libssl-dev:armhf + libssl1.0.0:armhf + linux-libc-dev:armhf + zlib1g-dev:armhf + zlib1g:armhf - &pedanticism name: -std=c99 -pedantic