mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
merge revision(s) 979dd02e2f
: [Backport #19262]
Check if the argument is Thread::Backtrace::Location object [Bug #19262] --- ast.c | 5 +++++ test/ruby/test_ast.rb | 6 ++++++ 2 files changed, 11 insertions(+)
This commit is contained in:
parent
08ae7f64dc
commit
1a2447ac99
3 changed files with 12 additions and 1 deletions
5
ast.c
5
ast.c
|
@ -202,6 +202,11 @@ static VALUE
|
|||
node_id_for_backtrace_location(rb_execution_context_t *ec, VALUE module, VALUE location)
|
||||
{
|
||||
int node_id;
|
||||
|
||||
if (!rb_frame_info_p(location)) {
|
||||
rb_raise(rb_eTypeError, "Thread::Backtrace::Location object expected");
|
||||
}
|
||||
|
||||
node_id = rb_get_node_id_from_frame_info(location);
|
||||
if (node_id == -1) {
|
||||
return Qnil;
|
||||
|
|
|
@ -227,6 +227,12 @@ class TestAst < Test::Unit::TestCase
|
|||
assert_equal node.node_id, node_id
|
||||
end
|
||||
|
||||
def test_node_id_for_backtrace_location_raises_argument_error
|
||||
bug19262 = '[ruby-core:111435]'
|
||||
|
||||
assert_raise(TypeError, bug19262) { RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(1) }
|
||||
end
|
||||
|
||||
def test_of_proc_and_method
|
||||
proc = Proc.new { 1 + 2 }
|
||||
method = self.method(__method__)
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
|
||||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
|
||||
#define RUBY_PATCHLEVEL 12
|
||||
#define RUBY_PATCHLEVEL 13
|
||||
|
||||
#include "ruby/version.h"
|
||||
#include "ruby/internal/abi.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue