Merge remote-tracking branch 'upstream/master' into fix_str_encode_in_ractors

Author: jhawthorn

.github/actions/setup/directories/action.yml

@@ -93,7 +93,7 @@ runs:
         path: ${{ inputs.srcdir }}
         fetch-depth: ${{ inputs.fetch-depth }}
 
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ${{ inputs.srcdir }}/.downloaded-cache
         key: ${{ runner.os }}-${{ runner.arch }}-downloaded-cache

.github/workflows/compilers.yml

@@ -107,6 +107,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
       - { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
+      - { uses: './.github/actions/compilers', name: 'clang 22', with: { tag: 'clang-22' } }
       - { uses: './.github/actions/compilers', name: 'clang 21', with: { tag: 'clang-21' } }
       - { uses: './.github/actions/compilers', name: 'clang 20', with: { tag: 'clang-20' } }
       - { uses: './.github/actions/compilers', name: 'clang 19', with: { tag: 'clang-19' } }

.github/workflows/mingw.yml

@@ -70,25 +70,38 @@ jobs:
         with:
           ruby-version: '3.2'
 
+      - name: Remove Strawberry Perl pkg-config
+        working-directory:
+        # `pkg-config.bat` included in Strawberry Perl is written in
+        # Perl and doesn't work when another msys2 `perl` precede its
+        # own `perl`.
+        #
+        # ```
+        # Can't find C:\Strawberry\perl\bin\pkg-config.bat on PATH, '.' not in PATH.
+        # ```
+        run: |
+          Get-Command pkg-config.bat | % { ren $_.path ($_.path + "~") }
+        shell: pwsh
+
       - name: Misc system & package info
         working-directory:
         run: |
           # show where
           result=true
           for e in gcc.exe ragel.exe make.exe libcrypto-3-x64.dll libssl-3-x64.dll; do
-            echo ::group::$'\033[93m'$e$'\033[m'
+            echo ::group::$'\e[93m'$e$'\e[m'
             where $e || result=false
             echo ::endgroup::
           done
           # show version
           for e in gcc ragel make "openssl version"; do
             case "$e" in *" "*) ;; *) e="$e --version";; esac
-            echo ::group::$'\033[93m'$e$'\033[m'
+            echo ::group::$'\e[93m'$e$'\e[m'
             $e || result=false
             echo ::endgroup::
           done
           # show packages
-          echo ::group::$'\033[93m'Packages$'\033[m'
+          echo ::group::$'\e[93m'Packages$'\e[m'
           pacman -Qs mingw-w64-ucrt-x86_64-* | sed -n "s,local/mingw-w64-ucrt-x86_64-,,p"
           echo ::endgroup::
           $result

ast.c

@@ -866,6 +866,11 @@ node_locations(VALUE ast_value, const NODE *node)
                                     location_new(&RNODE_IF(node)->if_keyword_loc),
                                     location_new(&RNODE_IF(node)->then_keyword_loc),
                                     location_new(&RNODE_IF(node)->end_keyword_loc));
+      case NODE_MODULE:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_MODULE(node)->module_keyword_loc),
+                                    location_new(&RNODE_MODULE(node)->end_keyword_loc));
       case NODE_NEXT:
         return rb_ary_new_from_args(2,
                                     location_new(nd_code_loc(node)),

autogen.sh

@@ -10,7 +10,7 @@ case "$0" in
     *   )  srcdir="";; # Otherwise
 esac
 
-# If install-only is explicitly requested, disbale symlink flags
+# If install-only is explicitly requested, disable symlink flags
 case " $* " in
     *" -i "* | *" --install"* ) symlink_flags="" ;;
     *                         ) symlink_flags="--install --symlink" ;;

benchmark/struct_accessor.yml

@@ -1,5 +1,12 @@
 prelude: |
   C = Struct.new(:x) do
+    def initialize(...)
+      super
+      @ivar = 42
+    end
+
+    attr_accessor :ivar
+
     class_eval <<-END
       def r
         #{'x;'*256}
@@ -15,11 +22,16 @@ prelude: |
         m = method(:x=)
         #{'m.call(nil);'*256}
       end
+      def r_ivar
+        #{'ivar;'*256}
+      end
     END
   end
+  C.new(nil) # ensure common shape is known
   obj = C.new(nil)
 benchmark:
   member_reader: "obj.r"
   member_writer: "obj.w"
   member_reader_method: "obj.rm"
   member_writer_method: "obj.wm"
+  ivar_reader: "obj.r_ivar"

depend

@@ -6065,6 +6065,7 @@ hash.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 hash.$(OBJEXT): $(top_srcdir)/internal/st.h
 hash.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 hash.$(OBJEXT): $(top_srcdir)/internal/string.h
+hash.$(OBJEXT): $(top_srcdir)/internal/struct.h
 hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 hash.$(OBJEXT): $(top_srcdir)/internal/thread.h
 hash.$(OBJEXT): $(top_srcdir)/internal/time.h
@@ -6288,6 +6289,7 @@ hash.$(OBJEXT): {$(VPATH)}symbol.h
 hash.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 hash.$(OBJEXT): {$(VPATH)}thread_native.h
 hash.$(OBJEXT): {$(VPATH)}util.h
+hash.$(OBJEXT): {$(VPATH)}variable.h
 hash.$(OBJEXT): {$(VPATH)}vm_core.h
 hash.$(OBJEXT): {$(VPATH)}vm_debug.h
 hash.$(OBJEXT): {$(VPATH)}vm_opts.h
@@ -12700,6 +12702,7 @@ ractor.$(OBJEXT): {$(VPATH)}vm_debug.h
 ractor.$(OBJEXT): {$(VPATH)}vm_opts.h
 ractor.$(OBJEXT): {$(VPATH)}vm_sync.h
 ractor.$(OBJEXT): {$(VPATH)}yjit.h
+ractor.$(OBJEXT): {$(VPATH)}zjit.h
 random.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 random.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 random.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -12926,6 +12929,7 @@ 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/imemo.h
 range.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 range.$(OBJEXT): $(top_srcdir)/internal/range.h
 range.$(OBJEXT): $(top_srcdir)/internal/serial.h
@@ -12948,6 +12952,7 @@ range.$(OBJEXT): {$(VPATH)}config.h
 range.$(OBJEXT): {$(VPATH)}defines.h
 range.$(OBJEXT): {$(VPATH)}encoding.h
 range.$(OBJEXT): {$(VPATH)}id.h
+range.$(OBJEXT): {$(VPATH)}id_table.h
 range.$(OBJEXT): {$(VPATH)}intern.h
 range.$(OBJEXT): {$(VPATH)}internal.h
 range.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -15580,6 +15585,7 @@ shape.$(OBJEXT): $(top_srcdir)/internal/serial.h
 shape.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 shape.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 shape.$(OBJEXT): $(top_srcdir)/internal/string.h
+shape.$(OBJEXT): $(top_srcdir)/internal/struct.h
 shape.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 shape.$(OBJEXT): $(top_srcdir)/internal/variable.h
 shape.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -16569,6 +16575,7 @@ string.$(OBJEXT): $(top_srcdir)/internal/serial.h
 string.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 string.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 string.$(OBJEXT): $(top_srcdir)/internal/string.h
+string.$(OBJEXT): $(top_srcdir)/internal/struct.h
 string.$(OBJEXT): $(top_srcdir)/internal/transcode.h
 string.$(OBJEXT): $(top_srcdir)/internal/variable.h
 string.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -16766,6 +16773,7 @@ string.$(OBJEXT): {$(VPATH)}thread.h
 string.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 string.$(OBJEXT): {$(VPATH)}thread_native.h
 string.$(OBJEXT): {$(VPATH)}util.h
+string.$(OBJEXT): {$(VPATH)}variable.h
 string.$(OBJEXT): {$(VPATH)}vm_core.h
 string.$(OBJEXT): {$(VPATH)}vm_debug.h
 string.$(OBJEXT): {$(VPATH)}vm_opts.h
@@ -18105,6 +18113,7 @@ variable.$(OBJEXT): $(top_srcdir)/internal/serial.h
 variable.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 variable.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 variable.$(OBJEXT): $(top_srcdir)/internal/string.h
+variable.$(OBJEXT): $(top_srcdir)/internal/struct.h
 variable.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 variable.$(OBJEXT): $(top_srcdir)/internal/thread.h
 variable.$(OBJEXT): $(top_srcdir)/internal/variable.h

doc/string/grapheme_clusters.rdoc

@@ -1,6 +1,19 @@
 Returns an array of the grapheme clusters in +self+
 (see {Unicode Grapheme Cluster Boundaries}[https://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries]):
 
-  s = "\u0061\u0308-pqr-\u0062\u0308-xyz-\u0063\u0308" # => "ä-pqr-b̈-xyz-c̈"
+  s = "ä-pqr-b̈-xyz-c̈"
+  s.size                   # => 16
+  s.bytesize               # => 19
+  s.grapheme_clusters.size # => 13
   s.grapheme_clusters
   # => ["ä", "-", "p", "q", "r", "-", "b̈", "-", "x", "y", "z", "-", "c̈"]
+
+Details:
+
+  s = "ä"
+  s.grapheme_clusters             # => ["ä"]           # One grapheme cluster.
+  s.bytes                         # => [97, 204, 136]  # Three bytes.
+  s.chars                         # => ["a", "̈"]       # Two characters.
+  s.chars.map {|char| char.ord }  # => [97, 776]       # Their values.
+
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].