Skip to content

Commit 4a10bb0

Browse files
committed
Merge branch 'master' into dist/3.4/bookworm
2 parents a335ef8 + b4b34ce commit 4a10bb0

File tree

287 files changed

+22730
-19669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+22730
-19669
lines changed

ChangeLog

Lines changed: 591 additions & 0 deletions
Large diffs are not rendered by default.

bootstraptest/test_method.rb

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,3 +1395,27 @@ def splat_args(*args)
13951395
no_args
13961396
splat_args
13971397
}
1398+
1399+
assert_equal 'ok', %q{
1400+
class A
1401+
private
1402+
def foo = "ng"
1403+
end
1404+
1405+
class B
1406+
def initialize(o)
1407+
@o = o
1408+
end
1409+
1410+
def foo(...) = @o.foo(...)
1411+
def internal_foo = foo
1412+
end
1413+
1414+
b = B.new(A.new)
1415+
1416+
begin
1417+
b.internal_foo
1418+
rescue NoMethodError
1419+
"ok"
1420+
end
1421+
}

common.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17680,6 +17680,7 @@ st.$(OBJEXT): {$(VPATH)}internal/variable.h
1768017680
st.$(OBJEXT): {$(VPATH)}internal/warning_push.h
1768117681
st.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
1768217682
st.$(OBJEXT): {$(VPATH)}missing.h
17683+
st.$(OBJEXT): {$(VPATH)}ruby_assert.h
1768317684
st.$(OBJEXT): {$(VPATH)}st.c
1768417685
st.$(OBJEXT): {$(VPATH)}st.h
1768517686
st.$(OBJEXT): {$(VPATH)}subst.h

compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10643,7 +10643,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
1064310643
if (nd_fl_newline(node)) {
1064410644
int event = RUBY_EVENT_LINE;
1064510645
ISEQ_COMPILE_DATA(iseq)->last_line = line;
10646-
if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
10646+
if (line > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
1064710647
event |= RUBY_EVENT_COVERAGE_LINE;
1064810648
}
1064910649
ADD_TRACE(ret, event);

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
ruby3.4 (3.4.3-0nkmi1~dist) unstable; urgency=medium
2+
3+
* 3.4.3
4+
5+
-- Sorah Fukumori <her@sorah.jp> Sat, 26 Apr 2025 10:58:36 +0900
6+
17
ruby3.4 (3.4.2-0nkmi1~dist) unstable; urgency=medium
28

39
* 3.4.2

ext/ripper/ripper.c

Lines changed: 4730 additions & 4624 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)